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

Florian Pritz bluewind at nymeria.archlinux.org
Thu Oct 17 09:11:16 UTC 2013


    Date: Thursday, October 17, 2013 @ 11:11:16
  Author: bluewind
Revision: 98700

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-gtk2/repos/multilib-x86_64/PKGBUILD
    (from rev 98699, lib32-gtk2/trunk/PKGBUILD)
  lib32-gtk2/repos/multilib-x86_64/gtk2.install
    (from rev 98699, lib32-gtk2/trunk/gtk2.install)
  lib32-gtk2/repos/multilib-x86_64/xid-collision-debug.patch
    (from rev 98699, lib32-gtk2/trunk/xid-collision-debug.patch)
Deleted:
  lib32-gtk2/repos/multilib-x86_64/PKGBUILD
  lib32-gtk2/repos/multilib-x86_64/gtk2.install
  lib32-gtk2/repos/multilib-x86_64/gtkrc-fix.patch
  lib32-gtk2/repos/multilib-x86_64/xid-collision-debug.patch

---------------------------+
 PKGBUILD                  |  120 +++++++++++++++++++++-----------------------
 gtk2.install              |   34 ++++++------
 gtkrc-fix.patch           |   22 --------
 xid-collision-debug.patch |   30 +++++------
 4 files changed, 91 insertions(+), 115 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-17 09:11:12 UTC (rev 98699)
+++ PKGBUILD	2013-10-17 09:11:16 UTC (rev 98700)
@@ -1,61 +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.21
-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 gtkrc-fix.patch)
-sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d')
-
-prepare() {
-  cd "${srcdir}/gtk+-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-  patch -Np1 -i ../gtkrc-fix.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
-}

Copied: lib32-gtk2/repos/multilib-x86_64/PKGBUILD (from rev 98699, lib32-gtk2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-10-17 09:11:16 UTC (rev 98700)
@@ -0,0 +1,59 @@
+# $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.22
+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)
+sha256sums=('b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f'
+'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+prepare() {
+  cd "${srcdir}/gtk+-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/xid-collision-debug.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: gtk2.install
===================================================================
--- gtk2.install	2013-10-17 09:11:12 UTC (rev 98699)
+++ gtk2.install	2013-10-17 09:11:16 UTC (rev 98700)
@@ -1,17 +0,0 @@
-post_install() {
-	GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 --update-cache
-}
-
-pre_upgrade() {
-if (( $(vercmp $2 2.24.20) < 0 )); then
-	rm -f /etc/gtk-2.0/gtk.immodules-32
-fi
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	rm -f /usr/lib32/gtk-2.0/2.10.0/immodules.cache
-}

Copied: lib32-gtk2/repos/multilib-x86_64/gtk2.install (from rev 98699, lib32-gtk2/trunk/gtk2.install)
===================================================================
--- gtk2.install	                        (rev 0)
+++ gtk2.install	2013-10-17 09:11:16 UTC (rev 98700)
@@ -0,0 +1,17 @@
+post_install() {
+	GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 --update-cache
+}
+
+pre_upgrade() {
+if (( $(vercmp $2 2.24.20) < 0 )); then
+	rm -f /etc/gtk-2.0/gtk.immodules-32
+fi
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	rm -f /usr/lib32/gtk-2.0/2.10.0/immodules.cache
+}

Deleted: gtkrc-fix.patch
===================================================================
--- gtkrc-fix.patch	2013-10-17 09:11:12 UTC (rev 98699)
+++ gtkrc-fix.patch	2013-10-17 09:11:16 UTC (rev 98700)
@@ -1,22 +0,0 @@
-From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at 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

Deleted: xid-collision-debug.patch
===================================================================
--- xid-collision-debug.patch	2013-10-17 09:11:12 UTC (rev 98699)
+++ xid-collision-debug.patch	2013-10-17 09:11:16 UTC (rev 98700)
@@ -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 98699, lib32-gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- xid-collision-debug.patch	                        (rev 0)
+++ xid-collision-debug.patch	2013-10-17 09:11:16 UTC (rev 98700)
@@ -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