From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4Of0KRprk2J52QAAbAwnHQ (envelope-from ) for ; Sun, 29 May 2022 14:46:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id kKwNKRprk2IkJQAAG6o9tA (envelope-from ) for ; Sun, 29 May 2022 14:46:18 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DD28127C6D for ; Sun, 29 May 2022 14:46:17 +0200 (CEST) Received: from localhost ([::1]:36604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvIJE-0005mM-9H for larch@yhetil.org; Sun, 29 May 2022 08:46:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvIJ0-0005kC-0I for guix-patches@gnu.org; Sun, 29 May 2022 08:46:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45683) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvIIz-0003Lr-MU for guix-patches@gnu.org; Sun, 29 May 2022 08:46:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nvIIz-0008Ef-Kl for guix-patches@gnu.org; Sun, 29 May 2022 08:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55538] [PATCH] gnu: virtuoso-ose: Update to 7.2.7. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 May 2022 12:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55538 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Roel Janssen Cc: 55538@debbugs.gnu.org, Maxim Cournoyer Received: via spool by 55538-submit@debbugs.gnu.org id=B55538.165382831631591 (code B ref 55538); Sun, 29 May 2022 12:46:01 +0000 Received: (at 55538) by debbugs.gnu.org; 29 May 2022 12:45:16 +0000 Received: from localhost ([127.0.0.1]:39580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nvII7-0008DH-O1 for submit@debbugs.gnu.org; Sun, 29 May 2022 08:45:15 -0400 Received: from flashner.co.il ([178.62.234.194]:49348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nvII2-0008CR-7e for 55538@debbugs.gnu.org; Sun, 29 May 2022 08:45:06 -0400 Received: from localhost (unknown [141.226.14.232]) by flashner.co.il (Postfix) with ESMTPSA id 5414E401AA; Sun, 29 May 2022 12:44:56 +0000 (UTC) Date: Sun, 29 May 2022 15:44:19 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Roel Janssen , Maxim Cournoyer , 55538@debbugs.gnu.org References: <875ylt4rep.fsf@gmail.com> <9b71e2c249653a74c0e039670d5a60492c9c2eb0.camel@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="om6ZJEsaEzoXc12o" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653828378; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=p/ROxEvbyMTz/lSF9ycneTRWAivda2vDEfUuzjGXWXo=; b=boU7fJ5Mn878VjIr0M9l9fTT2bH7bf9voumPlvPDx/9TZ70z9s0cncYhpZ1huu9d5zibx8 7wEzHx8BPWzSXytGcOLpfEztgsNeWexOV09hqmgdboAZipqgrGMBPUCArjkNZHrvinbGwR UB9E+luRIjvZIpxKjwkvubSLkNtym7QsigvsjPnpY+mPRk/6DVJsyyjglLxS5wl6CSY6fO RDsiPsKu7ENTo0/DAznsD5v9lHWaIZ3oNQaSJHhI4JGZ626pfUzN+qWW/SldLCX1RqZIXx XY2N45fGE+fa/qujNSfBB20QDAxTtkzX9wPuy8PQLuJ2m6qZIsMiIaKD9zFdhw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653828378; a=rsa-sha256; cv=none; b=AFSAHHuYHdiGDrO3DRvjwxB9/3UXdldq0GvOqrSKROi54atfh1bUOHO6T3yzwFFWSrXQzl BSa6xW4+UW1GGla3WEkkeb3qT/RvJTMwDgSQ0HsqWF04f0DGdOLAtb36BdhNBj60D8KxtZ JOkraQEsSf2uoxpQL+GJSahguY6tWDlKwAbYilzaJyr3Xt8wPo0soc30vxrPB91/W7tmz9 TouEzlpbk3yvztUEdTyg44bD3+6fMIeuFR+3FTulbZi1XtM177fuib+KF3Q6ayrs7YmTjc vT//twMc+Sf5jsBCVm+hYQozAD9v5VT3FRhFCkTFUgGzAiZEjGqeJAfyG6FsWA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.94 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: DD28127C6D X-Spam-Score: -5.94 X-Migadu-Scanner: scn0.migadu.com X-TUID: /33n6Q5XicnU --om6ZJEsaEzoXc12o Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, May 27, 2022 at 12:47:18PM +0200, Roel Janssen wrote: > On Wed, 2022-05-25 at 17:51 +0200, Roel Janssen wrote: > > On Wed, 2022-05-25 at 10:29 -0400, Maxim Cournoyer wrote: > > > Hi Roel, > > >=20 > > > Roel Janssen writes: > > >=20 > > > > Dear Guix, > > > >=20 > > > > I'd like to update Virtuoso OSE to the latest release (see attached= patch). > > > >=20 > > > > Other than the version number and checksum bump I noticed that some= JAR files made it in the > > > > build > > > > output.=C2=A0 I tried removing them from the source tarball using a= snippet, but then one needs to > > > > include a patch for various Makefile.am files and run the autogen.s= h script.=C2=A0 I thought this > > > > was > > > > simpler and clearer on what's actually achieved. > > >=20 > > > I fear in the future it would be easy to overlook the introduction of > > > extra bundled jars in the source, that'd get installed.=C2=A0 I feel = it'd be > > > preferable if we removed them all from a source snippet, at the cost = of > > > having to patch the build system (the extra complications you > > > mentioned). > > >=20 > > > Could you try it and send a revised patch? > > >=20 > >=20 > > Thank you for taking a look at it! To be fair, what the patches would d= o, would be to avoid > > including the directories that I remove. So removing the current pre-bu= ilt binaries in a snippet > > will be equally error-prone. > >=20 > > But I agree that you would preferably want to have a source tarball wit= hout pre-built binaries in > > it > > when running `guix build -S virtuoso-ose`. > >=20 > > A naive patch leads to the build getting stuck, so I need to investigat= e the impact further. > > I'll report back when I have adapted the patch. > >=20 > > THank you again for your time! >=20 > I attached an updated patch that removes the pre-built binaries in a snip= pet. It then removes these > directories from the build system which in turn requires one to re-run au= togen.sh. >=20 > Kind regards, > Roel Janssen >=20 > From 1f3b9db55cac790711ece613f5ebeb51474764a7 Mon Sep 17 00:00:00 2001 > From: Roel Janssen > Date: Fri, 27 May 2022 12:40:46 +0200 > Subject: [PATCH] gnu: virtuoso-ose: Update to 7.2.7. >=20 > * gnu/packages/databases.scm (virtuoso-ose): Update to 7.2.7; Run autogen > after applying the patch below. > * gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch: > New file. > --- > gnu/packages/databases.scm | 26 +++- > ...tuoso-ose-remove-pre-built-jar-files.patch | 117 ++++++++++++++++++ > 2 files changed, 141 insertions(+), 2 deletions(-) > create mode 100644 gnu/packages/patches/virtuoso-ose-remove-pre-built-ja= r-files.patch >=20 > diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm > index 2161340ef9..58b6dd088c 100644 > --- a/gnu/packages/databases.scm > +++ b/gnu/packages/databases.scm > @@ -100,6 +100,7 @@ (define-module (gnu packages databases) > #:use-module (gnu packages gnome) > #:use-module (gnu packages gnupg) > #:use-module (gnu packages golang) > + #:use-module (gnu packages gperf) > #:use-module (gnu packages gtk) > #:use-module (gnu packages guile) > #:use-module (gnu packages icu4c) > @@ -3229,14 +3230,30 @@ (define-public python-lmdb > (define-public virtuoso-ose > (package > (name "virtuoso-ose") > - (version "7.2.6") > + (version "7.2.7") > (source > (origin > (method url-fetch) > (uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" ver= sion "/" > "virtuoso-opensource-" version ".tar.gz")) > (sha256 > - (base32 "0ly7s7a3w2a2zhhi9rq9k2qlnzapqbbc1rcdqb3zqqpgg81krz9q"))= )) > + (base32 "1853ln0smiilf3pni70gq6nmi9ps039cy44g6b5i9d2z1n9hnj02")) > + (patches (search-patches "virtuoso-ose-remove-pre-built-jar-files= =2Epatch")) > + (modules '((guix build utils))) > + ;; This snippet removes pre-built Java archives. > + (snippet > + '(begin > + (delete-file-recursively "libsrc/JDBCDriverType4") > + (delete-file-recursively "binsrc/hibernate") > + (delete-file-recursively "binsrc/jena") > + (delete-file-recursively "binsrc/jena2") > + (delete-file-recursively "binsrc/jena3") > + (delete-file-recursively "binsrc/jena4") > + (delete-file-recursively "binsrc/rdf4j") > + (delete-file-recursively "binsrc/sesame") > + (delete-file-recursively "binsrc/sesame2") > + (delete-file-recursively "binsrc/sesame3") > + (delete-file-recursively "binsrc/sesame4"))))) how about (for-each delete-file-recursively (list "libsrc/JDBCDriverType4" "binsrc/hibernate" ...)) > (build-system gnu-build-system) > (arguments > `(#:tests? #f ; Tests require a network connection. > @@ -3247,6 +3264,9 @@ (define-public virtuoso-ose > "--enable-static=3Dno") > #:phases > (modify-phases %standard-phases > + (add-before 'configure 'autogen > + (lambda _ > + (invoke "./autogen.sh"))) This would probably be better as (replace 'bootstrap > ;; Even with "--enable-static=3Dno", "libvirtuoso-t.a" is left = in > ;; the build output. The following phase removes it. > (add-after 'install 'remove-static-libs > @@ -3256,6 +3276,8 @@ (define-public virtuoso-ose > (delete-file (string-append lib "/" file))) > '("libvirtuoso-t.a" > "libvirtuoso-t.la")))))))) > + (native-inputs > + (list autoconf automake libtool bison flex gperf)) That's more than I expected! > (inputs > (list openssl net-tools readline zlib)) > (home-page "http://vos.openlinksw.com/owiki/wiki/VOS/") > diff --git a/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files= =2Epatch b/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.pat= ch > new file mode 100644 > index 0000000000..17413c71ae > --- /dev/null > +++ b/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch > @@ -0,0 +1,117 @@ > +This patch disables build targets that contain pre-built Java archives t= hat > +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.0= 00000000 +0100 > +--- b-virtuoso-opensource-7.2.7/binsrc/Makefile.am 2022-05-27 12:20:52.9= 09135774 +0200 > +*************** > +*** 19,25 **** > + # =20 > + # =20 > + =20 > +! SUBDIRS =3D dav mono virtuoso tests rdf_mappers driver maildrop sqldoc= hosting bpel fct tutorial conductor samples vsp ws sync vspx vad cached_re= sources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparq= l jena jena2 jena3 jena4 sesame sesame2 sesame3 sesame4 redland hibernate d= bpedia rdb2rdf rdf4j > + =20 > + =20 > + # --------------------------------------------------------------------= -- > +--- 19,25 ---- > + # =20 > + # =20 > + =20 > +! SUBDIRS =3D dav mono virtuoso tests rdf_mappers driver maildrop sqldoc= hosting bpel fct tutorial conductor samples vsp ws sync vspx vad cached_re= sources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparq= l redland dbpedia rdb2rdf > + =20 > + =20 > + # --------------------------------------------------------------------= -- > +*** a-virtuoso-opensource-7.2.7/configure.ac 1970-01-01 01:00:01.0000000= 00 +0100 > +--- b-virtuoso-opensource-7.2.7/configure.ac 2022-05-27 12:27:51.8792080= 18 +0200 > +*************** > +*** 57,64 **** > + dnl AM_INIT_AUTOMAKE([1.8]) > + dnl AM_INIT_AUTOMAKE([1.9 tar-ustar]) > + dnl > +! AM_INIT_AUTOMAKE([1.9 tar-ustar]) > +!=20 > + AM_MAINTAINER_MODE > + =20 > + =20 > +--- 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 > + =20 > + =20 > +*************** > +*** 3157,3163 **** > + binsrc/dbpedia/Makefile > + binsrc/driver/Makefile > + binsrc/fct/Makefile > +- binsrc/hibernate/Makefile > + binsrc/hosting/Makefile > + binsrc/hosting/mono/Makefile > + binsrc/hosting/mono/tests/Makefile > +--- 3156,3161 ---- > +*************** > +*** 3169,3184 **** > + 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/redland/Makefile > + binsrc/samples/demo/Makefile > + binsrc/samples/hslookup/Makefile > +--- 3167,3177 ---- > +*************** > +*** 3191,3200 **** > + 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 > +--- 3184,3189 ---- > +*************** > +*** 3236,3245 **** > + 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 > +--- 3225,3230 ---- > +*** a-virtuoso-opensource-7.2.7/libsrc/Makefile.am 1970-01-01 01:00:01.0= 00000000 +0100 > +--- b-virtuoso-opensource-7.2.7/libsrc/Makefile.am 2022-05-27 12:30:12.6= 58593011 +0200 > +*************** > +*** 19,25 **** > + # =20 > + # =20 > + =20 > +! SUBDIRS =3D util zlib odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.ne= w JDBCDriverType4 > + =20 > + noinst_HEADERS =3D Dk.h libutil.h > + =20 > +--- 19,25 ---- > + # =20 > + # =20 > + =20 > +! SUBDIRS =3D util zlib odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.new > + =20 > + noinst_HEADERS =3D Dk.h libutil.h > + =20 > --=20 > 2.36.1 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --om6ZJEsaEzoXc12o Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmKTaqAACgkQQarn3Mo9 g1FVuA/+KcEnsKqoFjGWefbU+A9YWgRRMaB/WhopFfLtrtWxzNndGgrkL69kSAEY yu9kIgWW9XpD1S/iEYrVQXVNrt5J4TkFClLTyo0FpEn10ALS8uIv1E73AMxZQ5r8 bROsxcg7UxIncX98WCEPwEVPV1XRXaK8Mb8pdpdWzzVJhb3USKQ0B2q3o6iLRdsY wiLRcOU6EuCnTmwhcscvSzL+HNvxfXFSkWPcghLf9zwPwb3g2Bu2/JPScS5DSfAF YnHcTj8NBPgHwhbmldZnXTO1A8Zu9IZvI+oKogjwf90kdhHZpid05ySqPfQQP+Kh S3Weka+iN8AkSXpgqvINVZ3LC2rWyU9BNtUZ0JSry3XU5u5Xqw6hGu2iNfLKKgPd j85KTBOsw8+q73Oz8avKdau0vsG2cIBV2VNSjTeivzffmFrmkLGcT6dJIEEm/ZxG gIfh3qa2TQO1NPih0b52jDZ15V+Qbk1Ifpz7YAq7pTjBdQY6xlGlLuzqvtNccZnY 9DdGtUh2nUXOS172LuF+GfQnTQiCr/YKQpRkXddKdEXNRQ8y105/wpSI4iDLsmV1 wqkD0SQGAvHk/At4B1J1ktEPdoOb+SZg0Zu3MM6ck+EtPrQ50a0YkjCb5KtFZVrO sTs73TonyO3utP1R95/moiqwJ52blUcgaQ+VnoRtZwQxycoO38Y= =mbJt -----END PGP SIGNATURE----- --om6ZJEsaEzoXc12o--