From patchwork Mon Apr 28 14:43:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 42104 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 2DB0327BC4B; Mon, 28 Apr 2025 15:44:18 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 85B8027BC49 for ; Mon, 28 Apr 2025 15:44:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9PiG-00019u-Fa; Mon, 28 Apr 2025 10:44:04 -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 1u9PiF-00019j-8v for guix-patches@gnu.org; Mon, 28 Apr 2025 10:44: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 1u9PiF-0002vh-06 for guix-patches@gnu.org; Mon, 28 Apr 2025 10:44: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=jfSEtZW9xr3PHNr3bHEve65VNdJMXg0sJLFZH7sF0j8=; b=XVljE6vkpl/YkGF6s7x6ED2OcysK50MkG2v78s76bQreyedBrF97MXlxyy5sAvZBpOfl2bEJgo2f8C7+r0a8kDat4+z5Q/dP1D15Lw37HEcNSErj8BhQkvlPsnu77iNTS/qaScRaqQBpf9YZbhcADEdyRh+G2ook6ymxz5g12pdGIdFrhdopBO+8RIJqH4FKAApuiO21U01lr+VxQjPIhak5TyIgkncGfdckd1FeNBXs4Uh2UcRLieXnCIGZ97jO6oQ7kxHk0K5BFgCe4KFJzxWM6TP5Dqnb7pn8OkRfi6RAElM2vbVr+Hk9f+51e4wCx7AciSD8ShpUmZmdS/x7Cg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9PiE-0007Jh-PL for guix-patches@gnu.org; Mon, 28 Apr 2025 10:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78119] [PATCH 1/1] gnu: xapian: Update to 1.4.29. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Apr 2025 14:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78119 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78119@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 78119-submit@debbugs.gnu.org id=B78119.174585140027850 (code B ref 78119); Mon, 28 Apr 2025 14:44:02 +0000 Received: (at 78119) by debbugs.gnu.org; 28 Apr 2025 14:43:20 +0000 Received: from localhost ([127.0.0.1]:58941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9PhX-0007F7-9M for submit@debbugs.gnu.org; Mon, 28 Apr 2025 10:43:19 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:58408) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9PhU-0007Ec-7D for 78119@debbugs.gnu.org; Mon, 28 Apr 2025 10:43:17 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-39c1ef4acf2so3664825f8f.0 for <78119@debbugs.gnu.org>; Mon, 28 Apr 2025 07:43:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745851390; x=1746456190; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jfSEtZW9xr3PHNr3bHEve65VNdJMXg0sJLFZH7sF0j8=; b=ZW+npySTaIybOAAjRakDFCd315IrMdIRPvMi6ahiLhUUGrKSpSyC6knA6/vQ0YV4wf IuCK28loqp1AT/Bpuj4xu6Lqpi2hW9Ot9wzea2wrlHIw7mKzg7fVUaU3HIhyFbW0Jolw TrTMsSUGi//ZqNzYkDBm4iHslUmMxirDOyfdgh03YBXGhabkJupAGEWxCrGZyOYsoJZe 2omO8jSDzFdQ4FksNHmIU8VRysQUVFdi3UQf7YHXmbwZ9OSDiGRL/lYEXFCZS6n3lG8J d1n0DsJemNz3QCQb0ziPAv06aI/ZPTr3dikLf2DYVwIVMMc2sboVZjdltlHMg9kwNK+0 d4rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745851390; x=1746456190; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jfSEtZW9xr3PHNr3bHEve65VNdJMXg0sJLFZH7sF0j8=; b=HVU9nFMZVIGHxN9Ts3L+xaLDiHLSAbxJ/Cm6rlWl5ikDCz9EIwo6t8Ln/6EmB7A5Tl oyDVlyWVwpIwXbBOZtPZalRZ2ziE60n/sW+Jo9CrSF4KgzaZO8IG2NiMYlI7ujMEVcAR kCKNMCECSXo7xth8hXQ10M0IBBIFrcjWnw/f84bJuh+TM7LSD7fhGsqAGzWcSL+pjo5G xjQ/GikrBDAYVAO/bKj39zcQaPe847I1nRbv/KxE+41EPXfcgOsg2wXBEBs/yWoPbUKF puSaYRPIKLMFV/tXbM9ZKUe+6MEp350b4sU9dhx3Stia/oDkZ3D57VyTpngiWfRnWXbD Wvhg== X-Gm-Message-State: AOJu0Yzp/wKLu2XZl427jlm/LveFqabgjrUOOT+kRy+/mu2K230d3UH2 /jLbB9iyQ0z3kH8JzWbleQNeDUEWmU6zhzX/aHqIf6IlWs9YisDMz1i/iNF8 X-Gm-Gg: ASbGncvvTr/6xM3zRs+4dts3fy7o3Frz1bIa07Yga2uc26Uwr5TF1Ij3epUDLUHgPiV BA/OkxuHPv8yk0k7r5gs97UZ1RNZtzaSSBEunJj293BG0yaLwMcKhyEZn2a5pgQFtLDtMyp9TbU fYhgrKf56OEOmbV1OSkV8pAEXmat2tlvZitSa9ElAunyODxPXUDAKdmuqwmKnUZe7i7MD5O9R95 wrum6lzBvEAJOsGodg0gTVMJg1QV83bT2WXKbIU/CuTpAuqc4Qcpjx9ClWrdUi6nQv5QyTbxJKg i3V0QqsZcUlN6wS4bL7JJmUX+UqtuHWFfL5IrvWY0zjK6+tpyC9NqYBKNSuyWxJW2GZZV/V3SX/ LTlAHa4qo5wyupZIqjIgq/7zCKMgueHDpKur/ X-Google-Smtp-Source: AGHT+IGPGUfi+SnF2MUI4a+w+JcJoevRyCDjDUEWsriOTYEiN3uBAZHQtdnAHyCMcNZJCFub3CFPsA== X-Received: by 2002:a05:6000:1447:b0:39e:cbf2:e23f with SMTP id ffacd0b85a97d-3a088f6e559mr134368f8f.0.1745851389906; Mon, 28 Apr 2025 07:43:09 -0700 (PDT) Received: from localhost.localdomain (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073ca5225sm11538057f8f.33.2025.04.28.07.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 07:43:09 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 28 Apr 2025 15:43:05 +0100 Message-ID: <2d1922efa170de0fbe1cf90b341977d41133df66.1745851028.git.sharlatanus@gmail.com> 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: , 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 As omega and python-xapian-bindings inherit the same version as xapian, update them in a single commit. * gnu/packages/search.scm (xapian): Update to 1.4.29. (python-xapian-bindings): Update to 1.4.29. (omega): Update to 1.4.29. [inputs]: Remove pcre:bin; add file, pcre2, perl, xapian, and zlib. [native-inputs]: Add pkg-config. Change-Id: I9a6103135b7b9a116370b211b3ca4eb15a9bff4f --- gnu/packages/search.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 08f0278194..406a97d9df 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2023 Adam Faiz ;;; Copyright © 2023 David Pflug ;;; Copyright © 2024, 2025 Ashish SHUKLA +;;; Copyright © 2025 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ (define-module (gnu packages search) #:use-module (gnu packages databases) #:use-module (gnu packages ebook) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -82,7 +84,7 @@ (define-module (gnu packages search) (define-public xapian (package (name "xapian") - (version "1.4.19") + (version "1.4.29") ;; Note: When updating Xapian, remember to update omega and ;; python-xapian-bindings below. (source (origin @@ -90,7 +92,7 @@ (define-public xapian (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) (sha256 - (base32 "1hx92kbqdl38gsrwzvbqgf2jc4wwzsad2gd99g62cdfclvy4ijhz")))) + (base32 "1g11wps45rgh7a7z0zmsvk6vg2i1ih4cmbwf44nfrlrsc749np65")))) (build-system gnu-build-system) (inputs (list zlib `(,util-linux "lib"))) @@ -129,10 +131,12 @@ (define-public omega "/xapian-omega-" version ".tar.xz")) (sha256 (base32 - "136dsna6jvq48j4x4rr5y9nxmgrif9kvf4ybl5a6gpsmgqlfzcp4")))) + "0gpq1k1fanx2vpj0xrmkdafacn2r5qsf57201ax4skkb96flxfjg")))) (build-system gnu-build-system) + (native-inputs + (list pkg-config)) (inputs - (list (list pcre "bin") perl xapian zlib)) + (list file pcre2 perl xapian zlib)) (home-page "https://xapian.org/") (synopsis "Search engine built on Xapian") (description @@ -157,7 +161,7 @@ (define-public python-xapian-bindings "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 - "0gc8l9cn8jdma0p73jl14z17yizp6dax5zsycvgprajii6j8bhwi")))) + "1kn8dw0zrlxvc417wmqmdkqz76kw3f5802wsv5kyyl38pckyjh0p")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3")