mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: virtuoso-ose: Update to 7.2.15.
* gnu/packages/databases.scm (virtuoso-ose): Update to 7.2.15. [source]<patches>: Remove virtuoso-ose-remove-pre-built-jar-files.patch. <snippet>: Update snippet to simply delete all prebuilt Java archives. [arguments]<phases>: Remove the custom 'bootstrap phase. <phases>: Update list of files in 'avoid-embedding-kernel-and-timestamps phase. [native-inputs]: Add python. * gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove patch. Change-Id: I35677732e80e17a9115a910c921f4f167b6d9b3b Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
parent
371904f0b7
commit
28a1649927
3 changed files with 5 additions and 143 deletions
|
@ -2452,7 +2452,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/vcmi-disable-privacy-breach.patch \
|
||||
%D%/packages/patches/vinagre-newer-freerdp.patch \
|
||||
%D%/packages/patches/vinagre-newer-rdp-parameters.patch \
|
||||
%D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \
|
||||
%D%/packages/patches/vsearch-unbundle-cityhash.patch \
|
||||
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
|
||||
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
|
||||
|
|
|
@ -4067,30 +4067,19 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
|
|||
(define-public virtuoso-ose
|
||||
(package
|
||||
(name "virtuoso-ose")
|
||||
(version "7.2.11")
|
||||
(version "7.2.15")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" version "/"
|
||||
"virtuoso-opensource-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0mk25gr1pafmps4nsydjprwswbzwch8b583nlwh7x2031sz7ald1"))
|
||||
(patches (search-patches "virtuoso-ose-remove-pre-built-jar-files.patch"))
|
||||
(base32 "1nz6kddwxz5k79g3skj7y45f0l20m8fh8haw42j313xm177xpdp0"))
|
||||
(modules '((guix build utils)))
|
||||
;; This snippet removes pre-built Java archives.
|
||||
(snippet
|
||||
#~(for-each delete-file-recursively
|
||||
(list "binsrc/hibernate"
|
||||
"binsrc/jena"
|
||||
"binsrc/jena2"
|
||||
"binsrc/jena3"
|
||||
"binsrc/jena4"
|
||||
"binsrc/rdf4j"
|
||||
"binsrc/sesame"
|
||||
"binsrc/sesame2"
|
||||
"binsrc/sesame3"
|
||||
"binsrc/sesame4"
|
||||
"libsrc/JDBCDriverType4")))))
|
||||
(find-files "." "\\.jar$")))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -4103,9 +4092,6 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
|
|||
"--enable-static=no")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
(invoke "sh" "autogen.sh")))
|
||||
(add-after 'unpack 'avoid-embedding-kernel-and-timestamps
|
||||
;; For a reproducible build, avoid embedding the kernel version and
|
||||
;; timestamps.
|
||||
|
@ -4124,15 +4110,9 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
|
|||
"appsrc/ODS-FeedManager/make_vad.sh"
|
||||
"appsrc/ODS-Bookmark/make_vad.sh"
|
||||
"appsrc/ODS-Addressbook/make_vad.sh"
|
||||
"binsrc/dbpedia/make_vad.sh"
|
||||
"binsrc/samples/demo/make_vad.sh"
|
||||
"binsrc/samples/demo/mkdoc.sh"
|
||||
"binsrc/samples/sparql_demo/make_vad.sh"
|
||||
"binsrc/bpel/make_vad.sh"
|
||||
"binsrc/fct/make_vad.sh"
|
||||
"binsrc/rdf_mappers/make_vad.sh"
|
||||
"binsrc/isparql/make_vad.sh"
|
||||
"binsrc/conductor/mkvad.sh")
|
||||
"binsrc/rdf_mappers/make_vad.sh")
|
||||
(("^UNAME_SYSTEM=.*") "UNAME_SYSTEM=unknown\n")
|
||||
(("^UNAME_RELEASE=.*") "UNAME_RELEASE=unknown\n")
|
||||
(("^PACKDATE=.*") "PACKDATE=2012-04-18\n")
|
||||
|
@ -4147,7 +4127,7 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
|
|||
'("libvirtuoso-t.a"
|
||||
"libvirtuoso-t.la")))))))
|
||||
(native-inputs
|
||||
(list autoconf automake bison flex gperf libtool))
|
||||
(list autoconf automake bison flex gperf libtool python))
|
||||
(inputs
|
||||
(list openssl net-tools readline which zlib))
|
||||
(home-page "https://vos.openlinksw.com/owiki/wiki/VOS/")
|
||||
|
|
|
@ -1,117 +0,0 @@
|
|||
This patch disables build targets that contain pre-built Java archives that
|
||||
would be copied to the build's output.
|
||||
|
||||
Patch by Roel Janssen <roel@gnu.org>
|
||||
*** 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 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
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
--- 19,25 ----
|
||||
#
|
||||
#
|
||||
|
||||
! 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.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,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
|
||||
|
||||
--- 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
|
||||
|
||||
***************
|
||||
*** 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
|
||||
--- 3210,3215 ----
|
||||
***************
|
||||
*** 3222,3238 ****
|
||||
binsrc/hosting/ruby/Makefile
|
||||
binsrc/hosting/shapefileio/Makefile
|
||||
binsrc/isparql/Makefile
|
||||
- binsrc/jena/Makefile
|
||||
- binsrc/jena2/Makefile
|
||||
- binsrc/jena3/Makefile
|
||||
- binsrc/jena4/Makefile
|
||||
binsrc/maildrop/Makefile
|
||||
binsrc/mono/Makefile
|
||||
binsrc/oat/Makefile
|
||||
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
|
||||
--- 3221,3231 ----
|
||||
***************
|
||||
*** 3245,3254 ****
|
||||
binsrc/samples/webapp/Makefile
|
||||
binsrc/samples/xpath/Makefile
|
||||
binsrc/samples/xquery/Makefile
|
||||
- binsrc/sesame/Makefile
|
||||
- binsrc/sesame2/Makefile
|
||||
- binsrc/sesame3/Makefile
|
||||
- binsrc/sesame4/Makefile
|
||||
binsrc/sqldoc/Makefile
|
||||
binsrc/sync/Makefile
|
||||
binsrc/tests/biftest/Makefile
|
||||
--- 3238,3243 ----
|
||||
***************
|
||||
*** 3291,3300 ****
|
||||
docsrc/stylesheets/Makefile
|
||||
docsrc/xmlsource/Makefile
|
||||
libsrc/Dk/Makefile
|
||||
- libsrc/JDBCDriverType4/Makefile
|
||||
- libsrc/JDBCDriverType4/testsuite_4.0/Makefile
|
||||
- libsrc/JDBCDriverType4/virtuoso/jdbc/Makefile
|
||||
- libsrc/JDBCDriverType4/virtuoso/Makefile
|
||||
libsrc/langfunc/Makefile
|
||||
libsrc/odbcsdk/Makefile
|
||||
libsrc/plugin/Makefile
|
||||
--- 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 ****
|
||||
#
|
||||
#
|
||||
|
||||
! SUBDIRS = util zlib odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.new JDBCDriverType4
|
||||
|
||||
noinst_HEADERS = Dk.h libutil.h
|
||||
|
||||
--- 19,25 ----
|
||||
#
|
||||
#
|
||||
|
||||
! SUBDIRS = util zlib odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.new
|
||||
|
||||
noinst_HEADERS = Dk.h libutil.h
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue