Release to experimental

diff --git a/debian/changelog b/debian/changelog
index da7dff23b4c6a1f8fc1ac7969c5455a6c259e11d..9a54927eb033a6eb92ccfd3a9cc9a1a3f5f3c654 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+gtk4 (4.4.0+ds1-3) experimental; urgency=medium
+
+  * Disable Broadway (HTML) backend.
+    It isn't clear whether this is used in practice. If we disable it now,
+    enabling it later if requested will not be an ABI break, but if we
+    enable it now, we have to keep it enabled indefinitely.
+  * d/missing-sources: Add source for libX11-derived compose sequences.
+    By trial and error, the files in gtk/compose/ seem to be generated from
+    libX11 1.7.0.
+  * d/p/compose-Generate-endian-dependent-compact-Compose-data.patch,
+  * Add proposed patch to use big-endian compose data on big-endian host,
+    keeping the existing little-endian version for little-endian hosts.
+    This resolves a FTBFS caused by test failure on s390x and other
+    big-endian ports.
+  * d/p/compose-Document-how-to-get-compose-parse-input-from-libX.patch
+    Document how to reproduce the compose data. We don't do this at build
+    time, because the compose data is relatively rarely updated, and
+    during cross-compilation that would require building all of GTK for
+    both the build and host architectures.
+  * d/p/compose-Update-sequences-from-libX11-1.7.2.patch:
+    Update compose data from libX11 1.7.2.
+    This adds a few missing compose sequences.
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 30 Aug 2021 13:33:17 +0100
+
 gtk4 (4.4.0+ds1-2) experimental; urgency=medium
 
   * Completely move .links files to debhelper syntax (Closes: #991964)

diff --git a/debian/patches/compose-Document-how-to-get-compose-parse-input-from-libX.patch b/debian/patches/compose-Document-how-to-get-compose-parse-input-from-libX.patch
index 54b2cbc7a7b168147032c1afb45ca52035f00b9e..911a89f53d9cbaad5ab6708e34896c4bca3311f1 100644 (file)
--- a/debian/patches/compose-Document-how-to-get-compose-parse-input-from-libX.patch
+++ b/debian/patches/compose-Document-how-to-get-compose-parse-input-from-libX.patch
@@ -4,6 +4,7 @@ Subject: compose: Document how to get compose-parse input from libX11 source
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
 Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3902
+Applied-upstream: 4.5.0
 ---
  gtk/compose/compose-parse.c | 1 +
  1 file changed, 1 insertion(+)

diff --git a/debian/patches/compose-Generate-endian-dependent-compact-Compose-data.patch b/debian/patches/compose-Generate-endian-dependent-compact-Compose-data.patch
index 4f150c8c2f983f5904952736bcec7a162dccaf26..99b7eefe64d84b4370118716314072a9b2290ec9 100644 (file)
--- a/debian/patches/compose-Generate-endian-dependent-compact-Compose-data.patch
+++ b/debian/patches/compose-Generate-endian-dependent-compact-Compose-data.patch
@@ -11,9 +11,10 @@ each build of GTK. This fixes failure of the composetable test when
 building for a big-endian architecture such as s390x and (traditional,
 big-endian) powerpc.
 
-Resolves: https://gitlab.gnome.org/GNOME/gtk/-/issues/4217
+Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4217
 Signed-off-by: Simon McVittie <smcv@debian.org>
 Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3902
+Applied-upstream: 4.5.0
 ---
  gtk/compose/compose-parse.c   | 30 +++++++++++++++++++++++++-----
  gtk/gen-gtk-gresources-xml.py |  9 +++++----

diff --git a/debian/patches/compose-Update-sequences-from-libX11-1.7.2.patch b/debian/patches/compose-Update-sequences-from-libX11-1.7.2.patch
index 797a60bd739e5ce58ca56545aae9a39234b0c28d..ea2ae7c633d41cfa20aa461dcefe0621e0fa57fb 100644 (file)
--- a/debian/patches/compose-Update-sequences-from-libX11-1.7.2.patch
+++ b/debian/patches/compose-Update-sequences-from-libX11-1.7.2.patch
@@ -8,6 +8,7 @@ breve. Previously, only a capital U was accepted for E, G, I and O
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
 Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3902
+Applied-upstream: 4.5.0
 ---
  gtk/compose/gtkcomposedata.h          |  2 +-
  testsuite/gtk/compose/system.expected | 14 ++++++++++++--