Date: Thursday, July 30, 2015 @ 20:39:46
Author: arojas
Revision: 242878
Use 15.08 branch, share libastro and data with main marble package
Added:
libmarble4/trunk/marble-nowebkit-1508-1.diff
Modified:
libmarble4/trunk/PKGBUILD
-+
PKGBUILD| 41 +++--
marble-nowebkit-1508-1.diff | 301 ++
2 files changed, 324 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-30 18:25:57 UTC (rev 242877)
+++ PKGBUILD2015-07-30 18:39:46 UTC (rev 242878)
@@ -2,28 +2,30 @@
# Maintainer: Antonio Rojas aro...@archlinux.org
pkgname=libmarble4
-pkgver=15.04.3
-pkgrel=4
+pkgver=15.07.80
+pkgrel=1
pkgdesc=KDE4 Marble libraries
url=http://kde.org/applications/education/marble/;
arch=(i686 x86_64)
license=(GPL LGPL FDL)
-depends=(kdebase-runtime)
+depends=(qtwebkit libastro marble-data)
makedepends=(cmake automoc4 gpsd libwlocate)
optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation')
conflicts=(kdeedu-marble)
provides=(kdeedu-marble)
-source=(http://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz;)
-sha1sums=('34f6bdedb6ff37f49c1e0f1f3cca219a515accb4')
+source=(http://download.kde.org/unstable/applications/$pkgver/src/marble-$pkgver.tar.xz;
'marble-nowebkit-1508-1.diff')
+sha1sums=('8f61030eec2b2c9702150d799e2337867b9743b2'
+ 'ebe19afe48153ad9409ac783c42e44c6bb567b6b')
prepare() {
mkdir -p build
-# rename include dir
- sed -e 's|marble/MarbleModel.h|marble4/MarbleModel.h|' -i
marble-$pkgver/FindMarble.cmake
-# hack: change soname to make it coinstallable with 15.08 version
- sed -e 's|GENERIC_LIB_VERSION 0.17.20|GENERIC_LIB_VERSION 0.17|' -e
's|GENERIC_LIB_SOVERSION 1|GENERIC_LIB_SOVERSION 0|' \
- -i marble-$pkgver/src/lib/astro/CMakeLists.txt
+ cd marble-$pkgver
+ patch -p1 -i ../marble-nowebkit-1508-1.diff
+ cd ..
+
+# rename include dir
+ sed -e 's|marble/MarbleModel.h|marble4/MarbleModel.h|' -i
marble-$pkgver/FindMarble.cmake.in
}
build() {
@@ -30,8 +32,10 @@
cd build
cmake ../marble-$pkgver \
-DCMAKE_BUILD_TYPE=Release \
--DKDE4_BUILD_TESTS=OFF \
--DCMAKE_INSTALL_PREFIX=/usr
+-DBUILD_MARBLE_TESTS=OFF \
+-DBUILD_MARBLE_APPS=OFF \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DMARBLE_PLUGIN_PATH=/usr/lib/marble4/plugins
make
}
@@ -39,13 +43,14 @@
cd build
make DESTDIR=$pkgdir install
-# remove files provided by libastro and marble
- rm -r $pkgdir/usr/bin
- rm -r $pkgdir/usr/share/applications/kde4/marble-*
+# move cmake file
+ install -Dm644 $pkgdir/usr/share/marble/cmake/FindMarble.cmake
$pkgdir/usr/share/apps/cmake/modules/FindMarble.cmake
+
+# remove files provided by libastro and marble-data
rm -r $pkgdir/usr/include/astro
- rm -r $pkgdir/usr/lib/libastro.so
- rm -r $pkgdir/usr/share/{appdata,config.kcfg,doc,icons}
+ rm -r $pkgdir/usr/lib/libastro.*
+ rm -r $pkgdir/usr/share/{appdata,applications,icons,marble}
+
# rename include dir to avoid conflicts with marble
mv $pkgdir/usr/include/marble{,4}
}
-
Added: marble-nowebkit-1508-1.diff
===
--- marble-nowebkit-1508-1.diff (rev 0)
+++ marble-nowebkit-1508-1.diff 2015-07-30 18:39:46 UTC (rev 242878)
@@ -0,0 +1,301 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7c83158..560647e 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -81,6 +81,10 @@ if(ANDROID)
+ else()
+find_package(Qt5WebKitWidgets)
+find_package(Qt5DBus)
++
++ if ( NOT Qt5Webkit_FOUND )
++ set ( MARBLE_NO_WEBKIT TRUE )
++ endif()
+ endif()
+
+ find_package(Qt5Core)
+@@ -146,6 +150,9 @@ else()
+ FIND_PACKAGE(QtDeclarative)
+ include_directories(${QT_QTDECLARATIVE_INCLUDE_DIR})
+ endif()
++ if ( NOT QT_QTWEBKIT_FOUND )
++set ( MARBLE_NO_WEBKIT TRUE )
++ endif()
+ endif()
+
+ SET(CMAKE_AUTOMOC TRUE)
+diff --git a/src/apps/marble-mobile/MobileMainWindow.cpp
b/src/apps/marble-mobile/MobileMainWindow.cpp
+index 89db918..d17dde4 100644
+--- a/src/apps/marble-mobile/MobileMainWindow.cpp
b/src/apps/marble-mobile/MobileMainWindow.cpp
+@@ -97,7 +97,9 @@ MainWindow::MainWindow( const QString marbleDataPath, const
QVariantMap cmdLin
+
+ // prevent triggering of network requests under Maemo, presumably due to
qrc: URLs
+ m_networkAccessManager.setNetworkAccessible(
QNetworkAccessManager::NotAccessible );
++#ifndef MARBLE_NO_WEBKIT
+ m_legendBrowser-page()-setNetworkAccessManager( m_networkAccessManager
);
++#endif
+
+ QString selectedPath = marbleDataPath.isEmpty() ? readMarbleDataPath() :
marbleDataPath;
+ if ( !selectedPath.isEmpty() )
+diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
+index 78f5395..26eda3e 100644
+--- a/src/lib/marble/CMakeLists.txt
b/src/lib/marble/CMakeLists.txt
+@@ -52,8 +52,8 @@
