Unverified Commit 37ef1a3e authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #221192 from doronbehar/pkg/libreoffice

libreoffice-fresh: 7.4.2.3 -> 7.5.2.1
parents dbeebd15 6431dfbe
Loading
Loading
Loading
Loading
+6 −8
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ in

  inherit (primary-src) src;

  outputs = [ "out" "dev" ];

  env.NIX_CFLAGS_COMPILE = toString ([
    "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h
    "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10
@@ -216,9 +214,6 @@ in
    tar -xf ${srcs.translations}
  '';

  patches = optionals (variant == "still") [ ./skip-failed-test-with-icu70.patch ./gpgme-1.18.patch ]
  ;

  ### QT/KDE
  #
  # configure.ac assumes that the first directory that contains headers and
@@ -352,6 +347,10 @@ in
      sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
      sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
      sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk
      sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk
      sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk
      sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk
      sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk
      sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx"
      sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx"
      sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx"
@@ -386,9 +385,6 @@ in
    cp ${substituteAll {src = ./soffice-template.desktop; app="Calc";    ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop
    cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop
    cp ${substituteAll {src = ./soffice-template.desktop; app="Draw";    ext="odg"; type="drawing";     }} $out/share/templates/soffice.odg.desktop

    mkdir -p $dev
    cp -r include $dev
  '';

  # Wrapping is done in ./wrapper.nix
@@ -449,6 +445,8 @@ in
    "--without-system-libstaroffice"
    "--without-system-libepubgen"
    "--without-system-libqxp"
    "--without-system-dragonbox"
    "--without-system-libfixmath"
    "--with-system-mdds"
    # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
    "--without-system-orcus"
+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ def parse_line(line):
    if re.match('\s*(#.*)?$', line):
        return 'nothing'

    match = re.match('\s*export\s+([^:\s]+)\s*:=\s*(.*)$', line)
    match = re.match('([^:\s]+)\s*:=\s*(.*)$', line)

    if match:
        return {
+113 −148

File changed.

Preview size limit exceeded, changes collapsed.

+7 −7

File changed.

Preview size limit exceeded, changes collapsed.

+113 −134

File changed.

Preview size limit exceeded, changes collapsed.

Loading