diff --git a/java-encoding.patch b/java-encoding.patch new file mode 100644 index 0000000..2c7d6a8 --- /dev/null +++ b/java-encoding.patch @@ -0,0 +1,25 @@ +diff --git a/configure.ac b/configure.ac +index d99b67676177..10746af8ed1e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8429,6 +8429,7 @@ if test "$with_java" != "no"; then + BUILD_TYPE="$BUILD_TYPE HSQLDB" + AC_MSG_CHECKING([whether hsqldb should be built with JDBC 4.1]) + javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk` ++ echo "$javanumver" + if expr "$javanumver" '>=' 000100060000 > /dev/null; then + AC_MSG_RESULT([yes]) + HSQLDB_USE_JDBC_4_1=TRUE +diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java +index d20927f8eb27..6a1bd00736ee 100644 +--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java ++++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java +@@ -263,7 +263,7 @@ public class FormatValueUtility + final SectionLayoutController slc = findGroupOrDetail(ref); + if (slc == null) + { +- // {Page, Report} × {Header, Footer} have no usable iteration count ++ // {Page, Report} x {Header, Footer} have no usable iteration count + // err on the side of showing them rather than not showing them + return true; + } diff --git a/libreoffice.changes b/libreoffice.changes index ad93574..dea07d9 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -9,6 +9,8 @@ Tue Sep 12 08:41:51 UTC 2017 - fstrba@suse.com * 0001-Adapt-getcompver.awk-to-Java-9.patch + Adapt getcompver.awk to Java 9 where the version might be single digit + * java-encoding.patch + + Replace one unnecessary UTF-8 character by an ASCII one ------------------------------------------------------------------- Mon Aug 28 08:11:19 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 1eef1b8..e67736d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -88,6 +88,7 @@ Patch100: 0001-This-hunk-breaks-jdk9-build.patch Patch101: 0002-Detect-libjawt-automatically-on-java9-too.patch # PATCH-FIX-UPSTREAM: addapt getcompver.awk to java 9 Patch102: 0001-Adapt-getcompver.awk-to-Java-9.patch +Patch103: java-encoding.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -918,6 +919,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 %patch990 -p1 # Do not generate doxygen timestamp