[csw-devel] SF.net SVN: gar:[5087] csw/mgar/pkg/liblasi/trunk

[ellson at users.sourceforge.net]

Revision: 5087
          http://gar.svn.sourceforge.net/gar/?rev=5087&view=rev
Author:   ellson
Date:     2009-05-28 14:48:52 +0000 (Thu, 28 May 2009)

Log Message:
-----------
add patch to fix mismatched consts
switch back to Sun's compiler/linker

Modified Paths:
--------------
    csw/mgar/pkg/liblasi/trunk/Makefile
    csw/mgar/pkg/liblasi/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/liblasi/trunk/files/liblasi-consts.diff

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-28 14:46:14 UTC (rev 5086)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-28 14:48:52 UTC (rev 5087)
@@ -26,8 +26,10 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(SOURCENAME)-$(GARVERSION).tar.gz
 
-REQUIRED_PKGS = CSWftype2 CSWgcc3corert CSWgcc3g++ CSWggettextrt CSWglib2 CSWpango CSWzlib
+PATCHFILES = liblasi-consts.diff
 
+REQUIRED_PKGS = CSWftype2 CSWggettextrt CSWglib2 CSWpango CSWzlib
+
 CONFIGURE_SCRIPTS = custom
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS = custom
@@ -49,7 +51,6 @@
 configure-custom:
 	@echo " ==> Configuring $(GARNAME) (custom)"
 	@( cd $(WORKSRC) ; \
-		CXX=/opt/csw/gcc4/bin/g++ \
 		cmake	-DCMAKE_INSTALL_PREFIX=/opt/csw \
 			-DCMAKE_VERBOSE_MAKEFILE=ON \
 			. )

Modified: csw/mgar/pkg/liblasi/trunk/checksums
===================================================================
--- csw/mgar/pkg/liblasi/trunk/checksums	2009-05-28 14:46:14 UTC (rev 5086)
+++ csw/mgar/pkg/liblasi/trunk/checksums	2009-05-28 14:48:52 UTC (rev 5087)
@@ -1 +1,2 @@
 f18091569ed4fface75453b097c67459  download/libLASi-1.1.0.tar.gz
+3715bd353dbb70cfa7a5c95f447e14cc  download/liblasi-consts.diff

Added: csw/mgar/pkg/liblasi/trunk/files/liblasi-consts.diff
===================================================================
--- csw/mgar/pkg/liblasi/trunk/files/liblasi-consts.diff	                        (rev 0)
+++ csw/mgar/pkg/liblasi/trunk/files/liblasi-consts.diff	2009-05-28 14:48:52 UTC (rev 5087)
@@ -0,0 +1,19 @@
+--- libLASi-1.1.0.orig/src/psDoc.cpp	2008-02-09 02:27:56.000000000 +0100
++++ libLASi-1.1.0/src/psDoc.cpp	2009-05-28 16:30:44.992797292 +0200
+@@ -82,11 +82,11 @@
+ }
+ 
+ void PostscriptDocument::setFont(
+-    const char* const       family,
+-    const LASi::FontStyle   style,
+-    const LASi::FontWeight  weight,
+-    const LASi::FontVariant variant,
+-    const LASi::FontStretch stretch)
++    const char* const family,
++    LASi::FontStyle   style,
++    LASi::FontWeight  weight,
++    LASi::FontVariant variant,
++    LASi::FontStretch stretch)
+ {
+     
+     //


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.