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

Jan Steffens heftig at archlinux.org
Tue Apr 7 09:46:55 UTC 2020


    Date: Tuesday, April 7, 2020 @ 09:46:54
  Author: heftig
Revision: 379743

archrelease: copy trunk to extra-x86_64

Added:
  gtk3/repos/extra-x86_64/1638.patch
    (from rev 379742, gtk3/trunk/1638.patch)
  gtk3/repos/extra-x86_64/PKGBUILD
    (from rev 379742, gtk3/trunk/PKGBUILD)
  gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
    (from rev 379742, gtk3/trunk/gtk-query-immodules-3.0.hook)
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
    (from rev 379742, gtk3/trunk/gtk-update-icon-cache.hook)
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
    (from rev 379742, gtk3/trunk/gtk-update-icon-cache.script)
  gtk3/repos/extra-x86_64/gtk3.install
    (from rev 379742, gtk3/trunk/gtk3.install)
  gtk3/repos/extra-x86_64/settings.ini
    (from rev 379742, gtk3/trunk/settings.ini)
Deleted:
  gtk3/repos/extra-x86_64/1638.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

------------------------------+
 1638.patch                   |   73 ++++++++----------
 PKGBUILD                     |  160 ++++++++++++++++++++---------------------
 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 +-
 7 files changed, 155 insertions(+), 160 deletions(-)

Deleted: 1638.patch
===================================================================
--- 1638.patch	2020-04-07 09:46:38 UTC (rev 379742)
+++ 1638.patch	2020-04-07 09:46:54 UTC (rev 379743)
@@ -1,39 +0,0 @@
-From f7811616819040acc66dddd1762101d8ad87a2fa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
-Date: Mon, 6 Apr 2020 14:20:43 +0200
-Subject: [PATCH] wayland: Always store unconfigured size
-
-This means it'll always be as up to date GdkWindow::width/height. We
-still skip the resize for non-configured windows though, to avoid
-mapping with the wrong size.
----
- gdk/wayland/gdkwindow-wayland.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
-index 6c555443bd..05a673eb61 100644
---- a/gdk/wayland/gdkwindow-wayland.c
-+++ b/gdk/wayland/gdkwindow-wayland.c
-@@ -1145,16 +1145,12 @@ gdk_wayland_window_maybe_configure (GdkWindow *window,
-   gboolean is_xdg_popup;
-   gboolean is_visible;
- 
-+  impl->unconfigured_width = calculate_width_without_margin (window, width);
-+  impl->unconfigured_height = calculate_height_without_margin (window, height);
- 
-   if (needs_initial_configure (window) &&
-       !impl->initial_configure_received)
--    {
--      impl->unconfigured_width = calculate_width_without_margin (window,
--                                                                 width);
--      impl->unconfigured_height = calculate_height_without_margin (window,
--                                                                   height);
--      return;
--    }
-+    return;
- 
-   if (window->width == width &&
-       window->height == height &&
--- 
-2.24.1
-

Copied: gtk3/repos/extra-x86_64/1638.patch (from rev 379742, gtk3/trunk/1638.patch)
===================================================================
--- 1638.patch	                        (rev 0)
+++ 1638.patch	2020-04-07 09:46:54 UTC (rev 379743)
@@ -0,0 +1,34 @@
+From c5d9c8be2bda087ce33b36f46971dfb77f976827 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
+Date: Mon, 6 Apr 2020 14:20:43 +0200
+Subject: [PATCH] wayland: Always store unconfigured size
+
+This means it'll always be as up to date GdkWindow::width/height. We
+still skip the resize for non-configured windows though, to avoid
+mapping with the wrong size.
+
+The commit f06ee688fe86ec8e1db1c515a7bf2ccc8decc310 also accidentally
+removed the unconfigured size setting completely, so this essentially
+adds it back, but always sets it.
+
+Closes: https://gitlab.gnome.org/GNOME/gtk/-/issues/2582
+---
+ 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 f6acc74366..30d4353826 100644
+--- a/gdk/wayland/gdkwindow-wayland.c
++++ b/gdk/wayland/gdkwindow-wayland.c
+@@ -1156,6 +1156,8 @@ gdk_wayland_window_maybe_configure (GdkWindow *window,
+   gboolean is_xdg_popup;
+   gboolean is_visible;
+ 
++  impl->unconfigured_width = calculate_width_without_margin (window, width);
++  impl->unconfigured_height = calculate_height_without_margin (window, height);
+ 
+   if (should_inhibit_resize (window))
+     return;
+-- 
+2.24.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-07 09:46:38 UTC (rev 379742)
+++ PKGBUILD	2020-04-07 09:46:54 UTC (rev 379743)
@@ -1,80 +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+15+gdc79e07228
-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=dc79e07228800dafa1062c959c68afcc7b4a1bef  # gtk-3-24
-source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
-        1638.patch
-        settings.ini
-        gtk-query-immodules-3.0.hook
-        gtk-update-icon-cache.hook
-        gtk-update-icon-cache.script)
-sha256sums=('SKIP'
-            '45be674b2596b16d5778a85a51a31b59b3e3a198daaea34eec4400e4cdb9bd4e'
-            '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/1638
-  git apply -3 ../1638.patch
-}
-
-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 379742, gtk3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-07 09:46:54 UTC (rev 379743)
@@ -0,0 +1,80 @@
+# 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+18+gcdd4349bfe
+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=cdd4349bfed91cbc69b5f4b5e620f98b14247897  # gtk-3-24
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+        1638.patch
+        settings.ini
+        gtk-query-immodules-3.0.hook
+        gtk-update-icon-cache.hook
+        gtk-update-icon-cache.script)
+sha256sums=('SKIP'
+            '10ebcb8ec56c12e8f413c6af0c585877bca6b6530791c0c23698967a932c8e58'
+            '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/1638
+  git apply -3 ../1638.patch
+}
+
+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-07 09:46:38 UTC (rev 379742)
+++ gtk-query-immodules-3.0.hook	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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 379742, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- gtk-query-immodules-3.0.hook	                        (rev 0)
+++ gtk-query-immodules-3.0.hook	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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-07 09:46:38 UTC (rev 379742)
+++ gtk-update-icon-cache.hook	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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 379742, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- gtk-update-icon-cache.hook	                        (rev 0)
+++ gtk-update-icon-cache.hook	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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-07 09:46:38 UTC (rev 379742)
+++ gtk-update-icon-cache.script	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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 379742, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- gtk-update-icon-cache.script	                        (rev 0)
+++ gtk-update-icon-cache.script	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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-07 09:46:38 UTC (rev 379742)
+++ gtk3.install	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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 379742, gtk3/trunk/gtk3.install)
===================================================================
--- gtk3.install	                        (rev 0)
+++ gtk3.install	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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-07 09:46:38 UTC (rev 379742)
+++ settings.ini	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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 379742, gtk3/trunk/settings.ini)
===================================================================
--- settings.ini	                        (rev 0)
+++ settings.ini	2020-04-07 09:46:54 UTC (rev 379743)
@@ -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