The following commit has been merged in the debian-experimental-3.6 branch:
commit 03e27e72d3eb25b15bcede6d0f96254aae55d5d6
Author: Rene Engelhard <[email protected]>
Date: Mon Apr 23 22:21:29 2012 +0200
make patches apply again
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index fede0d6..23bcb93 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -2,22 +2,20 @@ diff --git a/configure.in b/configure.in
index 3257668..afd36de 100755
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
-@@ -2352,8 +2352,13 @@
- dnl ===================================================================
- AC_MSG_CHECKING([whether to include symbols])
- if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
-- ENABLE_SYMBOLS="TRUE"
-- AC_MSG_RESULT([yes])
-+ if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
-+ ENABLE_SYMBOLS="SMALL"
-+ AC_MSG_RESULT([yes, small ones])
-+ else
-+ ENABLE_SYMBOLS="TRUE"
-+ AC_MSG_RESULT([yes])
-+ fi
- else
- ENABLE_SYMBOLS=
- AC_MSG_RESULT([no])
+@@ -3518,6 +3518,13 @@
+ if test "$enable_symbols" = "y" || test "$enable_symbols" = "yes"; then
+ ENABLE_SYMBOLS_FOR=all
+ AC_MSG_RESULT([yes])
++ if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
++ ENABLE_SYMBOLS="SMALL"
++ AC_MSG_RESULT([yes, small ones])
++ else
++ ENABLE_SYMBOLS="TRUE"
++ AC_MSG_RESULT([yes])
++ fi
+ else
+ ENABLE_SYMBOLS_FOR="$enable_symbols"
+ AC_MSG_RESULT([for $enable_symbols])
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index c73333f..9338110 100644
--- libreoffice-3.5.0/solenv/inc/unxgcc.mk
@@ -46,17 +44,17 @@ index c73333f..9338110 100644
CFLAGSDBGUTIL=
GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f
$(SOLARENV)/bin/getcompver.awk
---- libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk.orig 2011-07-05
12:38:23.398653265 +0200
-+++ libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk 2011-07-05
14:10:50.598728992 +0200
-@@ -188,7 +188,11 @@
- GGDB2=-g2
+--- a/solenv/gbuild/platform/com_GCC_defs.mk-old 2012-04-23
22:19:05.806843257 +0200
++++ b/solenv/gbuild/platform/com_GCC_defs.mk 2012-04-23 22:19:52.943076997
+0200
+@@ -131,7 +131,11 @@
+ FNO_DEFAULT_INLINE=-fno-default-inline
endif
+ifeq ($(ENABLE_SYMBOLS),SMALL)
-+gb_DEBUG_CFLAGS := -g1 -finline-limit=0 -fno-inline
++gb_DEBUG_CFLAGS := -g1 $(FINLINE_LIMIT0) $(FNO_INLINE)
+else
- gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline
+ gb_DEBUG_CFLAGS := $(GGDB2) $(FINLINE_LIMIT0) $(FNO_INLINE)
+endif
- gb_DEBUG_CXXFLAGS := -fno-default-inline
+ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE)
+
- gb_COMPILERNOOPTFLAGS := -O0
diff --git a/patches/debian-hardened-buildflags.diff
b/patches/debian-hardened-buildflags.diff
index eb9d90e..cb365b1 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -35,9 +35,9 @@ diff --git a/solenv/gbuild/LinkTarget.mk
b/solenv/gbuild/LinkTarget.mk
index c094bb4..a0608f4 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
-@@ -53,6 +53,8 @@
- gb_LinkTarget__get_debugcxxflags=$(if $(filter $(1),$(foreach
lib,$(ENABLE_DEBUG_ONLY),$(call
gb_Library_get_linktargetname,$(lib)))),$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS))
- endif
+@@ -83,6 +83,8 @@
+ gb_LinkTarget__get_cflags=$(gb_COMPILEROPTFLAGS) $(call
gb_LinkTarget__get_symbolscflags,$(1)) $(CFLAGS)
+ gb_LinkTarget__get_cxxflags=$(gb_COMPILEROPTFLAGS) $(call
gb_LinkTarget__get_symbolscxxflags,$(1)) $(CXXFLAGS)
+LDFLAGS += $(HARDEN_LDFLAGS)
+
diff --git a/patches/rhino-build-optional.diff
b/patches/rhino-build-optional.diff
index 29a36a8..4f88b04 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -54,6 +54,6 @@ index 2bd4c61..f874898 100644
--- libreoffice-3.5.0/tail_build/prj/build.lst-old 2011-10-20
22:44:37.000000000 +0000
+++ libreoffice-3.5.0/tail_build/prj/build.lst 2011-10-20
22:44:49.000000000 +0000
@@ -1,2 +1,2 @@
--tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu
DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis
LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt
LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve
MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain
VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges
comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool
i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi
QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal
salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi
unoil un
otest unotools ure xmlreader xsltml NULL
-+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu
DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis
LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt
LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve
MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain
VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges
comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool
i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi
QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar rsc sal
salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi un
oil unotest unotools ure xmlreader xsltml NULL
+-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl
FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell
HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr
LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl
PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations
TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib
basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper
cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi
officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino
ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools
ucbhelp
er udkapi unoil unotest unotools ure xmlreader xsltml NULL
++tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl
FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell
HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr
LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl
PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations
TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib
basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper
cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi
officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo
RHINO:rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl
sysui tools u
cbhelper udkapi unoil unotest unotools ure xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
