[packages/plplot] - disable tests requiring DISPLAY

[baggins]

commit 02a5ec9dcc5c7aac9f07b232c6b98c1fba0a6d8e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 17 09:44:06 2014 +0100

    - disable tests requiring DISPLAY
    
    tk needs X11 display to run, thus making all tests that requires
    loding/running it unusable on builders
    Just remove them as workaround, leaving only the one that verifies
    library sonames

 plplot-no-DISPLAY.patch | 90 +++++++++++++++++++++++++++++++++++++++++++++++++
 plplot.spec             |  2 ++
 2 files changed, 92 insertions(+)
---
diff --git a/plplot.spec b/plplot.spec
index d8d6a65..2a8b92e 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -29,6 +29,7 @@ Source0:	http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
 # Source0-md5:	ece8c0b4d5cd815968a6d56bed0fbe7b
 Patch0:		%{name}-octave.patch
 Patch1:		%{name}-qhull.patch
+Patch2:		%{name}-no-DISPLAY.patch
 Patch4:		%{name}-nofonts.patch
 Patch5:		%{name}-adadirs.patch
 Patch6:		%{name}-ocamldir.patch
@@ -592,6 +593,7 @@ Biblioteka PLplot - przykłady do wiązania dla Pythona.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
diff --git a/plplot-no-DISPLAY.patch b/plplot-no-DISPLAY.patch
new file mode 100644
index 0000000..da3fc19
--- /dev/null
+++ b/plplot-no-DISPLAY.patch
@@ -0,0 +1,90 @@
+--- plplot-5.10.0/cmake/modules/tcl-related.cmake~	2014-01-12 04:12:25.000000000 +0100
++++ plplot-5.10.0/cmake/modules/tcl-related.cmake	2014-03-17 09:38:33.214584768 +0100
+@@ -268,45 +268,10 @@
+       message(STATUS "Looking for wish - found")
+       message(STATUS "TK_WISH = ${TK_WISH}")
+       if(NOT PLPLOT_TK_VERSION)
+-	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CheckTK_VERSION.tcl "puts -nonewline [package require Tk]; exit")
+-	# Find Tk version via wish or fail.
+-	execute_process(
+-	  COMMAND ${TK_WISH} ${CMAKE_CURRENT_BINARY_DIR}/CheckTK_VERSION.tcl
+-	  RESULT_VARIABLE TK_RC
+-	  OUTPUT_VARIABLE _plplot_tk_version
+-	  )
+-	if(NOT TK_RC)
+-	  message(STATUS "Looking for Tk version with wish - found")
+-	  # Store result in cached variable so it will be remembered
+-          # when cmake is re-run, but use type of STRING rather than
+-          # INTERNAL to allow users to specify the value with a
+-          # -DPLPLOT_TK_VERSION:STRING=<whatever> on the command
+-          # line for those rare cases when "package require Tk"
+-          # would error out due to some wish issue.
+-	  set(PLPLOT_TK_VERSION ${_plplot_tk_version}
++	  set(PLPLOT_TK_VERSION ${PLPLOT_TCL_VERSION}
+ 	    CACHE STRING "Tk version found by wish"
+ 	    )
+ 
+-	  if(PLPLOT_TCL_VERSION STREQUAL PLPLOT_TK_VERSION)
+-	    # Cross check that wish finds the same Tcl version as tclsh.
+-	    execute_process(
+-	      COMMAND ${TK_WISH} ${CMAKE_CURRENT_BINARY_DIR}/CheckTCL_VERSION.tcl
+-	      RESULT_VARIABLE TCL_RC
+-	      OUTPUT_VARIABLE _plplot_tcl_version
+-	      )
+-
+-	    if(NOT TCL_RC AND _plplot_tcl_version STREQUAL PLPLOT_TCL_VERSION)
+-	      # Cross check that tclsh finds the same Tk version as wish.
+-	      execute_process(
+-		COMMAND ${TCL_TCLSH} ${CMAKE_CURRENT_BINARY_DIR}/CheckTK_VERSION.tcl
+-		RESULT_VARIABLE TK_RC
+-		OUTPUT_VARIABLE _plplot_tk_version
+-		)
+-	      if(NOT TK_RC AND _plplot_tk_version STREQUAL PLPLOT_TK_VERSION)
+-		message(STATUS "Tcl and Tk versions found by both tclsh and wish are identical")
+-		# Sanity checking of Tk version consistency _if_ a Tk
+-		# version string can be extracted from the Tk library
+-		# name.
+ 		get_filename_component(library_name ${TK_LIBRARY} NAME)
+ 		string(REGEX MATCH "[0-9]+[.]?[0-9]+" library_version ${library_name})
+ 		if(library_version)
+@@ -323,40 +288,6 @@
+    library name is not consistent with PLPLOT_TK_VERSION = ${PLPLOT_TK_VERSION}")
+ 		  endif(NOT truncated_version STREQUAL library_version)
+ 		endif(library_version)
+-	      elseif(TK_RC)
+-		message(STATUS "Looking for Tk version with tclsh - not found")
+-		message(STATUS "WARNING: setting ENABLE_tk to OFF")
+-		set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+-	      else(NOT TK_RC AND _plplot_tk_version STREQUAL PLPLOT_TK_VERSION)
+-		message(STATUS "Tk version = ${_plplot_tk_version} found by tclsh is not consistent with
+-   Tk version = ${PLPLOT_TK_VERSION} found by wish"
+-		  )
+-		message(STATUS "WARNING: setting ENABLE_tk to OFF")
+-		set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+-	      endif(NOT TK_RC AND _plplot_tk_version STREQUAL PLPLOT_TK_VERSION)
+-	    elseif(TCL_RC)
+-	      message(STATUS "Looking for Tcl version with wish - not found")
+-	      message(STATUS "WARNING: setting ENABLE_tk to OFF")
+-	      set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+-	    else(NOT TCL_RC AND _plplot_tcl_version STREQUAL PLPLOT_TCL_VERSION)
+-	      message(STATUS "Tcl version = ${_plplot_tcl_version} found by wish is not consistent with
+-   Tcl version = ${PLPLOT_TCL_VERSION} found by tclsh"
+-		)
+-	      message(STATUS "WARNING: setting ENABLE_tk to OFF")
+-	      set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+-	    endif(NOT TCL_RC AND _plplot_tcl_version STREQUAL PLPLOT_TCL_VERSION)
+-	  else(PLPLOT_TCL_VERSION STREQUAL PLPLOT_TK_VERSION)
+-	    message(STATUS "Tk version = ${PLPLOT_TK_VERSION} found by wish is not consistent with 
+-   Tcl version = ${PLPLOT_TCL_VERSION} found by tclsh"
+-	      )
+-	    message(STATUS "WARNING: setting ENABLE_tk to OFF")
+-	    set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+-	  endif(PLPLOT_TCL_VERSION STREQUAL PLPLOT_TK_VERSION)
+-	else(NOT TK_RC)
+-	  message(STATUS "Looking for Tk version with wish - not found")
+-	  message(STATUS "WARNING: setting ENABLE_tk to OFF")
+-	  set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+-	endif(NOT TK_RC)
+       else(NOT PLPLOT_TK_VERSION)
+ 	set(TK_RC 0)
+       endif(NOT PLPLOT_TK_VERSION)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/plplot.git/commitdiff/02a5ec9dcc5c7aac9f07b232c6b98c1fba0a6d8e