core.git: Branch 'distro/collabora/co-25.04' - 2 commits - download.lst vcl/qa

[Xisco Fauli (via logerrit)]

 download.lst                       |    8 ++++----
 vcl/qa/cppunit/FontFeatureTest.cxx |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit fcd451277298d84a051284c653c6f01d94f804bf
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Mar 28 10:50:15 2025 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 31 10:36:21 2025 +0200

    expat: upgrade to 2.7.1
    
    Downloaded from 
https://github.com/libexpat/libexpat/releases/download/R_2_7_1/expat-2.7.1.tar.xz
    
    Change-Id: I10c3e609f1711afeceb5dad2ee871e305cccdf8e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183447
    Tested-by: Jenkins
    Reviewed-by: Taichi Haradaguchi <20001...@protonmail.com>

diff --git a/download.lst b/download.lst
index 4a130aaefbba..d372b9cd8e2b 100644
--- a/download.lst
+++ b/download.lst
@@ -111,8 +111,8 @@ ETONYEK_TARBALL := 
libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-EXPAT_SHA256SUM := 
25df13dd2819e85fb27a1ce0431772b7047d72af81ae78dc26b4c6e0805f48d1
-EXPAT_TARBALL := expat-2.7.0.tar.xz
+EXPAT_SHA256SUM := 
354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30
+EXPAT_TARBALL := expat-2.7.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
commit 6199f2f9d9d307d12686afd52a7cf69f1182a557
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Mar 28 15:26:12 2025 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 31 10:36:21 2025 +0200

    Amiri: upgrade to 1.001
    
    Downloaded from 
https://github.com/aliftype/amiri/archive/refs/tags/1.001.zip
    
    Change-Id: Ib6bd5ed05cbb282fde0bcab44b715350fdf252ce
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183455
    Tested-by: Jenkins
    Reviewed-by: Khaled Hosny <kha...@libreoffice.org>
    (cherry picked from commit c42357adc04648d2607346e78514ea1b8503b077)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183469

diff --git a/download.lst b/download.lst
index 093b4acc201b..4a130aaefbba 100644
--- a/download.lst
+++ b/download.lst
@@ -305,8 +305,8 @@ FONT_ALEF_TARBALL := alef-1.001.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_AMIRI_SHA256SUM := 
926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30
-FONT_AMIRI_TARBALL := Amiri-1.000.zip
+FONT_AMIRI_SHA256SUM := 
cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a
+FONT_AMIRI_TARBALL := Amiri-1.001.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx 
b/vcl/qa/cppunit/FontFeatureTest.cxx
index 1b8dd40213b6..51fc9e24b114 100644
--- a/vcl/qa/cppunit/FontFeatureTest.cxx
+++ b/vcl/qa/cppunit/FontFeatureTest.cxx
@@ -146,16 +146,16 @@ void FontFeatureTest::testGetFontFeaturesOpenType()
     for (vcl::font::Feature const& rFeature : rFontFeatures)
         aFeaturesString += vcl::font::featureCodeAsString(rFeature.m_nCode) + 
" ";
 
-    CPPUNIT_ASSERT_EQUAL(size_t(17), rFontFeatures.size());
+    CPPUNIT_ASSERT_EQUAL(size_t(15), rFontFeatures.size());
 
-    CPPUNIT_ASSERT_EQUAL(u"calt calt dnom liga numr pnum ss01 ss02 "
+    CPPUNIT_ASSERT_EQUAL(u"dnom liga numr pnum ss01 ss02 "
                          "ss03 ss04 ss05 ss06 ss07 ss08 kern kern "
                          "ss05 "_ustr,
                          aFeaturesString);
 
     // Check ss01 feature
     {
-        vcl::font::Feature& rFeature = rFontFeatures[6];
+        vcl::font::Feature& rFeature = rFontFeatures[4];
         CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("ss01"), rFeature.m_nCode);
 
         vcl::font::FeatureDefinition& rFeatureDefinition = 
rFeature.m_aDefinition;