Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f8a87f89cbcc8cd6ac0b2f5feae19c3d4e9d9f27)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f8a87f89cbcc8cd6ac0b2f5feae19c3d4e9d9f27)
  • Date: Mon, 26 Sep 2016 19:24:17 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

printer/ghostscript/DEPENDS | 2 -
printer/ghostscript/DETAILS | 8 +++---
printer/ghostscript/HISTORY | 7 +++++
printer/ghostscript/PRE_BUILD | 4 ++-
printer/ghostscript/fix_openjp2_dynamic_linking.patch | 23
++++++++++++++++++
5 files changed, 38 insertions(+), 6 deletions(-)

New commits:
commit f8a87f89cbcc8cd6ac0b2f5feae19c3d4e9d9f27
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

printer/ghostscript: version 9.20

commit 5a70922773818208d5e5f144291ac987138b5622
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

printer/ghostscript: version 9.20

diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index e5038f0..172d9f0 100755
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -4,7 +4,7 @@ depends freetype2 &&
depends JPEG &&
depends tiff '--with-system-libtiff' &&
depends lcms2 &&
-depends libpng &&
+#depends libpng &&
depends zlib &&

if [[ "$GS_LIBGS" == y ]]; then
diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index 557e563..f261170 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -1,8 +1,8 @@
SPELL=ghostscript
- VERSION=9.19
- VX=gs919
-
SOURCE_HASH=sha512:d92d05c90ab4849ccca0d8aa0c583d41da3fe6089fd724a84f1fbddb3e65e116ee064ae0933b77019609332f765840146b62607e2f94dbfff90aa0597e1271ea
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=9.20
+ VX=gs$(echo $VERSION|sed -e 's:\.::')
+
SOURCE_HASH=sha512:fc7e79a837334aa800ab27110996199c82b5074e70159d103000eb697352a7aee2e846a23760d4f9a96e484d4ebabe6fd5ff05df37d1184a090943c44da61ea9
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.ghostscript.com/

SOURCE_URL[0]=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/$VX/$SOURCE
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index aecc01d..e9b8f20 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,10 @@
+2016-09-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 9.20
+ * PRE_BUILD, fix_openjp2_dynamic_linking.patch: error during linking,
patch
+ from Debian
+ * PRE_BUILD, DEPENDS: use libpng that comes with ghostscript as ours
seems to be
+ incompatible
+
2016-05-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 9.19
now download from github
diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
index ac46868..f88c222 100755
--- a/printer/ghostscript/PRE_BUILD
+++ b/printer/ghostscript/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# remove most of the embedded libraries. use the system ones instead
-rm -rf freetype jpeg libpng tiff lcms2 cups ijs openjpeg zlib
+rm -rf freetype jpeg tiff lcms2 cups ijs openjpeg zlib &&
+
+patch -p1 < "$SPELL_DIRECTORY/fix_openjp2_dynamic_linking.patch"
diff --git a/printer/ghostscript/fix_openjp2_dynamic_linking.patch
b/printer/ghostscript/fix_openjp2_dynamic_linking.patch
new file mode 100644
index 0000000..1106ad0
--- /dev/null
+++ b/printer/ghostscript/fix_openjp2_dynamic_linking.patch
@@ -0,0 +1,23 @@
+Descrtiption: Don't pass -DOPJ_STATIC when compiling the OpenJPEG code, as it
+ makes the symbols hidden when including /usr/include/openjpeg-2.1/openjpeg.h
+ .
+ Fixes a FTBFS against libopenjp2-7 (>= 2.1.1)
+Author: Didier Raboud <odyx AT debian.org>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/832873
+
+--- a/base/lib.mak
++++ b/base/lib.mak
+@@ -1830,11 +1830,11 @@
+
+ $(GLOBJ)sjpx_openjpeg.$(OBJ) : $(GLSRC)sjpx_openjpeg.c $(AK) \
+ $(memory__h) $(gserror_h) $(gserrors_h) \
+ $(gdebug_h) $(strimpl_h) $(sjpx_openjpeg_h) $(LIB_MAK) $(MAKEDIRS)
+ $(GLJPXOPJCC) $(GLO_)sjpx_openjpeg.$(OBJ) \
+- $(C_) -DOPJ_STATIC $(GLSRC)sjpx_openjpeg.c
++ $(C_) $(GLSRC)sjpx_openjpeg.c
+
+ # ---------------- Pixel-difference filters ---------------- #
+ # The Predictor facility of the LZW and Flate filters uses these.
+
+ pdiff_=$(GLOBJ)spdiff.$(OBJ)



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f8a87f89cbcc8cd6ac0b2f5feae19c3d4e9d9f27), Florian Franzmann, 09/26/2016

Archive powered by MHonArc 2.6.24.

Top of Page