[arch-commits] Commit in marble/trunk (PKGBUILD marble-gpsd-3.21.patch)

2020-08-05 Thread Antonio Rojas via arch-commits 
Date: Wednesday, August 5, 2020 @ 12:22:33
  Author: arojas
Revision: 393177

gpsd 3.21 rebuild

Added:
  marble/trunk/marble-gpsd-3.21.patch
Modified:
  marble/trunk/PKGBUILD

+
 PKGBUILD   |   12 +---
 marble-gpsd-3.21.patch |   16 
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-05 12:05:54 UTC (rev 393176)
+++ PKGBUILD2020-08-05 12:22:33 UTC (rev 393177)
@@ -7,7 +7,7 @@
 pkgbase=marble
 pkgname=(marble-common marble-qt marble)
 pkgver=20.04.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(x86_64)
 url="https://www.kde.org/applications/system/marble";
@@ -14,12 +14,18 @@
 license=(GPL)
 makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner 
libwlocate phonon-qt5
  plasma-workspace qt5-serialport qt5-tools qt5-webengine shapelib)
-source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig}
+ marble-gpsd-3.21.patch)
 sha256sums=('9c0b6fb13d53e1748de081c43e06cc132d5b07d46e594443b207fbaf74e1f95b'
-'SKIP')
+'SKIP'
+'cfb30ebcefd5134c7b11525160537d1deee7cbd707df4fd8d59da4d9bd5bbd9c')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid 

   F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck 

 
