[arch-commits] Commit in gtk2/repos (14 files)
Jan de Groot
jgc at archlinux.org
Wed Aug 31 11:03:18 UTC 2011
Date: Wednesday, August 31, 2011 @ 07:03:18
Author: jgc
Revision: 136649
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gtk2/repos/extra-i686/PKGBUILD
(from rev 136648, gtk2/trunk/PKGBUILD)
gtk2/repos/extra-i686/gtk2.install
(from rev 136648, gtk2/trunk/gtk2.install)
gtk2/repos/extra-i686/xid-collision-debug.patch
(from rev 136648, gtk2/trunk/xid-collision-debug.patch)
gtk2/repos/extra-x86_64/PKGBUILD
(from rev 136648, gtk2/trunk/PKGBUILD)
gtk2/repos/extra-x86_64/gtk2.install
(from rev 136648, gtk2/trunk/gtk2.install)
gtk2/repos/extra-x86_64/xid-collision-debug.patch
(from rev 136648, gtk2/trunk/xid-collision-debug.patch)
Deleted:
gtk2/repos/extra-i686/PKGBUILD
gtk2/repos/extra-i686/gdk_Make_background_changes_queue_a_repaint.patch
gtk2/repos/extra-i686/gtk2.install
gtk2/repos/extra-i686/xid-collision-debug.patch
gtk2/repos/extra-x86_64/PKGBUILD
gtk2/repos/extra-x86_64/gdk_Make_background_changes_queue_a_repaint.patch
gtk2/repos/extra-x86_64/gtk2.install
gtk2/repos/extra-x86_64/xid-collision-debug.patch
----------------------------------------------------------------+
extra-i686/PKGBUILD | 111 ++++------
extra-i686/gdk_Make_background_changes_queue_a_repaint.patch | 55 ----
extra-i686/gtk2.install | 32 +-
extra-i686/xid-collision-debug.patch | 30 +-
extra-x86_64/PKGBUILD | 111 ++++------
extra-x86_64/gdk_Make_background_changes_queue_a_repaint.patch | 55 ----
extra-x86_64/gtk2.install | 32 +-
extra-x86_64/xid-collision-debug.patch | 30 +-
8 files changed, 170 insertions(+), 286 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-08-31 11:02:18 UTC (rev 136648)
+++ extra-i686/PKGBUILD 2011-08-31 11:03:18 UTC (rev 136649)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.5
-pkgrel=3
-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
- gdk_Make_background_changes_queue_a_repaint.patch)
-sha256sums=('d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3'
- 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
- '3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93')
-
-build() {
- cd "${srcdir}/gtk+-${pkgver}"
- patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
- patch -NRp1 -i "${srcdir}/gdk_Make_background_changes_queue_a_repaint.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="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 136648, gtk2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-08-31 11:03:18 UTC (rev 136649)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.6
+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=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca'
+ '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="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
+}
Deleted: extra-i686/gdk_Make_background_changes_queue_a_repaint.patch
===================================================================
--- extra-i686/gdk_Make_background_changes_queue_a_repaint.patch 2011-08-31 11:02:18 UTC (rev 136648)
+++ extra-i686/gdk_Make_background_changes_queue_a_repaint.patch 2011-08-31 11:03:18 UTC (rev 136649)
@@ -1,55 +0,0 @@
-From 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte at redhat.com>
-Date: Thu, 09 Jun 2011 04:29:45 +0000
-Subject: gdk: Make background changes queue a repaint
-
-For client-side windows, we need to queue a repaint when the background
-changes. For native windows, the windowing system does take care of it,
-but client-side windows are our own, so we gotta do it manually.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=652102
----
-diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index f058570..10d83ab 100644
---- a/gdk/gdkwindow.c
-+++ b/gdk/gdkwindow.c
-@@ -8004,11 +8004,15 @@ gdk_window_set_background (GdkWindow *window,
- }
-
- if (!GDK_WINDOW_DESTROYED (window) &&
-- gdk_window_has_impl (private) &&
- !private->input_only)
- {
-- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-- impl_iface->set_background (window, &private->bg_color);
-+ if (gdk_window_has_impl (private))
-+ {
-+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+ impl_iface->set_background (window, &private->bg_color);
-+ }
-+ else
-+ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
- }
- }
-
-@@ -8077,11 +8081,15 @@ gdk_window_set_back_pixmap (GdkWindow *window,
- private->bg_pixmap = GDK_NO_BG;
-
- if (!GDK_WINDOW_DESTROYED (window) &&
-- gdk_window_has_impl (private) &&
- !private->input_only)
- {
-- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-- impl_iface->set_back_pixmap (window, private->bg_pixmap);
-+ if (gdk_window_has_impl (private))
-+ {
-+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+ impl_iface->set_back_pixmap (window, private->bg_pixmap);
-+ }
-+ else
-+ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
- }
- }
-
---
-cgit v0.9
Deleted: extra-i686/gtk2.install
===================================================================
--- extra-i686/gtk2.install 2011-08-31 11:02:18 UTC (rev 136648)
+++ extra-i686/gtk2.install 2011-08-31 11:03:18 UTC (rev 136649)
@@ -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 136648, gtk2/trunk/gtk2.install)
===================================================================
--- extra-i686/gtk2.install (rev 0)
+++ extra-i686/gtk2.install 2011-08-31 11:03:18 UTC (rev 136649)
@@ -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-08-31 11:02:18 UTC (rev 136648)
+++ extra-i686/xid-collision-debug.patch 2011-08-31 11:03:18 UTC (rev 136649)
@@ -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 136648, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- extra-i686/xid-collision-debug.patch (rev 0)
+++ extra-i686/xid-collision-debug.patch 2011-08-31 11:03:18 UTC (rev 136649)
@@ -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);
+ }
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-08-31 11:02:18 UTC (rev 136648)
+++ extra-x86_64/PKGBUILD 2011-08-31 11:03:18 UTC (rev 136649)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.5
-pkgrel=3
-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
- gdk_Make_background_changes_queue_a_repaint.patch)
-sha256sums=('d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3'
- 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
- '3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93')
-
-build() {
- cd "${srcdir}/gtk+-${pkgver}"
- patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
- patch -NRp1 -i "${srcdir}/gdk_Make_background_changes_queue_a_repaint.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="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-x86_64/PKGBUILD (from rev 136648, gtk2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-08-31 11:03:18 UTC (rev 136649)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.6
+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=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca'
+ '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="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
+}
Deleted: extra-x86_64/gdk_Make_background_changes_queue_a_repaint.patch
===================================================================
--- extra-x86_64/gdk_Make_background_changes_queue_a_repaint.patch 2011-08-31 11:02:18 UTC (rev 136648)
+++ extra-x86_64/gdk_Make_background_changes_queue_a_repaint.patch 2011-08-31 11:03:18 UTC (rev 136649)
@@ -1,55 +0,0 @@
-From 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte at redhat.com>
-Date: Thu, 09 Jun 2011 04:29:45 +0000
-Subject: gdk: Make background changes queue a repaint
-
-For client-side windows, we need to queue a repaint when the background
-changes. For native windows, the windowing system does take care of it,
-but client-side windows are our own, so we gotta do it manually.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=652102
----
-diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index f058570..10d83ab 100644
---- a/gdk/gdkwindow.c
-+++ b/gdk/gdkwindow.c
-@@ -8004,11 +8004,15 @@ gdk_window_set_background (GdkWindow *window,
- }
-
- if (!GDK_WINDOW_DESTROYED (window) &&
-- gdk_window_has_impl (private) &&
- !private->input_only)
- {
-- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-- impl_iface->set_background (window, &private->bg_color);
-+ if (gdk_window_has_impl (private))
-+ {
-+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+ impl_iface->set_background (window, &private->bg_color);
-+ }
-+ else
-+ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
- }
- }
-
-@@ -8077,11 +8081,15 @@ gdk_window_set_back_pixmap (GdkWindow *window,
- private->bg_pixmap = GDK_NO_BG;
-
- if (!GDK_WINDOW_DESTROYED (window) &&
-- gdk_window_has_impl (private) &&
- !private->input_only)
- {
-- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-- impl_iface->set_back_pixmap (window, private->bg_pixmap);
-+ if (gdk_window_has_impl (private))
-+ {
-+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+ impl_iface->set_back_pixmap (window, private->bg_pixmap);
-+ }
-+ else
-+ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
- }
- }
-
---
-cgit v0.9
Deleted: extra-x86_64/gtk2.install
===================================================================
--- extra-x86_64/gtk2.install 2011-08-31 11:02:18 UTC (rev 136648)
+++ extra-x86_64/gtk2.install 2011-08-31 11:03:18 UTC (rev 136649)
@@ -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-x86_64/gtk2.install (from rev 136648, gtk2/trunk/gtk2.install)
===================================================================
--- extra-x86_64/gtk2.install (rev 0)
+++ extra-x86_64/gtk2.install 2011-08-31 11:03:18 UTC (rev 136649)
@@ -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-x86_64/xid-collision-debug.patch
===================================================================
--- extra-x86_64/xid-collision-debug.patch 2011-08-31 11:02:18 UTC (rev 136648)
+++ extra-x86_64/xid-collision-debug.patch 2011-08-31 11:03:18 UTC (rev 136649)
@@ -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-x86_64/xid-collision-debug.patch (from rev 136648, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- extra-x86_64/xid-collision-debug.patch (rev 0)
+++ extra-x86_64/xid-collision-debug.patch 2011-08-31 11:03:18 UTC (rev 136649)
@@ -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