Update to 3.0.4

2 files changed, 19 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47deb989cb36..d96b873f39c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Aug  5 14:56:30 UTC 2017
+# Thu Apr 12 13:41:36 UTC 2018
 pkgbase = lib32-wxwidgets-light
 	pkgdesc = wxWidgets suite for Base and GTK2 and GTK3 toolkits (GNOME/GStreamer free!) (32 bits)
-	pkgver = 3.0.3
-	pkgrel = 3
+	pkgver = 3.0.4
+	pkgrel = 1
 	url = http://wxwidgets.org
 	arch = x86_64
 	license = custom:wxWindows
@@ -16,7 +16,8 @@ pkgbase = lib32-wxwidgets-light
 	makedepends = lib32-sdl
 	makedepends = lib32-expat
 	makedepends = lib32-zlib
-	source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.0.3
+	makedepends = lib32-libnotify
+	source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.0.4
 	source = lib32-make-abicheck-non-fatal.patch
 	source = lib32-wxwidgets-collision.patch
 	sha256sums = SKIP
@@ -41,6 +42,7 @@ pkgname = lib32-wxgtk2-light
 	depends = lib32-gtk2
 	depends = lib32-libsm
 	depends = lib32-sdl2
+	depends = lib32-libnotify
 	provides = lib32-wxgtk
 	provides = lib32-wxgtk2
 	conflicts = lib32-wxgtk
@@ -54,6 +56,7 @@ pkgname = lib32-wxgtk3-light
 	depends = lib32-gtk3
 	depends = lib32-libsm
 	depends = lib32-sdl2
+	depends = lib32-libnotify
 	provides = lib32-wxgtk3
 	conflicts = lib32-wxgtk3
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 00466d3793f5..636cee841752 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ pkgname=('lib32-wxbase-light'
          'lib32-wxgtk3-light'
          'lib32-wxcommon-light'
          )
-pkgver=3.0.3
-pkgrel=3
+pkgver=3.0.4
+pkgrel=1
 pkgdesc="wxWidgets suite for Base and GTK2 and GTK3 toolkits (GNOME/GStreamer free!) (32 bits)"
 arch=('x86_64')
 url='http://wxwidgets.org'
@@ -21,6 +21,7 @@ makedepends=('lib32-gcc-libs'
              'lib32-sdl'
              'lib32-expat'
              'lib32-zlib'
+             'lib32-libnotify'
              )
 source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}"
         'lib32-make-abicheck-non-fatal.patch'
@@ -44,13 +45,11 @@ prepare() {
 }
 
 build() {
-
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  export CFLAGS="-I/usr/include/libtiff32 $CFLAGS"
-  export CXXFLAGS="-I/usr/include/libtiff32 $CXXFLAGS"
 
+  msg2 "Build WxBASE"
   cd "${srcdir}/build-base"
   ../wxwidgets/configure \
       --prefix=/usr \
@@ -62,6 +61,7 @@ build() {
   make
   make -C ../wxwidgets/locale allmo
 
+  msg2 "Build WxGTK2"
   cd "${srcdir}/build-gtk2"
   ../wxwidgets/configure \
       --prefix=/usr \
@@ -70,13 +70,14 @@ build() {
       --with-lib{jpeg,png,tiff,xpm}=sys \
       --with-regex=builtin \
       --with-{opengl,sdl} \
-      --enable-{unicode,graphics_ctx} \
-      --without-{libnotify,gnome{vfs,print}} \
+      --enable-graphics_ctx \
+      --without-gnomevfs \
       --disable-{precomp-headers,mediactrl,webview}
 
   make
   make -C ../wxwidgets/locale allmo
 
+  msg2 "Build WxGTK3"
   cd "${srcdir}/build-gtk3"
   ../wxwidgets/configure \
       --prefix=/usr \
@@ -85,8 +86,8 @@ build() {
       --with-lib{jpeg,png,tiff,xpm}=sys \
       --with-regex=builtin \
       --with-{opengl,sdl} \
-      --enable-{unicode,graphics_ctx} \
-      --without-{libnotify,gnome{vfs,print}} \
+      --enable-graphics_ctx \
+      --without-gnomevfs \
       --disable-{precomp-headers,mediactrl,webview}
 
   make
@@ -123,6 +124,7 @@ package_lib32-wxgtk2-light() {
            'lib32-gtk2'
            'lib32-libsm'
            'lib32-sdl2'
+           'lib32-libnotify'
            )
   provides=('lib32-wxgtk'
             'lib32-wxgtk2'
@@ -151,6 +153,7 @@ package_lib32-wxgtk3-light() {
            'lib32-gtk3'
            'lib32-libsm'
            'lib32-sdl2'
+           'lib32-libnotify'
            )
   provides=('lib32-wxgtk3')
   conflicts=('lib32-wxgtk3')