Unverified Commit 91cc6dc5 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #336839 from K900/libreoffice-24.8 

libreoffice: still 7.6 -> 24.2, fresh 24.2 -> 24.8, more cleanups, more system deps
parents 8da188f8 6a6ce44d

pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
From 982d38084f08950863b55043f36ce5548bd73635 Mon Sep 17 00:00:00 2001

From: Maximilian Bosch <maximilian@mbosch.me>

Date: Mon, 24 Jul 2023 19:12:25 +0200

Subject: [PATCH] Strip away BUILDCONFIG



The `BuildConfig` field in `libsofficeapp.so` includes the entire

`PKG_CONFIG_PATH` and subsequently references to a lot of `dev` outputs

of library dependencies blowing up the closure.



Since this is not strictly needed and the inputs are comprehensible via

`nix derivation show`, this doesn't bring a real benefit in the case of

nixpkgs anyways.

---

 desktop/source/lib/init.cxx | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx

index 8d830c0cbd00..fbdc86aa7115 100644

--- a/desktop/source/lib/init.cxx

+++ b/desktop/source/lib/init.cxx

@@ -7097,7 +7097,7 @@ static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER LibreOfficeKit* /*pThis*/)

         "\"ProductVersion\": \"%PRODUCTVERSION\", "

         "\"ProductExtension\": \"%PRODUCTEXTENSION\", "

         "\"BuildId\": \"%BUILDID\", "

-        "\"BuildConfig\": \""  BUILDCONFIG  "\" "

+        "\"BuildConfig\": \"removed to avoid runtime dependencies against dev outputs of each dependency. Use 'nix derivation show' against the package to find out details about BuildConfig.\" "

         "}"));

 }

 

-- 

2.40.1

pkgs/applications/office/libreoffice/default.nix

+55 −37
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ 
, amiri

, caladea

, carlito

, culmus

, dejavu_fonts

, rubik

, liberation-sans-narrow
@@ -126,6 +127,10 @@ 
, libertine-g

, noto-fonts

, noto-fonts-cjk-sans

, rhino

, lp_solve

, xmlsec

, libcmis

# The rest are used only in passthru, for the wrapper

, kauth ? null

, kcompletion ? null
@@ -138,6 +143,7 @@ 
, kxmlgui ? null

, phonon ? null

, qtdeclarative ? null

, qtmultimedia ? null

, qtquickcontrols ? null

, qtsvg ? null

