[arch-commits] Commit in gtk3/repos/extra-x86_64 (15 files)

Jan Steffens heftig at archlinux.org
Sun Apr 5 18:58:58 UTC 2020


    Date: Sunday, April 5, 2020 @ 18:58:57
  Author: heftig
Revision: 379592

archrelease: copy trunk to extra-x86_64

Added:
  gtk3/repos/extra-x86_64/1633.patch
    (from rev 379591, gtk3/trunk/1633.patch)
  gtk3/repos/extra-x86_64/1634.patch
    (from rev 379591, gtk3/trunk/1634.patch)
  gtk3/repos/extra-x86_64/PKGBUILD
    (from rev 379591, gtk3/trunk/PKGBUILD)
  gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
    (from rev 379591, gtk3/trunk/gtk-query-immodules-3.0.hook)
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
    (from rev 379591, gtk3/trunk/gtk-update-icon-cache.hook)
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
    (from rev 379591, gtk3/trunk/gtk-update-icon-cache.script)
  gtk3/repos/extra-x86_64/gtk3.install
    (from rev 379591, gtk3/trunk/gtk3.install)
  gtk3/repos/extra-x86_64/settings.ini
    (from rev 379591, gtk3/trunk/settings.ini)
Deleted:
  gtk3/repos/extra-x86_64/1633.patch
  gtk3/repos/extra-x86_64/PKGBUILD
  gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
  gtk3/repos/extra-x86_64/gtk3.install
  gtk3/repos/extra-x86_64/settings.ini

------------------------------+
 1633.patch                   |  114 +++++++++++++--------------
 1634.patch                   |   43 ++++++++++
 PKGBUILD                     |  173 +++++++++++++++++++++--------------------
 gtk-query-immodules-3.0.hook |   22 ++---
 gtk-update-icon-cache.hook   |   26 +++---
 gtk-update-icon-cache.script |   20 ++--
 gtk3.install                 |    6 -
 settings.ini                 |    8 -
 8 files changed, 230 insertions(+), 182 deletions(-)

Deleted: 1633.patch
===================================================================
--- 1633.patch	2020-04-05 18:58:38 UTC (rev 379591)
+++ 1633.patch	2020-04-05 18:58:57 UTC (rev 379592)
@@ -1,57 +0,0 @@
-From 12fc9a45efcbb546eb7de13c5c4d3183f2f5a3b8 Mon Sep 17 00:00:00 2001
-From: William Wold <wm at wmww.sh>
-Date: Sun, 5 Apr 2020 05:26:24 -0400
-Subject: [PATCH 1/2] Do not require an initial configure for custom Wayland
- surfaces
-
-There is no way for custom Wayland surfaces to get configure events, so an
-initial configure event should not be required to resize a custom surface.
-
-Fixes #2578.
----
- gdk/wayland/gdkwindow-wayland.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
-index eba8361b21..5f39c5771c 100644
---- a/gdk/wayland/gdkwindow-wayland.c
-+++ b/gdk/wayland/gdkwindow-wayland.c
-@@ -1087,6 +1087,8 @@ needs_initial_configure (GdkWindow *window)
- 
-   if (impl->display_server.wl_subsurface)
-     return FALSE;
-+  else if (impl->use_custom_surface)
-+    return FALSE;
-   else if (is_realized_toplevel (window))
-     return TRUE;
-   else if (is_realized_popup (window))
--- 
-2.24.1
-
-
-From 5a52af20cba76474e631b2a7548963bcad22d66d Mon Sep 17 00:00:00 2001
-From: William Wold <wm at wmww.sh>
-Date: Sun, 5 Apr 2020 07:11:45 -0400
-Subject: [PATCH 2/2] Do not require an initial configure for DnD windows
-
-Fixes #2075
----
- gdk/wayland/gdkwindow-wayland.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
-index 5f39c5771c..04506508f3 100644
---- a/gdk/wayland/gdkwindow-wayland.c
-+++ b/gdk/wayland/gdkwindow-wayland.c
-@@ -1089,6 +1089,8 @@ needs_initial_configure (GdkWindow *window)
-     return FALSE;
-   else if (impl->use_custom_surface)
-     return FALSE;
-+  else if (impl->hint == GDK_WINDOW_TYPE_HINT_DND)
-+    return FALSE;
-   else if (is_realized_toplevel (window))
-     return TRUE;
-   else if (is_realized_popup (window))
--- 
-2.24.1
-

