[arch-commits] Commit in gtk2/repos (16 files)
Jan Steffens
heftig at archlinux.org
Sat Mar 5 19:29:36 UTC 2016
Date: Saturday, March 5, 2016 @ 20:29:36
Author: heftig
Revision: 260968
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gtk2/repos/extra-i686/PKGBUILD
(from rev 260967, gtk2/trunk/PKGBUILD)
gtk2/repos/extra-i686/gtk2.install
(from rev 260967, gtk2/trunk/gtk2.install)
gtk2/repos/extra-i686/gtkrc
(from rev 260967, gtk2/trunk/gtkrc)
gtk2/repos/extra-i686/xid-collision-debug.patch
(from rev 260967, gtk2/trunk/xid-collision-debug.patch)
gtk2/repos/extra-x86_64/PKGBUILD
(from rev 260967, gtk2/trunk/PKGBUILD)
gtk2/repos/extra-x86_64/gtk2.install
(from rev 260967, gtk2/trunk/gtk2.install)
gtk2/repos/extra-x86_64/gtkrc
(from rev 260967, gtk2/trunk/gtkrc)
gtk2/repos/extra-x86_64/xid-collision-debug.patch
(from rev 260967, gtk2/trunk/xid-collision-debug.patch)
Deleted:
gtk2/repos/extra-i686/PKGBUILD
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/gtk2.install
gtk2/repos/extra-x86_64/gtkrc
gtk2/repos/extra-x86_64/xid-collision-debug.patch
----------------------------------------+
/PKGBUILD | 108 +++++++++++++++++++++++++++++++
/gtk2.install | 34 +++++++++
/gtkrc | 6 +
/xid-collision-debug.patch | 30 ++++++++
extra-i686/PKGBUILD | 53 ---------------
extra-i686/gtk2.install | 17 ----
extra-i686/gtkrc | 3
extra-i686/xid-collision-debug.patch | 15 ----
extra-x86_64/PKGBUILD | 53 ---------------
extra-x86_64/gtk2.install | 17 ----
extra-x86_64/gtkrc | 3
extra-x86_64/xid-collision-debug.patch | 15 ----
12 files changed, 178 insertions(+), 176 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-03-05 19:21:16 UTC (rev 260967)
+++ extra-i686/PKGBUILD 2016-03-05 19:29:36 UTC (rev 260968)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gtk2
-pkgver=2.24.29
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
- shared-mime-info cairo libcups gtk-update-icon-cache librsvg)
-makedepends=(gobject-introspection python2)
-optdepends=('gnome-themes-standard: Default widget theme'
- 'adwaita-icon-theme: Default icon theme')
-license=(LGPL)
-install=gtk2.install
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
- gtkrc xid-collision-debug.patch)
-sha256sums=('0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8'
- 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
- '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() {
- 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"
-
- rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-# vim:set noet sw=4:
Copied: gtk2/repos/extra-i686/PKGBUILD (from rev 260967, gtk2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-03-05 19:29:36 UTC (rev 260968)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gtk2
+pkgver=2.24.30
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
+ shared-mime-info cairo libcups gtk-update-icon-cache librsvg)
+makedepends=(gobject-introspection python2)
+optdepends=('gnome-themes-standard: Default widget theme'
+ 'adwaita-icon-theme: Default icon theme')
+license=(LGPL)
+install=gtk2.install
+source=(https://download.gnome.org/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+ gtkrc xid-collision-debug.patch)
+sha256sums=('0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50'
+ 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
+ '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() {
+ 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"
+
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+ rm -r "$pkgdir/usr/share/gtk-doc"
+}
+
+# vim:set noet sw=4:
Deleted: extra-i686/gtk2.install
===================================================================
--- extra-i686/gtk2.install 2016-03-05 19:21:16 UTC (rev 260967)
+++ extra-i686/gtk2.install 2016-03-05 19:29:36 UTC (rev 260968)
@@ -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 260967, gtk2/trunk/gtk2.install)
===================================================================
--- extra-i686/gtk2.install (rev 0)
+++ extra-i686/gtk2.install 2016-03-05 19:29:36 UTC (rev 260968)
@@ -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 2016-03-05 19:21:16 UTC (rev 260967)
+++ extra-i686/gtkrc 2016-03-05 19:29:36 UTC (rev 260968)
@@ -1,3 +0,0 @@
-gtk-icon-theme-name = "Adwaita"
-gtk-theme-name = "Adwaita"
-gtk-font-name = "Cantarell 11"
Copied: gtk2/repos/extra-i686/gtkrc (from rev 260967, gtk2/trunk/gtkrc)
===================================================================
--- extra-i686/gtkrc (rev 0)
+++ extra-i686/gtkrc 2016-03-05 19:29:36 UTC (rev 260968)
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "Adwaita"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
Deleted: extra-i686/xid-collision-debug.patch
===================================================================
--- extra-i686/xid-collision-debug.patch 2016-03-05 19:21:16 UTC (rev 260967)
+++ extra-i686/xid-collision-debug.patch 2016-03-05 19:29:36 UTC (rev 260968)
@@ -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 260967, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- extra-i686/xid-collision-debug.patch (rev 0)
+++ extra-i686/xid-collision-debug.patch 2016-03-05 19:29:36 UTC (rev 260968)
@@ -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 2016-03-05 19:21:16 UTC (rev 260967)
+++ extra-x86_64/PKGBUILD 2016-03-05 19:29:36 UTC (rev 260968)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gtk2
-pkgver=2.24.29
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
- shared-mime-info cairo libcups gtk-update-icon-cache librsvg)
-makedepends=(gobject-introspection python2)
-optdepends=('gnome-themes-standard: Default widget theme'
- 'adwaita-icon-theme: Default icon theme')
-license=(LGPL)
-install=gtk2.install
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
- gtkrc xid-collision-debug.patch)
-sha256sums=('0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8'
- 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
- '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() {
- 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"
-
- rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-# vim:set noet sw=4:
Copied: gtk2/repos/extra-x86_64/PKGBUILD (from rev 260967, gtk2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-03-05 19:29:36 UTC (rev 260968)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gtk2
+pkgver=2.24.30
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
+ shared-mime-info cairo libcups gtk-update-icon-cache librsvg)
+makedepends=(gobject-introspection python2)
+optdepends=('gnome-themes-standard: Default widget theme'
+ 'adwaita-icon-theme: Default icon theme')
+license=(LGPL)
+install=gtk2.install
+source=(https://download.gnome.org/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+ gtkrc xid-collision-debug.patch)
+sha256sums=('0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50'
+ 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
+ '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() {
+ 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"
+
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+ rm -r "$pkgdir/usr/share/gtk-doc"
+}
+
+# vim:set noet sw=4:
Deleted: extra-x86_64/gtk2.install
===================================================================
--- extra-x86_64/gtk2.install 2016-03-05 19:21:16 UTC (rev 260967)
+++ extra-x86_64/gtk2.install 2016-03-05 19:29:36 UTC (rev 260968)
@@ -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 260967, gtk2/trunk/gtk2.install)
===================================================================
--- extra-x86_64/gtk2.install (rev 0)
+++ extra-x86_64/gtk2.install 2016-03-05 19:29:36 UTC (rev 260968)
@@ -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 2016-03-05 19:21:16 UTC (rev 260967)
+++ extra-x86_64/gtkrc 2016-03-05 19:29:36 UTC (rev 260968)
@@ -1,3 +0,0 @@
-gtk-icon-theme-name = "Adwaita"
-gtk-theme-name = "Adwaita"
-gtk-font-name = "Cantarell 11"
Copied: gtk2/repos/extra-x86_64/gtkrc (from rev 260967, gtk2/trunk/gtkrc)
===================================================================
--- extra-x86_64/gtkrc (rev 0)
+++ extra-x86_64/gtkrc 2016-03-05 19:29:36 UTC (rev 260968)
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "Adwaita"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
Deleted: extra-x86_64/xid-collision-debug.patch
===================================================================
--- extra-x86_64/xid-collision-debug.patch 2016-03-05 19:21:16 UTC (rev 260967)
+++ extra-x86_64/xid-collision-debug.patch 2016-03-05 19:29:36 UTC (rev 260968)
@@ -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 260967, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- extra-x86_64/xid-collision-debug.patch (rev 0)
+++ extra-x86_64/xid-collision-debug.patch 2016-03-05 19:29:36 UTC (rev 260968)
@@ -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