* [gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/, mail-client/trojita/files/
@ 2016-12-16 21:20 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2016-12-16 21:20 UTC (permalink / raw
To: gentoo-commits
commit: fcf39a79df5b3b14e887edb2a25c232ac7587708
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Dec 16 20:42:17 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 21:19:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf39a79
mail-client/trojita: Port from kde-apps/gpgmepp to app-crypt/gpgme[qt5]
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3137
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
mail-client/trojita/files/trojita-0.7-gpgme.patch | 34 +++++++++
mail-client/trojita/trojita-0.7-r2.ebuild | 86 +++++++++++++++++++++++
2 files changed, 120 insertions(+)
diff --git a/mail-client/trojita/files/trojita-0.7-gpgme.patch b/mail-client/trojita/files/trojita-0.7-gpgme.patch
new file mode 100644
index 00000000..2a7a6d5
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-gpgme.patch
@@ -0,0 +1,34 @@
+commit 1978d0a12d2cb4886c5612d6a50b145f409d815c
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed Oct 26 22:42:47 2016 +0200
+
+ Switch from KF5Gpgmepp to Gpgmepp
+
+ Gpgmepp is part of GpgME since 1.7.0.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index edf3e79..6993d2e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,7 +84,7 @@ 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_find_package(QGpgme 1.8.0 "http://www.gnupg.org" "Qt5/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")
+
+ if(WIN32)
+@@ -615,11 +615,7 @@ if(WITH_MIMETIC)
+ 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)
+- endif()
++ target_link_libraries(Cryptography QGpgme)
+ endif()
+ endif()
+
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
new file mode 100644
index 00000000..308c9fd
--- /dev/null
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+inherit cmake-utils fdo-mime gnome2-utils virtualx
+[[ ${PV} == 9999 ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+if [[ ${PV} != 9999 ]]; then
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="+crypt +dbus debug +password test +zlib"
+
+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}
+ dev-qt/linguist-tools:5
+ test? ( dev-qt/qttest:5 )
+ zlib? ( virtual/pkgconfig )
+"
+
+DOCS=( README LICENSE )
+
+PATCHES=( "${FILESDIR}/${P}-gpgme.patch" )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # the build system is taking a look at `git describe ... --dirty` and
+ # gentoo's modifications to CMakeLists.txt break these
+ sed -i "s/--dirty//" "${S}/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_QTKEYCHAINPLUGIN=$(usex password)
+ -DWITH_TESTS=$(usex test)
+ -DWITH_ZLIB=$(usex zlib)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ virtx cmake-utils_src_test
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/, mail-client/trojita/files/
@ 2017-02-13 12:16 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-02-13 12:16 UTC (permalink / raw
To: gentoo-commits
commit: 1b1b1915959ed5c90de477e4a3c277b7363c93b9
Author: Jan Kundrát <jkt <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 12:04:12 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 12:16:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b1b1915
mail-client/trojita: Fix build aginst new `gpg`
Patch is already upstream.
Gentoo-Bug: 605824
.../trojita/files/trojita-0.7-gpg-tests.patch | 27 ++++++++++++++++++++++
mail-client/trojita/trojita-0.7-r2.ebuild | 5 +++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/mail-client/trojita/files/trojita-0.7-gpg-tests.patch b/mail-client/trojita/files/trojita-0.7-gpg-tests.patch
new file mode 100644
index 0000000000..db41ee577e
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-gpg-tests.patch
@@ -0,0 +1,27 @@
+commit be8fd5831afa0a04f14cd6206e6576f03ee59558
+Author: Amaury Pouly <amaury.pouly@gmail.com>
+Date: Sat Sep 17 16:40:46 2016 +0100
+
+ Fix GPG test
+
+ At least GnuPG, when run with both --fingerprint and --with-colons will output
+ the fingerprint of the public key and the subkey. The command below will thus
+ output two fingerprints and the delete command will fail because it cannot
+ find the second fingerprint (which is a subkey and not a public key). It seems
+ that a safe approach is to consider only the first fingerprint line.
+
+ Change-Id: I4c6aa79e4473bca146aa087728a5652d91586a81
+
+diff --git a/tests/Cryptography/keygen.sh b/tests/Cryptography/keygen.sh
+index c94c0ab..98c69ca 100755
+--- a/tests/Cryptography/keygen.sh
++++ b/tests/Cryptography/keygen.sh
+@@ -115,7 +115,7 @@ $TAIL" > crypto_test_data.h
+ echo -n "key *\nexpire\nseconds=1\nsave\n" | ${GPG} --no-tty --quiet --command-fd 0 --edit-key "expired@test.trojita.flaska.net"
+
+ # extract fingerprint of key to be deleted
+-FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint unknown@test.trojita.flaska.net | grep fpr | cut -d : -f 10)"
++FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint unknown@test.trojita.flaska.net | grep fpr | head -n 1 | cut -d : -f 10)"
+
+ # delete key
+ yes | DISPLAY="" ${GPG} --quiet --batch --no-tty --delete-secret-and-public-key --yes --command-fd 0 --passphrase-fd 0 "${FINGERPRINT}"
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
index 308c9fd73e..8f2c535eef 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -43,7 +43,10 @@ DEPEND="${RDEPEND}
DOCS=( README LICENSE )
-PATCHES=( "${FILESDIR}/${P}-gpgme.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-gpgme.patch"
+ "${FILESDIR}/${P}-gpg-tests.patch"
+ )
src_prepare() {
cmake-utils_src_prepare
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/, mail-client/trojita/files/
@ 2018-04-18 17:49 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-04-18 17:49 UTC (permalink / raw
To: gentoo-commits
commit: b39e91844b5fcda06bcf14b6b49e807252e172f1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 17:07:01 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 17:49:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39e9184
mail-client/trojita: Fix build with Qt 5.11_beta3
Package-Manager: Portage-2.3.30, Repoman-2.3.9
.../trojita/files/trojita-0.7-qt-5.11b3.patch | 207 +++++++++++++++++++++
mail-client/trojita/trojita-0.7-r2.ebuild | 3 +-
2 files changed, 209 insertions(+), 1 deletion(-)
diff --git a/mail-client/trojita/files/trojita-0.7-qt-5.11b3.patch b/mail-client/trojita/files/trojita-0.7-qt-5.11b3.patch
new file mode 100644
index 00000000000..32d1a021972
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-qt-5.11b3.patch
@@ -0,0 +1,207 @@
+From 7a9f7e0629aa28ffafc4433bbdf43a011754d7c3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 18 Apr 2018 18:53:23 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ CMakeLists.txt | 1 -
+ cmake/TrojitaOption.cmake | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3a882370..781e576b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ project(trojita)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+-# Qt5's qt5_use_modules need 2.8.9+
+ # On win32, we need QtMain linking, which means 2.8.11+
+ # EL7 ships 2.8.11, Debian 8 ships 3.0.2, and Ubuntu 14.04 LTS has 2.8.12
+ cmake_minimum_required(VERSION 2.8.11)
+diff --git a/cmake/TrojitaOption.cmake b/cmake/TrojitaOption.cmake
+index ed99e952..8ac6b6be 100644
+--- a/cmake/TrojitaOption.cmake
++++ b/cmake/TrojitaOption.cmake
+@@ -100,7 +100,7 @@ macro(trojita_add_plugin target type)
+ set_property(TARGET ${target} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_PLUGIN)
+ target_link_libraries(${target} Plugins)
+ if (WITH_QT5)
+- qt5_use_modules(${target} Core)
++ target_link_libraries(${target} Qt5::Core)
+ else()
+ target_link_libraries(${target} ${QT_QTCORE_LIBRARY})
+ endif()
+--
+2.17.0
+
+From 94adf1d2e3e2d4a9e0c59fa9423ae711cf55c6fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
+Date: Wed, 19 Oct 2016 21:58:57 +0200
+Subject: [PATCH] cmake: do not use qt5_use_modules
+
+...because the documentation suggests going with imported targets and
+target_link_libraries.
+
+Change-Id: I403d40d0b0ac8d88cadb011c2c2a643221f15daf
+---
+ CMakeLists.txt | 42 ++++++++++++++++--------------------------
+ 1 file changed, 16 insertions(+), 26 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 92a682f7..f0d395d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -552,13 +552,13 @@ set_source_files_properties(${version_files}
+ add_library(Common STATIC ${libCommon_SOURCES})
+ set_property(TARGET Common APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+ add_dependencies(Common version)
+-qt5_use_modules(Common Core Network)
++target_link_libraries(Common Qt5::Network)
+
+ add_library(AppVersion STATIC ${libAppVersion_SOURCES})
+ set_property(TARGET AppVersion APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+ add_dependencies(AppVersion version)
+ target_link_libraries(AppVersion Common)
+-qt5_use_modules(AppVersion Core)
++target_link_libraries(AppVersion Qt5::Core)
+
+ if(WITH_SHARED_PLUGINS)
+ add_library(Plugins SHARED ${libPlugins_SOURCES})
+@@ -569,12 +569,11 @@ else()
+ endif()
+ set_target_properties(Plugins PROPERTIES OUTPUT_NAME trojita_plugins)
+ set_property(TARGET Plugins APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+-qt5_use_modules(Plugins Core)
++target_link_libraries(Plugins Qt5::Core)
+
+ add_library(UiUtils STATIC ${libUiUtils_SOURCES})
+ set_property(TARGET UiUtils APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+-target_link_libraries(UiUtils Plugins Common)
+-qt5_use_modules(UiUtils Core Gui Network)
++target_link_libraries(UiUtils Plugins Common Qt5::Gui)
+
+ add_library(Streams STATIC ${libStreams_SOURCES})
+ set_property(TARGET Streams APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+@@ -582,36 +581,32 @@ if(WITH_ZLIB)
+ set_property(TARGET Streams APPEND PROPERTY INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIR})
+ target_link_libraries(Streams ${ZLIB_LIBRARIES})
+ endif()
+-qt5_use_modules(Streams Network)
++target_link_libraries(Streams Qt5::Network)
+
+ add_library(IPC STATIC ${libIPC_SOURCES})
+ set_property(TARGET IPC APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+ if(WITH_DBUS)
+- qt5_use_modules(IPC DBus Widgets)
++ target_link_libraries(IPC Qt5::DBus Qt5::Widgets)
+ else()
+- qt5_use_modules(IPC Core)
++ target_link_libraries(IPC Qt5::Core)
+ endif()
+
+ add_library(qwwsmtpclient STATIC ${libqwwsmtpclient_SOURCES})
+-qt5_use_modules(qwwsmtpclient Network)
++target_link_libraries(qwwsmtpclient Qt5::Network)
+
+ add_library(MSA STATIC ${libMSA_SOURCES})
+ set_property(TARGET MSA APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+ target_link_libraries(MSA Imap Streams qwwsmtpclient)
+-qt5_use_modules(MSA Network)
+
+ add_library(Composer STATIC ${libComposer_SOURCES})
+ set_property(TARGET Composer APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+ target_link_libraries(Composer Common MSA Streams UiUtils qwwsmtpclient)
+-qt5_use_modules(Composer Gui Network)
+
+ add_library(Imap STATIC ${libImap_SOURCES})
+ set_property(TARGET Imap APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+-target_link_libraries(Imap Common Streams UiUtils)
+-qt5_use_modules(Imap Gui Network Sql)
++target_link_libraries(Imap Common Streams UiUtils Qt5::Sql)
+
+ add_library(Cryptography STATIC ${libCryptography_SOURCES})
+-qt5_use_modules(Cryptography Core)
+ set_property(TARGET Cryptography APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+ target_link_libraries(Cryptography Common Imap)
+ if(WITH_MIMETIC)
+@@ -636,8 +631,7 @@ endif()
+ ## QtKeyChain plugin
+ if(WITH_QTKEYCHAIN_PLUGIN)
+ trojita_add_plugin(trojita_plugin_QtKeychainPasswordPlugin WITH_QTKEYCHAIN_PLUGIN src/Plugins/QtKeyChain/QtKeyChainPassword.cpp)
+- qt5_use_modules(trojita_plugin_QtKeychainPasswordPlugin Core DBus)
+- target_link_libraries(trojita_plugin_QtKeychainPasswordPlugin ${QTKEYCHAIN_LIBRARIES})
++ target_link_libraries(trojita_plugin_QtKeychainPasswordPlugin ${QTKEYCHAIN_LIBRARIES} Qt5::DBus)
+ set_property(TARGET trojita_plugin_QtKeychainPasswordPlugin APPEND PROPERTY INCLUDE_DIRECTORIES ${QTKEYCHAIN_INCLUDE_DIRS})
+ endif()
+
+@@ -662,7 +656,7 @@ if(WITH_ABOOKADDRESSBOOK_PLUGIN)
+ trojita_add_plugin(trojita_plugin_AbookAddressbookPlugin WITH_ABOOKADDRESSBOOK_PLUGIN ${libAbookAddressbook_SOURCES} ${libAbookAddressbook_UI_OUT})
+ set_property(TARGET trojita_plugin_AbookAddressbookPlugin APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+
+- qt5_use_modules(trojita_plugin_AbookAddressbookPlugin Widgets)
++ target_link_libraries(trojita_plugin_AbookAddressbookPlugin Qt5::Widgets)
+
+ set(be_contacts_SOURCES
+ ${path_AbookAddressbook}/main.cpp
+@@ -675,7 +669,7 @@ if(WITH_ABOOKADDRESSBOOK_PLUGIN)
+ set_property(TARGET be.contacts APPEND PROPERTY COMPILE_DEFINITIONS QT_STATICPLUGIN)
+ target_link_libraries(be.contacts trojita_plugin_AbookAddressbookPlugin)
+ endif()
+- qt5_use_modules(be.contacts Widgets)
++ target_link_libraries(be.contacts Qt5::Widgets)
+ endif()
+
+ # Generate file static_plugins.h.in
+@@ -695,15 +689,13 @@ if(WITH_DESKTOP)
+ # The following is needed for the LineEdit widget within the .ui files.
+ # The ${path_DesktopGui} is needed so that the generated ui_*.h file can find the headers of the custom widgets
+ set_property(TARGET DesktopGui APPEND PROPERTY INCLUDE_DIRECTORIES ${path_DesktopGui})
+- target_link_libraries(DesktopGui Common UiUtils Composer Cryptography Imap IPC MSA Plugins Streams qwwsmtpclient)
++ target_link_libraries(DesktopGui Common UiUtils Composer Cryptography Imap IPC MSA Plugins Streams qwwsmtpclient Qt5::WebKitWidgets)
+
+ # On Windows build a real Win32 GUI application without console window
+ # On other platforms WIN32 flag is ignored
+ add_executable(trojita WIN32 ${trojita_desktop_SOURCES} ${trojita_QM})
+ set_property(TARGET trojita APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+ target_link_libraries(trojita AppVersion Common UiUtils DesktopGui ${STATIC_PLUGINS})
+- qt5_use_modules(DesktopGui Network WebKitWidgets)
+- qt5_use_modules(trojita Widgets Network)
+ endif()
+
+
+@@ -737,17 +729,15 @@ if(WITH_TESTS)
+ tests/Utils/LibMailboxSync.cpp
+ )
+ add_library(test_LibMailboxSync STATIC ${test_LibMailboxSync_SOURCES})
+- qt5_use_modules(test_LibMailboxSync Test Network)
+ set_property(TARGET test_LibMailboxSync APPEND PROPERTY INCLUDE_DIRECTORIES
+ ${CMAKE_CURRENT_SOURCE_DIR}/tests
+ ${CMAKE_CURRENT_SOURCE_DIR}/tests/Utils)
+- target_link_libraries(test_LibMailboxSync Imap MSA Streams Common Composer)
++ target_link_libraries(test_LibMailboxSync Imap MSA Streams Common Composer Qt5::Test)
+
+ macro(trojita_test dir fname)
+ set(test_${fname}_SOURCES tests/${dir}/test_${fname}.cpp)
+ add_executable(test_${fname} ${test_${fname}_SOURCES})
+ target_link_libraries(test_${fname} Imap MSA Streams Common Composer Cryptography test_LibMailboxSync)
+- qt5_use_modules(test_${fname} Network Sql Test Widgets)
+ set_property(TARGET test_${fname} APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+ if(NOT CMAKE_CROSSCOMPILING)
+ add_test(test_${fname} test_${fname})
+@@ -759,9 +749,9 @@ if(WITH_TESTS)
+ enable_testing()
+ trojita_test(Composer Composer_Submission)
+ trojita_test(Composer Composer_responses)
++ target_link_libraries(test_Composer_responses Qt5::WebKitWidgets)
+ trojita_test(Composer Html_formatting)
+- qt5_use_modules(test_Composer_responses WebKitWidgets)
+- qt5_use_modules(test_Html_formatting WebKitWidgets)
++ target_link_libraries(test_Html_formatting Qt5::WebKitWidgets)
+ trojita_test(Imap Imap_DisappearingMailboxes)
+ trojita_test(Imap Imap_Idle)
+ trojita_test(Imap Imap_LowLevelParser)
+--
+2.17.0
+
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
index 7bdba08a79c..8a1979d7b34 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -45,7 +45,8 @@ DOCS=( README LICENSE )
PATCHES=(
"${FILESDIR}/${P}-gpgme.patch"
"${FILESDIR}/${P}-gpg-tests.patch"
- )
+ "${FILESDIR}/${P}-qt-5.11b3.patch"
+)
src_prepare() {
cmake-utils_src_prepare
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/, mail-client/trojita/files/
@ 2020-04-19 12:01 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-04-19 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 4a6a2f87aaedb9e3451c88a2e1c05f3c8f606b3c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 11:21:35 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 12:01:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6a2f87
mail-client/trojita: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../trojita/files/trojita-0.7-qt-5.15.patch | 28 ++++++++++++++++++++++
mail-client/trojita/trojita-0.7-r2.ebuild | 3 ++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/mail-client/trojita/files/trojita-0.7-qt-5.15.patch b/mail-client/trojita/files/trojita-0.7-qt-5.15.patch
new file mode 100644
index 00000000000..f6ce4cc938d
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-qt-5.15.patch
@@ -0,0 +1,28 @@
+From 2869c385e72932cbed7398742b8a4d5e3feda765 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 24 Mar 2020 13:14:43 +0100
+Subject: Fix build with Qt 5.15.0
+
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+
+Change-Id: Ibb59e769bba8514d86aa886afee26a2395d458ef
+---
+ src/Gui/Window.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp
+index 65ba246..8d74874 100644
+--- a/src/Gui/Window.cpp
++++ b/src/Gui/Window.cpp
+@@ -32,6 +32,7 @@
+ #include <QKeyEvent>
+ #include <QMenuBar>
+ #include <QMessageBox>
++#include <QPainterPath>
+ #include <QProgressBar>
+ #include <QRegularExpression>
+ #include <QScopedPointer>
+--
+cgit v1.1
+
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
index 19df3d88516..a5904f016e3 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -49,6 +49,7 @@ PATCHES=(
"${FILESDIR}/${P}-gpgme.patch"
"${FILESDIR}/${P}-gpg-tests.patch"
"${FILESDIR}/${P}-qt-5.11b3.patch"
+ "${FILESDIR}/${P}-qt-5.15.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/, mail-client/trojita/files/
@ 2020-06-28 21:55 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-06-28 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 79f45c1d2526dd37f1bc7a25b8f7feb13ad4575c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 20:55:39 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 21:55:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f45c1d
mail-client/trojita: Fix build with IUSE=test and >=Qt-5.13
Closes: https://bugs.gentoo.org/730058
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../trojita/files/trojita-0.7-cmake-cxx11.patch | 66 ++++++++++++++++++++++
.../trojita/files/trojita-0.7-qt-5.13.patch | 37 ++++++++++++
mail-client/trojita/trojita-0.7-r4.ebuild | 2 +
3 files changed, 105 insertions(+)
diff --git a/mail-client/trojita/files/trojita-0.7-cmake-cxx11.patch b/mail-client/trojita/files/trojita-0.7-cmake-cxx11.patch
new file mode 100644
index 00000000000..71ab15950b8
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-cmake-cxx11.patch
@@ -0,0 +1,66 @@
+From e2e35bfda75a2f4950408c93ede72fabfe86360e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
+Date: Wed, 19 Oct 2016 22:15:16 +0200
+Subject: [PATCH] cmake: Speed up cmake by using native features for enforcing
+ C++11
+
+This saves about 8 seconds in my (limited) testing with a 2016-era
+laptop with plenty of RAM and a fast SSD.
+
+We still attempt to support ancient pre-3.1 CMake by adding that blurb
+into CXXFLAGS, maybe it even works.
+
+I should probably start tracking time I spend supporting old
+environments and evaluate whether this is worth the effort. Once we are
+ready to distribute flatpaks/appimages/whatevers, I suspect that my life
+will become much easier.
+
+Change-Id: Ibbbe3d8440a7d29ef27440a99938d313bfe9699f
+---
+ CMakeLists.txt | 26 ++--
+ 24 files changed, 8 insertions(+), 468 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9393b19c..92a682f7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,6 +18,14 @@ if(POLICY CMP0043)
+ cmake_policy(SET CMP0043 OLD)
+ endif()
+
++if(CMAKE_VERSION VERSION_LESS "3.1")
++ # If you aren't using and old Linux with an old GCC and old CMake, please just upgrade.
++ set(CMAKE_CXX_FLAGS "--std=c++11 ${CMAKE_CXX_FLAGS}")
++else()
++ set(CMAKE_CXX_STANDARD 11)
++ set(CMAKE_CXX_STANDARD_REQUIRED ON)
++endif()
++
+ # Set a default build type if none was specified. This was shamelessly stolen
+ # from VTK's cmake setup because these guys produce both CMake and a project that
+ # manipulates this variable, and the web is full of posts where people say that
+@@ -34,24 +42,6 @@ endif()
+
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+-include(FindCXXFeatures)
+-if(NOT CXXFeatures_auto_FOUND)
+- message(SEND_ERROR "Your compiler doesn't support C++11's auto")
+-endif()
+-if(NOT CXXFeatures_static_assert_FOUND)
+- message(SEND_ERROR "Your compiler doesn't support C++11's static_assert")
+-endif()
+-if(NOT CXXFeatures_alignof_FOUND)
+- message(SEND_ERROR "Your compiler doesn't support C++11's alignof")
+-endif()
+-if(NOT CXXFeatures_nullptr_FOUND)
+- message(SEND_ERROR "Your compiler doesn't support C++11's nullptr")
+-endif()
+-if(NOT CXXFeatures_lambda_FOUND)
+- message(SEND_ERROR "Your compiler doesn't support C++11's lambda functions")
+-endif()
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}")
+-
+ include(TrojitaOption)
+
+ trojita_option(WITH_DESKTOP "Build desktop version" ON)
diff --git a/mail-client/trojita/files/trojita-0.7-qt-5.13.patch b/mail-client/trojita/files/trojita-0.7-qt-5.13.patch
new file mode 100644
index 00000000000..9f1ab3e7e88
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-qt-5.13.patch
@@ -0,0 +1,37 @@
+From 39772585033c1c0aff96f297e93de7be53f9b114 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sat, 23 Mar 2019 01:17:11 +0100
+Subject: [PATCH] tests: Fix build with Qt 5.13
+
+QTest::toString(QModelIndex) was added in
+7ef0b575b38d267bd3dc14ff46935d556562ff00 and thus causes a build
+error with Qt 5.13 because it's redefined here.
+
+Change-Id: I015800e49cf8d0e87f3541642406396f150d0eeb
+---
+ tests/Imap/test_Imap_BodyParts.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/Imap/test_Imap_BodyParts.cpp b/tests/Imap/test_Imap_BodyParts.cpp
+index f1c577fa..b6e0421d 100644
+--- a/tests/Imap/test_Imap_BodyParts.cpp
++++ b/tests/Imap/test_Imap_BodyParts.cpp
+@@ -51,6 +51,7 @@ struct Data {
+
+ Q_DECLARE_METATYPE(QList<Data>)
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+ namespace QTest {
+ template <>
+ char *toString(const QModelIndex &index)
+@@ -60,6 +61,7 @@ char *toString(const QModelIndex &index)
+ return qstrdup(buf.toUtf8().constData());
+ }
+ }
++#endif
+
+ using namespace Imap::Mailbox;
+
+--
+GitLab
+
diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild b/mail-client/trojita/trojita-0.7-r4.ebuild
index 8583ee49efd..e9b7c9e515a 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -52,9 +52,11 @@ 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"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-06-28 21:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-16 21:20 [gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/, mail-client/trojita/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2017-02-13 12:16 Michael Palimaka
2018-04-18 17:49 Andreas Sturmlechner
2020-04-19 12:01 Andreas Sturmlechner
2020-06-28 21:55 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox