summaryrefslogtreecommitdiffstats
path: root/abs/core/gtk2
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/gtk2')
-rw-r--r--abs/core/gtk2/PKGBUILD30
-rw-r--r--abs/core/gtk2/gtk2-emit-size-change.patch26
-rw-r--r--abs/core/gtk2/gtk2.install24
3 files changed, 47 insertions, 33 deletions
diff --git a/abs/core/gtk2/PKGBUILD b/abs/core/gtk2/PKGBUILD
index 7cab655..6cdc6e1 100644
--- a/abs/core/gtk2/PKGBUILD
+++ b/abs/core/gtk2/PKGBUILD
@@ -1,35 +1,37 @@
-# $Id: PKGBUILD 7635 2008-08-03 15:54:30Z jgc $
+# $Id: PKGBUILD 35332 2009-04-12 12:46:16Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gtk2
-pkgver=2.12.11
-pkgrel=3
+pkgver=2.16.1
+pkgrel=6
pkgdesc="The GTK+ Toolkit (v2)"
arch=(i686 x86_64)
url="http://www.gtk.org/"
install=gtk2.install
-depends=('atk>=1.22.0' 'pango>=1.20.5' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.8-2' 'libxcomposite' 'libxdamage' 'heimdal>=1.2' 'gnutls>=2.4.1')
+depends=('atk>=1.26.0' 'pango>=1.24.0-2' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.2.1' 'libcups>=1.3.9' 'libxcomposite' 'libxdamage' 'heimdal>=1.2.1' 'gnutls>=2.6.4' 'shared-mime-info')
makedepends=('pkgconfig')
-replaces=('gtkprint-cups')
-conflicts=('gtkprint-cups')
-options=('!libtool')
+replaces=('gtkprint-cups' 'gail')
+conflicts=('gtkprint-cups' 'gail')
+provides=('gail=1.22.3')
+options=('!libtool' '!docs')
backup=(etc/gtk-2.0/gtkrc)
license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.12/gtk+-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16/gtk+-${pkgver}.tar.bz2
gtkclipboard-check.patch)
-md5sums=('f7aab88e856a813386f797aade5867ad'
+md5sums=('74e35ff3e6e02c960fe2117a4b6b102f'
'4025d3c15d6c6f73a032f403ffd4ff1c')
build() {
- cd ${startdir}/src/gtk+-${pkgver}
+ cd "${srcdir}/gtk+-${pkgver}"
# Workaround patch for flash
- patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
+ patch -Np1 -i "${srcdir}/gtkclipboard-check.patch" || return 1
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --with-xinput=xfree \
+ --localstatedir=/var --with-xinput=yes \
+ --without-libjasper \
--with-included-loaders=png || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
+ make DESTDIR="${pkgdir}" install || return 1
- echo 'gtk-fallback-icon-theme = "gnome"' > ${startdir}/pkg/etc/gtk-2.0/gtkrc || return 1
+ echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" || return 1
}
diff --git a/abs/core/gtk2/gtk2-emit-size-change.patch b/abs/core/gtk2/gtk2-emit-size-change.patch
new file mode 100644
index 0000000..34053a8
--- /dev/null
+++ b/abs/core/gtk2/gtk2-emit-size-change.patch
@@ -0,0 +1,26 @@
+diff -Naur gtk+-2.14.5-old/gdk/x11/gdkscreen-x11.c gtk+-2.14.5/gdk/x11/gdkscreen-x11.c
+--- gtk+-2.14.5-old/gdk/x11/gdkscreen-x11.c 2008-11-24 16:36:03.000000000 +1000
++++ gtk+-2.14.5/gdk/x11/gdkscreen-x11.c 2008-12-03 00:39:38.000000000 +1000
+@@ -894,11 +894,6 @@
+ _gdk_x11_screen_size_changed (GdkScreen *screen,
+ XEvent *event)
+ {
+- gint width, height;
+-
+- width = gdk_screen_get_width (screen);
+- height = gdk_screen_get_height (screen);
+-
+ #ifdef HAVE_RANDR
+ if (!XRRUpdateConfiguration (event))
+ return;
+@@ -915,10 +910,6 @@
+ return;
+ #endif
+
+- if (width == gdk_screen_get_width (screen) &&
+- height == gdk_screen_get_height (screen))
+- return;
+-
+ _gdk_x11_screen_process_monitors_change (screen);
+ g_signal_emit_by_name (screen, "size_changed");
+ }
diff --git a/abs/core/gtk2/gtk2.install b/abs/core/gtk2/gtk2.install
index 3b4a881..6d415ad 100644
--- a/abs/core/gtk2/gtk2.install
+++ b/abs/core/gtk2/gtk2.install
@@ -1,27 +1,13 @@
-# arg 1: the new package version
post_install() {
- # we need to ldconfig first, in case xfree86's libs aren't
- # in ld.so.cache yet
- sbin/ldconfig -r .
- mkdir -p etc/gtk-2.0 &>/dev/null
- usr/bin/gtk-query-immodules-2.0 >etc/gtk-2.0/gtk.immodules
- usr/bin/gdk-pixbuf-query-loaders >etc/gtk-2.0/gdk-pixbuf.loaders
+ usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+ usr/bin/gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
}
-# arg 1: the new package version
-# arg 2: the old package version
post_upgrade() {
- post_install $1
+ post_install
}
-# arg 1: the old package version
pre_remove() {
- rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
- rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
- rmdir etc/gtk-2.0 &>/dev/null
+ rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
+ rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
}
-
-op=$1
-shift
-
-$op $*