[PATCH core-updates] Replace pkg-config with pkgconf to reduce propagation / Inkscape updates

+++ b/gnu/local.mk

+# Copyright © 2018, 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>

+ %D%/packages/patches/atf-execute-with-shell.patch \

+++ b/gnu/packages/check.scm

+;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>

+(define-public atf

+ (package

+ (name "atf")

+ (version "0.21")

+ (source (origin

+ (method git-fetch)

+ (uri (git-reference

+ (url "https://github.com/freebsd/atf")

+ (commit (string-append name "-" version))))

+ (file-name (git-file-name name version))

+ (sha256

+ (base32

+ "0jwzz6g9jdi5f8v10y0wf3hq73vxyv5qqhkh832ddsj36gn8rlcz"))

+ (patches (search-patches "atf-execute-with-shell.patch"))))

+ (build-system gnu-build-system)

+ (arguments

+ (list #:configure-flags

+ #~(list (string-append "ATF_SHELL="

+ #$(this-package-input "bash-minimal")

+ "/bin/sh"))))

+ (native-inputs (list autoconf automake libtool))

+ (inputs (list bash-minimal))

+ (home-page "https://github.com/freebsd/atf")

+ (synopsis "C/C++ Automated Testing Framework libraries")

+ (description "ATF, or Automated Testing Framework, is a collection of

+libraries to write test programs in C, C++ and POSIX shell.

+

+The ATF libraries offer a simple API. The API is orthogonal through the

+various bindings, allowing developers to quickly learn how to write test

+programs in different languages.

+

+ATF-based test programs offer a consistent end-user command-line interface to

+allow both humans and automation to run the tests.

+

+ATF-based test programs rely on an execution engine to be run and this

+execution engine is not shipped with ATF. Kyua is the engine of choice.")

+ (license (list license:bsd-2 license:bsd-3))))

+

+++ b/gnu/packages/patches/atf-execute-with-shell.patch

+Submitted here: https://github.com/freebsd/atf/pull/57

+

+From 098b66269b1cf1d944b8b214ceb7ce9febde3682 Mon Sep 17 00:00:00 2001

+From: Maxim Cournoyer <maxim.cournoyer@gmail.com>

+Date: Mon, 29 Jan 2024 22:35:49 -0500

+Subject: [PATCH] Fix use after free in execute_with_shell.

+

+The temporary string returned by atf::env::get would be used outside

+its statement, which is invalid and cause undefined behavior. Copy it

+to a local variable to avoid the issue.

+

+Fixes: https://github.com/freebsd/atf/issues/26

+Fixes: https://github.com/freebsd/kyua/issues/223

+

+Reported-by: Ruslan Bukin <br@bsdpad.com>

+---

+ atf-sh/atf-check.cpp | 4 +++-

+ 1 file changed, 3 insertions(+), 1 deletion(-)

+

+diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp

+index 41f0b13..9d6f7a8 100644

+--- a/atf-sh/atf-check.cpp

++++ b/atf-sh/atf-check.cpp

+@@ -436,7 +436,9 @@ execute_with_shell(char* const* argv)

+ const std::string cmd = flatten_argv(argv);

+

+ const char* sh_argv[4];

+- sh_argv[0] = atf::env::get("ATF_SHELL", ATF_SHELL).c_str();

++ const std::string shell = atf::env::get("ATF_SHELL", ATF_SHELL);

++

++ sh_argv[0] = shell.c_str();

+ sh_argv[1] = "-c";

+ sh_argv[2] = cmd.c_str();

+ sh_argv[3] = NULL;

+

+base-commit: 18eb8168b70a0f934b4824b6391b55ac0b2f4fdf

+--

+2.41.0

+

+++ b/gnu/packages/check.scm

+ #:use-module (gnu packages gdb)

+ #:use-module (gnu packages lua)

+ #:use-module (gnu packages sqlite)

