SF.net SVN: gar:[24336] csw/mgar/pkg/ghostscript/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Nov 12 22:11:44 CET 2014
Revision: 24336
http://sourceforge.net/p/gar/code/24336
Author: dmichelsen
Date: 2014-11-12 21:11:44 +0000 (Wed, 12 Nov 2014)
Log Message:
-----------
ghostscript/trunk: Update to 9.15
Modified Paths:
--------------
csw/mgar/pkg/ghostscript/trunk/Makefile
csw/mgar/pkg/ghostscript/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch
Modified: csw/mgar/pkg/ghostscript/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/Makefile 2014-11-12 20:49:23 UTC (rev 24335)
+++ csw/mgar/pkg/ghostscript/trunk/Makefile 2014-11-12 21:11:44 UTC (rev 24336)
@@ -1,7 +1,7 @@
# $Id$
NAME = ghostscript
-VERSION = 9.14
+VERSION = 9.15
GARTYPE = v2
DESCRIPTION = PostScript and PDF interpreter
@@ -15,6 +15,8 @@
# See for details https://www.opencsw.org/mantis/view.php?id=4913
#PATCHFILES += 0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch
+PATCHFILES += 0001-Fix-for-latest-autotools.patch
+
VENDOR_URL = http://www.ghostscript.com
LICENSE = LICENSE
@@ -60,6 +62,8 @@
RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWghostscript += CSWliblcms2-2
RUNTIME_DEP_PKGS_CSWghostscript += CSWlibijs0-35
+RUNTIME_DEP_PKGS_CSWghostscript-sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWghostscript += $(RUNTIME_DEP_PKGS_CSWghostscript-$(GARCH))
# These are probably ok
CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/lprsetup.sh
@@ -71,8 +75,6 @@
CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/lprsetup.sh
CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/unix-lpr.sh
-CHECKPKG_OVERRIDES_CSWghostscript += missing-dependency|CSWemacs-common
-
# This was the old package
OBSOLETED_BY_CSWghostscript += CSWgs
CATALOGNAME_CSWgs = ghostscript_stub
@@ -98,13 +100,14 @@
RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibpaper1
RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWlibgs9 += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibgs9-sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgs9 += $(RUNTIME_DEP_PKGS_CSWlibgs9-$(GARCH))
+
# This used to be a separate library and is now maintained as part of Ghostscript
PACKAGES += CSWlibijs0-35
-CATALOGNAME_CSWlibijs0-35 = libijs0_35
-PKGFILES_CSWlibijs0-35 += $(call baseisadirs,$(libdir),libijs-0\.35\.so)
-PKGFILES_CSWlibijs0-35 += $(call baseisadirs,$(libdir),libijs-0\.35\.so(\.\d+)*)
-SPKG_DESC_CSWlibijs0-35 += $(DESCRIPTION), libijs-0.35.so
+PKGFILES_CSWlibijs0-35 += $(call pkgfiles_lib,libijs-0.35.so)
+SPKG_DESC_CSWlibijs0-35 = $(DESCRIPTION), libijs-0.35.so
RUNTIME_DEP_PKGS_CSWlibijs0-35 += CSWlibgcc-s1
OBSOLETED_BY_CSWlibijs0-35 = CSWijs
CHECKPKG_OVERRIDES_CSWlibijs0-35 += soname-equals-filename
@@ -122,18 +125,6 @@
RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibijs0-35
RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWghostscript
-###
-# Needed for the Solaris ld bug
-ifeq ($(shell /usr/bin/uname -p),sparc)
-RUNTIME_DEP_PKGS_CSWghostscript += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibgnutls28
-RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibk5crypto3
-endif
-###
-
REINPLACEMENTS += fontpath
REINPLACE_MATCH_fontpath = /usr/share/cups/fonts
REINPLACE_WITH_fontpath = $(sharedstatedir)/cups/fonts
@@ -163,9 +154,9 @@
BUILD_ARGS += so
# This is needed because libidn.so and libpaper.so are not linked with LDFLAGS set
-BUILD_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))"
+#BUILD_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))"
-TEST_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))"
+#TEST_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))"
INSTALL_ARGS += soinstall
@@ -185,6 +176,9 @@
rm -rf $(WORKSRC)/expat
@$(MAKECOOKIE)
+# For building IJS take this into account:
+# http://bugs.ghostscript.com/show_bug.cgi?id=692040
+
post-configure:
# Specific for libijs
cd $(WORKSRC)/ijs && ./autogen.sh
Modified: csw/mgar/pkg/ghostscript/trunk/checksums
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/checksums 2014-11-12 20:49:23 UTC (rev 24335)
+++ csw/mgar/pkg/ghostscript/trunk/checksums 2014-11-12 21:11:44 UTC (rev 24336)
@@ -1 +1 @@
-586494befb443363338c1b6379f13973 ghostscript-9.14.tar.gz
+5a78ab0990ff6ec3a103576bc8777c46 ghostscript-9.15.tar.gz
Added: csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch (rev 0)
+++ csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch 2014-11-12 21:11:44 UTC (rev 24336)
@@ -0,0 +1,97 @@
+From 5732afdaaa749b7caf4757c1d6f7b92c87bf5e5b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 11 Nov 2014 15:27:55 +0100
+Subject: [PATCH] Fix for latest autotools
+
+---
+ ijs/Makefile.am | 4 +++-
+ ijs/autogen.sh | 4 ++--
+ ijs/configure.ac | 7 ++++---
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/ijs/Makefile.am b/ijs/Makefile.am
+index 6ca2adf..50c5755 100644
+--- a/ijs/Makefile.am
++++ b/ijs/Makefile.am
+@@ -23,7 +23,9 @@
+
+ ## Process this file with automake to produce Makefile.in.
+
+-AUTOMAKE_OPTIONS = 1.8 foreign dist-bzip2 no-dependencies
++AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2 no-dependencies
++
++ACLOCAL_AMFLAGS = -I m4
+
+ @SET_MAKE@
+
+diff --git a/ijs/autogen.sh b/ijs/autogen.sh
+index 4e346eb..3b3c509 100755
+--- a/ijs/autogen.sh
++++ b/ijs/autogen.sh
+@@ -51,7 +51,7 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/"
+ echo
+ else
+ echo -n "checking for automake $AM_NEEDED or later... "
+- for am in automake-$AM_NEEDED automake$AM_NEEDED automake; do
++ for am in automake automake-$AM_NEEDED automake$AM_NEEDED automake; do
+ ($am --version < /dev/null > /dev/null 2>&1) || continue
+ AM_MAJOR=`echo $AM_NEEDED |cut -d. -f1`
+ AM_MINOR=`echo $AM_NEEDED |cut -d. -f2`
+@@ -65,7 +65,7 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/"
+ done
+ test -z $AUTOMAKE && echo "no"
+ echo -n "checking for aclocal $AM_NEEDED or later... "
+- for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do
++ for ac in aclocal aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do
+ ($ac --version < /dev/null > /dev/null 2>&1) || continue
+ AM_MAJOR=`echo $AM_NEEDED |cut -d. -f1`
+ AM_MINOR=`echo $AM_NEEDED |cut -d. -f2`
+diff --git a/ijs/configure.ac b/ijs/configure.ac
+index df0260f..f0fae9f 100644
+--- a/ijs/configure.ac
++++ b/ijs/configure.ac
+@@ -51,6 +51,7 @@ pushdef([IJS_VERSION], IJS_MAJOR_VERSION.IJS_MINOR_VERSION[]IJS_EXTRA_VERSION)
+
+ AC_INIT(IJS_NAME, IJS_VERSION, [inkjet-list at linuxprinting.org])
+ AC_PREREQ(2.53)
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(ijs.c)
+ AC_REVISION($Revision: 5783 $)
+
+@@ -84,7 +85,7 @@ popdef([IJS_INTERFACE_AGE])
+ popdef([IJS_BINARY_AGE])
+
+ dnl Initialize automake stuff.
+-AM_INIT_AUTOMAKE(IJS_NAME, IJS_VERSION)
++AM_INIT_AUTOMAKE
+ popdef([IJS_NAME])
+ popdef([IJS_VERSION])
+
+@@ -117,7 +118,7 @@ AC_SUBST(LIBTOOL_DEPS)
+ dnl Checks for programs
+
+ AC_PROG_CC
+-AM_PROG_LIBTOOL
++AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+@@ -140,6 +141,7 @@ case ${host_os} in
+ cygwin | mingw32 | pw32 | interix3 | interix | uwin) libijs_sysdeps="windows";;
+ *) libijs_sysdeps="unix";;
+ esac
++
+ AM_CONDITIONAL(SYSDEPS_WINDOWS, test x$libijs_sysdeps = xwindows)
+
+
+@@ -151,7 +153,6 @@ AC_SUBST(IJS_VERSION)
+ AC_SUBST(ijs_cflags)
+ ijs_libs="${IJS_LIBS} ${IJS_DEPLIBS}"
+ AC_SUBST(ijs_libs)
+-AC_SUBST(INCLUDES)
+ LIBIJS_LIBS="${LIBIJS_LIBS} ${IJS_DEPLIBS}"
+ AC_SUBST(LIBIJS_LIBS)
+
+--
+2.0.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list