From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 18 Feb 2022 15:42:24 +0000 (+0000)
Subject: Merge version 4.4.1+ds1-3+rpi1 and 4.6.0+ds1-4 to produce 4.6.0+ds1-4+rpi1
X-Git-Tag: archive/raspbian/4.6.0+ds1-4+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c0481153eb49c4fd6f845b290516bcf684f27922;p=gtk4.git

Merge version 4.4.1+ds1-3+rpi1 and 4.6.0+ds1-4 to produce 4.6.0+ds1-4+rpi1
---

c0481153eb49c4fd6f845b290516bcf684f27922
diff --cc debian/changelog
index e27b448158,15d0745a20..ba0f83ccae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,50 +1,58 @@@
- gtk4 (4.4.1+ds1-3+rpi1) bookworm-staging; urgency=medium
++gtk4 (4.6.0+ds1-4+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4.4.0+ds1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 07 Sep 2021 10:26:09 +0000]
 +  * Disable a couple of faliing tests in Raspbian.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 03 Dec 2021 00:41:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Feb 2022 15:42:24 +0000
++
+ gtk4 (4.6.0+ds1-4) unstable; urgency=medium
+ 
+   * Release to unstable
+ 
+  -- Jeremy Bicha <jeremy.bicha@canonical.com>  Wed, 09 Feb 2022 13:25:53 -0500
+ 
+ gtk4 (4.6.0+ds1-3) experimental; urgency=medium
+ 
+   * Skip another known-failing test on mips*el (see #993550)
+   * Add mips*el bug reference to previous changelog entry
+ 
+  -- Simon McVittie <smcv@debian.org>  Sat, 08 Jan 2022 22:47:19 +0000
+ 
+ gtk4 (4.6.0+ds1-2) experimental; urgency=medium
+ 
+   * d/p/png-Correct-endianness-for-big-endian-machines.patch:
+     Add proposed patch to fix FTBFS on s390x
+   * d/p/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch:
+     Skip another known-failing test on mips family (see #1003348)
+   * d/p/debian/Disable-optimized-GResource-embedding.patch:
+     Disable optimized GResource embedding.
+     This seems to be triggering failures on armel and armhf. Second-guessing
+     GResource seems to be more trouble than it's worth.
+   * d/rules: Rebuild CSS using sass
+ 
+  -- Simon McVittie <smcv@debian.org>  Sat, 08 Jan 2022 18:40:18 +0000
+ 
+ gtk4 (4.6.0+ds1-1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Rebase patch series
+     - d/p/debian/testsuite-Don-t-test-the-old-gl-renderer.patch:
+       Drop, no longer needed
+   * d/control.in: Update build-dependencies
+   * d/copyright: Update
+   * d/rules: Don't build man pages under nodoc build-profile
+   * d/source/include-binaries, d/rules:
+     Remove workaround for Compose endianness handling, no longer necessary
+   * Update symbols file
+   * d/p/Make-our-stack-noexec.patch:
+     Add patch from upstream fixing regressions from optimized GResource
+     processing
+   * d/p/build-Tell-glib-compile-resources-to-make-symbols-interna.patch:
+     Add proposed patch to reduce unwanted symbol exports
+   * Upload to experimental for initial testing
+ 
+  -- Simon McVittie <smcv@debian.org>  Tue, 04 Jan 2022 18:14:08 +0000
  
  gtk4 (4.4.1+ds1-3) unstable; urgency=medium
  
diff --cc debian/patches/series
index 3da48e2071,203f46fa89..d743cd6883
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,7 -5,6 +5,7 @@@ reftest_compare_surfaces-Report-how-muc
  reftests-Allow-minor-differences-to-be-tolerated.patch
  debian/Disable-web-fonts-for-now.patch
  debian/templates-Remove-html5shiv.patch
- debian/testsuite-Don-t-test-the-old-gl-renderer.patch
  debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch
  debian/Disable-clipboard-test.patch
+ debian/Disable-optimized-GResource-embedding.patch
 +disable-tests-raspbian.patch