[libreoffice] 118/152: update patch queue

Rene Engelhard rene at moszumanska.debian.org
Thu Jul 27 19:17:05 UTC 2017 

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 5d02caf073d8b505982442a440f2240b98cc91aa
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Dec 14 16:50:12 2016 +0100

    update patch queue
---
 patches/debian-hardened-buildflags-CPPFLAGS.diff |  2 +-
 patches/debian-opt.diff                          |  2 +-
 patches/disable-flaky-tests.diff                 | 68 +++++++-----------------
 patches/fix-system-lpsolve-build.diff            |  4 +-
 patches/gcj-safe-jni-h-include.diff              |  2 +-
 patches/make-package-modules-not-suck.diff       |  5 +-
 6 files changed, 26 insertions(+), 57 deletions(-)

diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index 2239a6e..7954532 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -51,7 +51,7 @@ diff --git a/configure.ac b/configure.ac
      AC_MSG_CHECKING([whether $CC supports atomic functions])
      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
      int v = 0;
-@@ -10384,6 +10373,11 @@ else
+@@ -10399,6 +10388,11 @@ else
  fi
  AC_SUBST(ENABLE_VLC)
  
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 8f8674f..3fd23d4 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -23,7 +23,7 @@ diff --git a/config_host.mk.in b/config_host.mk.in
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -12772,6 +12772,9 @@ fi
+@@ -12787,6 +12787,9 @@ fi
  AC_SUBST(MPL_SUBSET)
  
  
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index b24b0de..34859a9 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -11,54 +11,53 @@ Subject: [PATCH] disable-flaky-tests.diff
  5 files changed, 29 insertions(+), 41 deletions(-)
 
 diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
+index cc842b2..6a8e3b1 100644
 --- a/libreofficekit/Module_libreofficekit.mk
 +++ b/libreofficekit/Module_libreofficekit.mk
-@@ -15,9 +15,9 @@ $(eval $(call gb_Module_add_check_targets,libreofficekit, \
+@@ -15,9 +15,6 @@ $(eval $(call gb_Module_add_check_targets,libreofficekit, \
      CppunitTest_libreofficekit_checkapi \
  ))
  
 -$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
 -    CppunitTest_libreofficekit_tiledrendering \
 -))
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
-+#    CppunitTest_libreofficekit_tiledrendering \
-+#))
  
  ifneq ($(ENABLE_GTK3),)
  $(eval $(call gb_Module_add_targets,libreofficekit,\
 diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
+index fa1684c..345a6eb 100644
 --- a/sc/qa/unoapi/sc_1.sce
 +++ b/sc/qa/unoapi/sc_1.sce
-@@ -24,10 +24,3 @@
+@@ -24,10 +24,8 @@
  # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
  # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
  -o sc.AccessibleEditableTextPara_PreviewCell
 --o sc.ScAccessibleCell
--# i91044 -o sc.ScAccessibleCsvCell
--# i91044 -o sc.ScAccessibleCsvGrid
--# i84641 -o sc.ScAccessibleCsvRuler
--# i88330 -o sc.ScAccessibleDocument
--# i91045 -o sc.ScAccessibleDocumentPagePreview
+ # i91044 -o sc.ScAccessibleCsvCell
+ # i91044 -o sc.ScAccessibleCsvGrid
+ # i84641 -o sc.ScAccessibleCsvRuler
+ # i88330 -o sc.ScAccessibleDocument
+ # i91045 -o sc.ScAccessibleDocumentPagePreview
 --o sc.ScAccessiblePageHeader
 diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
+index d934bc7..c10eb12 100644
 --- a/sc/qa/unoapi/sc_2.sce
 +++ b/sc/qa/unoapi/sc_2.sce
-@@ -15,11 +15,6 @@
- #   except in compliance with the License. You may obtain a copy of
+@@ -16,9 +16,6 @@
  #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  #
--# fdo#FOO -o sc.ScAccessiblePageHeaderArea
+ # fdo#FOO -o sc.ScAccessiblePageHeaderArea
 --o sc.ScAccessiblePreviewCell
 --o sc.ScAccessiblePreviewHeaderCell
 --o sc.ScAccessiblePreviewTable
--# fdo#45337 -o sc.ScAccessibleSpreadsheet
+ # fdo#45337 -o sc.ScAccessibleSpreadsheet
  # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
  # -o sc.ScAnnotationObj
- # -o sc.ScAnnotationShapeObj
 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+index d7c1f22..ef57a10 100644
 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
 +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-@@ -1103,28 +1103,28 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
+@@ -1114,28 +1114,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
      assertXPath(pXmlDoc, "//w:ind", "start", "1418");
  }
  
@@ -84,35 +83,14 @@ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexpor
 -    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
 -#endif
 -}
