[arch-commits] Commit in automoc4/trunk (PKGBUILD fix-cmake-warnings.patch)

[Antonio Rojas]

    Date: Saturday, September 12, 2015 @ 21:11:42
  Author: arojas
Revision: 246000

Add upstream fixes for compatibility with recent kdelibs CMake policies

Added:
  automoc4/trunk/fix-cmake-warnings.patch
Modified:
  automoc4/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   16 +++++++++++-----
 fix-cmake-warnings.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-12 15:03:58 UTC (rev 245999)
+++ PKGBUILD	2015-09-12 19:11:42 UTC (rev 246000)
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=automoc4
 pkgver=0.9.88
-pkgrel=5
+pkgrel=6
 pkgdesc="Automatic moc for Qt4"
 arch=('i686' 'x86_64')
 url='http://www.kde.org/'
@@ -12,12 +13,17 @@
 depends=('qt4')
 makedepends=('pkgconfig' 'cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'license.txt')
+        'license.txt' 'fix-cmake-warnings.patch')
 md5sums=('91bf517cb940109180ecd07bc90c69ec'
-         '9014edbb7e2f02fe90b2db8707487bce')
+         '9014edbb7e2f02fe90b2db8707487bce'
+         '65d8c4b8bb46ac408a8c3d5d82167f9b')
 
 prepare() {
-  mkdir build
+  mkdir -p build
+
+# Fix CMake warnings with newer policies
+  cd $pkgname-$pkgver
+  patch -p1 -i ../fix-cmake-warnings.patch
 }
 
 build() {

Added: fix-cmake-warnings.patch
===================================================================
--- fix-cmake-warnings.patch	                        (rev 0)
+++ fix-cmake-warnings.patch	2015-09-12 19:11:42 UTC (rev 246000)
@@ -0,0 +1,39 @@
+From: Stephen Kelly <steveire at gmail.com>
+Date: Sun, 19 Jul 2015 19:24:51 +0000
+Subject: Don't attempt to add dependencies which do not exist.
+X-Git-Url: http://quickgit.kde.org/?p=automoc.git&a=commitdiff&h=48f6e64d98e4aaa47f2a49faa5f3e821bc21fd6e
+---
+Don't attempt to add dependencies which do not exist.
+---
+
+
+--- a/Automoc4Config.cmake
++++ b/Automoc4Config.cmake
+@@ -132,7 +132,6 @@
+    if(_moc_files)
+       set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_automoc.cpp")
+       get_directory_property(_moc_incs INCLUDE_DIRECTORIES)
+-      get_directory_property(_moc_defs DEFINITIONS)
+       get_directory_property(_moc_cdefs COMPILE_DEFINITIONS)
+ 
+       # Assume CMAKE_INCLUDE_CURRENT_DIR is set
+@@ -198,7 +197,6 @@
+       set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp")
+       set(_automoc_dotFiles "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp.files")
+       get_directory_property(_moc_incs INCLUDE_DIRECTORIES)
+-      get_directory_property(_moc_defs DEFINITIONS)
+       get_directory_property(_moc_cdefs COMPILE_DEFINITIONS)
+ 
+       # Assume CMAKE_INCLUDE_CURRENT_DIR is set
+@@ -274,7 +272,9 @@
+ 
+ 
+ macro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING _target)
+-   add_dependencies(${_target} "${_target}_automoc")
++  if (TARGET "${_target}_automoc")
++    add_dependencies(${_target} "${_target}_automoc")
++  endif()
+ endmacro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING)
+ 
+ 
+