Fixed https://bugs.kde.org/show_bug.cgi?id=348594 and adjust the optdepends

2 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de1bc7a905c2..356732cea432 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = marble-git
 	pkgdesc = Desktop Globe. (GIT version)
-	pkgver = v15.03.97.136.ge640a4b
+	pkgver = v15.03.97.141.g7a411f4
 	pkgrel = 1
 	url = https://www.kde.org/applications/system/marble
 	install = marble-git.install
@@ -9,25 +9,27 @@ pkgbase = marble-git
 	license = GPL
 	makedepends = cmake
 	makedepends = git
-	makedepends = extra-cmake-modules
 	makedepends = gpsd
 	makedepends = quazip-qt5-svn
 	makedepends = shapelib
 	makedepends = qextserialport
 	makedepends = libwlocate
 	makedepends = phonon-qt5
+	makedepends = extra-cmake-modules
+	makedepends = qt5-webkit
+	makedepends = krunner
 	depends = qt5-webkit
 	depends = kparts
-	depends = krunner
 	depends = knewstuff
 	depends = opencv
 	depends = hicolor-icon-theme
 	optdepends = gpsd: position information via gpsd
 	optdepends = quazip-qt5-svn: reading and displaying .kmz files
 	optdepends = shapelib: reading and displaying .shp files
-	optdepends = qextserialport: eading from serial port in APRS plugin
+	optdepends = qextserialport: reading from serial port in APRS plugin
 	optdepends = libwlocate: Position information based on neighboring WLAN networks
 	optdepends = phonon-qt5: That enables the use of audio and video content
+	optdepends = krunner: Krunner plugin for marble
 	provides = marble
 	conflicts = marble
 	conflicts = marble-qt
diff --git a/PKGBUILD b/PKGBUILD
index acb690cd2fbe..7a28d5ef7f8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=marble-git
-pkgver=v15.03.97.136.ge640a4b
+pkgver=v15.03.97.141.g7a411f4
 pkgrel=1
 pkgdesc="Desktop Globe. (GIT version)"
 arch=('i686' 'x86_64')
@@ -9,14 +9,16 @@ url="https://www.kde.org/applications/system/marble"
 license=('GPL')
 provides=('marble')
 conflicts=('marble' 'marble-qt' 'kdeedu-marble' )
-depends=('qt5-webkit' 'kparts' 'krunner' 'knewstuff' 'opencv' 'hicolor-icon-theme')
-makedepends=('cmake' 'git' 'extra-cmake-modules' 'gpsd' 'quazip-qt5-svn' 'shapelib' 'qextserialport' 'libwlocate' 'phonon-qt5')
+depends=('qt5-webkit' 'kparts' 'knewstuff' 'opencv' 'hicolor-icon-theme') #
+makedepends=('cmake' 'git' 'gpsd' 'quazip-qt5-svn' 'shapelib' 'qextserialport' 'libwlocate' 'phonon-qt5'
+             'extra-cmake-modules' 'qt5-webkit' 'krunner' )
 optdepends=('gpsd: position information via gpsd'
             'quazip-qt5-svn: reading and displaying .kmz files'
             'shapelib: reading and displaying .shp files'
-            'qextserialport: eading from serial port in APRS plugin'
+            'qextserialport: reading from serial port in APRS plugin'
             'libwlocate: Position information based on neighboring WLAN networks'
-            'phonon-qt5: That enables the use of audio and video content')
+            'phonon-qt5: That enables the use of audio and video content'
+            'krunner: Krunner plugin for marble')
 source=('git://anongit.kde.org/marble.git')
 sha1sums=('SKIP')
 install=marble-git.install
@@ -48,16 +50,11 @@ build() {
     -DLIB_INSTALL_DIR=lib \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
     -DBUILD_TESTING=OFF \
-    -DQT5BUILD=ON \
     -DWITH_KF5=ON \
     -DBUILD_MARBLE_EXAMPLES=ON \
     -DBUILD_MARBLE_TOOLS=ON \
     -DBUILD_MARBLE_TESTS=OFF \
-    -DMOBILE=OFF \
-    -DQEXTSERIALPORT_INCLUDE_DIR=/usr/include/qt/QtExtSerialPort \
-    -DQEXTSERIALPORT_LIBRARIES=/usr/lib/libQt5ExtSerialPort.so \
-    -DPHONON_INCLUDE_DIR=/usr/include/phonon4qt5 \
-    -DPHONON_LIBRARY=/usr/lib/libphonon4qt5.so
+    -DMOBILE=OFF
   make
 }