[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.2_rc1-1-94-gac1f5f0
The following commit has been merged in the debian-experimental-3.7 branch:
commit ac1f5f0641fca09b37c7b0a1df1c65d4fa189451
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 5 17:55:35 2012 +0200
git update; update .symbols
diff --git a/changelog b/changelog
index 715a0c7..2e8bc80 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20120927-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20121004-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index b89f32f..5f1cc3a 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -48,7 +48,7 @@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..1665642 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
-@@ -155,6 +155,9 @@ ifneq ($(strip $(ENVCFLAGSCXX)),)
+@@ -163,6 +163,9 @@ ifneq ($(strip $(ENVCFLAGSCXX)),)
gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
endif
@@ -57,10 +57,10 @@ index e85ed83..1665642 100644
+
include $(GBUILDDIR)/Helper.mk
include $(GBUILDDIR)/TargetLocations.mk
-
-@@ -291,6 +294,8 @@ ifeq ($(ENABLE_TELEPATHY),TRUE)
- gb_GLOBALDEFS += -DENABLE_TELEPATHY
- endif
+ include $(GBUILDDIR)/Tempfile.mk
+@@ -300,6 +303,8 @@ gb_GLOBALDEFS += \
+ HAVE_THREADSAFE_STATICS \
+ )
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
diff --git a/patches/disable-flaky-unoapi-tests.diff b/patches/disable-flaky-unoapi-tests.diff
index 0a65b20..c1f7bc6 100644
--- a/patches/disable-flaky-unoapi-tests.diff
+++ b/patches/disable-flaky-unoapi-tests.diff
@@ -6,16 +6,14 @@
--- a/toolkit/Module_toolkit.mk-old 2012-09-05 14:24:27.129693868 +0200
+++ b/toolkit/Module_toolkit.mk 2012-09-05 14:24:39.521755312 +0200
-@@ -34,8 +34,8 @@ $(eval $(call gb_Module_add_targets,toolkit,\
- Package_inc \
- ))
-
--$(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+@@ -28,8 +28,8 @@ $(eval $(call gb_Module_add_targets,toolkit,\
+ ifneq ($(OOO_JUNIT_JAR),)
+ $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+ JunitTest_toolkit_complex \
- JunitTest_toolkit_unoapi \
--))
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+ ))
+ endif
+# JunitTest_toolkit_unoapi \
-+#))
# vim: set noet sw=4 ts=4:
--- a/sc/qa/unoapi/sc.sce-old 2012-09-06 10:38:29.160466870 +0200
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index 1737924..b4f295f 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -35,8 +35,8 @@ diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index ba9493a..93874b4 100644
--- libreoffice-3.5.0/sccomp/Library_solver.mk
+++ libreoffice-3.5.0/sccomp/Library_solver.mk
-@@ -49,7 +49,13 @@
- $(gb_STDLIBS) \
+@@ -41,7 +41,13 @@ $(eval $(call gb_Library_use_libraries,solver,\
+ $(gb_UWINAPI) \
))
+ifeq ($(SYSTEM_LPSOLVE),YES)
diff --git a/patches/gtk3-hack-explicit-gmodule.diff b/patches/gtk3-hack-explicit-gmodule.diff
index aae1702..8890a9d 100644
--- a/patches/gtk3-hack-explicit-gmodule.diff
+++ b/patches/gtk3-hack-explicit-gmodule.diff
@@ -2,14 +2,14 @@ For whatever reason we get undefined referenced to g_module_*.
--- a/vcl/Library_vclplug_gtk3.mk-old 2012-04-01 23:57:18.435192769 +0200
+++ b/vcl/Library_vclplug_gtk3.mk 2012-04-02 00:07:03.610693627 +0200
-@@ -56,6 +56,7 @@
+@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3))
$(eval $(call gb_Library_add_libs,vclplug_gtk3,\
- $$(GTK3_LIBS) \
- $$(GTHREAD_LIBS) \
-+ $$(GMODULE_LIBS) \
- ))
-
- $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
+ $(GTK3_LIBS) \
+ $(GTHREAD_LIBS) \
++ $(GMODULE_LIBS) \
+ -lX11 \
+ -lXext \
+ -lSM \
--- a/configure.in-old 2012-04-01 23:57:57.091193585 +0200
+++ a/configure.in 2012-04-01 23:58:51.926693332 +0200
@@ -6996,10 +6996,13 @@
diff --git a/patches/py3uno-module.diff b/patches/py3uno-module.diff
index cfda6d7..01d8901 100644
--- a/patches/py3uno-module.diff
+++ b/patches/py3uno-module.diff
@@ -1,13 +1,13 @@
--- a/Makefile.top-old 2012-04-06 14:26:46.828238642 +0200
+++ b/Makefile.top 2012-04-06 14:26:58.308239187 +0200
-@@ -118,6 +118,7 @@ packimages\
+@@ -121,6 +121,7 @@ packimages\
padmin\
psprint_config\
pyuno\
+py3uno\
qadevOOo\
+ rdbmaker\
readlicense_oo\
- regexp\
diff --git a/Repository.mk b/Repository.mk
index 3609d09..c0b11c2 100644
--- a/Repository.mk
diff --git a/patches/pyuno-copy-for-python3.diff b/patches/pyuno-copy-for-python3.diff
index d230150..62eb415 100644
--- a/patches/pyuno-copy-for-python3.diff
+++ b/patches/pyuno-copy-for-python3.diff
@@ -68,9 +68,8 @@ diff -urN pyuno/Library_py3uno.mk py3uno/Library_py3uno.mk
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
-diff -urN pyuno/Library_py3uno_wrapper.mk py3uno/Library_py3uno_wrapper.mk
---- pyuno/Library_py3uno_wrapper.mk 1970-01-01 01:00:00.000000000 +0100
-+++ py3uno/Library_py3uno_wrapper.mk 2012-09-17 21:45:33.783419647 +0200
+--- /dev/null 2012-09-07 17:14:08.612339087 +0200
++++ pyuno/Library_py3uno_wrapper.mk 2012-10-04 20:06:08.828380766 +0200
@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
@@ -125,8 +124,8 @@ diff -urN pyuno/Library_py3uno_wrapper.mk py3uno/Library_py3uno_wrapper.mk
+ifneq ($(GUI)$(COM),WNTMSC)
+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
+
-+$(eval $(call gb_Library_use_libraries,py3uno_wrapper,\
-+ dl \
++$(eval $(call gb_Library_add_libs,pyuno_wrapper,\
++ -ldl \
+))
+
+endif
@@ -327,9 +326,8 @@ diff -urN pyuno/Library_pyuno.mk py3uno/Library_pyuno.mk
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
-diff -urN pyuno/Library_pyuno_wrapper.mk py3uno/Library_pyuno_wrapper.mk
---- pyuno/Library_pyuno_wrapper.mk 2012-07-20 11:13:03.401545847 +0200
-+++ py3uno/Library_pyuno_wrapper.mk 1970-01-01 01:00:00.000000000 +0100
+--- pyuno/Library_pyuno_wrapper.mk 2012-09-30 14:39:02.759093832 +0200
++++ /dev/null 2012-09-07 17:14:08.612339087 +0200
@@ -1,65 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
@@ -384,8 +382,8 @@ diff -urN pyuno/Library_pyuno_wrapper.mk py3uno/Library_pyuno_wrapper.mk
-ifneq ($(GUI)$(COM),WNTMSC)
-ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
-
--$(eval $(call gb_Library_use_libraries,pyuno_wrapper,\
-- dl \
+-$(eval $(call gb_Library_add_libs,pyuno_wrapper,\
+- -ldl \
-))
-
-endif
diff --git a/uno-libs3.symbols b/uno-libs3.symbols
index 5e41e06..edf2277 100644
--- a/uno-libs3.symbols
+++ b/uno-libs3.symbols
@@ -14,6 +14,7 @@ libuno_cppuhelpergcc3.so.3 uno-libs3 #MINVER#, ure
*@UDK_3.7 3.4.0
*@UDK_3.8 3.5.0~beta
*@UDK_3.9 3.7.0~alpha
+ *@LIBO_UDK_3.9 3.7.0~alpha
libuno_sal.so.3 uno-libs3 #MINVER#, ure
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
@@ -31,7 +32,8 @@ libuno_sal.so.3 uno-libs3 #MINVER#, ure
osl_setEnvironment@UDK_3.11 1.7.0+LibO3.3.0~beta3
*@UDK_3.11 1.8.0
*@LIBO_UDK_3.5 3.5.0~beta
- *@LIBO_UDK_3.6 3.6.0~beta
+ *@LIBO_UDK_3.6 3.7.0~alpha
+ *@LIBO_UDK_3.7 3.7.0~alpha
libuno_salhelpergcc3.so.3 uno-libs3 #MINVER#, ure
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
--
LibreOffice packaging repository
Reply to: