update to version 2.24.30+95+g876b5f7-1

4 files changed, 99 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02f8a3bacf66..61c167923f66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = gtk2-ubuntu
-	pkgdesc = GTK+ is a multi-platform toolkit (v2)
-	pkgver = 2.24.30
+	pkgdesc = GObject-based multi-platform GUI toolkit (legacy)
+	pkgver = 2.24.30+95+g876b5f7
 	pkgrel = 1
 	url = http://www.gtk.org/
 	install = gtk2.install
 	arch = i686
 	arch = x86_64
 	license = LGPL
-	makedepends = pkg-config
 	makedepends = gobject-introspection
+	makedepends = python2
+	makedepends = git
 	makedepends = gtk-doc
 	depends = atk
 	depends = pango
@@ -22,18 +23,21 @@ pkgbase = gtk2-ubuntu
 	depends = cairo
 	depends = libcups
 	depends = gtk-update-icon-cache
-	depends = python2
-	provides = gtk2=2.24.30
+	depends = librsvg
+	depends = desktop-file-utils
+	optdepends = gnome-themes-standard: Default widget theme
+	optdepends = adwaita-icon-theme: Default icon theme
+	provides = gtk2=2.24.30+95+g876b5f7
 	conflicts = gtk2
-	replaces = gtk2-docs
-	backup = etc/gtk-2.0/gtkrc
-	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.30.tar.xz
+	source = git://git.gnome.org/gtk+#commit=876b5f75faab5d8f3c60c3ec035b2ecd4ac5b67e
 	source = https://launchpad.net/ubuntu/+archive/primary/+files/gtk+2.0_2.24.30-1ubuntu1.debian.tar.xz
 	source = gtkrc
+	source = gtk-query-immodules-2.0.hook
 	source = xid-collision-debug.patch
-	sha512sums = 13373e4809b48acefdbf09f18f0f18b562f05b3ce2e3169c5aa80722a262405b3b4a220ecee54c59ef03ef89be9850dc659f6da9251abaf7c577599b7a4319b1
+	sha512sums = SKIP
 	sha512sums = d948b64130e3acc02743b212d7afa96cee0da1f9adb9855989749c33f53e1f5fcc3328e14d83e733699f2f3f9657f79efb01afcea6f06760a1b6eea9c65dbd75
-	sha512sums = fb18f1937b117f97da1650fda2561e231cb5da108a9c04f3b27c19205843ea16402b52d9693eca63a8464bdfb1e6a0aedf81958ee3de75ce12aca4cce078bf23
+	sha512sums = b124433dd4b20d1d62f073df87e253ca23b3b51625cce55f29a220a4369eda5108c0de07fdc686f570232322c3ff04f7758383f2be5aeace40f843907aa3696d
+	sha512sums = be7a807046f27e5796f6069dfd2c88f9b7508e3b9e209d97c1575e0d809b279aacacd0e1247f1f7643fa47eede2d987bf433cd17cea0524526ad31982ae8d90d
 	sha512sums = 89e3223c86731a76b12d39245f1ec4cf8b4860ab1d11d74a10e5deb0db302f20b4bb5d9034da1d8aeb96369dbdeddcdd2f28943270dc501476c694562b960159
 
 pkgname = gtk2-ubuntu
diff --git a/PKGBUILD b/PKGBUILD
index 569e89b73778..ae1e22526ab9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,93 +1,111 @@
-# Maintainer: Michael Healy <horsemanoffaith@gmail.com>
+# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Original Maintainer: György Balló <ballogy@freestart.hu>
+# Contributor: Christopher Reimer <github@creimer.net>
 
 # vercheck-pkgbuild: auto
-# vercheck-ubuntu: name=gtk+2.0, repo=wily
+# vercheck-ubuntu: name=gtk+2.0, repo=xenial
 # vercheck-archlinux: name=gtk2, repo=extra, arch=x86_64
 # vercheck-gnome: name=gtk+, majorver=2.24
 
 pkgname=gtk2-ubuntu
 _ubuntu_rel=1ubuntu1
