From 3453ec649ab7db8d4edce1fc37fc0a5a2b66a9a7 Mon Sep 17 00:00:00 2001 From: Remko Scharroo Date: Thu, 19 Sep 2024 15:49:49 +0200 Subject: [PATCH] ghostscript: update to 10.04.0 --- graphics/ImageMagick/Portfile | 2 +- graphics/ImageMagick7/Portfile | 2 +- graphics/dvisvgm-devel/Portfile | 2 +- graphics/dvisvgm/Portfile | 2 +- graphics/xfig/Portfile | 2 +- print/ghostscript/Portfile | 13 +++--- .../files/patch-base_unix-dll.mak.diff | 41 ------------------- print/ghostscript/files/pdf_sec.c.diff | 20 --------- 8 files changed, 10 insertions(+), 74 deletions(-) delete mode 100644 print/ghostscript/files/patch-base_unix-dll.mak.diff delete mode 100644 print/ghostscript/files/pdf_sec.c.diff diff --git a/graphics/ImageMagick/Portfile b/graphics/ImageMagick/Portfile index cf7b06ef834e0..d27edf6ba51c0 100644 --- a/graphics/ImageMagick/Portfile +++ b/graphics/ImageMagick/Portfile @@ -14,7 +14,7 @@ legacysupport.newest_darwin_requires_legacy 10 name ImageMagick version 6.9.13-16 -revision 0 +revision 1 checksums rmd160 a76f0d3808d23e96badfd95fbaf9d1ec5c647694 \ sha256 a2ca04c37ef56e669f442954d878bab7d096fadabdc75f6027f755bfdbf89a98 \ size 9613864 diff --git a/graphics/ImageMagick7/Portfile b/graphics/ImageMagick7/Portfile index 6ec2f18a37575..838171d3301df 100644 --- a/graphics/ImageMagick7/Portfile +++ b/graphics/ImageMagick7/Portfile @@ -22,7 +22,7 @@ legacysupport.newest_darwin_requires_legacy 10 name ImageMagick7 github.setup ImageMagick ImageMagick 7.1.1-38 -revision 1 +revision 2 checksums rmd160 9b461dc2111125fd05ca0949db5480794b87bef2 \ sha256 109c4ce940db01e6e45ede67800e58ad1beaac9b04f27c618ffc4a1ec317159d \ diff --git a/graphics/dvisvgm-devel/Portfile b/graphics/dvisvgm-devel/Portfile index c6e4e655d5ddf..b0c200e3d47f9 100644 --- a/graphics/dvisvgm-devel/Portfile +++ b/graphics/dvisvgm-devel/Portfile @@ -9,7 +9,7 @@ github.setup mgieseki dvisvgm 3.3 name dvisvgm-devel conflicts dvisvgm set my_name dvisvgm -revision 1 +revision 2 checksums rmd160 2d3ebc700dce7d769e90be616b30cd15751df795 \ sha256 52be6bc4bb50c9a5bb7264c516ad7b867a91c4ccaa136a36b8919bab5578e30c \ diff --git a/graphics/dvisvgm/Portfile b/graphics/dvisvgm/Portfile index c503c5c6c98e3..910420264411e 100644 --- a/graphics/dvisvgm/Portfile +++ b/graphics/dvisvgm/Portfile @@ -9,7 +9,7 @@ github.setup mgieseki dvisvgm 3.3 name dvisvgm conflicts dvisvgm-devel set my_name dvisvgm -revision 1 +revision 2 checksums rmd160 2d3ebc700dce7d769e90be616b30cd15751df795 \ sha256 52be6bc4bb50c9a5bb7264c516ad7b867a91c4ccaa136a36b8919bab5578e30c \ diff --git a/graphics/xfig/Portfile b/graphics/xfig/Portfile index 134991bb9e073..589ed31b0859b 100644 --- a/graphics/xfig/Portfile +++ b/graphics/xfig/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 name xfig version 3.2.9 -revision 1 +revision 2 categories graphics x11 license Permissive maintainers nomaintainer diff --git a/print/ghostscript/Portfile b/print/ghostscript/Portfile index d78ccf7aba29e..008b4a1ce99b0 100644 --- a/print/ghostscript/Portfile +++ b/print/ghostscript/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup muniversal 1.0 name ghostscript -version 10.03.1 +version 10.04.0 revision 0 categories print @@ -34,9 +34,9 @@ distfiles ${distname}.tar.gz:source \ ${mappingresources_commit}.zip:misc checksums ${distname}.tar.gz \ - rmd160 56619c52c32237c97739d1830b0513cd6b17d2a8 \ - sha256 8ea9dd8768b64576bc4ee2d79611450c9e1edeb686f7824f3bf94b92457b882a \ - size 98222799 \ + rmd160 ab1bac9af5538bf441f7ec309a63513af427a96d \ + sha256 8b1594b067e00e386f818270a255eef6baba593197173725951d5f0c316dc205 \ + size 98270469 \ ghostscript-fonts-other-6.0.tar.gz \ rmd160 ab60dbf71e7d91283a106c3df381cadfe173082f \ sha256 4fa051e341167008d37fe34c19d241060cd17b13909932cd7ca7fe759243c2de \ @@ -70,13 +70,9 @@ post-extract { copy -force {*}[glob ${workpath}/mapping-resources-pdf-${mappingresources_commit}/pdf2other/*] ${worksrcpath}/Resource/CMap } -patchfiles-append patch-base_unix-dll.mak.diff patchfiles-append patch-base_unixinst.mak.diff -patchfiles-append pdf_sec.c.diff post-patch { - reinplace "s|__PREFIX__|${prefix}|" \ - ${worksrcpath}/base/unix-dll.mak reinplace "s|ZLIBDIR=src|ZLIBDIR=${prefix}/include|" \ ${worksrcpath}/configure.ac @@ -115,6 +111,7 @@ configure.checks.implicit_function_declaration.whitelist-append strchr # tell ghostscript it's OK to use the system pkg-config even when cross-compiling # see https://trac.macports.org/ticket/66627 configure.env-append \ + DARWIN_LDFLAGS_SO_PREFIX="${prefix}/lib/" \ PKGCONFIG=${prefix}/bin/pkg-config # https://trac.macports.org/ticket/56137 diff --git a/print/ghostscript/files/patch-base_unix-dll.mak.diff b/print/ghostscript/files/patch-base_unix-dll.mak.diff deleted file mode 100644 index 8c5ac2022ff94..0000000000000 --- a/print/ghostscript/files/patch-base_unix-dll.mak.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- base/unix-dll.mak.orig 2021-09-27 02:40:04.000000000 -0500 -+++ base/unix-dll.mak 2022-01-30 21:59:57.000000000 -0600 -@@ -100,13 +100,31 @@ - - - # MacOS X --#GS_SOEXT=dylib --#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) --#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) --#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) --#LDFLAGS_SO=-dynamiclib -flat_namespace --#LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR) --#LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME) -+GS_SOEXT=dylib -+GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) -+GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) -+GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) -+GS_LDFLAGS_SO=-dynamiclib -install_name __PREFIX__/lib/$(GS_SONAME_MAJOR_MINOR) -+ -+PCL_SONAME=$(PCL_SONAME_BASE).$(GS_SOEXT) -+PCL_SONAME_MAJOR=$(PCL_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) -+PCL_SONAME_MAJOR_MINOR=$(PCL_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) -+PCL_LDFLAGS_SO=-dynamiclib -install_name __PREFIX__/lib/$(PCL_SONAME_MAJOR_MINOR) -+ -+XPS_SONAME=$(XPS_SONAME_BASE).$(GS_SOEXT) -+XPS_SONAME_MAJOR=$(XPS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) -+XPS_SONAME_MAJOR_MINOR=$(XPS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) -+XPS_LDFLAGS_SO=-dynamiclib -install_name __PREFIX__/lib/$(XPS_SONAME_MAJOR_MINOR) -+ -+PDF_SONAME=$(PDF_SONAME_BASE).$(GS_SOEXT) -+PDF_SONAME_MAJOR=$(PDF_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) -+PDF_SONAME_MAJOR_MINOR=$(PDF_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) -+PDF_LDFLAGS_SO=-dynamiclib -install_name __PREFIX__/lib/$(PDF_SONAME_MAJOR_MINOR) -+ -+GPDL_SONAME=$(GPDL_SONAME_BASE).$(GS_SOEXT) -+GPDL_SONAME_MAJOR=$(GPDL_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) -+GPDL_SONAME_MAJOR_MINOR=$(GPDL_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) -+PDL_LDFLAGS_SO=-dynamiclib -install_name __PREFIX__/lib/$(GPDL_SONAME_MAJOR_MINOR) - - GS_SO=$(BINDIR)/$(GS_SONAME) - GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) diff --git a/print/ghostscript/files/pdf_sec.c.diff b/print/ghostscript/files/pdf_sec.c.diff deleted file mode 100644 index 029b5c094389d..0000000000000 --- a/print/ghostscript/files/pdf_sec.c.diff +++ /dev/null @@ -1,20 +0,0 @@ -Fix: - -error: assignment to ‘char **’ from incompatible pointer type ‘char *’ [-Wincompatible-pointer-types] -error: assignment to ‘int *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] - -https://bugs.ghostscript.com/show_bug.cgi?id=707649 -https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=90cabe08422afdd16bac5dd9217602679d943045 ---- pdf/pdf_sec.c.orig 2024-03-06 10:52:27 -+++ pdf/pdf_sec.c 2024-03-14 21:16:11 -@@ -183,8 +183,8 @@ - * this easy: the errors we want to ignore are the ones with - * codes less than 100. */ - if ((int)err < 100) { -- NewPassword = Password; -- NewLen = Len; -+ *NewPassword = Password; -+ *NewLen = Len; - return 0; - } -