From patchwork Sun May 8 21:41:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 39182 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 CF97E27BBEA; Mon, 9 May 2022 08:07:52 +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,HTML_MESSAGE,MAILING_LIST_MULTI,SPF_HELO_PASS, T_KAM_HTML_FONT_INVALID,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 C366027BBE9 for ; Mon, 9 May 2022 08:07:51 +0100 (BST) Received: from localhost ([::1]:42298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnxUk-0006qW-Ru for patchwork@mira.cbaines.net; Mon, 09 May 2022 03:07:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnxS6-0005e9-9p for guix-patches@gnu.org; Mon, 09 May 2022 03:05:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnxS6-0004zA-13 for guix-patches@gnu.org; Mon, 09 May 2022 03:05:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnxS5-0004gW-Rg for guix-patches@gnu.org; Mon, 09 May 2022 03:05:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55295] [PATCH] gnu: gcolor3: Fix build with libportal-0.5 Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 07:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55295 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "55295@debbugs.gnu.org" <55295@debbugs.gnu.org> Received: via spool by 55295-submit@debbugs.gnu.org id=B55295.165207989117912 (code B ref 55295); Mon, 09 May 2022 07:05:05 +0000 Received: (at 55295) by debbugs.gnu.org; 9 May 2022 07:04:51 +0000 Received: from localhost ([127.0.0.1]:55837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnxRq-0004ej-BE for submit@debbugs.gnu.org; Mon, 09 May 2022 03:04:51 -0400 Received: from mail-4318.protonmail.ch ([185.70.43.18]:43541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnofE-0006tZ-4B for 55295@debbugs.gnu.org; Sun, 08 May 2022 17:42:06 -0400 Date: Sun, 08 May 2022 21:41:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail3; t=1652046116; bh=/qpL2ZTE5cTbZyYngoF3jSbeJt8rvOMy8Ye53doZgyc=; h=Date:To:From:Reply-To:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=LjcjBVx8CCiPR+gcRH9L9BHd72RDpusEM/Bur68VMlI8M/kegHtYwZedQm4qajgcO dvOElDzYExkBV2xtYzYhcVKa4U2MumoqDVnu1CDfF+ptd6v45brD7M8CRXkBqPGoDf XHnPHuP24zAC3UGByL5WSWZbMWMKyW744hl3yV+aE056JmC1UpiryrsgDizJtmw57J 6fQjA2dzcBPC39JGkX0rG9i71EJtjZiqRxGL3OYnnf4n+BAPgsip7D8dKQ7b0lKS0m P+6HMTcr91pSQq/d0gE7b6MCDYqGNfMgWf7zFe0QI9gGSE14cOnEVI4XOz/xhPUMdz JfHy4UMlKTOKQ== Message-ID: <3x0UR1PjJhbOj9nmgJBzCZ3h6GpydLeDXehH_EPG3Hbw-icJk3bFHpgv9spXH1Q4DNlH2ngTU0_EJaCb9wmBsZnMPUJDdM6_2f9mKiCrrQ0=@proton.me> In-Reply-To: References: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 09 May 2022 03:04:46 -0400 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" Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha X-getmail-retrieved-from-mailbox: Patches Sorry, one small correction to the above (a comment was containing misleading version number).. --- gnu/packages/gnome.scm | 4 +- .../gcolor3-update-libportal-usage.patch | 55 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcolor3-update-libportal-usage.patch + ], + install: true, +-- +GitLab + --2.36.0 ------- Original Message ------- Sughosha schrieb am Sonntag, 8. Mai 2022 um 23:21: > --- > gnu/packages/gnome.scm | 4 +- > .../gcolor3-update-libportal-usage.patch | 55 +++++++++++++++++++ > 2 files changed, 58 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/gcolor3-update-libportal-usage.patch > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index dae6692109..53eec9336d 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -10321,7 +10321,9 @@ (define-public gcolor3 > (commit (string-append "v" version)))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")))) > + (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")) > + ;; XXX: Remove when upgrading to 42.0 > + (patches (search-patches "gcolor3-update-libportal-usage.patch")))) > (build-system meson-build-system) > (arguments > `(#:glib-or-gtk? #t)) > diff --git a/gnu/packages/patches/gcolor3-update-libportal-usage.patch b/gnu/packages/patches/gcolor3-update-libportal-usage.patch > new file mode 100644 > index 0000000000..0d19b124fd > --- /dev/null > +++ b/gnu/packages/patches/gcolor3-update-libportal-usage.patch > @@ -0,0 +1,55 @@ > +Fix gcolor3 to work with libportal-0.5 > + > +This patch is extracted from upstream, see here > +https://gitlab.gnome.org/World/gcolor3/-/commit/1750369a3fd922aa9db6916207dc460c6f885e14 > + > +From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001 > +From: Michal Vasilek > +Date: Mon, 27 Dec 2021 13:47:14 +0100 > +Subject: [PATCH] Update to libportal 0.5 > + > +--- > + meson.build | 2 ++ > + src/gcolor3-color-selection.c | 2 +- > + src/meson.build | 1 + > + 3 files changed, 4 insertions(+), 1 deletion(-) > + > +diff --git a/meson.build b/meson.build > +index 6453679..7d6dc50 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true) > + dep_libportal = dependency( > + 'libportal', > + required: true, > ++ version: '>= 0.5', > + fallback: ['libportal', 'libportal_dep'], > + default_options: ['gtk_doc=false'], > + ) > ++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true) > + cc = meson.get_compiler('c') > + dep_lm = cc.find_library('m', required: true) > + > +diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c > +index 7413850..5df9d54 100644 > +--- a/src/gcolor3-color-selection.c > ++++ b/src/gcolor3-color-selection.c > +@@ -41,7 +41,7 @@ > + #include > + #include > + #include > +-#include > ++#include > + > + #ifdef ENABLE_NLS > + #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String) > +diff --git a/src/meson.build b/src/meson.build > +index 3998f68..d488e51 100644 > +--- a/src/meson.build > ++++ b/src/meson.build > +@@ -42,6 +42,7 @@ executable( > + dependencies: [ > + dep_gtk, > + dep_libportal, > ++ dep_libportal_gtk3, > + dep_lm > + ], > + install: true, > +-- > +GitLab > + > -- > 2.36.0 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dae6692109..53eec9336d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10321,7 +10321,9 @@ (define-public gcolor3 (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")))) + (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")) + ;; XXX: Remove when upgrading + (patches (search-patches "gcolor3-update-libportal-usage.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) diff --git a/gnu/packages/patches/gcolor3-update-libportal-usage.patch b/gnu/packages/patches/gcolor3-update-libportal-usage.patch new file mode 100644 index 0000000000..0d19b124fd --- /dev/null +++ b/gnu/packages/patches/gcolor3-update-libportal-usage.patch @@ -0,0 +1,55 @@ +Fix gcolor3 to work with libportal-0.5 + +This patch is extracted from upstream, see here +https://gitlab.gnome.org/World/gcolor3/-/commit/1750369a3fd922aa9db6916207dc460c6f885e14 + +From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 27 Dec 2021 13:47:14 +0100 +Subject: [PATCH] Update to libportal 0.5 + +--- + meson.build | 2 ++ + src/gcolor3-color-selection.c | 2 +- + src/meson.build | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6453679..7d6dc50 100644 +--- a/meson.build ++++ b/meson.build +@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true) + dep_libportal = dependency( + 'libportal', + required: true, ++ version: '>= 0.5', + fallback: ['libportal', 'libportal_dep'], + default_options: ['gtk_doc=false'], + ) ++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true) + cc = meson.get_compiler('c') + dep_lm = cc.find_library('m', required: true) + +diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c +index 7413850..5df9d54 100644 +--- a/src/gcolor3-color-selection.c ++++ b/src/gcolor3-color-selection.c +@@ -41,7 +41,7 @@ + #include + #include + #include +-#include ++#include + + #ifdef ENABLE_NLS + #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String) +diff --git a/src/meson.build b/src/meson.build +index 3998f68..d488e51 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -42,6 +42,7 @@ executable( + dependencies: [ + dep_gtk, + dep_libportal, ++ dep_libportal_gtk3, + dep_lm