mcepl/swipl
SHA256
1
0
Fork 0
forked from pool/swipl
Code Pull Requests Activity

Update to 9.3.18:

Browse Source 
Complete changelog is
  https://www.swi-prolog.org/ChangeLog?branch=development&from=9.3.15&to=9.3.18
  and upstream still doesn’t provide any abbreviated version, and
  the list of changes is still too long to enumerate here.
Remove upstreamed patch:
  - 104-fix-prolog_in_java.patch
This commit is contained in:
Matej Cepl 2025-01-08 10:33:35 +01:00
parent eac5e712e4
commit 9628057073
Signed by: mcepl
GPG Key ID: 79205802880BC9D8
5 changed files with 15 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
104-fix-prolog_in_java.patch
View File

@ -1,46 +0,0 @@
---
packages/jpl/cmake/JUnit.cmake | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
--- a/packages/jpl/cmake/JUnit.cmake
+++ b/packages/jpl/cmake/JUnit.cmake
@@ -16,17 +16,28 @@
# Unfortunately GLOB ? means exactly one, so cannot use it to make the - optional!
## GLOB EXPRESSION: https://facelessuser.github.io/wcmatch/glob/
if(NOT JUNIT_JAR)
- file(GLOB JUNIT_JAR
- ${JAVA_LIB_INSTALL_DIR}/junit4.jar
- ${JAVA_LIB_INSTALL_DIR}/junit-4*.jar
- /usr/share/java/junit4.jar
- /usr/share/java/junit-4*.jar
- /usr/share/java/junit.jar
- /opt/local/share/java/junit.jar # Macport
- /opt/local/share/java/junit4.jar
- /opt/local/share/java/junit-4*.jar
- /usr/local/share/java/junit4.jar
- /usr/local/share/java/junit-4*.jar)
+ file(GLOB F_JUNIT_JAR
+ ${JAVA_LIB_INSTALL_DIR}/junit4.jar
+ ${JAVA_LIB_INSTALL_DIR}/junit-4*.jar
+ /usr/share/java/junit4.jar
+ /usr/share/java/junit-4*.jar
+ /opt/local/share/java/junit4.jar
+ /opt/local/share/java/junit-4*.jar
+ /usr/local/share/java/junit4.jar
+ /usr/local/share/java/junit-4*.jar)
+ if(NOT F_JUNIT_JAR)
+ file(GLOB F_JUNIT_JAR
+ /usr/share/java/junit.jar
+ /opt/local/share/java/junit.jar)
+ endif()
+ if(F_JUNIT_JAR)
+ list(GET F_JUNIT_JAR 0 F_JUNIT_JAR)
+ message("Found junit at ${F_JUNIT_JAR}")
+ else()
+ message("Could not find junit.jar.")
+ endif()
+ set(JUNIT_JAR ${F_JUNIT_JAR} CACHE FILEPATH
+ "junit4 jar file")
endif()
MARK_AS_ADVANCED(JUNIT_JAR)
find_file(HAMCREST

BIN
swipl-9.3.15.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
swipl-9.3.18.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

11
swipl.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jan 8 09:32:00 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
- Update to 9.3.18:
Complete changelog is
https://www.swi-prolog.org/ChangeLog?branch=development&from=9.3.15&to=9.3.18
and upstream still doesn’t provide any abbreviated version, and
the list of changes is still too long to enumerate here.
- Remove upstreamed patch:
- 104-fix-prolog_in_java.patch
-------------------------------------------------------------------
Fri Nov 22 13:31:23 UTC 2024 - Matej Cepl <mcepl@cepl.eu>

5
swipl.spec
View File

@ -17,7 +17,7 @@
Name: swipl
Version: 9.3.15
Version: 9.3.18
Release: 0
Summary: Prolog Compiler
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -26,9 +26,6 @@ Source0: https://www.swi-prolog.org/download/devel/src/swipl-%{version}.t
Source98: swipl-rpmlintrc
# For SOURCE_DATE_EPOCH variable- reproducible builds
Source99: %{name}.changes
# PATCH-FIX-UPSTREAM 104-fix-prolog_in_java.patch gh#SWI-Prolog/packages-jpl#104 mcepl@suse.com
# Fix the wrong location of hamcrest location
Patch0: 104-fix-prolog_in_java.patch
BuildRequires: cmake
BuildRequires: db-devel
BuildRequires: fdupes