+prepare() {
+  patch -d $pkgbase-$pkgver -p1 -i ../marble-gpsd-3.21.patch # Fix build with 
gpsd 3.21
+}
+
 build() {
   cmake -B build -S $pkgbase-$pkgver \
 -DCMAKE_INSTALL_PREFIX=/usr \

Added: marble-gpsd-3.21.patch
===
--- marble-gpsd-3.21.patch  (rev 0)
+++ marble-gpsd-3.21.patch  2020-08-05 12:22:33 UTC (rev 393177)
@@ -0,0 +1,16 @@
+diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 
b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+index 3a787eb1f..02dc4a355 100644
+--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
 b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+@@ -79,7 +79,11 @@ void GpsdPositionProviderPlugin::update( gps_data_t data )
+ {
+ PositionProviderStatus oldStatus = m_status;
+ GeoDataCoordinates oldPosition = m_position;
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 )
++if ( data.fix.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) 
|| std::isnan( data.fix.latitude ) )
++#else
+ if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || 
std::isnan( data.fix.latitude ) )
++#endif
+ m_status = PositionProviderStatusAcquiring;
+ else {
+ m_status = PositionProviderStatusAvailable;

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

2019-07-19 Thread Antonio Rojas via arch-commits 
Date: Friday, July 19, 2019 @ 23:08:10
  Author: arojas
Revision: 358401

gpsd 3.19 rebuild

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-19 22:12:13 UTC (rev 358400)
+++ PKGBUILD2019-07-19 23:08:10 UTC (rev 358401)
@@ -7,7 +7,7 @@
 pkgbase=marble
 pkgname=(marble-common marble-qt marble)
 pkgver=19.04.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(x86_64)
 url="https://www.kde.org/applications/system/marble";

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

2018-10-11 Thread Antonio Rojas via arch-commits 
Date: Thursday, October 11, 2018 @ 10:02:39
  Author: arojas
Revision: 336257

gpsd 3.18 rebuild

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-11 10:02:38 UTC (rev 336256)
+++ PKGBUILD2018-10-11 10:02:39 UTC (rev 336257)
@@ -7,7 +7,7 @@
 pkgbase=marble
 pkgname=(marble-common marble-qt marble)
 pkgver=18.08.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(x86_64)
 url="https://www.kde.org/applications/system/marble";

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

2018-09-12 Thread Antonio Rojas via arch-commits 
Date: Wednesday, September 12, 2018 @ 20:37:10
  Author: arojas
Revision: 334430

gpsd 3.17 rebuild

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-12 20:34:57 UTC (rev 334429)
+++ PKGBUILD2018-09-12 20:37:10 UTC (rev 334430)
@@ -7,7 +7,7 @@
 pkgbase=marble
 pkgname=(marble-common marble-qt marble)
 pkgver=18.08.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(x86_64)
 url="https://www.kde.org/applications/system/marble";

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

2017-11-09 Thread Antonio Rojas 
Date: Thursday, November 9, 2017 @ 17:43:39
  Author: arojas
Revision: 309319

Fix replaces

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-09 17:06:21 UTC (rev 309318)
+++ PKGBUILD2017-11-09 17:43:39 UTC (rev 309319)
@@ -8,7 +8,7 @@
 pkgbase=marble
 pkgname=(marble-common marble-qt marble)
 pkgver=17.08.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(i686 x86_64)
 url="https://www.kde.org/applications/system/marble";
@@ -42,14 +42,13 @@
 
 package_marble-common() {
   pkgdesc='Common libraries and plugins for Marble'
-  depends=(qt5-svg qt5-webkit phonon-qt5)
+  depends=(qt5-svg qt5-webkit phonon-qt5 hicolor-icon-theme)
   optdepends=('gpsd: GPS based geolocation'
   'libwlocate: WLAN based geolocation'
   'qt5-serialport: APRS plugin'
   'shapelib: SHP plugin')
   conflicts=(marble-data)
-  replaces=(marble-data)
-  replaces=(libastro)
+  replaces=(marble-data libastro)
 
   cd build
   make DESTDIR="$pkgdir" install

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

2017-02-17 Thread Antonio Rojas 
Date: Friday, February 17, 2017 @ 23:16:51
  Author: arojas
Revision: 289123

Provide pure Qt version (FS#52990)

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |   76 +
 1 file changed, 47 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-17 23:00:10 UTC (rev 289122)
+++ PKGBUILD2017-02-17 23:16:51 UTC (rev 289123)
@@ -3,18 +3,19 @@
 # Maintainer: Felix Yan 
 # Contributor: Andrea Scarpino 
 # Contributor: Gustavo Alvarez 
+# Contributor: Balló György 
 
 pkgbase=marble
-pkgname=(marble marble-data)
+pkgname=(marble-data marble-common marble-qt marble)
 pkgver=16.12.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Desktop Globe"
 arch=(i686 x86_64)
 url="https://www.kde.org/applications/system/marble";
 license=(GPL)
-makedepends=(extra-cmake-modules gpsd libwlocate phonon-qt5 qt5-webkit krunner
- kparts knewstuff qt5-tools kdoctools qt5-serialport 
plasma-workspace)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner 
libwlocate phonon-qt5
+ plasma-workspace qt5-serialport qt5-tools qt5-webkit shapelib)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
 md5sums=('83bc30b139eca4f4e511e3ea2587dd0d'
  'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid 

@@ -21,13 +22,6 @@
 
 prepare() {
   mkdir -p build
-
-  # 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() {
@@ -45,28 +39,52 @@
   make
 }
 
-package_marble() {
-  depends=(marble-data qt5-webkit kparts knewstuff)
+package_marble-data() {
+  pkgdesc='Data for Marble'
+  depends=(hicolor-icon-theme)
+  conflicts=(kdeedu-marble)
+
+  cd build
+  make -C doc DESTDIR="$pkgdir" install
+  make -C data DESTDIR="$pkgdir" install
+}
+
+package_marble-common() {
+  pkgdesc='Common libraries and plugins for Marble'
+  depends=(marble-data qt5-svg qt5-webkit phonon-qt5)
   optdepends=('gpsd: GPS based geolocation'
-'qt5-serialport: APRS plugin'
-'libwlocate: WLAN based geolocation'
-'krunner: Krunner plugin')
-  conflicts=('kdeedu-marble<15.04.3-3' marble-qt libastro libmarble4)
-  replaces=(kdeedu-marble 'marble-qt<15.07' libastro)
-  groups=(kde-applications kdeedu)
+  'libwlocate: WLAN based geolocation'
+  'qt5-serialport: APRS plugin'
+  'shapelib: SHP plugin')
+  conflicts=(kdeedu-marble libastro libmarble4)
+  replaces=(libastro)
 
   cd build
-  make DESTDIR="$pkgdir" install
+  make -C src/lib/marble DESTDIR="$pkgdir" install
+  make -C src/lib/astro DESTDIR="$pkgdir" install
+  make -C src/lib/marble/declarative DESTDIR="$pkgdir" install
+  make -C src/plugins DESTDIR="$pkgdir" install
+}
 
-# provided by marble-data
-  rm -r "$pkgdir"/usr/share/{icons,marble/data,mime}
+package_marble-qt() {
+  pkgdesc+=' (Qt version)'
+  depends=(marble-common)
+
+  cd build
+  make -C src/apps/marble-qt DESTDIR="$pkgdir" install
 }
 
-package_marble-data() {
-  pkgdesc='Data for Marble'
-  depends=(hicolor-icon-theme)
-  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+package_marble() {
+  depends=(marble-common knewstuff kparts)
+  optdepends=('krunner: Krunner plugin')
+  conflicts=(kdeedu-marble)
+  replaces=(kdeedu-marble)
+  groups=(kde-applications kdeedu)
 
-  cd build/data
-  make DESTDIR="$pkgdir" install
+  cd build
+  make -C src/apps/marble-kde DESTDIR="$pkgdir" install
+  make -C src/plasma DESTDIR="$pkgdir" install
+  make -C src/plasmarunner DESTDIR="$pkgdir" install
+  make -C src/thumbnailer DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/share/icons
 }

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

2017-02-17 Thread Antonio Rojas 
Date: Friday, February 17, 2017 @ 19:59:42
  Author: arojas
Revision: 289108

Drop quazip dependency (FS#52989)

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-17 19:03:09 UTC (rev 289107)
+++ PKGBUILD2017-02-17 19:59:42 UTC (rev 289108)
@@ -7,12 +7,12 @@
 pkgbase=marble
 pkgname=(marble marble-data)
 pkgver=16.12.2
-pkgrel=1
+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 libwlocate phonon-qt5 qt5-webkit 
krunner
+makedepends=(extra-cmake-modules gpsd libwlocate phonon-qt5 qt5-webkit krunner
  kparts knewstuff qt5-tools kdoctools qt5-serialport 
plasma-workspace)
 
source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
 md5sums=('83bc30b139eca4f4e511e3ea2587dd0d'
@@ -46,7 +46,7 @@
 }
 
 package_marble() {
-  depends=(marble-data qt5-webkit kparts knewstuff quazip)
+  depends=(marble-data qt5-webkit kparts knewstuff)
   optdepends=('gpsd: GPS based geolocation'
 'qt5-serialport: APRS plugin'
 'libwlocate: WLAN based geolocation'

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

2016-08-30 Thread Antonio Rojas 
Date: Tuesday, August 30, 2016 @ 20:56:41
  Author: arojas
Revision: 275340

quazip-qt5 -> quazip

Modified:
  marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-08-30 20:53:42 UTC (rev 275339)
+++ PKGBUILD2016-08-30 20:56:41 UTC (rev 275340)
@@ -12,7 +12,7 @@
 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
+makedepends=(extra-cmake-modules gpsd quazip libwlocate phonon-qt5 qt5-webkit 
krunner
  kparts knewstuff qt5-tools kdoctools qt5-serialport)
 
source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz";)
 md5sums=('6e2a88dc46331ce1200dfc341a598506')
@@ -52,7 +52,7 @@
 }
 
 package_marble() {
-  depends=(libastro marble-data qt5-webkit kparts knewstuff quazip-qt5)
+  depends=(libastro marble-data qt5-webkit kparts knewstuff quazip)
   optdepends=('gpsd: GPS based geolocation'
 'qt5-serialport: APRS plugin'
 'libwlocate: WLAN based geolocation'

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

2016-05-10 Thread Antonio Rojas 
Date: Tuesday, May 10, 2016 @ 22:47:16
  Author: arojas
Revision: 267660

Fix conflict between marble and marble-data (FS#49291)

Modified:
  marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-05-10 20:19:05 UTC (rev 267659)
+++ PKGBUILD2016-05-10 20:47:16 UTC (rev 267660)
@@ -7,7 +7,7 @@
 pkgbase=marble
 pkgname=(marble libastro marble-data)
 pkgver=16.04.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(i686 x86_64)
 url="https://www.kde.org/applications/system/marble";
@@ -69,7 +69,7 @@
   rm "$pkgdir"/usr/lib/libastro.*
 
 # provided by marble-data
-  rm -r "$pkgdir"/usr/share/{icons,marble/data}
+  rm -r "$pkgdir"/usr/share/{icons,marble/data,mime}
 }
 
 package_marble-data() {

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

2016-04-28 Thread Felix Yan 
Date: Thursday, April 28, 2016 @ 19:08:14
  Author: fyan
Revision: 266550

upgpkg: marble 16.04.0-2

Hooks rebuild (part 1)

Modified:
  marble/trunk/PKGBUILD
Deleted:
  marble/trunk/marble.install

+
 PKGBUILD   |4 +---
 marble.install |   13 -
 2 files changed, 1 insertion(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-28 17:01:34 UTC (rev 266549)
+++ PKGBUILD2016-04-28 17:08:14 UTC (rev 266550)
@@ -7,7 +7,7 @@
 pkgbase=marble
 pkgname=(marble libastro marble-data)
 pkgver=16.04.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(i686 x86_64)
 url="https://www.kde.org/applications/system/marble";
@@ -60,7 +60,6 @@
   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
@@ -77,7 +76,6 @@
   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

Deleted: marble.install
===
--- marble.install  2016-04-28 17:01:34 UTC (rev 266549)
+++ marble.install  2016-04-28 17:08:14 UTC (rev 266550)
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-

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

2016-01-12 Thread Antonio Rojas 
Date: Tuesday, January 12, 2016 @ 19:11:13
  Author: arojas
Revision: 258147

Build docs

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-12 17:26:08 UTC (rev 258146)
+++ PKGBUILD2016-01-12 18:11:13 UTC (rev 258147)
@@ -7,12 +7,13 @@
 pkgbase=marble
 pkgname=(marble libastro marble-data)
 pkgver=15.12.1
-pkgrel=1
+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)
+makedepends=(extra-cmake-modules gpsd quazip-qt5 libwlocate phonon-qt5 
qt5-webkit krunner
+ kparts knewstuff qt5-tools kdoctools)
 
source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz";)
 md5sums=('49ae100aa2ec034d702636008dba5f2f')

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

2015-12-08 Thread Evangelos Foutras 
Date: Tuesday, December 8, 2015 @ 15:16:49
  Author: foutrelis
Revision: 253916

C++11 ABI rebuild

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-08 14:06:57 UTC (rev 253915)
+++ PKGBUILD2015-12-08 14:16:49 UTC (rev 253916)
@@ -7,7 +7,7 @@
 pkgbase=marble
 pkgname=(marble libastro marble-data)
 pkgver=15.08.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(i686 x86_64)
 url="https://www.kde.org/applications/system/marble";

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

2015-12-08 Thread 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
===
--- PKGBUILD2015-12-08 14:06:01 UTC (rev 253912)
+++ PKGBUILD2015-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.patch2015-12-08 14:06:26 UTC (rev 253913)
@@ -0,0 +1,32 @@
+From: Antonio Rojas 
+Date: Sat, 19 Sep 2015 22:14:14 +
+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=f59d559347fea1e2ada00e111f1f74151614
+---
+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()
+ 
+

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

2015-10-15 Thread Antonio Rojas 
Date: Thursday, October 15, 2015 @ 21:15:05
  Author: arojas
Revision: 249395

Don't build tools, they are not installed anyway
Move hicolor-icon-theme to marble-data subpackage

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-15 18:52:00 UTC (rev 249394)
+++ PKGBUILD2015-10-15 19:15:05 UTC (rev 249395)
@@ -44,7 +44,6 @@
 -DQT_PLUGINS_DIR=lib/qt/plugins \
 -DBUILD_TESTING=OFF \
 -DBUILD_MARBLE_EXAMPLES=OFF \
--DBUILD_MARBLE_TOOLS=ON \
 -DBUILD_MARBLE_TESTS=OFF \
 -DMOBILE=OFF
   make
@@ -60,7 +59,7 @@
 }
 
 package_marble() {
-  depends=(libastro marble-data qt5-webkit kparts knewstuff hicolor-icon-theme 
quazip-qt5)
+  depends=(libastro marble-data qt5-webkit kparts knewstuff quazip-qt5)
   optdepends=('gpsd: GPS based geolocation'
 'libwlocate: WLAN based geolocation'
 'krunner: Krunner plugin')
@@ -82,7 +81,9 @@
 
 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

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

2015-10-13 Thread Antonio Rojas 
Date: Wednesday, October 14, 2015 @ 08:13:50
  Author: arojas
Revision: 249317

Fix patch source (FS#46705)

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-14 04:36:15 UTC (rev 249316)
+++ PKGBUILD2015-10-14 06:13:50 UTC (rev 249317)
@@ -13,9 +13,10 @@
 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)
+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";)
 md5sums=('85c1b7b07c9fc8952a1a221f4d45c88e'
- 'ba8fe57516790cf55efe9dd2b87bf41d')
+ '5b2bbae7e54c33230eafbc960f6dd5a6')
 
 prepare() {
   mkdir -p build

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

2015-09-19 Thread 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
===
--- PKGBUILD2015-09-19 21:11:57 UTC (rev 246706)
+++ PKGBUILD2015-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 \

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

2015-09-17 Thread Antonio Rojas 
Date: Friday, September 18, 2015 @ 00:45:12
  Author: arojas
Revision: 246549

Fix the fix for the designer plugins install dir

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-17 21:53:51 UTC (rev 246548)
+++ PKGBUILD2015-09-17 22:45:12 UTC (rev 246549)
@@ -7,7 +7,7 @@
 pkgbase=marble
 pkgname=(marble libastro marble-data)
 pkgver=15.08.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(i686 x86_64)
 url="https://www.kde.org/applications/system/marble";
@@ -19,8 +19,8 @@
 prepare() {
   mkdir -p build
 
-  # fix installation designer plugins path
-  sed 's|LIB_SUFFIX}/plugins|LIB_SUFFIX}/qt/plugins|g' -i 
$pkgbase-$pkgver/CMakeLists.txt
+  # 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
 
   # only build the KDE app
   sed -e '/mobile/d' \

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

2015-08-23 Thread Antonio Rojas 
Date: Sunday, August 23, 2015 @ 20:52:41
  Author: arojas
Revision: 244746

Already satisfied

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-23 18:33:48 UTC (rev 244745)
+++ PKGBUILD2015-08-23 18:52:41 UTC (rev 244746)
@@ -58,7 +58,6 @@
   depends=(libastro marble-data qt5-webkit kparts knewstuff hicolor-icon-theme 
quazip-qt5)
   optdepends=('gpsd: GPS based geolocation'
 'libwlocate: WLAN based geolocation'
-'phonon-qt5: enables the use of audio and video content'
 'krunner: Krunner plugin')
   conflicts=('kdeedu-marble<15.04.3-3' marble-qt)
   replaces=(kdeedu-marble 'marble-qt<15.07')

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

2015-08-23 Thread Antonio Rojas 
Date: Sunday, August 23, 2015 @ 20:33:07
  Author: arojas
Revision: 244744

Make quazip-qt5 a mandatory dependency (FS#46082)

Modified:
  marble/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-23 15:43:24 UTC (rev 244743)
+++ PKGBUILD2015-08-23 18:33:07 UTC (rev 244744)
@@ -7,7 +7,7 @@
 pkgbase=marble
 pkgname=(marble libastro marble-data)
 pkgver=15.08.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 arch=(i686 x86_64)
 url="https://www.kde.org/applications/system/marble";
@@ -55,9 +55,8 @@
 }
 
 package_marble() {
-  depends=(libastro marble-data qt5-webkit kparts knewstuff hicolor-icon-theme)
+  depends=(libastro marble-data qt5-webkit kparts knewstuff hicolor-icon-theme 
quazip-qt5)
   optdepends=('gpsd: GPS based geolocation'
-'quazip-qt5: reading and displaying .kmz files'
 'libwlocate: WLAN based geolocation'
 'phonon-qt5: enables the use of audio and video content'
 'krunner: Krunner plugin')