Update to 3.1.5

3 files changed, 43 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c7622a0eec7..170fcde253d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wxwidgets-dev-light
 	pkgdesc = wxWidgets suite for Base and GTK2 and GTK3 toolkits . Development branch (GNOME/GStreamer free!)
-	pkgver = 3.1.4
+	pkgver = 3.1.5
 	pkgrel = 1
 	url = http://wxwidgets.org
 	arch = x86_64
@@ -11,42 +11,43 @@ pkgbase = wxwidgets-dev-light
 	makedepends = gtk2
 	makedepends = gtk3
 	makedepends = libsm
-	makedepends = libgl
 	makedepends = libnotify
-	source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.1.4
+	makedepends = curl
+	makedepends = libsecret
+	makedepends = libxtst
+	source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.1.5
 	source = make-abicheck-non-fatal.patch
 	source = git+https://github.com/wxWidgets/Catch.git
 	source = wxGTK-collision.patch
 	sha256sums = SKIP
+	sha256sums = 214c2d9211e3505e94008747352f5fa07203d4d9087535985a1b6084d4e40ac7
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 7b41947bc72bf8d6edae67837d854390555cc5afc48dda618efd3021b5f6d7a8
 
 pkgname = wxbase-dev-light
 	pkgdesc = wxWidgets Base. Development branch (GNOME/GStreamer free!)
-	depends = wxcommon-light
-	depends = bash
 	depends = expat
-	depends = zlib
+	depends = curl
+	depends = libsecret
 	provides = wxbase-dev
 	conflicts = wxbase-dev
 	options = !emptydirs
 
 pkgname = wxgtk2-dev-light
 	pkgdesc = wxWidgets GTK2 Toolkit. Development branch (GNOME/GStreamer free!)
-	depends = wxcommon-light
-	depends = libgl
+	depends = wxcommon-dev-light
 	depends = gtk2
 	depends = libsm
 	depends = sdl2
 	depends = libnotify
+	depends = libxtst
 	provides = wxgtk2-dev
 	conflicts = wxgtk2-dev
 	options = !emptydirs
 
 pkgname = wxgtk3-dev-light
 	pkgdesc = wxWidgets GTK3 Toolkit. Development branch (GNOME/GStreamer free!)
-	depends = wxcommon-light
+	depends = wxcommon-dev-light
 	depends = gtk3
 	depends = libsm
 	depends = sdl2
@@ -57,7 +58,7 @@ pkgname = wxgtk3-dev-light
 
 pkgname = wxcommon-dev-light
 	pkgdesc = wxWidgets common. Development branch (GNOME/GStreamer free!)
-	depends = wxbase-light
+	depends = wxbase-dev-light
 	provides = wxgtk-common-dev
 	conflicts = wxgtk-common-dev
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 80589f2ea042..60a85f510d0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('wxbase-dev-light'
          'wxgtk3-dev-light'
          'wxcommon-dev-light'
          )
-pkgver=3.1.4
+pkgver=3.1.5
 pkgrel=1
 pkgdesc="wxWidgets suite for Base and GTK2 and GTK3 toolkits . Development branch (GNOME/GStreamer free!)"
 arch=('x86_64')
@@ -18,8 +18,10 @@ makedepends=('git'
              'gtk2'
              'gtk3'
              'libsm'
-             'libgl'
              'libnotify'
+             'curl'
+             'libsecret'
+             'libxtst'
              )
 source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}"
         'make-abicheck-non-fatal.patch'
