[csw-devel] SF.net SVN: gar:[9706] csw/mgar/pkg/libspectre/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Apr 19 13:28:06 CEST 2010


Revision: 9706
          http://gar.svn.sourceforge.net/gar/?rev=9706&view=rev
Author:   dmichelsen
Date:     2010-04-19 11:28:06 +0000 (Mon, 19 Apr 2010)

Log Message:
-----------
libspectre: Update to 0.2.5

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

Removed Paths:
-------------
    csw/mgar/pkg/libspectre/trunk/files/fixme.sh

Modified: csw/mgar/pkg/libspectre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libspectre/trunk/Makefile	2010-04-19 10:17:43 UTC (rev 9705)
+++ csw/mgar/pkg/libspectre/trunk/Makefile	2010-04-19 11:28:06 UTC (rev 9706)
@@ -1,5 +1,5 @@
 GARNAME = libspectre
-GARVERSION = 0.2.2
+GARVERSION = 0.2.5
 CATEGORIES = lib
 
 DESCRIPTION = A small library for rendering Postscript documents
@@ -8,7 +8,9 @@
 
 MASTER_SITES = http://libspectre.freedesktop.org/releases/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += fixme.sh
+
+# Use int_types.h instead of stdint.h until this is fixed:
+#   https://bugs.freedesktop.org/show_bug.cgi?id=27734
 PATCHFILES = patch-stdint.diff
 
 SPKG_SOURCEURL = http://libspectre.freedesktop.org
@@ -16,15 +18,18 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS = CSWgs
+DEP_PKGS = CSWgs
 
+# The flags -pedantic gets selected during configure as it seems to cause
+# no harm, but it effectively triggers performance tuning and fails as some
+# files miss _mcount as the performance lib is not linked in.
+# Do this until this bug is resolved:
+#   https://bugs.freedesktop.org/show_bug.cgi?id=27735
+BUILD_OVERRIDE_VARS = SPECTRE_CFLAGS
+BUILD_OVERRIDE_VAR_SPECTRE_CFLAGS =
+
 # Disable for now as libgs is missing 64 bit
 #BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk
-
-post-configure-modulated:
-	@echo " ==> Fixing libtool files"
-	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libspectre/trunk/checksums
===================================================================
--- csw/mgar/pkg/libspectre/trunk/checksums	2010-04-19 10:17:43 UTC (rev 9705)
+++ csw/mgar/pkg/libspectre/trunk/checksums	2010-04-19 11:28:06 UTC (rev 9706)
@@ -1,3 +1,2 @@
-34f5b20f6caf282b2533784fbb1b4395  download/fixme.sh
-0600653653d9313e3be135b2217ea7fd  download/libspectre-0.2.2.tar.gz
-7f3edd354885de75d806dfd740a23881  download/patch-stdint.diff
+56ed626fdf430039f1285e869b8fb3b6  libspectre-0.2.5.tar.gz
+7f3edd354885de75d806dfd740a23881  patch-stdint.diff

Deleted: csw/mgar/pkg/libspectre/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/libspectre/trunk/files/fixme.sh	2010-04-19 10:17:43 UTC (rev 9705)
+++ csw/mgar/pkg/libspectre/trunk/files/fixme.sh	2010-04-19 11:28:06 UTC (rev 9706)
@@ -1,51 +0,0 @@
-#!/bin/bash
-####################################################
-#
-#  fixme.sh
-#  Intended to remove the use of libtool's 
-#  pseudo-libraries for opencsw builds.
-#
-#  Author: Mike Watters  mwatters_at_opencsw.org
-#  Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
-    gecho "USAGE: $(basename $0) WORKSRC"
-    exit 1
-fi
-BASEPATH=$1
-
-## Fix Makefiles
-for mk in $(gfind ${BASEPATH} -name Makefile -print); do
-    LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
-        gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-    
-    for file in ${LT_FILES}; do
-        LIB_NAME=$(ggrep 'dlname=' ${file} | \
-            gsed -e "s/.*'\(.*\)'/\1/" \
-                -e "s/^lib//" \
-                -e "s/\.so.*$//")
-        fixpath=$(gecho $file |gsed 's/\//\\\//g')
-        gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
-        gmv Makefile.new ${mk}
-        gchmod +x ${mk}
-    done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
-    gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
-    gmv ${lt}.new ${lt}
-    gchmod +x ${lt}
-done
-
-for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do
-    gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
-    gmv ${LTMAIN}.new ${LTMAIN}
-    gchmod +x ${LTMAIN}
-done
-


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