subject:"\[arch\-commits\] Commit in cmake\/trunk \(2 files\)"

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

2015-12-03 Thread Felix Yan

Date: Friday, December 4, 2015 @ 06:50:20
  Author: fyan
Revision: 252338

upgpkg: cmake 3.4.1-1

Modified:
  cmake/trunk/PKGBUILD
Deleted:
  cmake/trunk/fix-c-c++-default-dialect-detection.patch

---+
 PKGBUILD  |   12 ++--
 fix-c-c++-default-dialect-detection.patch |   39 
 2 files changed, 4 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-03 21:58:26 UTC (rev 252337)
+++ PKGBUILD2015-12-04 05:50:20 UTC (rev 252338)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=cmake
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.4.1
+pkgrel=1
 pkgdesc='A cross-platform open-source make system'
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/;
@@ -15,15 +15,11 @@
 optdepends=('qt5-base: cmake-gui'
 'libxkbcommon-x11: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz;
-fix-c-c++-default-dialect-detection.patch)
-md5sums=('cd3034e0a44256a0917e254167217fc8'
- 'a2c3f0abf120a6dc8e142aa23dba1520')
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('73acda0d33be9b2729af99893d99a012')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  # FS#47113
-  patch -p1 -i ../fix-c-c++-default-dialect-detection.patch
 }
 
 build() {

Deleted: fix-c-c++-default-dialect-detection.patch
===
--- fix-c-c++-default-dialect-detection.patch   2015-12-03 21:58:26 UTC (rev 
252337)
+++ fix-c-c++-default-dialect-detection.patch   2015-12-04 05:50:20 UTC (rev 
252338)
@@ -1,39 +0,0 @@
-From: Setze Post 
-Date: Tue, 17 Nov 2015 16:59:05 + (-0500)
-Subject: Make C and C++ default dialect detection robust to advanced 
optimizations
-X-Git-Url: https://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=716a09b9
-
-Make C and C++ default dialect detection robust to advanced optimizations
-
-In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect
-for the compiler, 2015-09-15) we added an "INFO:..." string to the
-compiler id detection binary.  The value can be optimized out of the
-compiler id binary unless we force it to be included by making the
-program behavior depend on it at runtime.  Add references to the value
-as we do for the other info strings already.

-
-diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
-index b224007..63f8787 100644
 a/Modules/CMakeCCompilerId.c.in
-+++ b/Modules/CMakeCCompilerId.c.in
-@@ -55,6 +55,7 @@ int main(int argc, char* argv[])
- #ifdef SIMULATE_VERSION_MAJOR
-   require += info_simulate_version[argc];
- #endif
-+  require += info_language_dialect_default[argc];
-   (void)argv;
-   return require;
- }
-diff --git a/Modules/CMakeCXXCompilerId.cpp.in 
b/Modules/CMakeCXXCompilerId.cpp.in
-index d467507..61cd790 100644
 a/Modules/CMakeCXXCompilerId.cpp.in
-+++ b/Modules/CMakeCXXCompilerId.cpp.in
-@@ -49,6 +49,7 @@ int main(int argc, char* argv[])
- #ifdef SIMULATE_VERSION_MAJOR
-   require += info_simulate_version[argc];
- #endif
-+  require += info_language_dialect_default[argc];
-   (void)argv;
-   return require;
- }

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

2015-11-20 Thread Felix Yan

Date: Friday, November 20, 2015 @ 10:44:48
  Author: fyan
Revision: 251687

upgpkg: cmake 3.4.0-2

add a patch for FS#47113

Added:
  cmake/trunk/fix-c-c++-default-dialect-detection.patch
Modified:
  cmake/trunk/PKGBUILD

---+
 PKGBUILD  |   10 +--
 fix-c-c++-default-dialect-detection.patch |   39 
 2 files changed, 46 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-20 09:42:21 UTC (rev 251686)
