[csw-devel] SF.net SVN: gar:[20764] csw/mgar/pkg/ghostscript/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Apr 17 16:26:15 CEST 2013
Revision: 20764
http://gar.svn.sourceforge.net/gar/?rev=20764&view=rev
Author: dmichelsen
Date: 2013-04-17 14:26:14 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
ghostscript/trunk: Intermediate commit
Modified Paths:
--------------
csw/mgar/pkg/ghostscript/trunk/Makefile
csw/mgar/pkg/ghostscript/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch
Modified: csw/mgar/pkg/ghostscript/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/Makefile 2013-04-17 13:44:48 UTC (rev 20763)
+++ csw/mgar/pkg/ghostscript/trunk/Makefile 2013-04-17 14:26:14 UTC (rev 20764)
@@ -1,7 +1,7 @@
# $Id$
NAME = ghostscript
-VERSION = 9.04
+VERSION = 9.07
GARTYPE = v2
DESCRIPTION = PostScript and PDF interpreter
@@ -11,11 +11,9 @@
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-PACKAGES = CSWgs
-CATALOGNAME_CSWgs = ghostscript
+PACKAGES = CSWghostscript
SPKG_DESC_CSWgs = PostScript and PDF interpreter
-
RUNTIME_DEP_PKGS_CSWgs += CSWlibjpeg7
RUNTIME_DEP_PKGS_CSWgs += CSWlibz1
RUNTIME_DEP_PKGS_CSWgs += CSWlibssl0-9-8
@@ -54,45 +52,40 @@
# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsc
# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsx
-SPKG_SOURCEURL = http://www.ghostscript.com
+OSOLETED_BY_CSWghostscript += CSWgs
+CATALOGNAME_CSWgs = ghostscript_stub
+VENDOR_URL = http://www.ghostscript.com
+
LICENSE = LICENSE
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=
UPSTREAM_USE_SF = 1
-# PATCHFILES += 0001-Support-libjpeg7.patch
-PATCHFILES += 0002-Rearrange-compiler-flags.patch
-PATCHFILES += 0003-Change-gcc-flags-to-sun.patch
-# PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch
-PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch
-# PATCHFILES += 0006-Fix-dynamic-link-flag.patch
-PATCHFILES += 0007-libidn-needs-L-opt-csw-lib.patch
-PATCHFILES += 0008-Wrong-place-in-configure.patch
+## PATCHFILES += 0001-Support-libjpeg7.patch
+#PATCHFILES += 0002-Rearrange-compiler-flags.patch
+#PATCHFILES += 0003-Change-gcc-flags-to-sun.patch
+## PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch
+#PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch
+## PATCHFILES += 0006-Fix-dynamic-link-flag.patch
+#PATCHFILES += 0007-libidn-needs-L-opt-csw-lib.patch
+#PATCHFILES += 0008-Wrong-place-in-configure.patch
# Not until libcupsimage.so libcups.so libkrb5.so libk5crypto.so
# libcom_err.so libkrb5support.so are 64-bit
-# EXTRA_INC = $(prefix)/X11/include
-# EXTRA_LIB = $(prefix)/X11/lib
-# EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-# We want to be linked with Xrender from $(prefix)/X11/lib not
-# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4
-# EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-
# EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx
+EXTRA_CFLAGS += $(LINKER_FLAGS)
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-dynamic
CONFIGURE_ARGS += --enable-cups
CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts
-# CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-# CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib
# This fails due to ghostscript using PLATFORM for internal use which gets set
# by GAR
-#TEST_TARGET = check
-TEST_TARGET =
+#TEST_TARGET =
include gar/category.mk
@@ -100,8 +93,8 @@
# INSTALL_ARGS = install install-so
# Use CSW build packages instead of bundled stuff
-pre-configure-$(MODULATION):
- @(echo "~~~ Removing bundled binaries ~~~")
- rm -rf $(WORKSRC)/jpeg
- rm -rf $(WORKSRC)/jbig2dec
-# @rm -rf $(WORKSRC)/jasper
+#pre-configure:
+# @(echo "~~~ Removing bundled binaries ~~~")
+# rm -rf $(WORKSRC)/jpeg
+# rm -rf $(WORKSRC)/jbig2dec
+# rm -rf $(WORKSRC)/jasper
Modified: csw/mgar/pkg/ghostscript/trunk/checksums
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/checksums 2013-04-17 13:44:48 UTC (rev 20763)
+++ csw/mgar/pkg/ghostscript/trunk/checksums 2013-04-17 14:26:14 UTC (rev 20764)
@@ -1 +1 @@
-9f6899e821ab6d78ab2c856f10fa3023 ghostscript-9.04.tar.bz2
+eea27befc1e85bef6d4768202f6b03a5 ghostscript-9.07.tar.bz2
Added: csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch (rev 0)
+++ csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch 2013-04-17 14:26:14 UTC (rev 20764)
@@ -0,0 +1,30 @@
+From fd8d878d5f1bdb7a49dbdfd220e6c7f3525743e1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 17 May 2011 16:51:09 +0200
+Subject: [PATCH] Do not return something in void context
+
+---
+ base/gdevdrop.c | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/base/gdevdrop.c b/base/gdevdrop.c
+index fc52ebe..50a315b 100644
+--- a/base/gdevdrop.c
++++ b/base/gdevdrop.c
+@@ -408,9 +408,11 @@ pack_planar_from_standard(gx_device_memory * dev, int y, int destx,
+ const byte *sp = src;
+ int x, plane;
+
+- if (pdepth == 1 && dev->color_info.num_components == 4)
+- return pack_planar_cmyk_1bit_from_standard(dev, y, destx, src, width,
++ if (pdepth == 1 && dev->color_info.num_components == 4) {
++ pack_planar_cmyk_1bit_from_standard(dev, y, destx, src, width,
+ depth, src_depth);
++ return;
++ }
+
+ for (plane = 0; plane < dev->num_planes; plane++) {
+ byte *dest = scan_line_base(dev, y + plane * dev->height);
+--
+1.7.3.2
+
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