Attachment 187866 Details for Bug 220932 – fix build

[patch] fix build

wxgtk30.patch (text/plain), 6.23 KB, created by Ivan Rozhuk on 2017-11-08 20:24:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2017-11-08 20:24:26 UTC

Size: 6.23 KB

patch

obsolete

>Index: x11-toolkits/wxgtk30/Makefile
>===================================================================
>--- x11-toolkits/wxgtk30/Makefile	(revision 453470)
>+++ x11-toolkits/wxgtk30/Makefile	(working copy)
>@@ -1,21 +1,24 @@
> # $FreeBSD$
> 
> PORTNAME=	wx
>-PORTVERSION=	3.0.2
>-PORTREVISION?=	7
>+PORTVERSION=	3.0.3.1
> CATEGORIES=	x11-toolkits
>-MASTER_SITES=	SF/wxwindows/${PORTVERSION}
> PKGNAMESUFFIX=	30-gtk2
> DISTNAME=	wxWidgets-${PORTVERSION}
>+DISTVERSIONPREFIX=v
> 
> MAINTAINER=	portmaster@bsdforge.com
> COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	wxWidgets
>+GH_PROJECT=	wxWidgets
>+
> LIB_DEPENDS=	libpng.so:graphics/png \
> 		libtiff.so:graphics/tiff \
> 		libexpat.so:textproc/expat2
> 
>-USES=		compiler:c++11-lib gmake iconv jpeg pkgconfig tar:bzip2
>+USES=		compiler:c++11-lib gmake iconv jpeg pkgconfig
> USE_XORG=	x11 sm xxf86vm xinerama
> USE_GL=		glu
> USE_GNOME=	gtk20
>@@ -28,7 +31,13 @@
> 		--with-expat=sys \
> 		--with-opengl \
> 		--with-gtk \
>+		--without-gnomevfs \
>+		--disable-epollloop \
>+		--disable-joystick \
> 		--enable-backtrace \
>+		--enable-ipv6 \
>+		--enable-optimise \
>+		--enable-utf8 \
> 		--enable-graphics_ctx \
> 		--enable-compat26 \
> 		--enable-compat28
>@@ -44,10 +53,10 @@
> MSPACK_DESC=	Microsoft archives support
> OPTIONS_SUB=	yes
> 
>-NLS_USES=	gettext
>+NLS_USES=	gettext-tools
> 
> GSTREAMER_CONFIGURE_ENABLE=	mediactrl
>-GSTREAMER_USE=	GNOME=gconf2 GSTREAMER=yes
>+GSTREAMER_USE=	GNOME=gconf2 GSTREAMER1=yes
> 
> MSPACK_CONFIGURE_WITH=	libmspack
> MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack
>@@ -62,4 +71,7 @@
> CONFIGURE_ARGS+=--disable-precomp-headers
> .endif
> 
>+post-build-NLS-on:
>+	(cd ${WRKSRC}/locale/ && gmake allmo)
>+
> .include <bsd.port.post.mk>
>Index: x11-toolkits/wxgtk30/distinfo
>===================================================================
>--- x11-toolkits/wxgtk30/distinfo	(revision 453470)
>+++ x11-toolkits/wxgtk30/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (wxWidgets-3.0.2.tar.bz2) = 346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d
>-SIZE (wxWidgets-3.0.2.tar.bz2) = 20172909
>+TIMESTAMP = 1503270060
>+SHA256 (wxWidgets-3.0.3.1_GH0.tar.gz) = f94d4d2713a7ba2778677e2c26c61ac8f6e4be711bde6f88747662d093d899bc
>+SIZE (wxWidgets-3.0.3.1_GH0.tar.gz) = 24578618
>Index: x11-toolkits/wxgtk30/files/patch-src_stc_scintilla_src_Editor.cxx
>===================================================================
>--- x11-toolkits/wxgtk30/files/patch-src_stc_scintilla_src_Editor.cxx	(revision 453470)
>+++ x11-toolkits/wxgtk30/files/patch-src_stc_scintilla_src_Editor.cxx	(nonexistent)
>@@ -1,10 +0,0 @@
>---- src/stc/scintilla/src/Editor.cxx.orig	2014-10-06 21:33:44 UTC
>-+++ src/stc/scintilla/src/Editor.cxx
>-@@ -16,6 +16,7 @@
>- #include <map>
>- #include <algorithm>
>- #include <memory>
>-+#include <cmath>
>- 
>- #include "Platform.h"
>- 
>Index: x11-toolkits/wxgtk30/pkg-plist
>===================================================================
>--- x11-toolkits/wxgtk30/pkg-plist	(revision 453470)
>+++ x11-toolkits/wxgtk30/pkg-plist	(working copy)
>@@ -425,9 +425,9 @@
> include/wx-3.0/wx/preferences.h
> include/wx-3.0/wx/print.h
> include/wx-3.0/wx/printdlg.h
>-include/wx-3.0/wx/prntbase.h
> include/wx-3.0/wx/private/pipestream.h
> include/wx-3.0/wx/private/streamtempinput.h
>+include/wx-3.0/wx/prntbase.h
> include/wx-3.0/wx/process.h
> include/wx-3.0/wx/progdlg.h
> include/wx-3.0/wx/propdlg.h
>@@ -712,53 +712,59 @@
> include/wx-3.0/wx/zstream.h
> lib/libwx_baseu-3.0.so
> lib/libwx_baseu-3.0.so.0
>-lib/libwx_baseu-3.0.so.0.2.0
>+lib/libwx_baseu-3.0.so.0.3.0
> lib/libwx_baseu_net-3.0.so
> lib/libwx_baseu_net-3.0.so.0
>-lib/libwx_baseu_net-3.0.so.0.2.0
>+lib/libwx_baseu_net-3.0.so.0.3.0
> lib/libwx_baseu_xml-3.0.so
> lib/libwx_baseu_xml-3.0.so.0
>-lib/libwx_baseu_xml-3.0.so.0.2.0
>+lib/libwx_baseu_xml-3.0.so.0.3.0
> lib/libwx_gtk2u_adv-3.0.so
> lib/libwx_gtk2u_adv-3.0.so.0
>-lib/libwx_gtk2u_adv-3.0.so.0.2.0
>+lib/libwx_gtk2u_adv-3.0.so.0.3.0
> lib/libwx_gtk2u_aui-3.0.so
> lib/libwx_gtk2u_aui-3.0.so.0
>-lib/libwx_gtk2u_aui-3.0.so.0.2.0
>+lib/libwx_gtk2u_aui-3.0.so.0.3.0
> lib/libwx_gtk2u_core-3.0.so
> lib/libwx_gtk2u_core-3.0.so.0
>-lib/libwx_gtk2u_core-3.0.so.0.2.0
>+lib/libwx_gtk2u_core-3.0.so.0.3.0
> lib/libwx_gtk2u_gl-3.0.so
> lib/libwx_gtk2u_gl-3.0.so.0
>-lib/libwx_gtk2u_gl-3.0.so.0.2.0
>+lib/libwx_gtk2u_gl-3.0.so.0.3.0
> lib/libwx_gtk2u_html-3.0.so
> lib/libwx_gtk2u_html-3.0.so.0
>-lib/libwx_gtk2u_html-3.0.so.0.2.0
>+lib/libwx_gtk2u_html-3.0.so.0.3.0
> %%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so
> %%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so.0
>-%%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so.0.2.0
>+%%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so.0.3.0
> lib/libwx_gtk2u_propgrid-3.0.so
> lib/libwx_gtk2u_propgrid-3.0.so.0
>-lib/libwx_gtk2u_propgrid-3.0.so.0.2.0
>+lib/libwx_gtk2u_propgrid-3.0.so.0.3.0
> lib/libwx_gtk2u_qa-3.0.so
> lib/libwx_gtk2u_qa-3.0.so.0
>-lib/libwx_gtk2u_qa-3.0.so.0.2.0
>+lib/libwx_gtk2u_qa-3.0.so.0.3.0
> lib/libwx_gtk2u_ribbon-3.0.so
> lib/libwx_gtk2u_ribbon-3.0.so.0
>-lib/libwx_gtk2u_ribbon-3.0.so.0.2.0
>+lib/libwx_gtk2u_ribbon-3.0.so.0.3.0
> lib/libwx_gtk2u_richtext-3.0.so
> lib/libwx_gtk2u_richtext-3.0.so.0
>-lib/libwx_gtk2u_richtext-3.0.so.0.2.0
>+lib/libwx_gtk2u_richtext-3.0.so.0.3.0
> lib/libwx_gtk2u_stc-3.0.so
> lib/libwx_gtk2u_stc-3.0.so.0
>-lib/libwx_gtk2u_stc-3.0.so.0.2.0
>+lib/libwx_gtk2u_stc-3.0.so.0.3.0
> %%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so
> %%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so.0
>-%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so.0.2.0
>+%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so.0.3.0
> lib/libwx_gtk2u_xrc-3.0.so
> lib/libwx_gtk2u_xrc-3.0.so.0
>-lib/libwx_gtk2u_xrc-3.0.so.0.2.0
>+lib/libwx_gtk2u_xrc-3.0.so.0.3.0
> lib/wx/include/gtk2-unicode-3.0/wx/setup.h
>+share/aclocal/wxwin30.m4
>+share/bakefile/presets/wx30.bkl
>+share/bakefile/presets/wx30_presets.py
>+share/bakefile/presets/wx30_unix.bkl
>+share/bakefile/presets/wx30_win32.bkl
>+share/bakefile/presets/wx30_xrc.bkl
> %%NLS%%share/locale/ca/LC_MESSAGES/wxstd30.mo
> %%NLS%%share/locale/cs/LC_MESSAGES/wxstd30.mo
> %%NLS%%share/locale/da/LC_MESSAGES/wxstd30.mo
>@@ -781,9 +787,3 @@
> %%NLS%%share/locale/uk/LC_MESSAGES/wxstd30.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/wxstd30.mo
> %%NLS%%share/locale/zh_TW/LC_MESSAGES/wxstd30.mo
>-share/aclocal/wxwin30.m4
>-share/bakefile/presets/wx30.bkl
>-share/bakefile/presets/wx30_presets.py
>-share/bakefile/presets/wx30_unix.bkl
>-share/bakefile/presets/wx30_win32.bkl
>-share/bakefile/presets/wx30_xrc.bkl

Actions: View | Diff

Attachments on bug 220932: 184611 | 185617 | 187866 | 188077 | 188476 | 188688 | 188689