Add support for wxgtk over GTK3 and fix build with GCC 6.1.x

3 files changed, 53 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61c7ea5a99a3..1768f1381ff5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Apr 24 19:15:10 UTC 2016
+# Sun Jul 31 20:43:39 UTC 2016
 pkgbase = wxwidgets-light
 	pkgdesc = wxWidgets suite for Base and GTK2 toolkits (GNOME/GStreamer free!)
 	pkgver = 3.0.2
-	pkgrel = 6
+	pkgrel = 7
 	url = http://wxwidgets.org
 	arch = i686
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = wxwidgets-light
 	makedepends = glu
 	makedepends = bash
 	makedepends = gtk2
+	makedepends = gtk3
 	makedepends = libsm
 	makedepends = libgl
 	source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.0.2
@@ -19,7 +20,7 @@ pkgbase = wxwidgets-light
 	source = wx-config.sh
 	source = make-abicheck-non-fatal.patch
 	sha1sums = SKIP
-	sha1sums = 55436b5c57eae798f716e3e486c6834d6274cec5
+	sha1sums = fed3ad06526f2bccd3f3197c2b1fd3e96bf05685
 	sha1sums = 47df8d82e6c9671212428ea769ff4a3e3f725917
 	sha1sums = dfe38650c655395b90bf082b5734c4093508bfa3
 
@@ -33,9 +34,10 @@ pkgname = wxbase-light
 	options = !emptydirs
 
 pkgname = wxgtk-light
-	pkgdesc = wxWidgets GTK2 Toolkit (GNOME/GStreamer free!)
+	pkgdesc = wxWidgets GTK2 and GTK3 Toolkit (GNOME/GStreamer free!)
 	depends = wxbase-light
 	depends = gtk2
+	depends = gtk3
 	depends = libsm
 	depends = sdl
 	provides = wxgtk=3.0.2
diff --git a/PKGBUILD b/PKGBUILD
index 631cbee31390..f5050aa17d88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=wxwidgets-light
 pkgname=('wxbase-light' 'wxgtk-light' 'wxcommon-light')
 pkgver=3.0.2
-pkgrel=6
+pkgrel=7
 pkgdesc="wxWidgets suite for Base and GTK2 toolkits (GNOME/GStreamer free!)"
 arch=('i686' 'x86_64')
 url='http://wxwidgets.org'
@@ -12,6 +12,7 @@ makedepends=('git'
              'glu'
              'bash'
              'gtk2'
+             'gtk3'
              'libsm'
              'libgl'
              )
@@ -21,17 +22,22 @@ source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver
         'make-abicheck-non-fatal.patch'
         )
 sha1sums=('SKIP'
-          '55436b5c57eae798f716e3e486c6834d6274cec5'
+          'fed3ad06526f2bccd3f3197c2b1fd3e96bf05685'
           '47df8d82e6c9671212428ea769ff4a3e3f725917'
           'dfe38650c655395b90bf082b5734c4093508bfa3'
           )
 
 prepare() {
+  mkdir -p build-{base,gtk{2,3}}
+
+  cd wxwidgets
+
+  # Fix build with GCC 6.1.1
+  git cherry-pick 73e9e18ea09ffffcaac50237def0d9728a213c02
+
   # C++ ABI check is too strict and breaks with GCC 5.1
   # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
-  patch -d wxwidgets -Np1 -i ../make-abicheck-non-fatal.patch
-
-  mkdir -p build-{base,gtk}
+  patch -Np1 -i ../make-abicheck-non-fatal.patch
 }
 
 build() {
@@ -45,7 +51,7 @@ build() {
   make
   make -C ../wxwidgets/locale allmo
 
-  cd "${srcdir}/build-gtk"
+  cd "${srcdir}/build-gtk2"
   ../wxwidgets/configure \
     --prefix=/usr \
     --libdir=/usr/lib \
@@ -58,11 +64,28 @@ build() {
     --disable-{precomp-headers,mediactrl,webview}
   make
   make -C ../wxwidgets/locale allmo
+
+    cd "${srcdir}/build-gtk3"
+  ../wxwidgets/configure \
+    --prefix=/usr \
+    --libdir=/usr/lib \
+    --with-gtk='3' \
+    --with-lib{jpeg,png,tiff,xpm}='sys' \
+    --with-regex='builtin' \
+    --with-{opengl,sdl} \
+    --enable-{unicode,graphics_ctx} \
+    --without-{libnotify,gnome{vfs,print}} \
+    --disable-{precomp-headers,mediactrl,webview}
+  make
+  make -C ../wxwidgets/locale allmo
 }
 
 package_wxbase-light() {
   pkgdesc="wxWidgets Base (GNOME/GStreamer free!)"
-  depends=('wxcommon-light' 'expat' 'zlib')
+  depends=('wxcommon-light'
+           'expat'
+           'zlib'
+           )
   provides=("wxbase=${pkgver}")
   conflicts=('wxbase')
   options=('!emptydirs')
@@ -77,13 +100,21 @@ package_wxbase-light() {
 }
 
 package_wxgtk-light() {
-  pkgdesc="wxWidgets GTK2 Toolkit (GNOME/GStreamer free!)"
-  depends=('wxbase-light' 'gtk2' 'libsm' 'sdl')
+  pkgdesc="wxWidgets GTK2 and GTK3 Toolkit (GNOME/GStreamer free!)"
+  depends=('wxbase-light'
+           'gtk2'
+           'gtk3'
+           'libsm'
+           'sdl'
+           )
   provides=("wxgtk=${pkgver}")
   conflicts=('wxgtk')
   options=('!emptydirs')
 
-  make -C build-gtk DESTDIR="${pkgdir}" install
+  make -C build-gtk2 DESTDIR="${pkgdir}" install
+  rm -fr "${pkgdir}/usr/bin"
+
+  make -C build-gtk3 DESTDIR="${pkgdir}" install
 
   rm -fr "${pkgdir}/usr/bin/wx-config"
   rm -fr "${pkgdir}/usr/include"
@@ -102,13 +133,15 @@ package_wxcommon-light() {
   options=('!emptydirs')
   backup=('etc/wx/config')
 
-  make -C build-gtk DESTDIR="${pkgdir}" install
+  make -C build-gtk2 DESTDIR="${pkgdir}" install
+  rm -fr "${pkgdir}/usr/bin"
 
+  make -C build-gtk3 DESTDIR="${pkgdir}" install
   rm -fr "${pkgdir}/usr/bin"
 
   make -C build-base DESTDIR="${pkgdir}" install
-
   rm -fr "${pkgdir}/usr/bin"
+
   rm -fr "${pkgdir}/usr/lib"
 
   install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxcommon-light/LICENSE"
diff --git a/config.conf b/config.conf
index 57db6a5f6a32..3d4d28f19882 100644
--- a/config.conf
+++ b/config.conf
@@ -1,4 +1,5 @@
 # Set wx-config executable
 
 #wx=base-unicode-3.0
-wx=gtk2-unicode-3.0
+#wx=gtk2-unicode-3.0
+wx=gtk3-unicode-3.0