From 6839095af7f6c8a8d5ad481db22cd4ece0a1b5e3 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 21 Jan 2020 16:44:18 +0100 Subject: gnu: mrustc: Update to 0.8.1. * gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/rust.scm (mrustc): Update to 0.8.1. [source](patches): Remove it. [native-inputs]: Add zlib. --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 9dd67ddd5c..bbafa062ed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1180,7 +1180,6 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-tracelogger.patch \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ - %D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mumps-shared-libseq.patch \ -- cgit v1.2.3 From 43190ac64c5181841d68beade4d19e792f4f38a2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 22:37:34 +0100 Subject: gnu: evolution-data-server: Fix build with libical 3.0.7. * gnu/packages/patches/evolution-data-server-libical-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (evolution-data-server)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 +- .../evolution-data-server-libical-compat.patch | 36 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/evolution-data-server-libical-compat.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 448e70aa38..af030781a5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -838,6 +838,7 @@ dist_patch_DATA = \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/evolution-data-server-locales.patch \ + %D%/packages/patches/evolution-data-server-libical-compat.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cadd4d0655..ba5181c756 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6256,7 +6256,8 @@ (define-public evolution-data-server (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "evolution-data-server-locales.patch")) + (patches (search-patches "evolution-data-server-locales.patch" + "evolution-data-server-libical-compat.patch")) (sha256 (base32 "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3")))) diff --git a/gnu/packages/patches/evolution-data-server-libical-compat.patch b/gnu/packages/patches/evolution-data-server-libical-compat.patch new file mode 100644 index 0000000000..a988519ea0 --- /dev/null +++ b/gnu/packages/patches/evolution-data-server-libical-compat.patch @@ -0,0 +1,36 @@ +Prevent test failure and possible data loss due to API change in libical 3.0.7. + +https://gitlab.gnome.org/GNOME/evolution-data-server/issues/185 +https://lists.infradead.org/pipermail/libical-devel/2020-January/000907.html + +Adapted from upstream: + +https://gitlab.gnome.org/GNOME/evolution-data-server/commit/77384ab552c19bf374dbeda53dc37f98d07bd4ec + +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,7 @@ + + set(gcr_minimum_version 3.4) + set(libgdata_minimum_version 0.15.1) +-set(libical_minimum_version 2.0) ++set(libical_minimum_version 3.0.7) + set(libsecret_minimum_version 0.5) + set(libxml_minimum_version 2.0.0) + set(sqlite_minimum_version 3.7.17) +diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c +index 7501f2a43dcc3af91e93e89751caf76e77c2ac23..93f4806ba2c5193f746e9fae5bf74d08ad05f8bf 100644 +--- a/src/calendar/libedata-cal/e-cal-meta-backend.c ++++ b/src/calendar/libedata-cal/e-cal-meta-backend.c +@@ -3958,9 +3958,8 @@ + gchar *base64; + + base64 = g_base64_encode ((const guchar *) content, len); +- new_attach = icalattach_new_from_data (base64, NULL, NULL); ++ new_attach = icalattach_new_from_data (base64, (GFunc) g_free, NULL); + g_free (content); +- g_free (base64); + + ecmb_remove_all_but_filename_parameter (prop); + -- cgit v1.2.3 From af204f933f11928aacb6747cf94dfe90665cf614 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 22:02:28 +0100 Subject: gnu: Add dolphin. * gnu/packages/kde-system.scm: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-systemtools.scm | 88 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 gnu/packages/kde-systemtools.scm (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 7267bb79de..209bc7abf3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -285,6 +285,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/kde-frameworks.scm \ %D%/packages/kde-multimedia.scm \ %D%/packages/kde-plasma.scm \ + %D%/packages/kde-systemtools.scm \ %D%/packages/kde-utils.scm \ %D%/packages/kerberos.scm \ %D%/packages/key-mon.scm \ diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm new file mode 100644 index 0000000000..11228630ab --- /dev/null +++ b/gnu/packages/kde-systemtools.scm @@ -0,0 +1,88 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2020 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages kde-systemtools) + #:use-module (guix build-system qt) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages kde) + #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages qt) + #:use-module (gnu packages ruby)) + +(define-public dolphin + (package + (name "dolphin") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/dolphin-" version ".tar.xz")) + (sha256 + (base32 "0klxyvcj1bmzpsyahj9kq3smvwzww30pjk5c90j6jpf14hizawfy")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools) + ("ruby" ,ruby) + ("ruby-test-unit" ,ruby-test-unit))) + (inputs + `(("baloo" ,baloo) + ("baloo-widgets" ,baloo-widgets) + ("kactivities" ,kactivities) + ("kbookmarks" ,kbookmarks) + ("kcmutils" ,kcmutils) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kinit" ,kinit) + ("kio" ,kio) + ("knewstuff" ,knewstuff) + ("knotifications" ,knotifications) + ("kparts" ,kparts) + ("ktextwidgets" ,ktextwidgets) + ("kwindowsystem" ,kwindowsystem) + ("oxygen-icons" ,oxygen-icons) ;; default icon set + ("phonon" ,phonon) + ("qtbase" ,qtbase) + ("solid" ,solid))) + (arguments + `(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen + (home-page "https://kde.org/applications/system/org.kde.dolphin") + (synopsis "File manager for KDE") + (description "Dolphin is a file manager for KDE focusing on usability. +The main features of Dolphin are: +@itemize +@item Navigation bar for URLs, which allows to navigate quickly + through the file hierarchy. +@item View properties are remembered for each folder. +@item Split of views is supported. +@item Network transparency. +@item Undo/redo functionality. +@item Renaming of a variable number of selected items in one step. +@end itemize") + (license ;; GPL for programs, FDL for documentation + (list license:gpl2+ license:fdl1.2+)))) -- cgit v1.2.3 From e35b50ecdd553f3fac4d16db311149dbcc3028fe Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 19:05:29 +0100 Subject: gnu: Add akonadi. * gnu/packages/kde-pim.scm, gnu/packages/patches/akonadi-paths.patch, gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch gnu/packages/patches/akonadi-timestamps.patch: New files. * gnu/local.mk (MODULES): Add kde-pim.scm. (dist_patch): Add the patches. --- gnu/local.mk | 4 + gnu/packages/kde-pim.scm | 112 +++++++++++++++++++++ ...ert-Make-installation-properly-relocatabl.patch | 49 +++++++++ gnu/packages/patches/akonadi-paths.patch | 49 +++++++++ gnu/packages/patches/akonadi-timestamps.patch | 14 +++ 5 files changed, 228 insertions(+) create mode 100644 gnu/packages/kde-pim.scm create mode 100644 gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch create mode 100644 gnu/packages/patches/akonadi-paths.patch create mode 100644 gnu/packages/patches/akonadi-timestamps.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 209bc7abf3..912809b74d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -284,6 +284,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/kde.scm \ %D%/packages/kde-frameworks.scm \ %D%/packages/kde-multimedia.scm \ + %D%/packages/kde-pim.scm \ %D%/packages/kde-plasma.scm \ %D%/packages/kde-systemtools.scm \ %D%/packages/kde-utils.scm \ @@ -707,6 +708,9 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/akonadi-paths.patch \ + %D%/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch \ + %D%/packages/patches/akonadi-timestamps.patch \ %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm new file mode 100644 index 0000000000..3bf3e96a02 --- /dev/null +++ b/gnu/packages/kde-pim.scm @@ -0,0 +1,112 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2019, 2020 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages kde-pim) + #:use-module (guix build-system qt) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages boost) + #:use-module (gnu packages databases) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gnome) + #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages qt) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages xml)) + +(define-public akonadi + (package + (name "akonadi") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/akonadi-" version ".tar.xz")) + (sha256 + (base32 "0v7f1049wjnqxhwxr1443wc2cfbdqmf15xcwjz3j1m0vgdva9pyg")) + (patches (search-patches + "akonadi-paths.patch" + "akonadi-timestamps.patch" + "akonadi-Revert-Make-installation-properly-relocatabl.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools) + ("shared-mime-info" ,shared-mime-info))) + (inputs + `(("boost" ,boost) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdesignerplugin" ,kdesignerplugin) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ;; Do NOT add mysql or postgresql to the inputs. Otherwise the binaries + ;; and wrapped files will refer to them, even if the user choices none + ;; of these. Executables are searched on $PATH then. + ("qtbase" ,qtbase) + ("sqlite" ,sqlite))) + (arguments + `(#:tests? #f ;; TODO 135/167 tests fail + #:configure-flags '("-DDATABASE_BACKEND=SQLITE") ; lightweight + #:modules ((ice-9 textual-ports) + ,@%qt-build-system-modules) + #:phases + (modify-phases (@ (guix build qt-build-system) %standard-phases) + (add-before 'configure 'add-definitions + (lambda _ + (let ((out (assoc-ref %outputs "out")) + (mysql (assoc-ref %build-inputs "mysql")) + (pgsql (assoc-ref %build-inputs "postgresql"))) + (with-output-to-file "CMakeLists.txt.new" + (lambda _ + (display + (string-append + "add_compile_definitions(\n" + "NIX_OUT=\"" out "\"\n" + ;; pin binaries for mysql backend + ")\n\n")) + (display + (call-with-input-file "CMakeLists.txt" + get-string-all)))) + (rename-file "CMakeLists.txt.new" "CMakeLists.txt")) + #t))))) + (home-page "https://kontact.kde.org/components/akonadi.html") + (synopsis "Extensible cross-desktop storage service for PIM") + (description "Akonadi is an extensible cross-desktop Personal Information +Management (PIM) storage service. It provides a common framework for +applications to store and access mail, calendars, addressbooks, and other PIM +data. + +This package contains the Akonadi PIM storage server and associated +programs.") + (license license:fdl1.2+))) diff --git a/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch b/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch new file mode 100644 index 0000000000..c3964c5c05 --- /dev/null +++ b/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch @@ -0,0 +1,49 @@ +From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 +From: gnidorah +Date: Fri, 22 Dec 2017 17:36:03 +0300 +Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" + +This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. +--- + CMakeLists.txt | 3 --- + KF5AkonadiConfig.cmake.in | 6 +++--- + 2 files changed, 3 insertions(+), 6 deletions(-) + +Index: akonadi-19.08.0/CMakeLists.txt +=================================================================== +--- akonadi-19.08.0.orig/CMakeLists.txt ++++ akonadi-19.08.0/CMakeLists.txt +@@ -306,9 +306,6 @@ configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR +- AKONADI_INCLUDE_DIR +- KF5Akonadi_DATA_DIR + ) + + install(FILES +Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in +=================================================================== +--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in ++++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in +@@ -26,8 +26,8 @@ if(BUILD_TESTING) + find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") + endif() + +-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") +-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") ++set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") ++set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") + + find_dependency(Boost "@Boost_MINIMUM_VERSION@") + +@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako + include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) + + # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed +-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") ++set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") + + #################################################################################### + # CMAKE_AUTOMOC diff --git a/gnu/packages/patches/akonadi-paths.patch b/gnu/packages/patches/akonadi-paths.patch new file mode 100644 index 0000000000..da250ee9e8 --- /dev/null +++ b/gnu/packages/patches/akonadi-paths.patch @@ -0,0 +1,49 @@ +This is based on the respectve patch from NixPkgs, but with the parts pinning +mysql and postgresql executables removed. The our package definition on why. + + +Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp ++++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp +@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, + mStorageController = new Akonadi::ProcessControl; + mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld + connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); +- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + + if (mAgentServerEnabled) { + mAgentServer = new Akonadi::ProcessControl; + connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); +- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + } + } + +Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp ++++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A + } else { + Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); + const QStringList arguments = QStringList() << executable << identifier(); +- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher")); ++ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); + mController->start(agentLauncherExec, arguments); + } + return true; +Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer( + #endif + + // generate config file +- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); ++ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); + const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); + const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); + if (globalConfig.isEmpty()) { diff --git a/gnu/packages/patches/akonadi-timestamps.patch b/gnu/packages/patches/akonadi-timestamps.patch new file mode 100644 index 0000000000..e299a6991f --- /dev/null +++ b/gnu/packages/patches/akonadi-timestamps.patch @@ -0,0 +1,14 @@ +Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer( + bool confUpdate = false; + QFile actualFile(actualConfig); + // update conf only if either global (or local) is newer than actual +- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) || +- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { ++ if (true) { + QFile globalFile(globalConfig); + QFile localFile(localConfig); + if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { -- cgit v1.2.3 From 533c95bc17cd253455be077a54b1435d0c60950c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 8 Dec 2019 20:06:14 +0100 Subject: gnu: Add choqok. * gnu/packages/kde-internet.scm: New file. * gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch: New file. * gnu/lokal.mk: Add them. --- gnu/local.mk | 2 + gnu/packages/kde-internet.scm | 94 ++++++++++++++++++++++ .../choqok-Fix-building-under-Qt-5.13.patch | 89 ++++++++++++++++++++ 3 files changed, 185 insertions(+) create mode 100644 gnu/packages/kde-internet.scm create mode 100644 gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 912809b74d..da3291fdc6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -283,6 +283,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/kawa.scm \ %D%/packages/kde.scm \ %D%/packages/kde-frameworks.scm \ + %D%/packages/kde-internet.scm \ %D%/packages/kde-multimedia.scm \ %D%/packages/kde-pim.scm \ %D%/packages/kde-plasma.scm \ @@ -771,6 +772,7 @@ dist_patch_DATA = \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/ceph-volume-respect-PATH.patch \ %D%/packages/patches/chmlib-inttypes.patch \ + %D%/packages/patches/choqok-Fix-building-under-Qt-5.13.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch \ diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm new file mode 100644 index 0000000000..4b382df2e7 --- /dev/null +++ b/gnu/packages/kde-internet.scm @@ -0,0 +1,94 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2019, 2020 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages kde-internet) + #:use-module (guix build-system qt) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages kde) + #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-pim) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) + #:use-module (gnu packages web)) + +(define-public choqok + (package + (name "choqok") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/choqok/" + (version-major+minor version) + "/src/choqok-" version ".tar.xz")) + (sha256 + (base32 "03ri4y1wzyqlixnhczsls5gmy7jzzm67bb5gz8bav51ngc32fxca")) + (patches (search-patches "choqok-Fix-building-under-Qt-5.13.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools) + ("pkg-config" ,pkg-config))) + (inputs + `(("attica" ,attica) + ("kcmutils" ,kcmutils) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kdewebkit" ,kdewebkit) + ("kemoticons" ,kemoticons) + ("kglobalaccel" ,kglobalaccel) + ("kguiaddons" ,kguiaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kparts" ,kparts) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ;; TODO: telepathy + ("oxygen-icons" ,oxygen-icons) ; default icon set + ("qca" ,qca) + ("qoauth" ,qoauth) + ("qtbase" ,qtbase) + ("qtwebkit" ,qtwebkit) + ("sonnet" ,sonnet))) + (home-page "https://kde.org/applications/internet/org.kde.choqok") + (synopsis "Micro-Blogging Client") + (description "Choqok is a fast, efficient and simple to use micro-blogging +client for KDE. It currently supports the twitter.com and identi.ca +microblogging services. + +Other notable features include: +@itemize +@item Support for user + friends time-lines. +@item Support for @Reply time-lines. +@item Support for sending and receiving direct messages. +@item Twitpic.com integration. +@item The ability to use multiple accounts simultaneously. +@item Support for search APIs for all services. +@item KWallet integration. +@item Support for automatic shortening urls with more than 30 characters. +@item Support for configuring status lists appearance. +@end itemize") + (license license:gpl3+))) diff --git a/gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch b/gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch new file mode 100644 index 0000000000..4250106a19 --- /dev/null +++ b/gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch @@ -0,0 +1,89 @@ +Add QMap include to fix building under Qt 5.13 + +This combines several patches which all add the same missing include: +- e13ab06f65a4e8b6259bccda1401abb9c1c9fdca +- 546ede9ef712bb1b156a55ce30df81c3203dde61 +- 08fb06b63a78888e6703de6ac1a4fd6a0e2791eb +- bef6784596bf0b41287ebad81f138e1c8c2a6be2 + +Include is no longer added transitively. +--- + +--- a/plugins/betternotify/notify.h ++++ b/plugins/betternotify/notify.h +@@ -23,6 +23,7 @@ + #ifndef NOTIFY_H + #define NOTIFY_H + ++#include + #include + #include + #include +--- a/plugins/untiny/untiny.h ++++ b/plugins/untiny/untiny.h +@@ -27,6 +27,7 @@ + + #include "plugin.h" + ++#include + #include + #include + #include +--- a/plugins/uploaders/flickr/flickr.h ++++ b/plugins/uploaders/flickr/flickr.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + /** + @author Andrey Esin \ + */ +diff --git a/plugins/uploaders/imageshack/imageshack.h b/plugins/uploaders/imageshack/imageshack.h +index d9ddc88..63d0e3f 100644 +--- a/plugins/uploaders/imageshack/imageshack.h ++++ b/plugins/uploaders/imageshack/imageshack.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + /** + @author Mehrdad Momeny \ + */ +--- a/plugins/uploaders/mobypicture/mobypicture.h ++++ b/plugins/uploaders/mobypicture/mobypicture.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + class KJob; + + class Mobypicture : public Choqok::Uploader +--- a/plugins/uploaders/posterous/posterous.h ++++ b/plugins/uploaders/posterous/posterous.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + class KJob; + + class Posterous : public Choqok::Uploader +--- a/plugins/uploaders/twitgoo/twitgoo.h ++++ b/plugins/uploaders/twitgoo/twitgoo.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + class KJob; + + class Twitgoo : public Choqok::Uploader +-- -- cgit v1.2.3 From 579aa350eddcf6e645b2455d845e7caad6163ca9 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 8 Dec 2019 23:09:54 +0100 Subject: gnu: Add konversation. * gnu/packages/kde-internet.scm (konversation): New variable. * gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch: New file. * gnu/lokal.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-internet.scm | 72 ++++++++++++++++++++++ .../konversation-Fix-build-with-Qt-5.11.patch | 24 ++++++++ 3 files changed, 97 insertions(+) create mode 100644 gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index da3291fdc6..98b7395598 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1071,6 +1071,7 @@ dist_patch_DATA = \ %D%/packages/patches/kodi-increase-test-timeout.patch \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/kodi-skip-test-449.patch \ + %D%/packages/patches/konversation-Fix-build-with-Qt-5.11.patch \ %D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/lcalc-default-parameters-1.patch \ %D%/packages/patches/lcalc-default-parameters-2.patch \ diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 5f21b99685..54ca9250ae 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -155,3 +155,75 @@ (define-public kget This package is part of the KDE networking module.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + +(define-public konversation + (package + (name "konversation") + (version "1.7.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/konversation/" version + "/src/konversation-" version ".tar.xz")) + (sha256 + (base32 "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0")) + (patches (search-patches "konversation-Fix-build-with-Qt-5.11.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("karchive" ,karchive) + ("kbookmarks" ,kbookmarks) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kemoticons" ,kemoticons) + ("kglobalaccel" ,kglobalaccel) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidletime" ,kidletime) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kparts" ,kparts) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("oxygen-icons" ,oxygen-icons) ; default icon set + ("phonon" ,phonon) + ("qtbase" ,qtbase) + ("qca" ,qca) + ("solid" ,solid) + ("sonnet" ,sonnet))) + (home-page "https://kde.org/applications/internet/org.kde.konversations") + (synopsis "Graphical Internet Relay Chat (IRC) client for KDE") + (description "Konversation is a graphical Internet Relay Chat client (IRC) +with KDE support. + +Features are: +@itemize +@item Standard IRC features +@item SSL server support +@item Bookmarking support +@item Easy to use graphical user interface +@item Multiple servers and channels in one single window +@item DCC file transfer with resume support +@item Multiple identities for different servers +@item Text decorations and colors +@item Pattern-based message highlighting and OnScreen Display notifications +@item Automatic UTF-8 detection +@item Per channel encoding support +@item Theme support for nick icons +@item Highly configurable +@item Multi-language scripting support (with DCOP) +@item Customizable command aliases +@item NickServ-aware log-on (for registered nicknames) +@item Smart logging +@item Traditional or enhanced-shell-style nick completion +@end itemize") + (license ;; GPL for programs, FDL for documentation + (list license:gpl2+ license:fdl1.2+)))) diff --git a/gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch b/gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch new file mode 100644 index 0000000000..d9d29bbd1a --- /dev/null +++ b/gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch @@ -0,0 +1,24 @@ +From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Sun, 21 Jul 2019 09:14:32 +0200 +Subject: Fix build with Qt 5.13 + +--- + src/irc/outputfilter.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp +index f9e6253..45d11fb 100644 +--- a/src/irc/outputfilter.cpp ++++ b/src/irc/outputfilter.cpp +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +cgit v1.1 + -- cgit v1.2.3