From c735a28987fc86b7a81f04a6f989e0b4b6e6670097160f523f656ccc3dcbb976 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 5 Nov 2021 16:11:49 +0000 Subject: [PATCH 1/4] Accepting request 929693 from GNOME:Next Resub OBS-URL: https://build.opensuse.org/request/show/929693 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=77 --- gtk-4.4.0.tar.xz | 3 --- gtk-4.4.1.tar.xz | 3 +++ gtk4.changes | 43 +++++++++++++++++++++++++++++++++++++++++++ gtk4.spec | 35 ++++++++++++++++++++++++++--------- 4 files changed, 72 insertions(+), 12 deletions(-) delete mode 100644 gtk-4.4.0.tar.xz create mode 100644 gtk-4.4.1.tar.xz diff --git a/gtk-4.4.0.tar.xz b/gtk-4.4.0.tar.xz deleted file mode 100644 index f3dfa36..0000000 --- a/gtk-4.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0a1508f441686c3a20dfec48af533b19a4b2e017c18eaee31dccdb7d292505b -size 30008844 diff --git a/gtk-4.4.1.tar.xz b/gtk-4.4.1.tar.xz new file mode 100644 index 0000000..6f96b51 --- /dev/null +++ b/gtk-4.4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0faada983dc6b0bc409cb34c1713c1f3267e67c093f86b1e3b17db6100a3ddf4 +size 30031924 diff --git a/gtk4.changes b/gtk4.changes index dc5d1b4..18c4b38 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Thu Nov 4 20:37:05 UTC 2021 - Bjørn Lie + +- Disable sassc BuildRequires, only needed when building from git. +- Add pkgconfig(gi-docgen) and pkgconfig(iso-codes) BuildRequires + and pass gtk_doc=true to meson instead of documentation=true + following upstream changes. Also split develdocumentation out + into it's own sub-package. +- Drop pkgconfig(json-glib-1.0) BuildRequires, not needed nor used. +- Replace option print-backends=all with print-cups=enabled + following upstream changes. +- Stop passing xinerama=enabled to meson, not needed nor used. +- Add pkgconfig(tracker-sparql-3.0) BuildRequires and pass + tracker=enabled to meson, build with tracker support. + +------------------------------------------------------------------- +Mon Nov 1 15:21:35 UTC 2021 - Bjørn Lie + +- Update to version 4.4.1: + + input: + - Fix compose data on bigendian systems + - Accept long replacement strings for compose sequences + + a11y: + - Fix accessible relations for menu buttons + - Fix accessible descriptions in some cases + - Simplify atspi context a bit + + GtkTextView: + - Fix applying css properties such as letterspacing, line + decoration, font features, etc + - Improve grouping for undo + - Invalidate Pango contexts when font settings change + - Fix a crash + + Theme: Improve styling for toggle buttons in toolbars + + gsk: Avoid coordinate overflow with big text selections + + GtkFileChooser: Fix handling of choices + + GtkStackSwitcher: Expand child buttons + + GtkCalendar: Fix day names for weeks that start on monday + + GtkWindow: Prefer menubars when handling F10 + + GtkFontButton: Make sure the dialog is on the same display + + X11: Fix handling of randr events + + build: Fix detection of pre-compiled css files + + Updated translations. + ------------------------------------------------------------------- Sun Oct 3 08:58:01 UTC 2021 - Fuminobu Takeyama diff --git a/gtk4.spec b/gtk4.spec index b146f70..1c2184d 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -22,7 +22,7 @@ %define _name gtk Name: gtk4 -Version: 4.4.0 +Version: 4.4.1 Release: 0 Summary: The GTK+ toolkit library (version 4) License: LGPL-2.1-or-later @@ -49,7 +49,8 @@ BuildRequires: gettext-tools >= 0.19.7 BuildRequires: hicolor-icon-theme BuildRequires: meson >= 0.50.1 BuildRequires: pkgconfig -BuildRequires: sassc +# sassc is ONLY needed when building gitcheckouts, and not when using tarball releases +#BuildRequires: sassc BuildRequires: vulkan-devel BuildRequires: xsltproc BuildRequires: pkgconfig(atk) >= 2.15.1 @@ -61,6 +62,7 @@ BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(epoxy) >= 1.4 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.0 +BuildRequires: pkgconfig(gi-docgen) BuildRequires: pkgconfig(glib-2.0) >= 2.65.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-2.0) >= 2.53.7 @@ -69,12 +71,13 @@ BuildRequires: pkgconfig(graphene-1.0) >= 1.9.1 BuildRequires: pkgconfig(graphene-gobject-1.0) >= 1.9.1 BuildRequires: pkgconfig(gstreamer-gl-1.0) BuildRequires: pkgconfig(gstreamer-player-1.0) -BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libavfilter) BuildRequires: pkgconfig(pango) >= 1.47.0 BuildRequires: pkgconfig(pangocairo) >= 1.14.0 BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(rest-0.7) +BuildRequires: pkgconfig(tracker-sparql-3.0) BuildRequires: pkgconfig(wayland-client) >= 1.14.91 BuildRequires: pkgconfig(wayland-cursor) >= 1.9.91 BuildRequires: pkgconfig(wayland-egl) @@ -183,6 +186,14 @@ ranging from small one-off projects to complete application suites. This package provides the upstream theme configuration for widgets and icon themes. +%package docs +Summary: Developer documentation for GTK +BuildArch: noarch + +%description docs +This package contains developer documentation for version 4 of the GTK +widget toolkit. + %package devel Summary: Development files for the GTK+ toolkit library v4 Group: Development/Libraries/X11 @@ -216,17 +227,17 @@ This package enhances gettext with an International Tag Set for GTK+ 4 %build %meson \ -Dbuild-tests=false \ - -Ddocumentation=true \ + -Dgtk_doc=true \ -Dbroadway-backend=true \ -Dcloudproviders=enabled \ -Dcolord=enabled \ - -Dprint-backends=all \ + -Dprint-cups=enabled \ -Dvulkan=enabled \ -Dwayland-backend=true \ -Dx11-backend=true \ - -Dxinerama=enabled \ -Dintrospection=enabled \ -Dman-pages=true \ + -Dtracker=enabled \ %{nil} %meson_build @@ -308,11 +319,17 @@ cp %{SOURCE3} %{buildroot}%{_rpmmacrodir} %files branding-upstream %{_datadir}/gtk-4.0/settings.ini +%files docs +%{_datadir}/doc/gdk4/ +%{_datadir}/doc/gdk4-wayland/ +%{_datadir}/doc/gdk4-wayland/ +%{_datadir}/doc/gdk4-x11/ +%{_datadir}/doc/gdk4-x11/ +%{_datadir}/doc/gsk4/ +%{_datadir}/doc/gtk4/ + %files devel %doc CONTRIBUTING.md -#doc #{_datadir}/gtk-doc/html/gdk4/ -#doc #{_datadir}/gtk-doc/html/gsk4/ -#doc #{_datadir}/gtk-doc/html/gtk4/ %{_bindir}/gtk4-demo %{_bindir}/gtk4-demo-application %{_bindir}/gtk4-widget-factory From 0a30cc3587c8bcca2538156075b84100d973888419082f548c020b1035153e43 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 11 Nov 2021 09:41:37 +0000 Subject: [PATCH 2/4] Accepting request 930803 from home:yfjiang:branches:GNOME:STABLE:41 - Add gtk4-fix-link-to-g_signal_emit.patch: fix build failure caused by inproper link to g_signal_emit. OBS-URL: https://build.opensuse.org/request/show/930803 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=78 --- gtk4-fix-link-to-g_signal_emit.patch | 34 ++++++++++++++++++++++++++++ gtk4.changes | 6 +++++ gtk4.spec | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 gtk4-fix-link-to-g_signal_emit.patch diff --git a/gtk4-fix-link-to-g_signal_emit.patch b/gtk4-fix-link-to-g_signal_emit.patch new file mode 100644 index 0000000..8c27067 --- /dev/null +++ b/gtk4-fix-link-to-g_signal_emit.patch @@ -0,0 +1,34 @@ +From 49032b4b6349ee196289a237d9baa74f90ac589d Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Mon, 1 Nov 2021 12:54:07 +0000 +Subject: [PATCH] docs: Fix link to g_signal_emit() + +--- + gdk/gdkclipboard.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c +index b2fd191538..3daf2dcb04 100644 +--- a/gdk/gdkclipboard.c ++++ b/gdk/gdkclipboard.c +@@ -1253,14 +1253,14 @@ gdk_clipboard_set_content (GdkClipboard *clipboard, + * @...: value contents conforming to @type + * + * Sets the clipboard to contain the value collected from the given varargs. +- * ++ * + * Values should be passed the same way they are passed to other value + * collecting APIs, such as [`method@GObject.Object.set`] or +- * [`id@g_signal_emit`]. ++ * [`func@GObject.signal_emit`]. + * + * ```c + * gdk_clipboard_set (clipboard, GTK_TYPE_STRING, "Hello World"); +- * ++ * + * gdk_clipboard_set (clipboard, GDK_TYPE_TEXTURE, some_texture); + * ``` + */ +-- +GitLab + diff --git a/gtk4.changes b/gtk4.changes index 18c4b38..078008f 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 11 02:42:53 UTC 2021 - Yifan Jiang + +- Add gtk4-fix-link-to-g_signal_emit.patch: fix build failure + caused by inproper link to g_signal_emit. + ------------------------------------------------------------------- Thu Nov 4 20:37:05 UTC 2021 - Bjørn Lie diff --git a/gtk4.spec b/gtk4.spec index 1c2184d..ec7c738 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -34,6 +34,8 @@ Source2: settings.ini Source3: macros.gtk4 Source98: gtk4-rpmlintrc Source99: baselibs.conf +# PATCH-FIX-UPSTREAM gtk4-fix-link-to-g_signal_emit.patch glgo#GNOME/gtk!4108 yfjiang@suse.com -- Fix link to g_signal_emit() in doc +Patch0: gtk4-fix-link-to-g_signal_emit.patch BuildRequires: cups-devel >= 2.0 # We do not support building against cups 2.3 betas From c0e0971f477e464c696bf32b43a01fedd2139068f1e31fa065ad74fd380a5be1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 13 Nov 2021 15:00:39 +0000 Subject: [PATCH 3/4] Accepting request 931259 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/931259 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=79 --- baselibs.conf | 5 ----- gtk4.changes | 6 ++++++ gtk4.spec | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index e99940c..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,5 +0,0 @@ -gtk4-devel - requires -gtk4- - requires "libgtk-4-1- = " -libgtk-4-1 - provides "gtk4- = " diff --git a/gtk4.changes b/gtk4.changes index 078008f..5de105d 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 13 14:52:03 UTC 2021 - Bjørn Lie + +- Drop baselibs.conf, there should not be any consumers of 32bit + for this rather new package, so lets not build for the past. + ------------------------------------------------------------------- Thu Nov 11 02:42:53 UTC 2021 - Yifan Jiang diff --git a/gtk4.spec b/gtk4.spec index ec7c738..a75ada6 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -32,8 +32,8 @@ URL: https://www.gtk.org/ Source: https://download.gnome.org/sources/gtk/4.4/%{_name}-%{version}.tar.xz Source2: settings.ini Source3: macros.gtk4 -Source98: gtk4-rpmlintrc -Source99: baselibs.conf +Source99: gtk4-rpmlintrc + # PATCH-FIX-UPSTREAM gtk4-fix-link-to-g_signal_emit.patch glgo#GNOME/gtk!4108 yfjiang@suse.com -- Fix link to g_signal_emit() in doc Patch0: gtk4-fix-link-to-g_signal_emit.patch From f5a858584f69cc77999f325be812a4a23702e170e06512acbfabc8cb6719940e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 13 Nov 2021 15:52:27 +0000 Subject: [PATCH 4/4] Remove duplicate folders in filelists that snuck in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=80 --- gtk4.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/gtk4.spec b/gtk4.spec index a75ada6..1d40014 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -324,8 +324,6 @@ cp %{SOURCE3} %{buildroot}%{_rpmmacrodir} %files docs %{_datadir}/doc/gdk4/ %{_datadir}/doc/gdk4-wayland/ -%{_datadir}/doc/gdk4-wayland/ -%{_datadir}/doc/gdk4-x11/ %{_datadir}/doc/gdk4-x11/ %{_datadir}/doc/gsk4/ %{_datadir}/doc/gtk4/