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

[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
===================================================================
--- PKGBUILD	2015-12-03 21:58:26 UTC (rev 252337)
+++ PKGBUILD	2015-12-04 05:50:20 UTC (rev 252338)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 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 <cmake at sietze.uk>
-Date: Tue, 17 Nov 2015 16:59:05 +0000 (-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;
- }