* [bug#64007] [PATCH 0/2] Add CapyPDF
@ 2023-06-11 16:34 Liliana Marie Prikler
2023-06-11 16:33 ` [bug#64007] [PATCH 1/2] gnu: meson: Update to 1.1.1 Liliana Marie Prikler
2023-09-08 19:24 ` bug#64007: [PATCH 0/2] Add CapyPDF Liliana Marie Prikler
0 siblings, 2 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2023-06-11 16:34 UTC (permalink / raw)
To: 64007
Hi Guix,
this "updates" a4pdf to the new package name, while also adding a new
graft for meson that makes it accept C++23.
Cheers
Liliana Marie Prikler (2):
gnu: meson: Update to 1.1.1.
gnu: Add capypdf.
gnu/packages/build-tools.scm | 14 ++++++++++++++
gnu/packages/pdf.scm | 29 ++++++++++++++---------------
2 files changed, 28 insertions(+), 15 deletions(-)
base-commit: e8c207589d431c00b5f1a8175f391020323a3d27
--
2.40.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#64007] [PATCH 1/2] gnu: meson: Update to 1.1.1.
2023-06-11 16:34 [bug#64007] [PATCH 0/2] Add CapyPDF Liliana Marie Prikler
@ 2023-06-11 16:33 ` Liliana Marie Prikler
2023-06-11 16:34 ` [bug#64007] [PATCH 2/2] gnu: Add capypdf Liliana Marie Prikler
2023-09-08 19:24 ` bug#64007: [PATCH 0/2] Add CapyPDF Liliana Marie Prikler
1 sibling, 1 reply; 4+ messages in thread
From: Liliana Marie Prikler @ 2023-06-11 16:33 UTC (permalink / raw)
To: 64007
* 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(+)
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")
base-commit: e8c207589d431c00b5f1a8175f391020323a3d27
--
2.40.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#64007] [PATCH 2/2] gnu: Add capypdf.
2023-06-11 16:33 ` [bug#64007] [PATCH 1/2] gnu: meson: Update to 1.1.1 Liliana Marie Prikler
@ 2023-06-11 16:34 ` Liliana Marie Prikler
0 siblings, 0 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2023-06-11 16:34 UTC (permalink / raw)
To: 64007
* 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"))
--
2.40.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#64007: [PATCH 0/2] Add CapyPDF
2023-06-11 16:34 [bug#64007] [PATCH 0/2] Add CapyPDF Liliana Marie Prikler
2023-06-11 16:33 ` [bug#64007] [PATCH 1/2] gnu: meson: Update to 1.1.1 Liliana Marie Prikler
@ 2023-09-08 19:24 ` Liliana Marie Prikler
1 sibling, 0 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2023-09-08 19:24 UTC (permalink / raw)
To: 64007-done
CapyPDF has been added for a long while by now.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-08 19:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-11 16:34 [bug#64007] [PATCH 0/2] Add CapyPDF Liliana Marie Prikler
2023-06-11 16:33 ` [bug#64007] [PATCH 1/2] gnu: meson: Update to 1.1.1 Liliana Marie Prikler
2023-06-11 16:34 ` [bug#64007] [PATCH 2/2] gnu: Add capypdf Liliana Marie Prikler
2023-09-08 19:24 ` bug#64007: [PATCH 0/2] Add CapyPDF Liliana Marie Prikler
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).