Date: Tuesday, December 8, 2015 @ 15:17:00
Author: foutrelis
Revision: 253917
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
marble/repos/staging-i686/
marble/repos/staging-i686/PKGBUILD
(from rev 253916, marble/trunk/PKGBUILD)
marble/repos/staging-i686/marble.install
(from rev 253916, marble/trunk/marble.install)
marble/repos/staging-i686/plugin-dir.patch
(from rev 253916, marble/trunk/plugin-dir.patch)
marble/repos/staging-x86_64/
marble/repos/staging-x86_64/PKGBUILD
(from rev 253916, marble/trunk/PKGBUILD)
marble/repos/staging-x86_64/marble.install
(from rev 253916, marble/trunk/marble.install)
marble/repos/staging-x86_64/plugin-dir.patch
(from rev 253916, marble/trunk/plugin-dir.patch)
---------------------------------+
staging-i686/PKGBUILD | 90 ++++++++++++++++++++++++++++++++++++++
staging-i686/marble.install | 13 +++++
staging-i686/plugin-dir.patch | 32 +++++++++++++
staging-x86_64/PKGBUILD | 90 ++++++++++++++++++++++++++++++++++++++
staging-x86_64/marble.install | 13 +++++
staging-x86_64/plugin-dir.patch | 32 +++++++++++++
6 files changed, 270 insertions(+)
Copied: marble/repos/staging-i686/PKGBUILD (from rev 253916,
marble/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-12-08 14:17:00 UTC (rev 253917)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Gustavo Alvarez <sl1pk...@gmail.com>
+
+pkgbase=marble
+pkgname=(marble libastro marble-data)
+pkgver=15.08.3
+pkgrel=2
+pkgdesc="Desktop Globe"
+arch=(i686 x86_64)
+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";
+ 'plugin-dir.patch')
+md5sums=('98f8a4392897da9a475076ccd106c0b2'
+ 'e4441d763de7588a8c4fa93b83d945fe')
+
+prepare() {
+ mkdir -p build
+
+# 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' \
+ -e '/qt/d' \
+ -e '/Quick/d' \
+ -e '/touch/d' \
+ -i $pkgname-$pkgver/src/apps/CMakeLists.txt
+}
+
+build() {
+ cd build
+ cmake ../$pkgbase-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -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_TESTS=OFF \
+ -DMOBILE=OFF
+ make
+}
+
+package_libastro() {
+ pkgdesc='Marble astronomy library'
+ depends=(gcc-libs)
+ conflicts=('kdeedu-marble<15.07' marble-qt)
+
+ cd build/src/lib/astro
+ make DESTDIR="$pkgdir" install
+}
+
+package_marble() {
+ depends=(libastro marble-data qt5-webkit kparts knewstuff quazip-qt5)
+ optdepends=('gpsd: GPS based geolocation'
+ 'libwlocate: WLAN based geolocation'
+ 'krunner: Krunner plugin')
+ conflicts=('kdeedu-marble<15.04.3-3' marble-qt)
+ replaces=(kdeedu-marble 'marble-qt<15.07')
+ groups=(kde-applications kdeedu)
+ install=marble.install
+
+ cd build
+ make DESTDIR="$pkgdir" install
+
+# provided by libastro
+ rm -r "$pkgdir"/usr/include/astro
+ rm "$pkgdir"/usr/lib/libastro.*
+
+# provided by marble-data
+ rm -r "$pkgdir"/usr/share/{icons,marble/data}
+}
+
+package_marble-data() {
+ pkgdesc='Data for Marble'
+ depends=(hicolor-icon-theme)
+ conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+ install=marble.install
+
+ cd build/data
+ make DESTDIR="$pkgdir" install
+}
Copied: marble/repos/staging-i686/marble.install (from rev 253916,
marble/trunk/marble.install)
===================================================================
--- staging-i686/marble.install (rev 0)
+++ staging-i686/marble.install 2015-12-08 14:17:00 UTC (rev 253917)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Copied: marble/repos/staging-i686/plugin-dir.patch (from rev 253916,
marble/trunk/plugin-dir.patch)
===================================================================
--- staging-i686/plugin-dir.patch (rev 0)
+++ staging-i686/plugin-dir.patch 2015-12-08 14:17:00 UTC (rev 253917)
@@ -0,0 +1,32 @@
+From: Antonio Rojas <nqn1...@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()
+
+
Copied: marble/repos/staging-x86_64/PKGBUILD (from rev 253916,
marble/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-12-08 14:17:00 UTC (rev 253917)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Gustavo Alvarez <sl1pk...@gmail.com>
+
+pkgbase=marble
+pkgname=(marble libastro marble-data)
+pkgver=15.08.3
+pkgrel=2
+pkgdesc="Desktop Globe"
+arch=(i686 x86_64)
+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";
+ 'plugin-dir.patch')
+md5sums=('98f8a4392897da9a475076ccd106c0b2'
+ 'e4441d763de7588a8c4fa93b83d945fe')
+
+prepare() {
+ mkdir -p build
+
+# 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' \
+ -e '/qt/d' \
+ -e '/Quick/d' \
+ -e '/touch/d' \
+ -i $pkgname-$pkgver/src/apps/CMakeLists.txt
+}
+
+build() {
+ cd build
+ cmake ../$pkgbase-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -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_TESTS=OFF \
+ -DMOBILE=OFF
+ make
+}
+
+package_libastro() {
+ pkgdesc='Marble astronomy library'
+ depends=(gcc-libs)
+ conflicts=('kdeedu-marble<15.07' marble-qt)
+
+ cd build/src/lib/astro
+ make DESTDIR="$pkgdir" install
+}
+
+package_marble() {
+ depends=(libastro marble-data qt5-webkit kparts knewstuff quazip-qt5)
+ optdepends=('gpsd: GPS based geolocation'
+ 'libwlocate: WLAN based geolocation'
+ 'krunner: Krunner plugin')
+ conflicts=('kdeedu-marble<15.04.3-3' marble-qt)
+ replaces=(kdeedu-marble 'marble-qt<15.07')
+ groups=(kde-applications kdeedu)
+ install=marble.install
+
+ cd build
+ make DESTDIR="$pkgdir" install
+
+# provided by libastro
+ rm -r "$pkgdir"/usr/include/astro
+ rm "$pkgdir"/usr/lib/libastro.*
+
+# provided by marble-data
+ rm -r "$pkgdir"/usr/share/{icons,marble/data}
+}
+
+package_marble-data() {
+ pkgdesc='Data for Marble'
+ depends=(hicolor-icon-theme)
+ conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+ install=marble.install
+
+ cd build/data
+ make DESTDIR="$pkgdir" install
+}
Copied: marble/repos/staging-x86_64/marble.install (from rev 253916,
marble/trunk/marble.install)
===================================================================
--- staging-x86_64/marble.install (rev 0)
+++ staging-x86_64/marble.install 2015-12-08 14:17:00 UTC (rev 253917)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Copied: marble/repos/staging-x86_64/plugin-dir.patch (from rev 253916,
marble/trunk/plugin-dir.patch)
===================================================================
--- staging-x86_64/plugin-dir.patch (rev 0)
+++ staging-x86_64/plugin-dir.patch 2015-12-08 14:17:00 UTC (rev 253917)
@@ -0,0 +1,32 @@
+From: Antonio Rojas <nqn1...@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()
+
+
