[libreoffice] 01/01: git update; java9.diff is upstream
Rene Engelhard
rene at moszumanska.debian.org
Wed Aug 30 19:30:08 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 33d01d824319dad88969c84971d7fe56edc2cbf8
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Wed Aug 30 21:29:58 2017 +0200
git update; java9.diff is upstream
---
changelog | 6 ++++
patches/java9.diff | 95 ------------------------------------------------------
patches/series | 1 -
rules | 2 +-
4 files changed, 7 insertions(+), 97 deletions(-)
diff --git a/changelog b/changelog
index f12fcd3..5983033 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.4.2~rc1~git20170830-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org> Wed, 30 Aug 2017 20:46:06 +0200
+
libreoffice (1:5.4.1-1) unstable; urgency=medium
* New upstream release
diff --git a/patches/java9.diff b/patches/java9.diff
deleted file mode 100644
index 9562905..0000000
--- a/patches/java9.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-From 52ffad9bb7be800790de6d918154dbeade88cadd Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Mon, 28 Aug 2017 15:35:43 +0200
-Subject: tdf#100501: Adapt to Java 9 (at least on Linux x86-64)
-
-Checking with both jdk-9+181_linux-x64_bin.tar.gz and
-jre-9+181_linux-x64_bin.tar.gz as currently available at
-<http://jdk.java.net/9/> "JDK 9 Early-Access Builds":
-
-For one, make SunVersion::init understand <http://openjdk.java.net/jeps/223>
-"JEP 223: New Version-String Scheme" at least insofar as to accept strings like
-"9" with less than three dot-separated segments (where the missing segments are
-treated like "0").
-
-For another, at least for Linux x86-64, libjvm.so is now apparently located in a
-path without an "amd64" architecture segment, "lib/server/libjvm.so". (But
-could that also be "client"?) Other platforms may need further adjustments.
-
-Change-Id: Idcebc833472c81a1dc74dcdd481b0a37274a8713
-
-diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
-index 7f7c494..7543f49 100644
---- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
-+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
-@@ -68,7 +68,8 @@ char const* const* SunInfo::getRuntimePaths(int * size)
- "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
- "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
- "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
-- "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
-+ "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so",
-+ "/lib/server/libjvm.so"
- #endif
- };
- *size = SAL_N_ELEMENTS(ar);
-diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-index 9646ba3..23c5983 100644
---- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-@@ -88,7 +88,7 @@ bool SunVersion::init(const char *szVersion)
- ! (nPartPos == 0) // prevents: ".4.1", "..1", part must start with digit
- && (
- //separators after maintenance (1.4.1_01, 1.4.1-beta, or 1.4.1)
-- ((pCur == pEnd || *pCur == '_' || *pCur == '-') && (nPart == 2 ))
-+ (pCur == pEnd || *pCur == '_' || *pCur == '-')
- ||
- //separators between major-minor and minor-maintenance
- (nPart < 2 && *pCur == '.') )
-@@ -97,6 +97,8 @@ bool SunVersion::init(const char *szVersion)
- pCur + 1 != pEnd
- || rtl::isAsciiDigit(static_cast<unsigned char>(*pCur))) )
- {
-+ bool afterMaint = pCur != pEnd && (*pCur == '_' || *pCur == '-');
-+
- int len = pCur - pLast;
- if (len >= 127)
- return false;
-@@ -107,6 +109,9 @@ bool SunVersion::init(const char *szVersion)
- pLast = pCur;
-
- m_arVersionParts[nPart] = atoi(buf);
-+
-+ if (afterMaint)
-+ nPart = 2;
- nPart ++;
- nPartPos = 0;
- if (nPart == 3)
---
-cgit v0.10.2
-
-From cda4cea7cdfc9a8de814b901b3b957f029d36aaf Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Mon, 28 Aug 2017 18:18:12 +0200
-Subject: tdf#100501: Fix thinko
-
-...in previous 52ffad9bb7be800790de6d918154dbeade88cadd "tdf#100501: Adapt to
-Java 9 (at least on Linux x86-64)"
-
-Change-Id: I4d6bc31e0a7051a2657bb3d1ffc20c7a03d69038
-
-diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-index 23c5983..f5b60e6 100644
---- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-@@ -97,7 +97,7 @@ bool SunVersion::init(const char *szVersion)
- pCur + 1 != pEnd
- || rtl::isAsciiDigit(static_cast<unsigned char>(*pCur))) )
- {
-- bool afterMaint = pCur != pEnd && (*pCur == '_' || *pCur == '-');
-+ bool afterMaint = pCur == pEnd || *pCur == '_' || *pCur == '-';
-
- int len = pCur - pLast;
- if (len >= 127)
---
-cgit v0.10.2
-
diff --git a/patches/series b/patches/series
index 98d02d2..30de6a1 100644
--- a/patches/series
+++ b/patches/series
@@ -31,4 +31,3 @@ cppunit-optional.diff
disable-unused-test-programs.diff
gb_SUPPRESS_TESTS.diff
stop-shipping-mimelnk-desktop-files.diff
-java9.diff
diff --git a/rules b/rules
index 84a7682..8a01617 100755
--- a/rules
+++ b/rules
@@ -74,7 +74,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-5-4-1
+GIT_BRANCH=libreoffice-5-4
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
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