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

Ionut Biru ibiru at archlinux.org
Thu Oct 20 01:43:37 EDT 2011


    Date: Thursday, October 20, 2011 @ 01:43:37
  Author: ibiru
Revision: 140922

db-move: moved gtk2 from [testing] to [extra] (i686)

Added:
  gtk2/repos/extra-i686/PKGBUILD
    (from rev 140832, gtk2/repos/testing-i686/PKGBUILD)
  gtk2/repos/extra-i686/gtk2.install
    (from rev 140832, gtk2/repos/testing-i686/gtk2.install)
  gtk2/repos/extra-i686/xid-collision-debug.patch
    (from rev 140832, gtk2/repos/testing-i686/xid-collision-debug.patch)
Deleted:
  gtk2/repos/extra-i686/PKGBUILD
  gtk2/repos/extra-i686/gtk2-dont-ellipsize-filters.diff
  gtk2/repos/extra-i686/gtk2.install
  gtk2/repos/extra-i686/xid-collision-debug.patch
  gtk2/repos/testing-i686/

----------------------------------+
 PKGBUILD                         |  114 +++++++++++++++++--------------------
 gtk2-dont-ellipsize-filters.diff |   28 ---------
 gtk2.install                     |   32 +++++-----
 xid-collision-debug.patch        |   30 ++++-----
 4 files changed, 86 insertions(+), 118 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-20 05:43:36 UTC (rev 140921)
+++ extra-i686/PKGBUILD	2011-10-20 05:43:37 UTC (rev 140922)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.6
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
-             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
-options=('!libtool' '!docs')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch
-        gtk2-dont-ellipsize-filters.diff)
-sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8')
-
-build() {
-    cd "${srcdir}/gtk+-${pkgver}"
-    patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-    #https://bugzilla.gnome.org/show_bug.cgi?id=657949
-    patch -Np1 -i "${srcdir}/gtk2-dont-ellipsize-filters.diff"
-
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --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_gtk2() {
-    pkgdesc="The GTK+ Toolkit (v2)"
-    install=gtk2.install
-    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
-    backup=(etc/gtk-2.0/gtkrc)
-
-    cd "${srcdir}/gtk+-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install
-    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
-    echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc"
-    #split this out to use with gtk3 too
-    rm ${pkgdir}/usr/bin/gtk-update-icon-cache
-}
-package_gtk-update-icon-cache() {
-    pkgdesc="The GTK+ update icon cache tool"
-    depends=('gdk-pixbuf2')
-
-    cd "${srcdir}/gtk+-${pkgver}/gtk"
-
-    install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
-}

Copied: gtk2/repos/extra-i686/PKGBUILD (from rev 140832, gtk2/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-20 05:43:37 UTC (rev 140922)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.7
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
+             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
+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=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+build() {
+    cd "${srcdir}/gtk+-${pkgver}"
+    patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+
+    CXX=/bin/false ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --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_gtk2() {
+    pkgdesc="GTK+ is a multi-platform toolkit (v2)"
+    install=gtk2.install
+    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
+    backup=(etc/gtk-2.0/gtkrc)
+
+    cd "${srcdir}/gtk+-${pkgver}"
+
+    make DESTDIR="${pkgdir}" install
+    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+    echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc"
+    #split this out to use with gtk3 too
+    rm ${pkgdir}/usr/bin/gtk-update-icon-cache
+}
+package_gtk-update-icon-cache() {
+    pkgdesc="The GTK+ update icon cache tool"
+    depends=('gdk-pixbuf2')
+
+    cd "${srcdir}/gtk+-${pkgver}/gtk"
+
+    install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
+}

Deleted: extra-i686/gtk2-dont-ellipsize-filters.diff
===================================================================
--- extra-i686/gtk2-dont-ellipsize-filters.diff	2011-10-20 05:43:36 UTC (rev 140921)
+++ extra-i686/gtk2-dont-ellipsize-filters.diff	2011-10-20 05:43:37 UTC (rev 140922)
@@ -1,28 +0,0 @@
-diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
-index 2ee7903..37d9e8d 100644
---- a/gtk/gtkfilechooserdefault.c
-+++ b/gtk/gtkfilechooserdefault.c
-@@ -2322,23 +2322,9 @@ renderer_editing_canceled_cb (GtkCellRendererText   *cell_renderer_text,
- static GtkWidget *
- filter_create (GtkFileChooserDefault *impl)
- {
--  GtkCellRenderer *cell;
--  GList           *cells;
--
-   impl->filter_combo = gtk_combo_box_text_new ();
-   gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
- 
--  /* Get the combo's text renderer and set ellipsize parameters */
--  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (impl->filter_combo));
--  g_assert (cells);
--  cell = cells->data;
--
--  g_object_set (G_OBJECT (cell),
--		"ellipsize", PANGO_ELLIPSIZE_END,
--		NULL);
--
--  g_list_free (cells);
--
-   g_signal_connect (impl->filter_combo, "changed",
- 		    G_CALLBACK (filter_combo_changed), impl);
- 

Deleted: extra-i686/gtk2.install
===================================================================
--- extra-i686/gtk2.install	2011-10-20 05:43:36 UTC (rev 140921)
+++ extra-i686/gtk2.install	2011-10-20 05:43:37 UTC (rev 140922)
@@ -1,16 +0,0 @@
-post_install() {
-  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
-  rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-}

Copied: gtk2/repos/extra-i686/gtk2.install (from rev 140832, gtk2/repos/testing-i686/gtk2.install)
===================================================================
--- extra-i686/gtk2.install	                        (rev 0)
+++ extra-i686/gtk2.install	2011-10-20 05:43:37 UTC (rev 140922)
@@ -0,0 +1,16 @@
+post_install() {
+  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
+  rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
+}

Deleted: extra-i686/xid-collision-debug.patch
===================================================================
--- extra-i686/xid-collision-debug.patch	2011-10-20 05:43:36 UTC (rev 140921)
+++ extra-i686/xid-collision-debug.patch	2011-10-20 05:43:37 UTC (rev 140922)
@@ -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: gtk2/repos/extra-i686/xid-collision-debug.patch (from rev 140832, gtk2/repos/testing-i686/xid-collision-debug.patch)
===================================================================
--- extra-i686/xid-collision-debug.patch	                        (rev 0)
+++ extra-i686/xid-collision-debug.patch	2011-10-20 05:43:37 UTC (rev 140922)
@@ -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