[libreoffice] 01/03: 5.4.1 branch; remove upstreamed patches, update no-packagekit-per-default.diff
Rene Engelhard
rene at moszumanska.debian.org
Fri Jul 28 06:15:32 UTC 2017
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 1596f2c8eaef1200d10b528895e329bb9011c48f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Fri Jul 28 08:10:53 2017 +0200
5.4.1 branch; remove upstreamed patches, update no-packagekit-per-default.diff
---
changelog | 6 +++++
.../examples-fix-SDK_AUTO_DEPLOYMENT-check.diff | 29 ----------------------
patches/libebook-1.2.so.19.diff | 25 -------------------
patches/lo-xlate-lang-update.diff | 22 ----------------
patches/no-packagekit-per-default.diff | 4 +--
patches/series | 3 ---
6 files changed, 8 insertions(+), 81 deletions(-)
diff --git a/changelog b/changelog
index 4282074..111a506 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.4.1~rc1~git20170728-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org> Sat, 15 Jul 2017 12:24:52 +0000
+
libreoffice (1:5.4.0-1) unstable; urgency=medium
* New upstream release
diff --git a/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff b/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff
deleted file mode 100644
index d8bde1a..0000000
--- a/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From 77d6bb690865540577c04952ba685a0cfe3fa01e Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene at debian.org>
-Date: Mon, 17 Jul 2017 10:53:29 +0200
-Subject: [PATCH] use ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
-
-... instead of ifneq "$(SDK_AUTO_DEPLOYMENT)" "", as the variable is = NO
-if disabled
-
-Change-Id: I7dd2d165235f5cb7e55a8fed628ada71b04c7881
----
- odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
-index bcd47ac1725f..3af249f9d4b0 100644
---- a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
-+++ b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
-@@ -106,7 +106,7 @@ $(COMPONENT_PACKAGE) : $(COMPONENT_JAR) $(COMPONENT_UNOPKG_MANIFEST)
- cd $(subst /,$(PS),$(OUT_COMP_CLASS)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
-
- $(REGISTERFLAG) : $(COMPONENT_PACKAGE)
--ifneq "$(SDK_AUTO_DEPLOYMENT)" ""
-+ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
- -$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
- -$(MKDIR) $(subst /,$(PS),$(@D))
- $(DEPLOYTOOL) $(COMPONENT_PACKAGE_URL)
---
-2.11.0
-
diff --git a/patches/libebook-1.2.so.19.diff b/patches/libebook-1.2.so.19.diff
deleted file mode 100644
index 3471977..0000000
--- a/patches/libebook-1.2.so.19.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5844d813411be8c4c7c394be07a49eaf92885758 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz at ubuntu.com>
-Date: Mon, 24 Jul 2017 11:24:48 +0200
-Subject: add libebook-1.2.so.19 in EApi.cxx
-
-Change-Id: I900a190948087360bb4c3cd9235c9848333ad66f
-Reviewed-on: https://gerrit.libreoffice.org/40358
-Tested-by: Jenkins <ci at libreoffice.org>
-Reviewed-by: Michael Stahl <mstahl at redhat.com>
-
-diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
-index fc81a19..81db0b0 100644
---- a/connectivity/source/drivers/evoab2/EApi.cxx
-+++ b/connectivity/source/drivers/evoab2/EApi.cxx
-@@ -21,6 +21,7 @@
- #define DECLARE_FN_POINTERS 1
- #include "EApi.h"
- static const char *eBookLibNames[] = {
-+ "libebook-1.2.so.19", // evolution-data-server 3.24+
- "libebook-1.2.so.16",
- "libebook-1.2.so.15",
- "libebook-1.2.so.14", // bumped again (evolution-3.6)
---
-cgit v0.10.2
-
diff --git a/patches/lo-xlate-lang-update.diff b/patches/lo-xlate-lang-update.diff
deleted file mode 100644
index ee988b9..0000000
--- a/patches/lo-xlate-lang-update.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang
-index c54f379..1580d64 100755
---- a/bin/lo-xlate-lang
-+++ b/bin/lo-xlate-lang
-@@ -119,7 +119,7 @@ __DATA__
- :gu:gujarati
- :hr:croatian
- :km:khmer
--:ku:kurdish
-+:kmr-Latn:Kurmanji
- :pa-IN:punjabi
- :rw:kinarwanda
- :xh:xhosa
-@@ -174,6 +174,8 @@ __DATA__
- :si:sinhala
- :id:indonesian
- :my:burmese
-+:am:amharic
-+:gug:guarani
- 01:en-US:english_american
- 03:pt:portuguese
- 07:ru:russian
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index 1ca6bd6..8469e4c 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -125,7 +125,7 @@ index aff2848..8def362 100644
guint get_xid_for_dbus()
{
const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow();
-@@ -887,7 +887,7 @@ namespace
+@@ -873,7 +873,7 @@ namespace
#endif
}
@@ -133,7 +133,7 @@ index aff2848..8def362 100644
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
{
- guint xid = get_xid_for_dbus();
+ if (!officecfg::Office::Common::PackageKit::EnableFontInstallation::get())
@@ -1098,7 +1098,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
}
}
diff --git a/patches/series b/patches/series
index 3471358..2da03f7 100644
--- a/patches/series
+++ b/patches/series
@@ -19,7 +19,6 @@ disable-flaky-tests.diff
#dont-touch-urd.diff
fix-internal-hsqldb-build.diff
javadoc-optional.diff
-lo-xlate-lang-update.diff
build-connectivitytools.diff
odk-no-dot.diff
hppa-is-32bit.diff
@@ -31,5 +30,3 @@ disable-sc_subsequent_filters_test-with-internal-cppunit.diff
cppunit-optional.diff
disable-unused-test-programs.diff
gb_SUPPRESS_TESTS.diff
-examples-fix-SDK_AUTO_DEPLOYMENT-check.diff
-libebook-1.2.so.19.diff
--
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