From patchwork Sun Jun 11 16:33:09 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: 50842 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 CCC4D27BBEA; Sun, 11 Jun 2023 17:41:21 +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 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 5C48927BBE2 for ; Sun, 11 Jun 2023 17:41:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8O7n-0005Ww-GP; Sun, 11 Jun 2023 12:41:07 -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 1q8O7i-0005Va-MA for guix-patches@gnu.org; Sun, 11 Jun 2023 12:41:05 -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 1q8O7i-000739-DR for guix-patches@gnu.org; Sun, 11 Jun 2023 12:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8O7i-0000IA-9W for guix-patches@gnu.org; Sun, 11 Jun 2023 12:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64007] [PATCH 1/2] gnu: meson: Update to 1.1.1. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Jun 2023 16:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64007 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64007@debbugs.gnu.org Received: via spool by 64007-submit@debbugs.gnu.org id=B64007.16865016571095 (code B ref 64007); Sun, 11 Jun 2023 16:41:02 +0000 Received: (at 64007) by debbugs.gnu.org; 11 Jun 2023 16:40:57 +0000 Received: from localhost ([127.0.0.1]:37689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8O7d-0000HW-9Q for submit@debbugs.gnu.org; Sun, 11 Jun 2023 12:40:57 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:50317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8O7a-0000H6-Mb for 64007@debbugs.gnu.org; Sun, 11 Jun 2023 12:40:55 -0400 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-9788faaca2dso598479366b.0 for <64007@debbugs.gnu.org>; Sun, 11 Jun 2023 09:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686501648; x=1689093648; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=5pD78zdNFYThWSC72Ni+fhP1krvphc/BHKfByturHBg=; b=nUu+qBLvndRU1wYmRoLvObYIe3ZfIbfaMIAt/CyezlnEn7QHUSzJ/Cfo3yCeK8Gvmb XaOOTn73xDLdtp42ctMeaVbelknO3HBTI7oaxCGWsfTWKHJQ0ljlAbHqscCDHIq6tZhn CTRRgFmhjiQNEab4OwUzjGhcVeaeUmW0u9GpnKjaPzgNvgNHDzwd8h8O454Wl3PMfgde ruayLSZHjCq243HXjeGvlY19PUkZ69fM+Hbtdsw8pFKzZ0W8Fqtm/4Ks9SW/CB3ob2Jg ZAowOWUO055xWb+uhEeyLl6FyZ6ytroWMEIvjOwesJwWhgO1kvgs4ZYvlFFx5A7IG3kO mkOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686501648; x=1689093648; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=5pD78zdNFYThWSC72Ni+fhP1krvphc/BHKfByturHBg=; b=FZ/zKNckR6igeLUoEd/QCqJSCKRq4XMMI+NliT3vqzAPiHTD8oVh+FzA/gkY87hCRz LjbTCHSa9BKgVeEV7P0JvsB/iNk7qP5wsOQz7XTGchQIPjdLzl+AIm1OjB+ij0MyYZda JPImrCt2XlTQJ4awWIeN2f6AAVeOcdBko6Tx7/9AGpsBtXLZexYQoyYO7f1jWMqcNXJJ pNGDUNSfVgGGyK71GAoOieRdrHGYe787qLkkQtoYyOkMkNuhw5I2jC0eemRoc8J3zbF1 5CxiTY2bAviMh5gI7IgUNshnawVY3Gcs12+Al8PzTjfzdoGjD5zog5QnjRUHkFt4eiA4 bqbQ== X-Gm-Message-State: AC+VfDy6yzdkVp6n/5HhF411d1N2N8nxJRHxRvM2Lgboe2EUWjjGBPqT /HCbADJ6xSfz4tcPttg6A+cic9IvuJrKE32C X-Google-Smtp-Source: ACHHUZ7DXGq6gSSVE6WUpIkSj/jRh/nr+lnYStx79jmbB7uGyFnnBq0/G+WqrAUzTpd3rEzPeqeRow== X-Received: by 2002:a17:906:9c84:b0:973:c070:1b5f with SMTP id fj4-20020a1709069c8400b00973c0701b5fmr7875125ejc.44.1686501648444; Sun, 11 Jun 2023 09:40:48 -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 v5-20020a170906858500b0096f72424e00sm3993084ejx.131.2023.06.11.09.40.48 for <64007@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 09:40:48 -0700 (PDT) Message-Id: From: Liliana Marie Prikler Date: Sun, 11 Jun 2023 18:33:09 +0200 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): Replace with meson/newer. (meson/newer): New variable. --- gnu/packages/build-tools.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) base-commit: e8c207589d431c00b5f1a8175f391020323a3d27 diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index f3bf0857dd..190f263d31 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -293,6 +293,7 @@ (define-public gn (define-public meson (package (name "meson") + (replacement meson/newer) (version "1.1.0") (source (origin (method url-fetch) @@ -329,6 +330,19 @@ (define-public meson resembles Python.") (license license:asl2.0))) +(define-public meson/newer + (package + (inherit meson) + (version "1.1.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mesonbuild/meson/" + "releases/download/" version "/meson-" + version ".tar.gz")) + (sha256 + (base32 + "073vf8059nzs6p5aaqr5wva4pgl81540szdb5yw9yhyajwgm8jyh")))))) + (define-public meson-python (package (name "meson-python") From patchwork Sun Jun 11 16:34:02 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: 50841 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 58BB627BBEA; Sun, 11 Jun 2023 17:41:15 +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=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 7169327BBE2 for ; Sun, 11 Jun 2023 17:41:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8O7l-0005Vf-9O; Sun, 11 Jun 2023 12:41: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 1q8O7i-0005VS-9F for guix-patches@gnu.org; Sun, 11 Jun 2023 12:41:02 -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 1q8O7i-000733-0V for guix-patches@gnu.org; Sun, 11 Jun 2023 12:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8O7h-0000I2-SM for guix-patches@gnu.org; Sun, 11 Jun 2023 12:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64007] [PATCH 2/2] gnu: Add capypdf. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Jun 2023 16:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64007 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64007@debbugs.gnu.org Received: via spool by 64007-submit@debbugs.gnu.org id=B64007.16865016571089 (code B ref 64007); Sun, 11 Jun 2023 16:41:01 +0000 Received: (at 64007) by debbugs.gnu.org; 11 Jun 2023 16:40:57 +0000 Received: from localhost ([127.0.0.1]:37687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8O7c-0000HU-SX for submit@debbugs.gnu.org; Sun, 11 Jun 2023 12:40:57 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:47179) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8O7a-0000H7-Ow for 64007@debbugs.gnu.org; Sun, 11 Jun 2023 12:40:55 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-977e0fbd742so512271066b.2 for <64007@debbugs.gnu.org>; Sun, 11 Jun 2023 09:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686501649; x=1689093649; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=rxmX9uR62xL/7MyigjCw0r3M1haLwRlCXzSafoPgWec=; b=L/C2YI5Y/ZAxrCyuoSlCLv7g2LkNQbYSUTEFEe6LnSwMhZoc1g3iyU0GLSCbP45PGf Ek35+SeOCMmNFu57hjDHRUxiUxAL25qa/n7aubfT4Jp5Ewfo81ndNSmSD5wDfpj8XV+d HeppEZ6sI5JWZV7nBwEdSZnLH4RWnmgyWPGmH8JprdVod8Ibezm9Ytjx95fMWLqRI8JQ e00xzGBLAbgfvjVP/WQMbYDgTQ0int7WcmytmuRR7rkya8gLtIKlArRKaaw49SRl54jc SCgeM3WBpdKWpNuMbRZOyOHD8D0kposFLvuQ4CV8775/6bwU6WTpNyzX0XxaoPWrbIo+ MxrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686501649; x=1689093649; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rxmX9uR62xL/7MyigjCw0r3M1haLwRlCXzSafoPgWec=; b=MXGLnqnqsfDcSZOCf9srYIT4nnnB2ozCWnZIqMHC2Tw21ZMy3zhkA6o0SYgEzaOXam LCEK2x4ISG0/YOq9tz/I5ndwwIxNwr7PmKkprJ0UP5vMoOd/tFnQCggh3vkGzUL2uApq 3vFyJjiqqWDUYkWhUkAvFR12vawKg2uo90mSo4Wl9TgpEpMeC4lLZvbQvOrX738Eew5L Hp0M0riYZKTg9K70vuExzI0m8xNhvqtyN6iQasHHsxE2hPoajPqrDal8v8zurAHMA7N0 A2B4ONyJcUCfC7uPycEr3IpEJibxi3h5PmFNINQs/DlwfEHMBp5AREQK7sn4l6AUfpkv 96Bw== X-Gm-Message-State: AC+VfDw6vbyKVenEXiUYWsfciiSgKRkhiC0MHucFHfduImy0+pKczkgO G/KXvlVfaUPt4D1l8+ZYBBtAGurf6jwwJWvJ X-Google-Smtp-Source: ACHHUZ4aCJgW9TCM0tXUaMNrGinxM5+U36Bzky/kcFwGGRLmYPJIxvT/nqPZaegn4snR/NhGKoX/4g== X-Received: by 2002:a17:907:1b1a:b0:978:992e:efd1 with SMTP id mp26-20020a1709071b1a00b00978992eefd1mr6591514ejc.35.1686501648888; Sun, 11 Jun 2023 09:40:48 -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 v5-20020a170906858500b0096f72424e00sm3993084ejx.131.2023.06.11.09.40.48 for <64007@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 09:40:48 -0700 (PDT) Message-Id: <4cd4af2d61d0da74ce3606cf8f5db061dcd0f4e8.1686501460.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 11 Jun 2023 18:34:02 +0200 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/pdf.scm (capypdf): New variable. (a4pdf): Deprecate in favor of capypdf. --- gnu/packages/pdf.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 1f3cc4ba46..96d4484bf2 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -68,6 +68,7 @@ (define-module (gnu packages pdf) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages game-development) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -113,21 +114,23 @@ (define-module (gnu packages pdf) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) -(define-public a4pdf +(define-public capypdf (package - (name "a4pdf") - (version "0.1.0") + (name "capypdf") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jpakkane/a4pdf") + (url "https://github.com/jpakkane/capypdf") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "18062cm1qsbaymmjar0whbd7kaggy4x7wzp7xw94kcd1pwx2jp1p")))) + (base32 "193izn2jw55w2dxy6l0vz5zrlar9lm7a6z443nw0vs4mlj4jnasi")))) (build-system meson-build-system) (arguments - (list #:phases + (list #:meson meson/newer + #:test-options '(list "plainc") + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'add-missing-header (lambda _ @@ -139,14 +142,7 @@ (define-public a4pdf ;; XXX: remove when bumping glib (substitute* "src/pdfviewer.cpp" (("G_APPLICATION_DEFAULT_FLAGS") - "G_APPLICATION_FLAGS_NONE")))) - (add-after 'unpack 'fix-broken-tests - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (substitute* "test/a4pdftests.py" - (("'Ghostscript not found, test suite can not be run.'") - ;; Sucks, but there's no point in repairing a certain test - ;; at the moment. - "0"))))))) + "G_APPLICATION_FLAGS_NONE"))))))) (inputs (list fmt freetype gtk @@ -155,7 +151,8 @@ (define-public a4pdf libpng zlib)) (native-inputs (list font-google-noto - ;; ghostscript + gcc-12 + ghostscript pkg-config python python-pillow)) @@ -167,6 +164,9 @@ (define-public a4pdf convert data in any way.") (license license:asl2.0))) +(define-public a4pdf + (deprecated-package "a4pdf" capypdf)) + (define-public diffpdf (let ((commit "ba68231d3d05e0cb3a2d4a4fca8b70d4044f4303") (revision "1"))