From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- mail-client/trojita/Manifest | 5 +- .../trojita/files/trojita-0.7-qt-5.11b3.patch | 207 +++++++++++++++++++++ mail-client/trojita/trojita-0.7-r2.ebuild | 7 +- mail-client/trojita/trojita-9999.ebuild | 4 +- 4 files changed, 218 insertions(+), 5 deletions(-) create mode 100644 mail-client/trojita/files/trojita-0.7-qt-5.11b3.patch (limited to 'mail-client/trojita') diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest index 690ad5536348..814c0ac2ee91 100644 --- a/mail-client/trojita/Manifest +++ b/mail-client/trojita/Manifest @@ -1,6 +1,7 @@ AUX trojita-0.7-gpg-tests.patch 1465 BLAKE2B f336368c8166987dc096991a0855a05d83374b7d509dbd8b39e7a12f6f8b14b86c6405ea55882192601163cee9eadaf9ab306bfbdcae347857bf4dc2f3c5908a SHA512 e494de83085dbbd7c545e47fcb1116cfb48e787f7b8706bee51f30f74a9047d1cf835f20086355671643ee0ef88d01428683999765d4bb59c3d9d943e92c69eb AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db4b84f7a5dbc67ea0494b188d9ff79ccf096faaedc6a179167bc9394ced0203e9df69cc6368694e885fbb61836 SHA512 4031feb66e7ce53e5669e00dd8ca91a6a53a22207aae90e13ef38012777b76275911d78fbdcd58809571a7c649fb4025cdb7de97e9793102c62f5e8b7b0561e1 +AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40d44b461358c4b9fc730f6dba787d82837c16f2e6bc84df9d3f57ac404d7c006fc7db223efeacfb9e833b6209b4374 SHA512 c16f3a7b9555e70e61656eb8caf25f778ec14a1dfdd18f786ddc3d8ee49b28fd39c4f438d051dbf961afbaf8cafc3d84a5befa10111ba216b4dec300cd67e228 DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8 -EBUILD trojita-0.7-r2.ebuild 1842 BLAKE2B 5e1ce49a18be6db8e23146b2e06ec0573843abb2d92919b71694693a2a459c47776974dce585c96f58c7c4fd495aa454f6b3b990026ea814798d412a2aa7e503 SHA512 26f788471744577804fdcd0c99ba23468dea37b8d6e75afa775f23227babe099fef32d253462918eab65aea5c494a71ee2106989328472939c21fe4620f98959 -EBUILD trojita-9999.ebuild 1762 BLAKE2B 656a86170f4be86d501226b1b5cc7dd4e423687c53e281d6841ccfba8d329f5a595ca5c2a1a8a993a243a057e226ac5ba853c5891ebcc4ec6b142322ee6eac89 SHA512 470c450bf372fe8945df1483abd6b30e09c51110a7f1a864d7ca60a116f8171a409f43bf63ff3c43fef36e4f57a721be2d119f57d19dcd8ad1b607ce16cbc722 +EBUILD trojita-0.7-r2.ebuild 1913 BLAKE2B 045e1f76dc240bdb7f8b9205f44c98a49642dbaba21d697f2b41c302d12253070822b3617b13faac108a88307b43df793ab8a576c257d051bbe1edda07effdcc SHA512 b52d541396a5c99310af90ded525aae4af885b8a897202bba0d2386cffbdd8b7ff4c81584f05d84497a46fc99d62eb6c983a6f130ee666282824c67b29d4b8a6 +EBUILD trojita-9999.ebuild 1798 BLAKE2B 30c5a402d8018dcb23a127206ac86da8883be248a70cbd788c6b8d05b5e196d8eafc9842f3c0a00f51648baca88e6915afa231cd8cb5f4620a7fced6d112162a SHA512 c4a5ae32a89608553cd02751119ae38b716cd450ee6c68959acd055e983cc94e0b9f14b3e70f28cd071edb172ad4392e5f2c470945e6281617f470e6d777871c MISC metadata.xml 640 BLAKE2B e60d0eb2b469e6b8f497b6884eea116364f3fbc93632b76367386e65a8d1f3b0a7dff42c48e2a2959799cc61febf5022d3d6ddb4ad6e5e3535dc08ab4633e813 SHA512 3149333258d5506d34854c9b0cc3da3f6560d9a44cf7b26a908e7c2726a145ccfc98c1b521bb56da74517af196e1c3f53a4f0c1d9f4e27fcd3493f5350a4e8e4 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 000000000000..32d1a0219725 --- /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 +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?= +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 7bdba08a79cc..9f0e744cd9c8 100644 --- a/mail-client/trojita/trojita-0.7-r2.ebuild +++ b/mail-client/trojita/trojita-0.7-r2.ebuild @@ -18,6 +18,8 @@ LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" IUSE="+crypt +dbus debug +password test +zlib" +REQUIRED_USE="password? ( dbus )" + RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -45,7 +47,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 @@ -61,7 +64,7 @@ src_configure() { -DWITH_GPGMEPP=$(usex crypt) -DWITH_MIMETIC=$(usex crypt) -DWITH_DBUS=$(usex dbus) - -DWITH_QTKEYCHAINPLUGIN=$(usex password) + -DWITH_QTKEYCHAIN_PLUGIN=$(usex password) -DWITH_TESTS=$(usex test) -DWITH_ZLIB=$(usex zlib) ) diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild index 070ef4d1f87f..3868e240b410 100644 --- a/mail-client/trojita/trojita-9999.ebuild +++ b/mail-client/trojita/trojita-9999.ebuild @@ -18,6 +18,8 @@ LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" IUSE="+crypt +dbus debug +password test +zlib" +REQUIRED_USE="password? ( dbus )" + RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -56,7 +58,7 @@ src_configure() { -DWITH_GPGMEPP=$(usex crypt) -DWITH_MIMETIC=$(usex crypt) -DWITH_DBUS=$(usex dbus) - -DWITH_QTKEYCHAINPLUGIN=$(usex password) + -DWITH_QTKEYCHAIN_PLUGIN=$(usex password) -DWITH_TESTS=$(usex test) -DWITH_ZLIB=$(usex zlib) ) -- cgit v1.2.3