[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0-1-44-g18ae4bf
The following commit has been merged in the debian-experimental-4.2 branch:
commit 18ae4bfc246eb09660df433ddcf545ddbc77403f
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 26 20:35:36 2013 +0200
update debian-hardened-buildflags-CPPFLAGS.diff to apply again
diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index 17bb219..f8e8053 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -1,8 +1,8 @@
--- a/configure.ac-old 2012-03-02 21:48:47.000000000 +0000
+++ b/configure.ac 2012-03-02 21:51:29.000000000 +0000
@@ -9681,6 +9687,11 @@ AC_SUBST(GSTREAMER_0_10_CFLAGS)
- AC_SUBST(GSTREAMER_0_10_LIBS)
- AC_SUBST(ENABLE_GSTREAMER_0_10)
+ AC_SUBST(VLC_LIBS)
+ AC_SUBST(ENABLE_VLC)
+if test -x /usr/bin/dpkg-buildflags; then
+ HARDEN_CPPFLAGS=`dpkg-buildflags --get CPPFLAGS 2>/dev/null`
@@ -26,8 +26,8 @@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c71cb40..f826d65 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
-@@ -273,6 +273,8 @@ gb_GLOBALDEFS += \
- ENABLE_READONLY_INSTALLSET \
+@@ -263,6 +263,8 @@ gb_GLOBALDEFS += \
+ DISABLE_SCRIPTING \
)
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
--
LibreOffice packaging repository
Reply to: