summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail-client/trojita/files/trojita-0.7-desktop-spec-namespace.patch57
-rw-r--r--mail-client/trojita/files/trojita-0.7-metainfo.patch26
-rw-r--r--mail-client/trojita/trojita-0.7-r5.ebuild88
3 files changed, 171 insertions, 0 deletions
diff --git a/mail-client/trojita/files/trojita-0.7-desktop-spec-namespace.patch b/mail-client/trojita/files/trojita-0.7-desktop-spec-namespace.patch
new file mode 100644
index 00000000000..27ffe2c1ad0
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-desktop-spec-namespace.patch
@@ -0,0 +1,57 @@
+From d080f7855707634867593163e7d20ac85694f5be Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano@tiscali.it>
+Date: Mon, 3 Oct 2016 22:29:22 +0200
+Subject: [PATCH] Add namespace to desktop and appdata files
+
+Add the organization namespace to the desktop and then appdata files,
+according the Desktop Entry specification.
+
+Change-Id: I4c400ef0f120c3f549c0e19b4e74550cc8b54be8
+---
+ CMakeLists.txt | 6 +++---
+ .../{trojita.appdata.xml => org.kde.trojita.appdata.xml} | 2 +-
+ src/Gui/{trojita.desktop => org.kde.trojita.desktop} | 0
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+ rename src/Gui/{trojita.appdata.xml => org.kde.trojita.appdata.xml} (99%)
+ rename src/Gui/{trojita.desktop => org.kde.trojita.desktop} (100%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index da40ddb3..d242eda0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -728,10 +728,10 @@ if(WITH_ABOOKADDRESSBOOK_PLUGIN)
+ endif()
+
+ if(WITH_DESKTOP)
+- copy_desktop_file_without_cruft("${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/trojita.desktop" "${CMAKE_CURRENT_BINARY_DIR}/trojita-DesktopGui.desktop")
++ copy_desktop_file_without_cruft("${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.desktop" "${CMAKE_CURRENT_BINARY_DIR}/org.kde.trojita-DesktopGui.desktop")
+ install(TARGETS trojita RUNTIME DESTINATION bin)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/trojita-DesktopGui.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/" RENAME trojita.desktop)
+- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/trojita.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata/")
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.trojita-DesktopGui.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/" RENAME org.kde.trojita.desktop)
++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata/")
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/icons/trojita.png DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps/")
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/icons/trojita.svg DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps/")
+ endif()
+diff --git a/src/Gui/trojita.appdata.xml b/src/Gui/org.kde.trojita.appdata.xml
+similarity index 99%
+rename from src/Gui/trojita.appdata.xml
+rename to src/Gui/org.kde.trojita.appdata.xml
+index 39548041..04f9873c 100644
+--- a/src/Gui/trojita.appdata.xml
++++ b/src/Gui/org.kde.trojita.appdata.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <component type="desktop">
+- <id>trojita.desktop</id>
++ <id>org.kde.trojita.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <name>Trojit√°</name>
+diff --git a/src/Gui/trojita.desktop b/src/Gui/org.kde.trojita.desktop
+similarity index 100%
+rename from src/Gui/trojita.desktop
+rename to src/Gui/org.kde.trojita.desktop
+--
+GitLab
+
diff --git a/mail-client/trojita/files/trojita-0.7-metainfo.patch b/mail-client/trojita/files/trojita-0.7-metainfo.patch
new file mode 100644
index 00000000000..705fe714376
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-metainfo.patch
@@ -0,0 +1,26 @@
+From 4706896bbc3d7d9189a64117b75c01399b5271b9 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano@tiscali.it>
+Date: Mon, 3 Oct 2016 22:30:22 +0200
+Subject: [PATCH] Use the new directory for metadata (metainfo) files
+
+Change-Id: I06d721c6e082166fc303435b39e42c9f358ecca9
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d242eda0..9393b19c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -731,7 +731,7 @@ if(WITH_DESKTOP)
+ copy_desktop_file_without_cruft("${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.desktop" "${CMAKE_CURRENT_BINARY_DIR}/org.kde.trojita-DesktopGui.desktop")
+ install(TARGETS trojita RUNTIME DESTINATION bin)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.trojita-DesktopGui.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/" RENAME org.kde.trojita.desktop)
+- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata/")
++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo/")
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/icons/trojita.png DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps/")
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/icons/trojita.svg DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps/")
+ endif()
+--
+GitLab
+
diff --git a/mail-client/trojita/trojita-0.7-r5.ebuild b/mail-client/trojita/trojita-0.7-r5.ebuild
new file mode 100644
index 00000000000..c746c83d059
--- /dev/null
+++ b/mail-client/trojita/trojita-0.7-r5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+ KEYWORDS="amd64 x86"
+fi
+inherit cmake virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="+crypt +dbus debug +password test +zlib"
+
+REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ zlib? ( virtual/pkgconfig )
+"
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtsvg:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ crypt? (
+ >=app-crypt/gpgme-1.8.0[cxx,qt5]
+ dev-libs/mimetic
+ )
+ dbus? ( dev-qt/qtdbus:5 )
+ password? ( dev-libs/qtkeychain[qt5(+)] )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+
+DOCS=( README LICENSE )
+
+PATCHES=(
+ "${FILESDIR}/${P}-gpgme.patch"
+ "${FILESDIR}/${P}-gpg-tests.patch"
+ "${FILESDIR}/${P}-qt-5.11b3.patch"
+ "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058
+ "${FILESDIR}/${P}-qt-5.15.patch"
+ "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697
+ "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
+ "${FILESDIR}/${P}-cmake-cxx11.patch"
+ "${FILESDIR}/${P}-desktop-spec-namespace.patch"
+ "${FILESDIR}/${P}-metainfo.patch" # bug 730140
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # the build system is taking a look at `git describe ... --dirty` and
+ # gentoo's modifications to CMakeLists.txt break these
+ sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_CRYPTO_MESSAGES=$(usex crypt)
+ -DWITH_GPGMEPP=$(usex crypt)
+ -DWITH_MIMETIC=$(usex crypt)
+ -DWITH_DBUS=$(usex dbus)
+ -DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
+ -DWITH_TESTS=$(usex test)
+ -DWITH_ZLIB=$(usex zlib)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}