From patchwork Fri May 20 08:41:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roel Janssen X-Patchwork-Id: 39539 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4F8BB27BBEA; Fri, 20 May 2022 09:44:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9D67427BBE9 for ; Fri, 20 May 2022 09:44:54 +0100 (BST) Received: from localhost ([::1]:52494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nryFh-0005jA-L7 for patchwork@mira.cbaines.net; Fri, 20 May 2022 04:44:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nryCx-00046T-A9 for guix-patches@gnu.org; Fri, 20 May 2022 04:42:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43650) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nryCw-0000X8-8w for guix-patches@gnu.org; Fri, 20 May 2022 04:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nryCw-0004l9-3z for guix-patches@gnu.org; Fri, 20 May 2022 04:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55538] [PATCH] gnu: virtuoso-ose: Update to 7.2.7. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 May 2022 08:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55538 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55538@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165303611818275 (code B ref -1); Fri, 20 May 2022 08:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 May 2022 08:41:58 +0000 Received: from localhost ([127.0.0.1]:37547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nryCn-0004kS-S4 for submit@debbugs.gnu.org; Fri, 20 May 2022 04:41:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:50282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nryCk-0004kC-FN for submit@debbugs.gnu.org; Fri, 20 May 2022 04:41:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nryCk-000405-5K for guix-patches@gnu.org; Fri, 20 May 2022 04:41:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50964) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nryCj-0000WA-RB for guix-patches@gnu.org; Fri, 20 May 2022 04:41:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:To:From:Subject:in-reply-to: references; bh=id8Wzdh+tegURCnyCiGl0FP4RbmvC/EUNhu0zl0trac=; b=lcdKyB4UOnbgp0 yx4q2SncFZYflGfxCuCx/5GNidxW0+ZksdnfxLiMXTRCrhuXEWoN4bDrQr7THQp8Ub77AqVoMqRnJ /SR8/xyZoBw5Ee2Fts+jMuOWi7xrIYL65aN7dlpUNyQSrPhgH83w/nlneeMSrp8zO5qxsHPU0Nlg5 6mzIGuaLOCXpChkiVzwuldDqeSu4/ZkHRmcdCjCzKK502vSwCYDBU3giP0MD9q1sUKChcdbiMk4sT CLuJlgl4veCoGXm6Mvq40sqEn9IxTi/2iiI4CaOZSWc9o+rQciEH2EMKQZcDBpiSEgfU92erL79T4 4K7BLQYDnDcU+3c1ZWfg==; Received: from 2a02-a46b-9fc4-1-d864-ee57-c9d9-98a0.fixed6.kpn.net ([2a02:a46b:9fc4:1:d864:ee57:c9d9:98a0]:39454) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nryCj-0000dy-FG for guix-patches@gnu.org; Fri, 20 May 2022 04:41:49 -0400 Message-ID: From: Roel Janssen Date: Fri, 20 May 2022 10:41:46 +0200 User-Agent: Evolution 3.44.1 (3.44.1-1.fc36) MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Dear Guix, I'd like to update Virtuoso OSE to the latest release (see attached patch). Other than the version number and checksum bump I noticed that some JAR files made it in the build output. 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.sh script. I thought this was simpler and clearer on what's actually achieved. Kind regards, Roel Janssen From a5591def946ba8a5d9a2c5ccc3259efe9e43391c Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Fri, 20 May 2022 10:36:50 +0200 Subject: [PATCH] gnu: virtuoso-ose: Update to 7.2.7. * gnu/packages/databases.scm (virtuoso-ose): Update to 7.2.7; Remove pre-built blobs from the build output. --- gnu/packages/databases.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index feedfe68e7..03e191bab2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3229,14 +3229,14 @@ (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/" version "/" "virtuoso-opensource-" version ".tar.gz")) (sha256 - (base32 "0ly7s7a3w2a2zhhi9rq9k2qlnzapqbbc1rcdqb3zqqpgg81krz9q")))) + (base32 "1853ln0smiilf3pni70gq6nmi9ps039cy44g6b5i9d2z1n9hnj02")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; Tests require a network connection. @@ -3255,7 +3255,26 @@ (define-public virtuoso-ose (for-each (lambda (file) (delete-file (string-append lib "/" file))) '("libvirtuoso-t.a" - "libvirtuoso-t.la")))))))) + "libvirtuoso-t.la"))))) + ;; Optional bundled Java archives are copied into the build output. + ;; This phase removes them. + (add-after 'install 'remove-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) + (for-each (lambda (directory) + (delete-file-recursively + (string-append lib "/" directory))) + '("hibernate" + "jdbc-4.0" + "jdbc-4.1" + "jdbc-4.2" + "jdbc-4.3" + "jena" + "jena2" + "jena3" + "jena4" + "rdf4j" + "sesame")))))))) (inputs (list openssl net-tools readline zlib)) (home-page "http://vos.openlinksw.com/owiki/wiki/VOS/") -- 2.36.1