+++ PKGBUILD2015-11-20 09:44:48 UTC (rev 251687)
@@ -5,7 +5,7 @@
 
 pkgname=cmake
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform open-source make system'
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/;
@@ -15,11 +15,15 @@
 optdepends=('qt5-base: cmake-gui'
 'libxkbcommon-x11: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('cd3034e0a44256a0917e254167217fc8')
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz;
+fix-c-c++-default-dialect-detection.patch)
+md5sums=('cd3034e0a44256a0917e254167217fc8'
+ 'a2c3f0abf120a6dc8e142aa23dba1520')
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  # FS#47113
+  patch -p1 -i ../fix-c-c++-default-dialect-detection.patch
 }
 
 build() {

Added: fix-c-c++-default-dialect-detection.patch
===
--- fix-c-c++-default-dialect-detection.patch   (rev 0)
+++ fix-c-c++-default-dialect-detection.patch   2015-11-20 09:44:48 UTC (rev 
251687)
@@ -0,0 +1,39 @@
+From: Setze Post 
+Date: Tue, 17 Nov 2015 16:59:05 + (-0500)
+Subject: Make C and C++ default dialect detection robust to advanced 
optimizations
+X-Git-Url: https://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=716a09b9
+
+Make C and C++ default dialect detection robust to advanced optimizations
+
+In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect
+for the compiler, 2015-09-15) we added an "INFO:..." string to the
+compiler id detection binary.  The value can be optimized out of the
+compiler id binary unless we force it to be included by making the
+program behavior depend on it at runtime.  Add references to the value
+as we do for the other info strings already.
+---
+
+diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
+index b224007..63f8787 100644
+--- a/Modules/CMakeCCompilerId.c.in
 b/Modules/CMakeCCompilerId.c.in
+@@ -55,6 +55,7 @@ int main(int argc, char* argv[])
+ #ifdef SIMULATE_VERSION_MAJOR
+   require += info_simulate_version[argc];
+ #endif
++  require += info_language_dialect_default[argc];
+   (void)argv;
+   return require;
+ }
+diff --git a/Modules/CMakeCXXCompilerId.cpp.in 
b/Modules/CMakeCXXCompilerId.cpp.in
+index d467507..61cd790 100644
+--- a/Modules/CMakeCXXCompilerId.cpp.in
 b/Modules/CMakeCXXCompilerId.cpp.in
+@@ -49,6 +49,7 @@ int main(int argc, char* argv[])
+ #ifdef SIMULATE_VERSION_MAJOR
+   require += info_simulate_version[argc];
+ #endif
++  require += info_language_dialect_default[argc];
+   (void)argv;
+   return require;
+ }

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

2015-01-23 Thread 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.patch2015-01-23 
05:13:34 UTC (rev 229674)
+++ 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch2015-01-23 
08:04:11 UTC (rev 229675)
@@ -1,41 +0,0 @@
-From 339fc9de27d54edec3c0b71e9e1aba858c408399 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras evange...@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
===
--- PKGBUILD2015-01-23 05:13:34 UTC (rev 229674)
+++ PKGBUILD2015-01-23 08:04:11 UTC (rev 229675)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@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}

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

2014-12-29 Thread Evangelos Foutras

Date: Monday, December 29, 2014 @ 18:14:18
  Author: foutrelis
Revision: 228153

upgpkg: cmake 3.1.0-2

Fix FindRuby.cmake to properly detect Ruby 2.2.0.

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

--+
 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch |   41 +
 PKGBUILD |   15 +++-
 2 files changed, 53 insertions(+), 3 deletions(-)

Added: 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch
===
--- 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch
(rev 0)
+++ 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch2014-12-29 
17:14:18 UTC (rev 228153)
@@ -0,0 +1,41 @@
+From 339fc9de27d54edec3c0b71e9e1aba858c408399 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras evange...@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
===
--- PKGBUILD2014-12-29 16:40:28 UTC (rev 228152)
+++ PKGBUILD2014-12-29 17:14:18 UTC (rev 228153)
@@ -4,7 +4,7 @@
 
 pkgname=cmake
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform open-source make system'
 arch=('i686' 'x86_64')
 url=http://www.cmake.org/;
