From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aBXfJXQl72C8qgAAgWs5BA (envelope-from ) for ; Wed, 14 Jul 2021 19:57:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +C/RH3Ql72BVOQAAB5/wlQ (envelope-from ) for ; Wed, 14 Jul 2021 17:57:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C4C461E374 for ; Wed, 14 Jul 2021 19:57:07 +0200 (CEST) Received: from localhost ([::1]:53064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3j86-0007m7-Rx for larch@yhetil.org; Wed, 14 Jul 2021 13:57:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3j82-0007lj-Qz for guix-patches@gnu.org; Wed, 14 Jul 2021 13:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3j82-0002lD-JQ for guix-patches@gnu.org; Wed, 14 Jul 2021 13:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3j82-0007Wl-EG for guix-patches@gnu.org; Wed, 14 Jul 2021 13:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49563] [PATCH 1/1] gnu: Add marble-qt. References: <20210714175425.3310-1-wz@freeshell.de> In-Reply-To: <20210714175425.3310-1-wz@freeshell.de> Resent-From: Wiktor =?UTF-8?Q?=C5=BBelazny?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Jul 2021 17:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49563 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49563@debbugs.gnu.org Received: via spool by 49563-submit@debbugs.gnu.org id=B49563.162628537528880 (code B ref 49563); Wed, 14 Jul 2021 17:57:02 +0000 Received: (at 49563) by debbugs.gnu.org; 14 Jul 2021 17:56:15 +0000 Received: from localhost ([127.0.0.1]:45915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3j79-0007VZ-Mu for submit@debbugs.gnu.org; Wed, 14 Jul 2021 13:56:15 -0400 Received: from freeshell.de ([116.202.128.144]:49084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3j76-0007Uw-W6 for 49563@debbugs.gnu.org; Wed, 14 Jul 2021 13:56:06 -0400 Received: from localhost.localdomain (cst-prg-27-60.cust.vodafone.cz [46.135.27.60]) (Authenticated sender: wz) by freeshell.de (Postfix) with ESMTPSA id CEF78B2C1F6C for <49563@debbugs.gnu.org>; Wed, 14 Jul 2021 19:55:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freeshell.de; s=mail; t=1626285358; bh=GKP/LZWITfmymQJjRBv7ym8ctYmhOL+fPblg+K3WtL0=; h=From:To:Subject:Date:From; b=YOZ0AtwZuoDS28aItDW7wQNghoPfKi2w+xpb7qY+73R2znBXnKuLxppfti7pqHrek RTAwwEPu0F0b2cZzRq1oaKoiwgh9HN8N8kGjDj5DUHqC6rMaMM0ZSDZGjUir10zx3f fBjD1oNO0p/nW2COV0joydbiBuCGqsJdRKnmSgGI= From: Wiktor =?UTF-8?Q?=C5=BBelazny?= Date: Wed, 14 Jul 2021 19:55:52 +0200 Message-Id: <20210714175552.3456-1-wz@freeshell.de> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626285428; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=GKP/LZWITfmymQJjRBv7ym8ctYmhOL+fPblg+K3WtL0=; b=DVzdUWfv/+1xwUnq0J7wRGdTpyVXbsyY7GQpeDhdIe7v/5H2YYfstSIG+TLfaUcSdX0w97 uoiUr73pGU/qjfd7IRCTAH54ql28U8FMQpW5CU5J5S2XTAdUe/UEyYV62DIFr5yRLH3uq6 TdxSdeCFDOBJPbEO07zosTS18lZgNCij4g+Ks5JXPYpg9x6lEQkxpFqngywOtdY23cr7z3 gidrAcNNM4FIcxNfVQNeR7dBcZtTldD4eRQyz9Qj/IeUSKNq2KlwQJUFVoyMsj408vcjuD yjLbFmTPP3m/TzmxDchckx4Pli43One0rc+hvpzN8K884Gx4hgUtknQrPx0qww== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626285428; a=rsa-sha256; cv=none; b=hDwFdkkLAqOZ9gMBElhuNMv4qy0IVIfGRndHWFmTQIKNeaphyPbetqIklWDJOT9LkQ1hFY fvuf0CnVv1rLV93UvMXXf7bLKT6N2RaSSHHuOThwHmgmTW4hfOjHUkyfdZoIrakrM7Tda4 ly06eEnzi1u1VRNfztapEeteZcKPWSiyplmtsv5W1wQlAZzixe1LxqTcqDd8H/AZn2vkJX FVEDvE6nvonVZMPkmMYSlB1lZ19McZrUX84ylD6RvxeUFJeR377DcVEmqBi2ZsE8ILGMTv 0mL4cI03IhHekYAfjYpbhLSXt4TTHZaRtCaWg4Zx3/+s1Jedq/85Bo3vQdk65A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=freeshell.de header.s=mail header.b=YOZ0AtwZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=freeshell.de (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=freeshell.de header.s=mail header.b=YOZ0AtwZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=freeshell.de (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C4C461E374 X-Spam-Score: -0.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: PsrAVV3LN9Uo * gnu/packages/patches/marble-qt-add-qt-headers.patch: New patch. * gnu/packages/geo.scm (marble-qt): New variable. --- gnu/packages/geo.scm | 42 +++- .../patches/marble-qt-add-qt-headers.patch | 189 ++++++++++++++++++ 2 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/marble-qt-add-qt-headers.patch diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37be78edbf..37596d35b9 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018, 2019, 2020 Julien Lepiller ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2019 Wiktor Żelazny +;;; Copyright © 2019, 2021 Wiktor Żelazny ;;; Copyright © 2019, 2020 Hartmut Goebel ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Christopher Baines @@ -2414,3 +2414,43 @@ web services. @code{geopy} makes it easy for Python developers to locate the coordinates of addresses, cities, countries, and landmarks across the globe using third-party geocoders and other data sources.") (license license:expat))) + +(define-public marble-qt + (let ((release "17.08") + (commit "fc7166eeef784732033c999ba605364f9c82d21c") + (revision "1")) + (package + (name "marble-qt") + (version (git-version release revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://anongit.kde.org/marble") + (commit commit))) + (sha256 + (base32 + "0m0sf3sddaib7vc5lhbmh7ziw07p1hahg02f65sgfylyl5f5kj92")) + (patches (search-patches + "marble-qt-add-qt-headers.patch")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; libmarblewidget-qt5.so.28 not found + #:configure-flags + '("-DCMAKE_BUILD_TYPE=Release" + "-DWITH_KF5=FALSE"))) + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase-5) + ("qtsvg" ,qtsvg) + ("qtdeclarative" ,qtdeclarative) + ("qtwebkit" ,qtwebkit) + ("qtlocation" ,qtlocation))) + (home-page "https://marble.kde.org/") + (synopsis "Virtual globe and world atlas") + (description "Marble is similar to a desktop globe. At closer scale it +becomes a world atlas, while OpenStreetMap takes the user to street level. It +supports searching for places of interest, viewing Wikipedia articles, creating +routes by drag and drop and more.") + (license license:gpl3)))) diff --git a/gnu/packages/patches/marble-qt-add-qt-headers.patch b/gnu/packages/patches/marble-qt-add-qt-headers.patch new file mode 100644 index 0000000000..77c58317ad --- /dev/null +++ b/gnu/packages/patches/marble-qt-add-qt-headers.patch @@ -0,0 +1,189 @@ +Adapted from Debian: https://salsa.debian.org/qt-kde-team/kde/marble/-/blob/debian/4%2517.08.3-3.1/debian/patches/qt5.11.patch +Upstream status: Probably irrelevant, as this is an old version of this software. + +diff --git a/src/lib/marble/MergedLayerDecorator.cpp b/src/lib/marble/MergedLayerDecorator.cpp +index 40f3ddb..bafff50 100644 +--- a/src/lib/marble/MergedLayerDecorator.cpp ++++ b/src/lib/marble/MergedLayerDecorator.cpp +@@ -36,6 +36,7 @@ + + #include + #include ++#include + + using namespace Marble; + +diff --git a/src/lib/marble/VisiblePlacemark.cpp b/src/lib/marble/VisiblePlacemark.cpp +index cfe08af..1a84006 100644 +--- a/src/lib/marble/VisiblePlacemark.cpp ++++ b/src/lib/marble/VisiblePlacemark.cpp +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/src/lib/marble/graphicsview/FrameGraphicsItem.cpp b/src/lib/marble/graphicsview/FrameGraphicsItem.cpp +index 8a90526..065f245 100644 +--- a/src/lib/marble/graphicsview/FrameGraphicsItem.cpp ++++ b/src/lib/marble/graphicsview/FrameGraphicsItem.cpp +@@ -18,6 +18,7 @@ + // Qt + #include + #include ++#include + #include + #include + #include +diff --git a/src/lib/marble/layers/GroundLayer.cpp b/src/lib/marble/layers/GroundLayer.cpp +index 58d409f..df6d226 100644 +--- a/src/lib/marble/layers/GroundLayer.cpp ++++ b/src/lib/marble/layers/GroundLayer.cpp +@@ -14,6 +14,9 @@ + #include "ViewportParams.h" + #include "RenderState.h" + ++#include ++#include ++ + namespace Marble + { + +diff --git a/src/plugins/render/compass/CompassFloatItem.cpp b/src/plugins/render/compass/CompassFloatItem.cpp +index d8dc021..66095cc 100644 +--- a/src/plugins/render/compass/CompassFloatItem.cpp ++++ b/src/plugins/render/compass/CompassFloatItem.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp +index a790c16..96f5bed 100644 +--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp ++++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/plugins/render/foursquare/FoursquareItem.cpp b/src/plugins/render/foursquare/FoursquareItem.cpp +index d9e1f57..ef80472 100644 +--- a/src/plugins/render/foursquare/FoursquareItem.cpp ++++ b/src/plugins/render/foursquare/FoursquareItem.cpp +@@ -13,6 +13,8 @@ + #include "ViewportParams.h" + + #include ++#include ++#include + + namespace Marble + { +diff --git a/src/plugins/render/gpsinfo/GpsInfo.cpp b/src/plugins/render/gpsinfo/GpsInfo.cpp +index 522e907..20fd75a 100644 +--- a/src/plugins/render/gpsinfo/GpsInfo.cpp ++++ b/src/plugins/render/gpsinfo/GpsInfo.cpp +@@ -21,6 +21,8 @@ + #include "ViewportParams.h" + #include "GeoDataAccuracy.h" + ++#include ++ + namespace Marble + { + +diff --git a/src/plugins/render/license/License.cpp b/src/plugins/render/license/License.cpp +index 511dfc0..9436083 100644 +--- a/src/plugins/render/license/License.cpp ++++ b/src/plugins/render/license/License.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/plugins/render/notes/NotesItem.cpp b/src/plugins/render/notes/NotesItem.cpp +index 9d0961f..0c9fe99 100644 +--- a/src/plugins/render/notes/NotesItem.cpp ++++ b/src/plugins/render/notes/NotesItem.cpp +@@ -9,6 +9,7 @@ + #include "MarbleDirs.h" + + #include ++#include + #include + + using namespace Marble; +diff --git a/src/plugins/render/postalcode/PostalCodeItem.cpp b/src/plugins/render/postalcode/PostalCodeItem.cpp +index 772c0b2..0ff7957 100644 +--- a/src/plugins/render/postalcode/PostalCodeItem.cpp ++++ b/src/plugins/render/postalcode/PostalCodeItem.cpp +@@ -17,6 +17,7 @@ + // Qt + #include + #include ++#include + + using namespace Marble; + +diff --git a/src/plugins/render/progress/ProgressFloatItem.cpp b/src/plugins/render/progress/ProgressFloatItem.cpp +index a465857..6e2452c 100644 +--- a/src/plugins/render/progress/ProgressFloatItem.cpp ++++ b/src/plugins/render/progress/ProgressFloatItem.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + namespace Marble + { +diff --git a/src/plugins/render/satellites/SatellitesPlugin.cpp b/src/plugins/render/satellites/SatellitesPlugin.cpp +index 04d8321..0a43d24 100644 +--- a/src/plugins/render/satellites/SatellitesPlugin.cpp ++++ b/src/plugins/render/satellites/SatellitesPlugin.cpp +@@ -25,6 +25,7 @@ + + #include "ui_SatellitesConfigDialog.h" + ++#include + #include + #include + +diff --git a/src/plugins/render/speedometer/Speedometer.cpp b/src/plugins/render/speedometer/Speedometer.cpp +index 6e9c532..f40a174 100644 +--- a/src/plugins/render/speedometer/Speedometer.cpp ++++ b/src/plugins/render/speedometer/Speedometer.cpp +@@ -19,6 +19,8 @@ + #include "MarbleGraphicsGridLayout.h" + #include "ViewportParams.h" + ++#include ++ + namespace Marble + { + +diff --git a/src/plugins/render/stars/StarsPlugin.cpp b/src/plugins/render/stars/StarsPlugin.cpp +index 6599545..482680f 100644 +--- a/src/plugins/render/stars/StarsPlugin.cpp ++++ b/src/plugins/render/stars/StarsPlugin.cpp +@@ -19,6 +19,8 @@ + #include + #include + #include ++#include ++#include + #include + + #include "MarbleClock.h" -- 2.32.0