[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] 3 commits: temporarily use internal glm; configure check fails since the gcc 7.3 upload

[Rene Engelhard]

Rene Engelhard pushed to branch debian-experimental-6.0 at Debian LibreOffice Maintainers / libreoffice / libreoffice


Commits:
40c2c4d1 by Rene Engelhard at 2018-01-27T11:04:49+00:00
temporarily use internal glm; configure check fails since the gcc 7.3 upload

- - - - -
8c069d15 by Rene Engelhard at 2018-01-27T11:04:49+00:00
add temporary buildfix...

- - - - -
2aaf1622 by Rene Engelhard at 2018-01-27T11:04:49+00:00
release libreoffice 1:6.0.0~rc3-1

- - - - -


5 changed files:

- changelog
- patches/series
- + patches/temporary-buildfix.diff
- rules
- source/include-binaries


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~rc3-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~rc3-1) experimental; urgency=medium
 
   * New upstream release candidate
 
@@ -6,8 +6,10 @@ libreoffice (1:6.0.0~rc3-1) UNRELEASED; urgency=medium
     fixes. Also include X abstractions and allow .mozilla/firefox/** reading
   * debian/patches/apparmor-updates.diff: more gpg stuff: gpg(sm), .gnupg/*
   (both together closes: #887593)
+  * debian/rules, debian/source/include-binaries: temporarily use internal glm;
+    configure check fails since the gcc 7.3 upload
 
- -- Rene Engelhard <rene at debian.org>  Wed, 24 Jan 2018 20:40:49 +0000
+ -- Rene Engelhard <rene at debian.org>  Sat, 27 Jan 2018 11:36:59 +0100
 
 libreoffice (1:6.0.0~rc2-1) experimental; urgency=medium
 


=====================================
patches/series
=====================================
--- a/patches/series
+++ b/patches/series
@@ -39,3 +39,4 @@ poppler-0.62.diff
 apparmor-fixes.diff
 apparmor-updates.diff
 apparmor-complain.diff
+temporary-buildfix.diff


=====================================
patches/temporary-buildfix.diff
=====================================
--- /dev/null
+++ b/patches/temporary-buildfix.diff
@@ -0,0 +1,20 @@
+mv /data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/workdir/Dep/LinkTarget/CppunitTest/libtest_sw_uiwriter.so.d.tmp /data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/workdir/Dep/LinkTarget/CppunitTest/libtest_sw_uiwriter.so.d
+S=/data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3 && I=$S/instdir && W=$S/workdir &&  x86_64-linux-gnu-g++ -shared -Wl,-z,noexecstack   -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc  -Wl,--hash-style=gnu  -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions  -L$W/LinkTarget/StaticLibrary -L$I/sdk/lib  -L$I/program  -L$I/program  -L$W/LinkTarget/Library -Wl,-z,relro    $W/CxxObject/sw/qa/extras/uiwriter/uiwriter.o      -Wl,--start-group    -lcppunit  -lxml2 -Wl,--end-group -Wl,--no-as-needed -lmergedlo -luno_cppu -luno_cppuhelpergcc3 -lmswordlo -luno_sal -lswlo -ltest -lunotest  -o $W/LinkTarget/CppunitTest/libtest_sw_uiwriter.so 
+/data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/workdir/CxxObject/sw/qa/extras/uiwriter/uiwriter.o: In Funktion »SwUiWriterTest::addTestsToSuite(CppUnit::TestSuiteBuilderContextBase&)«:
+././sw/qa/extras/uiwriter/uiwriter.cxx:461: Warnung: undefinierter Verweis auf »SwUiWriterTest::testTdf114536()«
+collect2: error: ld returned 1 exit status
+/data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/solenv/gbuild/LinkTarget.mk:627: die Regel für Ziel „/data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/workdir/LinkTarget/CppunitTest/libtest_sw_uiwriter.so“ scheiterte
+
+whyever... it is there.
+
+--- a/sw/qa/extras/uiwriter/uiwriter.cxx-old	2018-01-27 10:23:35.652529748 +0000
++++ b/sw/qa/extras/uiwriter/uiwriter.cxx	2018-01-27 10:23:39.660660005 +0000
+@@ -458,7 +458,7 @@
+     CPPUNIT_TEST(testTdf99689TableOfTables);
+     CPPUNIT_TEST(testTdf113790);
+ //    CPPUNIT_TEST(testTdf114306);
+-    CPPUNIT_TEST(testTdf114536);
++//    CPPUNIT_TEST(testTdf114536);
+     CPPUNIT_TEST_SUITE_END();
+ 
+ private:


=====================================
rules
=====================================
--- a/rules
+++ b/rules
@@ -522,7 +522,7 @@ ENABLE_EOT=y
 ifeq "$(ENABLE_EOT)" "y"
 SYSTEM_STUFF += libeot
 endif
-SYSTEM_STUFF += glm
+#SYSTEM_STUFF += glm
 BUILD_PPC64EL=y
 BUILD_ARM64=y
 SYSTEM_STUFF += gpgmepp


=====================================
source/include-binaries
=====================================
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,3 +5,4 @@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 tarballs/pdfium-3235.tar.bz2
+tarballs/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/3eab389a46256fcacc8ca2f49458586c07a27f86...2aaf162214f8b21a383ebc9f3bcb223f628a7da8

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/3eab389a46256fcacc8ca2f49458586c07a27f86...2aaf162214f8b21a383ebc9f3bcb223f628a7da8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180127/d8da4138/attachment-0001.html>