From: Peter Michael Green Date: Thu, 26 Oct 2023 15:46:21 +0000 (+0000) Subject: Manual merge of version 4.8.3+ds-2+rpi1 and 4.12.3+ds-1 to produce 4.12.3+ds-1+rpi1 X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=72b9be93b97920e222e7e9d25502b8989cbfce8b;p=gtk4.git Manual merge of version 4.8.3+ds-2+rpi1 and 4.12.3+ds-1 to produce 4.12.3+ds-1+rpi1 --- 72b9be93b97920e222e7e9d25502b8989cbfce8b diff --cc debian/changelog index 22db17935d,31eafac83c..09c2e3e298 --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,294 +1,308 @@@ - gtk4 (4.8.3+ds-2+rpi1) bookworm-staging; urgency=medium ++gtk4 (4.12.3+ds-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 4.4.0+ds1-5+rpi1 by Peter Michael Green at Tue, 07 Sep 2021 10:26:09 +0000] + * Disable a couple of faliing tests in Raspbian. + * Fix clean target. + + [changes introduced in 4.8.3+ds-1+rpi1 by Peter Michael Green] + * Disable a couple more failing tests. + + [changes introudce in 4.8.3+ds-2+rpi1 by Peter Michael Green] + * Disable linear-gradient-transition-to-other test. + - -- Peter Michael Green Sat, 11 Feb 2023 22:31:33 +0000 ++ -- Peter Michael Green Thu, 26 Oct 2023 15:45:40 +0000 ++ + gtk4 (4.12.3+ds-1) unstable; urgency=medium + + * New upstream release + - GtkWindow: + + Don't assume titlebars are GtkHeaderBar + (https://gitlab.gnome.org/GNOME/gtk/-/issues/6116) + - GtkTreeView: + + Fix a crash in gtk_tree_view_is_blank_at_pos + (https://gitlab.gnome.org/GNOME/gtk/-/issues/6114) + - printing: + + Fix some issues with the portal implementation + (https://gitlab.gnome.org/GNOME/gtk/-/commit/03679fe6bf5ae391bd7cb21ad0492f530c86cd5e) + - GSK: + + Some optimizations in the GL renderer + (https://gitlab.gnome.org/GNOME/gtk/-/commit/3698cadcd21e2a52c30766d311043093ea557b3f, + https://gitlab.gnome.org/GNOME/gtk/-/commit/d4d0883a924f94fdc89fad50bce9ecad3128e0f3, + https://gitlab.gnome.org/GNOME/gtk/-/commit/0030c572d47f551847be0aed8054d4df34afffda) + + Fix memory leaks in the Broadway renderer + (https://gitlab.gnome.org/GNOME/gtk/-/issues/6120) + - demos: + + Fix a crash in gtk4-demo + (https://gitlab.gnome.org/GNOME/gtk/-/issues/6113) + + -- Amin Bandali Wed, 04 Oct 2023 16:11:12 -0400 + + gtk4 (4.12.2+ds-1) unstable; urgency=medium + + * New upstream release + * Build-Depend on fonts-noto-core instead of fonts-dejavu-core + & ttf-bitstream-vera + + -- Jeremy Bícha Fri, 22 Sep 2023 10:27:13 -0400 + + gtk4 (4.12.1+ds-3) unstable; urgency=medium + + [ Amin Bandali ] + * d/gbp.conf: Change packaging branch to debian/latest + + [ Jeremy Bícha ] + * Ignore the same reftest failures for riscv64 as for mips64el. + mips64el uses softpipe on the buildds because we force it to (because + llvmpipe is broken there), but riscv64 uses softpipe even when not + forced to, because llvmpipe doesn't exist on riscv64 yet. + (Closes: #1051168) + + [ Simon McVittie ] + * d/log-reftests.py: Log uuencoded variant GSK reftest renderings too. + The variant GSK reftest renderings (flipped, repeated, etc.) might fail + differently, in which case we will want to look at their outputs. + * d/rules: Always allow the differences that occur when using softpipe. + In principle we could be using softpipe on any architecture, if forced. + + -- Simon McVittie Mon, 04 Sep 2023 15:28:30 +0100 + + gtk4 (4.12.1+ds-2) unstable; urgency=medium + + * Release to unstable + + -- Jeremy Bícha Sun, 27 Aug 2023 19:33:26 -0400 + + gtk4 (4.12.1+ds-1) experimental; urgency=medium + + * New upstream release + * Drop 3 patches applied in new release + + -- Jeremy Bícha Sat, 26 Aug 2023 10:54:25 -0400 + + gtk4 (4.12.0+ds-4) experimental; urgency=medium + + * d/rules: Completely ignore border-one-rounded gsk reftest on mips*. + The actual rendering in the "flipped" mode only differs from the + reference rendering by one pixel, but that one pixel has a completely + different value. (Really closes: #1050077) + * d/clean: Remove generated file po/gtk40.pot (Closes: #1044991) + * d/libgtk-4-doc.links: Stop including symlinks for pango documentation + (Closes: #1040470) + + -- Simon McVittie Thu, 24 Aug 2023 11:48:45 +0100 + + gtk4 (4.12.0+ds-3) experimental; urgency=medium + + * d/p/tests-Accept-slightly-different-numeric-results.patch: + Replace patch for #1050076 with the version accepted upstream. + This accepts slight numerical differences on all platforms, not + just i386. + * d/rules: Accept minor rendering differences for some tests on mips*. + Presumably these render a bit differently with softpipe. + (Closes: #1050077) + * d/p/debian/reftests-Allow-minor-differences-to-be-tolerated.patch: + Update patch so that when gsk-compare tests are run repeatedly, we + apply the same error-tolerance each time, not just the first time + * d/changelog: Reorder to make the history of unstable linear. + This should avoid the bug tracking system thinking that regressions + found in 4.12.x also affect 4.10.x. + * Merge packaging from unstable + - No further changes, except in the changelog + + -- Simon McVittie Wed, 23 Aug 2023 16:43:03 +0100 + + gtk4 (4.12.0+ds-2) experimental; urgency=medium + + * d/rules: Skip build-time tests that are known to fail or be unreliable. + Upstream flagged these as failing and skips them in their CI, so there's + no point in us expecting them to succeed. (Closes: #1050075) + * Add patch to tolerate different floating-point results on i386. + Our baseline for i386 still doesn't include SSE, so we still have to use + i387 instructions with extended precision and sometimes different answers. + (Closes: #1050076) + * Ignore another test failure on big-endian machines. + Similar to #1024391. + * d/rules: Ignore two reftests that fail on i386 only. + In these tests, the reference rendering of "Hello world" is as one line, + but on i386 (possibly due to different rounding) it is word-wrapped onto + two lines. + * Add patch to work around a test failure on riscv64. + Other architectures are occasionally affected by this. + Thanks to Aurelien Jarno (Closes: #1049434) + * Merge packaging from unstable + - No further changes, except in the changelog + + -- Simon McVittie Tue, 22 Aug 2023 15:19:11 +0100 + + gtk4 (4.12.0+ds-1) experimental; urgency=medium + + * New upstream release + * Restore sysprof integration + * debian/control.in: Bump minimum glib, gobject-introspection, meson + & wayland-protocols + * debian/libgtk-4-bin.install: Install gtk4-rendernode-tool + * debian/libgtk-4-1.symbols.in: Add new symbols + * Drop patch marking the clipboard test flaky: applied upstream + * Cherry-pick patch to fix undefined references + * Add patch to adapt to Debian's tzdata 2023c-8 + * Add patch to mark headless tests as flaky + + -- Jeremy Bícha Tue, 08 Aug 2023 17:31:01 -0400 + + gtk4 (4.10.5+ds-5) unstable; urgency=medium + + * d/rules: Ignore two reftests that fail on i386 only. + In these tests, the reference rendering of "Hello world" is as one line, + but on i386 (possibly due to different rounding) it is word-wrapped onto + two lines. + I previously thought this was a regression between 4.10 and 4.12, but + it seems that instead, it was triggered by some other component being + upgraded, possibly fontconfig 2.14.2 or pango 1.51.0. + + -- Simon McVittie Tue, 22 Aug 2023 17:20:14 +0100 + + gtk4 (4.10.5+ds-4) unstable; urgency=medium + + [ Jeremy Bícha ] + * Restore sysprof integration + + [ Simon McVittie ] + * d/p/debian/tests-Allow-longer-for-a-dialog-to-open.patch: + Add patch to work around a test failure on riscv64 by extending an + arbitrary timeout. Other architectures are occasionally affected by this. + Thanks to Aurelien Jarno (Closes: #1049434) + * d/control.in, d/gbp.conf: Use debian/trixie and upstream/4.10.x branches + + -- Simon McVittie Tue, 22 Aug 2023 12:11:51 +0100 + + gtk4 (4.10.5+ds-3) unstable; urgency=medium + + * Temporarily disable sysprof integration altogether, to get the package + rebuilt + + -- Simon McVittie Mon, 07 Aug 2023 09:35:32 +0100 + + gtk4 (4.10.5+ds-2) unstable; urgency=medium + + * d/control.in: Only use libsysprof-capture-4-dev for shared library. + libsysprof-capture-4-dev is currently a virtual package provided + by libsysprof-4-dev, which also includes GTK 4 GUI components + and so depends on libgtk-4-dev. If the Architecture: amd64 build + happens to finish before the Architecture: all build starts, + then the Architecture: all build will fail with an unsatisfiable + build-dependency: libsysprof-4-dev Depends on libgtk-4-dev, which + Depends on libgtk-4-common (>= ${source:Version}), which hasn't been + built yet. The result is that libgtk-4-common can't be built and the + builds deadlock. + We've been lucky enough to avoid this until now, but version + 4.10.5+ds-1 was not sufficiently lucky and has become uninstallable + and unbuildable. + Because the sysprof integration is part of the architecture-specific + library, we can break this cycle by only installing libsysprof-4-dev + when we are building the architecture-specific library, and excluding + it when we are only building architecture-independent documentation + and common files. + * Remove version constraints unnecessary since Debian 11 + * Remove maintscripts unnecessary in any released Debian version + * d/upstream/metadata: Use preferred Gitlab URLs + + -- Simon McVittie Sun, 06 Aug 2023 13:03:36 +0100 + + gtk4 (4.10.5+ds-1) unstable; urgency=medium + + * New upstream release + + -- Jeremy Bícha Sat, 05 Aug 2023 09:56:12 -0400 + + gtk4 (4.10.4+ds-2) unstable; urgency=medium + + * Release to unstable + + -- Jeremy Bícha Wed, 19 Jul 2023 07:53:26 -0400 + + gtk4 (4.10.4+ds-1) experimental; urgency=medium + + * New upstream release + - Fix black rectangles seen with mutter 44.1 (LP: ##2020674) + * Revert a buildsystem change that affected our installed-tests patch + + -- Jeremy Bícha Mon, 05 Jun 2023 15:04:11 -0400 + + gtk4 (4.10.3+ds-1) experimental; urgency=medium + + * New upstream release + + -- Jeremy Bícha Thu, 11 May 2023 10:45:31 -0400 + + gtk4 (4.10.1+ds-2) experimental; urgency=medium + + * debian/patches: Add gstreamer-player as subproject. + It's used by gtk media to play videos, but it's currently in + gstreamer-plugins-bad. By just including this library inside gtk we can + avoid having dependency on gstreamer's bad set. (LP: #2011849) + * debian/control: build-depend on libgstreamer-plugins-base1.0-dev. + Remove instead dependency on libgstreamer-plugins-bad1.0-dev + * debian/rules: Also include gstreamer in udebs build. + We include some gstreamer sources in gtk now, so better to provide some + debug symbols too + * debian/control: Recommends libgtk-4-media-gstreamer. + Gtk media is considered a main element of gtk4, and not providing + support for it, implies shipping a broken gtk (as upstream sentenced). + So, let's recommend it. (LP: #2011849) + + -- Marco Trevisan (Treviño) Thu, 23 Mar 2023 18:23:32 +0100 + + gtk4 (4.10.1+ds-1) experimental; urgency=medium + + * New upstream release + * Drop combobox patch applied in new release + * Refresh patch + + -- Jeremy Bicha Tue, 14 Mar 2023 08:43:02 -0400 + + gtk4 (4.10.0+ds-2) experimental; urgency=medium + + * Cherry-pick patch to fix combo boxes + + -- Jeremy Bicha Wed, 08 Mar 2023 12:43:20 -0500 + + gtk4 (4.10.0+ds-1) experimental; urgency=medium + + * New upstream release + * debian/libgtk-4-1.symbols.in: Add new symbols + + -- Jeremy Bicha Mon, 06 Mar 2023 09:18:40 -0500 + + gtk4 (4.9.4+ds-1) experimental; urgency=medium + + * New upstream release + * debian/libgtk-4-1.symbols.in: Add new symbols + + -- Jeremy Bicha Mon, 13 Feb 2023 16:14:23 -0500 + + gtk4 (4.9.3+ds-1) experimental; urgency=medium + + [ Jeremy Bicha, via Ubuntu ] + * New upstream release 4.9.2 + * Bump minimum glib to 2.72.0 + * debian/libgtk-4-1.symbols.in: Update. + Some symbols were removed, but they were never considered public ABI. + * Revert commit dropping installed tests + * Refresh patch series + + [ Simon McVittie ] + * d/gbp.conf, d/watch: Branch for experimental + * New upstream release 4.9.3 + * Drop patches that were applied (some a little differently) upstream + * Refresh patch series + * d/copyright: Update + * d/control.in: Update versions of build-dependencies + * Drop version constraints that have been satisfied since Debian 10 + * d/libgtk-4-1.symbols.in: Update. + Ignore removal of gtk_file_dialog_{get,set}_shortcut_folders: they were + added in the 4.9.x branch and are not yet considered stable ABI. + + -- Jeremy Bicha Thu, 09 Feb 2023 11:43:59 -0500 gtk4 (4.8.3+ds-2) unstable; urgency=medium diff --cc debian/patches/series index 5a8f1d6f7a,481a9bcb6c..09a1fb7e4f --- a/debian/patches/series +++ b/debian/patches/series @@@ -13,7 -4,9 +4,12 @@@ tests-mark-headless-tests-as-flaky.patc debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch debian/reftests-Allow-minor-differences-to-be-tolerated.patch debian/Disable-inscription-markup.ui-reftest.patch - debian/Disable-clipboard-test.patch + debian/subprojects-Add-gst-player-1.0-as-subporject.patch + debian/gstreamer-player-1.0-Do-not-install-it-if-it-s-a-subproje.patch + debian/media-Use-gstplayer-from-meson-subproject.patch + debian/gstreamer-player-Use-GtkName-Prefix-to-avoid-issues-if-ac.patch + debian/tests-Mark-gltexture-as-expected-to-fail-on-big-endian-ma.patch + debian/tests-Allow-longer-for-a-dialog-to-open.patch +disable-tests-raspbian.patch +disable-a-couple-more-failing-tests.patch +disable-linear-gradient-transition-to-ot.patch diff --cc testsuite/tools/meson.build index 9ee118a49a,54ede78118..2fdedd3278 --- a/testsuite/tools/meson.build +++ b/testsuite/tools/meson.build @@@ -5,7 -5,7 +5,7 @@@ bash = find_program('bash', required : if bash.found() test_env = environment() - foreach t : ['validate', 'settings'] - foreach t : ['simplify', 'simplify-3to4', 'validate', 'enumerate', 'settings'] ++ foreach t : ['validate', 'enumerate', 'settings'] if get_option('install-tests') configure_file(output: t, input: '@0@.in'.format(t),