From nobody Wed Jun 08 08:29:48 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7C275839B52; Wed, 8 Jun 2022 08:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LJ0lJ315nz4gT0; Wed, 8 Jun 2022 08:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654676988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQtsmSZrhnorlhyUDbljuPVDx2kD0KtxwqzPh2OnyME=; b=jLVubo2dW46ScIrxWgiycD0ajY8fShybbvb2XenZfkpzUbAao4qpvmrrPg/IP7lx5G8xdl X9I+Iz8wrwH/r8uZFKjGnsEwiM0kxw7rFRSqMexhsZoQP+In71HE0n0o1NeLO1hvaPIyEG NG6Q+l8jK6dHFM9qUFUfkXBQGCoGTWmlAP8XLFI+znZMPjtRRVo2nJ2oQ2OVykwltxtMMb WUMwv1eAnYmPDRk6NCgxtYPIbicdYS9iegLM0eSA/ydWc4KkCwAOgUCHJJR0tWgYWA+zyK yMedMfn4ENo+hjdYkw9sWLS9tb+nMKwZ9hXD00EbMDc6NmWZxij34XvQK7LQfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4342944A1; Wed, 8 Jun 2022 08:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2588TmuS082508; Wed, 8 Jun 2022 08:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2588TmVS082507; Wed, 8 Jun 2022 08:29:48 GMT (envelope-from git) Date: Wed, 8 Jun 2022 08:29:48 GMT Message-Id: <202206080829.2588TmVS082507@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: a58264f05f67 - main - x11-toolkits/wxgtk31: add non-default, webkit-less gtk2 flavor List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a58264f05f6792fa7b5c2c930b0661202f8de737 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654676988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQtsmSZrhnorlhyUDbljuPVDx2kD0KtxwqzPh2OnyME=; b=ZscV4lBF+e8g8Sc3zJLo8Zt1qk5xB9eYqETdDlrI9bshPdd7o8ohC+kVmICArCp2tW50GW nN8NSsnYETv32/HjypOLGdKGdK0JM3QDumpctVJO/1R6+/fXMcaAzPZhcd9/FKhTWDaEmt 9cM2rnYfocaDla+8XW3/lP4YDDrwat2VrOS7kkpHSuoRzee0UfVhLfSGVNiQRCmBrwDd7c yA2P28g9D+BHrPgW+Ur1Ud9IE9jMvwZ74DAJTLiwc/jXT5xkX7Ei2o1fAZUcnRlnabykAZ 7kDapYZOXI/74MsVOZ01/l/Dy20lYWuRI22SGGVgiU/Wxae3879s7RIGI0DFwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654676988; a=rsa-sha256; cv=none; b=iyb8aAXem1gjQ+0pBs3MZYnmbzAJOZBdox763qPK9lk83pe12LjRjQI6GqltNxxcsxagtC PudnazVQjjjcQ9NcVGzf+rrorDGNprk7lyqKv5z30LFbjpfaI7nxxWAklusDr0Ja5zQqsj R0db3BxvZemD+IINTeUn8j3O1kOUmfTv2Sa8wIuUtyQY59cjrcfc4Ym24O12eCxsSiQl3A MFHDHjgCDmUOHab4H5WF4MEV6MIto3ZvenOaf31hn3BwBOl5GHgxBhgIyPEPrZfhlgG7L5 JVBI1SDeHD9Xtx6InySOszqWmAjgxBMSChJynhW+h+O3Sp1FZxRTsAoIQIEANg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=a58264f05f6792fa7b5c2c930b0661202f8de737 commit a58264f05f6792fa7b5c2c930b0661202f8de737 Author: Alexey Dokuchaev AuthorDate: 2022-06-08 08:29:06 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-06-08 08:29:06 +0000 x11-toolkits/wxgtk31: add non-default, webkit-less gtk2 flavor This follows similar commit b7cbb62f6ab6 in `x11-toolkits/wxgtk30' to allow widget-heavy graphical software, e.g. various CADs, offer more fluent, responsive, and overall better user experience. --- x11-toolkits/wxgtk31/Makefile | 33 +++++++++++++--- x11-toolkits/wxgtk31/pkg-plist | 86 +++++++++++++++++++++--------------------- 2 files changed, 71 insertions(+), 48 deletions(-) diff --git a/x11-toolkits/wxgtk31/Makefile b/x11-toolkits/wxgtk31/Makefile index a157185d203c..abf04f3a5a44 100644 --- a/x11-toolkits/wxgtk31/Makefile +++ b/x11-toolkits/wxgtk31/Makefile @@ -3,10 +3,10 @@ DISTVERSIONPREFIX= v DISTVERSION= 3.1.5 PORTREVISION= 2 CATEGORIES= x11-toolkits -PKGNAMESUFFIX= 31-gtk3 +PKGNAMESUFFIX= ${_SHORT_WX_VER}-${FLAVOR} MAINTAINER= ports@FreeBSD.org -COMMENT= GUI toolkit (wxWidgets) with GTK+ bindings +COMMENT= GUI toolkit (wxWidgets) with ${FLAVOR:S/k/&+/:tu} bindings LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/docs/gpl.txt @@ -15,6 +15,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ libjbig.so:graphics/jbigkit \ libnotify.so:devel/libnotify \ libpng.so:graphics/png \ @@ -33,7 +34,7 @@ GH_TUPLE= wxWidgets:Catch:ee4acb6:wxWidgets_Catch/3rdparty/catch GNU_CONFIGURE= yes USE_XORG= x11 sm xxf86vm xtst USE_GL= gl glu -USE_GNOME= cairo gdkpixbuf2 gtk30 +USE_GNOME= cairo gdkpixbuf2 USE_LDCONFIG= yes USE_CXXSTD= c++11 CONFIGURE_ARGS= --with-libpng=sys \ @@ -42,7 +43,6 @@ CONFIGURE_ARGS= --with-libpng=sys \ --with-zlib=sys \ --with-expat=sys \ --with-opengl \ - --with-gtk=3 \ --without-gnomevfs \ --disable-epollloop \ --disable-joystick \ @@ -57,8 +57,8 @@ CONFIGURE_ARGS= --with-libpng=sys \ CONFIGURE_ENV= X11BASE="${LOCALBASE}" \ ac_cv_header_sys_inotify_h=no -OPTIONS_DEFINE= GSTREAMER MSPACK NLS WEBKIT -OPTIONS_DEFAULT= GSTREAMER MSPACK WEBKIT +OPTIONS_DEFINE= GSTREAMER MSPACK NLS +OPTIONS_DEFAULT= GSTREAMER MSPACK MSPACK_DESC= Microsoft archives support OPTIONS_SUB= yes @@ -74,6 +74,27 @@ MSPACK_LIB_DEPENDS= libmspack.so:archivers/libmspack WEBKIT_CONFIGURE_ENABLE= webview WEBKIT_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 +FLAVORS= gtk3 gtk2 +FLAVOR?= ${FLAVORS:[1]} + +.if ${FLAVOR} == gtk3 +USE_GNOME+= gtk30 +CONFIGURE_ARGS+= --with-gtk=3 +OPTIONS_DEFINE+= WEBKIT +OPTIONS_DEFAULT+= WEBKIT +PLIST_SUB+= GTK2="@comment " GTK3="" +.else +USE_GNOME+= gtk20 +CONFIGURE_ARGS+= --with-gtk +PLIST_SUB+= GTK2="" GTK3="@comment " WEBKIT="@comment " +.endif +PLIST_SUB+= GTKVER=${FLAVOR} + +_SHORT_WX_VER= ${PORTVERSION:S/./ /g:[1..2]:ts} + +gtk3_CONFLICTS_INSTALL= ${PORTNAME}${_SHORT_WX_VER}-gtk2 +gtk2_CONFLICTS_INSTALL= ${PORTNAME}${_SHORT_WX_VER}-gtk3 + .include # TLS is broken on armv6/7, PR 229396 diff --git a/x11-toolkits/wxgtk31/pkg-plist b/x11-toolkits/wxgtk31/pkg-plist index 8cb8477f38d4..53c6f30d7a66 100644 --- a/x11-toolkits/wxgtk31/pkg-plist +++ b/x11-toolkits/wxgtk31/pkg-plist @@ -1,4 +1,4 @@ -bin/wxgtk3u-3.1-config +bin/wx%%GTKVER%%u-3.1-config bin/wxrc bin/wxrc-3.1 include/wx-3.1/wx/aboutdlg.h @@ -30,6 +30,7 @@ include/wx-3.1/wx/aui/dockart.h include/wx-3.1/wx/aui/floatpane.h include/wx-3.1/wx/aui/framemanager.h include/wx-3.1/wx/aui/tabart.h +%%GTK2%%include/wx-3.1/wx/aui/tabartgtk.h include/wx-3.1/wx/aui/tabmdi.h include/wx-3.1/wx/bannerwindow.h include/wx-3.1/wx/base64.h @@ -185,6 +186,7 @@ include/wx-3.1/wx/generic/dvrenderers.h include/wx-3.1/wx/generic/fdrepdlg.h include/wx-3.1/wx/generic/filectrlg.h include/wx-3.1/wx/generic/filepickerg.h +%%GTK2%%include/wx-3.1/wx/generic/fontdlgg.h include/wx-3.1/wx/generic/fswatcher.h include/wx-3.1/wx/generic/grid.h include/wx-3.1/wx/generic/gridctrl.h @@ -591,7 +593,7 @@ include/wx-3.1/wx/unix/evtloopsrc.h include/wx-3.1/wx/unix/fontutil.h include/wx-3.1/wx/unix/fswatcher_inotify.h include/wx-3.1/wx/unix/fswatcher_kqueue.h -include/wx-3.1/wx/unix/glegl.h +%%GTK3%%include/wx-3.1/wx/unix/glegl.h include/wx-3.1/wx/unix/glx11.h include/wx-3.1/wx/unix/joystick.h include/wx-3.1/wx/unix/mimetype.h @@ -735,47 +737,47 @@ lib/libwx_baseu_net-3.1.so.5.0.0 lib/libwx_baseu_xml-3.1.so lib/libwx_baseu_xml-3.1.so.5 lib/libwx_baseu_xml-3.1.so.5.0.0 -lib/libwx_gtk3u_adv-3.1.so -lib/libwx_gtk3u_adv-3.1.so.5 -lib/libwx_gtk3u_adv-3.1.so.5.0.0 -lib/libwx_gtk3u_aui-3.1.so -lib/libwx_gtk3u_aui-3.1.so.5 -lib/libwx_gtk3u_aui-3.1.so.5.0.0 -lib/libwx_gtk3u_core-3.1.so -lib/libwx_gtk3u_core-3.1.so.5 -lib/libwx_gtk3u_core-3.1.so.5.0.0 -lib/libwx_gtk3u_gl-3.1.so -lib/libwx_gtk3u_gl-3.1.so.5 -lib/libwx_gtk3u_gl-3.1.so.5.0.0 -lib/libwx_gtk3u_html-3.1.so -lib/libwx_gtk3u_html-3.1.so.5 -lib/libwx_gtk3u_html-3.1.so.5.0.0 -%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so -%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.5 -%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.5.0.0 -lib/libwx_gtk3u_propgrid-3.1.so -lib/libwx_gtk3u_propgrid-3.1.so.5 -lib/libwx_gtk3u_propgrid-3.1.so.5.0.0 -lib/libwx_gtk3u_qa-3.1.so -lib/libwx_gtk3u_qa-3.1.so.5 -lib/libwx_gtk3u_qa-3.1.so.5.0.0 -lib/libwx_gtk3u_ribbon-3.1.so -lib/libwx_gtk3u_ribbon-3.1.so.5 -lib/libwx_gtk3u_ribbon-3.1.so.5.0.0 -lib/libwx_gtk3u_richtext-3.1.so -lib/libwx_gtk3u_richtext-3.1.so.5 -lib/libwx_gtk3u_richtext-3.1.so.5.0.0 -lib/libwx_gtk3u_stc-3.1.so -lib/libwx_gtk3u_stc-3.1.so.5 -lib/libwx_gtk3u_stc-3.1.so.5.0.0 -%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so -%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.5 -%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.5.0.0 -lib/libwx_gtk3u_xrc-3.1.so -lib/libwx_gtk3u_xrc-3.1.so.5 -lib/libwx_gtk3u_xrc-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_adv-3.1.so +lib/libwx_%%GTKVER%%u_adv-3.1.so.5 +lib/libwx_%%GTKVER%%u_adv-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_aui-3.1.so +lib/libwx_%%GTKVER%%u_aui-3.1.so.5 +lib/libwx_%%GTKVER%%u_aui-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_core-3.1.so +lib/libwx_%%GTKVER%%u_core-3.1.so.5 +lib/libwx_%%GTKVER%%u_core-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_gl-3.1.so +lib/libwx_%%GTKVER%%u_gl-3.1.so.5 +lib/libwx_%%GTKVER%%u_gl-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_html-3.1.so +lib/libwx_%%GTKVER%%u_html-3.1.so.5 +lib/libwx_%%GTKVER%%u_html-3.1.so.5.0.0 +%%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.1.so +%%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.1.so.5 +%%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_propgrid-3.1.so +lib/libwx_%%GTKVER%%u_propgrid-3.1.so.5 +lib/libwx_%%GTKVER%%u_propgrid-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_qa-3.1.so +lib/libwx_%%GTKVER%%u_qa-3.1.so.5 +lib/libwx_%%GTKVER%%u_qa-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_ribbon-3.1.so +lib/libwx_%%GTKVER%%u_ribbon-3.1.so.5 +lib/libwx_%%GTKVER%%u_ribbon-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_richtext-3.1.so +lib/libwx_%%GTKVER%%u_richtext-3.1.so.5 +lib/libwx_%%GTKVER%%u_richtext-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_stc-3.1.so +lib/libwx_%%GTKVER%%u_stc-3.1.so.5 +lib/libwx_%%GTKVER%%u_stc-3.1.so.5.0.0 +%%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.1.so +%%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.1.so.5 +%%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.1.so.5.0.0 +lib/libwx_%%GTKVER%%u_xrc-3.1.so +lib/libwx_%%GTKVER%%u_xrc-3.1.so.5 +lib/libwx_%%GTKVER%%u_xrc-3.1.so.5.0.0 %%WEBKIT%%lib/wx/3.1.5/web-extensions/webkit2_extu-3.1.5.so -lib/wx/include/gtk3-unicode-3.1/wx/setup.h +lib/wx/include/%%GTKVER%%-unicode-3.1/wx/setup.h share/aclocal/wxwin31.m4 share/bakefile/presets/wx31.bkl share/bakefile/presets/wx31_presets.py