[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-115-g80e7623
The following commit has been merged in the debian-experimental-3.7 branch:
commit 80e7623d732c1fd791b9cce36a3ca557487247c0
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 9 23:40:29 2012 +0100
remove obsolete config_host-fix-envvars.diff
diff --git a/patches/config_host-fix-envvars.diff b/patches/config_host-fix-envvars.diff
deleted file mode 100644
index b5b5857..0000000
--- a/patches/config_host-fix-envvars.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/config_host.mk.in b/config_host.mk.in
-index b1bc535..cd08567 100644
---- a/config_host.mk.in
-+++ b/config_host.mk.in
-@@ -54,9 +54,7 @@ export CC_FOR_BUILD=@CC_FOR_BUILD@
- export CDR_CFLAGS=@CDR_CFLAGS@
- export CDR_LIBS=@CDR_LIBS@
- export CDR_TARBALL=@CDR_TARBALL@
--ifneq ($(strip @CFLAGS@),)
- export CFLAGS=@CFLAGS@
--endif
- export CHECK_PARALLELISM=@CHECK_PARALLELISM@
- export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
- export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
-@@ -91,9 +89,7 @@ export CURL_LIBS=@CURL_LIBS@
- export CXX=@CXX@
- export CXX_FOR_BUILD=@CXX_FOR_BUILD@
- export CXX_X64_BINARY=@CXX_X64_BINARY@
--ifneq ($(strip @CXXFLAGS@),)
- export CXXFLAGS=@CXXFLAGS@
--endif
- export DATADIR=@DATADIR@
- export DBGHELP_DLL=@DBGHELP_DLL@
- export DBUSMENUGTK_CFLAGS=@DBUSMENUGTK_CFLAGS@
-@@ -317,9 +313,7 @@ export L10N_MODULE=@L10N_MODULE@
- export LCMS2_CFLAGS=@LCMS2_CFLAGS@
- export LCMS2_LIBS=@LCMS2_LIBS@
- export LCMS2_TARBALL=@LCMS2_TARBALL@
--ifneq ($(strip @LDFLAGS@),)
- export LDFLAGS=@LDFLAGS@
--endif
- export LFS_CFLAGS=@LFS_CFLAGS@
- export LIBBASE_JAR=@LIBBASE_JAR@
- export LIBDIR=@LIBDIR@
-@@ -455,12 +449,8 @@ export NSS_CFLAGS=@NSS_CFLAGS@
- export NSS_LIBS=@NSS_LIBS@
- export NSS_TARBALL=@NSS_TARBALL@
- export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
--ifneq ($(strip @OBJCFLAGS@),)
- export OBJCFLAGS=@OBJCFLAGS@
--endif
--ifneq ($(strip @OBJCXXFLAGS@),)
- export OBJCXXFLAGS=@OBJCXXFLAGS@
--endif
- export OBJDUMP=@OBJDUMP@
- export OOOBLOGGER_EXTENSION_PACK=@OOOBLOGGER_EXTENSION_PACK@
- export OOODMAKEMODE=YES
diff --git a/patches/series b/patches/series
index c4b1318..f865cb4 100644
--- a/patches/series
+++ b/patches/series
@@ -26,5 +26,4 @@ ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
ure-no-etc-opt-ure.diff
-config_host-fix-envvars.diff
dont-touch-urd.diff
--
LibreOffice packaging repository
Reply to: