[libreoffice] 01/01: update java9.diff

Rene Engelhard rene at moszumanska.debian.org
Tue Aug 29 16:39:44 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 2fb03381c865d9ec76b3fb53f8f591e0d18899b5
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Aug 29 18:39:38 2017 +0200

    update java9.diff
---
 patches/java9.diff | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/patches/java9.diff b/patches/java9.diff
index 9f815c3..9562905 100644
--- a/patches/java9.diff
+++ b/patches/java9.diff
@@ -67,3 +67,29 @@ index 9646ba3..23c5983 100644
 -- 
 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
+

-- 
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