@@ -27,9 +29,9 @@ source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver
         'wxGTK-collision.patch'
         )
 sha256sums=('SKIP'
+            '214c2d9211e3505e94008747352f5fa07203d4d9087535985a1b6084d4e40ac7'
             'SKIP'
-            'SKIP'
-            'SKIP'
+            '7b41947bc72bf8d6edae67837d854390555cc5afc48dda618efd3021b5f6d7a8'
             )
 
 prepare() {
@@ -94,51 +96,51 @@ build() {
 
 package_wxbase-dev-light() {
   pkgdesc="wxWidgets Base. Development branch (GNOME/GStreamer free!)"
-  depends=('wxcommon-light'
-           'bash'
-           'expat'
-           'zlib'
+  depends=('expat'
+           'curl'
+           'libsecret'
            )
   provides=('wxbase-dev')
   conflicts=('wxbase-dev')
   options=('!emptydirs')
 
   make -C build-base DESTDIR="${pkgdir}" install
+  make -C build-gtk2 DESTDIR="${pkgdir}" locale_uninstall
 
   mv "${pkgdir}/usr/bin/wx-config-3.1" "${pkgdir}/usr/bin/wx-config-base-3.1"
   rm -fr "${pkgdir}/usr/include"
-  rm -fr "${pkgdir}/usr/share"
+  rm -fr "${pkgdir}/usr/share/bakefile"
 
   install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxbase-dev-light/LICENSE"
 }
 
 package_wxgtk2-dev-light() {
   pkgdesc="wxWidgets GTK2 Toolkit. Development branch (GNOME/GStreamer free!)"
-  depends=('wxcommon-light'
-           'libgl'
+  depends=('wxcommon-dev-light'
            'gtk2'
            'libsm'
            'sdl2'
            'libnotify'
+           'libxtst'
            )
   provides=('wxgtk2-dev')
   conflicts=('wxgtk2-dev')
   options=('!emptydirs')
 
   make -C build-gtk2 DESTDIR="${pkgdir}" install
+  make -C build-gtk2 DESTDIR="${pkgdir}" uninstall_basedll uninstall_netdll uninstall_xmldll locale_uninstall
+  make -C build-gtk2/utils DESTDIR="${pkgdir}" uninstall_wxrc
 
   cp -P "${pkgdir}/usr/bin/wx-config-3.1" "${pkgdir}/usr/bin/wx-config-gtk2-3.1"
-  rm -fr "${pkgdir}/usr/bin/"wxrc{,-3.1}
   rm -fr "${pkgdir}/usr/include"
-  rm -fr "${pkgdir}/usr/lib/"*baseu*
-  rm -fr "${pkgdir}/usr/share"
+  rm -fr "${pkgdir}/usr/share/bakefile"
 
   install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxgtk2-dev-light/LICENSE"
 }
 
 package_wxgtk3-dev-light() {
   pkgdesc="wxWidgets GTK3 Toolkit. Development branch (GNOME/GStreamer free!)"
-  depends=('wxcommon-light'
+  depends=('wxcommon-dev-light'
            'gtk3'
            'libsm'
            'sdl2'
@@ -149,19 +151,19 @@ package_wxgtk3-dev-light() {
   options=('!emptydirs')
 
   make -C build-gtk3 DESTDIR="${pkgdir}" install
+  make -C build-gtk3 DESTDIR="${pkgdir}" uninstall_basedll uninstall_netdll uninstall_xmldll locale_uninstall
+  make -C build-gtk3/utils DESTDIR="${pkgdir}" uninstall_wxrc
 
   mv "${pkgdir}/usr/bin/wx-config-3.1" "${pkgdir}/usr/bin/wx-config-gtk3-3.1"
-  rm -fr "${pkgdir}/usr/bin/"wxrc{,-3.1}
   rm -fr "${pkgdir}/usr/include"
-  rm -fr "${pkgdir}/usr/lib/"*baseu*
-  rm -fr "${pkgdir}/usr/share"
+  rm -fr "${pkgdir}/usr/share/bakefile"
 
   install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxgtk3-dev-light/LICENSE"
 }
 
 package_wxcommon-dev-light() {
   pkgdesc="wxWidgets common. Development branch (GNOME/GStreamer free!)"
-  depends=('wxbase-light')
+  depends=('wxbase-dev-light')
   provides=('wxgtk-common-dev')
   conflicts=('wxgtk-common-dev')
   options=('!emptydirs')
@@ -172,7 +174,6 @@ package_wxcommon-dev-light() {
 
   rm -fr "${pkgdir}/usr/bin/wx-config-3.1"
   rm -fr "${pkgdir}/usr/lib"
-  rm -fr "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
 
   install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxcommon-dev-light/LICENSE"
 }
diff --git a/wxGTK-collision.patch b/wxGTK-collision.patch
index f189837050cf..46fc11dc32fe 100644
--- a/wxGTK-collision.patch
+++ b/wxGTK-collision.patch
@@ -1,18 +1,9 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with app-eselect/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -13814,10 +13814,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
  all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname)
 
- 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_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install
+ 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_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install
 -	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
 -	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
@@ -32,44 +23,15 @@ Prevent file collisions between multiple installed SLOTs.
 
  locale_install:
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -14721,7 +14721,7 @@ locale_install:
- 	$(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
-
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -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
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1522,7 +1522,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
-
- 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 --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
+index 9b24d92a79..a189dcb454 100644
 --- a/utils/wxrc/Makefile.in
 +++ b/utils/wxrc/Makefile.in
-@@ -121,7 +121,6 @@ distclean: clean
- @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))
+@@ -126,6 +126,7 @@ distclean: clean
 
  @COND_USE_XRC_1@uninstall_wxrc:
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
+ @COND_USE_XRC_1@       rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
++@COND_USE_XRC_1@       rm -f $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT)
+
+ wxrc_wxrc.o: $(srcdir)/wxrc.cpp
+        $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp