From ee6e1488d03234032aabde268a0ade5efc1b20b4 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 28 Feb 2014 15:29:01 +0100 Subject: [PATCH 1/4] Merge changes from 2.8.12.1-1.1 Non-maintainer upload. --- debian/changelog | 8 ++++++++ debian/patches/fix-FindFreetype.diff | 17 +++++++++++++++++ debian/patches/series | 1 + debian/source/local-options | 2 -- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 debian/patches/fix-FindFreetype.diff delete mode 100644 debian/source/local-options diff --git a/debian/changelog b/debian/changelog index 60bbf513d..4f0151244 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cmake (2.8.12.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Make sure to find freetype headers in their new location (without an + extra freetype/ directory, fix-FindFreetype.diff). (Closes: #731089) + + -- Cyril Brulebois Sun, 15 Dec 2013 10:30:54 +0000 + cmake (2.8.12.1-1) unstable; urgency=low * New upstream release: diff --git a/debian/patches/fix-FindFreetype.diff b/debian/patches/fix-FindFreetype.diff new file mode 100644 index 000000000..47d757005 --- /dev/null +++ b/debian/patches/fix-FindFreetype.diff @@ -0,0 +1,17 @@ +Description: Fix FindFreetype after headers location breakage. + Make sure to find freetype headers in their new location (without an + extra freetype/ directory). +Author: Cyril Brulebois +Bug-Debian: http://bugs.debian.org/731089 + +--- a/Modules/FindFreetype.cmake ++++ b/Modules/FindFreetype.cmake +@@ -56,7 +56,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build + PATH_SUFFIXES include/freetype2 include + ) + +-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + HINTS + ENV FREETYPE_DIR + PATHS diff --git a/debian/patches/series b/debian/patches/series index 0a1f7ed0d..0b24e01ac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ qt_import_dir_variable.diff FindPHP4_fix_typo.diff FindJNI_amd64_ppc_biarch.diff fix-ftbfs-on-kfreebsd.patch +fix-FindFreetype.diff diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 9cdfca9f9..000000000 --- a/debian/source/local-options +++ /dev/null @@ -1,2 +0,0 @@ -unapply-patches -abort-on-upstream-changes From 7f2eb9ad342aa26de729926da1cb4bf4d60de124 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 28 Feb 2014 15:43:57 +0100 Subject: [PATCH 2/4] Backport patch to support Ruby 2.0 and 2.1 in FindRuby.cmake. --- debian/changelog | 8 ++ debian/patches/FindRuby_support_Ruby_2.diff | 120 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 129 insertions(+) create mode 100644 debian/patches/FindRuby_support_Ruby_2.diff diff --git a/debian/changelog b/debian/changelog index 4f0151244..862ad124d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cmake (2.8.12.1-1.2) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Backport patch to support Ruby 2.0 and 2.1 in FindRuby.cmake. + (closes: #739826) + + -- Bas Couwenberg Fri, 28 Feb 2014 15:42:54 +0100 + cmake (2.8.12.1-1.1) unstable; urgency=high * Non-maintainer upload. diff --git a/debian/patches/FindRuby_support_Ruby_2.diff b/debian/patches/FindRuby_support_Ruby_2.diff new file mode 100644 index 000000000..873b39dc2 --- /dev/null +++ b/debian/patches/FindRuby_support_Ruby_2.diff @@ -0,0 +1,120 @@ +Description: Update FindRuby.cmake to also support Ruby 2.0 and 2.1. + The most significant change since Ruby 1.9 is the changed path of + config.h, from RbConfig::CONFIG['rubyhdrdir'] to + RbConfig::CONFIG['rubyarchhdrdir']. +Author: Bas Couwenberg +Forwarded: https://github.com/Kitware/CMake/pull/92 +Bug-Debian: https://bugs.debian.org/739826 +Applied-Upstream: https://github.com/Kitware/CMake/commit/165f6430d957173a0c3fda48265d8ed761700e20 +--- a/Modules/FindRuby.cmake ++++ b/Modules/FindRuby.cmake +@@ -1,20 +1,32 @@ +-# - Find Ruby +-# This module finds if Ruby is installed and determines where the include files +-# and libraries are. Ruby 1.8 and 1.9 are supported. ++#.rst: ++# FindRuby ++# -------- ++# ++# 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) ++# 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: ++# 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 ++# 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. +@@ -56,6 +68,8 @@ else() + 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 +@@ -94,6 +108,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO + _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) + +@@ -115,7 +130,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO + 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_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 (2.0+)" 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) +@@ -128,6 +144,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO + RUBY_ARCH_DIR + RUBY_ARCH + RUBY_HDR_DIR ++ RUBY_ARCHHDR_DIR + RUBY_POSSIBLE_LIB_DIR + RUBY_RUBY_LIB_DIR + RUBY_SITEARCH_DIR +@@ -149,10 +166,20 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_ + set(RUBY_VERSION_MINOR 8) + set(RUBY_VERSION_PATCH 0) + # check whether we found 1.9.x +- if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR) ++ 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) +@@ -178,6 +205,7 @@ if( "${Ruby_FIND_VERSION_SHORT_NODOT}" G + HINTS + ${RUBY_HDR_DIR}/${RUBY_ARCH} + ${RUBY_ARCH_DIR} ++ ${RUBY_ARCHHDR_DIR} + ) + + set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} ) diff --git a/debian/patches/series b/debian/patches/series index 0b24e01ac..9665f9e41 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ FindPHP4_fix_typo.diff FindJNI_amd64_ppc_biarch.diff fix-ftbfs-on-kfreebsd.patch fix-FindFreetype.diff +FindRuby_support_Ruby_2.diff From e267451441785a853fc4be2c5f13c19db3161cc5 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sun, 30 Mar 2014 21:57:52 +0200 Subject: [PATCH 3/4] releasing package cmake version 2.8.12.1-1.2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 862ad124d..01c00822a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -cmake (2.8.12.1-1.2) UNRELEASED; urgency=low +cmake (2.8.12.1-1.2) unstable; urgency=low * Non-maintainer upload. * Backport patch to support Ruby 2.0 and 2.1 in FindRuby.cmake. (closes: #739826) - -- Bas Couwenberg Fri, 28 Feb 2014 15:42:54 +0100 + -- Bas Couwenberg Sun, 30 Mar 2014 21:57:27 +0200 cmake (2.8.12.1-1.1) unstable; urgency=high From 08b16aff7d3fdf53dabef7acf9ba9ab7b221619f Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sun, 30 Mar 2014 22:14:52 +0200 Subject: [PATCH 4/4] Also fixes #730095. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 01c00822a..da3835e26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ cmake (2.8.12.1-1.2) unstable; urgency=low * Non-maintainer upload. * Backport patch to support Ruby 2.0 and 2.1 in FindRuby.cmake. - (closes: #739826) + (closes: #739826, #730095) -- Bas Couwenberg Sun, 30 Mar 2014 21:57:27 +0200