-+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
-+//{
-+//    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-+//    if (!pXmlDoc)
-+//        return;
-+//    // there should be no flipH and flipV attributes in this case
-+//    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
-+//    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
-+//    // check rotation angle
-+//    assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
-+//    // check the first few coordinates of the polygon
-+//#ifndef MACOSX /* Retina-related rounding rountrip error
-+//                * hard to smooth out due to the use of string compare
-+//                * instead of number */
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
-+//#endif
-+//}
- 
- #endif
  
+ DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
+ {
 diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
+index 25db0b6..2bae4fa 100644
 --- a/toolkit/Module_toolkit.mk
 +++ b/toolkit/Module_toolkit.mk
-@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
+@@ -26,10 +26,6 @@ $(eval $(call gb_Module_add_targets,toolkit,\
  ifneq ($(OOO_JUNIT_JAR),)
  $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
      JunitTest_toolkit_complex \
@@ -122,12 +100,4 @@ diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
 -    JunitTest_toolkit_unoapi_4 \
  ))
  endif
-+#    JunitTest_toolkit_unoapi_1 \
-+#    JunitTest_toolkit_unoapi_2 \
-+#    JunitTest_toolkit_unoapi_3 \
-+#    JunitTest_toolkit_unoapi_4 \
  
- # vim: set noet sw=4 ts=4:
--- 
-2.7.4
-
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index 6eff680..97577ec 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -12,7 +12,7 @@ Change-Id: Ibe23717730dfb8365b738e366d083ffae9cfbe5a
 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
 --- a/RepositoryExternal.mk
 +++ b/RepositoryExternal.mk
-@@ -2315,7 +2315,7 @@ ifneq ($(ENABLE_LPSOLVE),)
+@@ -2325,7 +2325,7 @@ ifneq ($(ENABLE_LPSOLVE),)
  ifneq ($(SYSTEM_LPSOLVE),)
  
  define gb_LinkTarget__use_lpsolve
@@ -24,7 +24,7 @@ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -9670,8 +9670,9 @@ if test "$ENABLE_LPSOLVE" = TRUE; then
+@@ -9685,8 +9685,9 @@ if test "$ENABLE_LPSOLVE" = TRUE; then
          # some systems need this. Like Ubuntu....
          AC_CHECK_LIB(m, floor)
          AC_CHECK_LIB(dl, dlopen)
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index fa7a157..91280da 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -11,7 +11,7 @@ Change-Id: Iccce595463659ce0979694b8e27865b8dd68fec1
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -7251,12 +7251,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
+@@ -7252,12 +7252,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
          JAVAINC="-I$JAVA_HOME/include"
          JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index e0d49e5..f8b7206 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -3,14 +3,13 @@ Date: Mon, 8 Aug 2016 16:42:19 +0200
 Subject: [PATCH] make-package-modules-not-suck.diff
 
 ---
- Repository.mk                    | 45 +++++++++++++++++++++++-----------------
+ Repository.mk                    | 47 +++++++++++++++++++++++-----------------
  scp2/AutoInstall.mk              |  1 +
  scp2/InstallModule_draw.mk       |  1 +
  scp2/source/draw/module_draw.scp |  4 +++-
- 4 files changed, 31 insertions(+), 20 deletions(-)
+ 4 files changed, 32 insertions(+), 21 deletions(-)
 
 diff --git a/Repository.mk b/Repository.mk
-index 14a1c07..eab8078 100644
 --- a/Repository.mk
 +++ b/Repository.mk
 @@ -199,13 +199,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git

More information about the Pkg-openoffice-commits mailing list