[arch-commits] Commit in cmake/trunk (2 files)

[Andrea Scarpino]

    Date: Friday, January 23, 2015 @ 09:04:11
  Author: andrea
Revision: 229675

upgpkg: cmake 3.1.1-1

Upstream release

Modified:
  cmake/trunk/PKGBUILD
Deleted:
  cmake/trunk/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch

----------------------------------------------------------+
 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch |   41 -------------
 PKGBUILD                                                 |   17 +----
 2 files changed, 4 insertions(+), 54 deletions(-)

Deleted: 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch
===================================================================
--- 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch	2015-01-23 05:13:34 UTC (rev 229674)
+++ 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch	2015-01-23 08:04:11 UTC (rev 229675)
@@ -1,41 +0,0 @@
-From 339fc9de27d54edec3c0b71e9e1aba858c408399 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Mon, 29 Dec 2014 18:19:08 +0200
-Subject: [PATCH] FindRuby: Fix output check in _RUBY_CONFIG_VAR
-
-Since commit 854e762 (FindRuby: clean up querying variables from Ruby)
-we query RbConfig::CONFIG first and, if the command fails or its output
-equates to a false constant, then fall back to querying Config::CONFIG.
-
-Due to the above, an error condition exists with Ruby 2.2.0; when querying
-RbConfig::CONFIG['TEENY'], the output of '0' will be discarded since it
-matches the false constant '0'.
-
-In previous versions this wasn't a problem, but Ruby 2.2 has completely
-removed Config::CONFIG. This causes RUBY_VERSION_PATCH to be set to an
-empty string and the Ruby version to be detected as '2.2.' (instead of
-'2.2.0').
-
-This patch fixes the output check to explicitly look for an empty string
-before using the fallback query method. (Someone more familiar with Ruby
-might be able to deem the fallback as unnecessary and fully remove it.)
----
- Modules/FindRuby.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
-index b5ac703..0950d15 100644
---- a/Modules/FindRuby.cmake
-+++ b/Modules/FindRuby.cmake
-@@ -90,7 +90,7 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
-       RESULT_VARIABLE _RUBY_SUCCESS
-       OUTPUT_VARIABLE _RUBY_OUTPUT
-       ERROR_QUIET)
--    if(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT)
-+    if(_RUBY_SUCCESS OR _RUBY_OUTPUT STREQUAL "")
-       execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']"
-         RESULT_VARIABLE _RUBY_SUCCESS
-         OUTPUT_VARIABLE _RUBY_OUTPUT
--- 
-2.2.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-23 05:13:34 UTC (rev 229674)
+++ PKGBUILD	2015-01-23 08:04:11 UTC (rev 229675)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=cmake
-pkgver=3.1.0
-pkgrel=2
+pkgver=3.1.1
+pkgrel=1
 pkgdesc='A cross-platform open-source make system'
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -14,18 +14,9 @@
 optdepends=('qt5-base: cmake-gui'
             'libxkbcommon-x11: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
-        0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch)
-md5sums=('188eb7dc9b1b82b363bc51c0d3f1d461'
-         'c21e3e63501e1ee7aa6092851089f8ad')
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('0ae4f25dbec66697c0c3cec1b9e885ae')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  # http://public.kitware.com/pipermail/cmake-developers/2014-December/024044.html
-  patch -Np1 -i ../0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}