Merge version 4.12.4+ds-3+rpi1 and 4.12.5+ds-2 to produce 4.12.5+ds-2+rpi1

diff --cc debian/changelog
index 11c88a2b7e6b7d2c58804009819faddda5776c9c,e2c43b1f649519fe358c195ac169e60d1826bc6d..bf82ca66487e122681f81399e9d8521fdbc8f575
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,45 +1,59 @@@
- gtk4 (4.12.4+ds-3+rpi1) trixie-staging; urgency=medium
++gtk4 (4.12.5+ds-2+rpi1) trixie-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.
 +
 +  [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 <plugwash@debian.org>  Tue, 19 Dec 2023 10:11:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Feb 2024 00:23:36 +0000
++
+ gtk4 (4.12.5+ds-2) unstable; urgency=medium
+ 
+   * Allow stderr for python3-gi autopkgtests to not fail
+     tests for zink warnings emitted by mesa
+ 
+  -- Jeremy Bícha <jbicha@ubuntu.com>  Fri, 26 Jan 2024 15:19:36 -0500
+ 
+ gtk4 (4.12.5+ds-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - Update emoji chooser for Unicode 15.1
+   * missing-sources: Update emojibase
+   * missing-sources: Copy emoji 15.1 files from Debian's unicode-data package
+ 
+  -- Jeremy Bícha <jbicha@ubuntu.com>  Fri, 19 Jan 2024 15:20:15 -0500
+ 
+ gtk4 (4.12.4+ds-4) unstable; urgency=medium
+ 
+   [ Dandan Zhang ]
+   * Add loong64 to the list of architectures that have librsvg
+     (Closes: #1059613)
+   * Extend test timeout on loong64
+ 
+   [ Jeremy Bícha ]
+   * Remove references to obsolete mipsel
+ 
+   [ Simon McVittie ]
+   * d/control: Use dh-sequence-gir to activate debhelper addon
+   * d/control: Rely on ${gir:Provides} for gir1.2-gtk-4.0's Provides.
+     The version of gobject-introspection in testing now supports this.
+   * d/rules: Disable GObject-Introspection in the udeb build.
+     debian-installer does not use GTK from an interpreted language and
+     is unlikely to do so any time soon.
+   * d/control, d/rules: Use a cross g-ir-scanner if cross-compiled
+   * d/control: Stop build-depending on libgirepository1.0-dev.
+     This package is problematic because it cannot be Multi-Arch
+     co-installable, but with recent changes to the Build-Depends, we no
+     longer need it.
+   * d/control: Don't require python3-gi when not running tests.
+     This makes the build-dependencies satisfiable during cross-builds.
+ 
+  -- Simon McVittie <smcv@debian.org>  Wed, 17 Jan 2024 11:43:08 +0000
  
  gtk4 (4.12.4+ds-3) unstable; urgency=medium
  

diff --cc debian/rules
index 270fabc9e9fd48c460267f3a32050cf7526df386,c71c208c6771b490469cc1e07a73621230c2e18e..15cdc122afb7a33ebcbc2bc4b64fcd0da4c4301a
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -141,12 -146,9 +146,12 @@@ configure_flags_udeb = 
        $(NULL)
  
  %:
-       dh $@ --with gir --buildsystem=meson $(dh_options)
+       dh $@ --buildsystem=meson $(dh_options)
  
  override_dh_clean: debian/control
 +      # cleanup python crap
 +      rm -rf subprojects/gi-docgen/gidocgen/gir/__pycache__
 +      rm -rf subprojects/gi-docgen/gidocgen/__pycache__
        rm -f $(call dh_subst_files,$(all_binaries))
        rm -rf debian/build debian/install
        # Rebuild the CSS from source. Note that gtk.css is hand-written,

diff --cc testsuite/gtk/meson.build
Simple merge