Attachment 246248 Details for Bug 274367 – Update to 3.2.3: portclippy, portfmt

[patch] Update to 3.2.3: portclippy, portfmt

wxgtk32-3.2.3_formated.diff (text/plain), 7.40 KB, created by Nuno Teixeira on 2023-11-11 21:30:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2023-11-11 21:30:52 UTC

Size: 7.40 KB

patch

obsolete

>diff --git a/x11-toolkits/wxgtk32/Makefile b/x11-toolkits/wxgtk32/Makefile
>index 794704329f2a..88e3a96a7d77 100644
>--- a/x11-toolkits/wxgtk32/Makefile
>+++ b/x11-toolkits/wxgtk32/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	wx
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	3.2.1
>-PORTREVISION=	2
>+DISTVERSION=	3.2.3
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	https://github.com/wxWidgets/wxWidgets/releases/download/v${DISTVERSION}/
> PKGNAMESUFFIX=	${_SHORT_WX_VER}-${FLAVOR}
>@@ -22,90 +21,96 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
> 		libjbig.so:graphics/jbigkit \
> 		libnotify.so:devel/libnotify \
> 		libpcre2-32.so:devel/pcre2 \
>-		libpng.so:graphics/png \
>+		libpng16.so:graphics/png \
> 		libsecret-1.so:security/libsecret \
> 		libsoup-2.4.so:devel/libsoup \
> 		libtiff.so:graphics/tiff \
>-		libwayland-egl.so:graphics/wayland
>+		libwayland-egl.so:graphics/wayland \
>+		libxkbcommon.so:x11/libxkbcommon
> 
> FLAVORS=	gtk3 gtk2
> FLAVOR?=	${FLAVORS:[1]}
>+gtk3_CONFLICTS_INSTALL=	${PORTNAME}${_SHORT_WX_VER}-gtk2
>+gtk2_CONFLICTS_INSTALL=	${PORTNAME}${_SHORT_WX_VER}-gtk3
> 
> USES=		compiler:c++11-lib gl gmake gnome iconv jpeg localbase \
> 		pkgconfig tar:bz2 xorg
>-GNU_CONFIGURE=	yes
>-USE_XORG=	x11 sm xxf86vm xtst
>+USE_CXXSTD=	c++11
> USE_GL=		gl glu
> USE_GNOME=	cairo gdkpixbuf2
> USE_LDCONFIG=	yes
>-USE_CXXSTD=	c++11
>-CONFIGURE_ARGS=	--with-libpng=sys \
>-		--with-libjpeg=sys \
>-		--with-libtiff=sys \
>-		--with-liblzma \
>-		--with-nanosvg \
>-		--with-zlib=sys \
>-		--with-expat=sys \
>-		--with-opengl \
>-		--without-gnomevfs \
>-		--disable-epollloop \
>+USE_XORG=	sm x11 xtst xxf86vm
>+
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--disable-epollloop \
> 		--disable-joystick \
> 		--enable-backtrace \
>+		--enable-compat28 \
>+		--enable-compat30 \
>+		--enable-graphics_ctx \
> 		--enable-ipv6 \
> 		--enable-optimise \
>-		--enable-unicode \
> 		--enable-std_string \
>-		--enable-graphics_ctx \
>-		--enable-compat28 \
>-		--enable-compat30
>-CONFIGURE_ENV=	X11BASE="${LOCALBASE}" \
>-		ac_cv_header_sys_inotify_h=no
>+		--enable-unicode \
>+		--with-expat=sys \
>+		--with-libjpeg=sys \
>+		--with-liblzma \
>+		--with-libpng=sys \
>+		--with-libtiff=sys \
>+		--with-nanosvg \
>+		--with-opengl \
>+		--with-zlib=sys \
>+		--without-gnomevfs
>+CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no \
>+		X11BASE="${LOCALBASE}"
>+
>+PLIST_SUB+=	GTKVER=${FLAVOR}
> 
> OPTIONS_DEFINE=		GSTREAMER MSPACK NLS
> OPTIONS_DEFAULT=	GSTREAMER MSPACK
>-MSPACK_DESC=		Microsoft archives support
> OPTIONS_SUB=		yes
> 
>-NLS_USES=			gettext
>+MSPACK_DESC=	Microsoft archives support
> 
>-GSTREAMER_CONFIGURE_ENABLE=	mediactrl
> GSTREAMER_USES=			gstreamer
> GSTREAMER_USE=			GSTREAMER=bad
>+GSTREAMER_CONFIGURE_ENABLE=	mediactrl
> 
>-MSPACK_CONFIGURE_WITH=		libmspack
>-MSPACK_LIB_DEPENDS=		libmspack.so:archivers/libmspack
>+MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack
>+MSPACK_CONFIGURE_WITH=	libmspack
>+
>+NLS_USES=	gettext
> 
>-WEBKIT_CONFIGURE_ENABLE=	webview
> WEBKIT_LIB_DEPENDS=		libwebkit2gtk-4.0.so:www/webkit2-gtk3
>+WEBKIT_CONFIGURE_ENABLE=	webview
> 
> .if ${FLAVOR} == gtk3
>-USE_GNOME+=	gtk30
>+USE_GNOME+=		gtk30
> CONFIGURE_ARGS+=	--with-gtk=3
> OPTIONS_DEFINE+=	WEBKIT
> OPTIONS_DEFAULT+=	WEBKIT
>-PLIST_SUB+=	GTK2="@comment " GTK3=""
>+PLIST_SUB+=		GTK2="@comment " \
>+			GTK3=""
> .else
>-USE_GNOME+=	gtk20
>+USE_GNOME+=		gtk20
> CONFIGURE_ARGS+=	--with-gtk
>-PLIST_SUB+=	GTK2="" GTK3="@comment " WEBKIT="@comment "
>+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 <bsd.port.pre.mk>
> 
> # TLS is broken on armv6/7, PR 229396
> .if ${ARCH} == armv6 || ${ARCH} == armv7
>-CONFIGURE_ARGS+=--disable-tls
>+CONFIGURE_ARGS+=	--disable-tls
> .endif
> 
> # PR 196703, 197031
> .if ${CHOSEN_COMPILER_TYPE} == gcc
>-CONFIGURE_ARGS+=--disable-precomp-headers
>+CONFIGURE_ARGS+=	--disable-precomp-headers
> .endif
> 
> # wxWidgets uses the same linker version script for all its shared libraries, so
>@@ -118,4 +123,5 @@ post-build-NLS-on:
> 
> post-install:
> 	@${RM} ${STAGEDIR}${PREFIX}/bin/wxrc
>+
> .include <bsd.port.post.mk>
>diff --git a/x11-toolkits/wxgtk32/distinfo b/x11-toolkits/wxgtk32/distinfo
>index 8732d5b601fd..21d6d38c89bb 100644
>--- a/x11-toolkits/wxgtk32/distinfo
>+++ b/x11-toolkits/wxgtk32/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1663161295
>-SHA256 (wxWidgets-3.2.1.tar.bz2) = c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66
>-SIZE (wxWidgets-3.2.1.tar.bz2) = 27266651
>+TIMESTAMP = 1697910734
>+SHA256 (wxWidgets-3.2.3.tar.bz2) = c170ab67c7e167387162276aea84e055ee58424486404bba692c401730d1a67a
>+SIZE (wxWidgets-3.2.3.tar.bz2) = 27537724
>diff --git a/x11-toolkits/wxgtk32/pkg-plist b/x11-toolkits/wxgtk32/pkg-plist
>index d544e42614df..2f5545ffca0c 100644
>--- a/x11-toolkits/wxgtk32/pkg-plist
>+++ b/x11-toolkits/wxgtk32/pkg-plist
>@@ -735,52 +735,52 @@ include/wx-3.2/wx/zipstrm.h
> include/wx-3.2/wx/zstream.h
> lib/libwx_baseu-3.2.so
> lib/libwx_baseu-3.2.so.0
>-lib/libwx_baseu-3.2.so.0.1.0
>+lib/libwx_baseu-3.2.so.0.2.1
> lib/libwx_baseu_net-3.2.so
> lib/libwx_baseu_net-3.2.so.0
>-lib/libwx_baseu_net-3.2.so.0.1.0
>+lib/libwx_baseu_net-3.2.so.0.2.1
> lib/libwx_baseu_xml-3.2.so
> lib/libwx_baseu_xml-3.2.so.0
>-lib/libwx_baseu_xml-3.2.so.0.1.0
>+lib/libwx_baseu_xml-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_adv-3.2.so
> lib/libwx_%%GTKVER%%u_adv-3.2.so.0
>-lib/libwx_%%GTKVER%%u_adv-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_adv-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_aui-3.2.so
> lib/libwx_%%GTKVER%%u_aui-3.2.so.0
>-lib/libwx_%%GTKVER%%u_aui-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_aui-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_core-3.2.so
> lib/libwx_%%GTKVER%%u_core-3.2.so.0
>-lib/libwx_%%GTKVER%%u_core-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_core-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_gl-3.2.so
> lib/libwx_%%GTKVER%%u_gl-3.2.so.0
>-lib/libwx_%%GTKVER%%u_gl-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_gl-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_html-3.2.so
> lib/libwx_%%GTKVER%%u_html-3.2.so.0
>-lib/libwx_%%GTKVER%%u_html-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_html-3.2.so.0.2.1
> %%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.2.so
> %%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.2.so.0
>-%%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.2.so.0.1.0
>+%%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_propgrid-3.2.so
> lib/libwx_%%GTKVER%%u_propgrid-3.2.so.0
>-lib/libwx_%%GTKVER%%u_propgrid-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_propgrid-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_qa-3.2.so
> lib/libwx_%%GTKVER%%u_qa-3.2.so.0
>-lib/libwx_%%GTKVER%%u_qa-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_qa-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_ribbon-3.2.so
> lib/libwx_%%GTKVER%%u_ribbon-3.2.so.0
>-lib/libwx_%%GTKVER%%u_ribbon-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_ribbon-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_richtext-3.2.so
> lib/libwx_%%GTKVER%%u_richtext-3.2.so.0
>-lib/libwx_%%GTKVER%%u_richtext-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_richtext-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_stc-3.2.so
> lib/libwx_%%GTKVER%%u_stc-3.2.so.0
>-lib/libwx_%%GTKVER%%u_stc-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_stc-3.2.so.0.2.1
> %%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.2.so
> %%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.2.so.0
>-%%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.2.so.0.1.0
>+%%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.2.so.0.2.1
> lib/libwx_%%GTKVER%%u_xrc-3.2.so
> lib/libwx_%%GTKVER%%u_xrc-3.2.so.0
>-lib/libwx_%%GTKVER%%u_xrc-3.2.so.0.1.0
>+lib/libwx_%%GTKVER%%u_xrc-3.2.so.0.2.1
> %%WEBKIT%%lib/wx/3.2/web-extensions/webkit2_extu-3.2.so
> lib/wx/include/%%GTKVER%%-unicode-3.2/wx/setup.h
> share/aclocal/wxwin32.m4

Actions: View | Diff

Attachments on bug 274367: 245519 | 245520 | 245822 | 245823 | 246079 | 246095 | 246140 | 246173 | 246248 | 246304