Copied: gtk3/repos/extra-x86_64/1633.patch (from rev 379591, gtk3/trunk/1633.patch)
===================================================================
--- 1633.patch	                        (rev 0)
+++ 1633.patch	2020-04-05 18:58:57 UTC (rev 379592)
@@ -0,0 +1,57 @@
+From 12fc9a45efcbb546eb7de13c5c4d3183f2f5a3b8 Mon Sep 17 00:00:00 2001
+From: William Wold <wm at wmww.sh>
+Date: Sun, 5 Apr 2020 05:26:24 -0400
+Subject: [PATCH 1/2] Do not require an initial configure for custom Wayland
+ surfaces
+
+There is no way for custom Wayland surfaces to get configure events, so an
+initial configure event should not be required to resize a custom surface.
+
+Fixes #2578.
+---
+ gdk/wayland/gdkwindow-wayland.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
+index eba8361b21..5f39c5771c 100644
+--- a/gdk/wayland/gdkwindow-wayland.c
++++ b/gdk/wayland/gdkwindow-wayland.c
+@@ -1087,6 +1087,8 @@ needs_initial_configure (GdkWindow *window)
+ 
+   if (impl->display_server.wl_subsurface)
+     return FALSE;
++  else if (impl->use_custom_surface)
++    return FALSE;
+   else if (is_realized_toplevel (window))
+     return TRUE;
+   else if (is_realized_popup (window))
+-- 
+2.24.1
+
+
+From 5a52af20cba76474e631b2a7548963bcad22d66d Mon Sep 17 00:00:00 2001
+From: William Wold <wm at wmww.sh>
+Date: Sun, 5 Apr 2020 07:11:45 -0400
+Subject: [PATCH 2/2] Do not require an initial configure for DnD windows
+
+Fixes #2075
+---
+ gdk/wayland/gdkwindow-wayland.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
+index 5f39c5771c..04506508f3 100644
+--- a/gdk/wayland/gdkwindow-wayland.c
++++ b/gdk/wayland/gdkwindow-wayland.c
+@@ -1089,6 +1089,8 @@ needs_initial_configure (GdkWindow *window)
+     return FALSE;
+   else if (impl->use_custom_surface)
+     return FALSE;
++  else if (impl->hint == GDK_WINDOW_TYPE_HINT_DND)
++    return FALSE;
+   else if (is_realized_toplevel (window))
+     return TRUE;
+   else if (is_realized_popup (window))
+-- 
+2.24.1
+

