diff options
| -rw-r--r-- | abs/core/gtk2/PKGBUILD | 42 | ||||
| -rw-r--r-- | abs/core/gtk2/gtk-update-icon-cache.install | 3 | ||||
| -rw-r--r-- | abs/core/gtk2/gtk2.install | 11 | ||||
| -rw-r--r-- | abs/core/gtk2/gtkrc | 3 | ||||
| -rw-r--r-- | abs/extra/graphviz/graphviz.install | 17 |
5 files changed, 37 insertions, 39 deletions
diff --git a/abs/core/gtk2/PKGBUILD b/abs/core/gtk2/PKGBUILD index 13d72a2..4949bfc 100644 --- a/abs/core/gtk2/PKGBUILD +++ b/abs/core/gtk2/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 163898 2012-07-21 19:20:18Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.11 +pkgver=2.24.25 pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' - 'shared-mime-info' 'cairo' 'gdk-pixbuf2' 'gobject-introspection') -options=('!libtool') + 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection' 'python2') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - xid-collision-debug.patch) -sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9' + gtkrc xid-collision-debug.patch) +sha256sums=('38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3' + 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') +prepare() { + cd gtk+-$pkgver + patch -Np1 -i ../xid-collision-debug.patch +} + build() { - cd "$srcdir/gtk+-$pkgver" - patch -Np1 -i "$srcdir/xid-collision-debug.patch" + cd gtk+-$pkgver CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -34,23 +38,27 @@ build() { 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' 'gtk-update-icon-cache') - backup=(etc/gtk-2.0/gtkrc) + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' + 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + optdepends=('gnome-themes-standard: Default widget theme' + 'gnome-icon-theme: Default icon theme') replaces=('gtk2-docs') - cd "$srcdir/gtk+-$pkgver" - + cd gtk+-$pkgver make DESTDIR="$pkgdir" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert - echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc" + + 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 } package_gtk-update-icon-cache() { pkgdesc="The GTK+ update icon cache tool" - depends=('gdk-pixbuf2>=2.24.1-3') - - cd "$srcdir/gtk+-$pkgver/gtk" + depends=('gdk-pixbuf2>=2.24.1-3' 'hicolor-icon-theme') + install=gtk-update-icon-cache.install - install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache + cd gtk+-$pkgver/gtk + install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache" } diff --git a/abs/core/gtk2/gtk-update-icon-cache.install b/abs/core/gtk2/gtk-update-icon-cache.install new file mode 100644 index 0000000..1afcc72 --- /dev/null +++ b/abs/core/gtk2/gtk-update-icon-cache.install @@ -0,0 +1,3 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} diff --git a/abs/core/gtk2/gtk2.install b/abs/core/gtk2/gtk2.install index a988c64..f14e648 100644 --- a/abs/core/gtk2/gtk2.install +++ b/abs/core/gtk2/gtk2.install @@ -1,16 +1,17 @@ post_install() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + /usr/bin/gtk-query-immodules-2.0 --update-cache } pre_upgrade() { - pre_remove + if (( $(vercmp $2 2.24.20) < 0 )); then + rm -f /etc/gtk-2.0/gtk.immodules + fi } post_upgrade() { - post_install + post_install } pre_remove() { - rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null - rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null + rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache } diff --git a/abs/core/gtk2/gtkrc b/abs/core/gtk2/gtkrc new file mode 100644 index 0000000..d2282ac --- /dev/null +++ b/abs/core/gtk2/gtkrc @@ -0,0 +1,3 @@ +gtk-icon-theme-name = "gnome" +gtk-theme-name = "Adwaita" +gtk-font-name = "Cantarell 11" diff --git a/abs/extra/graphviz/graphviz.install b/abs/extra/graphviz/graphviz.install deleted file mode 100644 index 00510e3..0000000 --- a/abs/extra/graphviz/graphviz.install +++ /dev/null @@ -1,17 +0,0 @@ -# arg 1: the new package version -post_install() { - # Create plugin config /usr/lib/graphviz/config6 - rm -f usr/lib/graphviz/config{,6} - usr/bin/dot -c -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - rm -f usr/lib/graphviz/config{,6} -} |