import from community

3 files changed, 185 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..b4a1caf0a3f4
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,36 @@
+pkgbase = trojita
+	pkgdesc = A Qt IMAP email client
+	pkgver = 0.7
+	pkgrel = 7
+	url = https://trojita.flaska.net
+	arch = x86_64
+	license = GPL
+	makedepends = cmake
+	makedepends = qt5-tools
+	makedepends = pinentry
+	depends = hicolor-icon-theme
+	depends = qt5-webkit
+	depends = qtkeychain-qt5
+	depends = qt5-svg
+	depends = qgpgme
+	depends = mimetic
+	options = debug
+	source = https://downloads.sourceforge.net/trojita/trojita-0.7.tar.xz
+	source = https://downloads.sourceforge.net/trojita/trojita-0.7.tar.xz.asc
+	source = trojita-gpgme.patch
+	source = trojita-fix-crash.patch::https://invent.kde.org/pim/trojita/-/commit/cf2364b8.patch
+	source = trojita-qt5.15.patch::https://invent.kde.org/pim/trojita/-/commit/2869c385.patch
+	source = trojita-desktop.patch::https://invent.kde.org/pim/trojita/-/commit/d080f785.patch
+	source = trojita-highdpi.patch::https://invent.kde.org/pim/trojita/-/commit/eecc474a.patch
+	source = trojita-wayland.patch::https://invent.kde.org/pim/trojita/-/commit/81e84200.patch
+	validpgpkeys = 61AB87D6F66CE2FCD2D2E1F56A65DFA844722517
+	sha256sums = e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9
+	sha256sums = SKIP
+	sha256sums = 9f99bd2d91cd3b345e2bf52c0d9929ea81147f6578b774c5d2b4f2e86aade2a8
+	sha256sums = 3b97c6b60a986ca1ec5f505589600f6ed88a0ddd45960815a64c5f63b7e70d98
+	sha256sums = 7d0a506f16bd0bd112decfb25927fd19d77e53c71ac94e1e06ffddb16381d62e
+	sha256sums = f7a72c2fa4c8e2bd592a705781a32f6148198f7b43f603e2e0e704b92b38f2c5
+	sha256sums = a2ebc9ce38e47f8697ca3cbfd17a227dfd0f8c842803978f082857172de5fc42
+	sha256sums = 70646a2d1280f2eb56d166993ea9dee58f31264db9cf7fa1ff9ba469e9d9d73a
+
+pkgname = trojita
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..eb0f2fe80d7c
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Antonio Rojas <arojas@archlinux.org>
+# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=trojita
+pkgver=0.7
+pkgrel=7
+pkgdesc='A Qt IMAP email client'
+arch=(x86_64)
+url='https://trojita.flaska.net'
+license=(GPL)
+makedepends=(cmake qt5-tools pinentry)
+depends=(hicolor-icon-theme qt5-webkit qtkeychain-qt5 qt5-svg qgpgme mimetic)
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
+        trojita-gpgme.patch
+        trojita-fix-crash.patch::"https://invent.kde.org/pim/trojita/-/commit/cf2364b8.patch"
+        trojita-qt5.15.patch::"https://invent.kde.org/pim/trojita/-/commit/2869c385.patch"
+        trojita-desktop.patch::"https://invent.kde.org/pim/trojita/-/commit/d080f785.patch"
+        trojita-highdpi.patch::"https://invent.kde.org/pim/trojita/-/commit/eecc474a.patch"
+        trojita-wayland.patch::"https://invent.kde.org/pim/trojita/-/commit/81e84200.patch")
+sha256sums=('e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9'
+            'SKIP'
+            '9f99bd2d91cd3b345e2bf52c0d9929ea81147f6578b774c5d2b4f2e86aade2a8'
+            '3b97c6b60a986ca1ec5f505589600f6ed88a0ddd45960815a64c5f63b7e70d98'
+            '7d0a506f16bd0bd112decfb25927fd19d77e53c71ac94e1e06ffddb16381d62e'
+            'f7a72c2fa4c8e2bd592a705781a32f6148198f7b43f603e2e0e704b92b38f2c5'
+            'a2ebc9ce38e47f8697ca3cbfd17a227dfd0f8c842803978f082857172de5fc42'
+            '70646a2d1280f2eb56d166993ea9dee58f31264db9cf7fa1ff9ba469e9d9d73a')
+validpgpkeys=('61AB87D6F66CE2FCD2D2E1F56A65DFA844722517')
+options=(debug)
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < trojita-gpgme.patch # suport gmgpe's gpgme++
+  patch -d $pkgname-$pkgver -p1 < trojita-fix-crash.patch # Fix crash when opening attachments
+  patch -d $pkgname-$pkgver -p1 < trojita-qt5.15.patch # Fix build with Qt 5.15
+  patch -d $pkgname-$pkgver -p1 < trojita-desktop.patch # Fix taskbar item on Wayland
+  patch -d $pkgname-$pkgver -p1 < trojita-highdpi.patch # Enable high DPI support
+  patch -d $pkgname-$pkgver -p1 < trojita-wayland.patch # Fix icon on Wayland
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_TESTS=OFF
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}
diff --git a/trojita-gpgme.patch b/trojita-gpgme.patch
new file mode 100644
index 000000000000..bfbd9ee012e1
--- /dev/null
+++ b/trojita-gpgme.patch
@@ -0,0 +1,99 @@
+From e8393376969caf27b0c976d01645edd023c14df2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
+Date: Sat, 17 Dec 2016 13:26:56 +0100
+Subject: Support both vanilla gpgme and KDE Frameworks gpgmepp
+
+KF5Gpgmepp has been merged into GPGME (since 1.7.0) and will not see
+any further releases with KDE Applications. We still care about older
+distros (and that means older gpgme, and therefore a need for extra
+bindings).
+
+Stuff is a bit more complicated because 1.7.x is not thread-safe by
+default. Given that gpgme upstream start making their releases pretty
+often this fall, it seems safe to go with 1.8.0.
+
+Change-Id: Ia2f05bd8ed2a894435ca328a886325366ba41622
+Inspired-By: Heiko Becker <heirecka@exherbo.org>
+Inspired-By: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Fixed-By: Caspar Schutijser <caspar@schutijser.com>
+---
+ CMakeLists.txt | 30 ++++++++++++++++++------------
+ 1 file changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e129c1..3346142 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,8 @@ trojita_option(WITH_ZLIB "Build with zlib library" AUTO)
+ trojita_option(WITH_SHARED_PLUGINS "Enable shared dynamic plugins" ON)
+ trojita_option(BUILD_TESTING "Build tests" ON)
+ trojita_option(WITH_MIMETIC "Build with client-side MIME parsing" AUTO)
+-trojita_option(WITH_GPGMEPP "Build with the GpgME++ library for cryptography" AUTO)
++trojita_option(WITH_GPGMEPP "Use GpgME's native C++ bindings" AUTO)
++trojita_option(WITH_KF5_GPGMEPP "Use legacy discontinued GpgME++ library from KDE frameworks" AUTO)
+ 
+ if(WIN32)
+     trojita_option(WITH_NSIS "Build Windows NSIS installer" AUTO "WITH_DESKTOP")
+@@ -84,8 +85,13 @@ trojita_plugin_option(WITH_QTKEYCHAIN_PLUGIN "Build Qtkeychain password plugin"
+ trojita_find_package(Git "" "" "" "")
+ 
+ trojita_find_package(Mimetic "" "http://www.codesink.org/mimetic_mime_library.html" "C++ MIME Library" "Required for client-side MIME parsing" WITH_MIMETIC)
+-trojita_find_package(KF5Gpgmepp "" "https://quickgit.kde.org/?p=gpgmepp.git" "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP)
+-trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP")
++trojita_find_package(Gpgmepp "1.8.0" "https://gnupg.org/related_software/gpgme/index.html" "C++/Qt bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP)
++if(NOT WITH_GPGMEPP)
++    trojita_find_package(KF5Gpgmepp "" "https://commits.kde.org/gpgmepp?path=/" "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_KF5_GPGMEPP)
++    trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_KF5_GPGMEPP")
++else()
++    trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP")
++endif()
+ 
+ if(WIN32)
+     trojita_find_package(MakeNSIS "" "http://nsis.sourceforge.net" "Nullsoft Scriptable Install System" "Needed for building Windows installer" WITH_NSIS)
+@@ -197,7 +203,7 @@ else()
+   set(TROJITA_HAVE_MIMETIC False)
+ endif()
+ 
+-if(WITH_GPGMEPP)
++if(WITH_GPGMEPP OR WITH_KF5_GPGMEPP)
+   set(TROJITA_HAVE_GPGMEPP True)
+ else()
+   set(TROJITA_HAVE_GPGMEPP False)
+@@ -315,12 +321,10 @@ if(WITH_MIMETIC)
+     )
+ endif()
+ if(WITH_CRYPTO_MESSAGES)
+-  if(WITH_GPGMEPP)
+     set(libCryptography_SOURCES
+         ${libCryptography_SOURCES}
+         ${path_Cryptography}/GpgMe++.cpp
+     )
+-  endif()
+ endif()
+ 
+ if(WITH_ZLIB)
+@@ -614,13 +618,15 @@ if(WITH_MIMETIC)
+     set_property(TARGET Cryptography APPEND PROPERTY INCLUDE_DIRECTORIES ${MIMETIC_INCLUDE_DIRS})
+ endif()
+ if(WITH_CRYPTO_MESSAGES)
+-  if(WITH_GPGMEPP)
+-    if (WIN32)
+-      target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme)
+-    else()
+-      target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme)
++    if(WITH_GPGMEPP)
++        target_link_libraries(Cryptography Gpgmepp QGpgme)
++    elseif(WITH_KF5_GPGMEPP)
++        if(WIN32)
++            target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme)
++        else()
++            target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme)
++        endif()
+     endif()
+-  endif()
+ endif()
+ 
+ ## ClearText password plugin
+-- 
+cgit v0.11.2
+