From 3d3f03cda89688b2fd18a3ac363559a29f5bd082 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 11 Jun 2023 18:34:02 +0200 Subject: gnu: Add capypdf. * 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")) -- cgit v1.2.3