From patchwork Sun Jan 21 13:54:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 59266 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 92D0727BBE9; Sun, 21 Jan 2024 13:55:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 1D8DD27BBE2 for ; Sun, 21 Jan 2024 13:55:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRYHs-0005OS-Qr; Sun, 21 Jan 2024 08:55:00 -0500 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 1rRYHq-0005Np-SF for guix-patches@gnu.org; Sun, 21 Jan 2024 08:54:59 -0500 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 1rRYHq-0005bg-I5 for guix-patches@gnu.org; Sun, 21 Jan 2024 08:54:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRYHt-0002Oq-V9 for guix-patches@gnu.org; Sun, 21 Jan 2024 08:55:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68606] [PATCH v2 1/3] gnu: gdal: Update to 3.8.3. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 13:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68606 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68606@debbugs.gnu.org Cc: Roman Scherer Received: via spool by 68606-submit@debbugs.gnu.org id=B68606.17058452819164 (code B ref 68606); Sun, 21 Jan 2024 13:55:01 +0000 Received: (at 68606) by debbugs.gnu.org; 21 Jan 2024 13:54:41 +0000 Received: from localhost ([127.0.0.1]:36781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYHY-0002Ne-Br for submit@debbugs.gnu.org; Sun, 21 Jan 2024 08:54:40 -0500 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:47172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYHT-0002NE-Jo for 68606@debbugs.gnu.org; Sun, 21 Jan 2024 08:54:38 -0500 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a26ed1e05c7so241695966b.2 for <68606@debbugs.gnu.org>; Sun, 21 Jan 2024 05:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20230601.gappssmtp.com; s=20230601; t=1705845266; x=1706450066; 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=bFbLT3lv6YbszcBzmFo+OM9TM4n5emKDp7E5LQoXdpc=; b=Rl9+jcZnBnBFGoCVCWko1CZfoY0HGGq7niJ3lLuLFuhNF89lG0Bl5cbA2a5CvF4zjx jXyH8SzV/bOPylipalK0q++lV5TwguoFDfJ0HzsoBTn3bSIuyfgmqXYwrlNkR/KVciDb xqXNPsv4hfp8oeuJ1PUWjqAyjhIR0iEhZCZbhOPaMM/jvjwgTliQPVDAzoBcn7/Vx+va wZCzRiAbzqW6MnQAIPR1Mj5c/Lg52ZXxMHVct+aeWZFRCwQgahsWhBautOHAj66Xy70T e90JkMbttLDWM8liXaadvJLqZ6prdOgTOT3MM9XD+S6SzT1vHv18Ng9JMn6M1ILz0SfS tSoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705845266; x=1706450066; 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=bFbLT3lv6YbszcBzmFo+OM9TM4n5emKDp7E5LQoXdpc=; b=rprXdXV405DxtnQy9BHNMkecCccJ7jgI6Xx0PGrD4r/NrArwXSwAGpYFSpywg9UE4p CE3L02ZUznY2UYYu7Tju+dM2CP4gaiahAci57Pk8WmOl0n+WVi5gL1RWUfLz8/0Zf9Fw 6PCOSkphyEE/72bRt429POXf6CXff/FVg4kACyVOFIG/8Zv9XiqIt1cf5FcNpeeV4kC5 sdNFuyzev6ucNeKO9HlAyQ1xxH7gRLwwbtFucksq+fiOHF2O/Qa3BXn2AZh7zclqzt+j DDFddP+BsUKJZhBIzW1olTSZycfWAtRrVRTy00+DnWjwNrekNr2CFa6DN2iONYihsjTa I/KA== X-Gm-Message-State: AOJu0YwPsRK1R/lRxhp+Rg0FGKhvo+UsKnCNAxascrb/XOGA68oCx2ne UKLkvvYJp/Ct7d+ScsSqzW2sntG0B8X6w+qfbx3B7U16n8xEmAwlRPUjTzsjKdF5u5MZIwM7SbD l X-Google-Smtp-Source: AGHT+IF7opPfviCyraZEUY0tq+k0mYau0QzUoj4w2pQKZTxcdRoEY28EMDUatWj5404O1WRBev2nmg== X-Received: by 2002:a17:907:1b08:b0:a28:fdd1:fda8 with SMTP id mp8-20020a1709071b0800b00a28fdd1fda8mr1053706ejc.119.1705845265889; Sun, 21 Jan 2024 05:54:25 -0800 (PST) Received: from localhost.localdomain ([2a01:599:11f:5875:762c:c2a8:933b:b2f9]) by smtp.gmail.com with ESMTPSA id wb13-20020a170907d50d00b00a3009e3f8a9sm904102ejc.17.2024.01.21.05.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 05:54:25 -0800 (PST) From: Roman Scherer Date: Sun, 21 Jan 2024 14:54:17 +0100 Message-ID: <056f13e780254afc311925b568d747eeba65db27.1705844923.git.roman@burningswell.com> X-Mailer: git-send-email 2.41.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 * gnu/packages/geo.scm (gdal): Update to 3.8.3. Change-Id: Ib36177e1cb37e3852475cc0c1da3eb8747aac6d5 --- gnu/packages/geo.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 14e2d9f16b..3c82f2f3af 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1172,7 +1172,7 @@ (define-public spatialite-gui (define-public gdal (package (name "gdal") - (version "3.6.1") + (version "3.8.3") (source (origin (method url-fetch) (uri (string-append @@ -1180,7 +1180,7 @@ (define-public gdal version ".tar.gz")) (sha256 (base32 - "1qckwnygszxkkq40bf87s3m1sab6jj9jyakdvskh0qf7dq8zjarf")) + "1sj9l1hjfs5d0mnv71iy8zk2xprn46h8gxq0cai9v7i3m23h78zp")) (modules '((guix build utils))) (snippet `(begin @@ -1193,14 +1193,33 @@ (define-public gdal "frmts/jpeg/libjpeg12" "frmts/gtiff/libtiff" "frmts/gtiff/libgeotiff" - "frmts/zlib" "ogr/ogrsf_frmts/geojson/libjson")))))) (build-system cmake-build-system) (arguments - `(#:tests? #f - #:configure-flags - (list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL" - "-DGDAL_USE_JPEG12_INTERNAL=OFF"))) + (list + #:tests? #f + #:configure-flags + #~(list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL" + "-DGDAL_USE_JPEG12_INTERNAL=OFF") + #:modules '((guix build cmake-build-system) + (guix build utils) + (ice-9 rdelim) + (ice-9 popen)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'fix-rpath + (lambda* (#:key outputs #:allow-other-keys) + (let ((libdir (string-append (assoc-ref outputs "out") "/lib"))) + (for-each + (lambda (file) + (let* ((pipe (open-pipe* OPEN_READ "patchelf" + "--print-rpath" file)) + (line (read-line pipe))) + (and (zero? (close-pipe pipe)) + (invoke "patchelf" "--set-rpath" + (string-append libdir ":" line) + file)))) + (find-files libdir ".*\\.so$")))))))) (inputs (list curl expat @@ -1227,7 +1246,8 @@ (define-public gdal zlib zstd)) (native-inputs - (list pkg-config + (list patchelf + pkg-config python)) (propagated-inputs (list python-numpy))