[libreoffice] 01/01: update patches to apply again
Rene Engelhard
rene at moszumanska.debian.org
Tue Dec 13 20:15:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit dbc392f1efe3aa90ba376f6f4b1aa06001cf0652
Author: Rene Engelhard <rene at debian.org>
Date: Tue Dec 13 21:06:51 2016 +0100
update patches to apply again
---
patches/javadoc-optional.diff | 48 ++++++++++------------------------
patches/no-openssl.diff | 2 +-
patches/no-packagekit-per-default.diff | 12 ++++-----
patches/split-evoab.diff | 8 +++---
4 files changed, 25 insertions(+), 45 deletions(-)
diff --git a/patches/javadoc-optional.diff b/patches/javadoc-optional.diff
index 6bdc495..1afcd0b 100644
--- a/patches/javadoc-optional.diff
+++ b/patches/javadoc-optional.diff
@@ -112,39 +112,6 @@ Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
if test "$ENABLE_JAVA" != ""; then
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
---- a/scp2/source/sdkoo/sdkoo.scp-old 2013-05-27 21:26:53.967031270 +0200
-+++ b/scp2/source/sdkoo/sdkoo.scp 2013-05-27 21:27:01.895031062 +0200
-@@ -177,6 +177,7 @@
- End
-
- #if defined(ENABLE_JAVA)
-+#if defined(JAVADOC)
- File gid_File_Package_odk_javadoc
- TXT_FILE_BODY;
- Dir = FILELIST_SDK_DIR;
-@@ -184,6 +185,7 @@
- Styles = (FILELIST,USE_INTERNAL_RIGHTS);
- End
- #endif
-+#endif
-
- File gid_File_Package_odk_lib
- TXT_FILE_BODY;
---- a/scp2/InstallModule_sdkoo.mk-old 2013-09-23 22:46:56.034054736 +0200
-+++ b/scp2/InstallModule_sdkoo.mk 2013-09-23 22:46:47.914054950 +0200
-@@ -15,6 +15,12 @@
- ))
- endif
-
-+ifneq ($(JAVADOC),)
-+$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
-+ -DJAVADOC \
-+))
-+endif
-+
- $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
- scp2/source/sdkoo/sdkoo \
- ))
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index a9b542d..707829a 100644
--- a/odk/CustomTarget_check.mk
@@ -155,9 +122,9 @@ index a9b542d..707829a 100644
$(call gb_Package_get_target,odk_html) \
- $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+ $(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
- $(call gb_Package_get_target,odk_lib) \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
+ $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 899b42c..2c7a780 100644
--- a/odk/util/check.pl
@@ -171,3 +138,16 @@ index 899b42c..2c7a780 100644
print "check java docu: ";
if (check_dir("docs/java/ref")) {
if (!check_file("docs/java/ref/index.html")) {
+diff --git a/Repository.mk b/Repository.mk
+index 5f2654b..471210f 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -834,7 +841,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
+ offapi_idl \
+ udkapi_idl \
+ $(if $(ENABLE_JAVA), \
+- odk_javadoc \
++ $(if $(JAVADOC),odk_javadoc) \
+ odk_uno_loader_classes \
+ odk_unowinreg \
+ ) \
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
index 1357eac..627d5e7 100644
--- a/patches/no-openssl.diff
+++ b/patches/no-openssl.diff
@@ -36,9 +36,9 @@ index ddd144e..19f8368 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -100,7 +102,6 @@ export DISABLE_ATL=@DISABLE_ATL@
+ export DISABLE_ATL=@DISABLE_ATL@
export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
- export DISABLE_EXPORT=@DISABLE_EXPORT@
-export DISABLE_OPENSSL=@DISABLE_OPENSSL@
export DISABLE_PYTHON=@DISABLE_PYTHON@
export DLOPEN_LIBS=@DLOPEN_LIBS@
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index 2c0d5a6..b48154d 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -47,12 +47,12 @@ index b6f6f37..c6a9b7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1216,9 +1216,15 @@ AC_ARG_ENABLE(cairo-canvas,
- AC_ARG_ENABLE(dbus,
+ libo_FUZZ_ARG_ENABLE(dbus,
AS_HELP_STRING([--disable-dbus],
[Determines whether to enable features that depend on dbus.
- e.g. Presentation mode screensaver control, bluetooth presentation control, automatic font install]),
+ e.g. Presentation mode screensaver control, bluetooth presentation control]),
- ,enable_dbus=yes)
+ ,test "${enable_dbus+set}" = set || enable_dbus=yes)
+AC_ARG_ENABLE(packagekit,
+ AS_HELP_STRING([--enable-packagekit],
@@ -60,7 +60,7 @@ index b6f6f37..c6a9b7d 100644
+ Right now that is auto font install]),
+,)
+
- AC_ARG_ENABLE(sdremote,
+ libo_FUZZ_ARG_ENABLE(sdremote,
AS_HELP_STRING([--disable-sdremote],
[Determines whether to enable Impress remote control (i.e. the server component).]),
@@ -10046,6 +10052,20 @@ AC_SUBST(ENABLE_DBUS)
@@ -148,9 +148,9 @@ index 8089eae..b2525ac 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -674,7 +674,7 @@ PrintFontManager::PrintFontManager()
- }
- }
-
+ : m_nNextFontID( 1 )
+ , m_nNextDirAtom( 1 )
+ {
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport));
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
index 5d5a9c4..6b89cc2 100644
--- a/patches/split-evoab.diff
+++ b/patches/split-evoab.diff
@@ -20,16 +20,16 @@ diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome
index 08d9efe..492e274 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
-@@ -30,6 +30,9 @@ Module gid_Module_Optional_Gnome
+@@ -31,6 +31,9 @@ Module gid_Module_Optional_Gnome
#if ENABLE_GIO
- gid_File_Share_Registry_Gnome_Xcd,
+ ,gid_File_Share_Registry_Gnome_Xcd
#endif
+#ifdef ENABLE_EVOAB2
-+ gid_File_Share_Registry_Evoab_Xcd,
++ ,gid_File_Share_Registry_Evoab_Xcd
+#endif
- gid_File_Bin_Gnome_Open_Url
);
End
+
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 510b444..3ff190f 100644
--- a/postprocess/CustomTarget_registry.mk
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list