v3.2.2.1

3 files changed, 147 insertions, 109 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9905e61ab1b..2f30682d7b24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,43 @@
 pkgbase = wxwidgets-dev-light
 	pkgdesc = wxWidgets suite for Base, GTK2 and GTK3 toolkits . Development branch (GNOME/GStreamer free!)
-	pkgver = 3.1.6
+	pkgver = 3.2.2.1
 	pkgrel = 1
-	url = http://wxwidgets.org
+	url = https://github.com/wxWidgets/wxWidgets
 	arch = x86_64
 	license = custom:wxWindows
+	makedepends = bash
+	makedepends = curl
 	makedepends = git
 	makedepends = glu
-	makedepends = bash
 	makedepends = gtk2
 	makedepends = gtk3
-	makedepends = libsm
 	makedepends = libnotify
-	makedepends = curl
 	makedepends = libsecret
+	makedepends = libsm
 	makedepends = libxtst
 	options = debug
-	source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.1.6
-	source = wxgtk-abicheck.patch
-	source = git+https://github.com/wxWidgets/Catch.git
-	source = git+https://github.com/wxWidgets/pcre.git
-	source = git+https://github.com/wxWidgets/nanosvg.git
+	source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets#tag=v3.2.2.1
+	source = catch::git+https://github.com/wxWidgets/Catch
+	source = expat::git+https://github.com/wxWidgets/libexpat
+	source = jpeg::git+https://github.com/wxWidgets/libjpeg-turbo
+	source = nanosvg::git+https://github.com/wxWidgets/nanosvg
+	source = pcre::git+https://github.com/wxWidgets/pcre
+	source = png::git+https://github.com/wxWidgets/libpng
+	source = tiff::git+https://github.com/wxWidgets/libtiff
+	source = zlib::git+https://github.com/wxWidgets/zlib
 	source = wxGTK-collision.patch
+	source = wxgtk-abicheck.patch
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 81d596168253b05a36758235b054542f53e00e488a20da60f458126d46992ce3
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 605df102a0f1610ab37c5294166644de0d17592d806147b0fb283cb5c3ce172e
+	sha256sums = 81d596168253b05a36758235b054542f53e00e488a20da60f458126d46992ce3
 
 pkgname = wxgtk2-dev-light
 	pkgdesc = wxWidgets GTK2 Toolkit. Development branch (GNOME/GStreamer free!)
diff --git a/.gitignore b/.gitignore
index 1038c8ed3357..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 *
-!.gitignore
-!.SRCINFO
 !PKGBUILD
-!wxGTK-collision.patch
-!wxgtk-abicheck.patch
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 0f6b31282e06..5f9aa8a58c79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,61 @@
-# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
+# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgbase=wxwidgets-dev-light
-pkgname=('wxgtk2-dev-light'
-         'wxgtk3-dev-light'
-         'wxcommon-dev-light'
-         )
-pkgver=3.1.6
+pkgname=(
+  'wxgtk2-dev-light'
+  'wxgtk3-dev-light'
+  'wxcommon-dev-light'
+)
+pkgver=3.2.2.1
+_shortver=$(sed -E -e 's@^([0-9]+\.[0-9]+).*$@\1@' <(echo $pkgver))
 pkgrel=1
 pkgdesc="wxWidgets suite for Base, GTK2 and GTK3 toolkits . Development branch (GNOME/GStreamer free!)"
 arch=('x86_64')
-url='http://wxwidgets.org'
+# http://wxwidgets.org
+url="https://github.com/wxWidgets/wxWidgets"
 license=('custom:wxWindows')
