From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- mail-client/trojita/Manifest | 5 ++- .../trojita/files/trojita-0.7-qt-5.15.patch | 28 ++++++++++++ mail-client/trojita/trojita-0.7-r2.ebuild | 50 +++++++++------------- mail-client/trojita/trojita-9999.ebuild | 4 +- 4 files changed, 53 insertions(+), 34 deletions(-) create mode 100644 mail-client/trojita/files/trojita-0.7-qt-5.15.patch (limited to 'mail-client/trojita') diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest index d2ac87270155..a2832c689eb3 100644 --- a/mail-client/trojita/Manifest +++ b/mail-client/trojita/Manifest @@ -1,7 +1,8 @@ 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 +AUX trojita-0.7-qt-5.15.patch 774 BLAKE2B 0c1de7d7eebc9782d2e3e889365b283b3c5c82b7d792f167783857e8544f29f0a29284923a9b5f2974a5dbf8b9b3e6147c14654d78a57b67b8151407a63863b6 SHA512 42d45246c49ae99d9a49ed2c2186042427c8ea35b84123c876951f1d9ddcf9236acd14fd36e592041296ca6f6200e20eca786c967dade37bf8be8148dd7b3cca DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8 -EBUILD trojita-0.7-r2.ebuild 1937 BLAKE2B 1997e18e832f849041c5f157e1755b14804682a836f93cd5a27360df5f99a4188dfc26505b063a57b2c5c4c828f8b566bf27347d80c20e963c9595e0e30d696b SHA512 70bffb1b5b4c73f253aedd41288e5674cf143d1123c0549334a8c75a4326d3006d471ffa869a3e1ec05185ba66f57d2baae9e406b2cee8a7474e29ce8d6e002e -EBUILD trojita-9999.ebuild 1791 BLAKE2B 31082327b84b8dbf4266e4e53130295e6feb6a671670ad9b52689d197fab024b7d115e85279dfe91f2561bc7e4aafa3b5a0d8054e3eb7e228e1a6b21eefe6766 SHA512 2cbb459fd5a63e23877de16465af805f83c84c5c5543a0a6b4060aac3c5ddc65e2fcb51844471806f85f7381f2c11aaaf18c78564c826a80dfe4317b87a9b099 +EBUILD trojita-0.7-r2.ebuild 1732 BLAKE2B 4fe9fbd095244f6ca733b7fd7437669d671e96bc288161510f1c523f008abe061df3412d2303099a7511ffff96a5873cb69d8ac4b7bed7ff3176f89306c1fc17 SHA512 614426f9fe99c130354991db3fb4f1f986df2329912edbdd91a1bf201a40ea5eae8a05105f675d136a00563aea397e6ec1140f49c3a296a4b360f490dd565079 +EBUILD trojita-9999.ebuild 1791 BLAKE2B 13bf1d7c29c274cc473948fc40058de9757d6ad51911767c29c961303510f52d6f215365d90ad7d8e0085be610d4edc25df07e443757678f4ff71a8f245de14e SHA512 8f3e67e677262e29a2d26996d741f2fa4685f9c480791e95eb5d925c37dfcc2d3316b5129e0fc677951f0b174ae89e53e35223a6cbc9620f85fea5b16d0cc945 MISC metadata.xml 766 BLAKE2B b3fccdefcadc2ab93429fd991581a8b085546605ad00e68899a2d731f2217113f7271d5b53cef35dfab8063db05fd9662bdaff715a95bf73cfd8fa9c636f184f SHA512 b13adf41bd68543886b25fb0dfdc3c924e5fc050de4f4bbea383e91cb2d4542de83050695bd67b913f2707d8f6a689d6d387253c718ec7c78dd50abed3a3f633 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 000000000000..f6ce4cc938d4 --- /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 +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 + #include + #include ++#include + #include + #include + #include +-- +cgit v1.1 + diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild index 19df3d885167..f2648fcf92b8 100644 --- a/mail-client/trojita/trojita-0.7-r2.ebuild +++ b/mail-client/trojita/trojita-0.7-r2.ebuild @@ -1,26 +1,31 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -EGIT_REPO_URI="https://anongit.kde.org/${PN}.git" -inherit cmake-utils gnome2-utils virtualx xdg-utils -[[ ${PV} == 9999 ]] && inherit git-r3 - -DESCRIPTION="A Qt IMAP e-mail client" -HOMEPAGE="http://trojita.flaska.net/" -if [[ ${PV} != 9999 ]]; then +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" -RESTRICT="!test? ( test )" 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 @@ -38,9 +43,7 @@ RDEPEND=" zlib? ( sys-libs/zlib ) " DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) - zlib? ( virtual/pkgconfig ) " DOCS=( README LICENSE ) @@ -49,14 +52,15 @@ PATCHES=( "${FILESDIR}/${P}-gpgme.patch" "${FILESDIR}/${P}-gpg-tests.patch" "${FILESDIR}/${P}-qt-5.11b3.patch" + "${FILESDIR}/${P}-qt-5.15.patch" ) src_prepare() { - cmake-utils_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 -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check" + sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check" } src_configure() { @@ -70,23 +74,9 @@ src_configure() { -DWITH_ZLIB=$(usex zlib) ) - cmake-utils_src_configure + cmake_src_configure } src_test() { - virtx cmake-utils_src_test -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update + virtx cmake_src_test } diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild index a6f81504d4eb..672e67f6cd69 100644 --- a/mail-client/trojita/trojita-9999.ebuild +++ b/mail-client/trojita/trojita-9999.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=7 @@ -18,9 +18,9 @@ HOMEPAGE="http://trojita.flaska.net/" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" IUSE="+crypt +dbus debug +password pim +spell test +zlib" -RESTRICT="!test? ( test )" REQUIRED_USE="password? ( dbus )" +RESTRICT="!test? ( test )" BDEPEND=" dev-qt/linguist-tools:5 -- cgit v1.2.3