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

[Antonio Rojas]

    Date: Thursday, June 23, 2016 @ 07:47:09
  Author: arojas
Revision: 270489

archrelease: copy trunk to extra-any

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

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-23 07:46:43 UTC (rev 270488)
+++ PKGBUILD	2016-06-23 07:47:09 UTC (rev 270489)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=extra-cmake-modules
-pkgver=5.23.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")
-md5sums=('3c04b695a164407a2a2fcaf848c42c55')
-
-prepare() {
-  mkdir -p build
-}
-
-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 270488, extra-cmake-modules/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2016-06-23 07:47:09 UTC (rev 270489)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=extra-cmake-modules
+pkgver=5.23.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)
+md5sums=('3c04b695a164407a2a2fcaf848c42c55'
+         '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/pri-install-dir.patch (from rev 270488, extra-cmake-modules/trunk/pri-install-dir.patch)
===================================================================
--- pri-install-dir.patch	                        (rev 0)
+++ pri-install-dir.patch	2016-06-23 07:47:09 UTC (rev 270489)
@@ -0,0 +1,11 @@
+--- 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)