From patchwork Thu Nov 18 06:26:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 34586 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 A500127BBE1; Thu, 18 Nov 2021 06:27:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 52AD127BBE1 for ; Thu, 18 Nov 2021 06:27:16 +0000 (GMT) Received: from localhost ([::1]:49752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnat9-0005QJ-GC for patchwork@mira.cbaines.net; Thu, 18 Nov 2021 01:27:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnasw-0005Mo-Cx for guix-patches@gnu.org; Thu, 18 Nov 2021 01:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51032) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnasw-0002fz-35 for guix-patches@gnu.org; Thu, 18 Nov 2021 01:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnasv-0001WE-Uh for guix-patches@gnu.org; Thu, 18 Nov 2021 01:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51936] [PATCH core-updates-frozen] gnu: gnome-screenshot: Fix build with Meson 0.60.0. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Nov 2021 06:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51936 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51936@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16372167955786 (code B ref -1); Thu, 18 Nov 2021 06:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2021 06:26:35 +0000 Received: from localhost ([127.0.0.1]:34345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnasU-0001VG-KG for submit@debbugs.gnu.org; Thu, 18 Nov 2021 01:26:34 -0500 Received: from lists.gnu.org ([209.51.188.17]:51162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnasR-0001V5-8J for submit@debbugs.gnu.org; Thu, 18 Nov 2021 01:26:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnasR-0005AO-0o for guix-patches@gnu.org; Thu, 18 Nov 2021 01:26:31 -0500 Received: from minsky.hcoop.net ([104.248.1.95]:39364) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnasP-0002VR-2s for guix-patches@gnu.org; Thu, 18 Nov 2021 01:26:30 -0500 Received: from lib-its13.lib.duke.edu ([152.3.118.151] helo=localhost.localdomain) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mnasN-0006HL-Rp for guix-patches@gnu.org; Thu, 18 Nov 2021 01:26:27 -0500 From: Jack Hill Date: Thu, 18 Nov 2021 01:26:10 -0500 Message-Id: <20211118062610.11141-1-jackhill@jackhill.us> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Received-SPF: pass client-ip=104.248.1.95; envelope-from=jackhill@jackhill.us; helo=minsky.hcoop.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/packages/patches/gnome-screenshot-meson-0.60.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (gnome-screenshot)[patches]: New field. --- This change patches gnome-screenshot so that it can build with Meson 0.60.0, which is the default Meson on core-updates-frozen. The patch is from a change that I submitted upstream [0] and based on the advice in a corresponding Meson issue [1]. As an alternative to this change, we could instead build gnome-screenshot with Meson 0.59. [0] https://gitlab.gnome.org/GNOME/gnome-screenshot/-/merge_requests/57 [1] https://github.com/mesonbuild/meson/issues/9441 gnu/local.mk | 1 + gnu/packages/gnome.scm | 4 +- .../patches/gnome-screenshot-meson-0.60.patch | 39 +++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnome-screenshot-meson-0.60.patch diff --git a/gnu/local.mk b/gnu/local.mk index e710766eda..dde9c99a1f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1164,6 +1164,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ + %D%/packages/patches/gnome-screenshot-meson-0.60.patch \ %D%/packages/patches/gnome-shell-disable-test.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8677a6849d..f07ff28701 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9212,7 +9212,9 @@ (define-public gnome-screenshot name "-" version ".tar.xz")) (sha256 (base32 - "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n")))) + "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n")) + (patches + (search-patches "gnome-screenshot-meson-0.60.patch")))) (build-system meson-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/gnome-screenshot-meson-0.60.patch b/gnu/packages/patches/gnome-screenshot-meson-0.60.patch new file mode 100644 index 0000000000..c80ce9d6a3 --- /dev/null +++ b/gnu/packages/patches/gnome-screenshot-meson-0.60.patch @@ -0,0 +1,39 @@ +Fixes build issue with Meson 0.60.0. Taken from upstream +https://gitlab.gnome.org/GNOME/gnome-screenshot/-/merge_requests/57 + +From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001 +From: Jack Hill +Date: Thu, 18 Nov 2021 00:46:58 -0500 +Subject: [PATCH] meson: remove extraneous positional argument + +* data/meson.build (desktop_file) + (metainfo_file): Remove extraneous positional argument. + +Closes #186 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd570b3..4e2e2e8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + gnome = import('gnome') + + desktop_file = i18n.merge_file( +- 'desktop', + type: 'desktop', + input: 'org.gnome.Screenshot.desktop.in', + output: 'org.gnome.Screenshot.desktop', +@@ -23,7 +22,6 @@ if desktop_file_validate.found() + endif + + metainfo_file = i18n.merge_file( +- 'appdata', + input: 'org.gnome.Screenshot.metainfo.xml.in', + output: 'org.gnome.Screenshot.metainfo.xml', + po_dir: join_paths(meson.current_source_dir(), '../po'), +-- +2.33.1 +