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

[lblume at users.sourceforge.net]

Revision: 21656
          http://gar.svn.sourceforge.net/gar/?rev=21656&view=rev
Author:   lblume
Date:     2013-08-06 11:59:44 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
liblasi/trunk: Bump version to 1.1.1; switch compiler to GCC4; clean up deps

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2013-08-06 07:45:49 UTC (rev 21655)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2013-08-06 11:59:44 UTC (rev 21656)
@@ -1,5 +1,5 @@
 NAME = liblasi
-VERSION = 1.1.0
+VERSION = 1.1.1
 GARTYPE = v2
 
 DESCRIPTION = C++ Unicode support for PostScript
@@ -26,31 +26,36 @@
 DISTNAME = $(SOURCENAME)-$(VERSION)
 DISTFILES  = $(DISTNAME).tar.gz
 
-PATCHFILES = liblasi-consts.diff
-
 VENDOR_URL = http://unifont.org/lasi/
 
-PACKAGES += CSWliblasi0
-SPKG_DESC_CSWliblasi0 = C++ Unicode support for PostScript, libLASi.so.0
-PKGFILES_CSWliblasi0 = $(call pkgfiles_lib,libLASi.so.0)
-RUNTIME_DEP_PKGS_CSWliblasi0 += CSWftype2
-RUNTIME_DEP_PKGS_CSWliblasi0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWliblasi0 += CSWglib2
-RUNTIME_DEP_PKGS_CSWliblasi0 += CSWpango
-RUNTIME_DEP_PKGS_CSWliblasi0 += CSWfconfig
-OBSOLETED_BY_CSWliblasi0 = CSWliblasi
+GARCOMPILER = GCC4
 
+PACKAGES += CSWliblasi1
+SPKG_DESC_CSWliblasi1 = C++ Unicode support for PostScript, libLASi.so.1
+PKGFILES_CSWliblasi1 = $(call pkgfiles_lib,libLASi.so.1)
+RUNTIME_DEP_PKGS_CSWliblasi1 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWliblasi1 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWliblasi1 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWliblasi1 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWliblasi1 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWliblasi1 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWliblasi1 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWliblasi1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWliblasi1 += CSWpango
+OBSOLETED_BY_CSWliblasi1 = CSWliblasi
+# A lot of those, but the test returns nothing, so false positive
+CHECKPKG_OVERRIDES_CSWliblasi1 += no-direct-binding
+
 PACKAGES += CSWliblasi-dev
 SPKG_DESC_CSWliblasi-dev = Developer support for libLASi.so.0
 PKGFILES_CSWliblasi-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWliblasi-dev += $(sharedstatedir)/doc/.*
-RUNTIME_DEP_PKGS_CSWliblasi-dev += CSWliblasi0
-# That is ok
-CHECKPKG_OVERRIDES_CSWliblasi-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblasi/examples/README
+RUNTIME_DEP_PKGS_CSWliblasi-dev += CSWliblasi1
 
 BUILD64_LIBS_ONLY = 1
 
-EXTRA_CXX_FLAGS = -lCstd -norunpath
+# It doesn't remove the no-direct-binding errors, but it shouldn't hurt either
+EXTRA_LD_OPTIONS = -z nolazyload
 
 CONFIGURE_SCRIPTS = custom
 BUILD_SCRIPTS = custom
@@ -63,15 +68,16 @@
 	@echo " ==> Configuring $(NAME) (custom)"
 	@( cd $(WORKSRC) ; \
 		cmake	-DCMAKE_INSTALL_PREFIX="$(prefix)" \
-      -DCMAKE_INSTALL_EXEC_PREFIX:PATH="$(exec_prefix)" \
-      -DCMAKE_INSTALL_BINDIR:PATH="$(bindir)" \
-      -DCMAKE_INSTALL_DATADIR:PATH="$(datadir)" \
-      -DCMAKE_INSTALL_LIBDIR:PATH="$(libdir)" \
-      -DCMAKE_INSTALL_INCLUDEDIR:PATH="$(includedir)" \
-      -DCMAKE_INSTALL_INFODIR:PATH="$(infodir)" \
-      -DCMAKE_INSTALL_MANDIR:PATH="$(mandir)" \
-			-DCMAKE_VERBOSE_MAKEFILE=ON \
-      -DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS)" \
+	-DCMAKE_INSTALL_EXEC_PREFIX:PATH="$(exec_prefix)" \
+	-DCMAKE_INSTALL_BINDIR:PATH="$(bindir)" \
+	-DCMAKE_INSTALL_DATADIR:PATH="$(datadir)" \
+	-DCMAKE_INSTALL_LIBDIR:PATH="$(libdir)" \
+	-DCMAKE_INSTALL_INCLUDEDIR:PATH="$(includedir)" \
+	-DCMAKE_INSTALL_INFODIR:PATH="$(infodir)" \
+	-DCMAKE_INSTALL_MANDIR:PATH="$(mandir)" \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DCMAKE_CXX_COMPILER="$(CXX)" \
+	-DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS)" \
 			. )
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/liblasi/trunk/checksums
===================================================================
--- csw/mgar/pkg/liblasi/trunk/checksums	2013-08-06 07:45:49 UTC (rev 21655)
+++ csw/mgar/pkg/liblasi/trunk/checksums	2013-08-06 11:59:44 UTC (rev 21656)
@@ -1,2 +1 @@
-f18091569ed4fface75453b097c67459  download/libLASi-1.1.0.tar.gz
-3715bd353dbb70cfa7a5c95f447e14cc  download/liblasi-consts.diff
+bc5161b1d820db3dbcea24ce1c2ed5ec  libLASi-1.1.1.tar.gz

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