Page MenuHomeSolus
Files F11047883

D9028.id21708.diff
No OneTemporary
Actions

D9028.id21708.diff
View Options

diff --git a/files/Use-openjdk-8.patch b/files/0001-fix-jdk-search-and-use-java-11.patch
rename from files/Use-openjdk-8.patch
rename to files/0001-fix-jdk-search-and-use-java-11.patch
--- a/files/Use-openjdk-8.patch
+++ b/files/0001-fix-jdk-search-and-use-java-11.patch
@@ -1,14 +1,14 @@
-From a659f7297968befcbc25403fa54abc1aecdba43b Mon Sep 17 00:00:00 2001
-From: Fabio Forni <livingsilver94.solus@redaril.me>
-Date: Thu, 7 May 2020 22:58:13 +0200
-Subject: [PATCH] Use openjdk-8
+From 1a1882e7731dfdb25a572b8ccf65fc72b0296939 Mon Sep 17 00:00:00 2001
+From: Campbell Jones <git@serebit.com>
+Date: Mon, 8 Jun 2020 19:58:01 -0400
+Subject: [PATCH] fix jdk search and use java 11
---
- projectlibre_build/resources/projectlibre.sh | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
+ projectlibre_build/resources/projectlibre | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
-diff --git a/projectlibre_build/resources/projectlibre.sh b/projectlibre_build/resources/projectlibre.sh
-index babfd31..3c86396 100755
+diff --git a/projectlibre_build/resources/projectlibre b/projectlibre_build/resources/projectlibre
+index 9f38901..c460cc1 100755
--- a/projectlibre_build/resources/projectlibre
+++ b/projectlibre_build/resources/projectlibre
@@ -56,15 +56,21 @@
@@ -16,7 +16,7 @@
#*******************************************************************************
-CONF_DIR="$HOME/.projectlibre"
-+if [ -d $XDG_CONFIG_HOME ]; then
++if [ -d "$XDG_CONFIG_HOME" ]; then
+ CONF_DIR="$XDG_CONFIG_HOME/projectlibre"
+else
+ CONF_DIR="$HOME/.config/projectlibre"
@@ -30,7 +30,7 @@
RUN_CONF="$CONF_DIR/run.conf"
VERSION_FILE="$CONF_DIR/java-version"
-JAVA_INSTALL_DIR="/usr/java"
-+JAVA_INSTALL_DIR="/usr/lib64/openjdk-8"
++JAVA_INSTALL_DIR="/usr/lib64/openjdk-11"
JAVA_INSTALL_DIR_EXE="bin/java"
-JAVA_INSTALL_DIR2="/usr/lib/jvm"
-JAVA_INSTALL_DIR_EXE2="bin/java"
@@ -39,6 +39,15 @@
MIN_JAVA_VERSION="6"
#Default conf values
+@@ -239,7 +245,7 @@ if [ "$JAVA_OK" -eq "0" ]; then
+ check_java "$J"
+ fi
+ if [ "$JAVA_OK" -eq "0" ]; then
+- J="$JAVA_INSTALL_DIR/default/$JAVA_INSTALL_DIR_EXE"
++ J="$JAVA_INSTALL_DIR/$JAVA_INSTALL_DIR_EXE"
+ if [ -x "$J" ]; then
+ check_java "$J"
+ fi
--
-2.26.2
+2.27.0
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : projectlibre
version : 1.9.1
-release : 5
+release : 6
source :
- git|https://git.code.sf.net/p/projectlibre/code : a4f188f47459206c8c30219727f13f8ca2735cc7
homepage : https://www.projectlibre.com/
@@ -12,9 +12,9 @@
builddeps :
- apache-ant
rundeps :
- - openjdk-8
+ - openjdk-11
setup : |
- %patch -p1 < $pkgfiles/Use-openjdk-8.patch
+ %patch -p1 < $pkgfiles/0001-fix-jdk-search-and-use-java-11.patch
build : |
cd projectlibre_build
ant dir
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>projectlibre</Name>
<Homepage>https://www.projectlibre.com/</Homepage>
<Packager>
- <Name>Fabio Forni</Name>
- <Email>livingsilver94.solus@redaril.me</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Packager>
<License>CPAL-1.0</License>
<PartOf>office</PartOf>
@@ -31,12 +31,12 @@
</Files>
</Package>
<History>
- <Update release="5">
- <Date>2020-05-07</Date>
+ <Update release="6">
+ <Date>2020-06-09</Date>
<Version>1.9.1</Version>
<Comment>Packaging update</Comment>
- <Name>Fabio Forni</Name>
- <Email>livingsilver94.solus@redaril.me</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 3:55 PM (3 h, 5 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5813111
Default Alt Text
D9028.id21708.diff (3 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.