From patchwork Wed Oct 27 04:51:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 34098 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 B540D27BBE3; Wed, 27 Oct 2021 05:56:03 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,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 1FF5027BBE5 for ; Wed, 27 Oct 2021 05:56:02 +0100 (BST) Received: from localhost ([::1]:40504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfayn-0004Hc-6f for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 00:56:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfawy-0001wm-CF for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawy-0003pB-49 for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawy-0005A1-3E for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 15/20] gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041719663 (code B ref 51428); Wed, 27 Oct 2021 04:54:08 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:37 +0000 Received: from localhost ([127.0.0.1]:48146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawT-00056z-51 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:37 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:34737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw9-000541-Hu for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:17 -0400 Received: by mail-qt1-f179.google.com with SMTP id v17so1415737qtp.1 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+C+mJ9mAsqwTdKlnBqS6GGZziBJfyv/4HNa6LGG3iZQ=; b=WRyyoWM2DgS0BTSg1pQGpEnQDCY/u86yjMiqCkRjSKiqEJ6yebAWiWMFOaCpQR4yMb lh1KtbezslHyCjk4ikiGFmovxctz+4Snn4hnVFTi3eGO4jbsmcpUaodFv60S1kLXPA4b X9TaSySHZYEpN4nBnA6g/Mo7awFLwD8WExnHheIIBHb3LC99voF4LEINOf9LaFtNJc4P O1nDyDqwYwqD8QstfrXpOK0oAQFxa6LsJgrN71svlgNg7RFbagAd/V1LAP+LysaJqhvx Xo22KS+84+fMQXWgFI7+2g2fzJlraLTv+7J8CGHItwj2EXvqsKAbED+w9ioxmahTeyWC V7tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+C+mJ9mAsqwTdKlnBqS6GGZziBJfyv/4HNa6LGG3iZQ=; b=o+VU83FLzKkxqEtWI8Tr+disVsj/3hYkYYmVi+1Y88hV9Ccn81K/2IZHHQWjn9SPng IV7ZNe1vkE7mGTYr35y45rL/7s1ikiNBTE4tfFkkabHdfQTtb4GzHTjPhqFWU4r4U/t7 oXzl1NTIoKYf+v4NVFL/SMC2wLCEjDS8HRSE0ww138DiGr/rj8lTw6xbUURpZywPmgOw ah4pdc6Hr5WetPGsjrtfIBoVXQZPZHxcA9L40N2yxRlKuKqHTerPabs6tI7kVxEE56aO JqRcjUh8uEwA/IBHixUoaBMAKG3qQTMNSqoepW7hlK2WD6eBXnwn9ROWgAB3KZ7sWizq RbJg== X-Gm-Message-State: AOAM532FDOqnwn3Oy6CiBl+jwJDgHAeTurvn8CP4bvBczGBVFswwNEhL 4o8Sqv9ZqjJ9ctbjckQlP2XrNzaAgxE= X-Google-Smtp-Source: ABdhPJzu4/aK3ULZZLeYMw4iqdQnmcSWBHxysc+TngqGpMjSzrIMOa/HI7mdRRoC7rr6Oq5PxsGnhw== X-Received: by 2002:a05:622a:1486:: with SMTP id t6mr30084799qtx.319.1635310391944; Tue, 26 Oct 2021 21:53:11 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:11 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:46 -0400 Message-Id: <20211027045151.9889-15-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> 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 * gnu/packages/gtk.scm (gtk+)[arguments]: Import the (guix build glib-or-gtk-build-system) module and put it in scope. [phases]{generate-gdk-pixbuf-loaders-cache-file}: New phase. (gtk): Likewise. --- gnu/packages/gtk.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8f57f660c4..22106c1185 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1039,7 +1039,12 @@ (define-public gtk+ ("xorg-server" ,xorg-server-for-tests) ("xsltproc" ,libxslt))) (arguments - `(#:disallowed-references (,xorg-server-for-tests) + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%gnu-build-system-modules) + #:modules ((guix build utils) + (guix build gnu-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) + #:disallowed-references (,xorg-server-for-tests) ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes ;; to "doc". #:configure-flags (list (string-append "--with-html-dir=" @@ -1055,6 +1060,9 @@ (define-public gtk+ "--enable-broadway-backend") #:phases (modify-phases %standard-phases + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + (assoc-ref glib-or-gtk:%standard-phases + 'generate-gdk-pixbuf-loaders-cache-file)) (add-after 'unpack 'disable-failing-tests (lambda _ (substitute* "testsuite/gtk/Makefile.in" @@ -1119,7 +1127,12 @@ (define-public gtk (build-system meson-build-system) (outputs '("out" "bin" "doc")) (arguments - `(#:configure-flags + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%gnu-build-system-modules) + #:modules ((guix build utils) + (guix build gnu-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) + #:configure-flags (list "-Dbroadway-backend=true" ;for broadway display-backend "-Dcloudproviders=enabled" ;for cloud-providers support @@ -1133,6 +1146,9 @@ (define-public gtk "-Dman-pages=true") #:phases (modify-phases %standard-phases + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + (assoc-ref glib-or-gtk:%standard-phases + 'generate-gdk-pixbuf-loaders-cache-file)) (add-after 'unpack 'patch (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) ;; Correct DTD resources of docbook.