From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oAosHylT3GEyTwEAgWs5BA (envelope-from ) for ; Mon, 10 Jan 2022 16:39:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gDLXGylT3GHBdQAAauVa8A (envelope-from ) for ; Mon, 10 Jan 2022 16:39:21 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0D04B3587B for ; Mon, 10 Jan 2022 16:39:21 +0100 (CET) Received: from localhost ([::1]:39152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wlU-0004Vx-94 for larch@yhetil.org; Mon, 10 Jan 2022 10:39:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6wkF-0003Zo-0i for guix-patches@gnu.org; Mon, 10 Jan 2022 10:38:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6wkE-0001Uj-Ou for guix-patches@gnu.org; Mon, 10 Jan 2022 10:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6wkE-000145-3T for guix-patches@gnu.org; Mon, 10 Jan 2022 10:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53161] [PATCH 2/2] gnu: eog: Fix build with libportal-0.5 Resent-From: Daniel =?UTF-8?Q?Mei=C3=9Fner?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Jan 2022 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53161 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53161@debbugs.gnu.org Cc: Daniel =?UTF-8?Q?Mei=C3=9Fner?= Received: via spool by 53161-submit@debbugs.gnu.org id=B53161.16418290714065 (code B ref 53161); Mon, 10 Jan 2022 15:38:02 +0000 Received: (at 53161) by debbugs.gnu.org; 10 Jan 2022 15:37:51 +0000 Received: from localhost ([127.0.0.1]:53103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6wjv-00013L-Jc for submit@debbugs.gnu.org; Mon, 10 Jan 2022 10:37:51 -0500 Received: from out3.mail.ruhr-uni-bochum.de ([134.147.53.155]:34221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6wjq-00012k-Hq for 53161@debbugs.gnu.org; Mon, 10 Jan 2022 10:37:42 -0500 Received: from mx3.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by out3.mail.ruhr-uni-bochum.de (Postfix mo-ext) with ESMTP id 4JXdHc42jTz8Sgm for <53161@debbugs.gnu.org>; Mon, 10 Jan 2022 16:37:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ruhr-uni-bochum.de; s=mail-2017; t=1641829052; bh=BEnKMXePIOeoR1O4smsSEbRKQ3i3nY+RPfX2IHlSJuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bmbNnDCdVuLbmkVzam+9GLzpheezIRqAQwhDkNNSaJ+QPAXPk5uwMq4K659Fv8Any IFGf6/BxuoedlFKdT5Ark8snJS/jIrtgAj7Vh8XIoACjCUMUznwgnHzstcew2y+igW S4fSN1js/hmSpntfb3txBxA46/uV/OKFCd1u/RLo= Received: from out3.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by mx3.mail.ruhr-uni-bochum.de (Postfix idis) with ESMTP id 4JXdHc3CbDz8ShL; Mon, 10 Jan 2022 16:37:32 +0100 (CET) X-RUB-Notes: Internal origin=134.147.42.236 X-Envelope-Sender: Received: from mail2.mail.ruhr-uni-bochum.de (mail2.mail.ruhr-uni-bochum.de [134.147.42.236]) by out3.mail.ruhr-uni-bochum.de (Postfix mi-int) with ESMTP id 4JXdHc1y9fz8Sgs; Mon, 10 Jan 2022 16:37:32 +0100 (CET) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.104.1 at mx3.mail.ruhr-uni-bochum.de Received: from xii-04.mg07.ruhr-uni-bochum.de (pm26.mg07.ruhr-uni-bochum.de [10.150.49.41]) by mail2.mail.ruhr-uni-bochum.de (Postfix) with ESMTPSA id 4JXdHb6RtXzDgyd; Mon, 10 Jan 2022 16:37:31 +0100 (CET) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.104.1 at mail2.mail.ruhr-uni-bochum.de Date: Mon, 10 Jan 2022 16:37:15 +0100 Message-Id: <20220110153715.457-2-daniel.meissner-i4k@ruhr-uni-bochum.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220110153715.457-1-daniel.meissner-i4k@ruhr-uni-bochum.de> References: <20220110153715.457-1-daniel.meissner-i4k@ruhr-uni-bochum.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Daniel =?UTF-8?Q?Mei=C3=9Fner?= X-ACL-Warn: , =?utf-8?q?Daniel_Mei=C3=9Fner_via_Guix-patches?= From: =?utf-8?q?Daniel_Mei=C3=9Fner_via_Guix-patches?= via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641829161; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=mdohwDcLRNSi4f+8E9l/+VMAjqh+JhlE7y9HSIJt2yU=; b=XrXcVh6nvMeZ0QCg0ZPj4MtP/Pxqeb0PPiU3I6+t+pwy46v63qGeML/a1fryLe/TcrdBwj r332oKf+t1vOHhhFpKCrqjrfe+ZZuzmuuKBYbB9cNZYd+RXfvnXNgD5h+bNTuTJkYs1cay sn9KkHJcFP7I0Ofe4xfUaEUlb8SDSo3ZzIGf9CLrpEmg3DiFLcP1IEfr82+GGz4ilZ+3Zi 7OeVmSW+LCsBhV82hrYyqIqM2BytfySFQO/jXU6gw8EmuB2Eyd5N7bz+lZB7lYmTZxhvtS hyhR9pPKWsz38EO5C/K92Wr5C3q8b8kmV64U6jtsvEV7LJAvKLismZCr2HhIHA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641829161; a=rsa-sha256; cv=none; b=gWOCGjYR0+G3LfGZ89MUs17S6MYObdRmaV+3FRJ9neV4L4Vf++GQo5xtsIDjJYX1KfVlJy xe7QqCk0gaiqECdNKVNtUNdm13XaXcaBfmOVC8grR55ZRqtAWTCXactqmHeQc6WBqkOY83 Et71cvNvChMtB0qGzlLVSzuWYqQgZ9iE0bopwbzildXzaamGPMI8AilSzZw6Nw6qFDPx5C X1MWi9UNhnaeqMiAKj0xWeiIJ9wo18gmZD+FIroP+vxX6NZ069NWF4W9797M9UpBDcRFAF OWcoCZ28071IBVQie4qDDvgcG/G99u78bSg9OmQDA8OJ08UcQJ0kNOP2GaRkog== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ruhr-uni-bochum.de header.s=mail-2017 header.b=bmbNnDCd; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.11 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ruhr-uni-bochum.de header.s=mail-2017 header.b=bmbNnDCd; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 0D04B3587B X-Spam-Score: -5.11 X-Migadu-Scanner: scn0.migadu.com X-TUID: VtrTVd0hgjLh After the update to libportal-0.5 in 294476022f19139e290acb448d4575de0f851673 eog fails with: ../eog-40.3/src/eog-util.c:48:10: fatal error: libportal/portal-gtk3.h: No such file or directory This was already fixed upstream and this commits extracts the patch. * gnu/packages/patches/eog-update-libportal-usage.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnome.scm(eog)[origin]: Add new patch. --- gnu/local.mk | 2 + gnu/packages/gnome.scm | 5 ++- .../patches/eog-update-libportal-usage.patch | 40 +++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/eog-update-libportal-usage.patch diff --git a/gnu/local.mk b/gnu/local.mk index fe21cf8062..cc83c87282 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -47,6 +47,7 @@ # Copyright © 2021 Dmitry Polyakov # Copyright © 2021 Andrew Tropin # Copyright © 2021 Simon Tournier +# Copyright © 2022 Daniel Meißner # # This file is part of GNU Guix. # @@ -1027,6 +1028,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ + %D%/packages/patches/eog-update-libportal-usage.patch \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 429b17c00e..c8e82f811b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -65,6 +65,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Josselin Poiret ;;; Copyright © 2021 Mathieu Othacehe +;;; Copyright © 2022 Daniel Meißner ;;; ;;; This file is part of GNU Guix. ;;; @@ -6427,7 +6428,9 @@ (define-public eog name "-" version ".tar.xz")) (sha256 (base32 - "0ddjwcd77nw0rxb5x5bz5hd671m8gya9827p8rsnb58x103kpai8")))) + "0ddjwcd77nw0rxb5x5bz5hd671m8gya9827p8rsnb58x103kpai8")) + ;; XXX: Remove when upgrading to 42.0 + (patches (search-patches "eog-update-libportal-usage.patch")))) (build-system meson-build-system) (arguments `(#:meson ,meson-0.59 ;positional arguments error with meson 0.60 diff --git a/gnu/packages/patches/eog-update-libportal-usage.patch b/gnu/packages/patches/eog-update-libportal-usage.patch new file mode 100644 index 0000000000..220a16ddc4 --- /dev/null +++ b/gnu/packages/patches/eog-update-libportal-usage.patch @@ -0,0 +1,40 @@ +Fix eog to work with libportal-0.5 + +This patch is extracted from upstream, see here +https://gitlab.gnome.org/GNOME/eog/-/commit/a06e6325907e136678b0bbe7058c25d688034afd + +diff --git a/meson.build b/meson.build +index 9a32e4bb..9d49aa45 100644 +--- a/meson.build ++++ b/meson.build +@@ -165,10 +165,14 @@ config_h.set('HAVE_EXEMPI', enable_xmp) + # xdg-desktop-portal support with libportal (optional) + enable_libportal = get_option('libportal') + if enable_libportal +- libportal_dep = dependency('libportal', version: '>= 0.3', required: false) ++ libportal_dep = dependency('libportal', version: '>= 0.5', required: false) + assert(libportal_dep.found() and cc.has_header('libportal/portal.h', dependencies: libportal_dep), + 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') + +- common_deps += libportal_dep ++ libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: false) ++ assert(libportal_gtk3_dep.found() and cc.has_header('libportal-gtk3/portal-gtk3.h', dependencies: libportal_gtk3_dep), ++ 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') ++ ++ common_deps += [libportal_dep, libportal_gtk3_dep] + endif + config_h.set('HAVE_LIBPORTAL', enable_libportal) + +diff --git a/src/eog-util.c b/src/eog-util.c +index 90b9768e..56d23472 100644 +--- a/src/eog-util.c ++++ b/src/eog-util.c +@@ -45,7 +45,7 @@ + #include + #ifdef HAVE_LIBPORTAL + #include +-#include ++#include + #endif + + void -- 2.34.0