[csw-devel] SF.net SVN: gar:[19915] csw/mgar/pkg/gnuplot/trunk

[dmichelsen at users.sourceforge.net]

Revision: 19915
          http://gar.svn.sourceforge.net/gar/?rev=19915&view=rev
Author:   dmichelsen
Date:     2012-12-18 15:25:01 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
gnuplot/trunk: Update to 4.6.1, fix testsuite and disable -z ignore until Wx is fixed

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

Modified: csw/mgar/pkg/gnuplot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/Makefile	2012-12-18 14:54:38 UTC (rev 19914)
+++ csw/mgar/pkg/gnuplot/trunk/Makefile	2012-12-18 15:25:01 UTC (rev 19915)
@@ -1,19 +1,13 @@
 NAME = gnuplot
-VERSION = 4.6.0
-GARTYPE = v2
+VERSION = 4.6.1
 
 DESCRIPTION = The Gnuplot Plotting Utility
-define BLURB
-  The Gnuplot Plotting Utility.
-endef
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
 PATCHFILES = 0001-Remove-definition-unclear-why-leaving-it-in-causes-e.patch
 
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
 VENDOR_URL = http://www.gnuplot.info/
 
 LICENSE = Copyright
@@ -22,7 +16,6 @@
 CATALOGNAME_CSWgnuplot = gnuplot
 SPKG_DESC_CSWgnuplot = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWemacscommon
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibreadline6
@@ -70,8 +63,15 @@
 
 REINPLACE_USRLOCAL += share/gnuplotrc
 
-EXTRA_LINKER_FLAGS = -norunpath
+EXTRA_LINKER_FLAGS += -norunpath
 
+# Gnuplot automatically pulls in libCstd which is needed by libwx_gtk2u_core-2.8.so.0.6.0 because
+# the library is wrong self-contained (ldd -r on that throws unresolved symbol errors).
+# Gnuplot itself does not need libCstd leading to stripped NEEDED and then linking in libwx
+# fails. Long-term should be a fix to libwx to be self-contained, but add libs unconditionally
+# for now.
+LINKER_IGNORE =
+
 EXTRA_MODULATORS = WXWIDGETS
 MODULATIONS_WXWIDGETS = yes no
 
@@ -91,6 +91,10 @@
 EXTRA_TEST_EXPORTS = DISPLAY
 DISPLAY =
 
+# The testsuite does not work without DISPLAY any more, I tested it manually for 4.6.1 with DISPLAY
+# without errors. Please retest on major new versions.
+SKIPTEST ?= 1
+
 MERGE_SCRIPTS_isa-default-wxwidgets-yes = copy-all
 MERGE_SCRIPTS_isa-default-wxwidgets-no = copy-all
 

Modified: csw/mgar/pkg/gnuplot/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/checksums	2012-12-18 14:54:38 UTC (rev 19914)
+++ csw/mgar/pkg/gnuplot/trunk/checksums	2012-12-18 15:25:01 UTC (rev 19915)
@@ -1 +1 @@
-8e6e92b4596ea0eb75e16a57fc79efec  gnuplot-4.6.0.tar.gz
+4c9a06461f402482c30cf94e267eb877  gnuplot-4.6.1.tar.gz

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