Ahead of ubuntu's version.

2 files changed, 26 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1dabb91d886f..8ff2f060b8a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Mar 13 07:08:55 UTC 2016
+# Sun May 29 18:20:57 UTC 2016
 pkgbase = gtk3-ubuntu-multilib
 	pkgdesc = GObject-based multi-platform toolkit with Canonical patchset (multarch)
-	pkgver = 3.18.8
-	pkgrel = 4
+	pkgver = 3.20.3
+	pkgrel = 5
 	url = https://launchpad.net/ubuntu/+source/gtk+3.0/
 	arch = i686
 	arch = x86_64
@@ -11,11 +11,11 @@ pkgbase = gtk3-ubuntu-multilib
 	depends = adwaita-icon-theme
 	depends = gtk-update-icon-cache
 	depends = shared-mime-info
-	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/3.18/gtk+-3.18.8.tar.xz
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_3.18.8-1ubuntu2.debian.tar.xz
+	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/3.20/gtk+-3.20.3.tar.xz
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_3.18.9-1ubuntu3.debian.tar.xz
 	source = settings.ini
-	sha256sums = 1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8
-	sha256sums = cb878e3816b5dd8cbee7133efeb4de60430e4e46855191a6badfd5b61100fb01
+	sha256sums = 3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694
+	sha256sums = 42ed3bb7e66394612a0eeb25e75004f80ad7bcb580b999f65025341406b00733
 	sha256sums = 14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119
 
 pkgname = lib32-gtk3-ubuntu-multilib
@@ -41,9 +41,9 @@ pkgname = lib32-gtk3-ubuntu-multilib
 	depends = lib32-libxkbcommon
 	depends = lib32-libx11
 	depends = lib32-libxext
-	provides = lib32-gtk3=3.18.8
-	provides = lib32-gtk3-ubuntu=3.18.8
-	provides = lib32-gtk-update-icon-cache=3.18.8
+	provides = lib32-gtk3=3.20.3
+	provides = lib32-gtk3-ubuntu=3.20.3
+	provides = lib32-gtk-update-icon-cache=3.20.3
 	conflicts = lib32-gtk3
 	conflicts = lib32-gtk3-ubuntu
 	conflicts = lib32-gtk-update-icon-cache
@@ -70,9 +70,9 @@ pkgname = gtk3-ubuntu-multilib
 	depends = libxkbcommon
 	depends = libx11
 	depends = libxext
-	provides = gtk3=3.18.8
-	provides = gtk3-ubuntu=3.18.8
-	provides = gtk-update-icon-cache=3.18.8
+	provides = gtk3=3.20.3
+	provides = gtk3-ubuntu=3.20.3
+	provides = gtk-update-icon-cache=3.20.3
 	conflicts = gtk3
 	conflicts = gtk3-ubuntu
 	conflicts = gtk-update-icon-cache
diff --git a/PKGBUILD b/PKGBUILD
index 9d470a4333e2..c9a858ceb351 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,20 @@
 
 pkgbase=gtk3-ubuntu-multilib
 pkgname=({lib32-,}gtk3-ubuntu-multilib)
-pkgver=3.18.8
-_debrel=1ubuntu2
-pkgrel=4
+ubuntuver=3.18.9
+pkgver=3.20.3
+_debrel=1ubuntu3
+pkgrel=5
 pkgdesc="GObject-based multi-platform toolkit with Canonical patchset (multarch)"
 depends=(adwaita-icon-theme gtk-update-icon-cache shared-mime-info)
 arch=(i686 x86_64)
 url="https://launchpad.net/ubuntu/+source/gtk+3.0/"
 license=(LGPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
-        https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_$pkgver-$_debrel.debian.tar.xz
+        https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_$ubuntuver-$_debrel.debian.tar.xz
         settings.ini)
-sha256sums=('1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8'
-            'cb878e3816b5dd8cbee7133efeb4de60430e4e46855191a6badfd5b61100fb01'
+sha256sums=('3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694'
+            '42ed3bb7e66394612a0eeb25e75004f80ad7bcb580b999f65025341406b00733'
             '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
 
 prepare() {
@@ -24,6 +25,12 @@ prepare() {
 
   # Apply Patches
   for i in $(grep -v '#' "$srcdir/debian/patches/series" | sort); do
+    [[ "${i}" =~ ^# || -z "${i}" || "${i}" == *git* ]] && continue # Skip comments, newlines, and git patches
+    [[ "${i}" == message-dialog-restore-traditional-look-on-unity.patch ]] && continue
+    [[ "${i}" == uimanager-guard-against-nested-node-updates.patch ]] && continue
+    [[ "${i}" == unity-border-radius.patch ]] && continue
+    [[ "${i}" == unity-headerbar-maximized-mode.patch ]] && continue
+    [[ "${i}" == x-canonical-accel.patch ]] && continue
     msg2 "Applying $i ..."
     patch -p1 -i "$srcdir/debian/patches/$i"
   done