, qttools ? null
@@ -152,13 +158,14 @@ let 
    flatten flip

    concatMapStrings concatStringsSep

    getDev getLib

    optionals optionalAttrs optionalString;

    optionals optionalString;



  fontsConf = makeFontsConf {

    fontDirectories = [

      amiri

      caladea

      carlito

      culmus

      dejavu_fonts

      rubik

      liberation-sans-narrow
@@ -211,6 +218,7 @@ let 
    name = "libreoffice-kde-dependencies-${version}";

    paths = flatten (map (e: [ (getDev e) (getLib e) ]) [

      qtbase

      qtmultimedia

      qtx11extras

      kconfig

      kcoreaddons
@@ -249,29 +257,24 @@ in stdenv.mkDerivation (finalAttrs: { 
  patches = [

    # Skip some broken tests:

    # - tdf160386 does not fall back to a CJK font properly for some reason

    # - the remaining tests have notes in the patch

    # - the remaining tests have notes in the patches

    # FIXME: get rid of this ASAP

    ./skip-broken-tests.patch

    (./skip-broken-tests- + variant + ".patch")



    # Don't detect Qt paths from qmake, so our patched-in onese are used

    ./dont-detect-qt-paths-from-qmake.patch



    # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking

    ./readd-explicit-zlib-link.patch

  ] ++ lib.optionals (lib.versionOlder version "24.8") [

    (fetchpatch2 {

      name = "icu74-compat.patch";

      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch";

      hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y=";

    })

  ] ++ lib.optionals (variant == "still") [

    # Remove build config to reduce the amount of `-dev` outputs in the

    # runtime closure. This behavior was introduced by upstream in commit

    # cbfac11330882c7d0a817b6c37a08b2ace2b66f4

    ./0001-Strip-away-BUILDCONFIG.patch

    # See above

    ./skip-broken-tests-still.patch

  ] ++ lib.optionals (variant == "fresh" || variant == "collabora") [

    # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking

    ./readd-explicit-zlib-link.patch

    # See above

    ./skip-broken-tests-fresh.patch

  ] ++ lib.optionals (variant == "collabora") [

    ./fix-unpack-collabora.patch

    ./skip-broken-tests-collabora.patch

  ];



  postPatch = ''
@@ -353,6 +356,7 @@ in stdenv.mkDerivation (finalAttrs: { 
    libargon2

    libatomic_ops

    libcdr

    libcmis

    libe-book

    libepoxy

    libepubgen
@@ -379,6 +383,7 @@ in stdenv.mkDerivation (finalAttrs: { 
    libxslt

    libzmf

    libwebp

    lp_solve

    mdds

    mythes

    ncurses
@@ -397,6 +402,7 @@ in stdenv.mkDerivation (finalAttrs: { 
    unzip

    util-linux

    which

    xmlsec

    zip

    zlib

  ] ++ optionals kdeIntegration [
@@ -456,18 +462,6 @@ in stdenv.mkDerivation (finalAttrs: { 
    "--enable-release-build"

    "--enable-epm"

    "--with-ant-home=${getLib ant}/lib/ant"

    "--with-system-cairo"

    "--with-system-libs"

    "--with-system-headers"

    "--with-system-openssl"

    "--with-system-libabw"

    "--with-system-liblangtag"

    "--without-system-libcmis"

    "--with-system-libwps"

    "--with-system-mdds"

    "--with-system-openldap"

    "--with-system-coinmp"

    "--with-system-postgresql"



    # Without these, configure does not finish

    "--without-junit"
@@ -486,12 +480,28 @@ in stdenv.mkDerivation (finalAttrs: { 
    (lib.withFeature withFonts "fonts")

    "--without-doxygen"



    # TODO: package these as system libraries

    "--with-system-beanshell"

    "--without-system-hsqldb"

    "--with-system-cairo"

    "--with-system-coinmp"

    "--with-system-headers"

    "--with-system-libabw"

    "--with-system-libcmis"

    "--with-system-libepubgen"

    "--with-system-libetonyek"

    "--with-system-liblangtag"

    "--with-system-libs"

    "--with-system-libwps"

    "--with-system-lpsolve"

    "--with-system-mdds"

    "--with-system-openldap"

    "--with-system-openssl"

    "--with-system-orcus"

    "--with-system-postgresql"

    "--with-system-xmlsec"



    # TODO: package these as system libraries

    "--without-system-altlinuxhyph"

    "--without-system-frozen"

    "--without-system-lpsolve"

    "--without-system-libfreehand"

    "--without-system-libmspub"

    "--without-system-libnumbertext"
@@ -501,20 +511,26 @@ in stdenv.mkDerivation (finalAttrs: { 
    "--without-system-dragonbox"

    "--without-system-libfixmath"



    # is packaged but headers can't be found because there is no pkg-config file

    "--without-system-zxcvbn"

    # requires an oddly specific, old version

    "--without-system-hsqldb"



    "--with-system-orcus"

    "--with-system-libepubgen"

    "--with-system-libetonyek"

    "--without-system-xmlsec"

    # searches hardcoded paths that are wrong

    "--without-system-zxing"



    # is packaged but headers can't be found because there is no pkg-config file

    "--without-system-zxcvbn"

  ] ++ optionals kdeIntegration [

    "--enable-kf${qtMajor}"

    "--enable-qt${qtMajor}"

  ] ++ optionals (kdeIntegration && qtMajor == "5") [

    "--enable-gtk3-kde5"

  ];

  ] ++ (if variant == "fresh" then [

    "--with-system-rhino"

    "--with-rhino-jar=${rhino}/share/java/js.jar"

  ] else [

    # our Rhino is too new for older versions

    "--without-system-rhino"

  ]);





  env = {
@@ -598,6 +614,7 @@ in stdenv.mkDerivation (finalAttrs: { 
      ki18n

      knotifications

      qtdeclarative

      qtmultimedia

      qtquickcontrols

      qtwayland

      solid
@@ -618,6 +635,7 @@ in stdenv.mkDerivation (finalAttrs: { 
      phonon

      qtbase

      qtdeclarative

      qtmultimedia

      qtsvg

      qttools

      qtwayland

pkgs/applications/office/libreoffice/dont-detect-qt-paths-from-qmake.patch

0 → 100644
+22 −0
Original line number Diff line number Diff line 
diff --git a/configure.ac b/configure.ac

index 2c11703cb3ff..302a006bbf75 100644

--- a/configure.ac

+++ b/configure.ac

@@ -13444,8 +13444,6 @@ then

         fi

     fi

 

-    qt5_incdirs="`$QMAKE5 -query QT_INSTALL_HEADERS` $qt5_incdirs"

-    qt5_libdirs="`$QMAKE5 -query QT_INSTALL_LIBS` $qt5_libdirs"

     qt5_platformsdir="`$QMAKE5 -query QT_INSTALL_PLUGINS`/platforms"

     QT5_PLATFORMS_SRCDIR="$qt5_platformsdir"

 

@@ -13585,8 +13583,6 @@ then

         AC_MSG_NOTICE([Detected Qt6 version: $qmake6_test_ver])

     fi

 

-    qt6_incdirs="`$QMAKE6 -query QT_INSTALL_HEADERS` $qt6_incdirs"

-    qt6_libdirs="`$QMAKE6 -query QT_INSTALL_LIBS` $qt6_libdirs"

     qt6_platformsdir="`$QMAKE6 -query QT_INSTALL_PLUGINS`/platforms"

     QT6_PLATFORMS_SRCDIR="$qt6_platformsdir"

pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch

+25 −12
Original line number Diff line number Diff line
@@ -10,31 +10,44 @@ 
 	CppunitTest_sc_tiledrendering2 \

 ))

 endif

--- a/sc/qa/extras/vba-macro-test.cxx

+++ b/sc/qa/extras/vba-macro-test.cxx

@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba)

 // Failed:  : Test change event for Range.FillRight:

 // Tests passed: 4

 // Tests failed: 4

-#if !defined(_WIN32)

+#if 0 // flaky, see above

         { OUString("Ranges-3.xls"),

           OUString(

               "vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") },

--- a/sc/qa/unit/ucalc_formula.cxx

+++ b/sc/qa/unit/ucalc_formula.cxx

@@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs)

 

 CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaRefUpdate)

 {

+    return; // fails consistently on nixpkgs?

+

     m_pDoc->InsertTab(0, "Formula");

 

     sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.

--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx

+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx

@@ -2948,6 +2948,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testHighlightNumbering_shd)

 

 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPilcrowRedlining)

 {

+    return;

+    return; // flaky

+

     // Load a document where the top left tile contains

     // paragraph and line break symbols with redlining.

     SwXTextDocument* pXTextDocument = createDoc("pilcrow-redlining.fodt");

@@ -3057,6 +3059,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut)

 

 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin)

 {

+    return;

+

     // Load a document where the top left tile contains

     // paragraph and line break symbols with redlining.

     SwXTextDocument* pXTextDocument = createDoc("tdf43244_SpacesOnMargin.odt");

@@ -4100,6 +4104,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip)

 // toggling Formatting Marks on/off for one view should have no effect on other views

 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks)

 {

+    return;

+    return; // fails consistently

+

     SwXTextDocument* pXTextDocument = createDoc();

     int nView1 = SfxLokHelper::getView();
@@ -45,7 +58,7 @@ 
 

 CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)

 {

+    return;

+    return; // fails to find the font

+

 #if HAVE_MORE_FONTS

 #if !defined _WIN32 // TODO: Fails on jenkins but passes locally

pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch

+90 −18
Original line number Diff line number Diff line 
--- a/svgio/qa/cppunit/data/tdf160386.svg

+++ b/svgio/qa/cppunit/data/tdf160386.svg

@@ -8,7 +8,6 @@

     <text systemLanguage="en">Hello!</text>

     <text systemLanguage="es">Hola!</text>

     <text systemLanguage="fr">Bonjour!</text>

-    <text systemLanguage="ja">こんにちは</text>

     <text systemLanguage="ru">Привет!</text>

     <text>☺</text>

   </switch>

--- a/sw/qa/core/text/text.cxx

+++ b/sw/qa/core/text/text.cxx

@@ -1577,6 +1577,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect)

 

 CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810)

--- a/sc/Module_sc.mk

+++ b/sc/Module_sc.mk

@@ -69,8 +69,8 @@ endif

 

 ifneq ($(DISABLE_GUI),TRUE)

 ifeq ($(OS),LINUX)

+# CppunitTest_sc_tiledrendering hangs

 $(eval $(call gb_Module_add_check_targets,sc,\

-	CppunitTest_sc_tiledrendering \

 	CppunitTest_sc_tiledrendering2 \

 ))

 endif

--- a/sc/qa/extras/vba-macro-test.cxx

+++ b/sc/qa/extras/vba-macro-test.cxx

@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba)

 // Failed:  : Test change event for Range.FillRight:

 // Tests passed: 4

 // Tests failed: 4

-#if !defined(_WIN32)

+#if 0 // flaky, see above

         { u"Ranges-3.xls"_ustr,

           u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr },

 #endif

--- a/sc/qa/unit/ucalc_formula.cxx

+++ b/sc/qa/unit/ucalc_formula.cxx

@@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs)

 

 CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaRefUpdate)

 {

+    return; // fails consistently on nixpkgs?

+

     m_pDoc->InsertTab(0, u"Formula"_ustr);

 

     sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.

--- a/sw/qa/extras/layout/layout3.cxx

+++ b/sw/qa/extras/layout/layout3.cxx

@@ -3039,6 +3041,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR)

 {

+    return; // flaky?

+    return; // requests Noto Sans Hebrew with charset=28, which the font does not have

+            // FIXME: investigate

+

     // Load the document.

     // The document embeds a subset of "Source Han Serif SC" so that it works

     // even when the font is not installed.
 
     // Verify that line breaking a first bidi portion correctly underflows in LTR text

     createSwDoc("tdf56408-ltr.fodt");

     auto pXmlDoc = parseLayoutDump();

@@ -3053,6 +3058,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL)

 {

+    return; // same Noto Sans Hebrew issue

+

     // Verify that line breaking a first bidi portion correctly underflows in RTL text

     createSwDoc("tdf56408-rtl.fodt");

     auto pXmlDoc = parseLayoutDump();

@@ -3083,6 +3090,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash)

 {

+    return; // same Noto Sans Hebrew issue

+

     // Verify there is no crash/assertion for underflow after a number field

     createSwDoc("tdf56408-after-field.fodt");

 }

@@ -3121,6 +3130,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR)

 {

+    return; // same Noto Sans Hebrew issue

+

     // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions

     createSwDoc("tdf157829-ltr.fodt");

     auto pXmlDoc = parseLayoutDump();

@@ -3135,6 +3146,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL)

 {

+    return; // same Noto Sans Hebrew issue

+

     // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions

     createSwDoc("tdf157829-rtl.fodt");

     auto pXmlDoc = parseLayoutDump();

--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx

+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx

@@ -4230,6 +4232,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip)

 // toggling Formatting Marks on/off for one view should have no effect on other views

 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks)

 {

+    return; // fails consistently

+

     SwXTextDocument* pXTextDocument = createDoc();

     int nView1 = SfxLokHelper::getView();