[arch-commits] Commit in gtk2/trunk (PKGBUILD)

[Jan de Groot]

    Date: Thursday, July 14, 2016 @ 11:13:01
  Author: jgc
Revision: 271854

upgpkg: gtk2 2.24.30+95+g876b5f7-1

Update to git snapshot, should fix FS#49949

Modified:
  gtk2/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-14 10:31:52 UTC (rev 271853)
+++ PKGBUILD	2016-07-14 11:13:01 UTC (rev 271854)
@@ -2,40 +2,48 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.24.30
-pkgrel=2
+pkgver=2.24.30+95+g876b5f7
+pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
          shared-mime-info cairo libcups gtk-update-icon-cache librsvg desktop-file-utils)
-makedepends=(gobject-introspection python2)
+makedepends=(gobject-introspection python2 git gtk-doc)
 optdepends=('gnome-themes-standard: Default widget theme'
             'adwaita-icon-theme: Default icon theme')
 license=(LGPL)
 install=gtk2.install
-source=(https://download.gnome.org/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+_commit=876b5f75faab5d8f3c60c3ec035b2ecd4ac5b67e
+source=("git://git.gnome.org/gtk+#commit=$_commit"
         gtkrc
         gtk-query-immodules-2.0.hook
         xid-collision-debug.patch)
-sha256sums=('0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50'
+sha256sums=('SKIP'
             'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
             '9656a1efc798da1ac2dae94e921ed0f72719bd52d4d0138f305b993f778f7758'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
+pkgver() {
+  cd gtk+
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-    cd gtk+-$pkgver
+    cd gtk+
     patch -Np1 -i ../xid-collision-debug.patch
     sed -i '1s/python$/&2/' gtk/gtk-builder-convert
+    NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-    cd gtk+-$pkgver
+    cd gtk+
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
-        --with-xinput=yes
+        --with-xinput=yes \
+        --enable-gtk-doc
 
     # https://bugzilla.gnome.org/show_bug.cgi?id=655517
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -44,7 +52,7 @@
 }
 
 package() {
-    cd gtk+-$pkgver
+    cd gtk+
     make DESTDIR="$pkgdir" install
 
     install -Dm644 ../gtkrc "$pkgdir/usr/share/gtk-2.0/gtkrc"