[arch-commits] Commit in automoc4/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sun Dec 6 05:59:04 UTC 2015
Date: Sunday, December 6, 2015 @ 06:59:04
Author: bpiotrowski
Revision: 252613
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
automoc4/repos/staging-i686/
automoc4/repos/staging-i686/PKGBUILD
(from rev 252612, automoc4/trunk/PKGBUILD)
automoc4/repos/staging-i686/fix-cmake-warnings.patch
(from rev 252612, automoc4/trunk/fix-cmake-warnings.patch)
automoc4/repos/staging-i686/license.txt
(from rev 252612, automoc4/trunk/license.txt)
automoc4/repos/staging-x86_64/
automoc4/repos/staging-x86_64/PKGBUILD
(from rev 252612, automoc4/trunk/PKGBUILD)
automoc4/repos/staging-x86_64/fix-cmake-warnings.patch
(from rev 252612, automoc4/trunk/fix-cmake-warnings.patch)
automoc4/repos/staging-x86_64/license.txt
(from rev 252612, automoc4/trunk/license.txt)
-----------------------------------------+
staging-i686/PKGBUILD | 43 ++++++++++++++++++++++++++++++
staging-i686/fix-cmake-warnings.patch | 39 +++++++++++++++++++++++++++
staging-i686/license.txt | 31 +++++++++++++++++++++
staging-x86_64/PKGBUILD | 43 ++++++++++++++++++++++++++++++
staging-x86_64/fix-cmake-warnings.patch | 39 +++++++++++++++++++++++++++
staging-x86_64/license.txt | 31 +++++++++++++++++++++
6 files changed, 226 insertions(+)
Copied: automoc4/repos/staging-i686/PKGBUILD (from rev 252612, automoc4/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-12-06 05:59:04 UTC (rev 252613)
@@ -0,0 +1,43 @@
+# $Id$
+# 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=7
+pkgdesc="Automatic moc for Qt4"
+arch=('i686' 'x86_64')
+url='http://www.kde.org/'
+license=('custom')
+depends=('qt4')
+makedepends=('pkgconfig' 'cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+ 'license.txt' 'fix-cmake-warnings.patch')
+md5sums=('91bf517cb940109180ecd07bc90c69ec'
+ '9014edbb7e2f02fe90b2db8707487bce'
+ '65d8c4b8bb46ac408a8c3d5d82167f9b')
+
+prepare() {
+ mkdir -p build
+
+# Fix CMake warnings with newer policies
+ cd $pkgname-$pkgver
+ patch -p1 -i ../fix-cmake-warnings.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}/license.txt" \
+ "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: automoc4/repos/staging-i686/fix-cmake-warnings.patch (from rev 252612, automoc4/trunk/fix-cmake-warnings.patch)
===================================================================
--- staging-i686/fix-cmake-warnings.patch (rev 0)
+++ staging-i686/fix-cmake-warnings.patch 2015-12-06 05:59:04 UTC (rev 252613)
@@ -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)
+
+
+
Copied: automoc4/repos/staging-i686/license.txt (from rev 252612, automoc4/trunk/license.txt)
===================================================================
--- staging-i686/license.txt (rev 0)
+++ staging-i686/license.txt 2015-12-06 05:59:04 UTC (rev 252613)
@@ -0,0 +1,31 @@
+Upstream Authors:
+
+ Mathias Kretz <kretz at kde.org>
+ Alexander Neundorff <neundorff at kde.org>
+
+Copyright:
+
+ Copyright (c) 2007 Mathias Kretz <kretz at kde.org>
+
+License:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copied: automoc4/repos/staging-x86_64/PKGBUILD (from rev 252612, automoc4/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-12-06 05:59:04 UTC (rev 252613)
@@ -0,0 +1,43 @@
+# $Id$
+# 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=7
+pkgdesc="Automatic moc for Qt4"
+arch=('i686' 'x86_64')
+url='http://www.kde.org/'
+license=('custom')
+depends=('qt4')
+makedepends=('pkgconfig' 'cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+ 'license.txt' 'fix-cmake-warnings.patch')
+md5sums=('91bf517cb940109180ecd07bc90c69ec'
+ '9014edbb7e2f02fe90b2db8707487bce'
+ '65d8c4b8bb46ac408a8c3d5d82167f9b')
+
+prepare() {
+ mkdir -p build
+
+# Fix CMake warnings with newer policies
+ cd $pkgname-$pkgver
+ patch -p1 -i ../fix-cmake-warnings.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}/license.txt" \
+ "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: automoc4/repos/staging-x86_64/fix-cmake-warnings.patch (from rev 252612, automoc4/trunk/fix-cmake-warnings.patch)
===================================================================
--- staging-x86_64/fix-cmake-warnings.patch (rev 0)
+++ staging-x86_64/fix-cmake-warnings.patch 2015-12-06 05:59:04 UTC (rev 252613)
@@ -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)
+
+
+
Copied: automoc4/repos/staging-x86_64/license.txt (from rev 252612, automoc4/trunk/license.txt)
===================================================================
--- staging-x86_64/license.txt (rev 0)
+++ staging-x86_64/license.txt 2015-12-06 05:59:04 UTC (rev 252613)
@@ -0,0 +1,31 @@
+Upstream Authors:
+
+ Mathias Kretz <kretz at kde.org>
+ Alexander Neundorff <neundorff at kde.org>
+
+Copyright:
+
+ Copyright (c) 2007 Mathias Kretz <kretz at kde.org>
+
+License:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
More information about the arch-commits
mailing list