@@ -14,9 +14,18 @@
 optdepends=('qt5-base: cmake-gui'
 'libxkbcommon-x11: cmake-gui')
 install=${pkgname}.install
-source=(http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('188eb7dc9b1b82b363bc51c0d3f1d461')
+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')
 
+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}

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

2014-03-20 Thread Bartłomiej Piotrowski

Date: Thursday, March 20, 2014 @ 08:54:53
  Author: bpiotrowski
Revision: 208237

upgpkg: cmake 2.8.12.2-2

backport python 3.4 support

Added:
  cmake/trunk/FindPython-Interp-Libs-Search-for-Python-3.4.patch
Modified:
  cmake/trunk/PKGBUILD

+
 FindPython-Interp-Libs-Search-for-Python-3.4.patch |   40 +++
 PKGBUILD   |9 ++--
 2 files changed, 46 insertions(+), 3 deletions(-)

Added: FindPython-Interp-Libs-Search-for-Python-3.4.patch
===
--- FindPython-Interp-Libs-Search-for-Python-3.4.patch  
(rev 0)
+++ FindPython-Interp-Libs-Search-for-Python-3.4.patch  2014-03-20 07:54:53 UTC 
(rev 208237)
@@ -0,0 +1,40 @@
+From ab6201ab647c13fee44c44822b8502e9848faaaf Mon Sep 17 00:00:00 2001
+From: Matt McCormick matt.mccorm...@kitware.com
+Date: Wed, 5 Mar 2014 17:41:47 -0500
+Subject: [PATCH] FindPython{Interp,Libs}: Search for Python 3.4.
+
+Python 3.4.0rnc1 was released on 2014-02-20.
+---
+ Modules/FindPythonInterp.cmake | 2 +-
+ Modules/FindPythonLibs.cmake   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
+index 8da848c..e23a58b 100644
+--- a/Modules/FindPythonInterp.cmake
 b/Modules/FindPythonInterp.cmake
+@@ -47,7 +47,7 @@ unset(_Python_NAMES)
+ 
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(PythonInterp_FIND_VERSION)
+ if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index 0749efc..1dbc967 100644
+--- a/Modules/FindPythonLibs.cmake
 b/Modules/FindPythonLibs.cmake
+@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
+ 
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(PythonLibs_FIND_VERSION)
+ if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
+-- 
+1.9.0
+

Modified: PKGBUILD
===
--- PKGBUILD2014-03-20 06:29:06 UTC (rev 208236)
+++ PKGBUILD2014-03-20 07:54:53 UTC (rev 208237)
@@ -4,7 +4,7 @@
 
 pkgname=cmake
 pkgver=2.8.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A cross-platform open-source make system
 arch=('i686' 'x86_64')
 url=http://www.cmake.org/;
@@ -14,14 +14,17 @@
 optdepends=('qt4: cmake-gui')
 install=${pkgname}.install
 source=(http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz;
-findfreetype.patch)
+findfreetype.patch
+FindPython-Interp-Libs-Search-for-Python-3.4.patch)
 md5sums=('17c6513483d23590cbce6957ec6d1e66'
- '90321de1d9d46cd8d6609d0509dbd7b0')
+ '90321de1d9d46cd8d6609d0509dbd7b0'
+ '5e036a37f9b0b3368b8cfcc5784d1514')
 
 build() {
   cd ${pkgname}-${pkgver}
 
   patch -Np1  ${srcdir}/findfreetype.patch
+  patch -Np1  ${srcdir}/FindPython-Interp-Libs-Search-for-Python-3.4.patch
 
   ./bootstrap --prefix=/usr \
 --mandir=/share/man \

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

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

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

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

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

5 matches

Site Navigation

Mail list logo

Footer information