From patchwork Fri May 2 13:51:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 42249 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 27AC127BC4B; Fri, 2 May 2025 14:52:22 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C791D27BC49 for ; Fri, 2 May 2025 14:52:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAqoA-0005QK-Mr; Fri, 02 May 2025 09:52:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAqo7-0005Px-Sh for guix-patches@gnu.org; Fri, 02 May 2025 09:52:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAqo7-0007eV-Im for guix-patches@gnu.org; Fri, 02 May 2025 09:52:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ujLzUZwAfh7A4+JPZg80FZVrYf+K5GJQArEPmLeoloc=; b=G2ecVtsiDtsmPmmRrHz86dyKUYPOXJsXauwZIgHIxbOrskQlPQCQMCi3HxUa6JJiGcgYRN8noXyZkZUJFD3S2W9dlZu2h3BaTtou7Ccl2s2vP7oHU0ZFjNXJrOFosajkSe4yUsEWbh2q0GwvquSt+6dxjIlz2TCCbh3tpWmMHWr7NtsvAOrGo1W8xwrtAHSHbkpcxuHmonlIG9mop30KdBOUdz9gKLwwLVgQnQhpYpJXicbwtXA+oiSSz/LNRn31SH7G1xzBE9uaCnU3JmZ85pjMLs0pcgx+7eprESYMniONk4bzuthnZavrqGexXWnDE4glX5IKXxWnfK0LRrVTVQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uAqo6-00044K-UA for guix-patches@gnu.org; Fri, 02 May 2025 09:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78212] [PATCH 1/2] gnu: sqlite: Update to 3.49.1. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 May 2025 13:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78212 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78212@debbugs.gnu.org Cc: Ashish SHUKLA Received: via spool by 78212-submit@debbugs.gnu.org id=B78212.174619388215386 (code B ref 78212); Fri, 02 May 2025 13:52:02 +0000 Received: (at 78212) by debbugs.gnu.org; 2 May 2025 13:51:22 +0000 Received: from localhost ([127.0.0.1]:57637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uAqnR-000406-C5 for submit@debbugs.gnu.org; Fri, 02 May 2025 09:51:21 -0400 Received: from anamika.lostca.se ([2a01:4f9:3b:505c::2]:41728) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uAqnN-0003ze-E0 for 78212@debbugs.gnu.org; Fri, 02 May 2025 09:51:18 -0400 Received: from bob.inet6.fi (bob.inet6.fi [IPv6:2a0a:4cc0:0:1325::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 786031E4FC; Fri, 2 May 2025 13:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1746193869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ujLzUZwAfh7A4+JPZg80FZVrYf+K5GJQArEPmLeoloc=; b=XMwcw/g92GzeFr/RPeMXUS9JfNHXpTnMf/8E1QlkZYXXeMjF82snUSOYcxzXZoiOkTNwQA SnGatIjulKXkLqZZq5FTUt/dOte9whv2+MCk0TMzyw0hH/Brx8G36Si4PWeUzlgRPMGorg LElsru/jfWxAUmMcyyilGur4pjkt4KA= Date: Fri, 2 May 2025 13:51:02 +0000 Message-ID: <22cae4fcdf431cda907aa00892226530471501ec.1746193607.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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: , Reply-to: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sqlite.scm (sqlite)[#:phases]: Update to check for the existence of file before patching it. * gnu/packages/sqlite.scm (sqlite-next): Update to 3.49.1. Add arguments. Change-Id: I74f8bb57090a050eb2e0c8cb5a1d4910efa714d5 --- gnu/packages/sqlite.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index dd21db0921..5b30865b08 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -38,6 +38,7 @@ (define-module (gnu packages sqlite) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix deprecation) #:use-module (ice-9 match) @@ -99,10 +100,10 @@ (define-public sqlite ;; Remove reference to the static library from the .la file ;; so that Libtool looks for it in the usual places. - (substitute* (string-append out "/lib/libsqlite3.la") - (("^old_library=.*") - "old_library=''\n")) - #t)))))) + (when (file-exists? (string-append out "/lib/libsqlite3.la")) + (substitute* (string-append out "/lib/libsqlite3.la") + (("^old_library=.*") + "old_library=''\n"))))))))) (home-page "https://www.sqlite.org/") (synopsis "The SQLite database management system") (description @@ -116,10 +117,29 @@ (define-public sqlite (define-public sqlite-next (package (inherit sqlite) - (version "3.46.0") + (version "3.49.1") + (arguments + (cons* + ;; disable tests; no check/test target + #:tests? #f + (substitute-keyword-arguments (package-arguments sqlite) + ((#:configure-flags flags #~(list)) + #~(map (lambda (flag) + (if (string-prefix? "CFLAGS=" flag) + ;; enable for fossil + (string-append flag " -DSQLITE_ENABLE_FTS4") + flag)) + #$flags)) + ((#:phases phases #~(list)) + #~(modify-phases #$phases + (add-after 'unpack 'patch-unknown-option-check + (lambda _ + (substitute* "autosetup/autosetup" + (("user-error \"Unknown option" all) + (string-append "# " all)))))))))) (source (origin (method url-fetch) - (uri (sqlite-uri version 2024)) + (uri (sqlite-uri version 2025)) (sha256 (base32 - "0zbs853s8ly693qdg0l7vs4shwn3plmvdczr2s478wsj6dxnm3kg")))))) + "0m4jnnbpypixmkz5pkss470gf6dpx5942kmn4drmyv5krkc44rhh"))))))