+(define-public kyua

+ (package

+ (name "kyua")

+ (version "0.13")

+ (source (origin

+ (method git-fetch)

+ (uri (git-reference

+ (url "https://github.com/freebsd/kyua")

+ (commit (string-append name "-" version))))

+ (file-name (git-file-name name version))

+ (sha256

+ (base32

+ "1jzdal9smhmivj18683a5gy8jd2p1dbni7kcpaxq4g9jgjdidcrq"))))

+ (build-system gnu-build-system)

+ (arguments

+ (list

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-after 'unpack 'patch-paths

+ (lambda _

+ (substitute* '("Makefile.am"

+ "utils/process/isolation_test.cpp"

+ "utils/stacktrace_test.cpp"

+ "integration/utils.sh"

+ "integration/cmd_test_test.sh")

+ (("/bin/sh")

+ ;; The 'local-kyua' generated script in Makefile.am is used

+ ;; to run the built kyua binary for tests.

+ (which "sh")))))

+ (add-after 'unpack 'fix-to_absolute-test

+ ;; This test checks for the existence of /bin and /bin/ls.

+ (lambda _

+ (substitute* "utils/fs/path_test.cpp"

+ (("chdir\\(\"/bin\")")

+ (format #f "chdir(~s)" (dirname (which "ls"))))

+ (("\"/bin/ls\"")

+ (string-append "\"" (which "ls") "\"")))))

+ (add-before 'check 'prepare-for-tests

+ (lambda _

+ ;; The test suite expects HOME to be writable.

+ (setenv "HOME" "/tmp")

+ ;; Generate the autom4te-generated testsuite script, which

+ ;; contains a '/bin/sh' shebang.

+ (invoke "make" "bootstrap/testsuite")

+ (substitute* "bootstrap/testsuite"

+ (("/bin/sh")

+ (which "sh")))))

+ (add-after 'unpack 'disable-problematic-tests

+ (lambda _

+ ;; The stacktrace tests expect core files to be dumped to the

+ ;; current directory, which doesn't happen with our kernel

+ ;; configuration (see:

+ ;; https://github.com/freebsd/kyua/issues/214).

+ (substitute* "utils/Kyuafile"

+ ((".*atf_test_program.*stacktrace_test.*")

+ "")))))))

+ (native-inputs (list autoconf automake gdb pkg-config))

+ (inputs (list atf lutok sqlite))

+ (home-page "https://github.com/freebsd/kyua")

+ (synopsis "Testing framework for infrastructure software")

+ (description "Kyua is a testing framework for infrastructure software.

+Kyua is lightweight and simple, and integrates well with various build systems

+and continuous integration frameworks. Kyua features an expressive test suite

+definition language, a safe runtime engine for test suites and a powerful

+report generation engine.")

+ (license license:bsd-3)))

+

+++ b/gnu/packages/pkg-config.scm

+;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>

+ #:use-module (gnu packages check)

+ (arguments

+ (list #:phases #~(modify-phases %standard-phases

+ (add-after 'unpack 'set-HOME

+ (lambda _

+ ;; Kyua requires a writable HOME.

+ (setenv "HOME" "/tmp"))))))

+ (native-inputs (list atf kyua))

+++ b/gnu/packages/pkg-config.scm

+

