From patchwork Sat Jul 30 06:32:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41070 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 BA5ED27BBEA; Sun, 31 Jul 2022 11:21:35 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,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 7A81A27BBE9 for ; Sun, 31 Jul 2022 11:21:35 +0100 (BST) Received: from localhost ([::1]:46996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oI64k-0005Ft-MD for patchwork@mira.cbaines.net; Sun, 31 Jul 2022 06:21:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oI64E-0004wV-Qz for guix-patches@gnu.org; Sun, 31 Jul 2022 06:21:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46707) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oI64E-0005wz-HC for guix-patches@gnu.org; Sun, 31 Jul 2022 06:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oI64E-0000li-DO for guix-patches@gnu.org; Sun, 31 Jul 2022 06:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56850] [PATCH staging] gnu: gtk+@2: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Jul 2022 10:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56850 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56850@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16592628412902 (code B ref -1); Sun, 31 Jul 2022 10:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jul 2022 10:20:41 +0000 Received: from localhost ([127.0.0.1]:36456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oI63s-0000kk-Ol for submit@debbugs.gnu.org; Sun, 31 Jul 2022 06:20:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:32782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oI63q-0000kb-3W for submit@debbugs.gnu.org; Sun, 31 Jul 2022 06:20:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oI63p-0004CN-JH for guix-patches@gnu.org; Sun, 31 Jul 2022 06:20:37 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:39506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oI63n-0005sS-LO for guix-patches@gnu.org; Sun, 31 Jul 2022 06:20:37 -0400 Received: by mail-ej1-x642.google.com with SMTP id bp15so15467457ejb.6 for ; Sun, 31 Jul 2022 03:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=Tyv0Ed65yuLdpZsQYc1bZY/7+Qk0t8dS+bcVRegcxv0=; b=NbJ3evmQ7nePRwmIOst4gsw/lY0kxe0eCWu4IpyxtZXXA2+7B7WtiI63mfE8xxnGYx NHbJdE2Zpa/ljuYwFU0d2CzKdswiEVeyvFfesHCwGIDf8tZwwcvq4JHhkCbFr1NjoTwx wnZd3AuI6X4MrW9sKtTNvKsty4Kd1ioS2q1TkOdFS5SQFex9PbUi2Sdy2IXsquuvTGZA c4TTVIJ/ld7B/uwIIwQ7gL6u4mRsr0x8jw+O27swENsUirHujK8bB5u/mi7CCkkEnN2E J9YFRWeNC+KHY6tqhPZT4qCBguk9OqsElHLjagazN7Qf8ErfR24hU0HJJ/H0GLdVd0wb ZSOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=Tyv0Ed65yuLdpZsQYc1bZY/7+Qk0t8dS+bcVRegcxv0=; b=tld8OrssPP++lvgveD2EYWUh+pMVA8dqyxDqzoJPHpiM8hf/PssRl49rExgOkrRcgF DaGGczz8khJh3IEO7VEGp7p4Zk0vV6fbAeh7nYc12cZDs8o3fDI0LrfFNmiKX6VcDuyh lwIqK/dA28hv61AI4C0tEfT8K3TE8fv1ZpXndhOsnR3t2K7XuQxyeUSng7830g40jeLJ bMdvxKf5z5j8HYI3rb1ilGv0HhhTz27o3sBpUXC4vpCp33vJXCvHY1fXdaCvb9Us+acd 8S8s2FmAUQUq2tNNODOBx9UyTdwBZKMk1wFvFZa1H0gvryUE6HBOJB2u8ovvzqQzMrJw X4XQ== X-Gm-Message-State: AJIora+v9u+3q5Ur42nTPXLGAUNpqOkEc7bBUE1n/nucF5n+sl/UautP kVC+ErcGOAZCCptdPqMq629B0JMe26M= X-Google-Smtp-Source: AGRyM1sAcmcV/XnrJVbUMdA1EULaX6npCIp9OKRkJJ5Fh+l79x2TcdHaDKddVazlPT3ghIfxhmPR5g== X-Received: by 2002:a17:907:2cef:b0:72b:5b3e:3d7a with SMTP id hz15-20020a1709072cef00b0072b5b3e3d7amr8633182ejc.293.1659262833629; Sun, 31 Jul 2022 03:20:33 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0072f47838640sm3899348eja.71.2022.07.31.03.20.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jul 2022 03:20:33 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 30 Jul 2022 08:32:26 +0200 MIME-Version: 1.0 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::642; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x642.google.com X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_24_48=1.34, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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/gtk.scm (gtk+-2)[arguments]<#:imported-modules, #:modules> <#:disallowed-references, #:parallel-tests?>: Copy from gtk+-3. <#:phases>: Add ‘generate-gdk-pixbuf-loaders-cache-file’ from glib-or-gtk-build-system. --- gnu/packages/gtk.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cc25fac2aa..c6fd5fd9cb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -957,7 +957,13 @@ (define-public gtk+-2 python-wrapper xorg-server-for-tests)) (arguments - `(#:parallel-tests? #f + `(#: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) + #:parallel-tests? #f #:configure-flags (list "--with-xinput=yes" (string-append "--with-html-dir=" @@ -965,6 +971,9 @@ (define-public gtk+-2 "/share/gtk-doc/html")) #: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* "gtk/Makefile.in"