[libreoffice] 01/04: git update; update debian-debug.diff
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 8b1d5b8804530a6766d504d347ee5cd93daa25b9
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jul 14 18:39:17 2016 +0200
git update; update debian-debug.diff
---
changelog | 2 +-
patches/debian-debug.diff | 54 ++++++++++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/changelog b/changelog
index a7acd68..90c8eec 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~alpha0~git20160603-1) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~alpha0~git20160714-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 911f602..5f0ba47 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -1,29 +1,3 @@
-diff --git a/configure.ac b/configure.in
-index 3257668..afd36de 100755
---- libreoffice-3.5.0/configure.ac
-+++ libreoffice-3.5.0/configure.ac
-@@ -3361,13 +3361,19 @@ dnl Check for enable symbols option
- dnl ===================================================================
- AC_MSG_CHECKING([whether to include symbols while preserve optimization])
- if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
-- ENABLE_SYMBOLS="TRUE"
-+ 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
-+
- if test -n "$ENABLE_DBGUTIL"; then
- AC_MSG_ERROR([--enable-dbgutil cannot be used with --enable-symbols])
- elif test -n "$ENABLE_DEBUG"; then
- AC_MSG_ERROR([--enable-debug cannot be used with --enable-symbols])
- fi
-- AC_MSG_RESULT([yes])
- else
- if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
- ENABLE_SYMBOLS="FALSE"
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 9de88a2..9161a4e 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
@@ -44,3 +18,31 @@ index 9de88a2..9161a4e 100644
ifeq ($(HAVE_GCC_FINLINE_LIMIT),TRUE)
FINLINE_LIMIT0=-finline-limit=0
+diff --git a/configure.ac b/configure.ac
+index a91de78..1c03b1d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4043,15 +4043,20 @@ if test -z "$enable_symbols"; then
+ fi
+ fi
+ if test "$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])
+ fi
+ AC_SUBST(ENABLE_SYMBOLS)
+
+-if test -n "$with_android_ndk" -a \( -n "$ENABLE_SYMBOLS" -o -n "$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \) -a "$ENABLE_DEBUGINFO_FOR" = "all"; then
++if test -n "$with_android_ndk" -a \( "$ENABLE_SYMBOLS" != "SMALL" -o -n "$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \) -a "$ENABLE_DEBUGINFO_FOR" = "all"; then
+ # Building on Android with full symbols: without enough memory the linker never finishes currently.
+ AC_MSG_CHECKING([whether enough memory is available for linking])
+ mem_size=$(grep -o 'MemTotal: *.\+ kB' /proc/meminfo | sed 's/MemTotal: *\(.\+\) kB/\1/')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: