[arch-commits] Commit in lib32-gtk2/repos/multilib-x86_64 (8 files)

Laurent Carlier lcarlier at nymeria.archlinux.org
Mon May 13 12:24:07 EDT 2013


    Date: Monday, May 13, 2013 @ 18:24:06
  Author: lcarlier
Revision: 90757

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-gtk2/repos/multilib-x86_64/PKGBUILD
    (from rev 90756, lib32-gtk2/trunk/PKGBUILD)
  lib32-gtk2/repos/multilib-x86_64/gtk-modules-32.patch
    (from rev 90756, lib32-gtk2/trunk/gtk-modules-32.patch)
  lib32-gtk2/repos/multilib-x86_64/gtk2.install
    (from rev 90756, lib32-gtk2/trunk/gtk2.install)
  lib32-gtk2/repos/multilib-x86_64/xid-collision-debug.patch
    (from rev 90756, lib32-gtk2/trunk/xid-collision-debug.patch)
Deleted:
  lib32-gtk2/repos/multilib-x86_64/PKGBUILD
  lib32-gtk2/repos/multilib-x86_64/gtk-modules-32.patch
  lib32-gtk2/repos/multilib-x86_64/gtk2.install
  lib32-gtk2/repos/multilib-x86_64/xid-collision-debug.patch

---------------------------+
 PKGBUILD                  |  119 ++++++++++++++++++++++----------------------
 gtk-modules-32.patch      |   24 ++++----
 gtk2.install              |   32 +++++------
 xid-collision-debug.patch |   30 +++++------
 4 files changed, 105 insertions(+), 100 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 16:23:57 UTC (rev 90756)
+++ PKGBUILD	2013-05-13 16:24:06 UTC (rev 90757)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer:  Ionut Biru <ibiru at archlinux.org
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
-
-_pkgbasename=gtk2
-pkgname=lib32-$_pkgbasename
-pkgver=2.24.17
-pkgrel=2
-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','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=('e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415'
-            '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
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  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
-}

Copied: lib32-gtk2/repos/multilib-x86_64/PKGBUILD (from rev 90756, lib32-gtk2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-05-13 16:24:06 UTC (rev 90757)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer:  Ionut Biru <ibiru at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
+
+_pkgbasename=gtk2
+pkgname=lib32-$_pkgbasename
+pkgver=2.24.18
+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','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=('6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0')
+
+prepare() {
+  cd "${srcdir}/gtk+-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+  patch -p1 -i ${srcdir}/gtk-modules-32.patch
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/gtk+-${pkgver}"
+
+  CXX=/bin/false ./configure --prefix=/usr \
+      --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libdir=/usr/lib32 \
+      --with-xinput=yes
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  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
+}

Deleted: gtk-modules-32.patch
===================================================================
--- gtk-modules-32.patch	2013-05-13 16:23:57 UTC (rev 90756)
+++ gtk-modules-32.patch	2013-05-13 16:24:06 UTC (rev 90757)
@@ -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;

Copied: lib32-gtk2/repos/multilib-x86_64/gtk-modules-32.patch (from rev 90756, lib32-gtk2/trunk/gtk-modules-32.patch)
===================================================================
--- gtk-modules-32.patch	                        (rev 0)
+++ gtk-modules-32.patch	2013-05-13 16:24:06 UTC (rev 90757)
@@ -0,0 +1,12 @@
+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;

Deleted: gtk2.install
===================================================================
--- gtk2.install	2013-05-13 16:23:57 UTC (rev 90756)
+++ gtk2.install	2013-05-13 16:24:06 UTC (rev 90757)
@@ -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
-}

Copied: lib32-gtk2/repos/multilib-x86_64/gtk2.install (from rev 90756, lib32-gtk2/trunk/gtk2.install)
===================================================================
--- gtk2.install	                        (rev 0)
+++ gtk2.install	2013-05-13 16:24:06 UTC (rev 90757)
@@ -0,0 +1,16 @@
+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
+}

Deleted: xid-collision-debug.patch
===================================================================
--- xid-collision-debug.patch	2013-05-13 16:23:57 UTC (rev 90756)
+++ xid-collision-debug.patch	2013-05-13 16:24:06 UTC (rev 90757)
@@ -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);
- }
- 

Copied: lib32-gtk2/repos/multilib-x86_64/xid-collision-debug.patch (from rev 90756, lib32-gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- xid-collision-debug.patch	                        (rev 0)
+++ xid-collision-debug.patch	2013-05-13 16:24:06 UTC (rev 90757)
@@ -0,0 +1,15 @@
+--- 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);
+ }
+ 



More information about the arch-commits mailing list