From 6b792019561d378c92d903d0dc53c3e9719f0fbd Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Sun, 5 Mar 2023 13:54:28 +0100 Subject: gnu: virtuoso-ose: Update to 7.2.9. * gnu/packages/databases.scm (virtuoso-ose): Update to 7.2.9; Add 'which' for the test suite. * gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch: Update patch for new version. --- gnu/packages/databases.scm | 6 ++-- .../virtuoso-ose-remove-pre-built-jar-files.patch | 42 +++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 15cae58c55..c24d067bb0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3273,14 +3273,14 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (define-public virtuoso-ose (package (name "virtuoso-ose") - (version "7.2.7") + (version "7.2.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" version "/" "virtuoso-opensource-" version ".tar.gz")) (sha256 - (base32 "1853ln0smiilf3pni70gq6nmi9ps039cy44g6b5i9d2z1n9hnj02")) + (base32 "145s4lqixdxa3j0lp9lgzbb664zzy1imw04hmgia5y5679i8r0xy")) (patches (search-patches "virtuoso-ose-remove-pre-built-jar-files.patch")) (modules '((guix build utils))) ;; This snippet removes pre-built Java archives. @@ -3353,7 +3353,7 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (native-inputs (list autoconf automake bison flex gperf libtool)) (inputs - (list openssl net-tools readline zlib)) + (list openssl net-tools readline which zlib)) (home-page "https://vos.openlinksw.com/owiki/wiki/VOS/") (synopsis "Multi-model database system") (description "Virtuoso is a scalable cross-platform server that combines diff --git a/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch b/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch index 17413c71ae..548c3c2a1d 100644 --- a/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch +++ b/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch @@ -2,14 +2,14 @@ This patch disables build targets that contain pre-built Java archives that would be copied to the build's output. Patch by Roel Janssen -*** a-virtuoso-opensource-7.2.7/binsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 ---- b-virtuoso-opensource-7.2.7/binsrc/Makefile.am 2022-05-27 12:20:52.909135774 +0200 +*** a-virtuoso-opensource-7.2.9/binsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 +--- b-virtuoso-opensource-7.2.9/binsrc/Makefile.am 2023-03-05 13:05:37.946449855 +0100 *************** *** 19,25 **** # # -! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena jena2 jena3 jena4 sesame sesame2 sesame3 sesame4 redland hibernate dbpedia rdb2rdf rdf4j +! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting graphql bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena jena2 jena3 jena4 sesame sesame2 sesame3 sesame4 redland hibernate dbpedia rdb2rdf rdf4j rdf4j_4 websocket # ---------------------------------------------------------------------- @@ -17,42 +17,41 @@ Patch by Roel Janssen # # -! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql redland dbpedia rdb2rdf +! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting graphql bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql redland dbpedia rdb2rdf websocket # ---------------------------------------------------------------------- -*** a-virtuoso-opensource-7.2.7/configure.ac 1970-01-01 01:00:01.000000000 +0100 ---- b-virtuoso-opensource-7.2.7/configure.ac 2022-05-27 12:27:51.879208018 +0200 +*** a-virtuoso-opensource-7.2.9/configure.ac 1970-01-01 01:00:01.000000000 +0100 +--- b-virtuoso-opensource-7.2.9/configure.ac 2023-03-05 13:03:01.302629421 +0100 *************** -*** 57,64 **** +*** 57,63 **** dnl AM_INIT_AUTOMAKE([1.8]) dnl AM_INIT_AUTOMAKE([1.9 tar-ustar]) dnl ! AM_INIT_AUTOMAKE([1.9 tar-ustar]) -! - AM_MAINTAINER_MODE + AM_MAINTAINER_MODE --- 57,63 ---- dnl AM_INIT_AUTOMAKE([1.8]) dnl AM_INIT_AUTOMAKE([1.9 tar-ustar]) dnl ! AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects]) - AM_MAINTAINER_MODE + AM_MAINTAINER_MODE *************** -*** 3157,3163 **** - binsrc/dbpedia/Makefile +*** 3210,3216 **** binsrc/driver/Makefile binsrc/fct/Makefile + binsrc/graphql/Makefile - binsrc/hibernate/Makefile binsrc/hosting/Makefile binsrc/hosting/mono/Makefile binsrc/hosting/mono/tests/Makefile ---- 3156,3161 ---- +--- 3210,3215 ---- *************** -*** 3169,3184 **** +*** 3222,3238 **** binsrc/hosting/ruby/Makefile binsrc/hosting/shapefileio/Makefile binsrc/isparql/Makefile @@ -66,12 +65,13 @@ Patch by Roel Janssen binsrc/rdf_mappers/Makefile binsrc/rdb2rdf/Makefile - binsrc/rdf4j/Makefile +- binsrc/rdf4j_4/Makefile binsrc/redland/Makefile binsrc/samples/demo/Makefile binsrc/samples/hslookup/Makefile ---- 3167,3177 ---- +--- 3221,3231 ---- *************** -*** 3191,3200 **** +*** 3245,3254 **** binsrc/samples/webapp/Makefile binsrc/samples/xpath/Makefile binsrc/samples/xquery/Makefile @@ -82,9 +82,9 @@ Patch by Roel Janssen binsrc/sqldoc/Makefile binsrc/sync/Makefile binsrc/tests/biftest/Makefile ---- 3184,3189 ---- +--- 3238,3243 ---- *************** -*** 3236,3245 **** +*** 3291,3300 **** docsrc/stylesheets/Makefile docsrc/xmlsource/Makefile libsrc/Dk/Makefile @@ -95,9 +95,9 @@ Patch by Roel Janssen libsrc/langfunc/Makefile libsrc/odbcsdk/Makefile libsrc/plugin/Makefile ---- 3225,3230 ---- -*** a-virtuoso-opensource-7.2.7/libsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 ---- b-virtuoso-opensource-7.2.7/libsrc/Makefile.am 2022-05-27 12:30:12.658593011 +0200 +--- 3280,3285 ---- +*** a-virtuoso-opensource-7.2.9/libsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 +--- b-virtuoso-opensource-7.2.9/libsrc/Makefile.am 2023-03-05 13:03:17.616027294 +0100 *************** *** 19,25 **** # -- cgit v1.2.3