From patchwork Thu Nov 7 10:25:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 15993 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 3B2B3176EB; Thu, 7 Nov 2019 10:26:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E49E917663 for ; Thu, 7 Nov 2019 10:26:21 +0000 (GMT) Received: from localhost ([::1]:40536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSezd-0002Y8-EA for patchwork@mira.cbaines.net; Thu, 07 Nov 2019 05:26:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37473) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSezM-0002JJ-GP for guix-patches@gnu.org; Thu, 07 Nov 2019 05:26:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSezL-0003th-3S for guix-patches@gnu.org; Thu, 07 Nov 2019 05:26:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32875) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iSezK-0003sZ-Ve for guix-patches@gnu.org; Thu, 07 Nov 2019 05:26:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iSezK-0002r8-RN for guix-patches@gnu.org; Thu, 07 Nov 2019 05:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38099] [PATCH 2/3] gnu: kdevelop: Update to 5.4.4. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Nov 2019 10:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38099@debbugs.gnu.org Received: via spool by 38099-submit@debbugs.gnu.org id=B38099.157312235910944 (code B ref 38099); Thu, 07 Nov 2019 10:26:02 +0000 Received: (at 38099) by debbugs.gnu.org; 7 Nov 2019 10:25:59 +0000 Received: from localhost ([127.0.0.1]:41693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iSezH-0002qP-8B for submit@debbugs.gnu.org; Thu, 07 Nov 2019 05:25:59 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:52850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iSezF-0002qG-QD for 38099@debbugs.gnu.org; Thu, 07 Nov 2019 05:25:58 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4780112RD5z1qqxZ for <38099@debbugs.gnu.org>; Thu, 7 Nov 2019 11:25:57 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4780112LkFz1qqkh for <38099@debbugs.gnu.org>; Thu, 7 Nov 2019 11:25:57 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 774nAUeYr0sI for <38099@debbugs.gnu.org>; Thu, 7 Nov 2019 11:25:56 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-52-182.dynamic.mnet-online.de [188.174.52.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <38099@debbugs.gnu.org>; Thu, 7 Nov 2019 11:25:56 +0100 (CET) Received: from lenashee.fritz.box (lenashee.fritz.box [192.168.110.31]) by hermia.goebel-consult.de (Postfix) with ESMTP id 021CB602B3 for <38099@debbugs.gnu.org>; Thu, 7 Nov 2019 11:25:53 +0100 (CET) From: Hartmut Goebel Date: Thu, 7 Nov 2019 11:25:49 +0100 Message-Id: <20191107102550.3721-2-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191107102550.3721-1-h.goebel@crazy-compilers.com> References: <20191107102550.3721-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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(kdevelop): Update to 5.4.4. [inputs] Remove kconfig, kdevplatform, libepoxy; Add apr, apr-util, astyle, attica, boost, kconfigwidgets, kservice, libkomparediff2, sonnet, subversion; structure and sort. [arguments]{add-include-path}: New phase. {wrap-executable}: Remove references to kdevplatform. --- gnu/packages/kde.scm | 74 ++++++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 6afc2c5eba..923af4381d 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages apr) #:use-module (gnu packages boost) + #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) @@ -140,7 +141,7 @@ projects.") (define-public kdevelop (package (name "kdevelop") - (version "5.1.2") + (version "5.4.4") (source (origin (method url-fetch) @@ -149,55 +150,80 @@ projects.") version ".tar.xz")) (sha256 (base32 - "1iqaq0ilijjigqb34v5wq9in6bnjs0p9cmgbygjmy53xhh3yhm5g")))) + "1cangz3ghz39sxxggp2p7kqy2ncgs0r3i19c341b5xbkcxw2y20h")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs - `(("kdevplatform" ,kdevplatform) - ("kdevelop-pg-qt" ,kdevelop-pg-qt) - ("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative) - ("qtquickcontrols" ,qtquickcontrols) - ("qtwebkit" ,qtwebkit) + `(("boost" ,boost) + ("clang" ,clang) + ("grantlee" ,grantlee) ("karchive" ,karchive) ("kcmutils" ,kcmutils) - ("kconfig" ,kconfig) + ("kcrash" ,kcrash) ("kdeclarative" ,kdeclarative) ("kdoctools" ,kdoctools) ("kguiaddons" ,kguiaddons) ("ki18n" ,ki18n) - ("kio" ,kio) ("kiconthemes" ,kiconthemes) + ("kio" ,kio) ;; not checked as requirement ("kitemmodels" ,kitemmodels) ("kitemviews" ,kitemviews) ("kjobwidgets" ,kjobwidgets) - ("knotifyconfig" ,knotifyconfig) ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) ("kparts" ,kparts) - ("kcrash" ,kcrash) - ("knewstuff" ,knewstuff) - ("krunner" ,krunner) - ("kxmlgui" ,kxmlgui) - ("libksysguard" ,libksysguard) - ("threadweaver" ,threadweaver) + ("kservice" ,kservice) ("ktexteditor" ,ktexteditor) ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libkomparediff2" ,libkomparediff2) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement + ("qtwebkit" ,qtwebkit) + ("shared-mime-info" ,shared-mime-info) + ("threadweaver" ,threadweaver) + + ;; recommendes + ("astyle" ,astyle) + ("kdevelop-pg-qt" ,kdevelop-pg-qt) + ("libksysguard" ,libksysguard) + + ;; optional + ("apr" ,apr) ; required for subversion support + ("apr-util" ,apr-util) ; required for subversion support + ("attica" ,attica) + ("kconfigwidgets" ,kconfigwidgets) + ("knewstuff" ,knewstuff) + ("krunner" ,krunner) ("plasma" ,plasma-framework) - ("grantlee" ,grantlee) - ("libepoxy" ,libepoxy) - ("clang" ,clang) - ("shared-mime-info" ,shared-mime-info))) + ("sonnet" ,sonnet) + ("subversion" ,subversion) + ;; TODO: OktetaGui, OktetaKastenControllers + ;; TODO: purpose + + ;; run-time packages - TODO + ;; ClazyStandalone + ;; Cppcheck + ;; heaptrack + ;; heaptrack_gui + ;; meson + )) (arguments `(#:phases (modify-phases %standard-phases + (add-before 'configure 'add-include-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cmake/modules/FindClang.cmake" + (("^\\s*PATHS \"\\$\\{CLANG_LIBRARY_DIRS\\}\"" line) + (string-append line " " (assoc-ref inputs "clang") "/lib"))))) (delete 'check) ;; there are some issues with the test suite (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (kdevplatform (assoc-ref inputs "kdevplatform")) (kio (assoc-ref inputs "kio")) (kcmutils (assoc-ref inputs "kcmutils")) (qtquickcontrols (assoc-ref inputs "qtquickcontrols")) @@ -207,12 +233,12 @@ projects.") (wrap-program (string-append out "/bin/kdevelop") `("XDG_DATA_DIRS" ":" prefix ,(map (lambda (s) (string-append s "/share")) - (list out kdevplatform kcmutils))) + (list out kcmutils))) `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = (,(string-append qtbase "/plugins/platforms"))) `("QT_PLUGIN_PATH" ":" prefix ,(map (lambda (s) (string-append s "/lib/plugins")) - (list out kdevplatform kio))) + (list out kio))) `("QML2_IMPORT_PATH" ":" prefix (,(string-append qtquickcontrols qml) ,(string-append qtdeclarative qml))))))))))