[arch-commits] Commit in gtk2/trunk (PKGBUILD gtk-update-icon-cache.install gtkrc)

[Jan Steffens]

    Date: Wednesday, May 13, 2015 @ 18:43:08
  Author: heftig
Revision: 239303

2.24.28

Modified:
  gtk2/trunk/PKGBUILD
  gtk2/trunk/gtkrc
Deleted:
  gtk2/trunk/gtk-update-icon-cache.install

-------------------------------+
 PKGBUILD                      |   46 ++++++++++++++--------------------------
 gtk-update-icon-cache.install |    3 --
 gtkrc                         |    2 -
 3 files changed, 18 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-13 16:42:49 UTC (rev 239302)
+++ PKGBUILD	2015-05-13 16:43:08 UTC (rev 239303)
@@ -1,20 +1,23 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.27
-pkgrel=2
-arch=('i686' 'x86_64')
+pkgname=gtk2
+pkgver=2.24.28
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
+arch=(i686 x86_64)
 url="http://www.gtk.org/"
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
-             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection' 'python2'
-             'librsvg')
-license=('LGPL')
+depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage 
+         shared-mime-info cairo libcups gtk-update-icon-cache librsvg)
+makedepends=(gobject-introspection python2)
+optdepends=('gnome-themes-standard: Default widget theme'
+            'adwaita-icon-theme: Default icon theme')
+license=(LGPL)
+install=gtk2.install
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
         gtkrc xid-collision-debug.patch)
-sha256sums=('20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4'
-            'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
+sha256sums=('b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656'
+            'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 prepare() {
@@ -36,15 +39,7 @@
     make
 }
 
-package_gtk2() {
-    pkgdesc="GTK+ is a multi-platform toolkit (v2)"
-    install=gtk2.install
-    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 
-             'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache' 'librsvg')
-    optdepends=('gnome-themes-standard: Default widget theme'
-                'gnome-icon-theme: Default icon theme')
-    replaces=('gtk2-docs')
-
+package() {
     cd gtk+-$pkgver
     make DESTDIR="$pkgdir" install
 
@@ -52,14 +47,7 @@
 
     install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/gtk-2.0/gtkrc"
 
-    #split this out to use with gtk3 too
-    rm $pkgdir/usr/bin/gtk-update-icon-cache
+    rm "$pkgdir/usr/bin/gtk-update-icon-cache"
 }
-package_gtk-update-icon-cache() {
-    pkgdesc="The GTK+ update icon cache tool"
-    depends=('gdk-pixbuf2>=2.24.1-3' 'hicolor-icon-theme')
-    install=gtk-update-icon-cache.install
 
-    cd gtk+-$pkgver/gtk
-    install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
+# vim:set noet sw=4:

Deleted: gtk-update-icon-cache.install
===================================================================
--- gtk-update-icon-cache.install	2015-05-13 16:42:49 UTC (rev 239302)
+++ gtk-update-icon-cache.install	2015-05-13 16:43:08 UTC (rev 239303)
@@ -1,3 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}

Modified: gtkrc
===================================================================
--- gtkrc	2015-05-13 16:42:49 UTC (rev 239302)
+++ gtkrc	2015-05-13 16:43:08 UTC (rev 239303)
@@ -1,3 +1,3 @@
-gtk-icon-theme-name = "gnome"
+gtk-icon-theme-name = "Adwaita"
 gtk-theme-name = "Adwaita"
 gtk-font-name = "Cantarell 11"