[arch-commits] Commit in marble/repos/kde-unstable-x86_64 (3 files)
Antonio Rojas
arojas at archlinux.org
Fri Apr 3 20:25:21 UTC 2020
Date: Friday, April 3, 2020 @ 20:25:20
Author: arojas
Revision: 379325
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
marble/repos/kde-unstable-x86_64/PKGBUILD
(from rev 379324, marble/kde-unstable/PKGBUILD)
Deleted:
marble/repos/kde-unstable-x86_64/PKGBUILD
marble/repos/kde-unstable-x86_64/marble-qt5.15.patch
---------------------+
PKGBUILD | 161 ++++++++++++++++++++++++--------------------------
marble-qt5.15.patch | 144 --------------------------------------------
2 files changed, 78 insertions(+), 227 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-03 20:24:49 UTC (rev 379324)
+++ PKGBUILD 2020-04-03 20:25:20 UTC (rev 379325)
@@ -1,83 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-
-pkgbase=marble
-pkgname=(marble-common marble-qt marble)
-pkgver=20.03.80
-pkgrel=1
-pkgdesc="Desktop Globe"
-arch=(x86_64)
-url="https://www.kde.org/applications/system/marble"
-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/unstable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig}
- marble-qt5.15.patch)
-sha256sums=('447292cf1f6464d11960ac45f2bfcdb8b1ec15f5ccef2139e109cd932f647247'
- 'SKIP'
- '249a5da93b433a1a6999d8e3cc39c8118ab7a1221d22d98ac4749224514d7712')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid at kde.org>
- F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
- mkdir -p build
-
- cd $pkgbase-$pkgver
- patch -p1 -i ../marble-qt5.15.patch # Fix build with Qt 5.15
-}
-
-build() {
- cd build
- cmake ../$pkgbase-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc \
- -DQT_PLUGINS_DIR=lib/qt/plugins \
- -DBUILD_TESTING=OFF \
- -DBUILD_MARBLE_EXAMPLES=OFF \
- -DBUILD_MARBLE_TESTS=OFF \
- -DMOBILE=OFF
- make
-}
-
-package_marble-common() {
- pkgdesc='Common libraries and plugins for Marble'
- depends=(qt5-svg qt5-webengine phonon-qt5 desktop-file-utils)
- optdepends=('gpsd: GPS based geolocation'
- 'libwlocate: WLAN based geolocation'
- 'qt5-serialport: APRS plugin'
- 'shapelib: SHP plugin')
-
- cd build
- make DESTDIR="$pkgdir" install
- rm -r "$pkgdir"/usr/share/{config.kcfg,kxmlgui5,metainfo,plasma} \
- "$pkgdir"/usr/bin \
- "$pkgdir"/etc \
- "$pkgdir"/usr/lib/qt/{qml,plugins/*.so} \
- "$pkgdir"/usr/share/applications/{marble_geo.desktop,marble_worldwind.desktop,org.kde.marble*.desktop} \
- "$pkgdir"/usr/share/kservices5/{marble_part.desktop,plasma*} \
- "$pkgdir"/usr/share/locale/*/LC_MESSAGES/*.mo
-}
-
-package_marble-qt() {
- pkgdesc+=' (Qt version)'
- depends=(marble-common)
-
- cd build
- make -C src/apps/marble-qt DESTDIR="$pkgdir" install
-}
-
-package_marble() {
- depends=(marble-common knewstuff kparts)
- optdepends=('krunner: Krunner plugin')
- groups=(kde-applications kdeedu)
-
- 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,doc/HTML}
-}
Copied: marble/repos/kde-unstable-x86_64/PKGBUILD (from rev 379324, marble/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-03 20:25:20 UTC (rev 379325)
@@ -0,0 +1,78 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgbase=marble
+pkgname=(marble-common marble-qt marble)
+pkgver=20.03.90
+pkgrel=1
+pkgdesc="Desktop Globe"
+arch=(x86_64)
+url="https://www.kde.org/applications/system/marble"
+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/unstable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
+sha256sums=('25a37642e672498a17d439e19883ecf7a05d3601dae3bcbdf4aeee5d91b547d3'
+ 'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid at kde.org>
+ F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgbase-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ -DQT_PLUGINS_DIR=lib/qt/plugins \
+ -DBUILD_TESTING=OFF \
+ -DBUILD_MARBLE_EXAMPLES=OFF \
+ -DBUILD_MARBLE_TESTS=OFF \
+ -DMOBILE=OFF
+ make
+}
+
+package_marble-common() {
+ pkgdesc='Common libraries and plugins for Marble'
+ depends=(qt5-svg qt5-webengine phonon-qt5 desktop-file-utils)
+ optdepends=('gpsd: GPS based geolocation'
+ 'libwlocate: WLAN based geolocation'
+ 'qt5-serialport: APRS plugin'
+ 'shapelib: SHP plugin')
+
+ cd build
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir"/usr/share/{config.kcfg,kxmlgui5,metainfo,plasma} \
+ "$pkgdir"/usr/bin \
+ "$pkgdir"/etc \
+ "$pkgdir"/usr/lib/qt/{qml,plugins/*.so} \
+ "$pkgdir"/usr/share/applications/{marble_geo.desktop,marble_worldwind.desktop,org.kde.marble*.desktop} \
+ "$pkgdir"/usr/share/kservices5/{marble_part.desktop,plasma*} \
+ "$pkgdir"/usr/share/locale/*/LC_MESSAGES/*.mo
+}
+
+package_marble-qt() {
+ pkgdesc+=' (Qt version)'
+ depends=(marble-common)
+
+ cd build
+ make -C src/apps/marble-qt DESTDIR="$pkgdir" install
+}
+
+package_marble() {
+ depends=(marble-common knewstuff kparts)
+ optdepends=('krunner: Krunner plugin')
+ groups=(kde-applications kdeedu)
+
+ 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,doc/HTML}
+}
Deleted: marble-qt5.15.patch
===================================================================
--- marble-qt5.15.patch 2020-04-03 20:24:49 UTC (rev 379324)
+++ marble-qt5.15.patch 2020-04-03 20:25:20 UTC (rev 379325)
@@ -1,144 +0,0 @@
-diff --git a/src/lib/marble/MergedLayerDecorator.cpp b/src/lib/marble/MergedLayerDecorator.cpp
-index d2e454e3d..eb3d22e42 100644
---- a/src/lib/marble/MergedLayerDecorator.cpp
-+++ b/src/lib/marble/MergedLayerDecorator.cpp
-@@ -36,6 +36,7 @@
-
- #include <QPointer>
- #include <QPainter>
-+#include <QPainterPath>
-
- using namespace Marble;
-
-diff --git a/src/lib/marble/VisiblePlacemark.cpp b/src/lib/marble/VisiblePlacemark.cpp
-index cfe08af97..1a84006b7 100644
---- a/src/lib/marble/VisiblePlacemark.cpp
-+++ b/src/lib/marble/VisiblePlacemark.cpp
-@@ -22,6 +22,7 @@
-
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPalette>
- #include <QPixmapCache>
-
-diff --git a/src/lib/marble/graphicsview/FrameGraphicsItem.cpp b/src/lib/marble/graphicsview/FrameGraphicsItem.cpp
-index 8a90526fb..065f2452c 100644
---- a/src/lib/marble/graphicsview/FrameGraphicsItem.cpp
-+++ b/src/lib/marble/graphicsview/FrameGraphicsItem.cpp
-@@ -18,6 +18,7 @@
- // Qt
- #include <QSizeF>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmapCache>
- #include <QMargins>
- #include <qdrawutil.h>
-diff --git a/src/lib/marble/layers/GroundLayer.h b/src/lib/marble/layers/GroundLayer.h
-index b18b160cf..ad8d717b8 100644
---- a/src/lib/marble/layers/GroundLayer.h
-+++ b/src/lib/marble/layers/GroundLayer.h
-@@ -14,6 +14,7 @@
- #include "LayerInterface.h"
-
- #include <QColor>
-+#include <QPainterPath>
-
- namespace Marble
- {
-diff --git a/src/plugins/render/compass/CompassFloatItem.cpp b/src/plugins/render/compass/CompassFloatItem.cpp
-index 09e4c7655..9f222dcd9 100644
---- a/src/plugins/render/compass/CompassFloatItem.cpp
-+++ b/src/plugins/render/compass/CompassFloatItem.cpp
-@@ -19,6 +19,7 @@
- #include <QRect>
- #include <QColor>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPushButton>
- #include <QSvgRenderer>
-
-diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
-index 154264e67..c63235958 100644
---- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
-+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
-@@ -31,6 +31,7 @@
- #include <QContextMenuEvent>
- #include <QRect>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPushButton>
- #include <QMenu>
- #include <QMouseEvent>
-diff --git a/src/plugins/render/foursquare/FoursquareItem.cpp b/src/plugins/render/foursquare/FoursquareItem.cpp
-index d9e1f57d8..0bf68face 100644
---- a/src/plugins/render/foursquare/FoursquareItem.cpp
-+++ b/src/plugins/render/foursquare/FoursquareItem.cpp
-@@ -13,6 +13,7 @@
- #include "ViewportParams.h"
-
- #include <QFontMetrics>
-+#include <QPainterPath>
-
- namespace Marble
- {
-diff --git a/src/plugins/render/license/License.cpp b/src/plugins/render/license/License.cpp
-index 6faaa3e08..45682c3b8 100644
---- a/src/plugins/render/license/License.cpp
-+++ b/src/plugins/render/license/License.cpp
-@@ -23,6 +23,7 @@
- #include <QCommonStyle>
- #include <QContextMenuEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLabel>
- #include <QMenu>
- #include <QMouseEvent>
-diff --git a/src/plugins/render/notes/NotesItem.cpp b/src/plugins/render/notes/NotesItem.cpp
-index 9d0961fcd..0c9fe992b 100644
---- a/src/plugins/render/notes/NotesItem.cpp
-+++ b/src/plugins/render/notes/NotesItem.cpp
-@@ -9,6 +9,7 @@
- #include "MarbleDirs.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRect>
-
- using namespace Marble;
-diff --git a/src/plugins/render/postalcode/PostalCodeItem.cpp b/src/plugins/render/postalcode/PostalCodeItem.cpp
-index 772c0b269..0ff7957d2 100644
---- a/src/plugins/render/postalcode/PostalCodeItem.cpp
-+++ b/src/plugins/render/postalcode/PostalCodeItem.cpp
-@@ -17,6 +17,7 @@
- // Qt
- #include <QFontMetrics>
- #include <QPainter>
-+#include <QPainterPath>
-
- using namespace Marble;
-
-diff --git a/src/plugins/render/progress/ProgressFloatItem.cpp b/src/plugins/render/progress/ProgressFloatItem.cpp
-index a4658577c..6e2452c5f 100644
---- a/src/plugins/render/progress/ProgressFloatItem.cpp
-+++ b/src/plugins/render/progress/ProgressFloatItem.cpp
-@@ -22,6 +22,7 @@
- #include <QColor>
- #include <QPaintDevice>
- #include <QPainter>
-+#include <QPainterPath>
-
- namespace Marble
- {
-diff --git a/src/plugins/render/stars/StarsPlugin.cpp b/src/plugins/render/stars/StarsPlugin.cpp
-index ba1d2e349..5c83b8088 100644
---- a/src/plugins/render/stars/StarsPlugin.cpp
-+++ b/src/plugins/render/stars/StarsPlugin.cpp
-@@ -19,6 +19,7 @@
- #include <QContextMenuEvent>
- #include <QMenu>
- #include <QColorDialog>
-+#include <QPainterPath>
- #include <qmath.h>
-
- #include "MarbleClock.h"
More information about the arch-commits
mailing list