+(define-public pkgconf-as-pkg-config

+ (package/inherit pkgconf

+ (name "pkgconf-as-pkg-config")

+ (build-system gnu-build-system)

+ (arguments

+ (list

+ #:tests? #f

+ #:phases

+ #~(modify-phases %standard-phases

+ (delete 'configure)

+ (delete 'build)

+ (replace 'install

+ (lambda* (#:key inputs #:allow-other-keys)

+ (let ((pkgconf (search-input-file inputs "bin/pkgconf")))

+ (mkdir-p (string-append #$output "/bin"))

+ (symlink pkgconf (string-append #$output "/bin/pkg-config"))

+

+ ;; Also make 'pkg.m4' available, some packages might expect it.

+ (mkdir-p (string-append #$output "/share"))

+ ;; XXX: Using '#$(this-package-input "pkgconf") here would

+ ;; create a cycle.

+ (symlink (string-append (dirname (dirname pkgconf))

+ "/share/aclocal")

+ (string-append #$output "/share/aclocal"))))))))

+ (native-inputs '())

+ (inputs (list pkgconf))

+ (propagated-inputs '())))

+++ b/gnu/packages/pkg-config.scm

+ #:export (pkg-config

+ pkgconf

+ pkgconf-as-pkg-config))

+

+;;;

+;;; "Primitive" pkg-config packages.

+;;;

+

+;; The %-less variants defined below should be used instead; the %-prefixed

+;; "primitive" packages are exported so that `fold-packages' can find them,

+;; making them available for use via the Guix CLI.

+(define-public %pkgconf

+(define-public %pkgconf-as-pkg-config

+ (package/inherit %pkgconf

+ (inputs (list %pkgconf))

+

+

+;;;

+;;; Tooling for generating pkg-config wrappers for cross-compiling.

+;;;

+

+(define (make-cross-pkg-config pkg-config)

+ (mlambda (target)

+ "Return a procedure that evaluates to a PKG-CONFIG package for TARGET,

+essentially just a wrapper called `TARGET-pkg-config', as `configure' scripts

+like it."

+ ;; See <http://www.flameeyes.eu/autotools-mythbuster/pkgconfig/cross-compiling.html>

+ ;; for details.

+ (package

+ (inherit pkg-config)

+ (name (string-append (package-name pkg-config) "-" target))

+ (build-system trivial-build-system)

+ (arguments

+ (list

+ #:builder (with-imported-modules '((guix build utils))

+ #~(begin

+ (use-modules (guix build utils))

+

+ (let* ((in #+pkg-config)

+ (out #$output)

+ (bin (string-append out "/bin"))

+ (prog (string-append #$target "-pkg-config"))

+ (native (string-append in "/bin/pkg-config")))

+

+ (mkdir-p bin)

+

+ ;; Create a `TARGET-pkg-config' -> `pkg-config' symlink.

+ ;; This satisfies the pkg.m4 macros, which use

+ ;; AC_PROG_TOOL to determine the `pkg-config' program

+ ;; name.

+ (symlink native (string-append bin "/" prog))

+

+ ;; Also make 'pkg.m4' available, some packages might

+ ;; expect it.

+ (mkdir-p (string-append out "/share"))

+ (symlink (string-append in "/share/aclocal")

+ (string-append out "/share/aclocal")))))))

+

+ ;; Ignore native inputs, and set `PKG_CONFIG_PATH' for target inputs.

+ (native-search-paths '())

+ (search-paths (package-native-search-paths pkg-config)))))

+

+(define (make-pkg-config-for-target pkg-config)

+ "Return a procedure that evaluates to a `pkg-config' package for TARGET

+built from PKG-CONFIG. The target may be either #f for a native build, or a

+GNU triplet."

+ (let ((cross-pkg-config (make-cross-pkg-config pkg-config)))

+ (lambda (target)

+ (if target

+ (cross-pkg-config target)

+ pkg-config))))

+

+(define pkg-config-for-target

+ (make-pkg-config-for-target %pkg-config))

+

+(define pkgconf-for-target

+ (make-pkg-config-for-target %pkgconf))

+

+(define pkgconf-as-pkg-config-for-target

+ (make-pkg-config-for-target %pkgconf-as-pkg-config))

+

+

+;;;

+;;; The final pkg-config package variables to use.

+;;;

+

+;; These are a hacks for automatically choosing the native or the cross

+;; `pkg-config' depending on whether it's being used in a cross-build

+;; environment or not.

+(define-syntax pkg-config

+ (identifier-syntax (pkg-config-for-target (%current-target-system))))

+

+(define-syntax pkgconf

+ (identifier-syntax (pkgconf-for-target (%current-target-system))))

+

+(define-syntax pkgconf-as-pkg-config

+ (identifier-syntax (pkgconf-as-pkg-config-for-target

+ (%current-target-system))))

+

+

+;;;

+;;; pkg-config packages for native use (build-time only).

+;;;

+(define (make-pkg-config-for-build pkg-config)

+ "Return a `pkg-config' package from PKG-CONFIG for use by the builder when

+cross-compiling, that honors a PKG_CONFIG_PATH_FOR_BUILD search path instead

+of PKG_CONFIG_PATH, to avoid conflicting with the target `pkg-config'."

+ (package

+ (inherit (hidden-package pkg-config))

+ (name "pkg-config-for-build")

+ (version "0")

+ (source #f)

+ (build-system trivial-build-system)

+ (inputs (list bash-minimal pkg-config))

+ (arguments

+ (list

+ #:modules '((guix build utils))

+ #:builder

+ #~(begin

+ (use-modules (guix build utils))

+ (define where (string-append #$output "/bin/pkg-config"))

+ (mkdir-p (dirname where))

+ (call-with-output-file where

+ (lambda (port)

+ (format port "#!~a

+export PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH_FOR_BUILD\"

+exec ~a \"$@\""

+ (search-input-file %build-inputs "bin/bash")

+ (search-input-file %build-inputs "bin/pkg-config"))))

+ (chmod where #o500))))

+ (native-search-paths

+ (map (lambda (original)

+ (search-path-specification

+ (inherit original)

+ (variable "PKG_CONFIG_PATH_FOR_BUILD")))

+ (package-native-search-paths pkg-config)))))

+

+(define-public pkg-config-for-build

+ (make-pkg-config-for-build %pkg-config))

+

+(define-public pkgconf-as-pkg-config-for-build

+ (make-pkg-config-for-build %pkgconf-as-pkg-config))

+++ b/gnu/packages/commencement.scm

+ ;; Avoid a circular dependency by creating a new bootstrap pkg-config

+ ;; variant.

+ ;; Refer to %pkgconf-as-pkg-config instead of

+ ;; pkgconf-as-pkg-config to ensure native package is

+ ;; used.

+ (inherit (with-boot5 %pkgconf-as-pkg-config)))))

+++ b/gnu/packages/pkg-config.scm

+ #:use-module (srfi srfi-1)

+ #:export (old-pkg-config ;the original

+ pkg-config ;alias for pkgconf-as-pkg-config

+;;; This is the package exposed to the CLI, to ease updates via 'guix

+;;; refresh'.

+(define-public %pkgconf-with-tests

+;;; This is the minimal, untested variant used to avoid circular dependencies.

+(define-public %pkgconf

+ (hidden-package

+ (package/inherit %pkgconf-with-tests

+ (arguments (list #:tests? #f))

+ (native-inputs '()))))

+

+ (propagated-inputs '())

+ (properties (alist-delete 'hidden? (package-properties %pkgconf)))))

+(define-syntax old-pkg-config

+;;; This alias is to ensure we use pkgconf instead of pkg-config across Guix,

+;;; which includes welcome refinements such as proper handling of the

+;;; Requires.private field.

+(define pkg-config pkgconf-as-pkg-config)

+

+++ b/gnu/packages/graphics.scm

+ (version "0.31.10")

+ "0ai91c567c5z560s4zjgjclgca1pm61h8cb8c8q84wg3xvkhmc9x"))))

+ pstoedit

+ ;; pango is required because of libtool, from the imagemagick

+ ;; library files (.la), which records all its transitive

+ ;; dependencies.

+ pango))

+++ b/gnu/packages/graphics.scm

+ (string-append "@IMAGEMAGICK_" var "@")))))

+ (add-after 'install 'remove-libtool-archives

+ ;; Libtool archives lists the whole transitive dependencies,

+ ;; which is unnecessary unless producing static archives and

+ ;; leads to overlinking, e.g. causing the build of inkscape

+ ;; to fail due to looking for a transitive pstoedit library.

+ (lambda _

+ (for-each delete-file

+ (find-files (string-append #$output "/lib")

+ "\\.la$")))))))

+++ b/gnu/local.mk

+ %D%/packages/patches/autotrace-pkg-config.patch \

+++ b/gnu/packages/graphics.scm

+ "0ai91c567c5z560s4zjgjclgca1pm61h8cb8c8q84wg3xvkhmc9x"))

+ (patches (search-patches "autotrace-pkg-config.patch"))))

+++ b/gnu/packages/patches/autotrace-pkg-config.patch

+Submitted upstream: https://github.com/autotrace/autotrace/pull/128

+

+diff --git a/Makefile.am b/Makefile.am

+index ea6eadd..cd9de37 100644

+--- a/Makefile.am

++++ b/Makefile.am

+@@ -127,7 +127,18 @@ autotraceinclude_HEADERS=\

+ src/exception.h \

+ src/color.h

+

+-libautotrace_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

++libautotrace_la_LDFLAGS = \

++ -version-info \

++ $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \

++ $(GRAPHICSMAGICK_LIBS) \

++ $(IMAGEMAGICK_LIBS) \

++ $(LIBPNG_LIBS) \

++ $(LIBSWF_LIBS) \

++ $(LIBPSTOEDIT_LIBS) \

++ $(GLIB2_LIBS) \

++ $(POPT_LIBS) \

++ $(INTLLIBS) \

++ -lm

+

+ #

+ # noinst_HEADERS: headers shared between lib and bin.

+@@ -143,17 +154,7 @@ autotrace_SOURCES=\

+

+ AM_CPPFLAGS = $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(LIBPSTOEDIT_CFLAGS) $(LIBSWF_CFLAGS) $(GLIB2_CFLAGS) -DLOCALEDIR=\""$(datadir)/locale"\"

+

+-autotrace_LDADD = \

+- libautotrace.la \

+- $(GRAPHICSMAGICK_LIBS) \

+- $(IMAGEMAGICK_LIBS) \

+- $(LIBPNG_LIBS) \

+- $(LIBSWF_LIBS) \

+- $(LIBPSTOEDIT_LIBS) \

+- $(GLIB2_LIBS) \

+- $(POPT_LIBS) \

+- $(INTLLIBS) \

+- -lm

++autotrace_LDADD = libautotrace.la

+

+ pkgconfigdir = $(libdir)/pkgconfig

+ pkgconfig_DATA= autotrace.pc

+diff --git a/autotrace.pc.in b/autotrace.pc.in

+index 4c2e581..c70808e 100644

+--- a/autotrace.pc.in

++++ b/autotrace.pc.in

+@@ -6,6 +6,6 @@ includedir=@includedir@

+ Name: Autotrace

+ Description: a utility that converts bitmap to vector graphics

+ Version: @VERSION@

+-Requires:

+-Libs: -L@libdir@ -lautotrace @LIBPNG_LIBS@ @MAGICK_LIBS@ @LIBSWF_LIBS@ @LIBPSTOEDIT_LIBS@ @GLIB2_LIBS@

+-Cflags: -I@includedir@ @MAGICK_CFLAGS@ @LIBPSTOEDIT_CFLAGS@ @GLIB2_CFLAGS@

++Requires.private: glib-2.0 >= 2.0 gmodule-2.0 >= 2.0 gthread-2.0 >= 2.0 gobject-2.0 >= 2.0 @REQUIRES_PRIVATE@

++Libs: -L@libdir@ -lautotrace

++Cflags: -I@includedir@

+diff --git a/configure.ac b/configure.ac

+index 43b6fea..e6cf262 100644

+--- a/configure.ac

++++ b/configure.ac

+@@ -85,7 +85,8 @@ else

+ if test "x${with_magick}" = xGraphicsMagick; then

+ PKG_CHECK_MODULES([GRAPHICSMAGICK],

+ [GraphicsMagick >= 1.3.40],

+- [HAVE_MAGICK=yes

++ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}GraphicsMagick >= 1.3.40 "

++ HAVE_MAGICK=yes

+ HAVE_GRAPHICSMAGICK=yes

+ MAGICK_LIBRARY=GraphicsMagick

+ AC_DEFINE(HAVE_GRAPHICSMAGICK, 1, [GraphicsMagick library is available.])

+@@ -97,13 +98,15 @@ else

+ if test "x${with_magick}" = xImageMagick; then

+ PKG_CHECK_MODULES([IMAGEMAGICK7],

+ [ImageMagick >= 7.0.1],

+- [HAVE_IMAGEMAGICK7=yes

++ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}ImageMagick >= 7.0.1 "

++ HAVE_IMAGEMAGICK7=yes

+ AC_DEFINE(HAVE_IMAGEMAGICK7, 1, [ImageMagick version 7 or higher is available.])

+ ],[]

+ )

+ PKG_CHECK_MODULES([IMAGEMAGICK],

+ [ImageMagick >= 5.2.1],

+- [HAVE_MAGICK=yes

++ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}ImageMagick >= 5.2.1 "

++ HAVE_MAGICK=yes

+ HAVE_IMAGEMAGICK=yes

+ MAGICK_LIBRARY=ImageMagick

+ AC_DEFINE(HAVE_IMAGEMAGICK, 1, [ImageMagick library is available.])

+@@ -140,6 +143,7 @@ HAVE_LIBPNG=no

+ if test "x${with_png}" = xyes; then

+ PKG_CHECK_MODULES([LIBPNG],[libpng],

+ [

++ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}libpng "

+ HAVE_LIBPNG=yes

+ AC_DEFINE(HAVE_LIBPNG,1,[PNG library is available or not])

+ ],

+@@ -165,6 +169,7 @@ if test "${swf_header_found}" = yes ; then

+ PKG_CHECK_MODULES([LIBSWF],

+ [libming],

+ [

++ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}libming "

+ HAVE_LIBSWF=yes

+ AC_DEFINE(HAVE_LIBSWF,1,[SWF library is available or not])

+ ],

+@@ -187,6 +192,7 @@ if test "x${with_pstoedit}" = xyes; then

+ PKG_CHECK_MODULES([LIBPSTOEDIT],

+ [pstoedit >= 3.32.0],

+ [

++ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}pstoedit >= 3.32.0 "

+ HAVE_LIBPSTOEDIT=yes

+ AC_DEFINE(HAVE_LIBPSTOEDIT,1,[pstoedit library is available or not])

+ ],

+@@ -210,6 +216,7 @@ fi

+

+ dnl po/Makefile.in FIXME FIXME FIXME

+ AC_CONFIG_FILES([po/Makefile.in Makefile autotrace.pc])

++AC_SUBST([REQUIRES_PRIVATE])

+ AC_OUTPUT

+

+ echo "

+++ b/gnu/local.mk

+++ b/gnu/packages/gd.scm

+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>

+ (version "2.3.3")

+ (method url-fetch)

+ (uri (string-append

+ "https://github.com/libgd/libgd/releases/download/gd-"

+ version "/libgd-" version ".tar.xz"))

+ (sha256

+ (base32

+ "0qas3q9xz3wgw06dm2fj0i189rain6n60z1vyq50d5h7wbn25s1z"))

+ (patches

+ (search-patches "gd-fix-tests-on-i686.patch"

+ "gd-brect-bounds.patch"))))

+ ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding

+ ;; issues on aarch64 and other architectures.

+ (list #:make-flags #~(list "CFLAGS=-ffp-contract=off")

+ #:configure-flags #~(list "--disable-static")

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-after 'install 'remove-libtool-archives

+ ;; Libtool archives lists the whole transitive dependencies,

+ ;; which is unnecessary unless producing static archives and

+ ;; leads to overlinking, e.g. causing the configure script of

+ ;; texlive-bin to fail due to looking for a transitive jpeg

+ ;; library.

+ (lambda _

+ (for-each delete-file

+ (find-files (string-append #$output "/lib")

+ "\\.la$")))))))

+++ /dev/null

+++ b/gnu/packages/graphics.scm

+ (version "1.3")

+ "1ypcn0yxk9ny7qg8s8h3px2wpimhfgkwk7x1548ky12iqmdjjmcn"))))

+++ b/gnu/packages/inkscape.scm

+ ((#:configure-flags flags ''())

+ ;; Enable ImageMagick support.

+ #~(delete "-DWITH_IMAGE_MAGICK=OFF" #$flags))

+++ b/gnu/packages/graphics.scm

+ (list

+ #:imported-modules `((guix build python-build-system)

+ #:modules '((guix build cmake-build-system)

+ (guix build utils)

+ ((guix build python-build-system) #:prefix python:))

+ #:configure-flags

+ #~(list "-D2GEOM_BUILD_SHARED=ON"

+ "-D2GEOM_BOOST_PYTHON=ON"

+ ;; Compiling the Cython bindings fail (see:

+ ;; https://gitlab.com/inkscape/lib2geom/issues/21).

+ "-D2GEOM_CYTHON_BINDINGS=OFF")

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-after 'unpack 'patch-python-lib-install-path

+ (lambda* (#:key inputs outputs #:allow-other-keys)

+ (substitute* '("src/cython/CMakeLists.txt"

+ "src/py2geom/CMakeLists.txt")

+ (("PYTHON_LIB_INSTALL \"[^\"]*\"")

+ (format #f "PYTHON_LIB_INSTALL ~s"

+ (python:site-packages inputs outputs))))))

+ #$@(if (target-x86-32?)

+ #~((add-after 'unpack 'skip-faulty-test

+ (lambda _

+ ;; This test fails on i686 when comparing floating point

+ ;; values, probably due to excess precision. However,

+ ;; '-fexcess-precision' is not implemented for C++ in

+ ;; GCC 10 so just skip it.

+ (substitute* "tests/CMakeLists.txt"

+ (("bezier-test") "")))))

+ #~()))))

+ (native-inputs (list python-wrapper googletest pkg-config))

+ (inputs (list cairo python-pycairo double-conversion glib gsl))

+ (propagated-inputs (list boost)) ;included in 2geom/pathvector.h

+++ b/gnu/local.mk

+++ b/gnu/packages/inkscape.scm

+ #:use-module (gnu packages algebra)

+ #:use-module (gnu packages readline)

+ (version "1.3.2")

+ (base32 "0sq81smxwypgnp7r3wgza8w25dsz9qa8ga79sc85xzj3qi6q9lfv"))

+ #:configure-flags

+ #~(list "-DWITH_IMAGE_MAGICK=OFF"

+ ;; TODO: Remove after next release, since the problematic

+ ;; libsoup/soup.h include is no longer used.

+ (string-append "-DCMAKE_CXX_FLAGS=-I"

+ (search-input-directory %build-inputs

+ "/include/libsoup-2.4")))

+ ;; Use ctest directly so that we can easily exclude problematic

+ ;; tests.

+ (lambda* (#:key parallel-tests? tests? #:allow-other-keys)

+ (when tests?

+ ;; The following tests fails, perhaps due to building without

+ ;; ImageMagick (see:

+ ;; https://gitlab.com/inkscape/inbox/-/issues/10005).

+ (let ((job-count (if parallel-tests?

+ (number->string (parallel-job-count))

+ "1"))

+ (skipped-tests

+ (list "cli_export-type-caseinsensitive_check_output"

+ "cli_export-type_xaml_check_output"

+ "cli_export-height_export-use-hints_check_output"

+ "cli_export-plain-svg_check_output"

+ "cli_export-use-hints_export-id_check_output"

+ "cli_export-extension_svg_check_output"

+ "cli_export-extension_ps_check_output"

+ "cli_export-extension_eps_check_output"

+ "cli_export-extension_pdf_check_output"

+ "cli_export-plain-extension-svg_check_output"

+ ;; These fail non-deterministically (see:

+ ;; https://gitlab.com/inkscape/inbox/-/issues/10005).

+ "cli_export-ps-level_3_check_output"

+ "cli_export-ps-level_3_content_check_output"

+ "cli_export-ps-level_2_content_check_output"

+ "cli_export-ps-level_2_check_output")))

+ (invoke "make" "-j" job-count "tests")

+ (invoke "ctest" "-j" job-count

+ "--output-on-error"

+ "-E" (string-append

+ "(" (string-join skipped-tests "|") ")"))))))

+ (list autotrace

+ gspell

+ python-lxml

+ readline))

+ (list bc

+ gettext-minimal

+ (version "1.3.2")

+ (base32 "0sq81smxwypgnp7r3wgza8w25dsz9qa8ga79sc85xzj3qi6q9lfv"))))

+ (replace 'check

+ ;; Re-instate the tests disabled in inskcape/stable, now that

+ ;; their ImageMagick requirement is satisfied.

+ (assoc-ref %standard-phases 'check))

+++ /dev/null

+++ b/gnu/packages/inkscape.scm

+ (lambda* (#:key inputs #:allow-other-keys)

+ `("PATH" prefix

+ (,(dirname (search-input-file inputs "bin/python"))))

+ (,(getenv "GDK_PIXBUF_MODULE_FILE")))

+ ;; Ensure GObject Introspection typelibs are found.

+ `("GI_TYPELIB_PATH" ":" prefix

+ (,(getenv "GI_TYPELIB_PATH")))))))))

+ ;; These Python dependencies are used by the Inkscape extension

+ ;; management system. To verify that it is working, visit the

+ ;; Extensions -> Manage Extensions... menu.

+ python-appdirs

+ python-cssselect

+ python-pygobject

+ python-requests

+ (append imagemagick))) ;for libMagickCore and libMagickWand

+++ b/gnu/packages/lua.scm

+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>

+ #:use-module (gnu packages autotools)

+ #:use-module (gnu packages check)

+(define-public lutok

+ (package

+ (name "lutok")

+ (version "0.4")

+ (source (origin

+ (method git-fetch)

+ (uri (git-reference

+ (url "https://github.com/freebsd/lutok")

+ (commit (string-append name "-" version))))

+ (file-name (git-file-name name version))

+ (sha256

+ (base32

+ "0a2vc2wy5hasw69h1mz768ywx6c4ccl9jzzd4ixddwba3z3ha03b"))))

+ (build-system gnu-build-system)

+ ;; Disable the test suite to avoid a circular dependency on kyua.

+ (arguments (list #:tests? #f))

+ (native-inputs (list autoconf automake libtool pkg-config))

+ (inputs (list atf))

+ (propagated-inputs (list lua-5.2)) ;included in c_gate.hpp

+ (home-page "https://github.com/freebsd/lutok")

+ (synopsis "Lightweight C++ API for Lua")

+ (description "Lutok is a lightweight C++ API library for Lua.

+

+Lutok provides thin C++ wrappers around the Lua C API to ease the interaction

+between C++ and Lua. These wrappers make intensive use of @acronym{RAII,

+Resource Acquisition is Initialization} to prevent resource leakage, expose

+C++-friendly data types, report errors by means of exceptions and ensure that

+the Lua stack is always left untouched in the face of errors. The library

+also provides a small subset of miscellaneous utility functions built on top

+of the wrappers.

+

+Lutok focuses on providing a clean and safe C++ interface; the drawback is

+that it is not suitable for performance-critical environments. In order to

+implement error-safe C++ wrappers on top of a Lua C binary library, Lutok adds

+several layers or abstraction and error checking that go against the original

+spirit of the Lua C API and thus degrade performance.")

+ (license license:bsd-3)))

+

+++ b/gnu/packages/video.scm

+ (list perl ; for zsh completion file

+ pkg-config python-docutils python-wrapper))

+ enca

+ ladspa

+ lcms

+ libbs2b

+ libdvdnav

+ libxinerama

+ mpg123

+ rsound

+ vulkan-headers

+ vulkan-loader

+ yt-dlp

+++ b/gnu/local.mk

+ %D%/packages/patches/atf-execute-with-shell.patch \

+++ b/gnu/packages/check.scm

+;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>

+(define-public atf

+ (package

+ (name "atf")

+ (version "0.21")

+ (source (origin

+ (method git-fetch)

+ (uri (git-reference

+ (url "https://github.com/freebsd/atf")

+ (commit (string-append name "-" version))))

+ (file-name (git-file-name name version))

+ (sha256

+ (base32

+ "0jwzz6g9jdi5f8v10y0wf3hq73vxyv5qqhkh832ddsj36gn8rlcz"))

+ (patches (search-patches "atf-execute-with-shell.patch"))))

+ (build-system gnu-build-system)

+ (arguments

+ (list #:configure-flags

+ #~(list (string-append "ATF_SHELL="

+ #$(this-package-input "bash-minimal")

+ "/bin/sh"))))

+ (native-inputs (list autoconf automake libtool))

+ (inputs (list bash-minimal))

+ (home-page "https://github.com/freebsd/atf")

+ (synopsis "C/C++ Automated Testing Framework libraries")

+ (description "ATF, or Automated Testing Framework, is a collection of

+libraries to write test programs in C, C++ and POSIX shell.

+

+The ATF libraries offer a simple API. The API is orthogonal through the

+various bindings, allowing developers to quickly learn how to write test

+programs in different languages.

+

+ATF-based test programs offer a consistent end-user command-line interface to

+allow both humans and automation to run the tests.

+

+ATF-based test programs rely on an execution engine to be run and this

+execution engine is not shipped with ATF. Kyua is the engine of choice.")

+ (license (list license:bsd-2 license:bsd-3))))

+

+++ b/gnu/packages/patches/atf-execute-with-shell.patch

+Submitted here: https://github.com/freebsd/atf/pull/57

+

+From 098b66269b1cf1d944b8b214ceb7ce9febde3682 Mon Sep 17 00:00:00 2001

+From: Maxim Cournoyer <maxim.cournoyer@gmail.com>

+Date: Mon, 29 Jan 2024 22:35:49 -0500

+Subject: [PATCH] Fix use after free in execute_with_shell.

+

+The temporary string returned by atf::env::get would be used outside

+its statement, which is invalid and cause undefined behavior. Copy it

+to a local variable to avoid the issue.

+

+Fixes: https://github.com/freebsd/atf/issues/26

+Fixes: https://github.com/freebsd/kyua/issues/223

+

+Reported-by: Ruslan Bukin <br@bsdpad.com>

+---

+ atf-sh/atf-check.cpp | 4 +++-

+ 1 file changed, 3 insertions(+), 1 deletion(-)

+

+diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp

+index 41f0b13..9d6f7a8 100644

+--- a/atf-sh/atf-check.cpp

++++ b/atf-sh/atf-check.cpp

+@@ -436,7 +436,9 @@ execute_with_shell(char* const* argv)

+ const std::string cmd = flatten_argv(argv);

+

+ const char* sh_argv[4];

+- sh_argv[0] = atf::env::get("ATF_SHELL", ATF_SHELL).c_str();

++ const std::string shell = atf::env::get("ATF_SHELL", ATF_SHELL);

++

++ sh_argv[0] = shell.c_str();

+ sh_argv[1] = "-c";

+ sh_argv[2] = cmd.c_str();

+ sh_argv[3] = NULL;

+

+base-commit: 18eb8168b70a0f934b4824b6391b55ac0b2f4fdf

+--

+2.41.0

+

+++ b/gnu/local.mk

+ %D%/packages/patches/pstoedit-fix-gcc12.patch \

+ %D%/packages/patches/pstoedit-fix-plainC.patch \

+ %D%/packages/patches/pstoedit-pkglibdir.patch \

+++ b/gnu/packages/graphics.scm

+;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>

+ ;; Do not yet upgrade to 4.0.0, as its include file fails to compile for C

+ ;; project (see: https://github.com/reviczky/pstoedit/issues/2).

+ (version "4.00")

+ "1sk2mhrjgnlz4a1650p3qxrv6av6qc66ibmy48ckspx7mfp7snh7"))

+ (patches

+ (search-patches "pstoedit-fix-gcc12.patch"

+ "pstoedit-fix-plainC.patch"

+ "pstoedit-pkglibdir.patch"))))

+ (arguments

+ ;; Avoid keeping extraneous references to libtool exhaustively listed

+ ;; dependencies.

+ (list #:configure-flags #~(list "LDFLAGS=-Wl,--as-needed")))

+ (list ghostscript

+ imagemagick

+ plotutils

+ libjpeg-turbo

+ libzip

+ ;; The following inputs are pulled in by libtool, from the

+ ;; imagemagick library files (.la), which records all its

+ ;; transitive dependencies.

+ glib

+ pango))

+++ b/gnu/packages/patches/pstoedit-fix-gcc12.patch

+Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree

+

+--- a/src/drvpptx.orig.cpp 2021-08-29 16:25:45.000000000 +0200

++++ b/src/drvpptx.cpp 2022-01-28 11:57:44.765756339 +0100

+@@ -65,6 +65,7 @@

+ #define ZIP_EXTERN extern

+

+ #include <zip.h>

++#include <memory>

+

+ #ifdef _MSC_VER

+ // MS VC++ Windows

+++ b/gnu/packages/patches/pstoedit-fix-plainC.patch

+Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree

+

+diff --git a/src/pstoedit.cpp b/src/pstoedit.cpp

+index a718f37..ac0df37 100755

+--- a/src/pstoedit.cpp

++++ b/src/pstoedit.cpp

+@@ -327,6 +327,11 @@ extern FILE *yyin; // used by lexer

+ // otherwise we could declare it locally where it is used

+

+

++extern "C" DLLEXPORT void loadpstoeditplugins_plainC(const char *progname, int verbose)

++{

++ return loadpstoeditplugins(progname, cerr, (bool) verbose);

++}

++

+ static void usage(ostream & outstream, bool forTeX, bool withdetails, bool withcategories )

+ {

+ if (withcategories) {

+diff --git a/src/pstoedit.h b/src/pstoedit.h

+index 294b3c2..74ebf2a 100755

+--- a/src/pstoedit.h

++++ b/src/pstoedit.h

+@@ -100,8 +100,13 @@ void clearPstoeditDriverInfo_plainC(struct DriverDescription_S * ptr);

+

+ #ifdef __cplusplus

+ extern "C" DLLEXPORT

+-#endif

+ void loadpstoeditplugins(const char* progname, std::ostream & errstream, bool verbose);

++#endif

++

++#ifdef __cplusplus

++extern "C" DLLEXPORT

++#endif

++void loadpstoeditplugins_plainC(const char* progname, int verbose);

+

+ #ifdef __cplusplus

+ extern "C" DLLEXPORT

+--- a/src/pstoedit.orig.h 2023-07-22 19:27:43.691166652 +0200

++++ b/src/pstoedit.h 2023-07-22 19:31:18.897952130 +0200

+@@ -37,6 +37,7 @@

+ #endif

+

+ #include "pstoedll.h"

++#include <stdbool.h>

+

+ typedef int (*execute_interpreter_function)(int argc, const char * const argv[]);

+

+++ b/gnu/packages/patches/pstoedit-pkglibdir.patch

+Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree

+

+--- a/config/pstoedit.pc.orig.in 2018-04-16 14:26:28.000000000 +0200

++++ b/config/pstoedit.pc.in 2020-10-05 14:37:16.750980762 +0200

+@@ -1,7 +1,7 @@

+ prefix=@prefix@

+ exec_prefix=@exec_prefix@

+ libdir=@libdir@

+-includedir=@includedir@

++includedir=@includedir@/pstoedit

+

+ Name: pstoedit

+ Description: converts PostScript(TM) and PDF files to other vector graphic formats

+@@ -8,4 +8,4 @@

+ Version: @VERSION@.0

+ Requires:

+ Libs: -L@libdir@ -lpstoedit @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@

+-Cflags: -I@includedir@

++Cflags: -I@includedir@/pstoedit

+++ b/gnu/packages/pkg-config.scm

+ (native-search-paths (list $PKG_CONFIG_PATH))

+++ b/gnu/packages/inkscape.scm

+ (list (librsvg-for-system) ;for the pixbuf loader

+ autotrace

+ boost

+ freetype

+ gtk+

+ gtkmm-3

+ lcms

+ libcdr

+ libgc

+ libxml2

+ libxslt

+ poppler

+ python-numpy

+ python-pyserial

+ python-scour

+ python-wrapper

+ (list `(,glib "bin")

+ bc

+ imagemagick/stable ;for tests