Date: Saturday, April 15, 2023 @ 22:43:33
Author: heftig
Revision: 474082
archrelease: copy trunk to extra-x86_64
Added:
gtk2/repos/extra-x86_64/PKGBUILD
(from rev 474080, gtk2/trunk/PKGBUILD)
gtk2/repos/extra-x86_64/gtk-query-immodules-2.0.hook
(from rev 474080, gtk2/trunk/gtk-query-immodules-2.0.hook)
gtk2/repos/extra-x86_64/gtk2.install
(from rev 474080, gtk2/trunk/gtk2.install)
gtk2/repos/extra-x86_64/gtkrc
(from rev 474080, gtk2/trunk/gtkrc)
gtk2/repos/extra-x86_64/xid-collision-debug.patch
(from rev 474080, 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 | 157 +++++++++++++++++++++++------------------
gtk-query-immodules-2.0.hook | 22 ++---
gtk2.install | 6 -
gtkrc | 6 -
xid-collision-debug.patch | 36 ++++-----
5 files changed, 124 insertions(+), 103 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-15 22:43:33 UTC (rev 474081)
+++ PKGBUILD 2023-04-15 22:43:33 UTC (rev 474082)
@@ -1,66 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Maintainer: Jan de Groot <[email protected]>
-
-pkgname=gtk2
-pkgver=2.24.33
-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'
- 'python: gtk-builder-convert')
-provides=(libgailutil.so libg{d,t}k-x11-2.0.so)
-license=(LGPL)
-install=gtk2.install
-_commit=68631945733158f164427db84f01301d7e875763 # tags/2.24.33^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'
- '7724a55c4916318ed81b22f21c37c0a66e78adce017563fed6d84d813a4b80bc')
-
-pkgver() {
- cd gtk
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd gtk
- git apply -3 ../xid-collision-debug.patch
- 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 474080, gtk2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-15 22:43:33 UTC (rev 474082)
@@ -0,0 +1,91 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Maintainer: Jan de Groot <[email protected]>
+
+pkgname=gtk2
+pkgver=2.24.33
+pkgrel=3
+pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
+url="https://www.gtk.org/";
+arch=(x86_64)
+depends=(
+ atk
+ cairo
+ desktop-file-utils
+ gtk-update-icon-cache
+ libcups
+ librsvg
+ libxcomposite
+ libxcursor
+ libxdamage
+ libxi
+ libxinerama
+ libxrandr
+ pango
+ shared-mime-info
+)
+makedepends=(
+ git
+ gobject-introspection
+ gtk-doc
+)
+optdepends=(
+ 'adwaita-icon-theme: Default icon theme'
+ 'gnome-themes-standard: Default widget theme'
+ 'python: gtk-builder-convert'
+)
+provides=(
+ libgailutil.so
+ libg{d,t}k-x11-2.0.so
+)
+license=(LGPL)
+install=gtk2.install
+_commit=68631945733158f164427db84f01301d7e875763 # tags/2.24.33^0
+source=(
+ "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit";
+ gtkrc
+ gtk-query-immodules-2.0.hook
+ xid-collision-debug.patch
+)
+b2sums=('SKIP'
+
'0583436972edcebb09ce6c3f445f6ea4d7f92132da0ef317ee93665b646061ba261281b0186ed6655e63bbb668c58e37f6987919d4c054ccda19ca034aa718dc'
+
'9c531f9f605e1739e13c39c1cac22daddd9574f3082f18bcf0b9dfaa4c41f2485d55be03a9ed12fb4504d509f0d5ac63980a9d9349e3f80a06595c6430c78096'
+
'c35b2f16ea3402f41a7a5ac83a93b423e46f9355e11186742402887ba94fc58e9a5c1d7fc55141fab72f230a973c5ac6346090b225a5eff9e416e397bd1b1ec4')
+
+pkgver() {
+ cd gtk
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd gtk
+ git apply -3 ../xid-collision-debug.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ local configure_options=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --localstatedir=/var
+ --with-xinput=yes
+ --disable-gtk-doc
+ )
+
+ cd gtk
+ ./configure "${configure_options[@]}"
+ 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
+
+ # Built by GTK 4, shared with GTK 2/3
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: gtk-query-immodules-2.0.hook
===================================================================
--- gtk-query-immodules-2.0.hook 2023-04-15 22:43:33 UTC (rev 474081)
+++ gtk-query-immodules-2.0.hook 2023-04-15 22:43:33 UTC (rev 474082)
@@ -1,11 +0,0 @@
-[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
Copied: gtk2/repos/extra-x86_64/gtk-query-immodules-2.0.hook (from rev 474080,
gtk2/trunk/gtk-query-immodules-2.0.hook)
===================================================================
--- gtk-query-immodules-2.0.hook (rev 0)
+++ gtk-query-immodules-2.0.hook 2023-04-15 22:43:33 UTC (rev 474082)
@@ -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 2023-04-15 22:43:33 UTC (rev 474081)
+++ gtk2.install 2023-04-15 22:43:33 UTC (rev 474082)
@@ -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 474080,
gtk2/trunk/gtk2.install)
===================================================================
--- gtk2.install (rev 0)
+++ gtk2.install 2023-04-15 22:43:33 UTC (rev 474082)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}
Deleted: gtkrc
===================================================================
--- gtkrc 2023-04-15 22:43:33 UTC (rev 474081)
+++ gtkrc 2023-04-15 22:43:33 UTC (rev 474082)
@@ -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 474080, gtk2/trunk/gtkrc)
===================================================================
--- gtkrc (rev 0)
+++ gtkrc 2023-04-15 22:43:33 UTC (rev 474082)
@@ -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 2023-04-15 22:43:33 UTC (rev 474081)
+++ xid-collision-debug.patch 2023-04-15 22:43:33 UTC (rev 474082)
@@ -1,20 +0,0 @@
- gdk/x11/gdkxid.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git c/gdk/x11/gdkxid.c i/gdk/x11/gdkxid.c
-index 1005f9e40c..71578f8fcf 100644
---- c/gdk/x11/gdkxid.c
-+++ i/gdk/x11/gdkxid.c
-@@ -56,10 +56,10 @@ _gdk_xid_table_insert (GdkDisplay *display,
- 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 474080,
gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- xid-collision-debug.patch (rev 0)
+++ xid-collision-debug.patch 2023-04-15 22:43:33 UTC (rev 474082)
@@ -0,0 +1,16 @@
+ gdk/x11/gdkxid.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/gdk/x11/gdkxid.c i/gdk/x11/gdkxid.c
+index 1005f9e40c..1523fa70b2 100644
+--- c/gdk/x11/gdkxid.c
++++ i/gdk/x11/gdkxid.c
+@@ -58,7 +58,7 @@ _gdk_xid_table_insert (GdkDisplay *display,
+ (GEqualFunc) gdk_xid_equal);
+
+ if (g_hash_table_lookup (display_x11->xid_ht, xid))
+- g_warning ("XID collision, trouble ahead");
++ g_debug ("XID collision, trouble ahead");
+
+ g_hash_table_insert (display_x11->xid_ht, xid, data);
+ }
