[mapserver] 02/03: Drop patched FindRuby.cmake, build depend on the cmake version containing the updated module.
Bas Couwenberg
sebastic at xs4all.nl
Thu Apr 3 22:57:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository mapserver.
commit 3677854272221716486a98e166e8bb92ab1396d1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Apr 4 00:19:14 2014 +0200
Drop patched FindRuby.cmake, build depend on the cmake version containing the updated module.
---
debian/changelog | 2 +
debian/control | 2 +-
debian/patches/cmake-ruby2.patch | 334 ---------------------------------------
debian/patches/series | 1 -
4 files changed, 3 insertions(+), 336 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 54d78c1..6c93d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mapserver (6.4.1-3) UNRELEASED; urgency=low
Thanks Ezequiel Lara Gómez for the patch.
(closes: #740351)
* Don't install ruby mapscript for Ruby 1.9, only built for 2.x now.
+ * Drop patched FindRuby.cmake, build depend on the cmake version
+ containing the updated module.
-- Bas Couwenberg <sebastic at xs4all.nl> Fri, 28 Feb 2014 20:38:22 +0100
diff --git a/debian/control b/debian/control
index 8be4905..be5e2b1 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Build-Depends: debhelper (>= 9),
libxslt1-dev,
pkg-kde-tools,
chrpath,
- cmake (>= 2.8.0),
+ cmake (>= 2.8.12.1-1.2),
pkg-config,
docbook2x,
docbook-xsl,
diff --git a/debian/patches/cmake-ruby2.patch b/debian/patches/cmake-ruby2.patch
deleted file mode 100644
index a5b1098..0000000
--- a/debian/patches/cmake-ruby2.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-Description: Update FindRuby.cmake module to support Ruby 2.0 and 2.1.
- This FindRuby.cmake is a copy of the one included in CMake 2.8.12.1,
- and modified to also support Ruby 2.0 and Ruby 2.1.
- .
- The first version found is used unless -DRUBY_EXECUTABLE is set.
- .
- Ruby 2.0 moved the config.h file to the architecture specific path
- as reported by:
- `ruby -r rbconfig -e "print RbConfig::CONFIG['rubyarchhdrdir']"`
- .
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Bug-Debian: https://bugs.debian.org/739773
-Bug: https://github.com/Kitware/CMake/pull/92
---- /dev/null
-+++ b/cmake/FindRuby.cmake
-@@ -0,0 +1,318 @@
-+# - Find Ruby
-+# This module finds if Ruby is installed and determines where the include files
-+# and libraries are. Ruby 1.8, 1.9, 2.0 and 2.1 are supported.
-+#
-+# The minimum required version of Ruby can be specified using the
-+# standard syntax, e.g. find_package(Ruby 1.8)
-+#
-+# It also determines what the name of the library is. This
-+# code sets the following variables:
-+#
-+# RUBY_EXECUTABLE = full path to the ruby binary
-+# RUBY_INCLUDE_DIRS = include dirs to be used when using the ruby library
-+# RUBY_LIBRARY = full path to the ruby library
-+# RUBY_VERSION = the version of ruby which was found, e.g. "1.8.7"
-+# RUBY_FOUND = set to true if ruby ws found successfully
-+#
-+# RUBY_INCLUDE_PATH = same as RUBY_INCLUDE_DIRS, only provided for compatibility reasons, don't use it
-+
-+#=============================================================================
-+# Copyright 2004-2009 Kitware, Inc.
-+# Copyright 2008-2009 Alexander Neundorf <neundorf at kde.org>
-+#
-+# CMake - Cross Platform Makefile Generator
-+# Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
-+# All rights reserved.
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# * Redistributions of source code must retain the above copyright
-+# notice, this list of conditions and the following disclaimer.
-+#
-+# * Redistributions in binary form must reproduce the above copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+#
-+# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-+# nor the names of their contributors may be used to endorse or promote
-+# products derived from this software without specific prior written
-+# permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#
-+# ------------------------------------------------------------------------------
-+#
-+# The above copyright and license notice applies to distributions of
-+# CMake in source and binary form. Some source files contain additional
-+# notices of original copyright by their contributors; see each source
-+# for details. Third-party software packages supplied with CMake under
-+# compatible licenses provide their own copyright notices documented in
-+# corresponding subdirectories.
-+#
-+# ------------------------------------------------------------------------------
-+#
-+# CMake was initially developed by Kitware with the following sponsorship:
-+#
-+# * National Library of Medicine at the National Institutes of Health
-+# as part of the Insight Segmentation and Registration Toolkit (ITK).
-+#
-+# * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
-+# Visualization Initiative.
-+#
-+# * National Alliance for Medical Image Computing (NAMIC) is funded by the
-+# National Institutes of Health through the NIH Roadmap for Medical Research,
-+# Grant U54 EB005149.
-+#
-+# * Kitware, Inc.
-+#=============================================================================
-+
-+# RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-+# RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-+# RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-+# RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
-+# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
-+
-+# uncomment the following line to get debug output for this file
-+# set(_RUBY_DEBUG_OUTPUT TRUE)
-+
-+# Determine the list of possible names of the ruby executable depending
-+# on which version of ruby is required
-+set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
-+
-+# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
-+if(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR)
-+ set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
-+ # we can't construct that if only major version is given
-+ set(_RUBY_POSSIBLE_EXECUTABLE_NAMES
-+ ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
-+ ruby${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION_MINOR}
-+ ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-+else()
-+ set(Ruby_FIND_VERSION_SHORT_NODOT "18")
-+endif()
-+
-+if(NOT Ruby_FIND_VERSION_EXACT)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
-+
-+ # if we want a version below 1.9, also look for ruby 1.8
-+ if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.8 ruby18)
-+ endif()
-+
-+ list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
-+endif()
-+
-+if(NOT RUBY_EXECUTABLE)
-+ find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-+endif()
-+
-+
-+if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-+ function(_RUBY_CONFIG_VAR RBVAR OUTVAR)
-+ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']"
-+ RESULT_VARIABLE _RUBY_SUCCESS
-+ OUTPUT_VARIABLE _RUBY_OUTPUT
-+ ERROR_QUIET)
-+ if(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT)
-+ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']"
-+ RESULT_VARIABLE _RUBY_SUCCESS
-+ OUTPUT_VARIABLE _RUBY_OUTPUT
-+ ERROR_QUIET)
-+ endif()
-+ set(${OUTVAR} "${_RUBY_OUTPUT}" PARENT_SCOPE)
-+ endfunction()
-+
-+
-+ # query the ruby version
-+ _RUBY_CONFIG_VAR("MAJOR" RUBY_VERSION_MAJOR)
-+ _RUBY_CONFIG_VAR("MINOR" RUBY_VERSION_MINOR)
-+ _RUBY_CONFIG_VAR("TEENY" RUBY_VERSION_PATCH)
-+
-+ # query the different directories
-+ _RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR)
-+ _RUBY_CONFIG_VAR("arch" RUBY_ARCH)
-+ _RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR)
-+ _RUBY_CONFIG_VAR("rubyarchhdrdir" RUBY_ARCHHDR_DIR)
-+ _RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR)
-+ _RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR)
-+
-+ # site_ruby
-+ _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-+ _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
-+
-+ # vendor_ruby available ?
-+ execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
-+ OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
-+
-+ if(RUBY_HAS_VENDOR_RUBY)
-+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
-+ endif()
-+
-+ # save the results in the cache so we don't have to run ruby the next time again
-+ set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
-+ set(RUBY_VERSION_MINOR ${RUBY_VERSION_MINOR} CACHE PATH "The Ruby minor version" FORCE)
-+ set(RUBY_VERSION_PATCH ${RUBY_VERSION_PATCH} CACHE PATH "The Ruby patch version" FORCE)
-+ set(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir" FORCE)
-+ set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9+)" FORCE)
-+ set(RUBY_ARCHHDR_DIR ${RUBY_ARCHHDR_DIR} CACHE PATH "The Ruby arch header dir (1.9+)" FORCE)
-+ set(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
-+ set(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE)
-+ set(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE)
-+ set(RUBY_SITELIB_DIR ${RUBY_SITELIB_DIR} CACHE PATH "The Ruby site lib dir" FORCE)
-+ set(RUBY_HAS_VENDOR_RUBY ${RUBY_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available" FORCE)
-+ set(RUBY_VENDORARCH_DIR ${RUBY_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir" FORCE)
-+ set(RUBY_VENDORLIB_DIR ${RUBY_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir" FORCE)
-+
-+ mark_as_advanced(
-+ RUBY_ARCH_DIR
-+ RUBY_ARCH
-+ RUBY_HDR_DIR
-+ RUBY_ARCHHDR_DIR
-+ RUBY_POSSIBLE_LIB_DIR
-+ RUBY_RUBY_LIB_DIR
-+ RUBY_SITEARCH_DIR
-+ RUBY_SITELIB_DIR
-+ RUBY_HAS_VENDOR_RUBY
-+ RUBY_VENDORARCH_DIR
-+ RUBY_VENDORLIB_DIR
-+ RUBY_VERSION_MAJOR
-+ RUBY_VERSION_MINOR
-+ RUBY_VERSION_PATCH
-+ )
-+endif()
-+
-+# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
-+# try to detect which version we found. This is not too good.
-+if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-+ # by default assume 1.8.0
-+ set(RUBY_VERSION_MAJOR 1)
-+ set(RUBY_VERSION_MINOR 8)
-+ set(RUBY_VERSION_PATCH 0)
-+ # check whether we found 1.9.x
-+ if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9")
-+ set(RUBY_VERSION_MAJOR 1)
-+ set(RUBY_VERSION_MINOR 9)
-+ endif()
-+ # check whether we found 2.0.x
-+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?0")
-+ set(RUBY_VERSION_MAJOR 2)
-+ set(RUBY_VERSION_MINOR 0)
-+ endif()
-+ # check whether we found 2.1.x
-+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?1")
-+ set(RUBY_VERSION_MAJOR 2)
-+ set(RUBY_VERSION_MINOR 1)
-+ endif()
-+endif()
-+
-+if(RUBY_VERSION_MAJOR)
-+ set(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
-+ set(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
-+ set(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
-+ set(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
-+endif()
-+
-+find_path(RUBY_INCLUDE_DIR
-+ NAMES ruby.h
-+ HINTS
-+ ${RUBY_HDR_DIR}
-+ ${RUBY_ARCH_DIR}
-+ /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ )
-+
-+set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
-+
-+# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir
-+if( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18 OR "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18 OR RUBY_HDR_DIR)
-+ find_path(RUBY_CONFIG_INCLUDE_DIR
-+ NAMES ruby/config.h config.h
-+ HINTS
-+ ${RUBY_HDR_DIR}/${RUBY_ARCH}
-+ ${RUBY_ARCH_DIR}
-+ ${RUBY_ARCHHDR_DIR}
-+ )
-+
-+ set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
-+endif()
-+
-+
-+# Determine the list of possible names for the ruby library
-+set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
-+
-+if(WIN32)
-+ set( _RUBY_MSVC_RUNTIME "" )
-+ if( MSVC60 )
-+ set( _RUBY_MSVC_RUNTIME "60" )
-+ endif()
-+ if( MSVC70 )
-+ set( _RUBY_MSVC_RUNTIME "70" )
-+ endif()
-+ if( MSVC71 )
-+ set( _RUBY_MSVC_RUNTIME "71" )
-+ endif()
-+ if( MSVC80 )
-+ set( _RUBY_MSVC_RUNTIME "80" )
-+ endif()
-+ if( MSVC90 )
-+ set( _RUBY_MSVC_RUNTIME "90" )
-+ endif()
-+
-+ list(APPEND _RUBY_POSSIBLE_LIB_NAMES
-+ "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
-+ "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static"
-+ "msvcrt-ruby${_RUBY_NODOT_VERSION}"
-+ "msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
-+endif()
-+
-+find_library(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )
-+
-+include(FindPackageHandleStandardArgs)
-+set(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY)
-+if(_RUBY_VERSION_SHORT_NODOT GREATER 18)
-+ list(APPEND _RUBY_REQUIRED_VARS RUBY_CONFIG_INCLUDE_DIR)
-+endif()
-+
-+if(_RUBY_DEBUG_OUTPUT)
-+ message(STATUS "--------FindRuby.cmake debug------------")
-+ message(STATUS "_RUBY_POSSIBLE_EXECUTABLE_NAMES: ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}")
-+ message(STATUS "_RUBY_POSSIBLE_LIB_NAMES: ${_RUBY_POSSIBLE_LIB_NAMES}")
-+ message(STATUS "RUBY_ARCH_DIR: ${RUBY_ARCH_DIR}")
-+ message(STATUS "RUBY_HDR_DIR: ${RUBY_HDR_DIR}")
-+ message(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}")
-+ message(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"")
-+ message(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}")
-+ message(STATUS "RUBY_EXECUTABLE: ${RUBY_EXECUTABLE}")
-+ message(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}")
-+ message(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}")
-+ message(STATUS "RUBY_CONFIG_INCLUDE_DIR: ${RUBY_CONFIG_INCLUDE_DIR}")
-+ message(STATUS "--------------------")
-+endif()
-+
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ruby REQUIRED_VARS ${_RUBY_REQUIRED_VARS}
-+ VERSION_VAR RUBY_VERSION )
-+
-+mark_as_advanced(
-+ RUBY_EXECUTABLE
-+ RUBY_LIBRARY
-+ RUBY_INCLUDE_DIR
-+ RUBY_CONFIG_INCLUDE_DIR
-+ )
-+
-+# Set some variables for compatibility with previous version of this file
-+set(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR})
-+set(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR})
-+set(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_DIRS})
diff --git a/debian/patches/series b/debian/patches/series
index ad99519..58ac143 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@ hardening.patch
perl-mapscript-install.patch
ruby-mapscript-install.patch
cmake-mapserver-export.patch
-cmake-ruby2.patch
java-hardening.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git
More information about the Pkg-grass-devel
mailing list