diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
| commit | 87bd9124ec1abd5c6171af47af93805b975343b6 (patch) | |
| tree | f9732aabf9c46c6391409187f8ddf8cc5b005006 /extra/gtk2 | |
| parent | 96c65d8a0393645808ab5ea31776baa26209fc5f (diff) | |
| parent | 0dee03071a0643c3ee5820afa3c694dcef71d385 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/beye/PKGBUILD
community/xmlrpc-c/PKGBUILD
extra/avidemux/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk2/PKGBUILD
extra/libvpx/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/libxml2/PKGBUILD
extra/pixman/PKGBUILD
extra/thunar-archive-plugin/PKGBUILD
extra/thunar-volman/PKGBUILD
extra/vdpau-video/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-battery-plugin/PKGBUILD
extra/xfce4-cpufreq-plugin/PKGBUILD
extra/xfce4-cpugraph-plugin/PKGBUILD
extra/xfce4-dict/PKGBUILD
extra/xfce4-diskperf-plugin/PKGBUILD
extra/xfce4-eyes-plugin/PKGBUILD
extra/xfce4-fsguard-plugin/PKGBUILD
extra/xfce4-mixer/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-power-manager/PKGBUILD
extra/xfce4-systemload-plugin/PKGBUILD
extra/xfce4-taskmanager/PKGBUILD
extra/xfce4-time-out-plugin/PKGBUILD
extra/xfce4-timer-plugin/PKGBUILD
extra/xfce4-wavelan-plugin/PKGBUILD
extra/xorg-luit/PKGBUILD
extra/xorg-xfontsel/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/gtk2')
| -rw-r--r-- | extra/gtk2/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/gtk2/gtk2.install | 6 |
2 files changed, 9 insertions, 13 deletions
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index e71084748..6729146a2 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148770 2012-02-05 11:49:51Z ibiru $ +# $Id: PKGBUILD 149300 2012-02-06 18:07:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.9 -pkgrel=3 +pkgver=2.24.10 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,18 +12,14 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool' '!docs') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - xid-collision-debug.patch cups-custom-print.patch) -sha256sums=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '9535c9df19338cbea98ec4b2b5c8e4cef718455938f05c9cf8a08a3805d6b85d') + xid-collision-debug.patch) +sha256sums=('ea56e31bb9d6e19ed2e8911f4c7ac493cb804431caa21cdcadae625d375a0e89' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { cd "$srcdir/gtk+-$pkgver" patch -Np1 -i "$srcdir/xid-collision-debug.patch" - # https://bugzilla.gnome.org/show_bug.cgi?id=543520 - patch -Rp1 -i "$srcdir/cups-custom-print.patch" - CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk2/gtk2.install b/extra/gtk2/gtk2.install index 4e2b72f1b..a988c645b 100644 --- a/extra/gtk2/gtk2.install +++ b/extra/gtk2/gtk2.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules } pre_upgrade() { @@ -11,6 +11,6 @@ post_upgrade() { } 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 /etc/gtk-2.0/gtk.immodules &>/dev/null + rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null } |