From patchwork Wed Mar 4 09:21:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 20515 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 2149527BBEA; Wed, 4 Mar 2020 09:22:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 56A8527BBE4 for ; Wed, 4 Mar 2020 09:22:42 +0000 (GMT) Received: from localhost ([::1]:59480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9QEj-0005LM-Tp for patchwork@mira.cbaines.net; Wed, 04 Mar 2020 04:22:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55636) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9QEB-0004oE-DL for guix-patches@gnu.org; Wed, 04 Mar 2020 04:22:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9QE8-0004bu-KD for guix-patches@gnu.org; Wed, 04 Mar 2020 04:22:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34405) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9QE8-0004bb-GI for guix-patches@gnu.org; Wed, 04 Mar 2020 04:22:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j9QE8-0007xD-9v for guix-patches@gnu.org; Wed, 04 Mar 2020 04:22:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39896] [PATCH 06/14] gnu: Add kdepim-runtime. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Mar 2020 09:22:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39896@debbugs.gnu.org Received: via spool by 39896-submit@debbugs.gnu.org id=B39896.158331372130523 (code B ref 39896); Wed, 04 Mar 2020 09:22:04 +0000 Received: (at 39896) by debbugs.gnu.org; 4 Mar 2020 09:22:01 +0000 Received: from localhost ([127.0.0.1]:40370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9QE4-0007wA-HX for submit@debbugs.gnu.org; Wed, 04 Mar 2020 04:22:00 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:53641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9QE0-0007vy-EZ for 39896@debbugs.gnu.org; Wed, 04 Mar 2020 04:21:59 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 48XT0h0Wj8z1qs0m for <39896@debbugs.gnu.org>; Wed, 4 Mar 2020 10:21:56 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 48XT0h0QX3z1r0bd for <39896@debbugs.gnu.org>; Wed, 4 Mar 2020 10:21:56 +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 pyKA8bAJySQu for <39896@debbugs.gnu.org>; Wed, 4 Mar 2020 10:21:54 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-55-76.dynamic.mnet-online.de [188.174.55.76]) (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 <39896@debbugs.gnu.org>; Wed, 4 Mar 2020 10:21:54 +0100 (CET) Received: from lenashee.fritz.box (lenashee.fritz.box [192.168.110.28]) by hermia.goebel-consult.de (Postfix) with ESMTP id 0E456605D9 for <39896@debbugs.gnu.org>; Wed, 4 Mar 2020 10:24:29 +0100 (CET) From: Hartmut Goebel Date: Wed, 4 Mar 2020 10:21:25 +0100 Message-Id: X-Mailer: git-send-email 2.21.1 In-Reply-To: References: 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-pim.scm (kdepim-runtime): New variable. * gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-pim.scm | 79 +++++++++++++++++++ ...m-runtime-Fix-missing-link-libraries.patch | 42 ++++++++++ 3 files changed, 122 insertions(+) create mode 100644 gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2c204b436..e200f30419 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1049,6 +1049,7 @@ dist_patch_DATA = \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ + %D%/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ %D%/packages/patches/kiki-makefile.patch \ %D%/packages/patches/kiki-missing-includes.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 42feea9830..4b41dea383 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -523,6 +523,85 @@ for KDE PIM.") (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public kdepim-runtime + (package + (name "kdepim-runtime") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kdepim-runtime-" version ".tar.xz")) + (sha256 + (base32 "1skid9v6viw379mwhmb4xjh6bylv8wg7cy56kkbcpsmpars9cwr6")) + (patches (search-patches + "kdepim-runtime-Fix-missing-link-libraries.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("kdoctools" ,kdoctools) + ("libxslt" ,libxslt) + ("shared-mime-info" ,shared-mime-info))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-notes" ,akonadi-notes) + ("boost" ,boost) + ("cyrus-sasl" ,cyrus-sasl) + ("kalarmcal" ,kalarmcal) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kdav" ,kdav) + ("kdbusaddons" ,kdbusaddons) + ("kholidays" ,kholidays) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmailtransport" ,kmailtransport) + ("kmbox" ,kmbox) + ("kmime" ,kmime) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("kross" ,kross) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwindowsystem" ,kwindowsystem) + ("libkgapi" ,libkgapi) + ;; TODO: libkolab + ("qca" ,qca) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtnetworkauth" ,qtnetworkauth) + ("qtspeech" ,qtspeech) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine) + ("qtxmlpatterns" ,qtxmlpatterns))) + (arguments + ;; TODO: 5/45 tests fail for quite different reasons, even with + ;; "offscreen" and dbus + `(#:tests? #f)) + (home-page "https://cgit.kde.org/kdepim-runtime.git") + (synopsis "Runtime components for Akonadi KDE") + (description "This package contains Akonadi agents written using KDE +Development Platform libraries. Any package that uses Akonadi should probably +pull this in as a dependency. The kres-bridges is also parts of this +package.") + (license ;; Files vary a lot regarding the license. GPL2+ and LGPL2.1+ + ;; have been used in those I checked. But the archive also includes + ;; license texts for GPL3 and AGPL3. + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kgpg (package (name "kgpg") diff --git a/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch b/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch new file mode 100644 index 0000000000..13345c0038 --- /dev/null +++ b/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch @@ -0,0 +1,42 @@ +From b84c4ba97cecf7304e99cafdd8a9c5866ce27050 Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Tue, 21 Jan 2020 23:33:50 +0100 +Subject: [PATCH] Fix missing link libraries. + +See + +These are only actually missing if the libraries reside in different +prefixes, as it is the case in Guix or Nix. +--- + resources/ews/test/CMakeLists.txt | 1 + + resources/facebook/CMakeLists.txt | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/resources/ews/test/CMakeLists.txt b/resources/ews/test/CMakeLists.txt +index b20eddcb8..6355eb994 100644 +--- a/resources/ews/test/CMakeLists.txt ++++ b/resources/ews/test/CMakeLists.txt +@@ -35,6 +35,7 @@ qt5_add_resources(isolatestestcommon_RSRCS isolatedtestcommon.qrc) + add_library(isolatedtestcommon STATIC ${isolatestestcommon_SRCS}) + target_link_libraries(isolatedtestcommon + KF5::AkonadiCore ++ KF5::AkonadiMime + Qt5::Core + Qt5::Network + Qt5::Test +diff --git a/resources/facebook/CMakeLists.txt b/resources/facebook/CMakeLists.txt +index bdd5eeaa7..27a9c83c1 100644 +--- a/resources/facebook/CMakeLists.txt ++++ b/resources/facebook/CMakeLists.txt +@@ -21,7 +21,8 @@ add_library(facebookresourcelib STATIC ${fbresource_SRCS}) + + target_link_libraries(facebookresourcelib + KF5::KIOWidgets ++ KF5::AkonadiCore + KF5::IconThemes + KF5::I18n + KF5::ConfigGui + KF5::CalendarCore +-- +2.21.1 +