[libreoffice] 05/06: rebase debian-hardened

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_5.0.2_rc2-0ubuntu2
in repository libreoffice.

commit 587fdeb4ca5f4739ad6129035ea070b36421ca3a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Feb 9 02:01:28 2016 +0100

    rebase debian-hardened
---
 patches/debian-hardened-buildflags-CPPFLAGS.diff | 71 ++++++++++++------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index fdbe044..186ba34 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -1,18 +1,37 @@
 From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Date: Sat, 9 Nov 2013 02:00:34 +0100
-Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS.diff
 
 Change-Id: I2ba4dc925a66ecca5c7cc4af87224511a3bc88d9
-
 ---
- config_host.mk.in       | 1 +
- configure.ac            | 5 +++++
- solenv/gbuild/gbuild.mk | 2 ++
- 3 files changed, 8 insertions(+)
+ config_host.mk.in                      |  2 +-
+ configure.ac                           | 17 ++++++-----------
+ solenv/gbuild/gbuild.mk                |  2 ++
+ solenv/gbuild/platform/com_GCC_defs.mk |  5 -----
+ 4 files changed, 9 insertions(+), 17 deletions(-)
 
---- a/configure.ac-old	2012-03-02 21:48:47.000000000 +0000
-+++ b/configure.ac	2012-03-02 21:51:29.000000000 +0000
-@@ -5751,17 +5751,6 @@ if test "$GCC" = "yes"; then
+diff --git a/config_host.mk.in b/config_host.mk.in
+--- a/config_host.mk.in
++++ b/config_host.mk.in
+@@ -75,6 +75,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
+ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
+ export CPUNAME=@CPUNAME@
+ export CDEFAULTOPT=@CDEFAULTOPT@
++export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
+ export CROSS_COMPILING=@CROSS_COMPILING@
+ export CURL=@CURL@
+ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
+@@ -245,7 +246,6 @@ export GUIBASE=@GUIBASE@
+ export HAMCREST_JAR=@HAMCREST_JAR@
+ export HARDLINKDELIVER=@HARDLINKDELIVER@
+ 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_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
+ export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -5852,17 +5852,6 @@ if test "$GCC" = "yes"; then
          AC_MSG_RESULT([no])
      fi
  
@@ -30,7 +49,7 @@ Change-Id: I2ba4dc925a66ecca5c7cc4af87224511a3bc88d9
      AC_MSG_CHECKING([whether $CC supports atomic functions])
      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
      int v = 0;
-@@ -10225,6 +10225,11 @@ else
+@@ -10321,6 +10310,12 @@ else
  fi
  AC_SUBST(ENABLE_VLC)
  
@@ -39,31 +58,14 @@ Change-Id: I2ba4dc925a66ecca5c7cc4af87224511a3bc88d9
 +fi
 +AC_SUBST(HARDEN_CPPFLAGS)
 +
++
  # this is for opengl transitions in impress slideshow
  ENABLE_OPENGL=
  if test $_os = iOS -o $_os = Android; then
---- a/config_host.mk.in-old	2012-04-06 14:17:55.164239390 +0200
-+++ b/config_host.mk.in	2012-04-06 14:18:55.440239065 +0200
-@@ -70,6 +70,7 @@
- export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
- export CPUNAME=@CPUNAME@
- export CDEFAULTOPT=@CDEFAULTOPT@
-+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
- export CROSS_COMPILING=@CROSS_COMPILING@
- export CURL=@CURL@
- export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
-@@ -240,7 +240,6 @@ export GUIBASE=@GUIBASE@
- export HAMCREST_JAR=@HAMCREST_JAR@
- export HARDLINKDELIVER=@HARDLINKDELIVER@
- 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_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
- export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
 --- a/solenv/gbuild/gbuild.mk
 +++ b/solenv/gbuild/gbuild.mk
-@@ -259,6 +259,8 @@ gb_GLOBALDEFS += \
+@@ -262,6 +262,8 @@ gb_GLOBALDEFS += \
  		ENABLE_LTO \
  	)
  
@@ -73,10 +75,9 @@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
  
  # This is used to detect whether LibreOffice is being built (as opposed to building
 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
-index 7acd068..b6d9735 100644
 --- a/solenv/gbuild/platform/com_GCC_defs.mk
 +++ b/solenv/gbuild/platform/com_GCC_defs.mk
-@@ -103,12 +103,6 @@ endif
+@@ -106,11 +106,6 @@ endif
  endif
  gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
  
@@ -85,7 +86,9 @@ index 7acd068..b6d9735 100644
 -gb_CXXFLAGS_COMMON += -fstack-protector-strong
 -gb_LinkTarget_LDFLAGS += -fstack-protector-strong
 -endif
--
- gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)
  
- # This is the default in non-C++11 mode
+ gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror -Wno-error=deprecated-declarations)
+ 
+-- 
+2.5.0
+

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