[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-1-20-g3b85e7f
The following commit has been merged in the debian-experimental-3.6 branch:
commit d089c5203361c919e279436706c3739bce2699b6
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 6 17:09:25 2012 +0200
update various patches to apply again
diff --git a/patches/add-debian-multiarch-support.diff b/patches/add-debian-multiarch-support.diff
index 6ae30b6..449d9e4 100644
--- a/patches/add-debian-multiarch-support.diff
+++ b/patches/add-debian-multiarch-support.diff
@@ -10,7 +10,7 @@ index 290b294..f3ca081 100644
MOC4="moc"
KDE_GLIB_CFLAGS=""
KDE_GLIB_LIBS=""
-@@ -7817,6 +7818,18 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
+@@ -9248,6 +9248,19 @@
AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
fi
@@ -26,6 +26,7 @@ index 290b294..f3ca081 100644
+ fi
+
+ qt_libdirs="`$QMAKE4 -query QT_INSTALL_LIBS` $qt_libdirs"
++
AC_MSG_CHECKING([for Qt4 libraries])
qt_lib_dir="no"
- for lib_dir in $qt_libdirs ; do
+ for lib_dir in $qt_libdirs; do
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index 7f67fd8..8865825 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -35,15 +35,15 @@ 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
-@@ -46,6 +46,8 @@ CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
+@@ -46,6 +46,8 @@
OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
endif
-
+
+LDFLAGS += $(HARDEN_LDFLAGS)
+
- # if enabled we link all of these libraries into one larger, merged library
- # for which we can do a lot more optimisation, and which is faster to read
- # from disk.
+ # Overview of dependencies and tasks of LinkTarget
+ #
+ # target task depends on
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..1665642 100644
--- a/solenv/gbuild/gbuild.mk
diff --git a/patches/disable-sc-sw-unoapi-subsequentcheck-for-now.diff b/patches/disable-sc-sw-unoapi-subsequentcheck-for-now.diff
index 8ff75ea..757b5bc 100644
--- a/patches/disable-sc-sw-unoapi-subsequentcheck-for-now.diff
+++ b/patches/disable-sc-sw-unoapi-subsequentcheck-for-now.diff
@@ -2,18 +2,21 @@ diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 9c8696b..385e126 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
-@@ -45,7 +45,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
- CppunitTest_sc_subsequent_filters_test \
- CppunitTest_sc_tableautoformatfield \
+@@ -52,7 +52,6 @@
+
+ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
JunitTest_sc_complex \
- JunitTest_sc_unoapi \
+ CppunitTest_sc_cellrangeobj \
+ $(if $(filter-out $(OS),IOS), \
+ CppunitTest_sc_databaserangeobj) \
+@@ -63,5 +62,6 @@
+ CppunitTest_sc_namedrangesobj \
+ CppunitTest_sc_tablesheetsobj \
))
+# JunitTest_sc_unoapi \
# vim: set noet sw=4 ts=4:
---
-1.7.5.4
-
--- a/sw/Module_sw.mk-old 2012-02-04 11:25:21.000000000 +0100
+++ b/sw/Module_sw.mk 2012-02-04 11:25:30.000000000 +0100
@@ -48,7 +48,7 @@
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index 425b93d..6c6ad17 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -2,17 +2,17 @@ diff --git a/configure.in b/configure.in
index d9d28ff..4fcbe7c 100644
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
-@@ -6474,8 +6474,9 @@ if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
+@@ -7982,8 +7982,9 @@
# some systems need this. Like Ubuntu....
AC_CHECK_LIB(m, floor)
AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(colamd, colamd)
- AC_CHECK_LIB(lpsolve55, make_lp, ,
+ AC_CHECK_LIB([lpsolve55], [make_lp], [:],
- [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
+ [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lpsolve])
- MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS lpsolve55.dll"
+ LIBS=$save_LIBS
+ libo_MINGW_CHECK_DLL([LPSOLVE], [lpsolve55])
else
- AC_MSG_RESULT([internal])
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 91161f1..eb9885e 100644
--- libreoffice-3.5.0/solenv/inc/libs.mk
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 5243714..ed8cbf0 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -160,14 +160,14 @@ index 024ec68..a46e972 100644
gid_File_Lib_Vclplug_Svp,
gid_File_Lib_Basctl,
gid_File_Lib_CanvasTools,
-@@ -355,7 +345,6 @@ Module gid_Module_Root_Files_5
+@@ -354,7 +354,6 @@
gid_File_Lib_Evtatt,
gid_File_Lib_Fileacc,
gid_File_Lib_Filterconfig1,
- gid_File_Lib_Dbodbcbase,
gid_File_Lib_I18npool,
- gid_File_Lib_I18npaper,
gid_File_Lib_I18nregexp,
+ gid_File_Lib_I18nsearch,
@@ -385,7 +374,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_DeploymentGui,
gid_File_Lib_Expwrap_Uno,
diff --git a/patches/make-pyuno-work-with-system-wide-module-install.diff b/patches/make-pyuno-work-with-system-wide-module-install.diff
index 532b5bc..e865481 100644
--- a/patches/make-pyuno-work-with-system-wide-module-install.diff
+++ b/patches/make-pyuno-work-with-system-wide-module-install.diff
@@ -1,7 +1,7 @@
-diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index defd7b2..ea2a809 100755
---- a/desktop/scripts/soffice.sh.in
-+++ b/desktop/scripts/soffice.sh.in
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
exit 1;
fi
diff --git a/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff b/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
index 5515df0..d291625 100644
--- a/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
+++ b/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
@@ -12,15 +12,12 @@ diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 06a103d..450da5a 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
-@@ -136,7 +136,7 @@ my %replaceable = (
+@@ -137,7 +137,7 @@
my @search_dirs = ( 'lib', 'bin', 'class' );
--my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3' );
-+my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
+-my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
++my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno', 'pythonloader.uno', 'pyuno', 'libpyuno' );
sub sniff_target($)
{
---
-1.7.5.4
-
diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
index 038c6d3..857284b 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 : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
-+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript 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 ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil un
otest unotools ure DESKTOP:xmlhelp 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 DESKTOP:xmlhelp xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/patches/split-binfilters-and-evo.diff b/patches/split-binfilters-and-evo.diff
index f71ab71..0b46535 100644
--- a/patches/split-binfilters-and-evo.diff
+++ b/patches/split-binfilters-and-evo.diff
@@ -11,7 +11,7 @@
-.END
-
.IF "$(WITH_LDAP)" == "YES"
- my_components += ldapbe2
+ my_components += component/extensions/source/config/ldap/ldapbe2
.END
@@ -355,10 +345,6 @@
my_components += cmdmail
--
LibreOffice packaging repository
Reply to: