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

Jan Steffens heftig at archlinux.org
Wed May 6 13:20:35 UTC 2015


    Date: Wednesday, May 6, 2015 @ 15:20:34
  Author: heftig
Revision: 238548

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gtk2/repos/extra-i686/PKGBUILD
    (from rev 238547, gtk2/trunk/PKGBUILD)
  gtk2/repos/extra-i686/gtk-update-icon-cache.install
    (from rev 238547, gtk2/trunk/gtk-update-icon-cache.install)
  gtk2/repos/extra-i686/gtk2.install
    (from rev 238547, gtk2/trunk/gtk2.install)
  gtk2/repos/extra-i686/gtkrc
    (from rev 238547, gtk2/trunk/gtkrc)
  gtk2/repos/extra-i686/xid-collision-debug.patch
    (from rev 238547, gtk2/trunk/xid-collision-debug.patch)
  gtk2/repos/extra-x86_64/PKGBUILD
    (from rev 238547, gtk2/trunk/PKGBUILD)
  gtk2/repos/extra-x86_64/gtk-update-icon-cache.install
    (from rev 238547, gtk2/trunk/gtk-update-icon-cache.install)
  gtk2/repos/extra-x86_64/gtk2.install
    (from rev 238547, gtk2/trunk/gtk2.install)
  gtk2/repos/extra-x86_64/gtkrc
    (from rev 238547, gtk2/trunk/gtkrc)
  gtk2/repos/extra-x86_64/xid-collision-debug.patch
    (from rev 238547, gtk2/trunk/xid-collision-debug.patch)
Deleted:
  gtk2/repos/extra-i686/PKGBUILD
  gtk2/repos/extra-i686/gtk-update-icon-cache.install
  gtk2/repos/extra-i686/gtk2.install
  gtk2/repos/extra-i686/gtkrc
  gtk2/repos/extra-i686/xid-collision-debug.patch
  gtk2/repos/extra-x86_64/PKGBUILD
  gtk2/repos/extra-x86_64/gtk-update-icon-cache.install
  gtk2/repos/extra-x86_64/gtk2.install
  gtk2/repos/extra-x86_64/gtkrc
  gtk2/repos/extra-x86_64/xid-collision-debug.patch

--------------------------------------------+
 /PKGBUILD                                  |  130 +++++++++++++++++++++++++++
 /gtk-update-icon-cache.install             |    6 +
 /gtk2.install                              |   34 +++++++
 /gtkrc                                     |    6 +
 /xid-collision-debug.patch                 |   30 ++++++
 extra-i686/PKGBUILD                        |   64 -------------
 extra-i686/gtk-update-icon-cache.install   |    3 
 extra-i686/gtk2.install                    |   17 ---
 extra-i686/gtkrc                           |    3 
 extra-i686/xid-collision-debug.patch       |   15 ---
 extra-x86_64/PKGBUILD                      |   64 -------------
 extra-x86_64/gtk-update-icon-cache.install |    3 
 extra-x86_64/gtk2.install                  |   17 ---
 extra-x86_64/gtkrc                         |    3 
 extra-x86_64/xid-collision-debug.patch     |   15 ---
 15 files changed, 206 insertions(+), 204 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-i686/PKGBUILD	2015-05-06 13:20:34 UTC (rev 238548)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.27
-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' 'python2')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        gtkrc xid-collision-debug.patch)
-sha256sums=('20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4'
-            'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-prepare() {
-    cd gtk+-$pkgver
-    patch -Np1 -i ../xid-collision-debug.patch
-}
-
-build() {
-    cd gtk+-$pkgver
-
-    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')
-    optdepends=('gnome-themes-standard: Default widget theme'
-                'gnome-icon-theme: Default icon theme')
-    replaces=('gtk2-docs')
-
-    cd gtk+-$pkgver
-    make DESTDIR="$pkgdir" install
-
-    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
-
-    install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/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>=2.24.1-3' 'hicolor-icon-theme')
-    install=gtk-update-icon-cache.install
-
-    cd 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 238547, gtk2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-05-06 13:20:34 UTC (rev 238548)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.27
+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' 'python2'
+             'librsvg')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+        gtkrc xid-collision-debug.patch)
+sha256sums=('20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4'
+            'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+prepare() {
+    cd gtk+-$pkgver
+    patch -Np1 -i ../xid-collision-debug.patch
+}
+
+build() {
+    cd gtk+-$pkgver
+
+    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' 'librsvg')
+    optdepends=('gnome-themes-standard: Default widget theme'
+                'gnome-icon-theme: Default icon theme')
+    replaces=('gtk2-docs')
+
+    cd gtk+-$pkgver
+    make DESTDIR="$pkgdir" install
+
+    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+
+    install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/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>=2.24.1-3' 'hicolor-icon-theme')
+    install=gtk-update-icon-cache.install
+
+    cd gtk+-$pkgver/gtk
+    install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+}

Deleted: extra-i686/gtk-update-icon-cache.install
===================================================================
--- extra-i686/gtk-update-icon-cache.install	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-i686/gtk-update-icon-cache.install	2015-05-06 13:20:34 UTC (rev 238548)
@@ -1,3 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}

Copied: gtk2/repos/extra-i686/gtk-update-icon-cache.install (from rev 238547, gtk2/trunk/gtk-update-icon-cache.install)
===================================================================
--- extra-i686/gtk-update-icon-cache.install	                        (rev 0)
+++ extra-i686/gtk-update-icon-cache.install	2015-05-06 13:20:34 UTC (rev 238548)
@@ -0,0 +1,3 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}

Deleted: extra-i686/gtk2.install
===================================================================
--- extra-i686/gtk2.install	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-i686/gtk2.install	2015-05-06 13:20:34 UTC (rev 238548)
@@ -1,17 +0,0 @@
-post_install() {
-    /usr/bin/gtk-query-immodules-2.0 --update-cache
-}
-
-pre_upgrade() {
-    if (( $(vercmp $2 2.24.20) < 0 )); then
-        rm -f /etc/gtk-2.0/gtk.immodules
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
-}

Copied: gtk2/repos/extra-i686/gtk2.install (from rev 238547, gtk2/trunk/gtk2.install)
===================================================================
--- extra-i686/gtk2.install	                        (rev 0)
+++ extra-i686/gtk2.install	2015-05-06 13:20:34 UTC (rev 238548)
@@ -0,0 +1,17 @@
+post_install() {
+    /usr/bin/gtk-query-immodules-2.0 --update-cache
+}
+
+pre_upgrade() {
+    if (( $(vercmp $2 2.24.20) < 0 )); then
+        rm -f /etc/gtk-2.0/gtk.immodules
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}

Deleted: extra-i686/gtkrc
===================================================================
--- extra-i686/gtkrc	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-i686/gtkrc	2015-05-06 13:20:34 UTC (rev 238548)
@@ -1,3 +0,0 @@
-gtk-icon-theme-name = "gnome"
-gtk-theme-name = "Adwaita"
-gtk-font-name = "Cantarell 11"

Copied: gtk2/repos/extra-i686/gtkrc (from rev 238547, gtk2/trunk/gtkrc)
===================================================================
--- extra-i686/gtkrc	                        (rev 0)
+++ extra-i686/gtkrc	2015-05-06 13:20:34 UTC (rev 238548)
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "gnome"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"

Deleted: extra-i686/xid-collision-debug.patch
===================================================================
--- extra-i686/xid-collision-debug.patch	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-i686/xid-collision-debug.patch	2015-05-06 13:20:34 UTC (rev 238548)
@@ -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 238547, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- extra-i686/xid-collision-debug.patch	                        (rev 0)
+++ extra-i686/xid-collision-debug.patch	2015-05-06 13:20:34 UTC (rev 238548)
@@ -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	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-x86_64/PKGBUILD	2015-05-06 13:20:34 UTC (rev 238548)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.27
-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' 'python2')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        gtkrc xid-collision-debug.patch)
-sha256sums=('20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4'
-            'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-prepare() {
-    cd gtk+-$pkgver
-    patch -Np1 -i ../xid-collision-debug.patch
-}
-
-build() {
-    cd gtk+-$pkgver
-
-    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')
-    optdepends=('gnome-themes-standard: Default widget theme'
-                'gnome-icon-theme: Default icon theme')
-    replaces=('gtk2-docs')
-
-    cd gtk+-$pkgver
-    make DESTDIR="$pkgdir" install
-
-    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
-
-    install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/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>=2.24.1-3' 'hicolor-icon-theme')
-    install=gtk-update-icon-cache.install
-
-    cd 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 238547, gtk2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-05-06 13:20:34 UTC (rev 238548)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.27
+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' 'python2'
+             'librsvg')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+        gtkrc xid-collision-debug.patch)
+sha256sums=('20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4'
+            'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+prepare() {
+    cd gtk+-$pkgver
+    patch -Np1 -i ../xid-collision-debug.patch
+}
+
+build() {
+    cd gtk+-$pkgver
+
+    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' 'librsvg')
+    optdepends=('gnome-themes-standard: Default widget theme'
+                'gnome-icon-theme: Default icon theme')
+    replaces=('gtk2-docs')
+
+    cd gtk+-$pkgver
+    make DESTDIR="$pkgdir" install
+
+    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+
+    install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/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>=2.24.1-3' 'hicolor-icon-theme')
+    install=gtk-update-icon-cache.install
+
+    cd gtk+-$pkgver/gtk
+    install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+}

Deleted: extra-x86_64/gtk-update-icon-cache.install
===================================================================
--- extra-x86_64/gtk-update-icon-cache.install	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-x86_64/gtk-update-icon-cache.install	2015-05-06 13:20:34 UTC (rev 238548)
@@ -1,3 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}

Copied: gtk2/repos/extra-x86_64/gtk-update-icon-cache.install (from rev 238547, gtk2/trunk/gtk-update-icon-cache.install)
===================================================================
--- extra-x86_64/gtk-update-icon-cache.install	                        (rev 0)
+++ extra-x86_64/gtk-update-icon-cache.install	2015-05-06 13:20:34 UTC (rev 238548)
@@ -0,0 +1,3 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}

Deleted: extra-x86_64/gtk2.install
===================================================================
--- extra-x86_64/gtk2.install	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-x86_64/gtk2.install	2015-05-06 13:20:34 UTC (rev 238548)
@@ -1,17 +0,0 @@
-post_install() {
-    /usr/bin/gtk-query-immodules-2.0 --update-cache
-}
-
-pre_upgrade() {
-    if (( $(vercmp $2 2.24.20) < 0 )); then
-        rm -f /etc/gtk-2.0/gtk.immodules
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
-}

Copied: gtk2/repos/extra-x86_64/gtk2.install (from rev 238547, gtk2/trunk/gtk2.install)
===================================================================
--- extra-x86_64/gtk2.install	                        (rev 0)
+++ extra-x86_64/gtk2.install	2015-05-06 13:20:34 UTC (rev 238548)
@@ -0,0 +1,17 @@
+post_install() {
+    /usr/bin/gtk-query-immodules-2.0 --update-cache
+}
+
+pre_upgrade() {
+    if (( $(vercmp $2 2.24.20) < 0 )); then
+        rm -f /etc/gtk-2.0/gtk.immodules
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}

Deleted: extra-x86_64/gtkrc
===================================================================
--- extra-x86_64/gtkrc	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-x86_64/gtkrc	2015-05-06 13:20:34 UTC (rev 238548)
@@ -1,3 +0,0 @@
-gtk-icon-theme-name = "gnome"
-gtk-theme-name = "Adwaita"
-gtk-font-name = "Cantarell 11"

Copied: gtk2/repos/extra-x86_64/gtkrc (from rev 238547, gtk2/trunk/gtkrc)
===================================================================
--- extra-x86_64/gtkrc	                        (rev 0)
+++ extra-x86_64/gtkrc	2015-05-06 13:20:34 UTC (rev 238548)
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "gnome"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"

Deleted: extra-x86_64/xid-collision-debug.patch
===================================================================
--- extra-x86_64/xid-collision-debug.patch	2015-05-06 13:16:12 UTC (rev 238547)
+++ extra-x86_64/xid-collision-debug.patch	2015-05-06 13:20:34 UTC (rev 238548)
@@ -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 238547, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- extra-x86_64/xid-collision-debug.patch	                        (rev 0)
+++ extra-x86_64/xid-collision-debug.patch	2015-05-06 13:20:34 UTC (rev 238548)
@@ -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