-makedepends=('git'
-             'glu'
-             'bash'
-             'gtk2'
-             'gtk3'
-             'libsm'
-             'libnotify'
-             'curl'
-             'libsecret'
-             'libxtst'
-             )
-source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}"
-        'wxgtk-abicheck.patch'
-        'git+https://github.com/wxWidgets/Catch.git'
-        'git+https://github.com/wxWidgets/pcre.git'
-        'git+https://github.com/wxWidgets/nanosvg.git'
-        'wxGTK-collision.patch'
-        )
-sha256sums=('SKIP'
-            '81d596168253b05a36758235b054542f53e00e488a20da60f458126d46992ce3'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            '605df102a0f1610ab37c5294166644de0d17592d806147b0fb283cb5c3ce172e'
-            )
+makedepends=(
+  'bash'
+  'curl'
+  'git'
+  'glu'
+  'gtk2'
+  'gtk3'
+  'libnotify'
+  'libsecret'
+  'libsm'
+  'libxtst'
+)
+source=(
+  "wxwidgets::git+$url#tag=v$pkgver"
+
+  "catch"::"git+https://github.com/wxWidgets/Catch"
+  "expat"::"git+https://github.com/wxWidgets/libexpat"
+  "jpeg"::"git+https://github.com/wxWidgets/libjpeg-turbo"
+  "nanosvg"::"git+https://github.com/wxWidgets/nanosvg"
+  "pcre"::"git+https://github.com/wxWidgets/pcre"
+  "png"::"git+https://github.com/wxWidgets/libpng"
+  "tiff"::"git+https://github.com/wxWidgets/libtiff"
+  "zlib"::"git+https://github.com/wxWidgets/zlib"
+
+  'wxGTK-collision.patch'
+  'wxgtk-abicheck.patch'
+)
+sha256sums=(
+  'SKIP'
+
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+
+  '605df102a0f1610ab37c5294166644de0d17592d806147b0fb283cb5c3ce172e'
+  '81d596168253b05a36758235b054542f53e00e488a20da60f458126d46992ce3'
+)
 options=('debug')
 
 prepare() {
@@ -43,23 +63,31 @@ prepare() {
 
   cd wxwidgets
 
-  git config submodule.3rdparty/catch.url "${srcdir}/Catch"
-  git config submodule.3rdparty/pcre.url "${srcdir}/pcre"
-  git config submodule.3rdparty/nanosvg.url "${srcdir}/nanosvg"
-  git submodule update --init \
-    3rdparty/catch \
-    3rdparty/pcre \
+  _submodules=(
+    src/expat
+    src/jpeg
+    src/png
+    src/tiff
+    src/zlib
+    3rdparty/catch
     3rdparty/nanosvg
-
-  patch -Np1 -i "${srcdir}/wxGTK-collision.patch"
-
-  # C++ ABI check is too strict
-  patch -Np1 -i "${srcdir}/wxgtk-abicheck.patch"
+    3rdparty/pcre
+  )
+  for submodule in ${_submodules[@]} ; do
+    git submodule init ${submodule}
+    git submodule set-url ${submodule} "${srcdir}/${submodule##*/}"
+    git -c protocol.file.allow=always submodule update ${submodule}
+  done
+
+  for p in "$srcdir"/*.patch ; do
+    echo "Applying patch: ${p##*/}"
+    patch -Np1 -i "$p"
+  done
 }
 
 build() {
-  msg2 "Build WxBASE"
-  cd "${srcdir}/build-base"
+  echo "Build WxBASE"
+  cd "$srcdir/build-base"
   ../wxwidgets/configure \
     --prefix=/usr \
     --libdir=/usr/lib \
@@ -69,8 +97,8 @@ build() {
   make
   make -C ../wxwidgets/locale allmo
 
-  msg2 "Build WxGTK2"
-  cd "${srcdir}/build-gtk2"
+  echo "Build WxGTK2"
+  cd "$srcdir/build-gtk2"
   ../wxwidgets/configure \
     --prefix=/usr \
     --libdir=/usr/lib \
@@ -85,8 +113,8 @@ build() {
   make
   make -C ../wxwidgets/locale allmo
 
-  msg2 "Build WxGTK3"
-  cd "${srcdir}/build-gtk3"
+  echo "Build WxGTK3"
+  cd "$srcdir/build-gtk3"
   ../wxwidgets/configure \
     --prefix=/usr \
     --libdir=/usr/lib \
@@ -104,77 +132,79 @@ build() {
 
 package_wxgtk2-dev-light() {
   pkgdesc="wxWidgets GTK2 Toolkit. Development branch (GNOME/GStreamer free!)"
-  depends=('wxcommon-dev-light'
-           'gtk2'
-           'libsm'
-           'sdl2'
-           'libnotify'
-           'libxtst'
-           )
+  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
+  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/include"
-  rm -fr "${pkgdir}/usr/share/bakefile"
+  cp -P "$pkgdir/usr/bin/wx-config-$_shortver" "$pkgdir/usr/bin/wx-config-gtk2-$_shortver"
+  rm -fr "$pkgdir/usr/include"
+  rm -fr "$pkgdir/usr/share/bakefile"
 
-  install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxgtk2-dev-light/LICENSE"
+  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-dev-light'
-           'gtk3'
-           'libsm'
-           'sdl2'
-           'libnotify'
-           )
+  depends=(
+    'wxcommon-dev-light'
+    'gtk3'
+    'libsm'
+    'sdl2'
+    'libnotify'
+  )
   provides=('wxgtk3-dev')
   conflicts=('wxgtk3-dev')
   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
+  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/include"
-  rm -fr "${pkgdir}/usr/share/bakefile"
+  mv "$pkgdir/usr/bin/wx-config-$_shortver" "$pkgdir/usr/bin/wx-config-gtk3-$_shortver"
+  rm -fr "$pkgdir/usr/include"
+  rm -fr "$pkgdir/usr/share/bakefile"
 
-  install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxgtk3-dev-light/LICENSE"
+  install -Dm644 wxwidgets/docs/licence.txt "$pkgdir/usr/share/licenses/wxgtk3-dev-light/LICENSE"
 }
 
 package_wxcommon-dev-light() {
   pkgdesc="wxWidgets common & base. Development branch (GNOME/GStreamer free!)"
   depends=('expat'
-           'curl'
-           'libsecret'
-           )
+    'curl'
+    'libsecret'
+  )
   provides=('wxbase-dev-light'
-            'wxbase-dev'
-            'wxgtk-common-dev'
-            )
+    'wxbase-dev'
+    'wxgtk-common-dev'
+  )
   conflicts=('wxbase-dev-light'
-             'wxbase-dev'
-             'wxgtk-common-dev'
-             )
+    'wxbase-dev'
+    'wxgtk-common-dev'
+  )
   options=('!emptydirs')
 
-  make -C build-gtk2 DESTDIR="${pkgdir}" install
-  make -C build-gtk3 DESTDIR="${pkgdir}" install
-  make -C build-base DESTDIR="${pkgdir}" install
+  make -C build-gtk2 DESTDIR="$pkgdir" install
+  make -C build-gtk3 DESTDIR="$pkgdir" install
+  make -C build-base DESTDIR="$pkgdir" install
 
-  make -C build-gtk2 DESTDIR="${pkgdir}" uninstall_advdll uninstall_auidll uninstall_coredll uninstall_gldll uninstall_htmldll uninstall_propgriddll uninstall_qadll uninstall_ribbondll uninstall_richtextdll uninstall_stcdll uninstall_xrcdll
-  make -C build-gtk3 DESTDIR="${pkgdir}" uninstall_advdll uninstall_auidll uninstall_coredll uninstall_gldll uninstall_htmldll uninstall_propgriddll uninstall_qadll uninstall_ribbondll uninstall_richtextdll uninstall_stcdll uninstall_xrcdll
+  make -C build-gtk2 DESTDIR="$pkgdir" uninstall_advdll uninstall_auidll uninstall_coredll uninstall_gldll uninstall_htmldll uninstall_propgriddll uninstall_qadll uninstall_ribbondll uninstall_richtextdll uninstall_stcdll uninstall_xrcdll
+  make -C build-gtk3 DESTDIR="$pkgdir" uninstall_advdll uninstall_auidll uninstall_coredll uninstall_gldll uninstall_htmldll uninstall_propgriddll uninstall_qadll uninstall_ribbondll uninstall_richtextdll uninstall_stcdll uninstall_xrcdll
 
-  mv "${pkgdir}/usr/bin/wx-config-3.1" "${pkgdir}/usr/bin/wx-config-base-3.1"
-  rm -fr "${pkgdir}/usr/bin/wxrc"
-  rm -fr "${pkgdir}/usr/lib/wx/"{config,include}/gtk*
+  mv "$pkgdir/usr/bin/wx-config-$_shortver" "$pkgdir/usr/bin/wx-config-base-$_shortver"
+  rm -fr "$pkgdir/usr/bin/wxrc"
+  rm -fr "$pkgdir/usr/lib/wx/"{config,include}/gtk*
 
-  install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxcommon-dev-light/LICENSE"
+  install -Dm644 wxwidgets/docs/licence.txt "$pkgdir/usr/share/licenses/wxcommon-dev-light/LICENSE"
 }