diff options
author | root <root@rshg054.dnsready.net> | 2013-10-08 02:34:09 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-10-08 02:34:09 -0700 |
commit | 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a (patch) | |
tree | a6af20a38d47d7a7ae8e1b98f70005c54644bbdd /extra/gtk2 | |
parent | 9159b8ca1c97a398204d7a7d4d78c3394639bd02 (diff) |
Tue Oct 8 02:32:53 PDT 2013
Diffstat (limited to 'extra/gtk2')
-rw-r--r-- | extra/gtk2/PKGBUILD | 39 | ||||
-rw-r--r-- | extra/gtk2/gtk-update-icon-cache.install | 3 | ||||
-rw-r--r-- | extra/gtk2/gtkrc | 3 | ||||
-rw-r--r-- | extra/gtk2/gtkrc-fix.patch | 22 |
4 files changed, 53 insertions, 14 deletions
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 61084467a..e35ebeaf5 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189695 2013-07-04 21:16:18Z heftig $ +# $Id: PKGBUILD 196102 2013-10-07 11:52:32Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.20 -pkgrel=1 +pkgver=2.24.21 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,13 +12,20 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - xid-collision-debug.patch) -sha256sums=('cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + gtkrc xid-collision-debug.patch gtkrc-fix.patch) +sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3' + 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' + '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d') -build() { +prepare() { cd gtk+-$pkgver patch -Np1 -i ../xid-collision-debug.patch + patch -Np1 -i ../gtkrc-fix.patch +} + +build() { + cd gtk+-$pkgver CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -34,23 +41,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' 'libcups' '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 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') + 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 + install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache" } diff --git a/extra/gtk2/gtk-update-icon-cache.install b/extra/gtk2/gtk-update-icon-cache.install new file mode 100644 index 000000000..1afcc72a7 --- /dev/null +++ b/extra/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/extra/gtk2/gtkrc b/extra/gtk2/gtkrc new file mode 100644 index 000000000..d2282ac36 --- /dev/null +++ b/extra/gtk2/gtkrc @@ -0,0 +1,3 @@ +gtk-icon-theme-name = "gnome" +gtk-theme-name = "Adwaita" +gtk-font-name = "Cantarell 11" diff --git a/extra/gtk2/gtkrc-fix.patch b/extra/gtk2/gtkrc-fix.patch new file mode 100644 index 000000000..09e350e98 --- /dev/null +++ b/extra/gtk2/gtkrc-fix.patch @@ -0,0 +1,22 @@ +From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Mon, 30 Sep 2013 16:50:34 +0000 +Subject: Actually look in /usr/share/gtk-2.0 for default rc files + +I managed to forget the 'share' component of the path. +--- +diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c +index b1f68e2..50b2563 100644 +--- a/gtk/gtkrc.c ++++ b/gtk/gtkrc.c +@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void) + const gchar * const *config_dirs; + const gchar *config_dir; + +- str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL); ++ str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL); + gtk_rc_add_default_file (str); + g_free (str); + +-- +cgit v0.9.2 |