Skip to content
Commits on Source (15)
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 15efe869
gtk4 (4.6.6+ds-1ubuntu1) kinetic; urgency=medium
gtk4 (4.6.6+ds-3ubuntu1) UNRELEASED; urgency=medium
* Sync with Debian. Remaining changes:
- debian/tests:
+ include the memorytexture test in the flaky set, it has been unreliable
- debian/control:
+ Build-Depend on dh-sequence-translations
- debian/rules: Handle the 2nd translation template file.
This override can be dropped with 4.7.1
-- Jesús Soto <jesus.soto@canonical.com> Tue, 16 Aug 2022 09:49:05 -0500
gtk4 (4.6.6+ds-3) unstable; urgency=medium
* Branch 4.6.x for unstable
* d/rules: Force softpipe OpenGL driver on mips* architectures.
This is a workaround for misrendering and crashes when the buildds run
tests under llvmpipe on these architectures (see #993550, #1003348,
#1010838).
* d/p/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch:
Remove patch, stop skipping tests that (should) pass on mips*el when
we force softpipe.
* d/p/Work-around-1014417-in-Meson.patch:
Remove workaround for a Meson 0.63.0 bug that was fixed in 0.63.1
* d/p/build-Add-an-option-to-use-more-conservative-GResource-em.patch:
Add a build option to disable the GResource fast-path, and disable it.
It isn't reliable on non-mainstream architectures, and the compile time
improvement is not significant if we're compiling all of GTK anyway.
* d/rules: Enable broadway backend for the .deb build (but not the udeb).
This is apparently used by Cambalache and Deckard, and also the
Pidgin unit tests. (Closes: #994944)
-- Simon McVittie <smcv@debian.org> Tue, 16 Aug 2022 09:23:59 +0100
gtk4 (4.6.6+ds-2) unstable; urgency=medium
[ Evangelos Ribeiro Tzaras ]
* Drop erroneous !nocheck annotation from python3-gi Build-Depends
(Closes: #1014878)
[ Simon McVittie ]
* Add temporary patch to work around #1014417 in Meson
* Standards-Version: 4.6.1 (no changes required)
* Migrate GLib 2.68.0 build-dependency from d/control to d/control.in
* d/copyright: Drop unused GPL license stanzas
* d/gtk-4-tests.lintian-overrides: Update syntax for current Lintian
-- Simon McVittie <smcv@debian.org> Mon, 08 Aug 2022 19:22:54 +0100
gtk4 (4.6.6+ds-1ubuntu1) kinetic; urgency=medium
* Sync with Debian. Remaining changes:
- debian/tests:
......
debian/control
View file @ 15efe869
......@@ -65,7 +65,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
meson (>= 0.59),
pkg-config,
python3-docutils <!nodoc>,
python3-gi (>= 3.40) <!nocheck>,
python3-gi (>= 3.40),
sassc,
ttf-bitstream-vera <!nocheck>,
wayland-protocols (>= 1.23) [linux-any],
......@@ -79,9 +79,9 @@ Build-Depends-Indep: gi-docgen <!nodoc>,
libpango1.0-doc <!nodoc>,
pandoc,
Rules-Requires-Root: no
Standards-Version: 4.6.0
Standards-Version: 4.6.1
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git -b debian/unstable
Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4/tree/ubuntu/jammy
Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git -b ubuntu/jammy
Homepage: https://www.gtk.org/
......
debian/control.in
View file @ 15efe869
......@@ -32,7 +32,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
libfribidi-dev (>= 0.19.7),
libgdk-pixbuf-2.0-dev (>= 2.30.0),
libgirepository1.0-dev (>= 1.39.0),
libglib2.0-dev (>= 2.66.0),
libglib2.0-dev (>= 2.68.0),
libgraphene-1.0-dev (>= 1.10.4~),
libgstreamer1.0-dev (>= 1.12.3),
libgstreamer-plugins-bad1.0-dev (>= 1.12.3),
......@@ -65,7 +65,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
meson (>= 0.59),
pkg-config,
python3-docutils <!nodoc>,
python3-gi (>= 3.40) <!nocheck>,
python3-gi (>= 3.40),
sassc,
ttf-bitstream-vera <!nocheck>,
wayland-protocols (>= 1.23) [linux-any],
......@@ -79,9 +79,9 @@ Build-Depends-Indep: gi-docgen <!nodoc>,
libpango1.0-doc <!nodoc>,
pandoc,
Rules-Requires-Root: no
Standards-Version: 4.6.0
Standards-Version: 4.6.1
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git -b debian/unstable
Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4/tree/ubuntu/jammy
Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git -b ubuntu/jammy
Homepage: https://www.gtk.org/
......
debian/copyright
View file @ 15efe869
......@@ -513,34 +513,6 @@ Files:
Copyright: unspecified
License: CC0-1.0
License: GPL-2.0+
SPDX license expression "GPL-2.0-or-later":
https://spdx.org/licenses/GPL-2.0-or-later.html
.
This license identifier refers to the choice to use code under
GPL-2.0-or-later (i.e., GPL-2.0 or some later version), as distinguished
from use of code under GPL-2.0-only. The license notice (as seen in the
Standard License Header field below) states which of these applies the
code in the file. The example in the exhibit to the license shows the
license notice for the "or later" approach.
.
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in "/usr/share/common-licenses/GPL-2.0".
License: GPL-3.0+
SPDX license expression "GPL-3.0-or-later":
https://spdx.org/licenses/GPL-3.0-or-later.html
.
This license identifier refers to the choice to use code under
GPL-3.0-or-later (i.e., GPL-3.0 or some later version), as distinguished
from use of code under GPL-3.0-only. The license notice (as seen in the
Standard License Header field below) states which of these applies the
code in the file. The example in the exhibit to the license shows the
license notice for the "or later" approach.
.
On Debian systems, the complete text of the GNU General Public License
version 3 can be found in "/usr/share/common-licenses/GPL-3.0".
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......
debian/gbp.conf
View file @ 15efe869
......@@ -2,7 +2,7 @@
pristine-tar = True
debian-branch = ubuntu/master
debian-tag = ubuntu/%(version)s
upstream-branch = upstream/latest
upstream-branch = upstream/4.6.x
upstream-vcs-tag = %(version)s
[buildpackage]
......
debian/gtk-4-tests.lintian-overrides
View file @ 15efe869
# test data is not documentation
package-contains-documentation-outside-usr-share-doc usr/libexec/installed-tests/*
package-contains-documentation-outside-usr-share-doc [usr/libexec/installed-tests/*]
debian/libgtk-4-1.symbols.in
View file @ 15efe869
......@@ -10,6 +10,15 @@ libgtk-@APIVER@.so.@SONAME@ @SHARED_PKG@ #MINVER#
gdk_app_launch_context_set_timestamp@Base 4.0.0
gdk_axis_flags_get_type@Base 4.0.0
gdk_axis_use_get_type@Base 4.0.0
gdk_broadway_cairo_context_get_type@Base 4.6.6+ds-3~
gdk_broadway_display_get_surface_scale@Base 4.6.6+ds-3~
gdk_broadway_display_get_type@Base 4.6.6+ds-3~
gdk_broadway_display_hide_keyboard@Base 4.6.6+ds-3~
gdk_broadway_display_set_surface_scale@Base 4.6.6+ds-3~
gdk_broadway_display_show_keyboard@Base 4.6.6+ds-3~
gdk_broadway_draw_context_get_type@Base 4.6.6+ds-3~
gdk_broadway_monitor_get_type@Base 4.6.6+ds-3~
gdk_broadway_surface_get_type@Base 4.6.6+ds-3~
gdk_button_event_get_button@Base 4.0.0
gdk_button_event_get_type@Base 4.0.0
gdk_cairo_context_cairo_create@Base 4.0.0
......@@ -633,6 +642,8 @@ libgtk-@APIVER@.so.@SONAME@ @SHARED_PKG@ #MINVER#
gsk_border_node_get_type@Base 4.0.0
gsk_border_node_get_widths@Base 4.0.0
gsk_border_node_new@Base 4.0.0
gsk_broadway_renderer_get_type@Base 4.6.6+ds-3~
gsk_broadway_renderer_new@Base 4.6.6+ds-3~
gsk_cairo_node_get_draw_context@Base 4.0.0
gsk_cairo_node_get_surface@Base 4.0.0
gsk_cairo_node_get_type@Base 4.0.0
......
debian/libgtk-4-bin.install
View file @ 15efe869
usr/bin/gtk4-broadwayd
usr/bin/gtk4-builder-tool
usr/bin/gtk4-encode-symbolic-svg
usr/bin/gtk4-launch
usr/bin/gtk4-query-settings
usr/bin/gtk4-update-icon-cache
usr/share/man/*/gtk4-encode-symbolic-svg.*
usr/share/man/man1/gtk4-broadwayd.1
usr/share/man/man1/gtk4-builder-tool.1
usr/share/man/man1/gtk4-launch.1
usr/share/man/man1/gtk4-query-settings.1
......
debian/patches/build-Add-an-option-to-use-more-conservative-GResource-em.patch 0 → 100644
View file @ 15efe869
From: Simon McVittie <smcv@debian.org>
Date: Mon, 15 Aug 2022 22:24:26 +0100
Subject: build: Add an option to use more conservative GResource embedding
Doing clever things with objcopy is faster, but also doesn't work on
all toolchains and architectures: in particular, Debian has had trouble
with this on arm and mips.
Developers will want to leave this option switched on for faster
incremental builds (unless their toolchain doesn't support it), but in
a distro build environment where we are compiling all of GTK every time,
the cost of potentially unreliable builds is higher than the cost of
using slower but more conservative GResource embedding.
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5107
Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4956
Signed-off-by: Simon McVittie <smcv@debian.org>
---
gtk/meson.build | 15 ++++++++++++++-
meson_options.txt | 5 +++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/gtk/meson.build b/gtk/meson.build
index 3a8457a..de40b91 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -864,15 +864,28 @@ if not fs.exists('theme/Default/Default-light.css')
endif
+fast_gresource_embedding = get_option('fast_gresource_embedding')
+
objcopy_supports_add_symbol = false
objcopy = find_program('objcopy', required : false)
if objcopy.found()
objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
endif
+fast_gresource_embedding = fast_gresource_embedding and objcopy_supports_add_symbol
ld = find_program('ld', required : false)
+fast_gresource_embedding = fast_gresource_embedding and ld.found()
+
+if meson.is_cross_build() or build_machine.system() != 'linux'
+ fast_gresource_embedding = false
+endif
+
+if build_machine.cpu_family() in ['arm', 'mips']
+ # Known not to work reliably on these architectures
+ fast_gresource_embedding = false
+endif
-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+if fast_gresource_embedding
glib_compile_resources = find_program('glib-compile-resources')
# Create the resource blob
diff --git a/meson_options.txt b/meson_options.txt
index bb2530d..73ed3ab 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -78,6 +78,11 @@ option('f16c',
value: 'enabled',
description: 'Enable F16C fast paths (requires F16C)')
+option('fast_gresource_embedding',
+ type: 'boolean',
+ value: true,
+ description: 'Speed up GResource compilation (does not work on all architectures)')
+
# Documentation and introspection
option('gtk_doc',
debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch deleted 100644 → 0
View file @ 02ed35c6
From: Simon McVittie <smcv@debian.org>
Date: Thu, 2 Sep 2021 23:31:54 +0100
Subject: Skip some known-failing tests on mips-family architectures
Forwarded: no
---
testsuite/gsk/meson.build | 10 ++++++++--
testsuite/reftests/meson.build | 19 +++++++++++++------
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 2fb0208..8c3ff1f 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -77,9 +77,7 @@ compare_render_tests = [
'scale-up-down',
'shadow-in-opacity',
'texture-url',
- 'repeat',
'repeat-no-repeat',
- 'repeat-negative-coords',
'repeat-texture',
'transform-in-transform',
'transform-in-transform-in-transform',
@@ -87,6 +85,14 @@ compare_render_tests = [
'rounded-clip-in-clip-3d', # not really 3d, but cairo fails it
]
+if not host_machine.cpu_family().contains('mips')
+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/4228
+ compare_render_tests += [
+ 'repeat',
+ 'repeat-negative-coords',
+ ]
+endif
+
# these are too sensitive to differences in the renderers
# to run in ci, but still useful to keep around
informative_render_tests = [
diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 0b6d0fa..b7d2fcf 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -71,9 +71,6 @@ testdata = [
'background-area.css',
'background-area.ref.ui',
'background-area.ui',
- 'background-blend-mode-clip-interaction.css',
- 'background-blend-mode-clip-interaction.ref.ui',
- 'background-blend-mode-clip-interaction.ui',
'background-color-transparent.css',
'background-color-transparent.ref.ui',
'background-color-transparent.ui',
@@ -92,9 +89,6 @@ testdata = [
'background-position-repeat.ref.ui',
'background-position-repeat.ui',
'background-position-repeat-bg.png',
- 'background-position-simple.css',
- 'background-position-simple.ref.ui',
- 'background-position-simple.ui',
'background-repeat-clip.css',
'background-repeat-clip.ref.ui',
'background-repeat-clip.ui',
@@ -581,6 +575,19 @@ xfails = [
'border-half-pixel.ui'
]
+if not host_machine.cpu_family().contains('mips')
+ testdata += [
+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/4618
+ 'background-blend-mode-clip-interaction.css',
+ 'background-blend-mode-clip-interaction.ref.ui',
+ 'background-blend-mode-clip-interaction.ui',
+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/4228
+ 'background-position-simple.css',
+ 'background-position-simple.ref.ui',
+ 'background-position-simple.ui',
+ ]
+endif
+
reftest_env = environment()
reftest_env.set('GTK_A11Y', 'test')
reftest_env.set('G_TEST_SRCDIR', meson.current_source_dir())
debian/patches/series
View file @ 15efe869
build-Add-an-option-to-use-more-conservative-GResource-em.patch
reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
reftests-Allow-minor-differences-to-be-tolerated.patch
debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch
debian/Disable-clipboard-test.patch
debian/rules
View file @ 15efe869
......@@ -76,11 +76,12 @@ debian/%: debian/%.in
configure_flags_common = \
--libdir=/$(LIBDIR) \
-Dfast_gresource_embedding=false \
${NULL}
configure_flags_deb = \
-Dauto_features=enabled \
-Dbroadway-backend=false \
-Dbroadway-backend=true \
-Dx11-backend=true \
${NULL}
......@@ -217,6 +218,12 @@ $(info Architecture with qemu buildds detected, increasing test timeout a lot)
test_timeout_multiplier = 20
endif
ifneq ($(filter mips%,$(DEB_HOST_ARCH_CPU)),)
$(info Disabling use of llvmpipe due to mips family CPU, see https://bugs.debian.org/993550)
export GALLIUM_DRIVER=softpipe
export LIBGL_ALWAYS_SOFTWARE=true
endif
fuzzy_gsk_compare = \
$(NULL)
......@@ -255,11 +262,6 @@ ifeq (big,$(DEB_HOST_ARCH_ENDIAN))
$(NULL)
endif
# Workaround for https://bugs.debian.org/1010838
ifeq (mipsel,$(DEB_HOST_ARCH_CPU))
export GALLIUM_DRIVER=softpipe
endif
override_dh_auto_test:
env \
BUILDDIR=debian/build/deb \
......@@ -284,7 +286,6 @@ override_dh_install:
rm -fv debian/install/udeb/usr/bin/gtk4-update-icon-cache
rm -frv debian/install/udeb/usr/share/gtk-4.0/valgrind
rm -frv debian/install/udeb/usr/share/metainfo
rm -fv debian/install/deb/usr/share/man/man1/gtk4-broadwayd.1
:
dh_install -p$(UDEB_PKG) --sourcedir=debian/install/udeb
dh_install --remaining-packages --sourcedir=debian/install/deb
......