Attachment 194177 Details for Bug 228904 – wx31-gtk3.patch

[patch] wx31-gtk3.patch

wx31-gtk3.patch (text/plain), 8.28 KB, created by Val Packett on 2018-06-11 19:54:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2018-06-11 19:54:49 UTC

Size: 8.28 KB

patch

obsolete

>diff --git c/x11-toolkits/wxgtk31/Makefile i/x11-toolkits/wxgtk31/Makefile
>index 700b7350d466..352ef26b07c6 100644
>--- c/x11-toolkits/wxgtk31/Makefile
>+++ i/x11-toolkits/wxgtk31/Makefile
>@@ -4,7 +4,7 @@ PORTNAME=	wx
> DISTVERSIONPREFIX=	v
> DISTVERSION=	3.1.1
> CATEGORIES=	x11-toolkits
>-PKGNAMESUFFIX=	31-gtk2
>+PKGNAMESUFFIX=	31-${FLAVOR}
> 
> MAINTAINER=	yuri@FreeBSD.org
> COMMENT=	GUI toolkit (wxWidgets) with GTK+ bindings
>@@ -12,6 +12,9 @@ COMMENT=	GUI toolkit (wxWidgets) with GTK+ bindings
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/docs/gpl.txt
> 
>+FLAVORS=	gtk2 gtk3
>+FLAVOR?=	${FLAVORS:[1]}
>+
> LIB_DEPENDS=	libexpat.so:textproc/expat2 \
> 		libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
>@@ -29,7 +32,7 @@ GH_PROJECT=	wxWidgets
> GNU_CONFIGURE=	yes
> USE_XORG=	x11 sm xxf86vm xtst
> USE_GL=		gl glu
>-USE_GNOME=	cairo gdkpixbuf2 gtk20
>+USE_GNOME=	cairo gdkpixbuf2
> USE_LDCONFIG=	yes
> USE_CXXSTD=	c++11
> CONFIGURE_ARGS=	--with-libpng=sys \
>@@ -38,7 +41,6 @@ CONFIGURE_ARGS=	--with-libpng=sys \
> 		--with-zlib=sys \
> 		--with-expat=sys \
> 		--with-opengl \
>-		--with-gtk \
> 		--without-gnomevfs \
> 		--disable-epollloop \
> 		--disable-joystick \
>@@ -51,6 +53,7 @@ CONFIGURE_ARGS=	--with-libpng=sys \
> 		--enable-compat30
> CONFIGURE_ENV=	X11BASE="${LOCALBASE}" \
> 		ac_cv_header_sys_inotify_h=no
>+PLIST_SUB=	FLAVOR="${FLAVOR}"
> 
> OPTIONS_DEFINE=		GSTREAMER MSPACK NLS WEBKIT
> OPTIONS_DEFAULT=	GSTREAMER MSPACK WEBKIT
>@@ -66,7 +69,18 @@ MSPACK_CONFIGURE_WITH=		libmspack
> MSPACK_LIB_DEPENDS=		libmspack.so:archivers/libmspack
> 
> WEBKIT_CONFIGURE_ENABLE=	webview
>-WEBKIT_LIB_DEPENDS=		libwebkitgtk-1.0.so:www/webkit-gtk2
>+
>+.if ${FLAVOR} == gtk2
>+CONFIGURE_ARGS+=	--with-gtk=2
>+USE_GNOME+=		gtk20
>+PLIST_SUB+=		GTK2="" GTK3="@comment "
>+WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
>+.else
>+CONFIGURE_ARGS+=	--with-gtk=3
>+USE_GNOME+=		gtk30
>+PLIST_SUB+=		GTK2="@comment " GTK3=""
>+WEBKIT_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
>+.endif
> 
> .include <bsd.port.pre.mk>
> 
>diff --git c/x11-toolkits/wxgtk31/files/patch-Makefile.in i/x11-toolkits/wxgtk31/files/patch-Makefile.in
>index 87b8131c461e..0ae028afd5df 100644
>--- c/x11-toolkits/wxgtk31/files/patch-Makefile.in
>+++ i/x11-toolkits/wxgtk31/files/patch-Makefile.in
>@@ -8,6 +8,14 @@
>  INSTALL_DATA = @INSTALL_DATA@
>  INSTALL_DIR = @INSTALL_DIR@
>  ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
>+@@ -54,6 +55,7 @@
>+ TOOLKIT = @TOOLKIT@
>+ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
>+ TOOLKIT_VERSION = @TOOLKIT_VERSION@
>++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
>+ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
>+ EXTRALIBS = @EXTRALIBS@
>+ EXTRALIBS_XML = @EXTRALIBS_XML@
> @@ -15214,9 +15215,9 @@
>  
>  install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
>diff --git c/x11-toolkits/wxgtk31/pkg-plist i/x11-toolkits/wxgtk31/pkg-plist
>index 62439f35e682..18545c24276c 100644
>--- c/x11-toolkits/wxgtk31/pkg-plist
>+++ i/x11-toolkits/wxgtk31/pkg-plist
>@@ -1,5 +1,5 @@
>-bin/wx-config
>-bin/wxrc-gtk2u-3.1
>+bin/wx%%FLAVOR%%u-3.1-config
>+bin/wxrc-%%FLAVOR%%u-3.1
> include/wx-3.1/wx/aboutdlg.h
> include/wx-3.1/wx/accel.h
> include/wx-3.1/wx/access.h
>@@ -29,7 +29,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
>-include/wx-3.1/wx/aui/tabartgtk.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
>@@ -183,7 +183,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
>-include/wx-3.1/wx/generic/fontdlgg.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
>@@ -728,46 +728,47 @@ lib/libwx_baseu_net-3.1.so.1.0.0
> lib/libwx_baseu_xml-3.1.so
> lib/libwx_baseu_xml-3.1.so.1
> lib/libwx_baseu_xml-3.1.so.1.0.0
>-lib/libwx_gtk2u_adv-3.1.so
>-lib/libwx_gtk2u_adv-3.1.so.1
>-lib/libwx_gtk2u_adv-3.1.so.1.0.0
>-lib/libwx_gtk2u_aui-3.1.so
>-lib/libwx_gtk2u_aui-3.1.so.1
>-lib/libwx_gtk2u_aui-3.1.so.1.0.0
>-lib/libwx_gtk2u_core-3.1.so
>-lib/libwx_gtk2u_core-3.1.so.1
>-lib/libwx_gtk2u_core-3.1.so.1.0.0
>-lib/libwx_gtk2u_gl-3.1.so
>-lib/libwx_gtk2u_gl-3.1.so.1
>-lib/libwx_gtk2u_gl-3.1.so.1.0.0
>-lib/libwx_gtk2u_html-3.1.so
>-lib/libwx_gtk2u_html-3.1.so.1
>-lib/libwx_gtk2u_html-3.1.so.1.0.0
>-%%GSTREAMER%%lib/libwx_gtk2u_media-3.1.so
>-%%GSTREAMER%%lib/libwx_gtk2u_media-3.1.so.1
>-%%GSTREAMER%%lib/libwx_gtk2u_media-3.1.so.1.0.0
>-lib/libwx_gtk2u_propgrid-3.1.so
>-lib/libwx_gtk2u_propgrid-3.1.so.1
>-lib/libwx_gtk2u_propgrid-3.1.so.1.0.0
>-lib/libwx_gtk2u_qa-3.1.so
>-lib/libwx_gtk2u_qa-3.1.so.1
>-lib/libwx_gtk2u_qa-3.1.so.1.0.0
>-lib/libwx_gtk2u_ribbon-3.1.so
>-lib/libwx_gtk2u_ribbon-3.1.so.1
>-lib/libwx_gtk2u_ribbon-3.1.so.1.0.0
>-lib/libwx_gtk2u_richtext-3.1.so
>-lib/libwx_gtk2u_richtext-3.1.so.1
>-lib/libwx_gtk2u_richtext-3.1.so.1.0.0
>-lib/libwx_gtk2u_stc-3.1.so
>-lib/libwx_gtk2u_stc-3.1.so.1
>-lib/libwx_gtk2u_stc-3.1.so.1.0.0
>-%%WEBKIT%%lib/libwx_gtk2u_webview-3.1.so
>-%%WEBKIT%%lib/libwx_gtk2u_webview-3.1.so.1
>-%%WEBKIT%%lib/libwx_gtk2u_webview-3.1.so.1.0.0
>-lib/libwx_gtk2u_xrc-3.1.so
>-lib/libwx_gtk2u_xrc-3.1.so.1
>-lib/libwx_gtk2u_xrc-3.1.so.1.0.0
>-lib/wx/include/gtk2-unicode-3.1/wx/setup.h
>+lib/libwx_%%FLAVOR%%u_adv-3.1.so
>+lib/libwx_%%FLAVOR%%u_adv-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_adv-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_aui-3.1.so
>+lib/libwx_%%FLAVOR%%u_aui-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_aui-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_core-3.1.so
>+lib/libwx_%%FLAVOR%%u_core-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_core-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_gl-3.1.so
>+lib/libwx_%%FLAVOR%%u_gl-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_gl-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_html-3.1.so
>+lib/libwx_%%FLAVOR%%u_html-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_html-3.1.so.1.0.0
>+%%GSTREAMER%%lib/libwx_%%FLAVOR%%u_media-3.1.so
>+%%GSTREAMER%%lib/libwx_%%FLAVOR%%u_media-3.1.so.1
>+%%GSTREAMER%%lib/libwx_%%FLAVOR%%u_media-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_propgrid-3.1.so
>+lib/libwx_%%FLAVOR%%u_propgrid-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_propgrid-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_qa-3.1.so
>+lib/libwx_%%FLAVOR%%u_qa-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_qa-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_ribbon-3.1.so
>+lib/libwx_%%FLAVOR%%u_ribbon-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_ribbon-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_richtext-3.1.so
>+lib/libwx_%%FLAVOR%%u_richtext-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_richtext-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_stc-3.1.so
>+lib/libwx_%%FLAVOR%%u_stc-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_stc-3.1.so.1.0.0
>+%%WEBKIT%%lib/libwx_%%FLAVOR%%u_webview-3.1.so
>+%%WEBKIT%%lib/libwx_%%FLAVOR%%u_webview-3.1.so.1
>+%%WEBKIT%%lib/libwx_%%FLAVOR%%u_webview-3.1.so.1.0.0
>+lib/libwx_%%FLAVOR%%u_xrc-3.1.so
>+lib/libwx_%%FLAVOR%%u_xrc-3.1.so.1
>+lib/libwx_%%FLAVOR%%u_xrc-3.1.so.1.0.0
>+%%GTK3%%%%WEBKIT%%lib/wx/3.1.1/web-extensions/webkit2_extu-3.1.1.so
>+lib/wx/include/%%FLAVOR%%-unicode-3.1/wx/setup.h
> share/aclocal/wxwin31.m4
> share/bakefile/presets/wx31.bkl
> share/bakefile/presets/wx31_presets.py

Actions: View | Diff

Attachments on bug 228904: 194177 | 194179