From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH 0/5] Xfig module refactoring Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Sep 2023 18:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16944583476679 (code B ref -1); Mon, 11 Sep 2023 18:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Sep 2023 18:52:27 +0000 Received: from localhost ([127.0.0.1]:54830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm1K-0001jf-TH for submit@debbugs.gnu.org; Mon, 11 Sep 2023 14:52:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm1J-0001jT-Kq for submit@debbugs.gnu.org; Mon, 11 Sep 2023 14:52:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfm19-00021p-Up for guix-patches@gnu.org; Mon, 11 Sep 2023 14:52:15 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfm17-00035c-Cn for guix-patches@gnu.org; Mon, 11 Sep 2023 14:52:15 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 0287E20E44 for ; Mon, 11 Sep 2023 20:51:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 352EC80098; Mon, 11 Sep 2023 20:51:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 2DtBovsnviDL; Mon, 11 Sep 2023 20:51:58 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 34CB280095; Mon, 11 Sep 2023 20:51:58 +0200 (CEST) From: Bruno Victal Date: Mon, 11 Sep 2023 19:51:35 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.107.238; envelope-from=mirai@makinata.eu; helo=smtpmciv2.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Bruno Victal (5): gnu: xfig: Use G-Expressions. gnu: Add fig2dev. gnu: transfig: Remove package. gnu: texlive-latex-make: Update description. gnu: xfig: Update to 3.2.9. gnu/local.mk | 4 +- gnu/packages/docbook.scm | 2 +- .../patches/transfig-gcc10-fno-common.patch | 33 --- ...-error-message-for-missing-libraries.patch | 39 ++++ ...double-free-when-requesting-MediaBox.patch | 58 +++++ ...ig-to-set-fontconfig-CFLAGS-and-LIBS.patch | 89 ++++++++ gnu/packages/photo.scm | 3 +- gnu/packages/tex.scm | 2 +- gnu/packages/xfig.scm | 214 +++++++++--------- 9 files changed, 305 insertions(+), 139 deletions(-) delete mode 100644 gnu/packages/patches/transfig-gcc10-fno-common.patch create mode 100644 gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch create mode 100644 gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch create mode 100644 gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch base-commit: ab971e9c1922ae6eeec47401cb589ae15f29e15f -- 2.40.1 From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH 3/5] gnu: transfig: Remove package. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Sep 2023 18:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.16944585096960 (code B ref 65873); Mon, 11 Sep 2023 18:56:02 +0000 Received: (at 65873) by debbugs.gnu.org; 11 Sep 2023 18:55:09 +0000 Received: from localhost ([127.0.0.1]:54837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm3w-0001oB-Dn for submit@debbugs.gnu.org; Mon, 11 Sep 2023 14:55:08 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm3u-0001ny-5J for 65873@debbugs.gnu.org; Mon, 11 Sep 2023 14:55:07 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 3629F202FB for <65873@debbugs.gnu.org>; Mon, 11 Sep 2023 20:55:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 90BED8009D; Mon, 11 Sep 2023 20:55:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id iNTWor5PndoR; Mon, 11 Sep 2023 20:55:00 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id E4B0B80099; Mon, 11 Sep 2023 20:54:59 +0200 (CEST) From: Bruno Victal Date: Mon, 11 Sep 2023 19:54:51 +0100 Message-Id: <0469f9a315069001990f79b4e4fc539dd4d683a3.1694458076.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The source used by this package is outdated and its development was moved into the repository used by fig2dev though considered its obsolete and not built by default in the fig2dev package. Note: enblend-enfuse no longer needs transfig since 4.2 according to NEWS. * gnu/packages/docbook.scm (dblatex): Update comment. * gnu/packages/photo.scm (enblend-enfuse)[native-inputs]: Remove transfig. * gnu/packages/xfig.scm (transfig): Remove. * gnu/packages/patches/transfig-gcc10-fno-common.patch: Remove. * gnu/local.mk: Unregister it. --- gnu/local.mk | 1 - gnu/packages/docbook.scm | 2 +- .../patches/transfig-gcc10-fno-common.patch | 33 -------- gnu/packages/photo.scm | 3 +- gnu/packages/xfig.scm | 81 ------------------- 5 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 gnu/packages/patches/transfig-gcc10-fno-common.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4f8637418a..f4707a89e6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2021,7 +2021,6 @@ dist_patch_DATA = \ %D%/packages/patches/tootle-glib-object-naming.patch \ %D%/packages/patches/tootle-reason-phrase.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ - %D%/packages/patches/transfig-gcc10-fno-common.patch \ %D%/packages/patches/trytond-add-egg-modules-to-path.patch \ %D%/packages/patches/trytond-add-guix_trytond_path.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ff6d32b168..c47d3db2c0 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -532,7 +532,7 @@ (define-public dblatex (base32 "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n")))) (build-system python-build-system) - ;; TODO: Add xfig/transfig for fig2dev utility + ;; TODO: Add fig2dev for fig2dev utility. (inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-anysize texlive-appendix diff --git a/gnu/packages/patches/transfig-gcc10-fno-common.patch b/gnu/packages/patches/transfig-gcc10-fno-common.patch deleted file mode 100644 index ebe9236533..0000000000 --- a/gnu/packages/patches/transfig-gcc10-fno-common.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fixes "multiple definition" errors when building with GCC 10+. - -Based on . ---- a/fig2dev/dev/gensvg.c 2010-07-01 22:41:16.000000000 +0200 -+++ b/fig2dev/dev/gensvg.c 2022-02-27 20:02:33.379945500 +0100 -@@ -230,10 +230,12 @@ - }; - - /* arrowhead arrays */ --Point points[50], fillpoints[50], clippoints[50]; --int npoints, nfillpoints, nclippoints; --int arrowx1, arrowy1; /* first point of object */ --int arrowx2, arrowy2; /* second point of object */ -+Point fillpoints[50]; -+int nfillpoints; -+extern Point points[50], clippoints[50]; -+extern int npoints, nclippoints; -+extern int arrowx1, arrowy1; /* first point of object */ -+extern int arrowx2, arrowy2; /* second point of object */ - - static int tileno=0; /* number of current tile */ - ---- a/fig2dev/fig2dev.h 2010-03-16 19:53:20.000000000 +0100 -+++ b/fig2dev/fig2dev.h 2022-02-27 19:56:06.072253991 +0100 -@@ -126,7 +126,7 @@ - extern char *prog, *from, *to; - extern char *name; - extern double font_size; --Boolean correct_font_size; /* use correct font size */ -+extern Boolean correct_font_size; /* use correct font size */ - extern double mag, fontmag; - extern FILE *tfp; - diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index b290e2b29a..d9ecc1d39c 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -382,8 +382,7 @@ (define-public enblend-enfuse imagemagick libxml2 (texlive-updmap.cfg) - tidy-html - transfig)) + tidy-html)) (inputs (list boost gsl diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 51791a1696..9ea40c193e 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -130,84 +130,3 @@ (define-public xfig 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))) - -(define-public transfig - (package - (name "transfig") - (version "3.2.5e") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/mcj/mcj-source/transfig." - version ".tar.gz")) - (sha256 - (base32 - "0i3p7qmg2w8qrad3pn42b0miwarql7yy0gpd49b1bpal6bqsiicf")) - (patches - (search-patches - "transfig-gcc10-fno-common.patch")))) ; fix GCC10 build - (build-system gnu-build-system) - (native-inputs - (list imake makedepend)) - (inputs - `(("xfig" ,xfig) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxpm" ,libxpm) - ("libx11" ,libx11) - ("zlib" ,zlib))) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((imake (assoc-ref inputs "imake")) - (out (assoc-ref outputs "out"))) - (substitute* '("fig2dev/Imakefile" - "transfig/Imakefile") - (("XCOMM (BINDIR = )[[:graph:]]*" _ front) - (string-append front out "/bin")) - (("XCOMM USEINLINE") "USEINLINE") - ;; The variable name is deceptive. The directory is used as an - ;; installation path for bitmaps. - (("(XFIGLIBDIR =[[:blank:]]*)[[:graph:]]*" _ front) - (string-append front out "/lib")) - (("(XPMLIBDIR = )[[:graph:]]*" _ front) - (string-append front (assoc-ref inputs "libxpm") "/lib")) - (("(XPMINC = -I)[[:graph:]]*" _ front) - (string-append front (assoc-ref inputs "libxpm") "/include/X11")) - (("/usr/local/lib/fig2dev") (string-append out "/lib"))) - ;; The -a argument is required in order to pick up the correct paths - ;; to several X header files. - (invoke "xmkmf" "-a") - (substitute* '("Makefile" - "fig2dev/Makefile" - "fig2dev/dev/Makefile" - "transfig/Makefile") - ;; These imake variables somehow remain undefined - (("DefaultGcc2[[:graph:]]*Opt") "-O2") - ;; Reset a few variable defaults that are set in imake templates - ((imake) out) - (("(MANPATH = )[[:graph:]]*" _ front) - (string-append front out "/share/man")) - (("(CONFDIR = )([[:graph:]]*)" _ front default) - (string-append front out default)) - ;; The "l" option was silently ignored until binutils 2.36, - ;; where it got a different purpose. So remove it to avoid - ;; "ar: libdeps specified more than once". - (("((AR|MODAR) = ar )clq" _ front) - (string-append front "cq"))) - #t))) - (add-after 'install 'install/doc - (lambda _ - (invoke "make" "install.man")))))) - (home-page "https://mcj.sourceforge.net/") - (synopsis "Create portable LaTeX figures") - (description - "Transfig creates a makefile to translate figures described in Fig code -or PIC into a specified LaTeX graphics language. PIC files are identified by -the suffix \".pic\"; Fig files can be specified either with or without the -suffix \".fig\". Transfig also creates a TeX macro file appropriate to the -target language.") - (license license:bsd-2))) -- 2.40.1 From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH 2/5] gnu: Add fig2dev. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Sep 2023 18:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.16944585126982 (code B ref 65873); Mon, 11 Sep 2023 18:56:02 +0000 Received: (at 65873) by debbugs.gnu.org; 11 Sep 2023 18:55:12 +0000 Received: from localhost ([127.0.0.1]:54840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm3z-0001oW-Vc for submit@debbugs.gnu.org; Mon, 11 Sep 2023 14:55:12 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:52214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm3t-0001nw-SW for 65873@debbugs.gnu.org; Mon, 11 Sep 2023 14:55:09 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 9368620FA5 for <65873@debbugs.gnu.org>; Mon, 11 Sep 2023 20:55:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 01A5A8009C; Mon, 11 Sep 2023 20:55:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id AMkSqzWRqStr; Mon, 11 Sep 2023 20:54:59 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6D2628009A; Mon, 11 Sep 2023 20:54:59 +0200 (CEST) From: Bruno Victal Date: Mon, 11 Sep 2023 19:54:50 +0100 Message-Id: <314135730d67064978288e115ad334d9ee546e8a.1694458076.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/xfig.scm: Import all of (guix licenses). (xfig, transfig)[license]: Adjust accordingly. (fig2dev): New variable. --- gnu/packages/xfig.scm | 64 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index f68ddb01f9..51791a1696 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -23,7 +23,7 @@ (define-module (gnu packages xfig) #:use-module (guix packages) - #:use-module ((guix licenses) #:select (bsd-2)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix build-system gnu) @@ -32,8 +32,66 @@ (define-module (gnu packages xfig) #:use-module (gnu packages ghostscript) #:use-module (gnu packages xorg) #:use-module (gnu packages image) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages netpbm) #:use-module (gnu packages compression)) +(define-public fig2dev + (package + (name "fig2dev") + (version "3.2.9") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mcj/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1cch429zbmrg2zy1mkx9xwnpvkjhmlw40c88bvi2virws744dqhm")))) + (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 ((programs + (find-files (string-append #$output "/bin"))) + (path + (search-path-as-list + '("bin") + (map (cut assoc-ref inputs <>) + (list "ghostscript" "imagemagick"))))) + (for-each (lambda (program) + (wrap-program program + `("PATH" ":" prefix ,path))) + programs))))))) + (inputs + (list libpng zlib + ;; Quoth INSTALL: + ;; “To run fig2dev, the packages + ;; ghostscript, and one out of + ;; netpbm | ImageMagick | GraphicsMagick + ;; are needed to produce various bitmap output formats, or process + ;; fig files with embedded images.” + ghostscript + imagemagick)) + (native-inputs + ;; XXX: Tests fail if netpbm is absent. + (list netpbm)) + (home-page "https://sourceforge.net/projects/mcj") + (synopsis "Translate Fig to other graphic description formats") + (description "Fig2dev is a set of tools for creating TeX documents with +graphics which are portable, in the sense that they can be printed in a wide +variety of environments.") + (license + (license:non-copyleft "file://Makefile.am" + "See .")))) + (define-public xfig (package (name "xfig") @@ -71,7 +129,7 @@ (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 bsd-2))) + (license license:bsd-2))) (define-public transfig (package @@ -152,4 +210,4 @@ (define-public transfig the suffix \".pic\"; Fig files can be specified either with or without the suffix \".fig\". Transfig also creates a TeX macro file appropriate to the target language.") - (license bsd-2))) + (license license:bsd-2))) -- 2.40.1 From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH 4/5] gnu: texlive-latex-make: Update description. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: rekado@elephly.net, guix-patches@gnu.org Resent-Date: Mon, 11 Sep 2023 18:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal , Ricardo Wurmus X-Debbugs-Original-Xcc: Ricardo Wurmus Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.16944585136988 (code B ref 65873); Mon, 11 Sep 2023 18:56:03 +0000 Received: (at 65873) by debbugs.gnu.org; 11 Sep 2023 18:55:13 +0000 Received: from localhost ([127.0.0.1]:54842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm40-0001oZ-HC for submit@debbugs.gnu.org; Mon, 11 Sep 2023 14:55:12 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm3y-0001oP-MM for 65873@debbugs.gnu.org; Mon, 11 Sep 2023 14:55:11 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id A539720858 for <65873@debbugs.gnu.org>; Mon, 11 Sep 2023 20:55:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 0BC098009C; Mon, 11 Sep 2023 20:55:01 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id RWO__pprl2MD; Mon, 11 Sep 2023 20:55:00 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 717C08009A; Mon, 11 Sep 2023 20:55:00 +0200 (CEST) From: Bruno Victal Date: Mon, 11 Sep 2023 19:54:52 +0100 Message-Id: <389a69fe23aa6f30fa111c40eb0d1527c223929f.1694458076.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Upstreamed with 1dcc04aaa860b123924ae83fc30a47d6f7179f7a. [1]: * gnu/packages/tex.scm (texlive-latex-make)[description]: Update description. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bd02190a51..b5da339353 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -40434,7 +40434,7 @@ (define-public texlive-latex-make @item @file{figlatex.sty}: a LaTeX package to easily insert Xfig figures. It can interact with LaTeX.mk so that the latter automatically invokes -@command{transfig} if needed. +@command{fig2dev} if needed. @end itemize") (license license:gpl3+))) -- 2.40.1 From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH 5/5] gnu: xfig: Update to 3.2.9. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Sep 2023 18:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.16944585217011 (code B ref 65873); Mon, 11 Sep 2023 18:56:03 +0000 Received: (at 65873) by debbugs.gnu.org; 11 Sep 2023 18:55:21 +0000 Received: from localhost ([127.0.0.1]:54845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm44-0001ov-TQ for submit@debbugs.gnu.org; Mon, 11 Sep 2023 14:55:21 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm42-0001om-OJ for 65873@debbugs.gnu.org; Mon, 11 Sep 2023 14:55:16 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 7C41D2089C for <65873@debbugs.gnu.org>; Mon, 11 Sep 2023 20:55:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id D7BBD8009A; Mon, 11 Sep 2023 20:55:01 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id jYF1Xxno4144; Mon, 11 Sep 2023 20:55:01 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id E5DDD80099; Mon, 11 Sep 2023 20:55:00 +0200 (CEST) From: Bruno Victal Date: Mon, 11 Sep 2023 19:54:53 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/xfig.scm (xfig): Update to 3.2.9. [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]: Correct it to `SPDX-License-Identifier:Xfig'. * gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch: New file. * gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch: Ditto. * gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch: Ditto. * gnu/local.mk: Register it. --- gnu/local.mk | 3 + ...-error-message-for-missing-libraries.patch | 39 ++++++++ ...double-free-when-requesting-MediaBox.patch | 58 ++++++++++++ ...ig-to-set-fontconfig-CFLAGS-and-LIBS.patch | 89 +++++++++++++++++++ gnu/packages/xfig.scm | 53 +++++++++-- 5 files changed, 234 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch create mode 100644 gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch create mode 100644 gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch diff --git a/gnu/local.mk b/gnu/local.mk index f4707a89e6..e21d497e8b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2115,6 +2115,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 \ 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 +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 + diff --git a/gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch b/gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch new file mode 100644 index 0000000000..65b0ad8d36 --- /dev/null +++ b/gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch @@ -0,0 +1,58 @@ +From a9181df87d78828318f2e9f8d4ea012bc06883b9 Mon Sep 17 00:00:00 2001 +From: Bruno Victal +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]: +[2]: +--- + 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 + diff --git a/gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch b/gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch new file mode 100644 index 0000000000..65158b901b --- /dev/null +++ b/gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch @@ -0,0 +1,89 @@ +From 4320b1d82da1bfe1519800ae3ac35b6b59a9da56 Mon Sep 17 00:00:00 2001 +From: Thomas Loimer +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 , not , 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 + diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 9ea40c193e..d5f67c110e 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -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) @@ -95,7 +97,7 @@ (define-public fig2dev (define-public xfig (package (name "xfig") - (version "3.2.8b") + (version "3.2.9") (source (origin (method url-fetch) @@ -103,22 +105,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") @@ -129,4 +164,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 .")))) -- 2.40.1 From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH 1/5] gnu: xfig: Use G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Sep 2023 19:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.16944594958593 (code B ref 65873); Mon, 11 Sep 2023 19:12:02 +0000 Received: (at 65873) by debbugs.gnu.org; 11 Sep 2023 19:11:35 +0000 Received: from localhost ([127.0.0.1]:54880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfmJq-0002EX-Nq for submit@debbugs.gnu.org; Mon, 11 Sep 2023 15:11:35 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:43764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfmJn-0002EN-Q0 for 65873@debbugs.gnu.org; Mon, 11 Sep 2023 15:11:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id A844F20772 for <65873@debbugs.gnu.org>; Mon, 11 Sep 2023 21:11:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 82DD28009B; Mon, 11 Sep 2023 20:54:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id qPBpPXN7tUkR; Mon, 11 Sep 2023 20:54:59 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id EF33680099; Mon, 11 Sep 2023 20:54:58 +0200 (CEST) From: Bruno Victal Date: Mon, 11 Sep 2023 19:54:49 +0100 Message-Id: <9b1ed59e811ee0fcdf52d9a34bbe871df994517b.1694458076.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/xfig.scm (xfig)[arguments]<#:phases>: Relocate 'strip-bogus-exec-prefix into … [sources]: … here, as a snippet instead. [inputs]: Restyle. --- gnu/packages/xfig.scm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 8efe561433..f68ddb01f9 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2022 Ivan Vilata i Balaguer +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages xfig) #:use-module (guix packages) #:use-module ((guix licenses) #:select (bsd-2)) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages freedesktop) @@ -43,27 +45,23 @@ (define-public xfig name "-" version ".tar.xz")) (sha256 (base32 - "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j")))) + "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j")) + (modules '((guix build utils))) + (snippet + ;; The patch-dot-desktop-files phase requires a relative name. + #~(substitute* "xfig.desktop" + (("^(Exec=)/usr/bin/" _ key) key))))) (build-system gnu-build-system) (native-inputs ;; For tests. (list desktop-file-utils ghostscript)) (inputs - `(("libxaw3d" ,libxaw3d) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxpm" ,libxpm) - ("libx11" ,libx11) - ("libxt" ,libxt))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'strip-bogus-exec-prefix - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "xfig.desktop" - ;; The patch-dot-desktop-files phase requires a relative name. - (("Exec=/usr/bin/xfig") "Exec=xfig")) - #t))))) + (list libxaw3d + libjpeg-turbo + libpng + libxpm + libx11 + libxt)) (home-page "https://mcj.sourceforge.net/") (synopsis "Interactive drawing tool") (description -- 2.40.1 From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH v2 0/3] Xfig module refactoring Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Sep 2023 15:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.169556945618283 (code B ref 65873); Sun, 24 Sep 2023 15:31:02 +0000 Received: (at 65873) by debbugs.gnu.org; 24 Sep 2023 15:30:56 +0000 Received: from localhost ([127.0.0.1]:43429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4S-0004kp-54 for submit@debbugs.gnu.org; Sun, 24 Sep 2023 11:30:56 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:54870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4Q-0004kg-2V for 65873@debbugs.gnu.org; Sun, 24 Sep 2023 11:30:55 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id DE52D20D0B for <65873@debbugs.gnu.org>; Sun, 24 Sep 2023 17:30:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 1AD1980099; Sun, 24 Sep 2023 17:30:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id XDyfM_bD0uNJ; Sun, 24 Sep 2023 17:30:36 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 3CBE380095; Sun, 24 Sep 2023 17:30:36 +0200 (CEST) From: Bruno Victal Date: Sun, 24 Sep 2023 16:30:24 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Notable changes since v1: * Rebased to resolve conflicts. * Squashed v1 patches [{2,3,4}/5] into v2 [2/3]. * Mark `transfig' as a deprecated package with `fig2dev' as its replacement. Bruno Victal (3): gnu: xfig: Use G-Expressions. gnu: Add fig2dev. gnu: xfig: Update to 3.2.9. gnu/local.mk | 4 +- gnu/packages/docbook.scm | 2 +- .../patches/transfig-gcc10-fno-common.patch | 33 --- ...-error-message-for-missing-libraries.patch | 39 ++++ ...double-free-when-requesting-MediaBox.patch | 58 +++++ ...ig-to-set-fontconfig-CFLAGS-and-LIBS.patch | 89 ++++++++ gnu/packages/tex.scm | 2 +- gnu/packages/xfig.scm | 215 ++++++++++-------- 8 files changed, 306 insertions(+), 136 deletions(-) delete mode 100644 gnu/packages/patches/transfig-gcc10-fno-common.patch create mode 100644 gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch create mode 100644 gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch create mode 100644 gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch base-commit: e134686cead6db62ea8b941b2ed7c0bd660804da -- 2.41.0 From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH v2 2/3] gnu: Add fig2dev. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, rekado@elephly.net, guix-patches@gnu.org Resent-Date: Sun, 24 Sep 2023 15:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal , Andreas Enge , Ricardo Wurmus X-Debbugs-Original-Xcc: Andreas Enge , Ricardo Wurmus Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.169556947018337 (code B ref 65873); Sun, 24 Sep 2023 15:32:02 +0000 Received: (at 65873) by debbugs.gnu.org; 24 Sep 2023 15:31:10 +0000 Received: from localhost ([127.0.0.1]:43433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4f-0004lg-Hj for submit@debbugs.gnu.org; Sun, 24 Sep 2023 11:31:10 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:54918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4c-0004lW-GT for 65873@debbugs.gnu.org; Sun, 24 Sep 2023 11:31:07 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 0B4EC20D0E for <65873@debbugs.gnu.org>; Sun, 24 Sep 2023 17:30:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 56A1F8009A; Sun, 24 Sep 2023 17:30:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id seLksk3__z76; Sun, 24 Sep 2023 17:30:52 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 477D180095; Sun, 24 Sep 2023 17:30:52 +0200 (CEST) From: Bruno Victal Date: Sun, 24 Sep 2023 16:30:26 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The source used by the transfig package is outdated and its development was moved into the repository used by fig2dev though the utility `transfig' is considered obsolete and not built by default in the fig2dev package. In practice this isn't a problem since the user is generally after the `fig2dev' utility which was also provided in the (now obsolete) transfig package. Note texlive-latex-make: Description upstreamed with 1dcc04aaa860b123924ae83fc30a47d6f7179f7a. [1] [1]: * gnu/packages/xfig.scm: Import all of (guix licenses). (xfig)[license]: Adjust accordingly. (fig2dev): New variable. (transfig): Remove & mark as deprecated package with fig2dev as its replacement. * gnu/packages/patches/transfig-gcc10-fno-common.patch: Remove. * gnu/local.mk: Unregister it. * gnu/packages/docbook.scm (dblatex): Update comment. * gnu/packages/tex.scm (texlive-latex-make)[description]: Update description. --- gnu/local.mk | 1 - gnu/packages/docbook.scm | 2 +- .../patches/transfig-gcc10-fno-common.patch | 33 ---- gnu/packages/tex.scm | 2 +- gnu/packages/xfig.scm | 146 ++++++++---------- 5 files changed, 65 insertions(+), 119 deletions(-) delete mode 100644 gnu/packages/patches/transfig-gcc10-fno-common.patch diff --git a/gnu/local.mk b/gnu/local.mk index ee9a509f1b..d26720640e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2026,7 +2026,6 @@ dist_patch_DATA = \ %D%/packages/patches/tootle-glib-object-naming.patch \ %D%/packages/patches/tootle-reason-phrase.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ - %D%/packages/patches/transfig-gcc10-fno-common.patch \ %D%/packages/patches/trytond-add-egg-modules-to-path.patch \ %D%/packages/patches/trytond-add-guix_trytond_path.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ff6d32b168..c47d3db2c0 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -532,7 +532,7 @@ (define-public dblatex (base32 "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n")))) (build-system python-build-system) - ;; TODO: Add xfig/transfig for fig2dev utility + ;; TODO: Add fig2dev for fig2dev utility. (inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-anysize texlive-appendix diff --git a/gnu/packages/patches/transfig-gcc10-fno-common.patch b/gnu/packages/patches/transfig-gcc10-fno-common.patch deleted file mode 100644 index ebe9236533..0000000000 --- a/gnu/packages/patches/transfig-gcc10-fno-common.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fixes "multiple definition" errors when building with GCC 10+. - -Based on . ---- a/fig2dev/dev/gensvg.c 2010-07-01 22:41:16.000000000 +0200 -+++ b/fig2dev/dev/gensvg.c 2022-02-27 20:02:33.379945500 +0100 -@@ -230,10 +230,12 @@ - }; - - /* arrowhead arrays */ --Point points[50], fillpoints[50], clippoints[50]; --int npoints, nfillpoints, nclippoints; --int arrowx1, arrowy1; /* first point of object */ --int arrowx2, arrowy2; /* second point of object */ -+Point fillpoints[50]; -+int nfillpoints; -+extern Point points[50], clippoints[50]; -+extern int npoints, nclippoints; -+extern int arrowx1, arrowy1; /* first point of object */ -+extern int arrowx2, arrowy2; /* second point of object */ - - static int tileno=0; /* number of current tile */ - ---- a/fig2dev/fig2dev.h 2010-03-16 19:53:20.000000000 +0100 -+++ b/fig2dev/fig2dev.h 2022-02-27 19:56:06.072253991 +0100 -@@ -126,7 +126,7 @@ - extern char *prog, *from, *to; - extern char *name; - extern double font_size; --Boolean correct_font_size; /* use correct font size */ -+extern Boolean correct_font_size; /* use correct font size */ - extern double mag, fontmag; - extern FILE *tfp; - diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bd02190a51..b5da339353 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -40434,7 +40434,7 @@ (define-public texlive-latex-make @item @file{figlatex.sty}: a LaTeX package to easily insert Xfig figures. It can interact with LaTeX.mk so that the latter automatically invokes -@command{transfig} if needed. +@command{fig2dev} if needed. @end itemize") (license license:gpl3+))) diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index f68ddb01f9..a9a86fc2ed 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -23,7 +23,7 @@ (define-module (gnu packages xfig) #:use-module (guix packages) - #:use-module ((guix licenses) #:select (bsd-2)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix build-system gnu) @@ -32,8 +32,69 @@ (define-module (gnu packages xfig) #:use-module (gnu packages ghostscript) #:use-module (gnu packages xorg) #:use-module (gnu packages image) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages netpbm) #:use-module (gnu packages compression)) +(define-public fig2dev + (package + (name "fig2dev") + (version "3.2.9") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mcj/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1cch429zbmrg2zy1mkx9xwnpvkjhmlw40c88bvi2virws744dqhm")))) + (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 ((programs + (find-files (string-append #$output "/bin"))) + (path + (search-path-as-list + '("bin") + (map (cut assoc-ref inputs <>) + (list "ghostscript" "imagemagick"))))) + (for-each (lambda (program) + (wrap-program program + `("PATH" ":" prefix ,path))) + programs))))))) + (inputs + (list libpng zlib + ;; Quoth INSTALL: + ;; “To run fig2dev, the packages + ;; ghostscript, and one out of + ;; netpbm | ImageMagick | GraphicsMagick + ;; are needed to produce various bitmap output formats, or process + ;; fig files with embedded images.” + ghostscript + imagemagick)) + (native-inputs + ;; XXX: Tests fail if netpbm is absent. + (list netpbm)) + (home-page "https://sourceforge.net/projects/mcj") + (synopsis "Translate Fig to other graphic description formats") + (description "Fig2dev is a set of tools for creating TeX documents with +graphics which are portable, in the sense that they can be printed in a wide +variety of environments.") + (license + (license:non-copyleft "file://Makefile.am" + "See .")))) + +(define-public transfig + (deprecated-package "transfig" fig2dev)) + (define-public xfig (package (name "xfig") @@ -71,85 +132,4 @@ (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 bsd-2))) - -(define-public transfig - (package - (name "transfig") - (version "3.2.5e") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/mcj/mcj-source/transfig." - version ".tar.gz")) - (sha256 - (base32 - "0i3p7qmg2w8qrad3pn42b0miwarql7yy0gpd49b1bpal6bqsiicf")) - (patches - (search-patches - "transfig-gcc10-fno-common.patch")))) ; fix GCC10 build - (build-system gnu-build-system) - (native-inputs - (list imake makedepend)) - (inputs - `(("xfig" ,xfig) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxpm" ,libxpm) - ("libx11" ,libx11) - ("zlib" ,zlib))) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((imake (assoc-ref inputs "imake")) - (out (assoc-ref outputs "out"))) - (substitute* '("fig2dev/Imakefile" - "transfig/Imakefile") - (("XCOMM (BINDIR = )[[:graph:]]*" _ front) - (string-append front out "/bin")) - (("XCOMM USEINLINE") "USEINLINE") - ;; The variable name is deceptive. The directory is used as an - ;; installation path for bitmaps. - (("(XFIGLIBDIR =[[:blank:]]*)[[:graph:]]*" _ front) - (string-append front out "/lib")) - (("(XPMLIBDIR = )[[:graph:]]*" _ front) - (string-append front (assoc-ref inputs "libxpm") "/lib")) - (("(XPMINC = -I)[[:graph:]]*" _ front) - (string-append front (assoc-ref inputs "libxpm") "/include/X11")) - (("/usr/local/lib/fig2dev") (string-append out "/lib"))) - ;; The -a argument is required in order to pick up the correct paths - ;; to several X header files. - (invoke "xmkmf" "-a") - (substitute* '("Makefile" - "fig2dev/Makefile" - "fig2dev/dev/Makefile" - "transfig/Makefile") - ;; These imake variables somehow remain undefined - (("DefaultGcc2[[:graph:]]*Opt") "-O2") - ;; Reset a few variable defaults that are set in imake templates - ((imake) out) - (("(MANPATH = )[[:graph:]]*" _ front) - (string-append front out "/share/man")) - (("(CONFDIR = )([[:graph:]]*)" _ front default) - (string-append front out default)) - ;; The "l" option was silently ignored until binutils 2.36, - ;; where it got a different purpose. So remove it to avoid - ;; "ar: libdeps specified more than once". - (("((AR|MODAR) = ar )clq" _ front) - (string-append front "cq"))) - #t))) - (add-after 'install 'install/doc - (lambda _ - (invoke "make" "install.man")))))) - (home-page "https://mcj.sourceforge.net/") - (synopsis "Create portable LaTeX figures") - (description - "Transfig creates a makefile to translate figures described in Fig code -or PIC into a specified LaTeX graphics language. PIC files are identified by -the suffix \".pic\"; Fig files can be specified either with or without the -suffix \".fig\". Transfig also creates a TeX macro file appropriate to the -target language.") - (license bsd-2))) + (license license:bsd-2))) -- 2.41.0 From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH v2 1/3] gnu: xfig: Use G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Sep 2023 15:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.169556947918365 (code B ref 65873); Sun, 24 Sep 2023 15:32:03 +0000 Received: (at 65873) by debbugs.gnu.org; 24 Sep 2023 15:31:19 +0000 Received: from localhost ([127.0.0.1]:43437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4o-0004m7-Bn for submit@debbugs.gnu.org; Sun, 24 Sep 2023 11:31:18 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:58996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4h-0004lo-6y for 65873@debbugs.gnu.org; Sun, 24 Sep 2023 11:31:12 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 150F4203EE for <65873@debbugs.gnu.org>; Sun, 24 Sep 2023 17:30:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 579CA80099; Sun, 24 Sep 2023 17:30:52 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 8drGdaBEzBQN; Sun, 24 Sep 2023 17:30:51 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B16F58005B; Sun, 24 Sep 2023 17:30:51 +0200 (CEST) From: Bruno Victal Date: Sun, 24 Sep 2023 16:30:25 +0100 Message-ID: <1393088416c6de494317c3e79cba85b23853f869.1695569123.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/xfig.scm (xfig)[arguments]<#:phases>: Relocate 'strip-bogus-exec-prefix into … [sources]: … here, as a snippet instead. [inputs]: Restyle. --- gnu/packages/xfig.scm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 8efe561433..f68ddb01f9 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2022 Ivan Vilata i Balaguer +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages xfig) #:use-module (guix packages) #:use-module ((guix licenses) #:select (bsd-2)) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages freedesktop) @@ -43,27 +45,23 @@ (define-public xfig name "-" version ".tar.xz")) (sha256 (base32 - "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j")))) + "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j")) + (modules '((guix build utils))) + (snippet + ;; The patch-dot-desktop-files phase requires a relative name. + #~(substitute* "xfig.desktop" + (("^(Exec=)/usr/bin/" _ key) key))))) (build-system gnu-build-system) (native-inputs ;; For tests. (list desktop-file-utils ghostscript)) (inputs - `(("libxaw3d" ,libxaw3d) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxpm" ,libxpm) - ("libx11" ,libx11) - ("libxt" ,libxt))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'strip-bogus-exec-prefix - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "xfig.desktop" - ;; The patch-dot-desktop-files phase requires a relative name. - (("Exec=/usr/bin/xfig") "Exec=xfig")) - #t))))) + (list libxaw3d + libjpeg-turbo + libpng + libxpm + libx11 + libxt)) (home-page "https://mcj.sourceforge.net/") (synopsis "Interactive drawing tool") (description -- 2.41.0 From unknown Fri Jun 20 18:19:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH v2 3/3] gnu: xfig: Update to 3.2.9. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Sep 2023 15:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.169556948018372 (code B ref 65873); Sun, 24 Sep 2023 15:32:03 +0000 Received: (at 65873) by debbugs.gnu.org; 24 Sep 2023 15:31:20 +0000 Received: from localhost ([127.0.0.1]:43439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4o-0004mA-QW for submit@debbugs.gnu.org; Sun, 24 Sep 2023 11:31:19 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:57354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4h-0004lp-77 for 65873@debbugs.gnu.org; Sun, 24 Sep 2023 11:31:13 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 5B97620ECD for <65873@debbugs.gnu.org>; Sun, 24 Sep 2023 17:30:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id B4C8D80095; Sun, 24 Sep 2023 17:30:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 1nrhs5J2rdJf; Sun, 24 Sep 2023 17:30:53 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id C9D9C8005B; Sun, 24 Sep 2023 17:30:52 +0200 (CEST) From: Bruno Victal Date: Sun, 24 Sep 2023 16:30:27 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/xfig.scm (xfig): Update to 3.2.9. [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]: Correct it to `SPDX-License-Identifier:Xfig'. * gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch: New file. * gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch: Ditto. * gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch: Ditto. * gnu/local.mk: Register it. --- gnu/local.mk | 3 + ...-error-message-for-missing-libraries.patch | 39 ++++++++ ...double-free-when-requesting-MediaBox.patch | 58 ++++++++++++ ...ig-to-set-fontconfig-CFLAGS-and-LIBS.patch | 89 +++++++++++++++++++ gnu/packages/xfig.scm | 53 +++++++++-- 5 files changed, 234 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch create mode 100644 gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch create mode 100644 gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch diff --git a/gnu/local.mk b/gnu/local.mk index d26720640e..188066826d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2120,6 +2120,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 \ 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 +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 + diff --git a/gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch b/gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch new file mode 100644 index 0000000000..65b0ad8d36 --- /dev/null +++ b/gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch @@ -0,0 +1,58 @@ +From a9181df87d78828318f2e9f8d4ea012bc06883b9 Mon Sep 17 00:00:00 2001 +From: Bruno Victal +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]: +[2]: +--- + 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 + diff --git a/gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch b/gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch new file mode 100644 index 0000000000..65158b901b --- /dev/null +++ b/gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch @@ -0,0 +1,89 @@ +From 4320b1d82da1bfe1519800ae3ac35b6b59a9da56 Mon Sep 17 00:00:00 2001 +From: Thomas Loimer +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 , not , 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 + diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index a9a86fc2ed..9d07a5cd42 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -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 .")))) -- 2.41.0 From unknown Fri Jun 20 18:19:29 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Bruno Victal Subject: bug#65873: closed (Re: [PATCH v2 3/3] gnu: xfig: Update to 3.2.9.) Message-ID: References: X-Gnu-PR-Message: they-closed 65873 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 65873@debbugs.gnu.org Date: Sun, 01 Oct 2023 08:20:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1696148402-20565-1" This is a multi-part message in MIME format... ------------=_1696148402-20565-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #65873: [PATCH 0/5] Xfig module refactoring which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 65873@debbugs.gnu.org. --=20 65873: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D65873 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1696148402-20565-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 65873-done) by debbugs.gnu.org; 1 Oct 2023 08:19:44 +0000 Received: from localhost ([127.0.0.1]:60471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmrfz-0005L5-KP for submit@debbugs.gnu.org; Sun, 01 Oct 2023 04:19:43 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:52525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmrfw-0005Kr-SL for 65873-done@debbugs.gnu.org; Sun, 01 Oct 2023 04:19:41 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-533d31a8523so17346861a12.1 for <65873-done@debbugs.gnu.org>; Sun, 01 Oct 2023 01:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696148359; x=1696753159; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Y2QYHGTVFt12mdsDsX+/lFghTzIz9hqT+Hh+lylYpmo=; b=ToJbHGkmal6FTY1Hdv72tVCe9nPRcOCHTSEmxflzaef9YsuZcVXlrop6ArkZNXqqqX 3pMajBXIB9bUz6UFTgnmQ2DPi6U+fdHGHqdiJ9WWYm/szit50BWz37FgvhudrpvI7Q4n PanHZx9PRvJHaTl3mbi67Xkx2nZZARGBHeKe/MmOnzA6BBKKqnzrTyIt9c5aXal5YSv0 w/KsdLfJVxhdxkWZPVTtghytdv9L6XTRFuCa7xRSj4iD4iWdxZjxhWyRXOYtgq4mb24N 1BHSvfJdDMLaqRwGQfpCS0TyvfTy107E4n88ZItP2fk/bZGd/Bi+2+IXQrT/LifTRuBR vjxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696148359; x=1696753159; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Y2QYHGTVFt12mdsDsX+/lFghTzIz9hqT+Hh+lylYpmo=; b=G1lcfL85ly2RDF0Y4ueaJzIReuE9wE6Ck5p/gkMUP15/wqT72RF4Qbg2URRXnyFdd4 Hk8BwD2e97d/V9ewKHjio1v+XD0yScmBAhKwl9WRz1C7C9ZNqaymz0BQpGgG0GvKkGeR g1QpHPD11Z1HYm5h0wY0r9Wmb/in0YZ+N2u+wvcSJXQT7d6QLc+ZlgG4P04/9yQDSOtC 04oIuvYqKd9IUzUex8tmuY1OsZc5H7Hg/V1gz4gP9yIR79d29eb3hbRb4c91Acn/1p90 Qjgs1upznk2f9/5FFnXdMy4X4dWHEtcOrXPnzlDWeTjgJV3Wn3QtyKpKaUCJ25kxZ3mY 4JVQ== X-Gm-Message-State: AOJu0Yz/C7vHiWiS4NS3KjjxHlcjNwXTAFDfVhTiVEZZszXnOOiyCBB5 VMdfcJ91st+qxcY6E4YFqz4fHlFo479DwQ== X-Google-Smtp-Source: AGHT+IEH74OMoI1Ua6Qaj4mf91ZWAquhQNHhaZaEcuW7UhL2tFDZO4Jm4dpdR+I/matcKpWDpSMLiw== X-Received: by 2002:aa7:cd15:0:b0:52b:db31:3c48 with SMTP id b21-20020aa7cd15000000b0052bdb313c48mr7430050edw.0.1696148358799; Sun, 01 Oct 2023 01:19:18 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id c8-20020aa7c748000000b005288f0e547esm13919148eds.55.2023.10.01.01.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 01:19:17 -0700 (PDT) Message-ID: Subject: Re: [PATCH v2 3/3] gnu: xfig: Update to 3.2.9. From: Liliana Marie Prikler To: Bruno Victal , 65873-done@debbugs.gnu.org Date: Sun, 01 Oct 2023 10:19:16 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65873-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 24.09.2023 um 16:30 +0100 schrieb Bruno Victal: > * gnu/packages/xfig.scm (xfig): Update to 3.2.9. > [arguments]<#:phases>: Add 'wrap-program. > [native-inputs]: Add pkg-config, autoconf, automake and libtool. Move > ghostscript to =E2=80=A6 > [inputs]: =E2=80=A6 here. Add fig2dev, libxaw3d and libxft. > [license]: Correct it to `SPDX-License-Identifier:Xfig'. > * gnu/packages/patches/xfig-Enable-error-message-for-missing- > libraries.patch: > New file. > * gnu/packages/patches/xfig-Fix-double-free-when-requesting- > MediaBox.patch: Ditto. > * gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS- > and-LIBS.patch: > Ditto. > * gnu/local.mk: Register it. > --- Reworded slightly and pushed. Thanks ------------=_1696148402-20565-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Sep 2023 18:52:27 +0000 Received: from localhost ([127.0.0.1]:54830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm1K-0001jf-TH for submit@debbugs.gnu.org; Mon, 11 Sep 2023 14:52:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfm1J-0001jT-Kq for submit@debbugs.gnu.org; Mon, 11 Sep 2023 14:52:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfm19-00021p-Up for guix-patches@gnu.org; Mon, 11 Sep 2023 14:52:15 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfm17-00035c-Cn for guix-patches@gnu.org; Mon, 11 Sep 2023 14:52:15 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 0287E20E44 for ; Mon, 11 Sep 2023 20:51:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 352EC80098; Mon, 11 Sep 2023 20:51:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 2DtBovsnviDL; Mon, 11 Sep 2023 20:51:58 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 34CB280095; Mon, 11 Sep 2023 20:51:58 +0200 (CEST) From: Bruno Victal To: guix-patches@gnu.org Subject: [PATCH 0/5] Xfig module refactoring Date: Mon, 11 Sep 2023 19:51:35 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.107.238; envelope-from=mirai@makinata.eu; helo=smtpmciv2.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Bruno Victal (5): gnu: xfig: Use G-Expressions. gnu: Add fig2dev. gnu: transfig: Remove package. gnu: texlive-latex-make: Update description. gnu: xfig: Update to 3.2.9. gnu/local.mk | 4 +- gnu/packages/docbook.scm | 2 +- .../patches/transfig-gcc10-fno-common.patch | 33 --- ...-error-message-for-missing-libraries.patch | 39 ++++ ...double-free-when-requesting-MediaBox.patch | 58 +++++ ...ig-to-set-fontconfig-CFLAGS-and-LIBS.patch | 89 ++++++++ gnu/packages/photo.scm | 3 +- gnu/packages/tex.scm | 2 +- gnu/packages/xfig.scm | 214 +++++++++--------- 9 files changed, 305 insertions(+), 139 deletions(-) delete mode 100644 gnu/packages/patches/transfig-gcc10-fno-common.patch create mode 100644 gnu/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch create mode 100644 gnu/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch create mode 100644 gnu/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch base-commit: ab971e9c1922ae6eeec47401cb589ae15f29e15f -- 2.40.1 ------------=_1696148402-20565-1--