From patchwork Thu Feb 22 16:10:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60901 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F1FAF27BBEA; Thu, 22 Feb 2024 16:43:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9EE4227BBE2 for ; Thu, 22 Feb 2024 16:43:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdC9g-0001UC-Me; Thu, 22 Feb 2024 11:42:40 -0500 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 1rdC9f-0001TX-7J for guix-patches@gnu.org; Thu, 22 Feb 2024 11:42:39 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdC9e-00025i-UQ for guix-patches@gnu.org; Thu, 22 Feb 2024 11:42:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdCA1-0004qf-SO for guix-patches@gnu.org; Thu, 22 Feb 2024 11:43:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 09/20] gnu: pstoedit: Update to 4.00. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170862017318608 (code B ref 68813); Thu, 22 Feb 2024 16:43:01 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:42:53 +0000 Received: from localhost ([127.0.0.1]:40382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdC9s-0004q1-IV for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:42:53 -0500 Received: from mail-oi1-f173.google.com ([209.85.167.173]:59611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdC9m-0004pS-BX for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:42:51 -0500 Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-3bb9b28acb4so5312349b6e.2 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:42:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708620077; x=1709224877; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6SXEExoUrGZFk1X0oD69sCrCLo+bv7NnYuGt2Jj/q0E=; b=MukM4MwSq1rbgj1La3x2DDFU9tSgIkVmAKmzexe8zH3C/UFz+Dt/Q/r6EBypZ8OmPI wl+Gi7lyAhekLUfeDtC1o6hWn2CAknXKXmivQwCvvWt9uh3z2CNFu1MVoYSviCZ69T+M gInCvLrgNI0SQNe4gxlfkvrQpHp7kpbDE+1NGHZWm7LaB3S7VGPDmyZJtah5wnRVsD0s XErNbeLpuLxzg8AAVvyjig5qZXm7CFTfqtz4TZJEQmPxXL6bkANJQ82d3N7m2n/1Ufc6 XkwFY89tIXfTIHuaDeBTBcml8HbvC88uDVVyLvbHnhS2XB3JCkaI5OmPmVCH01yZz87T pK0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708620077; x=1709224877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6SXEExoUrGZFk1X0oD69sCrCLo+bv7NnYuGt2Jj/q0E=; b=Ea91GAHMbUwVZ0y9ZUvEMdYb/AheuWIV+IIOA/fS5cgEtAk1TQxwH47kEH6ZTmmHo6 TlVkSIOA4lNaZXLrHUyUt4pkHcF/OMMqjaLWvcMMDg9lLAO4jycGkjdi9G0WvPzA6ceE RiHsbJHTeJOekpl9ihQLvrC5NyUYou03+gnyXT8JUFQ1uZEWWvB2EKDRMIXFhK/33pOZ eufDGQUG7eX9MKDSMYm862WD06JOsUscdpA0/EoqUjJ2x8A73PMBGxtn1rfad04QBO4S J3fndsVhj4W+aQKkzZJv1eCRuYsliVnjBXTxqzE0j+cP2J2ZN9Y2vUmCe/2dmSPtVUOu v0gQ== X-Gm-Message-State: AOJu0YydB1l/FHXwtnkAeGFkDx3xU8Mpx1q/CSydWiJlOrwgxogB3ea7 a20zvdMFSXFW1RhSeIz0Spnnyds0sp0/M3lET8wxWDaKePxWTsbO8vB3djwi X-Google-Smtp-Source: AGHT+IEX9bBLT/5wm558Y7Ol4+05kc5kTklCg5nTcngSnQcnVzpSdqr9seG4Arl5J+WxTuV8jqmEEw== X-Received: by 2002:a0c:ca0f:0:b0:68c:a83b:b1ba with SMTP id c15-20020a0cca0f000000b0068ca83bb1bamr22276027qvk.38.1708618487208; Thu, 22 Feb 2024 08:14:47 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:46 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:08 -0500 Message-ID: <0bd56daf4bc6f8dfb9616dad8b18f5e3a9f4f689.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graphics.scm (pstoedit): Update to 4.00. [source]: Apply patches. [arguments]: New field. [inputs]: Remove labels. Add glib and pango. * gnu/packages/patches/pstoedit-fix-gcc12.patch: New file. * gnu/packages/patches/pstoedit-fix-plainC.patch: Likewise. * gnu/packages/patches/pstoedit-pkglibdir.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. Change-Id: Ia17dae0ebc3e08b573b02431b10cc689a72a07dd --- gnu/local.mk | 3 ++ gnu/packages/graphics.scm | 31 ++++++++---- gnu/packages/patches/pstoedit-fix-gcc12.patch | 12 +++++ .../patches/pstoedit-fix-plainC.patch | 47 +++++++++++++++++++ gnu/packages/patches/pstoedit-pkglibdir.patch | 19 ++++++++ 5 files changed, 104 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/pstoedit-fix-gcc12.patch create mode 100644 gnu/packages/patches/pstoedit-fix-plainC.patch create mode 100644 gnu/packages/patches/pstoedit-pkglibdir.patch diff --git a/gnu/local.mk b/gnu/local.mk index 34cdf6564d..9db2e39c45 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1908,6 +1908,9 @@ dist_patch_DATA = \ %D%/packages/patches/psm-disable-memory-stats.patch \ %D%/packages/patches/psm-ldflags.patch \ %D%/packages/patches/psm-repro.patch \ + %D%/packages/patches/pstoedit-fix-gcc12.patch \ + %D%/packages/patches/pstoedit-fix-plainC.patch \ + %D%/packages/patches/pstoedit-pkglibdir.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ %D%/packages/patches/pulseview-qt515-compat.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e04834670d..17a388beea 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2021 Antoine Côté ;;; Copyright © 2021 Andy Tai @@ -976,23 +976,38 @@ (define-public python-booleanoperations (define-public pstoedit (package (name "pstoedit") - (version "3.77") + ;; Do not yet upgrade to 4.0.0, as its include file fails to compile for C + ;; project (see: https://github.com/reviczky/pstoedit/issues/2). + (version "4.00") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pstoedit/pstoedit/" version "/pstoedit-" version ".tar.gz")) (sha256 (base32 - "02av76j75g5sq3bg353yl6dlllda9ihmmk4c8hvgiscix816nv4s")))) + "1sk2mhrjgnlz4a1650p3qxrv6av6qc66ibmy48ckspx7mfp7snh7")) + (patches + (search-patches "pstoedit-fix-gcc12.patch" + "pstoedit-fix-plainC.patch" + "pstoedit-pkglibdir.patch")))) (build-system gnu-build-system) + (arguments + ;; Avoid keeping extraneous references to libtool exhaustively listed + ;; dependencies. + (list #:configure-flags #~(list "LDFLAGS=-Wl,--as-needed"))) (native-inputs (list pkg-config)) (inputs - `(("ghostscript" ,ghostscript) - ("imagemagick" ,imagemagick) - ("libplot" ,plotutils) - ("libjpeg" ,libjpeg-turbo) - ("zlib" ,zlib))) ;else libp2edrvmagick++.so fails to link + (list ghostscript + imagemagick + plotutils + libjpeg-turbo + libzip + ;; The following inputs are pulled in by libtool, from the + ;; imagemagick library files (.la), which records all its + ;; transitive dependencies. + glib + pango)) (home-page "http://www.pstoedit.net/") (synopsis "Converter for PostScript and PDF graphics") (description "The @code{pstoedit} utility allows translating graphics diff --git a/gnu/packages/patches/pstoedit-fix-gcc12.patch b/gnu/packages/patches/pstoedit-fix-gcc12.patch new file mode 100644 index 0000000000..4aeeaff818 --- /dev/null +++ b/gnu/packages/patches/pstoedit-fix-gcc12.patch @@ -0,0 +1,12 @@ +Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree + +--- a/src/drvpptx.orig.cpp 2021-08-29 16:25:45.000000000 +0200 ++++ b/src/drvpptx.cpp 2022-01-28 11:57:44.765756339 +0100 +@@ -65,6 +65,7 @@ + #define ZIP_EXTERN extern + + #include ++#include + + #ifdef _MSC_VER + // MS VC++ Windows diff --git a/gnu/packages/patches/pstoedit-fix-plainC.patch b/gnu/packages/patches/pstoedit-fix-plainC.patch new file mode 100644 index 0000000000..684c5043be --- /dev/null +++ b/gnu/packages/patches/pstoedit-fix-plainC.patch @@ -0,0 +1,47 @@ +Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree + +diff --git a/src/pstoedit.cpp b/src/pstoedit.cpp +index a718f37..ac0df37 100755 +--- a/src/pstoedit.cpp ++++ b/src/pstoedit.cpp +@@ -327,6 +327,11 @@ extern FILE *yyin; // used by lexer + // otherwise we could declare it locally where it is used + + ++extern "C" DLLEXPORT void loadpstoeditplugins_plainC(const char *progname, int verbose) ++{ ++ return loadpstoeditplugins(progname, cerr, (bool) verbose); ++} ++ + static void usage(ostream & outstream, bool forTeX, bool withdetails, bool withcategories ) + { + if (withcategories) { +diff --git a/src/pstoedit.h b/src/pstoedit.h +index 294b3c2..74ebf2a 100755 +--- a/src/pstoedit.h ++++ b/src/pstoedit.h +@@ -100,8 +100,13 @@ void clearPstoeditDriverInfo_plainC(struct DriverDescription_S * ptr); + + #ifdef __cplusplus + extern "C" DLLEXPORT +-#endif + void loadpstoeditplugins(const char* progname, std::ostream & errstream, bool verbose); ++#endif ++ ++#ifdef __cplusplus ++extern "C" DLLEXPORT ++#endif ++void loadpstoeditplugins_plainC(const char* progname, int verbose); + + #ifdef __cplusplus + extern "C" DLLEXPORT +--- a/src/pstoedit.orig.h 2023-07-22 19:27:43.691166652 +0200 ++++ b/src/pstoedit.h 2023-07-22 19:31:18.897952130 +0200 +@@ -37,6 +37,7 @@ + #endif + + #include "pstoedll.h" ++#include + + typedef int (*execute_interpreter_function)(int argc, const char * const argv[]); + diff --git a/gnu/packages/patches/pstoedit-pkglibdir.patch b/gnu/packages/patches/pstoedit-pkglibdir.patch new file mode 100644 index 0000000000..0734913593 --- /dev/null +++ b/gnu/packages/patches/pstoedit-pkglibdir.patch @@ -0,0 +1,19 @@ +Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree + +--- a/config/pstoedit.pc.orig.in 2018-04-16 14:26:28.000000000 +0200 ++++ b/config/pstoedit.pc.in 2020-10-05 14:37:16.750980762 +0200 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/pstoedit + + Name: pstoedit + Description: converts PostScript(TM) and PDF files to other vector graphic formats +@@ -8,4 +8,4 @@ + Version: @VERSION@.0 + Requires: + Libs: -L@libdir@ -lpstoedit @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@ +-Cflags: -I@includedir@ ++Cflags: -I@includedir@/pstoedit