diff options
Diffstat (limited to 'multilib/lib32-gtk2')
-rw-r--r-- | multilib/lib32-gtk2/PKGBUILD | 53 | ||||
-rw-r--r-- | multilib/lib32-gtk2/gtk-modules-32.patch | 12 | ||||
-rw-r--r-- | multilib/lib32-gtk2/gtk2.install | 16 | ||||
-rw-r--r-- | multilib/lib32-gtk2/xid-collision-debug.patch | 15 |
4 files changed, 0 insertions, 96 deletions
diff --git a/multilib/lib32-gtk2/PKGBUILD b/multilib/lib32-gtk2/PKGBUILD deleted file mode 100644 index da890b247..000000000 --- a/multilib/lib32-gtk2/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 49586 2011-06-18 08:35:08Z bluewind $ -# Maintainer: Ionut Biru <ibiru@archlinux.org -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> - -_pkgbasename=gtk2 -pkgname=lib32-$_pkgbasename -pkgver=2.24.5 -pkgrel=1 -pkgdesc="The GTK+ Toolkit (v2) (32-bit)" -arch=('x86_64') -url="http://www.gtk.org/" -install=gtk2.install -depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','gnutls>=2.8.6','gdk-pixbuf2>=2.22.1'} - lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage} - $_pkgbasename) -makedepends=('pkgconfig' 'gcc-multilib') -options=('!libtool' '!docs') -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz - xid-collision-debug.patch - gtk-modules-32.patch) -sha256sums=('d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - patch -p1 -i ${srcdir}/gtk-modules-32.patch - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib32 \ - --with-xinput=yes - make -} - -package() { - cd "${srcdir}/gtk+-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/etc - rm -rf "${pkgdir}"/usr/{include,share} - - cd "${pkgdir}"/usr/bin - mv gtk-query-immodules-2.0 gtk-query-immodules-2.0-32 - rm -f gtk-builder-convert gtk-demo gtk-update-icon-cache -} diff --git a/multilib/lib32-gtk2/gtk-modules-32.patch b/multilib/lib32-gtk2/gtk-modules-32.patch deleted file mode 100644 index a2530c3bf..000000000 --- a/multilib/lib32-gtk2/gtk-modules-32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c ---- gtk+-2.20.1/gtk/gtkrc.c 2010-05-03 01:28:21.000000000 +0200 -+++ gtk+-2.20.1-32/gtk/gtkrc.c 2010-08-26 07:22:42.316920033 +0200 -@@ -450,7 +450,7 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL); - } - - return result; diff --git a/multilib/lib32-gtk2/gtk2.install b/multilib/lib32-gtk2/gtk2.install deleted file mode 100644 index 49f86f550..000000000 --- a/multilib/lib32-gtk2/gtk2.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32 -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null - rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null -} diff --git a/multilib/lib32-gtk2/xid-collision-debug.patch b/multilib/lib32-gtk2/xid-collision-debug.patch deleted file mode 100644 index d61238c3b..000000000 --- a/multilib/lib32-gtk2/xid-collision-debug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 -+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 -@@ -56,10 +56,10 @@ - if (!display_x11->xid_ht) - display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, - (GEqualFunc) gdk_xid_equal); -- -+/* - if (g_hash_table_lookup (display_x11->xid_ht, xid)) - g_warning ("XID collision, trouble ahead"); -- -+*/ - g_hash_table_insert (display_x11->xid_ht, xid, data); - } - |