diff options
author | Bruno Victal <mirai@makinata.eu> | 2023-09-24 16:30:27 +0100 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-10-01 08:14:56 +0200 |
commit | 337dbf6867597b6e3b72b0bdb2152a42a9f41dbc (patch) | |
tree | cc4f420c3c24fe841b105fca67e15fbb9112f458 /gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch | |
parent | dd36ca07f0f6ee5adf1629f4dd56702755683e72 (diff) | |
download | guix-337dbf6867597b6e3b72b0bdb2152a42a9f41dbc.tar.gz guix-337dbf6867597b6e3b72b0bdb2152a42a9f41dbc.zip |
gnu: xfig: Update to 3.2.9.
* gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch:
New file.
* gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch:
Likewise.
* gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch:
Likewise.
* gnu/local.mk (dist_patch_DATA): Register new patches.
* gnu/packages/xfig.scm (xfig): Update to 3.2.9.
[source]: Use new patches.
[arguments]<#:phases>: Add ‘wrap-program’.
[native-inputs]: Add pkg-config, autoconf, automake and libtool.
Move ghostscript to …
[inputs]: … here. Add fig2dev, libxaw3d and libxft.
[license]: Update URL.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch')
-rw-r--r-- | gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch b/gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch new file mode 100644 index 0000000000..a6c37e3353 --- /dev/null +++ b/gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch @@ -0,0 +1,39 @@ +From 84685930d5cfc7005f3414601230a23e28a18f59 Mon Sep 17 00:00:00 2001 +From: Thomas Loimer <thomas.loimer@tuwien.ac.at> +Date: Tue, 5 Sep 2023 22:02:55 +0200 +Subject: [PATCH 1/3] Enable error message for missing libraries + +Move the check for missing libraries to a place where the queried +variables are set. +--- + configure.ac | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 035b9d7..47452c5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,9 +95,6 @@ dnl AC_CHECK_PROG(XDG_MENU, [xdg-desktop-menu], [xdg-desktop-menu]) + AC_SEARCH_LIBS([pow], [m])dnl + dnl AC_SEARCH_LIBS([deflate], [z]) # libz is not needed. + AC_SEARCH_LIBS([FcInit], [fontconfig]) +-AS_IF([test "x$ac_cv_search_pow" = xno \ +- || test "x$ac_cv_search_png_read_info" = xno], +- [AC_MSG_ERROR([Necessary libraries not found.])]) + + + # Checks for header files. +@@ -187,6 +184,10 @@ PostScript files. To disable calling ghostscript, set to the empty string, + AC_SUBST([gsman]) + AM_SUBST_NOTMAKE([gsman]) + ++AS_IF([test "x$ac_cv_search_pow" = xno \ ++ || test "x$ac_cv_search_png_read_info" = xno], ++ [AC_MSG_ERROR([Necessary libraries not found.])]) ++ + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_BIGENDIAN +-- +2.40.1 + |