[libreoffice] 03/03: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0

Thu Oct 19 14:13:24 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 fa6436b2c2a8d83b75baba65295c91979ca20f69
Merge: aa80d14 3fdd593
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Oct 19 16:09:49 2017 +0200

    Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0

 changelog                                          | 25 +++++++++++++
 control.kde.in                                     |  2 +-
 libreoffice-l10n-za.lintian-overrides              |  2 +-
 .../arm64-bridges-no-stack-protector-strong.diff   | 43 ++++++++++++++++++++++
 patches/debian-hardened-buildflags-CPPFLAGS.diff   | 35 ------------------
 ...d-buildflags-no-LO-fstack-protector-strong.diff | 40 ++++++++++++++++++++
 patches/no-check-if-root.diff                      | 35 ++++++++++++++++++
 patches/series                                     |  4 ++
 rules                                              |  5 ++-
 9 files changed, 153 insertions(+), 38 deletions(-)

diff --cc changelog
index a85c150,1b64356..bfb4854

--- a/changelog
+++ b/changelog
@@@ -1,24 -1,27 +1,48 @@@
 +libreoffice (1:6.0.0~alpha1-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream alpha release
 +
 +  * debian/patches/tdf108963-test.diff: adapt test to what we get; the
 +    text _is_ rotated on export, so...
 +
 +  * merge from Ubuntu, thanks Rico Tzschichholz:
 +    - Add "elementary" style package
 +
 +  * debian/rules:
 +    - finally stop building -systray. GNOME 3.26 doesn't show it anymore,
 +      and in 6.0 the feature is not completely removed yet but the UI for
 +      setting it is already gone anyway....
 +
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 19 Oct 2017 15:49:57 +0200
 +
+ libreoffice (1:5.4.3~rc1-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/no-check-if-root.diff: remove (senseful, IMHO!) check
+     given policy implies "build" should be able to run as root... :(
+   * debian/patches/avoid-throwing-cpp-exceptions-across-libgpeg-c-frames.diff:
+     add from master, fixing CppunitTest_vcl_filters_test on armhf
+   * debian/patches/debian-hardened-buildflags-CPPFLAGS.diff: split this up,
+     into the CPPFLAGS part here ..
+   * debian/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff:
+     and the removal of the explicit default -fstack-protector-strong here.
+   * debian/patches/arm64-bridges-no-stack-protector-strong.diff: add from master:
+     go sure that we build gcc3_linux_aarch64/cpp2uno.cxx only with
+     -fstack-protector. Works for us by chance because of above
+     debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
+ 
+   * debian/rules:
+     - make armhf test failures fatal now that above test is fixed which
+       was the only one failing; upstream apparently also builds armhf/arm64
+       flatpaks now for flathub
+ 
+  -- Rene Engelhard <rene at debian.org>  Wed, 18 Oct 2017 22:35:53 +0000
+ 
  libreoffice (1:5.4.2-4) UNRELEASED; urgency=medium
  
    * debian/rules:
diff --cc patches/no-check-if-root.diff
index 0000000,1de9fd5..2bd27c8
mode 000000,100644..100644
--- a/patches/no-check-if-root.diff
+++ b/patches/no-check-if-root.diff
@@@ -1,0 -1,35 +1,35 @@@
+ --- a/Makefile.in	2017-07-28 06:09:37.072183489 +0000
+ +++ b/Makefile.in	2017-10-18 12:43:59.215567467 +0000
+ @@ -9,7 +9,7 @@
+  
+  gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
+  
 --.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
 -+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
++-.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+++.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+  
+  MAKECMDGOALS?=all
+  build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
 -@@ -57,14 +57,6 @@
++@@ -57,14 +57,6 @@ else # MAKE_RESTARTS
+  
+  all: build
+  
+ -check-if-root:
+ -	@if test `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then \
+ -		echo; \
+ -		echo 'No. You make ME a sandwich.'; \
+ -		echo; \
+ -		exit 1; \
+ -	fi
+ -
+  gb_Side ?= host
+  
+  include $(BUILDDIR)/config_$(gb_Side).mk
 -@@ -254,7 +246,7 @@
++@@ -252,7 +244,7 @@ endif
+  #
+  # Bootstrap
+  #
+ -bootstrap: check-if-root compilerplugins
+ +bootstrap: compilerplugins
+  
+  #
+  # Build
diff --cc patches/series
index baf4818,2342c33..570ad3c
--- a/patches/series
+++ b/patches/series
@@@ -28,4 -31,9 +30,6 @@@ no-openssl.dif
  disable-some-sc-tests-with-internal-cppunit.diff
  cppunit-optional.diff
  disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -stop-shipping-mimelnk-desktop-files.diff
 -icu-no-icu-config.diff
  ww8export-HAVE_MORE_FONTS.diff
+ avoid-throwing-cpp-exceptions-across-libgpeg-c-frames.diff
+ arm64-bridges-no-stack-protector-strong.diff

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

