[arch-commits] Commit in marble/trunk (PKGBUILD plugin-dir.patch)

[Evangelos Foutras]

    Date: Tuesday, December 8, 2015 @ 15:06:26
  Author: foutrelis
Revision: 253913

Add plugin-dir.patch to svn

Added:
  marble/trunk/plugin-dir.patch
Modified:
  marble/trunk/PKGBUILD

------------------+
 PKGBUILD         |    4 ++--
 plugin-dir.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-08 14:06:01 UTC (rev 253912)
+++ PKGBUILD	2015-12-08 14:06:26 UTC (rev 253913)
@@ -14,9 +14,9 @@
 license=(GPL)
 makedepends=(extra-cmake-modules gpsd quazip-qt5 libwlocate phonon-qt5 qt5-webkit krunner kparts knewstuff qt5-tools)
 source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
-	plugin-dir.patch::"https://quickgit.kde.org/?p=marble.git&a=commitdiff&h=f59d559&o=plain")
+        'plugin-dir.patch')
 md5sums=('98f8a4392897da9a475076ccd106c0b2'
-         '5b2bbae7e54c33230eafbc960f6dd5a6')
+         'e4441d763de7588a8c4fa93b83d945fe')
 
 prepare() {
   mkdir -p build

Added: plugin-dir.patch
===================================================================
--- plugin-dir.patch	                        (rev 0)
+++ plugin-dir.patch	2015-12-08 14:06:26 UTC (rev 253913)
@@ -0,0 +1,32 @@
+From: Antonio Rojas <nqn1976 at gmail.com>
+Date: Sat, 19 Sep 2015 22:14:14 +0000
+Subject: Allow overriding Qt designer plugins install dir
+X-Git-Tag: v15.11.80
+X-Git-Url: http://quickgit.kde.org/?p=marble.git&a=commitdiff&h=f59d559347fea1e2ada00e111f1faaaa74151614
+---
+Allow overriding Qt designer plugins install dir
+
+Allow specifying a custom QT_PLUGINS_DIR in the cmake command and don't
+overwrite it.
+
+Testing Done:
+Builds and installs the plugins in the directory specified in the
+QT_PLUGINS_DIR cmake variable.
+
+REVIEW: 125299
+CCBUG: 348554
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -177,7 +177,7 @@
+ add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO")
+ 
+ set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX} CACHE PATH  "Base directory for executables and libraries" FORCE)
+-if (QT5BUILD)
++if (QT5BUILD AND NOT QT_PLUGINS_DIR)
+    set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins)
+ endif()
+ 
+