From 153001836aa35f1d4dc206e368d0b239acd8b872 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Thu, 20 Nov 2014 11:11:11 +0100
Subject: [PATCH] wxWidgets: update to 3.0.2
Add patch to avoid conflict with wxWidgets 2.8 branch.
The patch is based on the Gentoo one, adapted for Void.
---
.../wxWidgets/patches/wxGTK-collision.patch | 79 +++++++++++++++++++
srcpkgs/wxWidgets/template | 14 ++--
2 files changed, 86 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/wxWidgets/patches/wxGTK-collision.patch
diff --git a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch
new file mode 100644
index 00000000000..0128f032e2e
--- /dev/null
+++ b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch
@@ -0,0 +1,79 @@
+diff -Naur Makefile.in Makefile.in
+--- Makefile.in 2014-10-06 23:33:44.000000000 +0200
++++ Makefile.in 2014-11-19 10:48:18.752319058 +0100
+@@ -15258,9 +15258,11 @@
+
+ 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)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin3.m4)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ $(DYLIB_RPATH_INSTALL)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+@@ -16145,7 +16147,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -16153,7 +16155,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+@@ -16170,7 +16172,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/msw/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+diff -Naur build/bakefiles/wx.bkl build/bakefiles/wx.bkl
+--- build/bakefiles/wx.bkl 2014-10-06 23:33:44.000000000 +0200
++++ build/bakefiles/wx.bkl 2014-11-19 10:32:21.692283955 +0100
+@@ -137,7 +137,7 @@
+ <using module="gettext"/>
+ <gettext-catalogs id="locale">
+ <srcdir>$(SRCDIR)/locale</srcdir>
+- <catalog-name>wxstd</catalog-name>
++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+ <linguas>
+ ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+ zh zh_CN zh_TW
+diff -Naur src/common/translation.cpp src/common/translation.cpp
+--- src/common/translation.cpp 2014-10-06 23:33:44.000000000 +0200
++++ src/common/translation.cpp 2014-11-19 11:02:21.067788665 +0100
+@@ -1471,7 +1471,7 @@
+
+ bool wxTranslations::AddStdCatalog()
+ {
+- if ( !AddCatalog(wxS("wxstd")) )
++ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
+ return false;
+
+ // there may be a catalog with toolkit specific overrides, it is not
+diff -Naur utils/wxrc/Makefile.in utils/wxrc/Makefile.in
+--- utils/wxrc/Makefile.in 2014-10-06 23:33:44.000000000 +0200
++++ utils/wxrc/Makefile.in 2014-11-19 10:49:55.410110669 +0100
+@@ -125,7 +125,6 @@
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template
index ea2b19d912c..a27abc5d6ab 100644
--- a/srcpkgs/wxWidgets/template
+++ b/srcpkgs/wxWidgets/template
@@ -1,25 +1,25 @@
# Template file for 'wxWidgets'
-pkgname="wxWidgets"
-version=3.0.1
-revision=2
+pkgname=wxWidgets
+version=3.0.2
+revision=1
build_style=gnu-configure
-configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack --with-libnotify --enable-mediactrl"
+configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
+ --with-libnotify --enable-mediactrl"
short_desc="The wxWidgets GUI toolkit library (version 3)"
maintainer="Martin Riese <grauehaare@gmx.de>"
-license="wxWindows Library Licence"
+license="wxWindows"
homepage="http://www.wxwidgets.org/"
hostmakedepends="pkg-config"
makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libnotify-devel
libXinerama-devel libmspack-devel SDL-devel glu-devel gst-plugins-base-devel"
distfiles="${SOURCEFORGE_SITE}/wxwindows/${version}/${pkgname}-${version}.tar.bz2"
-checksum=bd671b79ec56af8fb3844e11cafceac1a4276fb02c79404d06b91b6c19d2c5f5
+checksum=346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d
# Cross compiling works, but then wx-config is wrong for native builds
# on target.
nocross=yes
wxWidgets-devel_package() {
- conflicts="wxGTK-devel>=0"
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {