[arch-commits] Commit in gtk2/repos/extra-x86_64 (10 files)
Jan Steffens
heftig at archlinux.org
Sat Feb 22 20:44:23 UTC 2020
Date: Saturday, February 22, 2020 @ 20:44:21
Author: heftig
Revision: 376067
archrelease: copy trunk to extra-x86_64
Added:
gtk2/repos/extra-x86_64/PKGBUILD
(from rev 376065, gtk2/trunk/PKGBUILD)
gtk2/repos/extra-x86_64/gtk-query-immodules-2.0.hook
(from rev 376065, gtk2/trunk/gtk-query-immodules-2.0.hook)
gtk2/repos/extra-x86_64/gtk2.install
(from rev 376065, gtk2/trunk/gtk2.install)
gtk2/repos/extra-x86_64/gtkrc
(from rev 376065, gtk2/trunk/gtkrc)
gtk2/repos/extra-x86_64/xid-collision-debug.patch
(from rev 376065, gtk2/trunk/xid-collision-debug.patch)
Deleted:
gtk2/repos/extra-x86_64/PKGBUILD
gtk2/repos/extra-x86_64/gtk-query-immodules-2.0.hook
gtk2/repos/extra-x86_64/gtk2.install
gtk2/repos/extra-x86_64/gtkrc
gtk2/repos/extra-x86_64/xid-collision-debug.patch
------------------------------+
PKGBUILD | 132 ++++++++++++++++++++---------------------
gtk-query-immodules-2.0.hook | 22 +++---
gtk2.install | 6 -
gtkrc | 6 -
xid-collision-debug.patch | 30 ++++-----
5 files changed, 99 insertions(+), 97 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-22 20:44:17 UTC (rev 376066)
+++ PKGBUILD 2020-02-22 20:44:21 UTC (rev 376067)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gtk2
-pkgver=2.24.32
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
-arch=(x86_64)
-url="https://www.gtk.org/"
-depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
- shared-mime-info cairo libcups gtk-update-icon-cache librsvg desktop-file-utils)
-makedepends=(gobject-introspection python2 git gtk-doc)
-optdepends=('gnome-themes-standard: Default widget theme'
- 'adwaita-icon-theme: Default icon theme')
-license=(LGPL)
-install=gtk2.install
-_commit=ed7d3e25f8b6debae6ccc8b50d1329155338cab8 # tags/2.24.32^0
-source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"
- gtkrc
- gtk-query-immodules-2.0.hook
- xid-collision-debug.patch)
-sha256sums=('SKIP'
- 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
- '9656a1efc798da1ac2dae94e921ed0f72719bd52d4d0138f305b993f778f7758'
- 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-pkgver() {
- cd gtk+
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd gtk+
- patch -Np1 -i ../xid-collision-debug.patch
- sed -i '1s/python$/&2/' gtk/gtk-builder-convert
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd gtk+
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-xinput=yes \
- --disable-gtk-doc
-
- # 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+
- make DESTDIR="$pkgdir" install
-
- install -Dt "$pkgdir/usr/share/gtk-2.0" -m644 ../gtkrc
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../gtk-query-immodules-2.0.hook
-
- rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-# vim:set et sw=2:
Copied: gtk2/repos/extra-x86_64/PKGBUILD (from rev 376065, gtk2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-02-22 20:44:21 UTC (rev 376067)
@@ -0,0 +1,67 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gtk2
+pkgver=2.24.32
+pkgrel=2
+pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
+arch=(x86_64)
+url="https://www.gtk.org/"
+depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
+ shared-mime-info cairo libcups gtk-update-icon-cache librsvg desktop-file-utils)
+makedepends=(gobject-introspection git gtk-doc)
+optdepends=('gnome-themes-standard: Default widget theme'
+ 'adwaita-icon-theme: Default icon theme'
+ 'python2: gtk-builder-convert')
+provides=(libgailutil.so libg{d,t}k-x11-2.0.so)
+license=(LGPL)
+install=gtk2.install
+_commit=ed7d3e25f8b6debae6ccc8b50d1329155338cab8 # tags/2.24.32^0
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+ gtkrc
+ gtk-query-immodules-2.0.hook
+ xid-collision-debug.patch)
+sha256sums=('SKIP'
+ 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
+ '427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425'
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+pkgver() {
+ cd gtk
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd gtk
+ git cherry-pick -n 2dbf31c0ea4f17a817b931c731f8de14c278300d
+ patch -Np1 -i ../xid-collision-debug.patch
+ sed -i '1s/python$/&2/' gtk/gtk-builder-convert
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd gtk
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-xinput=yes \
+ --disable-gtk-doc
+
+ # 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
+ make DESTDIR="$pkgdir" install
+
+ install -Dt "$pkgdir/usr/share/gtk-2.0" -m644 ../gtkrc
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../gtk-query-immodules-2.0.hook
+
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+# vim:set et sw=2:
Deleted: gtk-query-immodules-2.0.hook
===================================================================
--- gtk-query-immodules-2.0.hook 2020-02-22 20:44:17 UTC (rev 376066)
+++ gtk-query-immodules-2.0.hook 2020-02-22 20:44:21 UTC (rev 376067)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-2.0/2.10.0/immodules/*.so
-
-[Action]
-Description = Probing GTK2 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-2.0 --update-cache
Copied: gtk2/repos/extra-x86_64/gtk-query-immodules-2.0.hook (from rev 376065, gtk2/trunk/gtk-query-immodules-2.0.hook)
===================================================================
--- gtk-query-immodules-2.0.hook (rev 0)
+++ gtk-query-immodules-2.0.hook 2020-02-22 20:44:21 UTC (rev 376067)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-2.0/2.10.0/immodules/*.so
+
+[Action]
+Description = Probing GTK2 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-2.0 --update-cache
Deleted: gtk2.install
===================================================================
--- gtk2.install 2020-02-22 20:44:17 UTC (rev 376066)
+++ gtk2.install 2020-02-22 20:44:21 UTC (rev 376067)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
-}
Copied: gtk2/repos/extra-x86_64/gtk2.install (from rev 376065, gtk2/trunk/gtk2.install)
===================================================================
--- gtk2.install (rev 0)
+++ gtk2.install 2020-02-22 20:44:21 UTC (rev 376067)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}
Deleted: gtkrc
===================================================================
--- gtkrc 2020-02-22 20:44:17 UTC (rev 376066)
+++ gtkrc 2020-02-22 20:44:21 UTC (rev 376067)
@@ -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 376065, gtk2/trunk/gtkrc)
===================================================================
--- gtkrc (rev 0)
+++ gtkrc 2020-02-22 20:44:21 UTC (rev 376067)
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "Adwaita"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
Deleted: xid-collision-debug.patch
===================================================================
--- xid-collision-debug.patch 2020-02-22 20:44:17 UTC (rev 376066)
+++ xid-collision-debug.patch 2020-02-22 20:44:21 UTC (rev 376067)
@@ -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 376065, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- xid-collision-debug.patch (rev 0)
+++ xid-collision-debug.patch 2020-02-22 20:44:21 UTC (rev 376067)
@@ -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