From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kHFEHnExomFcSAAAgWs5BA (envelope-from ) for ; Sat, 27 Nov 2021 14:24:01 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id oCHeGXExomEOYQAAbx9fmQ (envelope-from ) for ; Sat, 27 Nov 2021 13:24:01 +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 2A0BD36FFD for ; Sat, 27 Nov 2021 14:24:01 +0100 (CET) Received: from localhost ([::1]:48772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mqxgO-0001GQ-Cl for larch@yhetil.org; Sat, 27 Nov 2021 08:24:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqxfT-0000I7-Rm for guix-patches@gnu.org; Sat, 27 Nov 2021 08:23:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49927) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mqxfT-0005Qi-JH 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-0007wz-Ft 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 3/3] gnu: marble-qt: Add optional dependencies. 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.163801934430465 (code B ref 52144); Sat, 27 Nov 2021 13:23:03 +0000 Received: (at 52144) by debbugs.gnu.org; 27 Nov 2021 13:22:24 +0000 Received: from localhost ([127.0.0.1]:33233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqxeq-0007vE-5R for submit@debbugs.gnu.org; Sat, 27 Nov 2021 08:22:24 -0500 Received: from mout01.posteo.de ([185.67.36.65]:48891) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqxep-0007ui-5L for 52144@debbugs.gnu.org; Sat, 27 Nov 2021 08:22:23 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 95AD5240027 for <52144@debbugs.gnu.org>; Sat, 27 Nov 2021 14:22:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1638019337; bh=qje7IWg6WlgPR/o5JniUmXOtP8UEdQ09jdO9uKYOGCk=; h=From:To:Cc:Subject:Date:From; b=bK0PrMf+GvcQcH5rnZRBy0cV2/IpgCDUaGUJRqds5o7TbUYhKGgYVm88QgjTZ3JY6 xJtasy5YlCGrtcwPW8Nol3nWG203ZOZnrPS5r73go+th3M0WmlJXhY/csYpVEimNqh /6BoxOKj4xXfQEtmfcaTAROzmxqgWYZj7d5Cn7A07OpVPGLT7tToUDjNpa/g/p3y3T JWdC+ME7LkrXqgo2ptV8AbvA86BChQn7kOEW9r8Pmh65l7eJKdfrAV5kvmDUDDP7OV R99S+jMUb/TH2+KT14juKV9tn25fuU5hw0D/VMO61w8/v0mg5VxYdvDHpQAdomTXFx FkqyRb1QrHqvQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4J1XMr4w9Zz6tnn; Sat, 27 Nov 2021 14:22:16 +0100 (CET) From: Vinicius Monego Date: Sat, 27 Nov 2021 13:21:53 +0000 Message-Id: <20211127132153.210724-3-monego@posteo.net> In-Reply-To: <20211127132153.210724-1-monego@posteo.net> References: <20211127132153.210724-1-monego@posteo.net> MIME-Version: 1.0 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638019441; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=3zz9TD0MQ9aaR/VpAf/Y+P6BMbz/3sqLsI6C6SnGbiQ=; b=RKddJED13XIx4keKx0k6rs2y5XerAk/wXEt5a0hYpNOHUGuOfH/mOYcDbEt68z0BxRWsHV P5mfUy4cxUVYMIZm1PqkRJTMkhnBUcOWo/JwLnZCs7Xut9DXQzn4+xBwjgTCsARD9BtARV 8ROcauY1kZUATPYPvavIkODevWVfqhiNeIN5xyrF+hY3PbnKU3PsRZ082pUptiooChytg7 48eCoc0BNDS6YcBFhGtkuEE3LFvnusvUkIIaPzWvtcXSp27LtHByZkyc6Dhq2vkKmIanMR 36hvXPDcW6TsWJB2Q0WCMTpLpQY2RmCjptEugm7C8J+JtNBYURtit6sZPZQQUg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638019441; a=rsa-sha256; cv=none; b=mGKTwan+YBOvhD8hAmbQ0FdHbn6MvDsrOjxYZcuNe1ZcJQ84sjIYgiQAVBi174VQSZbLwO 5z+xHdAQiQZWcONLKlqmOQHOJK4delY7Lu7ieCdaZee0qri48w3axiqzK6Dx3NJ7p0s6Sn GM3JeOtPpOjL8d04Qh1lxIKlrNdikkxzykrdpcE0SaIdyLs54lCqXrmm3ifcyI87bvIC3+ hWIOO3s0G9HQWHdA5toHpmivG4AETnir24rPz3eDKpykgCNEOhGyfLfXuniHaMRUtm7L9X 8R5i66JvK4ezPAoZH0zdCpJCAKTG5r7KpcmKeK2EZN1BD/iwr2MNf71bmA8dyA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=bK0PrMf+; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.50 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=bK0PrMf+; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 2A0BD36FFD X-Spam-Score: -0.50 X-Migadu-Scanner: scn0.migadu.com X-TUID: hIhqYVFdWW4m * gnu/packages/kde.scm (marble-qt)[arguments]<#:configure-flags>: Remove "-DCMAKE_BUILD_TYPE=Release" and "-DWITH_KF5=FALSE". Add "-DBUILD_MARBLE_TOOLS=YES" and "-DBUILD_TOUCH=YES". [native-inputs]: Add extra-cmake-modules. [inputs]: Sort alphabetically. Add gpsd, kcoreaddons, kcrash, kdoctools, ki18n, kio, knewstuff, kparts, krunner, kwallet, perl, phonon, protobuf, qtserialport, qtsvg, shapelib, shared-mime-info, zlib. Remove qtwebkit. --- gnu/packages/kde.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 886d8f6025..20916cf164 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -57,10 +57,12 @@ #:use-module (gnu packages ebook) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) + #:use-module (gnu packages geo) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages gnome) + #:use-module (gnu packages gps) #:use-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) @@ -74,6 +76,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages tls) @@ -1006,17 +1009,36 @@ Python, PHP, and Perl.") ;; corresponding configure flag to build tests. `(#:tests? #f #:configure-flags - '("-DCMAKE_BUILD_TYPE=Release" - "-DWITH_KF5=FALSE" - "-DBUILD_MARBLE_TESTS=FALSE"))) + (list "-DBUILD_MARBLE_TOOLS=YES" ; file conversion tools + "-DBUILD_TOUCH=YES" + "-DBUILD_MARBLE_TESTS=FALSE"))) (native-inputs - `(("qttools" ,qttools))) + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + ;; One optional dependency missing: libwlocate. (inputs - `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + `(("gpsd" ,gpsd) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdoctools" ,kdoctools) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("knewstuff" ,knewstuff) + ("kparts" ,kparts) + ("krunner" ,krunner) + ("kwallet" ,kwallet) + ("perl" ,perl) + ("phonon" ,phonon) + ("protobuf" ,protobuf) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtwebkit" ,qtwebkit) - ("qtlocation" ,qtlocation))) + ("qtlocation" ,qtlocation) + ("qtserialport" ,qtserialport) + ("qtsvg" ,qtsvg) + ;; ("qtwebengine" ,qtwebengine) ; FIXME: not found by CMake + ("shapelib" ,shapelib) + ("shared-mime-info" ,shared-mime-info) + ("zlib" ,zlib))) (home-page "https://marble.kde.org/") (synopsis "Virtual globe and world atlas") (description "Marble is similar to a desktop globe. At closer scale it -- 2.30.2