[arch-commits] Commit in extra-cmake-modules/repos/extra-any (3 files)

[Antonio Rojas]

    Date: Monday, July 18, 2016 @ 20:44:48
  Author: arojas
Revision: 271990

archrelease: copy trunk to extra-any

Added:
  extra-cmake-modules/repos/extra-any/PKGBUILD
    (from rev 271989, extra-cmake-modules/trunk/PKGBUILD)
Deleted:
  extra-cmake-modules/repos/extra-any/PKGBUILD
  extra-cmake-modules/repos/extra-any/pri-install-dir.patch

-----------------------+
 PKGBUILD              |   79 ++++++++++++++++++++++++------------------------
 pri-install-dir.patch |   11 ------
 2 files changed, 40 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-18 20:44:26 UTC (rev 271989)
+++ PKGBUILD	2016-07-18 20:44:48 UTC (rev 271990)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=extra-cmake-modules
-pkgver=5.24.0
-pkgrel=1
-pkgdesc='Extra modules and scripts for CMake'
-arch=('any')
-url='https://community.kde.org/Frameworks'
-license=('LGPL')
-depends=('cmake')
-makedepends=('python-sphinx') # qt5-tools for QtHelp pages
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" pri-install-dir.patch)
-md5sums=('cd3b0c844234ad29cfdba89d63ccb2ae'
-         '76ec20005b7a78be8ac88265b436c13a')
-
-prepare() {
-  mkdir -p build
-
-# Workaround wrong .pri install dir https://bugs.kde.org/show_bug.cgi?id=363348
-  cd $pkgname-$pkgver
-  patch -p1 -i ../pri-install-dir.patch
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_HTML_DOCS=OFF \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: extra-cmake-modules/repos/extra-any/PKGBUILD (from rev 271989, extra-cmake-modules/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2016-07-18 20:44:48 UTC (rev 271990)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=extra-cmake-modules
+pkgver=5.24.0
+pkgrel=2
+pkgdesc='Extra modules and scripts for CMake'
+arch=('any')
+url='https://community.kde.org/Frameworks'
+license=('LGPL')
+depends=('cmake')
+makedepends=('python-sphinx') # qt5-tools for QtHelp pages
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+        pri-install-dir.patch::"https://quickgit.kde.org/?p=extra-cmake-modules.git&a=commitdiff&h=5bb92992&o=plain")
+md5sums=('cd3b0c844234ad29cfdba89d63ccb2ae'
+         '2357eb8f8ecff829e29b2d3e5777c8c8')
+
+prepare() {
+  mkdir -p build
+
+# Workaround wrong .pri install dir https://bugs.kde.org/show_bug.cgi?id=363348
+  cd $pkgname-$pkgver
+  patch -p1 -i ../pri-install-dir.patch
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_HTML_DOCS=OFF \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: pri-install-dir.patch
===================================================================
--- pri-install-dir.patch	2016-07-18 20:44:26 UTC (rev 271989)
+++ pri-install-dir.patch	2016-07-18 20:44:48 UTC (rev 271990)
@@ -1,11 +0,0 @@
---- extra-cmake-modules-5.23.0/modules/ECMGeneratePriFile.cmake.orig	2016-06-23 07:40:57.240619651 +0000
-+++ extra-cmake-modules-5.23.0/modules/ECMGeneratePriFile.cmake	2016-06-23 07:41:26.010499925 +0000
-@@ -84,6 +84,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
-+include(KDEInstallDirs)
-+
- if(KDE_INSTALL_USE_QT_SYS_PATHS)
-   include(ECMQueryQmake)
-   query_qmake(qt_host_data_dir QT_HOST_DATA)