From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 19 Jul 2026 23:09:25 +0000 (+0100)
Subject: Merge version 4:7.4.7-1+rpi1+deb12u13 and 4:7.4.7-1+deb12u14 to produce 4:7.4.7-1... 
X-Git-Tag: archive/raspbian/4%7.4.7-1+rpi1+deb12u14^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bcacc9663f42abfcbf67ab8298a5f16f9db19eab;p=libreoffice.git

Merge version 4:7.4.7-1+rpi1+deb12u13 and 4:7.4.7-1+deb12u14 to produce 4:7.4.7-1+rpi1+deb12u14
---

bcacc9663f42abfcbf67ab8298a5f16f9db19eab
diff --cc debian/changelog
index 48887237de7,5dc400cb281..6f5258f7e26
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- libreoffice (4:7.4.7-1+rpi1+deb12u13) bookworm-staging; urgency=medium
++libreoffice (4:7.4.7-1+rpi1+deb12u14) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
 +  * Disable testsuite.
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
 +  [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green]
 +  * Use clang 11, newer versions cause armv7 contamination issues.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jun 2026 17:20:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 19 Jul 2026 23:09:15 +0000
++
+ libreoffice (4:7.4.7-1+deb12u14) bookworm; urgency=medium
+ 
+   * debian/patches/check-for-hb_shape_full-failure.diff: add patch from
+     libreoffice-26-2 branch to gracefully handle hb_shape_full failure,
+     as can happen after the fix for CVE-2026-50593 in graphite2 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 06 Jun 2026 23:07:23 +0200
  
  libreoffice (4:7.4.7-1+deb12u13) bookworm-security; urgency=medium