From patchwork Fri Sep 17 14:11:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 33095 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 7E9B927BBE3; Fri, 17 Sep 2021 15:12:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, 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 08F8027BBE1 for ; Fri, 17 Sep 2021 15:12:26 +0100 (BST) Received: from localhost ([::1]:33496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mREbJ-0007z8-3O for patchwork@mira.cbaines.net; Fri, 17 Sep 2021 10:12:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mREaw-0007wq-MT for guix-patches@gnu.org; Fri, 17 Sep 2021 10:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49280) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mREav-00037k-SL for guix-patches@gnu.org; Fri, 17 Sep 2021 10:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mREav-0004sC-MS for guix-patches@gnu.org; Fri, 17 Sep 2021 10:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50627] [PATCH v1] gnu: gtk: Move wayland-protocols to inputs. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Sep 2021 14:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50627 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50627@debbugs.gnu.org Received: via spool by 50627-submit@debbugs.gnu.org id=B50627.163188787418650 (code B ref 50627); Fri, 17 Sep 2021 14:12:01 +0000 Received: (at 50627) by debbugs.gnu.org; 17 Sep 2021 14:11:14 +0000 Received: from localhost ([127.0.0.1]:60820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mREa9-0004qk-RC for submit@debbugs.gnu.org; Fri, 17 Sep 2021 10:11:14 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:58092 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mREa7-0004qa-I3 for 50627@debbugs.gnu.org; Fri, 17 Sep 2021 10:11:12 -0400 Received: from [176.234.10.27] (port=7294 helo=localhost) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mREa7-0000h6-Qz for 50627@debbugs.gnu.org; Fri, 17 Sep 2021 14:11:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=46hDnFyUuP3vK0FuT9yAh3QHuU9MEOKSkvDb3lFRbXk=; b=rlXeIyo6L82gDuJPhyb7WjL4zb j9isj/gyuxKXODOtBsdifq/+h2I9GRfZDCawOTmmgTrUWd+g5x3ywtfHxz6XO1nAAO6+/NDOBIDeK 7ZKELRMRiL7Yp5D2tlhCFDZQMnj0v2sCJwpBvHrn5hBtmVtW8oweC3jsjVTJZ0Z7+8t4H+hTJhJFk 3BLKmoSfz7l43NNNhUGIYHOYOMpkqy9H/l0mTirO4lMapMJkUz09Ly2QlA5dW05jomnLpyi4h6CnE 3pAIeCkCAMJwEn9Ja6d/VPVW/e6qdK2472vSNpIzCWYHXAOBW41nFJlOfseSZiWCd3TMscf7NdPXV CAPwu0oPcvCWszthFSWpr+18TdM0JedhpKnxeHIu+LBOs/Gy6SlRcdUSpju0Q9DA8e+YmH8TCWWX6 UZyd9RIo9knEpZ0WMdwJtStRFpWDUUG/yH2U/YPLPZYum2zvYioHlwBpKQZjscYNnZT3ypoU+gn+O +P0pmGKEFbljfiVlx50+fC8n; Received: from muradm by localhost with local (Exim 4.94.2) (envelope-from ) id 1mREa4-0000D3-RR for 50627@debbugs.gnu.org; Fri, 17 Sep 2021 17:11:08 +0300 From: muradm Date: Fri, 17 Sep 2021 17:11:08 +0300 Message-Id: <20210917141108.801-1-mail@muradm.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916192331.29606-1-mail@muradm.net> References: <20210916192331.29606-1-mail@muradm.net> 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" X-getmail-retrieved-from-mailbox: Patches I was building some packages on Guix. I figured out that wayland-protocols was listed among propagated-inputs for gtk+ package. wayland-protocols is not runtime dependency, so I moved it to inputs of gtk+ package, once moved, building of other applications that depening on gtk+ started to fail. Investigation showed that, all .pc (pkg-config) files prepared by gtk+ package, was including: Requires.private: ... wayland-protocols ... Since it becomes requirement, other applications was failing with missing dependency wayland-protocols of dependency gtk+, for instance: -- Checking for module 'gtk+-3.0' -- Package 'wayland-protocols', required by 'gdk-3.0', not found While actually wayland-protocols is not even a build time dependency of application that depends on gtk+. Advertisement of such requirement, is a bit misleading, because one does not need it at runtime, especially applications based on gtk. Same change also merged upstream for both master and gtk-3-24 branch. * gnu/packages/patches/gtk3-wayland-protocols-dependency.patch: Upstream change * gnu/packages/gtk.scm (gtk+): move wayland-protocols to inputs --- gnu/packages/gtk.scm | 9 ++++---- .../gtk3-wayland-protocols-dependency.patch | 23 +++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/gtk3-wayland-protocols-dependency.patch diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 24c24d5653..f164005416 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -948,7 +948,8 @@ application suites.") (base32 "1a9vg840fjq1mmm403b67k624qrkxh9shaz9pv7z9l8a6bzvyxds")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" - "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) + "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch" + "gtk3-wayland-protocols-dependency.patch")))) (propagated-inputs `(("atk" ,atk) ("at-spi2-atk" ,at-spi2-atk) @@ -978,8 +979,7 @@ application suites.") ("libxrender" ,libxrender) ("mesa" ,mesa) ("pango" ,pango) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (inputs `(("colord" ,colord) ("cups" ,cups) @@ -988,7 +988,8 @@ application suites.") ("iso-codes" ,iso-codes) ("json-glib" ,json-glib) ("libxml2" ,libxml2) - ("rest" ,rest))) + ("rest" ,rest) + ("wayland-protocols" ,wayland-protocols))) (native-inputs `(("docbook-xml" ,docbook-xml-4.1.2) ("gettext" ,gettext-minimal) diff --git a/gnu/packages/patches/gtk3-wayland-protocols-dependency.patch b/gnu/packages/patches/gtk3-wayland-protocols-dependency.patch new file mode 100644 index 0000000000..03196713bc --- /dev/null +++ b/gnu/packages/patches/gtk3-wayland-protocols-dependency.patch @@ -0,0 +1,23 @@ +diff --git a/configure b/configure +index edd41ad..cb36877 100755 +--- a/configure ++++ b/configure +@@ -23247,7 +23247,8 @@ $as_echo "no" >&6; } + fi + fi + +-WAYLAND_DEPENDENCIES="wayland-client >= 1.14.91 wayland-protocols >= 1.17 xkbcommon >= 0.2.0 wayland-cursor >= 1.14.91 wayland-egl" ++WAYLAND_RUNTIME_DEPENDENCIES="wayland-client >= 1.14.91 xkbcommon >= 0.2.0 wayland-cursor >= 1.14.91 wayland-egl" ++WAYLAND_DEPENDENCIES="wayland-protocols >= 1.17 $WAYLAND_RUNTIME_DEPENDENCIES" + if test "$enable_wayland_backend" = "maybe" ; then + # Extract the first word of "wayland-scanner", so it can be a program name with args. + set dummy wayland-scanner; ac_word=$2 +@@ -23320,7 +23321,7 @@ if test "$enable_wayland_backend" = "yes"; then + GDK_WINDOWING="$GDK_WINDOWING + #define GDK_WINDOWING_WAYLAND" + backend_immodules="$backend_immodules,wayland" +- WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES" ++ WAYLAND_PACKAGES="$WAYLAND_RUNTIME_DEPENDENCIES" + # Extract the first word of "wayland-scanner", so it can be a program name with args. + set dummy wayland-scanner; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5