diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2022-04-02 18:52:59 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2022-04-03 06:59:45 +0200 |
| commit | 077ad1ea6c8bca0eb13fd41f844718c92364d1ac (patch) | |
| tree | 4acd433b95b3499a71d4e38f2b5cf5fbc8ee826d /source/ap | |
| parent | 20f8c8e77495af3d80549ad1387c560581bc0b31 (diff) | |
| download | current-077ad1ea6c8bca0eb13fd41f844718c92364d1ac.tar.gz current-077ad1ea6c8bca0eb13fd41f844718c92364d1ac.tar.xz | |
Sat Apr 2 18:52:59 UTC 202220220402185259
ap/ghostscript-9.56.0-x86_64-1.txz: Upgraded.
d/poke-2.3-x86_64-1.txz: Upgraded.
l/freetype-2.12.0-x86_64-1.txz: Upgraded.
l/frei0r-plugins-1.8.0-x86_64-1.txz: Upgraded.
l/libsndfile-1.1.0-x86_64-1.txz: Upgraded.
l/mozilla-nss-3.77-x86_64-1.txz: Upgraded.
x/libX11-1.7.4-x86_64-1.txz: Upgraded.
xfce/mousepad-0.5.9-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch | 40 | ||||
| -rwxr-xr-x | source/ap/ghostscript/ghostscript.SlackBuild | 2 |
2 files changed, 42 insertions, 0 deletions
diff --git a/source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch b/source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch new file mode 100644 index 000000000..0e94bb9e9 --- /dev/null +++ b/source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch @@ -0,0 +1,40 @@ +From ef6bd6d61a3b5649dda077822d68de4e89133174 Mon Sep 17 00:00:00 2001 +From: Chris Liddell <chris.liddell@artifex.com> +Date: Wed, 30 Mar 2022 10:22:12 +0100 +Subject: [PATCH] Fix broken .so build + +The earlier rejig was incorrect. + +Noted here: + +https://github.com/ArtifexSoftware/ghostpdl/commit/9aae213ff3ae971942b427062799b009c07ea713#commitcomment-69841178 +--- + base/unix-dll.mak | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/base/unix-dll.mak b/base/unix-dll.mak +index 0e4bbab4a..89dfa5a2e 100644 +--- a/base/unix-dll.mak ++++ b/base/unix-dll.mak +@@ -193,15 +193,16 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UNIX_DLL_MAK) $(MAKEDIRS) + $(NO_OP) + + # Build the small Ghostscript loaders, with Gtk+ and without +-$(GLOBJ)dxmainc.$(OBJ): $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS) ++$(GLO)dxmainc.$(OBJ): $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS) + $(GLCC) $(GLO_)dxmainc.$(OBJ) $(C_) $(PSSRC)dxmainc.c + +-$(GSSOC_XE): gs-so-links-subtarget $(GLOBJ)dxmainc.$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS) +- $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE) ++$(GLO)dxmain.$(OBJ): $(PSSRC)dxmain.c $(UNIX_DLL_MAK) $(MAKEDIRS) ++ $(GLCC) $(SOC_CFLAGS) $(GLO_)dxmain.$(OBJ) $(C_) $(PSSRC)dxmain.c + +-$(GLO_)$(SOC_LOADER).$(OBJ): $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS) ++$(GSSOC_XE): gs-so-links-subtarget $(GLO)dxmainc.$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS) ++ $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE) + +-$(GSSOX_XE): gs-so-links-subtarget $(GLO_)$(SOC_LOADER).$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS) ++$(GSSOX_XE): gs-so-links-subtarget $(GLO)$(SOC_LOADER).$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS) + $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOX_XE) $(GLOBJ)$(SOC_LOADER).$(OBJ) -l$(GS_SO_BASE) $(SOC_LIBS) + + $(PCLSOC_XE): gpcl6-so-links-subtarget $(UNIX_DLL_MAK) $(PLOBJ)$(REALMAIN_SRC).$(OBJ) $(MAKEDIRS) diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild index 485704b8b..a08e3ccdd 100755 --- a/source/ap/ghostscript/ghostscript.SlackBuild +++ b/source/ap/ghostscript/ghostscript.SlackBuild @@ -89,6 +89,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/ef6bd6d61a3b5649dda077822d68de4e89133174.patch.gz | patch -p1 --verbose || exit 1 + # Build/install IJS: ( cd ijs CFLAGS="$SLKCFLAGS" \ |