- Remove merged patches:
* 0001-Adapt-getcompver.awk-to-Java-9.patch * 0001-This-hunk-breaks-jdk9-build.patch * 0002-Detect-libjawt-automatically-on-java9-too.patch * java-encoding.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=551
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
a0ca556612
commit
9717415726
@ -1,38 +0,0 @@
|
||||
From b44f062df9f541b0a1bea974556483c7a5876b35 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Wed, 30 Aug 2017 15:16:22 +0200
|
||||
Subject: [PATCH] Adapt getcompver.awk to Java 9
|
||||
|
||||
...where at least <http://jdk.java.net/9/> "JDK 9 Early-Access Builds" 'java
|
||||
-version' outputs a single-digit
|
||||
|
||||
java version "9"
|
||||
|
||||
Change-Id: I7807f56593e5436418b49950ca6c2a178d6721f5
|
||||
---
|
||||
solenv/bin/getcompver.awk | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
|
||||
index ae08f4e21790..6744c4dc5c7c 100644
|
||||
--- a/solenv/bin/getcompver.awk
|
||||
+++ b/solenv/bin/getcompver.awk
|
||||
@@ -40,8 +40,13 @@ BEGIN {
|
||||
/java version/ || /openjdk version/ {
|
||||
compiler_matched = 1
|
||||
# match on the format of the java versions ( d[d].d[d].d[d] )
|
||||
- x = match( $0, /[0-9]*\.[0-9]*\.[0-9]*/ )
|
||||
- CCversion = substr( $0, RSTART, RLENGTH)
|
||||
+ if (match($0, /[0-9]+\.[0-9]+\.[0-9]+/)) {
|
||||
+ CCversion = substr($0, RSTART, RLENGTH)
|
||||
+ } else if (match($0, /[0-9]+\.[0-9]+/)) {
|
||||
+ CCversion = substr($0, RSTART, RLENGTH) "."
|
||||
+ } else if (match($0, /[0-9]+/)) {
|
||||
+ CCversion = substr($0, RSTART, RLENGTH) ".."
|
||||
+ }
|
||||
}
|
||||
/^[0-9]*[.][0-9]*\r*$/ {
|
||||
if ( compiler_matched == 0 ) {
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 93157811a1e290416422fea91c5bbc2a03b6324a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||
Date: Mon, 4 Sep 2017 20:59:02 +0200
|
||||
Subject: [PATCH 1/2] This hunk breaks jdk9 build
|
||||
|
||||
Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
|
||||
---
|
||||
external/rhino/rhino1_5R5.patch | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/external/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch
|
||||
index e44872e3df8f..40fc6cc9427b 100644
|
||||
--- a/external/rhino/rhino1_5R5.patch
|
||||
+++ b/external/rhino/rhino1_5R5.patch
|
||||
@@ -185,14 +185,6 @@
|
||||
</target>
|
||||
|
||||
<target name="compile" depends="properties,get-swing-ex">
|
||||
-@@ -68,6 +54,7 @@
|
||||
- includes="org/**/*.java"
|
||||
- deprecation="on"
|
||||
- debug="${debug}">
|
||||
-+ <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
|
||||
- </javac>
|
||||
- <copy todir="${nest}/${classes}">
|
||||
- <fileset dir="." includes="org/**/*.properties" />
|
||||
--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2004-03-25 21:54:34.000000000 +0100
|
||||
+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2009-01-17 20:44:22.000000000 +0100
|
||||
@@ -470,15 +470,21 @@
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From f0e34eaf4969af89eab22331c882a0a8a10e82d8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||
Date: Tue, 12 Sep 2017 10:32:26 +0200
|
||||
Subject: [PATCH 2/2] Detect libjawt automatically on java9 too
|
||||
|
||||
Change-Id: Ie8eb53a915682b7a188b1af4b2d435eb0cc9ff81
|
||||
---
|
||||
configure.ac | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f053df0192c7..d99b67676177 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -7003,7 +7003,12 @@ then
|
||||
my_java_arch=$host_cpu
|
||||
;;
|
||||
esac
|
||||
- JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
|
||||
+ # This is where JDK9 puts the library
|
||||
+ if test -e "$JAVA_HOME/lib/libjawt.so"; then
|
||||
+ JAWTLIB="-L$JAVA_HOME/lib/ -ljawt"
|
||||
+ else
|
||||
+ JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
|
||||
+ fi
|
||||
AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
|
||||
fi
|
||||
AC_MSG_RESULT([$JAWTLIB])
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
Index: libreoffice-5.4.0.0.alpha1/dbaccess/Module_dbaccess.mk
|
||||
===================================================================
|
||||
--- libreoffice-5.4.0.0.alpha1.orig/dbaccess/Module_dbaccess.mk
|
||||
+++ libreoffice-5.4.0.0.alpha1/dbaccess/Module_dbaccess.mk
|
||||
@@ -45,16 +45,8 @@ $(eval $(call gb_Module_add_check_target
|
||||
CppunitTest_dbaccess_empty_stdlib_save \
|
||||
CppunitTest_dbaccess_nolib_save \
|
||||
CppunitTest_dbaccess_macros_test \
|
||||
- $(if $(ENABLE_JAVA), \
|
||||
- CppunitTest_dbaccess_RowSetClones) \
|
||||
))
|
||||
|
||||
-ifeq ($(ENABLE_JAVA),TRUE)
|
||||
-$(eval $(call gb_Module_add_check_targets,dbaccess,\
|
||||
- CppunitTest_dbaccess_hsqldb_test \
|
||||
-))
|
||||
-endif
|
||||
-
|
||||
# This runs a suite of performance tests on embedded firebird and HSQLDB.
|
||||
# Instructions on running the test can be found in qa/unit/embeddedb_performancetest
|
||||
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
|
||||
@ -1,13 +0,0 @@
|
||||
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;
|
||||
}
|
||||
@ -7,6 +7,11 @@ Wed Nov 29 11:55:23 UTC 2017 - tchvatal@suse.com
|
||||
* Tons of updates
|
||||
* Collada and gltf are removed upstream
|
||||
* Online help re-integrated even better
|
||||
- Remove merged patches:
|
||||
* 0001-Adapt-getcompver.awk-to-Java-9.patch
|
||||
* 0001-This-hunk-breaks-jdk9-build.patch
|
||||
* 0002-Detect-libjawt-automatically-on-java9-too.patch
|
||||
* java-encoding.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 18 18:42:01 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.0
|
||||
%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
|
||||
# Wether to enable the kde integration
|
||||
%if 0%{?is_opensuse} && 0%{?suse_version} < 1330
|
||||
%if 0%{?is_opensuse}
|
||||
%bcond_without kdeintegration
|
||||
%else
|
||||
%bcond_with kdeintegration
|
||||
@ -89,13 +89,6 @@ Patch5: mediawiki-no-broken-help.diff
|
||||
# PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs
|
||||
Patch16: libreoffice-hotfix-disablebrokenshapetest.patch
|
||||
Patch17: gnome-documents-check-ntimeoutid.patch
|
||||
# PATCH-FIX-UPSTREAM: remove a patch hunk that breaks rhino build
|
||||
Patch100: 0001-This-hunk-breaks-jdk9-build.patch
|
||||
# PATCH-FIX-UPSTREAM: fix detection of JDK9's libjawt.so
|
||||
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
|
||||
Patch104: java-encoding.patch
|
||||
# try to save space by using hardlinks
|
||||
Patch990: install-with-hardlinks.diff
|
||||
BuildRequires: %{name}-share-linker
|
||||
@ -919,7 +912,7 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
|
||||
%prep
|
||||
%setup -q -b1 -b2
|
||||
%patch0 -p1
|
||||
#%patch0 -p1
|
||||
# The rename of the configdir is needed only on older than factory for compat
|
||||
%if 0%{?suse_version} < 1330
|
||||
%patch1
|
||||
@ -928,10 +921,6 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%patch5
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch104 -p1
|
||||
%patch990 -p1
|
||||
|
||||
# Disable some of the failing tests (some are random)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user