From patchwork Mon Mar 27 18:27:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49186 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 8FC0B175BB; Sat, 15 Apr 2023 23:36:49 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 C8DC5175A5 for ; Sat, 15 Apr 2023 23:36:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnoV3-0000zW-Lo; Sat, 15 Apr 2023 18:36:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnoV1-0000y7-5a for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnoV0-0002p9-To for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnoV0-00083D-6G; Sat, 15 Apr 2023 18:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62873] [PATCH gnome-team 1/4] gnu: meson: Update to 1.1. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 15 Apr 2023 22:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62873@debbugs.gnu.org Cc: rg@raghavgururajan.name X-Debbugs-Original-Xcc: rg@raghavgururajan.name Received: via spool by 62873-submit@debbugs.gnu.org id=B62873.168159812930874 (code B ref 62873); Sat, 15 Apr 2023 22:36:02 +0000 Received: (at 62873) by debbugs.gnu.org; 15 Apr 2023 22:35:29 +0000 Received: from localhost ([127.0.0.1]:50271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUS-00081t-Nz for submit@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:29 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:44657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUR-00081J-1b for 62873@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:27 -0400 Received: by mail-ej1-f65.google.com with SMTP id dx24so10686337ejb.11 for <62873@debbugs.gnu.org>; Sat, 15 Apr 2023 15:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681598121; x=1684190121; h=mime-version:message-id:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=TAdCZJLOPfluJah/XPMm8zEAxHMFwGZWqLp0Ke6JYC0=; b=FKGTBgkeJozfv0JzyG/FXTl5hVEoDO4t2XMCV///bejkPfes0sm5O5pqq2tqzU1i4u fQvFVwPM0Vz3UcdEo4ex+wv4+Qg2lZJ+F60dBgnGO9GYrh9hMGrjvqbBjwlj7X7bXt7g WSql7Mq0xEL1ONSByXmDinhIGvwe7EDPBKbihAVXzwSV/4/O2iXEE3W0e7NOjE2wiZAm mhbvPMTZbOCEAGmrBECw4nCFULUm4Q+AHIOS2M30NYP/SQXQ0aQMNdTVq4uLwZT2ASKx hebWv6vllh3RVhIC8vT4Pm+g1sOxI48wodjCprem8r/MRGWzRFvZo8IShMt0PvkgPugX uyug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681598121; x=1684190121; h=mime-version:message-id:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TAdCZJLOPfluJah/XPMm8zEAxHMFwGZWqLp0Ke6JYC0=; b=TNuKOpcDYV9teUw622fxQtG6hECocFyfH4VsYPgkrOBnv7AWvLTRCM/SMBQEw7CJc7 VYWapDNsWv7I7ppHm1gCeqqF5Z2JDKs8mXuwlmKdxmdEfzmD3g5vWoZYTMfjO0fQ7os3 ggTZaRum66QVZYHoa/RsPWv0b+FD7Khr2Jk5Zmf9R+AkN8aznRaiuV4FsTdI91FL+xVN 6kl6Fq9jEWYYM36jBPCTYqbuWJIFyc9kzXVdZAWoc0D0LEAmvBjZPq82J/ah4t7SelgJ QfpymUYy6u6LFGrn+ZHocOB4Oqvar3fCpK34yDhkErIiF74PbUMV5Q8WA0YXIN0OmvVm uHxQ== X-Gm-Message-State: AAQBX9ffe8A6LTsfiytrFKnShIWSHKP88VSkSwidOTPFS90Fo4DzKG9N 5i6255brBYZaPON2meORG0dtu/OVk6YTUg== X-Google-Smtp-Source: AKy350b7vtgio+LIIK8i0tfmmCuCkFz+KtOWfTBwUtzIET3SLinP/LjHcV4l4sH/Mq+x+VBC0DcKTA== X-Received: by 2002:a17:907:3e1c:b0:94f:3804:5cd6 with SMTP id hp28-20020a1709073e1c00b0094f38045cd6mr1526290ejc.66.1681598121051; Sat, 15 Apr 2023 15:35:21 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg16-20020a170907205000b0094a85f6074bsm4306035ejb.33.2023.04.15.15.35.20 for <62873@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 15:35:20 -0700 (PDT) From: Liliana Marie Prikler Date: Mon, 27 Mar 2023 20:27:48 +0200 Message-ID: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/build-tools.scm (meson-1.1): New variable. (meson-0.63): Inherit from meson-1.1. sq meson 1.1 f meson 1.1 --- gnu/packages/build-tools.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 2bbf7ce4c9..c53d4dd6db 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -283,10 +283,10 @@ (define-public gn ;; X11 license. (license (list license:bsd-3 license:x11))))) -(define-public meson-0.63 +(define-public meson-1.1 (package (name "meson") - (version "0.63.2") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -294,7 +294,7 @@ (define-public meson-0.63 version ".tar.gz")) (sha256 (base32 - "1gwba75z47m2hv3w08gw8sgqgbknjr7rj1qwr510bgknxwbjy8hn")))) + "17w2zymmvrffhfpqsaj7qcbjwgv9iaawcpzhz2gnhlvcrm26qqfr")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs and patching many @@ -327,6 +327,20 @@ (define-public meson-0.63 resembles Python.") (license license:asl2.0))) +(define-public meson-0.63 + (package + (inherit meson-1.1) + (name "meson") + (version "0.63.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mesonbuild/meson/" + "releases/download/" version "/meson-" + version ".tar.gz")) + (sha256 + (base32 + "1gwba75z47m2hv3w08gw8sgqgbknjr7rj1qwr510bgknxwbjy8hn")))))) + (define-public meson-0.60 (package (inherit meson-0.63) From patchwork Sat Apr 8 15:22:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49185 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 E64F0175BC; Sat, 15 Apr 2023 23:36:45 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 06745175A5 for ; Sat, 15 Apr 2023 23:36:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnoV3-0000zT-BI; Sat, 15 Apr 2023 18:36:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnoV1-0000y6-4C for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnoV0-0002pC-Rd for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnoV0-00083L-Hh; Sat, 15 Apr 2023 18:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62873] [PATCH gnome-team 2/4] build: meson: Explicitly invoke "meson setup" instead of just "meson". References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 15 Apr 2023 22:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62873@debbugs.gnu.org Cc: rg@raghavgururajan.name X-Debbugs-Original-Xcc: rg@raghavgururajan.name Received: via spool by 62873-submit@debbugs.gnu.org id=B62873.168159812930880 (code B ref 62873); Sat, 15 Apr 2023 22:36:02 +0000 Received: (at 62873) by debbugs.gnu.org; 15 Apr 2023 22:35:29 +0000 Received: from localhost ([127.0.0.1]:50273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUT-00081v-3A for submit@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:29 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:45912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUR-00081L-DL for 62873@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:27 -0400 Received: by mail-ej1-f66.google.com with SMTP id u3so2717008ejj.12 for <62873@debbugs.gnu.org>; Sat, 15 Apr 2023 15:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681598121; x=1684190121; h=mime-version:message-id:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=1/qM75gR0Aq7WVeVjh05gvHHDx7idJ8foffFuJWabhk=; b=fThFLkxDkIT2CSYRB8lcHOMa8rDIgVOxUdKOZwYdSW8xjOACAP8BH0GyODqAMgrmxL Nb5hua5V/6DeaJdqFM7bpOrPwWDai3XKL6Kz6DL5aVx69J91a+KBGXvNErPH63D34oPo 0Ydt9JELmKTbVoY3ptJY91YX4mi99LGEBsC5hhTSpY4rOSGPbsGzdJHkPYiqgBw9mSPd ea9WUB4AiaqEIWFhTHqepluEpt1zPLueckT+JShYSW/uMHCXuPL1qQyKTVc1UhuanCCb PtRr3VDlFwdZA7mKYI1lcRyGHEYiNN+INpU34Kg8fwix6V1hfUA7BGrzeqLkAU7O6Q+m or9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681598121; x=1684190121; h=mime-version:message-id:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1/qM75gR0Aq7WVeVjh05gvHHDx7idJ8foffFuJWabhk=; b=ZXYysNiYnxBzIAQjVhALXd/AA4rDKU9NQvo2o8343nq4oRu/wynsjeUcXQNsFql15s CzU8DSegWHuQt9kce9Xdn+th2ULzuwx/gn4nwsF9lVqNQrskj+moBI2H6o5c8BhZMUtn YUj2sYow1S0fQFLUqTEbYeKLBY2IN8eWXlWw+Eo3vecK4XazIjS1aF8WYs9wGg0RERqk 61twx7qMQJR3fGLaqvSsYP8xw63hXn47U5yrpfZBgTBAGsF3IJD5XNhyVEHhcMWH7F4f VKZm2x4eNWZeQuKCMqlEoaWKg+CMLrpZFANNos7g/Sxr5XIyIb7ONRqSXri9cxy/JjzR Ulhw== X-Gm-Message-State: AAQBX9dcgFyBch4srKPIgaSNKgAMK3W7LDrrgu7pgIqeLKSnvk8MBrqY ManQpLF1nmOsfiZpdOtSHVjI8QSVWhF5ag== X-Google-Smtp-Source: AKy350ZUCMAhPXz1LwAiQqfGfXSsi+U4rGe+Nnn1I56sy74TpbvEezN+p0LIbhr+KdDuh5erjgMUiA== X-Received: by 2002:a17:906:3ad9:b0:882:cdd4:14d9 with SMTP id z25-20020a1709063ad900b00882cdd414d9mr2750871ejd.46.1681598121475; Sat, 15 Apr 2023 15:35:21 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg16-20020a170907205000b0094a85f6074bsm4306035ejb.33.2023.04.15.15.35.21 for <62873@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 15:35:21 -0700 (PDT) From: Maxim Cournoyer X-Google-Original-From: Maxim Cournoyer Date: Sat, 8 Apr 2023 11:22:46 -0400 Message-ID: <93093b0b40301a4c88f8842dded8d63b3c63bce2.camel@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build/meson-build-system.scm (configure): Invoke the setup command to avoid a deprecation warning. Signed-off-by: Liliana Marie Prikler --- guix/build/meson-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index 61ce45367d..3d1a27cba7 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -55,7 +55,7 @@ (define* (configure #:key outputs configure-flags build-type (mkdir build-dir) (chdir build-dir) - (apply invoke "meson" args))) + (apply invoke "meson" "setup" args))) (define* (build #:key parallel-build? #:allow-other-keys) From patchwork Sat Apr 8 14:04:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49183 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 8D842175BC; Sat, 15 Apr 2023 23:36:18 +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, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 442B31759E for ; Sat, 15 Apr 2023 23:36:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnoV3-0000za-T1; Sat, 15 Apr 2023 18:36:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnoV1-0000yC-95 for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnoV1-0002pP-1G for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnoV0-00083T-Tg; Sat, 15 Apr 2023 18:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62873] [PATCH gnome-team 3/4] build: meson: Honor bindir, libdir and includedir. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 15 Apr 2023 22:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62873@debbugs.gnu.org Cc: rg@raghavgururajan.name X-Debbugs-Original-Xcc: rg@raghavgururajan.name Received: via spool by 62873-submit@debbugs.gnu.org id=B62873.168159813430897 (code B ref 62873); Sat, 15 Apr 2023 22:36:02 +0000 Received: (at 62873) by debbugs.gnu.org; 15 Apr 2023 22:35:34 +0000 Received: from localhost ([127.0.0.1]:50275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUX-00082G-EO for submit@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:33 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:38763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUR-00081M-On for 62873@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:28 -0400 Received: by mail-ej1-f67.google.com with SMTP id fw30so1928751ejc.5 for <62873@debbugs.gnu.org>; Sat, 15 Apr 2023 15:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681598122; x=1684190122; h=mime-version:message-id:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=yTpG3ZXu18/pl3Xe2qYi66h61ZE31nncurx6U/ybApM=; b=btLKxLZOsvbsmowKhWJctEp73CKQv9trR76q7mb+8UnasM1Cjnz6F/UAr/RtKPg8Hj Rke9E1JZ+d8py6qVQbS/9eTQFk0NCru0wUbqOhWMTzOo+Xw2LywLRseAEuaeWNX9tgxZ gg23oJk8o2uyYP34eiWbcCl60CSDoHrNUdRC3DOBacdnRfDK3/6CBonxQbiDjYCrSRBW urclcxrU3s8pHTvJV3Xsw6zXZxM+WmzTxKPzJ0tm1PuQ9FWhv6ZfUAXGLnFk+NuGU8gg 0PTFY4ItGL80pCUJ458+3tE1qgx+2ppDAznmNxfw5l04tge3vYSEgukHyxDx7g+tRf3z EFMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681598122; x=1684190122; h=mime-version:message-id:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=yTpG3ZXu18/pl3Xe2qYi66h61ZE31nncurx6U/ybApM=; b=dRPqiI3Uu+2ZkEXSNwI+1Tft+Ebz/a2wmUY3ZbJgNxOEFOptw42RHBCFMI/e9OsqVg wHZRZ2TgihWwJbZV/MCfilfeUQM/cjVxpDF4T8xnPjn3GvgC8tGj3F7KZ0ZB0zTs9Zqi Muzc+b8voQ3AfnR96myC2gOjL28ohczwGhe6oQQ/UUn64+BWe86ac6PWtwlqY3JbR34Z RkixaRv9eaNBhkYw+1wEUmXaL9kSUMnILugoEAsfz1S+cSw6RlwUjxXG5LjN3VyQBfy/ lsXOTlfoJTk2LC9uaRNtw79ik9AJFH8bwEFGNAlwAU9T/PyftY4EI1bCdOOF/NUDS9ry 8YLQ== X-Gm-Message-State: AAQBX9caskguUdOVj+gRP88LnlQ6v7Xy5Kyg6HtI2K4MQhywG6UlpUL9 tFIZPuzpfjIBh2j6c0cY3ihj3/3tQMD/DQ== X-Google-Smtp-Source: AKy350Yjr6oFM56SOJUu8Cf0nt5VE7GfiIaHiDSrKhjVoFGcOJRw2eFZ/u+kygm24czSVnk1SdU4Pw== X-Received: by 2002:a17:906:3e03:b0:94e:4489:f24d with SMTP id k3-20020a1709063e0300b0094e4489f24dmr3004555eji.61.1681598122095; Sat, 15 Apr 2023 15:35:22 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg16-20020a170907205000b0094a85f6074bsm4306035ejb.33.2023.04.15.15.35.21 for <62873@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 15:35:21 -0700 (PDT) From: Maxim Cournoyer X-Google-Original-From: Maxim Cournoyer Date: Sat, 8 Apr 2023 10:04:38 -0400 Message-ID: <43971973ac0be90c50f67b35a59734b8cea1c4c8.camel@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This brings our meson-build-system closer to our gnu-build-system in terms of using different installation prefixes based on the presence of outputs such as "bin", "lib" or "include". * guix/build/meson-build-system.scm (configure): Add --bindir, --libdir and --includedir according to the presence of the "bin", "lib" and "include" outputs, as done in gnu-build-system. Signed-off-by: Liliana Marie Prikler --- guix/build/meson-build-system.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index 3d1a27cba7..d11a5d8e18 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Marius Bakke -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,10 +41,28 @@ (define* (configure #:key outputs configure-flags build-type #:allow-other-keys) "Configure the given package." (let* ((out (assoc-ref outputs "out")) + (bindir (assoc-ref outputs "bin")) + (libdir (assoc-ref outputs "lib")) + (includedir (assoc-ref outputs "include")) (source-dir (getcwd)) (build-dir "../build") (prefix (assoc-ref outputs "out")) (args `(,(string-append "--prefix=" prefix) + ,@(if bindir + (list (string-append "--bindir=" bindir "/bin")) + '()) + ,@(if libdir + (cons (string-append "--libdir=" libdir "/lib") + (if includedir + '() + (list + (string-append "--includedir=" + libdir "/include")))) + '()) + ,@(if includedir + (list (string-append "--includedir=" + includedir "/include")) + '()) ,(string-append "--buildtype=" build-type) ,(string-append "-Dc_link_args=-Wl,-rpath=" (assoc-ref outputs "out") "/lib") From patchwork Thu Apr 13 13:33:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49184 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 78193175BB; Sat, 15 Apr 2023 23:36:44 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 D94681759E for ; Sat, 15 Apr 2023 23:36:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnoV4-0000zm-2j; Sat, 15 Apr 2023 18:36:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnoV1-0000yU-LR for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnoV1-0002pj-De for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnoV1-00083c-8n; Sat, 15 Apr 2023 18:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62873] [PATCH gnome-team 4/4] gnu: gtk+-3: Fix build. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 15 Apr 2023 22:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62873@debbugs.gnu.org Cc: rg@raghavgururajan.name X-Debbugs-Original-Xcc: rg@raghavgururajan.name Received: via spool by 62873-submit@debbugs.gnu.org id=B62873.168159813430905 (code B ref 62873); Sat, 15 Apr 2023 22:36:03 +0000 Received: (at 62873) by debbugs.gnu.org; 15 Apr 2023 22:35:34 +0000 Received: from localhost ([127.0.0.1]:50277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUX-00082I-Tj for submit@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:34 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:44665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUS-00081O-6A for 62873@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:28 -0400 Received: by mail-ej1-f67.google.com with SMTP id dx24so10686414ejb.11 for <62873@debbugs.gnu.org>; Sat, 15 Apr 2023 15:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681598122; x=1684190122; h=mime-version:message-id:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=bzRpARVh/DC15Rtjp7UkN3uau2TkY5eKaLqc+Hw0djY=; b=s4PSuqkMcHhh2Se5qy0Th+NmPSqbNF2VUHc5ijBKFoHjqwou40Hzr9D4ogox+ZrP2L SrCEj0xW2dQO8SRi6hcLvn7JzEVMXQ6om9+TI4nBZOzOlXLTKnyh98aRHgGaj9oF4WRn xX3hk9EieZieBO9ABhupw8iGzfRfCNh5RdJ5oz4yh2n++iTN2eEmhJDZZSL9ScFfEeyS UMbmVMZkm5+iqwY77IuG01ulMsaN+9XkJfImNZrt0rmoM2Ym2EFuhzXpQzujuK7WblXB nC6XQrSBjkOcdjtu5ao3UjaUAV+a7/lVsoFWbgPLhyq/CDKTzPPakRRaclFIJz6ECPLW yUxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681598122; x=1684190122; h=mime-version:message-id:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bzRpARVh/DC15Rtjp7UkN3uau2TkY5eKaLqc+Hw0djY=; b=bKRzHQXOCXnuCzE2tMu2bT5SBR873iU2u97cmBbcJXJJpF9Cl/KqmqPL1/4IrblSew G/hQwQqAyV/yXfuXyFJGbrH0cDeyJVffW0fcWhtP601IXtvPAyhDv5MjWANPHsrvCCXc 2DXp2P3hZaQFJjPM2SDpNdxHZ3qCdP+EgF7mTfCORD5KxSSsbAM2XKAMikfR09zet11g yySTMdLEcQzrDCxP45CRBZkCtqv35IXV5QUfvt+qtY1sBeg4wT+fz/pZfdwLhQTY1mL7 bryhnaackWH8JcYApVohcyr6iC+e/0MGQIQzk+GMyeliPnjdQc7eT1b/lvRGqpFRi79C TCIA== X-Gm-Message-State: AAQBX9cOsVL/C8lwTknEDKQJgq+14mqLWZGDeRNhPdOcLLdQvIduVWC9 vL1FfQPyN/MQrFQJLBwZCtN4ReEGeL4xVg== X-Google-Smtp-Source: AKy350Y1BA1ZAz3wAaKF5AzJa63Q0AWVc/WxpR/E9nVmLG7eoZkzp1T8kNCfYzr5F+wwSHKpBYmDnA== X-Received: by 2002:a17:906:b88d:b0:94f:3312:3daf with SMTP id hb13-20020a170906b88d00b0094f33123dafmr1485805ejb.66.1681598122514; Sat, 15 Apr 2023 15:35:22 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg16-20020a170907205000b0094a85f6074bsm4306035ejb.33.2023.04.15.15.35.22 for <62873@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 15:35:22 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 13 Apr 2023 15:33:22 +0200 Message-ID: <01feb5d46e7959b7818737ef348717bf56cd626a.camel@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches meson-build-system now sets bindir, so we don't need to move the files. * gnu/packages/gtk.scm (gtk+-3)[arguments]: Do not attempt to move /bin. --- gnu/packages/gtk.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e49115ad0e..64058fbf66 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1208,7 +1208,6 @@ (define-values (out bin doc) (assoc-ref outputs "doc"))) (for-each mkdir-p (list - (string-append bin "/bin") (string-append bin "/share/applications") (string-append bin "/share/icons") (string-append bin "/share/man") @@ -1220,7 +1219,6 @@ (define-values (out bin doc) (string-append out dir) (string-append bin dir))) (list - "/bin" "/share/applications" "/share/icons" "/share/man")) From patchwork Sun Apr 16 05:47:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49188 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 8D2C1175D4; Sun, 16 Apr 2023 06:51:42 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7F9FE17570 for ; Sun, 16 Apr 2023 06:51:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnvI4-0001DX-Ce; Sun, 16 Apr 2023 01:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnvI1-0001Ck-C2 for guix-patches@gnu.org; Sun, 16 Apr 2023 01:51:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnvHz-0004rE-Bj for guix-patches@gnu.org; Sun, 16 Apr 2023 01:51:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnvHy-0004Aw-KS; Sun, 16 Apr 2023 01:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62873] [PATCH gnome-team 6/6] gnu: gst-plugins-base: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sun, 16 Apr 2023 05:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62873@debbugs.gnu.org Cc: rg@raghavgururajan.name X-Debbugs-Original-Xcc: rg@raghavgururajan.name Received: via spool by 62873-submit@debbugs.gnu.org id=B62873.168162423815096 (code B ref 62873); Sun, 16 Apr 2023 05:51:02 +0000 Received: (at 62873) by debbugs.gnu.org; 16 Apr 2023 05:50:38 +0000 Received: from localhost ([127.0.0.1]:50477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnvHZ-0003vP-Ij for submit@debbugs.gnu.org; Sun, 16 Apr 2023 01:50:37 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:49439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnvHX-0003uG-MC for 62873@debbugs.gnu.org; Sun, 16 Apr 2023 01:50:36 -0400 Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-3f16b99b936so2939595e9.3 for <62873@debbugs.gnu.org>; Sat, 15 Apr 2023 22:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681624229; x=1684216229; h=mime-version:message-id:to:subject:date:from:references:in-reply-to :from:to:cc:subject:date:message-id:reply-to; bh=xie6Cx07XH9rW/5tMDEZ2RsR/mTk2DcyQm0zk7KPlUg=; b=UhEfXJ7U2RhR/xK76QmKvCGbK8tMFkw+lC6wkuXwdKxzAgwg3036utnKLm+At10L0z YzL9qSRL1kXBWv8w7Pfa6M+96iQWtcS4Mo3c2XAn9+NDgOdGcdSGdzoSJz/BJVcha0ve f3hEImyoL6EEGSc5ctlQDObxlt9Jhy2JWAIdGQ8X8Ahf2WrskPb5vDS6+kATpiqhTpAF +peQB2P1/XpAaFBBeqh+KQdE9AhoqfCyrlhTaeKeAW2d9TKmgkeCBylHlzccQYiNuGJ/ p4oT1UQLAuEZtlL+JakAxV7fRoYdVZ8iZzdrCMLlGgK/ky1Y/xwPelnJacZnRp/na5AF T8ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681624229; x=1684216229; h=mime-version:message-id:to:subject:date:from:references:in-reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xie6Cx07XH9rW/5tMDEZ2RsR/mTk2DcyQm0zk7KPlUg=; b=eEfmgh0DLH6UjKMRsp7SRDcTDYWD990OQpje5wM1/UhE4CoeB/EH6sZt2F4pmcc4Af flsutp9mifWKz6AcEEYYjvGhWkCAFq3JXFY1rHRHGaJwFNSAbLCXRoZaS7WVi/afTRmT Fqmd2KTvGTELV2oQS7YW02pvUUC0x9+zu8QBj1c8JCK3jTlaCtKmGDRU/GKdUdFdfmuo t52GN4TmC5DmcYfA/UQk/FkEDKIvDdAXJb9ua7CGThabSfohdNeYiN2XktVst8OKv6Dg sEeLevoU1s0IAlaJvfOXujZxNVEP3e9lFnSVgTPl+i+kR44byXKLVENyUQ9OTVXt2Fa/ KhbA== X-Gm-Message-State: AAQBX9ftORvg6GsdSZF+Fve2aO2VRrG+rW3MBzvzkHXP3ml2WUcDJYtw zyzciG8odLkw1/Mhs4aU1P8/0yeBnLoZ2A== X-Google-Smtp-Source: AKy350ZvnUbLACvfkfTvq6yAxLhQ9LErWIdhR7UWP8gxt+OLX23BNhuNsFIxVXWynG6845Gderae3g== X-Received: by 2002:a5d:45ce:0:b0:2f6:de1f:acb6 with SMTP id b14-20020a5d45ce000000b002f6de1facb6mr2766790wrs.34.1681624229153; Sat, 15 Apr 2023 22:50:29 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id f17-20020adff8d1000000b002ef222822d5sm7280400wrq.74.2023.04.15.22.50.28 for <62873@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 22:50:28 -0700 (PDT) In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 16 Apr 2023 07:47:00 +0200 Message-ID: <43da6ec9e3cd102cdd1403d144009ba15b2d6769.camel@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/gst-plugins-base-fix-broken-test.patch: New file. * gnu/packages/gstreamer.scm (gst-plugins-base)[patches]: Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- As a follow-up to the master merge, the good, bad, and ugly plugins as well as gst-editing-services build with this simple trick. gnu/local.mk | 1 + gnu/packages/gstreamer.scm | 3 ++- .../gst-plugins-base-fix-broken-test.patch | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gst-plugins-base-fix-broken-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 72b73761d8..1d7c5696f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1303,6 +1303,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ + %D%/packages/patches/gst-plugins-base-fix-broken-test.patch \ %D%/packages/patches/gtk2-fix-builder-test.patch \ %D%/packages/patches/gtk2-harden-list-store.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 0d051438e3..486ebe6dcd 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -554,7 +554,8 @@ (define-public gst-plugins-base name "-" version ".tar.xz")) (sha256 (base32 - "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb")))) + "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb")) + (patches (search-patches "gst-plugins-base-fix-broken-test.patch")))) (build-system meson-build-system) (propagated-inputs (list glib ;required by gstreamer-sdp-1.0.pc diff --git a/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch new file mode 100644 index 0000000000..2785983d8d --- /dev/null +++ b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch @@ -0,0 +1,22 @@ +Index: gst-plugins-base-1.22.1/tests/check/libs/allocators.c +=================================================================== +--- gst-plugins-base-1.22.1.orig/tests/check/libs/allocators.c ++++ gst-plugins-base-1.22.1/tests/check/libs/allocators.c +@@ -80,7 +80,7 @@ GST_START_TEST (test_fdmem) + + alloc = gst_fd_allocator_new (); + fail_unless (alloc); +- mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED); ++ mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED | GST_FD_MEMORY_FLAG_DONT_CLOSE); + + fail_unless (gst_memory_map (mem, &info, GST_MAP_READ)); + fail_unless (info.data[5] == '5'); +@@ -95,7 +95,7 @@ GST_START_TEST (test_fdmem) + gst_memory_unmap (mem, &info); + + gst_memory_unref (mem); +- fail_unless (g_close (fd, NULL) == 0); ++ fail_unless (g_close (fd, NULL)); + gst_object_unref (alloc); + } +