Copied: gtk3/repos/extra-x86_64/1634.patch (from rev 379591, gtk3/trunk/1634.patch)
===================================================================
--- 1634.patch	                        (rev 0)
+++ 1634.patch	2020-04-05 18:58:57 UTC (rev 379592)
@@ -0,0 +1,43 @@
+From 79732da1ed8cb167440fb047c72cfc0d888a187b Mon Sep 17 00:00:00 2001
+From: Jonas Witschel <diabonas at archlinux.org>
+Date: Sun, 5 Apr 2020 20:16:52 +0200
+Subject: [PATCH] wayland: don't call gdk_wayland_window_configure without
+ valid size
+
+Commit 7f12dc2b66bba15b2e1c0ca077fa4ae58962ec0f ("wayland: Postpone
+window resize requests until configured") runs
+gdk_wayland_window_configure unconditionally even if no valid size is
+set. This breaks GtkDialogs, which are not shown any more, and results
+in warnings like
+
+gtk_widget_size_allocate(): attempt to allocate widget with width -3 and
+height -3
+
+Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/2574
+---
+ gdk/wayland/gdkwindow-wayland.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
+index eba8361b21..2d3e31906e 100644
+--- a/gdk/wayland/gdkwindow-wayland.c
++++ b/gdk/wayland/gdkwindow-wayland.c
+@@ -1635,10 +1635,11 @@ gdk_wayland_window_handle_configure (GdkWindow *window,
+     }
+   else
+     {
+-      gdk_wayland_window_configure (window,
+-                                    impl->unconfigured_width,
+-                                    impl->unconfigured_height,
+-                                    impl->scale);
++      if (impl->unconfigured_width > 0 && impl->unconfigured_height > 0)
++        gdk_wayland_window_configure (window,
++                                      impl->unconfigured_width,
++                                      impl->unconfigured_height,
++                                      impl->scale);
+     }
+ 
+   if (fixed_size)
+-- 
+2.24.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-05 18:58:38 UTC (rev 379591)
+++ PKGBUILD	2020-04-05 18:58:57 UTC (rev 379592)
@@ -1,84 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.24.17+4+g8c97702a07
-pkgrel=1
-epoch=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(x86_64)
-url="https://www.gtk.org/"
-depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
-         libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
-         adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
-         cantarell-fonts colord rest libcups libcanberra fribidi iso-codes)
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
-license=(LGPL)
-_commit=8c97702a0771ccb186088ea04478dfc8c6616fe4  # gtk-3-24
-source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
-        1633.patch
-        settings.ini
-        gtk-query-immodules-3.0.hook
-        gtk-update-icon-cache.hook
-        gtk-update-icon-cache.script)
-sha256sums=('SKIP'
-            '7b7141c53de03d0bd6c73287b27c75e39a8eede1853037f52183c4648805255d'
-            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
-            'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
-            '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
-            'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
-
-pkgver() {
-  cd gtk
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd gtk
-
-  # https://bugs.archlinux.org/task/66106
-  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1633
-  git apply -3 ../1633.patch
-
-  # https://bugs.archlinux.org/task/66119
-  # https://gitlab.gnome.org/GNOME/gtk/-/issues/2576
-  # no patch yet
-}
-
-build() {
-  CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
-  arch-meson gtk build \
-    -D broadway_backend=true \
-    -D colord=yes \
-    -D gtk_doc=true \
-    -D man=true
-  ninja -C build
-}
-
-package_gtk3() {
-  depends+=(gtk-update-icon-cache)
-  provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
-  conflicts=(gtk3-print-backends)
-  replaces=("gtk3-print-backends<=3.22.26-1")
-  install=gtk3.install
-
-  DESTDIR="$pkgdir" meson install -C build
-
-  install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 settings.ini
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook
-
-  # split this out to use with gtk2 too
-  mv "$pkgdir/usr/bin/gtk-update-icon-cache" "$srcdir"
-}
-
-package_gtk-update-icon-cache() {
-  pkgdesc="GTK+ icon cache updater"
-  depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
-
-  install -Dt "$pkgdir/usr/bin" gtk-update-icon-cache
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook
-  install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 379591, gtk3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-05 18:58:57 UTC (rev 379592)
@@ -0,0 +1,89 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache)
+pkgver=3.24.17+4+g8c97702a07
+pkgrel=2
+epoch=1
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(x86_64)
+url="https://www.gtk.org/"
+depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
+         libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
+         adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
+         cantarell-fonts colord rest libcups libcanberra fribidi iso-codes)
+makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
+license=(LGPL)
+_commit=8c97702a0771ccb186088ea04478dfc8c6616fe4  # gtk-3-24
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+        1633.patch 1634.patch
+        settings.ini
+        gtk-query-immodules-3.0.hook
+        gtk-update-icon-cache.hook
+        gtk-update-icon-cache.script)
+sha256sums=('SKIP'
+            '7b7141c53de03d0bd6c73287b27c75e39a8eede1853037f52183c4648805255d'
+            '59f5304bdbeff82fd08e43d1c19afc4c5b65703c36a243909b92681ae1519020'
+            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+            'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
+            '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
+            'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
+
+pkgver() {
+  cd gtk
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd gtk
+
+  # https://bugs.archlinux.org/task/66106
+  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1633
+  git apply -3 ../1633.patch
+
+  # https://bugs.archlinux.org/task/66106
+  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1634
+  git apply -3 ../1634.patch
+
+  # https://bugs.archlinux.org/task/66119
+  # https://gitlab.gnome.org/GNOME/gtk/-/issues/2576
+  # no patch yet
+}
+
+build() {
+  CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
+  arch-meson gtk build \
+    -D broadway_backend=true \
+    -D colord=yes \
+    -D gtk_doc=true \
+    -D man=true
+  ninja -C build
+}
+
+package_gtk3() {
+  depends+=(gtk-update-icon-cache)
+  provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
+  conflicts=(gtk3-print-backends)
+  replaces=("gtk3-print-backends<=3.22.26-1")
+  install=gtk3.install
+
+  DESTDIR="$pkgdir" meson install -C build
+
+  install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 settings.ini
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook
+
+  # split this out to use with gtk2 too
+  mv "$pkgdir/usr/bin/gtk-update-icon-cache" "$srcdir"
+}
+
+package_gtk-update-icon-cache() {
+  pkgdesc="GTK+ icon cache updater"
+  depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
+
+  install -Dt "$pkgdir/usr/bin" gtk-update-icon-cache
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook
+  install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: gtk-query-immodules-3.0.hook
===================================================================
--- gtk-query-immodules-3.0.hook	2020-04-05 18:58:38 UTC (rev 379591)
+++ gtk-query-immodules-3.0.hook	2020-04-05 18:58:57 UTC (rev 379592)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache

Copied: gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook (from rev 379591, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- gtk-query-immodules-3.0.hook	                        (rev 0)
+++ gtk-query-immodules-3.0.hook	2020-04-05 18:58:57 UTC (rev 379592)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache

Deleted: gtk-update-icon-cache.hook
===================================================================
--- gtk-update-icon-cache.hook	2020-04-05 18:58:38 UTC (rev 379591)
+++ gtk-update-icon-cache.hook	2020-04-05 18:58:57 UTC (rev 379592)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
-
-[Action]
-Description = Updating icon theme caches...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
-NeedsTargets

Copied: gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook (from rev 379591, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- gtk-update-icon-cache.hook	                        (rev 0)
+++ gtk-update-icon-cache.hook	2020-04-05 18:58:57 UTC (rev 379592)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/icons/*/
+Target = !usr/share/icons/*/?*
+
+[Action]
+Description = Updating icon theme caches...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
+NeedsTargets

Deleted: gtk-update-icon-cache.script
===================================================================
--- gtk-update-icon-cache.script	2020-04-05 18:58:38 UTC (rev 379591)
+++ gtk-update-icon-cache.script	2020-04-05 18:58:57 UTC (rev 379592)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-while read -r f; do
-  if [[ -e ${f}index.theme ]]; then
-    gtk-update-icon-cache -q "$f"
-  elif [[ -d $f ]]; then
-    rm -f "${f}icon-theme.cache"
-    rmdir --ignore-fail-on-non-empty "$f"
-  fi
-done

Copied: gtk3/repos/extra-x86_64/gtk-update-icon-cache.script (from rev 379591, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- gtk-update-icon-cache.script	                        (rev 0)
+++ gtk-update-icon-cache.script	2020-04-05 18:58:57 UTC (rev 379592)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+  if [[ -e ${f}index.theme ]]; then
+    gtk-update-icon-cache -q "$f"
+  elif [[ -d $f ]]; then
+    rm -f "${f}icon-theme.cache"
+    rmdir --ignore-fail-on-non-empty "$f"
+  fi
+done

Deleted: gtk3.install
===================================================================
--- gtk3.install	2020-04-05 18:58:38 UTC (rev 379591)
+++ gtk3.install	2020-04-05 18:58:57 UTC (rev 379592)
@@ -1,3 +0,0 @@
-pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}

Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 379591, gtk3/trunk/gtk3.install)
===================================================================
--- gtk3.install	                        (rev 0)
+++ gtk3.install	2020-04-05 18:58:57 UTC (rev 379592)
@@ -0,0 +1,3 @@
+pre_remove() {
+    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}

Deleted: settings.ini
===================================================================
--- settings.ini	2020-04-05 18:58:38 UTC (rev 379591)
+++ settings.ini	2020-04-05 18:58:57 UTC (rev 379592)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11

Copied: gtk3/repos/extra-x86_64/settings.ini (from rev 379591, gtk3/trunk/settings.ini)
===================================================================
--- settings.ini	                        (rev 0)
+++ settings.ini	2020-04-05 18:58:57 UTC (rev 379592)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11


More information about the arch-commits mailing list