-pkgver=2.24.30
+_ubuntu_ver=2.24.30
+pkgver=2.24.30+95+g876b5f7
 pkgrel=1
-pkgdesc="GTK+ is a multi-platform toolkit (v2)"
+pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 license=(LGPL)
 depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite
          libxdamage shared-mime-info cairo libcups gtk-update-icon-cache
-         python2)
-makedepends=(pkg-config gobject-introspection gtk-doc)
+         librsvg desktop-file-utils)
+makedepends=(gobject-introspection python2 git gtk-doc)
+optdepends=('gnome-themes-standard: Default widget theme'
+            'adwaita-icon-theme: Default icon theme')
 provides=("gtk2=${pkgver}")
 conflicts=(gtk2)
-replaces=(gtk2-docs)
-backup=(etc/gtk-2.0/gtkrc)
 install=gtk2.install
-source=("http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz"
+_commit=876b5f75faab5d8f3c60c3ec035b2ecd4ac5b67e
+source=("git://git.gnome.org/gtk+#commit=${_commit}"
         "https://launchpad.net/ubuntu/+archive/primary/+files/gtk+2.0_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.debian.tar.xz"
         gtkrc
+        gtk-query-immodules-2.0.hook
         xid-collision-debug.patch)
-sha512sums=('13373e4809b48acefdbf09f18f0f18b562f05b3ce2e3169c5aa80722a262405b3b4a220ecee54c59ef03ef89be9850dc659f6da9251abaf7c577599b7a4319b1'
+sha512sums=('SKIP'
             'd948b64130e3acc02743b212d7afa96cee0da1f9adb9855989749c33f53e1f5fcc3328e14d83e733699f2f3f9657f79efb01afcea6f06760a1b6eea9c65dbd75'
-            'fb18f1937b117f97da1650fda2561e231cb5da108a9c04f3b27c19205843ea16402b52d9693eca63a8464bdfb1e6a0aedf81958ee3de75ce12aca4cce078bf23'
+            'b124433dd4b20d1d62f073df87e253ca23b3b51625cce55f29a220a4369eda5108c0de07fdc686f570232322c3ff04f7758383f2be5aeace40f843907aa3696d'
+            'be7a807046f27e5796f6069dfd2c88f9b7508e3b9e209d97c1575e0d809b279aacacd0e1247f1f7643fa47eede2d987bf433cd17cea0524526ad31982ae8d90d'
             '89e3223c86731a76b12d39245f1ec4cf8b4860ab1d11d74a10e5deb0db302f20b4bb5d9034da1d8aeb96369dbdeddcdd2f28943270dc501476c694562b960159')
 
+pkgver() {
+  cd gtk+
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd "gtk+-${pkgver}"
+    cd gtk+
+
+    patch -p1 -i ../xid-collision-debug.patch
+    sed -i '1s/python$/&2/' gtk/gtk-builder-convert
 
-  patch -p1 -i ../xid-collision-debug.patch
+    local patches=(
+        004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
+        012_ubuntu-set-grab-add.patch
+        042_treeview_single-focus.patch
+        060_ignore-random-icons.patch
+        061_use_pdf_as_default_printing_standard.patch
+        062_dnd_menubar.patch
+        063_treeview_almost_fixed.patch
+        071_no_offscreen_widgets_grabbing.patch
+        090_logging_file_saves.patch
+        092_default_to_xdg_document_dir.patch
+        093_gtk3_gtkimage_fallbacks_use.patch
+        096_git_gtkprintsettings.patch
+        097_statusicon_image_fallback.patch
+        099_printer_filename_fix.patch
+        100_overlay_scrollbar_loading.patch
+        print-dialog-show-options-of-remote-dnssd-printers.patch
+        gtk-shell-shows-menubar.patch
+        backport_search_printer_location.patch
+        menubar_toolbar_dragging.patch
+        #printing-initialize-auth_info.patch
+        #gdkcairo-Avoid-integer-overflow.patch
+    )
 
-  # Apply Ubuntu patches
-    # Enable patches
-      # Implement gtk-shell-shows-menubar from gtk3
-        echo 'gtk-shell-shows-menubar.patch' > ../debian/patches/series
-      # liboverlay-scrollbar.so: undefined symbol: ubuntu_gtk_set_use_overlay_scrollbar
-        echo '100_overlay_scrollbar_loading.patch' >> ../debian/patches/series
-      # Allow printing to printers advertised using Avahi/Bonjour when CUPS 1.6
-        echo 'print-dialog-show-options-of-remote-dnssd-printers.patch' >> ../debian/patches/series
-      # Make GTK 2 applications behave more like GTK 3 applications where the
-      # windows can be dragged via the menubar.
-        echo '062_dnd_menubar.patch' >> ../debian/patches/series
-      # Make sure than an offscreen window does not grab the mouse pointer.
-        echo '071_no_offscreen_widgets_grabbing.patch' >> ../debian/patches/series
-      # Fix bug for printers that don't print at 300 DPI
-        echo '096_git_gtkprintsettings.patch' >> ../debian/patches/series
-      # The list of printers should be searchable/sortable
-        echo 'backport_search_printer_location.patch' >> ../debian/patches/series
-      # Allow window dragging from empty areas of the menubar
-        echo 'menubar_toolbar_dragging.patch' >> ../debian/patches/series
+    for i in "${patches[@]}"; do
+        msg "Applying ${i}"
+        patch -p1 -i "../debian/patches/${i}"
+    done
 
-  for i in $(grep -v '#' ../debian/patches/series); do
-    msg "Applying ${i}"
-    patch -p1 -i "../debian/patches/${i}"
-  done
+    NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd "gtk+-${pkgver}"
+    cd gtk+
 
-  autoreconf -vfi
+    CXX=/bin/false ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-xinput=yes \
+        --enable-gtk-doc \
+        --enable-test-print-backend
 
-  CXX=/bin/false ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --with-xinput=yes \
-    --enable-test-print-backend
+    # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
+    make
 }
 
 package() {
-  cd "gtk+-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  sed -i "s#env python#env python2#" "${pkgdir}/usr/bin/gtk-builder-convert"
+    cd gtk+
+    make DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}/gtkrc" "${pkgdir}/usr/share/gtk-2.0/gtkrc"
+    install -Dm644 ../gtkrc \
+        "${pkgdir}/usr/share/gtk-2.0/gtkrc"
+    install -Dm644 ../gtk-query-immodules-2.0.hook \
+        "${pkgdir}/usr/share/libalpm/hooks/gtk-query-immodules-2.0.hook"
 
-  # Use the official gtk-update-icon-cache package
-  rm -v "${pkgdir}/usr/bin/gtk-update-icon-cache"
+    rm "${pkgdir}/usr/bin/gtk-update-icon-cache"
+    rm -r "${pkgdir}/usr/share/gtk-doc"
 }
diff --git a/gtk-query-immodules-2.0.hook b/gtk-query-immodules-2.0.hook
new file mode 100644
index 000000000000..40a0aa747b93
--- /dev/null
+++ b/gtk-query-immodules-2.0.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-2.0/2.10.0/immodules/*.so
+
+[Action]
+Description = Probing GTK2 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-2.0 --update-cache
diff --git a/gtkrc b/gtkrc
index d2282ac36e5f..1ee9497d946f 100644
--- a/gtkrc
+++ b/gtkrc
@@ -1,3 +1,3 @@
-gtk-icon-theme-name = "gnome"
+gtk-icon-theme-name = "Adwaita"
 gtk-theme-name = "Adwaita"
 gtk-font-name = "Cantarell 11"