[arch-commits] Commit in marble/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Sunday, September 20, 2015 @ 00:21:17
  Author: arojas
Revision: 246707

Use upstream fix for designer plugins install dir

Modified:
  marble/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-19 21:11:57 UTC (rev 246706)
+++ PKGBUILD	2015-09-19 22:21:17 UTC (rev 246707)
@@ -13,14 +13,17 @@
 url="https://www.kde.org/applications/system/marble"
 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")
-md5sums=('07d2986ff88fbf21ddba94614288a14e')
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz" plugin-dir.patch)
+md5sums=('07d2986ff88fbf21ddba94614288a14e'
+         'ba8fe57516790cf55efe9dd2b87bf41d')
 
 prepare() {
   mkdir -p build
 
-  # fix installation designer plugins path https://bugs.kde.org/show_bug.cgi?id=348554
-  sed 's|LIBDIR}/plugins|LIBDIR}/qt/plugins|g' -i $pkgbase-$pkgver/CMakeLists.txt
+# fix installation designer plugins path https://bugs.kde.org/show_bug.cgi?id=348554
+  cd $pkgname-$pkgver
+  patch -p1 -i ../plugin-dir.patch
+  cd ..
 
   # only build the KDE app
   sed -e '/mobile/d' \
@@ -37,6 +40,7 @@
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DQT_PLUGINS_DIR=lib/qt/plugins \
     -DBUILD_TESTING=OFF \
     -DBUILD_MARBLE_EXAMPLES=OFF \
     -DBUILD_MARBLE_TOOLS=ON \