[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-287-g58523f8
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit 21819fb2bd2e0938d1cb3668bb1fd18135011747
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue May 28 00:20:17 2013 +0200
remove pyuno2
- remove patches to make sure this does not come back accidentally
- keep some of the logic in debian/rules though, to keep the delta at minimum
diff --git a/patches/py2uno-module.diff b/patches/py2uno-module.diff
deleted file mode 100644
index 248bc25..0000000
--- a/patches/py2uno-module.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Repository.mk b/Repository.mk
-index 16ef7ba..ea257b1 100755
---- a/Repository.mk
-+++ b/Repository.mk
-@@ -481,7 +481,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- mozbootstrap \
- officebean \
- pyuno \
-+ py2uno \
- pyuno_wrapper \
-+ py2uno_wrapper \
- recentfile \
- scriptframe \
- sdbc2 \
-@@ -609,6 +609,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- postgresql-sdbc \
- postgresql-sdbc-impl \
- pythonloader \
-+ python2loader \
- simplecanvas \
- stringresource \
- syssh \
-diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
-index 6beb818..1a570e4 100644
---- a/RepositoryFixes.mk
-+++ b/RepositoryFixes.mk
-@@ -49,6 +49,7 @@ gb_Library_FILENAMES := $(patsubst pyuno_wrapper:libpyuno_wrapper.dylib,pyuno_wr
- else
- # libpyuno_wrapper.so => pyuno.so
- gb_Library_FILENAMES := $(patsubst pyuno_wrapper:libpyuno_wrapper.so,pyuno_wrapper:pyuno.so,$(gb_Library_FILENAMES))
-+gb_Library_FILENAMES := $(patsubst py2uno_wrapper:libpy2uno_wrapper.so,py2uno_wrapper:py2uno.so,$(gb_Library_FILENAMES))
- endif
-
- ifneq ($(OS),ANDROID)
diff --git a/patches/pyuno-copy-for-python2.diff b/patches/pyuno-copy-for-python2.diff
deleted file mode 100644
index 3d274fc..0000000
--- a/patches/pyuno-copy-for-python2.diff
+++ /dev/null
@@ -1,444 +0,0 @@
-diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
---- pyuno/Library_py2uno.mk 1970-01-01 01:00:00.000000000 +0100
-+++ py2uno/Library_py2uno.mk 2012-09-17 21:35:21.284382442 +0200
-@@ -0,0 +1,50 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call gb_Library_Library,py2uno))
-+
-+$(eval $(call gb_Library_set_include,py2uno,\
-+ -I$(SRCDIR)/py2uno/source/loader \
-+ -I$(SRCDIR)/py2uno/inc \
-+ $$(INCLUDE) \
-+))
-+
-+$(eval $(call gb_Library_add_defs,py2uno,\
-+ -DLO_DLLIMPLEMENTATION_PYUNO \
-+))
-+
-+$(eval $(call gb_Library_use_api,py2uno,\
-+ udkapi \
-+))
-+
-+$(eval $(call gb_Library_use_libraries,py2uno,\
-+ cppu \
-+ cppuhelper \
-+ sal \
-+ salhelper \
-+))
-+
-+$(eval $(call gb_Library_use_externals,py2uno,\
-+ boost_headers \
-+ python \
-+))
-+
-+$(eval $(call gb_Library_add_exception_objects,py2uno,\
-+ py2uno/source/module/pyuno_runtime \
-+ py2uno/source/module/pyuno \
-+ py2uno/source/module/pyuno_callable \
-+ py2uno/source/module/pyuno_module \
-+ py2uno/source/module/pyuno_type \
-+ py2uno/source/module/pyuno_util \
-+ py2uno/source/module/pyuno_except \
-+ py2uno/source/module/pyuno_adapter \
-+ py2uno/source/module/pyuno_gc \
-+))
-+
-+# vim:set noet sw=4 ts=4:
---- /dev/null 2012-11-27 20:03:56.000000000 +0100
-+++ py2uno/Library_py2uno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
-@@ -0,0 +1,47 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call gb_Library_Library,py2uno_wrapper))
-+
-+$(eval $(call gb_Library_set_include,py2uno_wrapper,\
-+ -I$(SRCDIR)/py2uno/source/module \
-+ -I$(SRCDIR)/py2uno/inc \
-+ $$(INCLUDE) \
-+))
-+
-+# not using external "python" because we do not want to link against python
-+$(eval $(call gb_Library_use_externals,py2uno_wrapper,\
-+ python_headers \
-+))
-+
-+# python "import pyuno" dlopens pyuno.so as RTLD_LOCAL, so g++ exception
-+# handling used to not work, so pyuno.so (pyuno_wrapper) is just a thin wrapper
-+# that dlopens libpyuno.so as RTLD_GLOBAL; but when pyuno.so wrapper links
-+# against libstdc++ (which has not previously been loaded into python process),
-+# that resolves its _ZNSs4_Rep20_S_empty_rep_storageE to itself, but later LO
-+# libs (loaded though RTLD_GLOBAL libpyuno.so) may resolve that symbol to e.g.
-+# cppu, because they happen to see that before libstdc++; so the requirement has
-+# always been that RTLD_LOCAL-loaded pyuno.so wrapper implicitly load into the
-+# process as little as possible:
-+$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
-+$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
-+
-+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
-+
-+$(eval $(call gb_Library_add_libs,py2uno_wrapper,\
-+ -ldl \
-+))
-+
-+endif
-+
-+$(eval $(call gb_Library_add_cobjects,py2uno_wrapper,\
-+ py2uno/source/module/pyuno_dlopenwrapper \
-+))
-+
-+# vim:set noet sw=4 ts=4:
-diff -urN pyuno/Library_python2loader.mk py2uno/Library_python2loader.mk
---- pyuno/Library_python2loader.mk 1970-01-01 01:00:00.000000000 +0100
-+++ py2uno/Library_python2loader.mk 2012-09-17 21:36:02.252585588 +0200
-@@ -0,0 +1,39 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call gb_Library_Library,python2loader))
-+
-+$(eval $(call gb_Library_set_componentfile,python2loader,py2uno/source/loader/pythonloader))
-+
-+$(eval $(call gb_Library_set_include,python2loader,\
-+ -I$(SRCDIR)/py2uno/source/loader \
-+ -I$(SRCDIR)/py2uno/inc \
-+ $$(INCLUDE) \
-+))
-+
-+$(eval $(call gb_Library_use_api,python2loader,\
-+ udkapi \
-+))
-+
-+$(eval $(call gb_Library_use_libraries,python2loader,\
-+ cppu \
-+ cppuhelper \
-+ py2uno \
-+ sal \
-+))
-+
-+$(eval $(call gb_Library_use_externals,python2loader,\
-+ python \
-+))
-+
-+$(eval $(call gb_Library_add_exception_objects,python2loader,\
-+ py2uno/source/loader/pyuno_loader \
-+))
-+
-+# vim:set noet sw=4 ts=4:
-diff -urN pyuno/Library_pythonloader.mk py2uno/Library_pythonloader.mk
---- pyuno/Library_pythonloader.mk 2012-06-18 20:36:22.723886656 +0200
-+++ py2uno/Library_pythonloader.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,39 +0,0 @@
--# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
--#
--# This file is part of the LibreOffice project.
--#
--# This Source Code Form is subject to the terms of the Mozilla Public
--# License, v. 2.0. If a copy of the MPL was not distributed with this
--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
--#
--
--$(eval $(call gb_Library_Library,pythonloader))
--
--$(eval $(call gb_Library_set_componentfile,pythonloader,pyuno/source/loader/pythonloader))
--
--$(eval $(call gb_Library_set_include,pythonloader,\
-- -I$(SRCDIR)/pyuno/source/loader \
-- -I$(SRCDIR)/pyuno/inc \
-- $$(INCLUDE) \
--))
--
--$(eval $(call gb_Library_use_api,pythonloader,\
-- udkapi \
--))
--
--$(eval $(call gb_Library_use_libraries,pythonloader,\
-- cppu \
-- cppuhelper \
-- pyuno \
-- sal \
--))
--
--$(eval $(call gb_Library_use_externals,pythonloader,\
-- python \
--))
--
--$(eval $(call gb_Library_add_exception_objects,pythonloader,\
-- pyuno/source/loader/pyuno_loader \
--))
--
--# vim:set noet sw=4 ts=4:
-diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
---- pyuno/Library_pyuno.mk 2012-06-18 20:36:23.391889962 +0200
-+++ py2uno/Library_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,50 +0,0 @@
--# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
--#
--# This file is part of the LibreOffice project.
--#
--# This Source Code Form is subject to the terms of the Mozilla Public
--# License, v. 2.0. If a copy of the MPL was not distributed with this
--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
--#
--
--$(eval $(call gb_Library_Library,pyuno))
--
--$(eval $(call gb_Library_set_include,pyuno,\
-- -I$(SRCDIR)/pyuno/source/loader \
-- -I$(SRCDIR)/pyuno/inc \
-- $$(INCLUDE) \
--))
--
--$(eval $(call gb_Library_add_defs,pyuno,\
-- -DLO_DLLIMPLEMENTATION_PYUNO \
--))
--
--$(eval $(call gb_Library_use_api,pyuno,\
-- udkapi \
--))
--
--$(eval $(call gb_Library_use_libraries,pyuno,\
-- cppu \
-- cppuhelper \
-- sal \
-- salhelper \
--))
--
--$(eval $(call gb_Library_use_externals,pyuno,\
-- boost_headers \
-- python \
--))
--
--$(eval $(call gb_Library_add_exception_objects,pyuno,\
-- pyuno/source/module/pyuno_runtime \
-- pyuno/source/module/pyuno \
-- pyuno/source/module/pyuno_callable \
-- pyuno/source/module/pyuno_module \
-- pyuno/source/module/pyuno_type \
-- pyuno/source/module/pyuno_util \
-- pyuno/source/module/pyuno_except \
-- pyuno/source/module/pyuno_adapter \
-- pyuno/source/module/pyuno_gc \
--))
--
--# vim:set noet sw=4 ts=4:
---- pyuno/Library_pyuno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
-+++ /dev/null 2012-11-27 20:03:56.000000000 +0100
-@@ -1,47 +0,0 @@
--# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
--#
--# This file is part of the LibreOffice project.
--#
--# This Source Code Form is subject to the terms of the Mozilla Public
--# License, v. 2.0. If a copy of the MPL was not distributed with this
--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
--#
--
--$(eval $(call gb_Library_Library,pyuno_wrapper))
--
--$(eval $(call gb_Library_set_include,pyuno_wrapper,\
-- -I$(SRCDIR)/pyuno/source/module \
-- -I$(SRCDIR)/pyuno/inc \
-- $$(INCLUDE) \
--))
--
--# not using external "python" because we do not want to link against python
--$(eval $(call gb_Library_use_externals,pyuno_wrapper,\
-- python_headers \
--))
--
--# python "import pyuno" dlopens pyuno.so as RTLD_LOCAL, so g++ exception
--# handling used to not work, so pyuno.so (pyuno_wrapper) is just a thin wrapper
--# that dlopens libpyuno.so as RTLD_GLOBAL; but when pyuno.so wrapper links
--# against libstdc++ (which has not previously been loaded into python process),
--# that resolves its _ZNSs4_Rep20_S_empty_rep_storageE to itself, but later LO
--# libs (loaded though RTLD_GLOBAL libpyuno.so) may resolve that symbol to e.g.
--# cppu, because they happen to see that before libstdc++; so the requirement has
--# always been that RTLD_LOCAL-loaded pyuno.so wrapper implicitly load into the
--# process as little as possible:
--$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
--$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
--
--ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
--
--$(eval $(call gb_Library_add_libs,pyuno_wrapper,\
-- -ldl \
--))
--
--endif
--
--$(eval $(call gb_Library_add_cobjects,pyuno_wrapper,\
-- pyuno/source/module/pyuno_dlopenwrapper \
--))
--
--# vim:set noet sw=4 ts=4:
-diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
---- pyuno/Module_py2uno.mk 1970-01-01 01:00:00.000000000 +0100
-+++ py2uno/Module_py2uno.mk 2012-09-17 21:37:10.060921827 +0200
-@@ -0,0 +1,71 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call gb_Module_Module,py2uno))
-+
-+ifneq ($(DISABLE_PYTHON),TRUE)
-+
-+$(eval $(call gb_Module_add_targets,py2uno,\
-+ Library_py2uno \
-+ Library_python2loader \
-+ Package_pyunorc \
-+ Package_python_scripts \
-+))
-+
-+ifneq ($(OS),WNT)
-+$(eval $(call gb_Module_add_targets,py2uno,\
-+ Library_py2uno_wrapper \
-+))
-+endif
-+
-+#
-+# Windows: only --enable-python=internal possible
-+# mingw: both cases possible: internal && system
-+# that why it makes sense to handle the next 3 targets
-+# with SYSTEM_PYTHON=YES and SYSTEM_PYTHON=NO
-+
-+# zipcore: pyuno/python.exe on Windows
-+ifeq ($(OS),WNT)
-+$(eval $(call gb_Module_add_targets,pyuno,\
-+ Executable_python_wrapper \
-+))
-+endif
-+
-+ifneq ($(SYSTEM_PYTHON),YES)
-+
-+# zipcore: python.sh on Unix
-+ifneq ($(OS),WNT)
-+$(eval $(call gb_Module_add_targets,pyuno,\
-+ CustomTarget_python_shell \
-+ Package_python_shell \
-+))
-+endif
-+
-+else # SYSTEM_PYTHON
-+
-+# these two targets have to be executed only with system-python on mingw
-+# FIXME remove this
-+ifeq ($(OS)$(COM),WNTGCC)
-+$(eval $(call gb_Module_add_targets,pyuno,\
-+ CustomTarget_zipcore \
-+ Package_zipcore \
-+))
-+endif
-+
-+endif # SYSTEM_PYTHON
-+
-+ifneq ($(gb_RUNNABLE_INSTDIR),)
-+$(eval $(call gb_Module_add_targets,py2uno,\
-+ Package_python_scripts_install \
-+))
-+endif
-+
-+endif # DISABLE_PYTHON
-+
-+# vim:set noet sw=4 ts=4:
-diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
---- pyuno/Module_pyuno.mk 2012-07-20 11:13:03.401545847 +0200
-+++ py2uno/Module_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,71 +0,0 @@
--# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
--#
--# This file is part of the LibreOffice project.
--#
--# This Source Code Form is subject to the terms of the Mozilla Public
--# License, v. 2.0. If a copy of the MPL was not distributed with this
--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
--#
--
--$(eval $(call gb_Module_Module,pyuno))
--
--ifneq ($(DISABLE_PYTHON),TRUE)
--
--$(eval $(call gb_Module_add_targets,pyuno,\
-- Library_pyuno \
-- Library_pythonloader \
-- Package_pyunorc \
-- Package_python_scripts \
--))
--
--ifneq ($(OS),WNT)
--$(eval $(call gb_Module_add_targets,pyuno,\
-- Library_pyuno_wrapper \
--))
--endif
--
--#
--# Windows: only --enable-python=internal possible
--# mingw: both cases possible: internal && system
--# that why it makes sense to handle the next 3 targets
--# with SYSTEM_PYTHON=YES and SYSTEM_PYTHON=NO
--
--# zipcore: pyuno/python.exe on Windows
--ifeq ($(OS),WNT)
--$(eval $(call gb_Module_add_targets,pyuno,\
-- Executable_python_wrapper \
--))
--endif
--
--ifneq ($(SYSTEM_PYTHON),YES)
--
--# zipcore: python.sh on Unix
--ifneq ($(OS),WNT)
--$(eval $(call gb_Module_add_targets,pyuno,\
-- CustomTarget_python_shell \
-- Package_python_shell \
--))
--endif
--
--else # SYSTEM_PYTHON
--
--# these two targets have to be executed only with system-python on mingw
--# FIXME remove this
--ifeq ($(OS)$(COM),WNTGCC)
--$(eval $(call gb_Module_add_targets,pyuno,\
-- CustomTarget_zipcore \
-- Package_zipcore \
--))
--endif
--
--endif # SYSTEM_PYTHON
--
--ifneq ($(gb_RUNNABLE_INSTDIR),)
--$(eval $(call gb_Module_add_targets,pyuno,\
-- Package_python_scripts_install \
--))
--endif
--
--endif # DISABLE_PYTHON
--
--# vim:set noet sw=4 ts=4:
diff --git a/patches/series b/patches/series
index 4179eb9..32ba4eb 100644
--- a/patches/series
+++ b/patches/series
@@ -19,7 +19,6 @@ make-package-modules-not-suck.diff
mediwiki-oor-replace.diff
debian-hardened-buildflags-CPPFLAGS.diff
gtk3-hack-explicit-gmodule.diff
-py2uno-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
diff --git a/rules b/rules
index db9c636..6ce7e68 100755
--- a/rules
+++ b/rules
@@ -121,7 +121,7 @@ BUILD_DEPS=\
SYSTEM_STUFF = dicts
ENABLE_PYTHON=y
-ENABLE_PYTHON2=y
+ENABLE_PYTHON2=n
ifeq "$(ENABLE_PYTHON)" "y"
ENABLE_SCRIPT_PROVIDER_PYTHON=y
PACKAGE_LIBRELOGO=y
--
LibreOffice packaging repository
Reply to: