From patchwork Wed May 8 12:51:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 27186 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 B865927BBE9; Wed, 8 May 2024 13:52:55 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED 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 47A9B27BBE2 for ; Wed, 8 May 2024 13:52:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4gmn-0006AR-Bq; Wed, 08 May 2024 08:52:41 -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 1s4gmj-00068w-Hx for guix-patches@gnu.org; Wed, 08 May 2024 08:52:37 -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 1s4gmj-0002Da-3F for guix-patches@gnu.org; Wed, 08 May 2024 08:52:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4gn8-0003Ca-49; Wed, 08 May 2024 08:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70831] [PATCH 1/2] gnu: libshumate: Update to 1.2.1. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Wed, 08 May 2024 12:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70831 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70831@debbugs.gnu.org Cc: Jonathan Brielmaier , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by 70831-submit@debbugs.gnu.org id=B70831.171517275512294 (code B ref 70831); Wed, 08 May 2024 12:53:02 +0000 Received: (at 70831) by debbugs.gnu.org; 8 May 2024 12:52:35 +0000 Received: from localhost ([127.0.0.1]:48744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4gmh-0003C9-0g for submit@debbugs.gnu.org; Wed, 08 May 2024 08:52:35 -0400 Received: from mout.web.de ([212.227.17.11]:46163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4gme-0003C0-0U for 70831@debbugs.gnu.org; Wed, 08 May 2024 08:52:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1715172720; x=1715777520; i=jonathan.brielmaier@web.de; bh=oCghf8XvCwFU2kKFWzy8UFQMoAltS+uTUSJJrkNqmHY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=Ptan5dacojIbvUC7le14fMCP0zbbe8NAI310Y/FI0nwBSCGtnjSRXsXQZ88hqx17 FuelfrrpFPhaKbIFwSWysuVU9HE/H+d2ks4xqHineBjeV/KukziY1TS9lXFC0m/g4 kO9ngpNrVkcEU3zZb2bZ236Iah3vIEIJb35ZQZana/zuEKcVbsxWMMJMGIbIoExhc tG8usdbg2GM9BIoVUP10xPHSXSnf5sKJzNcr+y5Xpnc5pT/n2kKkPVeNEy3OaMe2q 0W/caZM/jaEEsfzixSO6WusOAjbJHpgkQnNKM3nocOLhuuxZpXLb1HwndxmyK4a2Y 3nTZFdldpijwu5mKLA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([78.51.161.120]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MnpGi-1sO2DS2UHq-00dF4K; Wed, 08 May 2024 14:52:00 +0200 Date: Wed, 8 May 2024 14:51:37 +0200 Message-ID: <3e8fe9608b5176c1b1bdabd614904cf49b6eb8fc.1715172318.git.jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:tBuae9tpxipVGjt5eI9oms7tuZEkLx6ksHe2vwaxA/zACA1pRSJ kpQBaKaQRDOvaf0ICov3r9vCqH6Zp79ButUrjPMwt4o1McxB0L6zqmo4m5+q9zjuja3EVVK eeuucUBzMw9seGMc3IJzEoWsHjRX74GGtd2pRizZlig+1Fh9+vNmY6FIvv0G5OXqHukHl8H GhxoWb/RWwuQ8H9TB2nNg== UI-OutboundReport: notjunk:1;M01:P0:0hgdZLDyWQU=;iuLsUIyCGCb+5Oy9RdliZjAMLfL feXIywxAfBNzMGS/N2VL9m+OasUdu7zZ4uQwP4qjL3H9Scul8enRg746GjtnRXAOjaj3HXbaA qQqA51bTrGr5Cs0mPO1ldohyQJjY4nNFfEPTRIa6qaEKJZRP4LmrttPqh9ISLr6zesm11Fs8z SkHl+RvPylUirk5k+aeB1vPUFEexcP3U2mZx8sVto+DwkDzXloQPlUqkYIHEi0q2FASatqgwG UEq6K2Z7vCNNAEh9H2pfCckzHKp+D5/l2BtswRqI4htCMIaNaRG89yX/ibz/ivVm4n+yEDby+ Z19D14ouKwP5YkjWZB5xHKaII9Ztkc35P8rmod9ds8FfJc9t20geu/Y+wwVLv0pJcgX/vpPVV /qfod9j0IhregNWH+Ws59Cj5DynSKEW/wFX1k5NvDFqHwgvok33DAh81AZppMTQAucsYz5bIg Pk+9wnQbkUQ8qGC1LfSJEW1+/LtSnXWilWzItPFvWW8Bzkmio2XfiSNtLLrJ/vQwDw/q8lsiR c5Jd6FUIGcgfXOC/qzZtmz0V7GqoHZ7XUbrEjEIm/0GMoiFixrrGtVWbISRuKV2SwBklBrWCz +slgtY5gideO/kAPf2m/z0CzOvsu+9CM6dRaGbEjvd2MVJZyvlYnd3zPeRdHfJ/rwo5tVHTS4 SuCZ+velIhTG44+YHeD90iKDBq60EqXYZsF6qyJN1nmkXEtLHqWdDzsTrflFRKieVvIHKuHuk giYYTwB14woENi66LdzZnqiWhrPopLi3f6z9FMUzAzhns+Nj4FZY2hAvQJ307E9Ar7RPo+SWt kZfbpV7sdOgNXNUjPS/rMLewZc7nfC/NYkn7Ia2D2eVhA= 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: Jonathan Brielmaier X-ACL-Warn: , Jonathan Brielmaier via Guix-patches X-Patchwork-Original-From: Jonathan Brielmaier via Guix-patches via From: Jonathan Brielmaier 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/gnome.scm (libshumate): Update to 1.2.1. [arguments]: Drop `-Dlibsoup3=true` configure flag as it got removed upstream. It only supports libsoup3 now. [native-inputs]: Add gperf. [propagated-inputs]: Add json-glib and protobuf-c. Change-Id: Ibe63b6f2060f6684f8f68f44c2221ba9d6ad5a45 Reviewed-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.41.0 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 489f23865b..ab76f9c019 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -43,7 +43,7 @@ ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan -;;; Copyright © 2019, 2020 Jonathan Brielmaier +;;; Copyright © 2019, 2020, 2024 Jonathan Brielmaier ;;; Copyright © 2019-2022 Liliana Marie Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt @@ -5030,7 +5030,7 @@ (define-public rest-next (define-public libshumate (package (name "libshumate") - (version "1.0.5") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5038,11 +5038,10 @@ (define-public libshumate name "-" version ".tar.xz")) (sha256 (base32 - "0v4m07vxm3m4a2vqkp2wfsc3zsf92fpigc1k8yq49vkpj7gxikx8")))) + "04cwakbdr68nw4kh956xhf447fawz8badpyd76hg4ir1gq3yw18i")))) (build-system meson-build-system) (arguments - (list #:configure-flags #~(list "-Dlibsoup3=true") - #:phases + (list #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? test-options #:allow-other-keys) @@ -5062,6 +5061,7 @@ (define-public libshumate (list gi-docgen `(,glib "bin") gobject-introspection + gperf pkg-config ;; For tests: xorg-server-for-tests @@ -5072,7 +5072,9 @@ (define-public libshumate (list cairo glib gtk + json-glib libsoup + protobuf-c sqlite)) (home-page "https://wiki.gnome.org/Projects/libshumate") (synopsis "GtkWidget C library for displaying maps") From patchwork Wed May 8 12:51:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 27187 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 5F17B27BBEA; Wed, 8 May 2024 13:53:00 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS 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 9460027BBE9 for ; Wed, 8 May 2024 13:52:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4gmp-0006BB-N1; Wed, 08 May 2024 08:52:43 -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 1s4gmj-000693-In for guix-patches@gnu.org; Wed, 08 May 2024 08:52:37 -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 1s4gmj-0002Dc-8x for guix-patches@gnu.org; Wed, 08 May 2024 08:52:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4gn8-0003Ci-I1; Wed, 08 May 2024 08:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70831] [PATCH 2/2] gnu: gnome-maps: Update to 46.10. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 08 May 2024 12:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70831 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70831@debbugs.gnu.org Cc: Jonathan Brielmaier , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 70831-submit@debbugs.gnu.org id=B70831.171517275712301 (code B ref 70831); Wed, 08 May 2024 12:53:02 +0000 Received: (at 70831) by debbugs.gnu.org; 8 May 2024 12:52:37 +0000 Received: from localhost ([127.0.0.1]:48747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4gmi-0003CL-Mr for submit@debbugs.gnu.org; Wed, 08 May 2024 08:52:37 -0400 Received: from mout.web.de ([212.227.17.11]:36481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4gmg-0003C1-DZ for 70831@debbugs.gnu.org; Wed, 08 May 2024 08:52:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1715172723; x=1715777523; i=jonathan.brielmaier@web.de; bh=4LNzEaCaoe7jLw7p019Ywl46+EJXfE4AsrIJj2cH14Q=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=ZwwCc6nInWWhWQJgH1oCy+B4wSMYl4/V1/7eCEmwjSNpo2ic+wmvWKX18i6i5hWb KI2MOdFmVEVyNVOra1mamBqfoY8nHL980KpDT3d/3AXzQPO9Lkg6XEcIHVKVhNKll UzAefotAE1MkvC6s3cos7YT4qVuXhudrqiEr1Q61fJ6ubsqE/bqN5+tFOHnXQ8iXk 64//gfnYeT2rQyH7ZH1dDRH1B+CEcMTHmuFNKqh7FKRcyd5yG6zU1Rk9roOBVamA0 T7ko/6Jurr4Dn+Byp8+g2rc/egmz09w75nLAwXxP3b5+dShbK0jOmGiXiJS4GtRYe 3Nkbv/mgo+0RYFXhLQ== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([78.51.161.120]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MBSB3-1rtw4414k3-007SgX; Wed, 08 May 2024 14:52:03 +0200 Date: Wed, 8 May 2024 14:51:38 +0200 Message-ID: <28c88e7db49fbe56d7348d45a7efd2e7c85d3577.1715172318.git.jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:xpHU0JYnorJ4YuTVIp762gRfjYJx5jKCQv2/exqFSuPw4c9CjM0 i4GtmJmkojaPetRlxuv2nO4i4jfRSgRVE+eEmAyAinSqZUZMMBxYwrwcJxcCdzUiWHMIeRZ RuNQ5+iv3ODSYX/tcJ/25rBbNp6PEW4TWAE8w7UX10SWs3QY4JoMrDqG3qCDBEpGtdjfbZ0 /Xaa0bmNvf/GgU3iBwmfQ== UI-OutboundReport: notjunk:1;M01:P0:e4JjpqEK7EY=;KlCMi+jLXZgbvc99W9TFoVbhOxZ yDhPROamOHR3Zt6NaSflbyeXBR9WvqFSXJrwru+jZORfCz89EfPyWLftHys0PfPnEDL+3RQU7 lwIg8y0davolLln/ihoVLedH4oipfN2sTAYDpB2xk6s1oxLM4U8HKL9t8hVDrcSBuO6pYDPc+ xezbDHOTYMMRvgA3WSOF54SvGJJqHlD9nCHKCvJCN7ZEWo6fbrkaBee2ifFP9Da3Y18sjtMik ktdkZUq8Z4kJvgGvHSPcRz6wbzJYS2rJlXy9M8GDldyS5LmOXZTTTSRX6IegmPSRtZQyjEJ18 TVr8lNGu17PXIMftwNQOoVh/703oyfsxzaFqZHneWVTOKiCWN0fBzFGYUmRovbDLFhtzeGGoV Dv6SSf9m9kr3ji4i+jCiUGPIOTkN4XV/zt9UQwenYe59Qi57RdwpssS9lQIS5Y0kgv1tF1O+6 pkm+tNX/7FhLcHIMkANHCxTF7IB31kzFfOcxS+9/mBFdtybmOMVqag1j7Ec8LAI3AAp8hwBR7 GIjZttPfHF/05vg0LmdOG2kBklA01KC3Cux5UZlsA6amp0xEqY0ZPWmys4EuqQtMjjDPAe3js x3dUQ8BOqvY/Spb4vzoxuReZP+g/xXL4+LzLYowQoUXxxgS823PIizvILJS+099c+glSFdaTz bm2DaMBiNFxvdQa8lO8qi0ONyzRQEZdNItjdVzA+HxCG9peCus5UK9KGbEGbwPqGocDVeByl8 uPbUs6pr73yL0EA0Jvjt65Bo/AlMsE0o/lTsabM7fGayRP0uuxauH9tmJV1r4iNbMJr44pusF DtxOUpjc1UhPkb33YBKe5TmZICwJBM7jqtIV7RiUEIhbc= 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: Jonathan Brielmaier X-ACL-Warn: , Jonathan Brielmaier via Guix-patches X-Patchwork-Original-From: Jonathan Brielmaier via Guix-patches via From: Jonathan Brielmaier 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 (gnome-maps): Update to 46.10. [arguments]: Add phase to setup time zones for a new test. [native-inputs]: Add libportal and tzdata-for-tests. Change-Id: Ife9b17eda68662d2adb289acfeacf1dc8f179a46 --- gnu/packages/geo.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) -- 2.41.0 diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 985fa77231..1dd0c7ba92 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Denis 'GNUtoo' Carikli +;;; Copyright © 2024 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,6 +84,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages flex) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -472,7 +474,7 @@ (define-public geos (define-public gnome-maps (package (name "gnome-maps") - (version "44.5") + (version "46.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -480,7 +482,7 @@ (define-public gnome-maps name "-" version ".tar.xz")) (sha256 (base32 - "026488yb6azwb2sm0yy0iaipk914l3agvb7d8azks4kyjqlslyb8")))) + "1br1ak0cwvvv8rszj9ffyvir7qcbxys940ygy22dzzn2l2byw9az")))) (build-system meson-build-system) (arguments (list @@ -496,6 +498,12 @@ (define-public gnome-maps "update_desktop_database")) (string-append option ": false")) (else all)))))) + (add-before 'check 'check-setup + (lambda* (#:key native-inputs inputs #:allow-other-keys) + ;; for timeTest + (setenv "TZDIR" + (search-input-directory (or native-inputs inputs) + "share/zoneinfo")))) (add-after 'install 'wrap (lambda _ (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))) @@ -510,7 +518,9 @@ (define-public gnome-maps (list gettext-minimal `(,glib "bin") gobject-introspection - pkg-config)) + libportal + pkg-config + tzdata-for-tests)) (inputs (list folks evolution-data-server