From patchwork Sat Nov 27 13:21:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 34834 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7F97D27BBEA; Sat, 27 Nov 2021 13:23:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 35DBE27BBE9 for ; Sat, 27 Nov 2021 13:23:44 +0000 (GMT) Received: from localhost ([::1]:47858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mqxg7-0000iw-CT for patchwork@mira.cbaines.net; Sat, 27 Nov 2021 08:23:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqxfT-0000Hx-E0 for guix-patches@gnu.org; Sat, 27 Nov 2021 08:23:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mqxfT-0005Qc-5d for guix-patches@gnu.org; Sat, 27 Nov 2021 08:23:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mqxfT-0007ws-2h for guix-patches@gnu.org; Sat, 27 Nov 2021 08:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52144] [PATCH core-updates-frozen 2/3] gnu: marble-qt: Update to 21.08.3. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Nov 2021 13:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52144@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 52144-submit@debbugs.gnu.org id=B52144.163801934230444 (code B ref 52144); Sat, 27 Nov 2021 13:23:03 +0000 Received: (at 52144) by debbugs.gnu.org; 27 Nov 2021 13:22:22 +0000 Received: from localhost ([127.0.0.1]:33227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqxem-0007uq-Bf for submit@debbugs.gnu.org; Sat, 27 Nov 2021 08:22:21 -0500 Received: from mout01.posteo.de ([185.67.36.65]:45203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqxek-0007uQ-Uk for 52144@debbugs.gnu.org; Sat, 27 Nov 2021 08:22:19 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 60D8B240027 for <52144@debbugs.gnu.org>; Sat, 27 Nov 2021 14:22:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1638019333; bh=YqytqUdCJeAQXrWF37805HH2Dae80Y5IVpxBxGGOKlA=; h=From:To:Cc:Subject:Date:From; b=QLurjnOyTvEhsGrQUeeIdD28i1F32qE/Dj3N4nBJRGEcUynndE/ixBE+7grUlPSg1 ym6V63b7Kip0EPtQYo2J37KOAnuSwoRzc5UnqYDHYsQ3F3xx2KZNgGDBgH4aG0D2xK xkA6PWysDqCa4gILDzNGWBG+nLKCJE6sR8FYlOGkWqfjQrUXYaqhvWUgO0aCX9uuI2 6dfn2qKNU9qXSx363jhIjvGfZXSYn6RXWJYqRRR9fES9qer2IWfdLpS+j4m0NUIZyv 5ixDQvCQ4yWJCgAD6BznXPhydhxF8Gbn9N/MeB09onz96JaKFhzcqDFZirGj4wS+7f 4xtvv4wxEWbIQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4J1XMm3SXmz6tnF; Sat, 27 Nov 2021 14:22:12 +0100 (CET) From: Vinicius Monego Date: Sat, 27 Nov 2021 13:21:52 +0000 Message-Id: <20211127132153.210724-2-monego@posteo.net> In-Reply-To: <20211127132153.210724-1-monego@posteo.net> References: <20211127132153.210724-1-monego@posteo.net> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde.scm (marble-qt): Update to 21.08.3. [build-system]: Use qt-build-system. [arguments]<#:configure-flags>: Pass "-DBUILD_MARBLE_TESTS=FALSE". [license]: Change to lgpl2.1+. --- gnu/packages/kde.scm | 68 +++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index fa220c91f0..886d8f6025 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -988,44 +988,42 @@ Python, PHP, and Perl.") (license (list license:gpl2+ license:fdl1.2+)))) (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 "https://invent.kde.org/education/marble.git/") - (commit commit))) - (file-name (git-file-name name version)) - (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 + (package + (name "marble-qt") + (version "21.08.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://invent.kde.org/education/marble.git/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15gqym45z0gjzdc4ypfj0fki96c3dad4ygsi6lfr8yvwsx8swrb6")))) + (build-system qt-build-system) + (arguments + ;; FIXME: libmarblewidget-qt5.so.28 not found. Also enable the + ;; corresponding configure flag to build tests. + `(#:tests? #f + #:configure-flags + '("-DCMAKE_BUILD_TYPE=Release" + "-DWITH_KF5=FALSE" + "-DBUILD_MARBLE_TESTS=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)))) + (license license:lgpl2.1+))) (define-public okular (package