[arch-commits] Commit in kdebindings-qyoto/trunk (PKGBUILD cmake2810.patch)

[Andrea Scarpino]

    Date: Wednesday, November 7, 2012 @ 04:30:08
  Author: andrea
Revision: 170403

Fix build with cmake 2.8.10

Added:
  kdebindings-qyoto/trunk/cmake2810.patch
Modified:
  kdebindings-qyoto/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   14 ++++++++++----
 cmake2810.patch |   15 +++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-07 08:10:15 UTC (rev 170402)
+++ PKGBUILD	2012-11-07 09:30:08 UTC (rev 170403)
@@ -12,11 +12,17 @@
 depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz")
-sha1sums=('24397a09c50ccc2e87dcd5d07f33d74cc9c5113f')
+source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz"
+        'cmake2810.patch')
+sha1sums=('24397a09c50ccc2e87dcd5d07f33d74cc9c5113f'
+          'f7745cb0fc4768dc8cab0e0d58b1159fb19805f5')
 
 build() {
-  cd "${srcdir}"
+  cd qyoto-${pkgver}
+  # KDEBUG#209652
+  patch -p1 -i "${srcdir}"/cmake2810.patch
+  cd ../
+ 
   mkdir build
   cd build
   cmake ../qyoto-${pkgver} \
@@ -26,6 +32,6 @@
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }

Added: cmake2810.patch
===================================================================
--- cmake2810.patch	                        (rev 0)
+++ cmake2810.patch	2012-11-07 09:30:08 UTC (rev 170403)
@@ -0,0 +1,15 @@
+diff -up qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10 qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake
+--- qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10	2012-08-13 04:00:53.000000000 -0500
++++ qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake	2012-11-06 15:31:18.719822193 -0600
+@@ -84,6 +84,9 @@ endif (CMAKE_CSharp_COMPILER)
+ get_filename_component(script_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
+ 
+ # configure variables set in this file for fast reload later on
+-configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
+-  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
++ if(NOT CMAKE_PLATFORM_INFO_DIR) # pre-2.8.10
++   set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
++ endif()
++ configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
++   ${CMAKE_PLATFORM_INFO_DIR}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
+ set(CMAKE_CSharp_COMPILER_ENV_VAR "CSC")