[libreoffice] 01/01: back to master; remove the obsolete arm64-* patches

Rene Engelhard rene at moszumanska.debian.org
Fri Oct 20 22:52:46 UTC 2017 

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

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 042c8c67046f3b36b4f5f7266d1719ef543e0fa2
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Oct 20 17:12:33 2017 +0200

    back to master; remove the obsolete arm64-* patches
---
 changelog                                          |  6 +++
 control                                            |  2 +-
 .../arm64-bridges-no-stack-protector-strong.diff   | 43 ----------------------
 patches/arm64-disable-sc-functions-test.diff       | 37 -------------------
 ...d-buildflags-no-LO-fstack-protector-strong.diff |  2 +-
 patches/series                                     |  2 -
 rules                                              |  2 +-
 7 files changed, 9 insertions(+), 85 deletions(-)

diff --git a/changelog b/changelog
index fdc2cd0..3f07d6f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:6.0.0~beta1~git20171020-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 19 Oct 2017 15:49:57 +0200
+
 libreoffice (1:6.0.0~alpha1-1) experimental; urgency=medium
 
   [ Rene Engelhard ]
diff --git a/control b/control
index 6f66956..8cb33fe 100644
--- a/control
+++ b/control
@@ -191,7 +191,7 @@ Build-Conflicts: amd-libopencl1,
 Standards-Version: 4.0.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
-Bugs: 
+Bugs: mailto:debian-openoffice at lists.debian.org
 Homepage: http://www.libreoffice.org
 
 Package: libreoffice
diff --git a/patches/arm64-bridges-no-stack-protector-strong.diff b/patches/arm64-bridges-no-stack-protector-strong.diff
deleted file mode 100644
index d3f7f9f..0000000
--- a/patches/arm64-bridges-no-stack-protector-strong.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From dddb527db1562f30a2a2b20338dfc8458086a4a9 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Thu, 19 Oct 2017 15:29:38 +0200
-Subject: Again, no -fstack-protector-strong for gcc3_linux_aarch64/cpp2uno.cxx
-
-8d12e4ec8b843d59661a12a7a92bfec7e4473e0f "No -fstack-protect-strong for
-gcc3_linux_aarch64/cpp2uno.cxx vtableSlotCall" had done that in the past (so
-that setting up the x0/x1 return registers in vtableSlotCall is not clobbered
-by the stack protector code), but gbuild details have apparently changed in the
-meantime, so that gb_CXXFLAGS_COMMON's -fstack-protector-strong now ends up on
-the compiler command line before what is covered by gb_Library_add_cxxobjects's
-argument, so didn't get subst'ed to -fstack-protector.  That caused Flathub
-aarch64 builds to fail in CustomTarget_testtools/uno_test.
-
-However, if both -fstack-protector-strong and -fstack-protector are present on
-the command line, the second apparently wins, so use that hack for now.
-(-fstack-protector-strong is only available since GCC 4.9, but -fstack-protector
-is already available in our current baseline GCC 4.8.1, and even for a build on
-that baseline it wouldn't hurt if cpp2uno.cxx was explicitly built with
--fstack-protector even if none of the other files were built with
--fstack-protector-strong.)
-
-Change-Id: I9d78d2e5b08b7c0a4adb1531b482cd43617886f7
-
-diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
-index 8016677..22ce084 100644
---- a/bridges/Library_cpp_uno.mk
-+++ b/bridges/Library_cpp_uno.mk
-@@ -34,9 +34,8 @@ bridge_exception_objects := abi callvirtualfunction uno2cpp
- 
- $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno, \
-     bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/cpp2uno, \
--    $(subst -fstack-protector-strong,-fstack-protector, \
--        $(gb_LinkTarget_EXCEPTIONFLAGS) \
--        $(call gb_LinkTarget__get_cxxflags,$(gb_CPPU_ENV)_uno)) \
-+    $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+    $(call gb_LinkTarget__get_cxxflags,$(gb_CPPU_ENV)_uno) -fstack-protector \
- ))
- endif
- 
--- 
-cgit v0.10.2
-
diff --git a/patches/arm64-disable-sc-functions-test.diff b/patches/arm64-disable-sc-functions-test.diff
deleted file mode 100644
index 5e327f9..0000000
--- a/patches/arm64-disable-sc-functions-test.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6cb20e0b298f41fe88984aebfe5454f936a0ae3a Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Fri, 20 Oct 2017 10:52:48 +0200
-Subject: Disable CppunitTset_sc_*_functions_test for linux_aarch64 for now,
- too
-
-> Oct 20 10:21:31 <sberg> erAck, when "Testing
->  file:///run/build/libreoffice/sc/qa/unit/data/functions/array/fods/linest.fods"
->  in CppunitTest_sc_array_functions_test fails with non-informative expected 1
->  vs. actual 0, how can I reasonably debug that?  (and no, I don't have an X11
->  connection to the relevant machine, to see what opening that .fods with LO
->  would look like there)
-> Oct 20 10:25:04 <erAck> sberg: sigh.. we're still lacking an "analyze steps"
->  in the functions test loader, so far only loading the doc and inspecting
->  provides that; maybe getting individual cell results via UNO would work
-
-So disable these tests for aarch64 for now too, to get Flathub builds unstuck,
-until somebody finds a way to actually debug this.
-
-Change-Id: I9bf30d0d7185497f9ad4b04b60b6a67f34a8c44e
-
-diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
-index bd5b769..0b600f7 100644
---- a/sc/Module_sc.mk
-+++ b/sc/Module_sc.mk
-@@ -69,7 +69,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
- # point weirdness (x87, registers, compiler optimization, ... whatever),
- # disable them until someone finds a real cure.
- 
--ifneq ($(PLATFORMID),linux_x86)
-+ifneq ($(filter-out linux_aarch64 linux_x86,$(PLATFORMID)),)
- $(eval $(call gb_Module_add_slowcheck_targets,sc, \
- 	CppunitTest_sc_functions_test_old \
- 	CppunitTest_sc_database_functions_test \
--- 
-cgit v0.10.2
-
diff --git a/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff b/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
index a7671b2..1ffcf7b 100644
--- a/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
+++ b/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
@@ -46,5 +46,5 @@ index 7acd068..b6d9735 100644
  export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 -export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
  export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
+ export HAVE_GCC_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@
  export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
- export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
diff --git a/patches/series b/patches/series
index fb8ca1a..063d940 100644
--- a/patches/series
+++ b/patches/series
@@ -31,6 +31,4 @@ disable-some-sc-tests-with-internal-cppunit.diff
 cppunit-optional.diff
 disable-unused-test-programs.diff
 ww8export-HAVE_MORE_FONTS.diff
-arm64-bridges-no-stack-protector-strong.diff
 tdf108963-test.diff
-arm64-disable-sc-functions-test.diff
diff --git a/rules b/rules
index 5411673..213b6fd 100755
--- a/rules
+++ b/rules
@@ -73,7 +73,7 @@ GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
 lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
 # NOT in proper libreoffice-3-6 branch
 # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
-GIT_TAG=libreoffice-$(lo_sources_ver)-buildfix1
+GIT_TAG=libreoffice-$(lo_sources_ver)
 GIT_BRANCH=master
 endif
 ifeq "$(USE_SOURCE_TARBALLS)" "y"

-- 
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