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>
This commit is contained in:
Bruno Victal
Liliana Marie Prikler
parent
dd36ca07f0
commit
337dbf6867
5 changed files with 234 additions and 8 deletions
|
|
@ -2125,6 +2125,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/xf86-video-nouveau-fixup-ABI.patch \
|
||||
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \
|
||||
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
|
||||
%D%/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch \
|
||||
%D%/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch \
|
||||
%D%/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch \
|
||||
%D%/packages/patches/xfce4-panel-plugins.patch \
|
||||
%D%/packages/patches/xfce4-settings-defaults.patch \
|
||||
%D%/packages/patches/xgboost-use-system-dmlc-core.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
|
||||
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
From a9181df87d78828318f2e9f8d4ea012bc06883b9 Mon Sep 17 00:00:00 2001
|
||||
From: Bruno Victal <mirai@makinata.eu>
|
||||
Date: Thu, 7 Sep 2023 16:51:23 +0100
|
||||
Subject: [PATCH 3/3] Fix double-free when requesting MediaBox.
|
||||
|
||||
Explicitly close the Ghostscript PDF interpreter before calling quit.
|
||||
|
||||
References:
|
||||
[1]: <https://bugs.ghostscript.com/show_bug.cgi?id=705855>
|
||||
[2]: <https://bugs.ghostscript.com/show_bug.cgi?id=705836>
|
||||
---
|
||||
src/u_ghostscript.c | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/u_ghostscript.c b/src/u_ghostscript.c
|
||||
index 5974b31..d14674f 100644
|
||||
--- a/src/u_ghostscript.c
|
||||
+++ b/src/u_ghostscript.c
|
||||
@@ -317,10 +317,10 @@ gsexe(FILE **out, bool *isnew, char *exenew, char *exeold)
|
||||
* Call ghostscript to extract the /MediaBox from the pdf given in file.
|
||||
* Command line, for gs >= 9.50,
|
||||
* gs -q -dNODISPLAY --permit-file-read=in.pdf -c \
|
||||
- * "(in.pdf) (r) file runpdfbegin 1 pdfgetpage /MediaBox pget pop == quit"
|
||||
+ * "(in.pdf) (r) file runpdfbegin 1 pdfgetpage /MediaBox pget pop == runpdfend quit"
|
||||
* gs < 9.50:
|
||||
* gs -q -dNODISPLAY -dNOSAFER -c \
|
||||
- * "(in.pdf) (r) file runpdfbegin 1 pdfgetpage /MediaBox pget pop == quit"
|
||||
+ * "(in.pdf) (r) file runpdfbegin 1 pdfgetpage /MediaBox pget pop == runpdfend quit"
|
||||
* The command line was found, and modified a bit, at
|
||||
*https://stackoverflow.com/questions/2943281/using-ghostscript-to-get-page-size
|
||||
* Beginning with gs 9.50, "-dSAFER" is the default, and permission to access
|
||||
@@ -349,9 +349,11 @@ gsexe_mediabox(char *file, int *llx, int *lly, int *urx, int *ury)
|
||||
return -3;
|
||||
|
||||
exenew = "%s -q -dNODISPLAY \"--permit-file-read=%s\" -c \"(%s) (r) "
|
||||
- "file runpdfbegin 1 pdfgetpage /MediaBox pget pop == quit\"";
|
||||
+ "file runpdfbegin 1 pdfgetpage /MediaBox pget pop == "
|
||||
+ "runpdfend quit\"";
|
||||
exeold = "%s -q -dNODISPLAY -c \"(%s) (r) "
|
||||
- "file runpdfbegin 1 pdfgetpage /MediaBox pget pop == quit\"";
|
||||
+ "file runpdfbegin 1 pdfgetpage /MediaBox pget pop == "
|
||||
+ "runpdfend quit\"";
|
||||
|
||||
/* malloc() buffers for the command line, if necessary */
|
||||
fmt = exenew;
|
||||
@@ -445,7 +447,8 @@ gslib_mediabox(char *file, int *llx, int *lly, int *urx, int *ury)
|
||||
argnew[3] = "--permit-file-read=%s"; /* file */
|
||||
argnew[4] = "-c";
|
||||
argnew[5] =
|
||||
- "(%s) (r) file runpdfbegin 1 pdfgetpage /MediaBox pget pop == quit";
|
||||
+ "(%s) (r) file runpdfbegin 1 pdfgetpage /MediaBox pget pop == "
|
||||
+ "runpdfend quit";
|
||||
|
||||
argold[0] = argnew[0];
|
||||
argold[1] = argnew[1];
|
||||
--
|
||||
2.40.1
|
||||
|
||||
|
|
@ -0,0 +1,89 @@
|
|||
From 4320b1d82da1bfe1519800ae3ac35b6b59a9da56 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Loimer <thomas.loimer@tuwien.ac.at>
|
||||
Date: Fri, 8 Sep 2023 18:43:00 +0200
|
||||
Subject: [PATCH 2/3] Use pkg-config to set fontconfig CFLAGS and LIBS
|
||||
|
||||
---
|
||||
configure.ac | 16 +++++++++++++---
|
||||
src/Makefile.am | 8 +++-----
|
||||
tests/Makefile.am | 4 ++--
|
||||
3 files changed, 18 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 47452c5..3113db8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -81,11 +81,23 @@ AC_PROG_SED
|
||||
AM_PROG_AR
|
||||
|
||||
# Search for pkg-config and set PKG_CONFIG to the path found, else empty.
|
||||
-# PKG_PROG_PKG_CONFIG
|
||||
+PKG_PROG_PKG_CONFIG
|
||||
# On debian, pkg-config does not find xaw3d. On archlinux, pkg-config
|
||||
# --libs xaw3d yields -lXaw3d -lXmu -lXt -lX11 -- but -lXmu is not
|
||||
# strictly necessary. Use hard-coded paths instead of pkg-config.
|
||||
|
||||
+# First try pkg-config, as a side-effect this might set flags that are
|
||||
+# useful later, e.g., for libpng.
|
||||
+dnl Under archlinux, PKG_CHECK_MODULES(FT, fontconfig) would write during
|
||||
+dnl ./configure "checking for FT...", under debian the line is
|
||||
+dnl "checking for fontconfig...". Stay on the comprehensible side.
|
||||
+AS_IF([test "x$PKG_CONFIG" != x],
|
||||
+ [PKG_CHECK_MODULES([fontconfig], [fontconfig])],
|
||||
+ [fontconfig_CFLAGS='-I$(oldincludedir)/freetype2 '
|
||||
+ AC_SEARCH_LIBS([FcInit], [fontconfig])])
|
||||
+AC_SUBST([fontconfig_CFLAGS])
|
||||
+AC_SUBST([fontconfig_LIBS])
|
||||
+
|
||||
dnl Not useful for packagers.
|
||||
dnl AC_CHECK_PROG(XDG_ICON, [xdg-icon-resource], [xdg-icon-resource])
|
||||
dnl AC_CHECK_PROG(XDG_MENU, [xdg-desktop-menu], [xdg-desktop-menu])
|
||||
@@ -93,8 +105,6 @@ dnl AC_CHECK_PROG(XDG_MENU, [xdg-desktop-menu], [xdg-desktop-menu])
|
||||
|
||||
# Checks for libraries.
|
||||
AC_SEARCH_LIBS([pow], [m])dnl
|
||||
-dnl AC_SEARCH_LIBS([deflate], [z]) # libz is not needed.
|
||||
-AC_SEARCH_LIBS([FcInit], [fontconfig])
|
||||
|
||||
|
||||
# Checks for header files.
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 3cbd5ee..73d5132 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -23,13 +23,11 @@
|
||||
# "`u' modifier ignored since `D' is the default...".
|
||||
ARFLAGS = cr
|
||||
|
||||
-# Xft #includes <ft2build.h>, not <freetype2/ft2build.h>, hence freetype2
|
||||
-# must be put into the search path.
|
||||
-
|
||||
-AM_CPPFLAGS = -I$(oldincludedir)/freetype2 $(XCPPFLAGS) -DNDEBUG -DXFIGLIBDIR="\"$(compkeydbdir)\"" \
|
||||
+AM_CPPFLAGS = $(fontconfig_CFLAGS) $(XCPPFLAGS) -DNDEBUG \
|
||||
+ -DXFIGLIBDIR="\"$(compkeydbdir)\"" \
|
||||
-DOBJLIBDIR="\"$(pkgdatadir)/Libraries\"" -DXFIGDOCDIR="\"$(docdir)\""
|
||||
|
||||
-AM_LDFLAGS = $(XLDFLAGS)
|
||||
+AM_LDFLAGS = $(fontconfig_LIBS) $(XLDFLAGS)
|
||||
|
||||
# LIBOBJS must be placed in LDADD or xfig_LDADD - otherwise, the
|
||||
# lib-dir is not distributed
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 2f529ac..c158806 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -39,9 +39,9 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
|
||||
echo 'm4_define([AT_PACKAGE_URL], [@PACKAGE_URL@])'; \
|
||||
} >'$(srcdir)/package.m4'
|
||||
|
||||
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(oldincludedir)/freetype2 $(XCPPFLAGS)
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/src $(fontconfig_CFLAGS) $(XCPPFLAGS)
|
||||
|
||||
-AM_LDFLAGS = $(XLDFLAGS)
|
||||
+AM_LDFLAGS = $(fontconfig_LIBS) $(XLDFLAGS)
|
||||
LDADD = $(top_builddir)/src/libxfig.a $(XLIBS)
|
||||
|
||||
check_PROGRAMS = test1 test2 test3 test4
|
||||
--
|
||||
2.40.1
|
||||
|
||||
|
|
@ -28,9 +28,11 @@ (define-module (gnu packages xfig)
|
|||
#:use-module (guix gexp)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
|
|
@ -98,7 +100,7 @@ (define-public transfig
|
|||
(define-public xfig
|
||||
(package
|
||||
(name "xfig")
|
||||
(version "3.2.8b")
|
||||
(version "3.2.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -106,22 +108,55 @@ (define-public xfig
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j"))
|
||||
"1xy2zqbd1wn2fij95kgnj39850r7xk74kvx7kp0dxhmvs429vv8k"))
|
||||
;; TODO: Remove these patches and snippet when updating,
|
||||
;; upstreamed since commit `84375ac05e923b46bbacc8b336b0dfbe29497b6b'.
|
||||
(patches
|
||||
(search-patches "xfig-Enable-error-message-for-missing-libraries.patch"
|
||||
"xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch"
|
||||
"xfig-Fix-double-free-when-requesting-MediaBox.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; The patch-dot-desktop-files phase requires a relative name.
|
||||
#~(substitute* "xfig.desktop"
|
||||
(("^(Exec=)/usr/bin/" _ key) key)))))
|
||||
#~(begin
|
||||
(substitute* "xfig.desktop"
|
||||
(("^(Exec=)/usr/bin/" _ key) key))
|
||||
;; This forces autoreconf to be invoked, needed for patches
|
||||
;; to be effective.
|
||||
(delete-file "configure")))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:modules '((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-26))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((path
|
||||
(search-path-as-list
|
||||
'("bin")
|
||||
(map (cut assoc-ref inputs <>)
|
||||
(list "ghostscript" "fig2dev")))))
|
||||
(wrap-program (string-append #$output "/bin/xfig")
|
||||
`("PATH" ":" prefix ,path))))))))
|
||||
(native-inputs
|
||||
;; For tests.
|
||||
(list desktop-file-utils ghostscript))
|
||||
(list pkg-config
|
||||
;; TODO: Remove the import on (gnu packages autotools)
|
||||
;; and related packages in the next update.
|
||||
autoconf automake libtool
|
||||
;; For tests.
|
||||
desktop-file-utils))
|
||||
(inputs
|
||||
(list libxaw3d
|
||||
(list ghostscript
|
||||
fig2dev
|
||||
libxaw3d
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
libxpm
|
||||
libx11
|
||||
libxft
|
||||
libxt))
|
||||
(home-page "https://mcj.sourceforge.net/")
|
||||
(synopsis "Interactive drawing tool")
|
||||
|
|
@ -132,4 +167,6 @@ (define-public xfig
|
|||
such as GIF, JPEG, EPSF (PostScript), etc. Those objects can be created,
|
||||
deleted, moved or modified. Attributes such as colors or line styles can be
|
||||
selected in various ways. For text, 35 fonts are available.")
|
||||
(license license:bsd-2)))
|
||||
(license
|
||||
(license:non-copyleft "file://Makefile.am"
|
||||
"See <https://spdx.org/licenses/Xfig.html>."))))
|
||||
|
|
|
|||
Loading…
Reference in a new issue