commit: 98c19fb406d6fb1b90be812b0459a6c790ef6b02 Author: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> AuthorDate: Thu Oct 15 15:50:06 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Oct 16 04:32:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98c19fb4
net-misc/seafile-client: fix Qt5.15 build Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> Closes: https://github.com/gentoo/gentoo/pull/17938 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../files/seafile-client-7.0.9-qt-5.15.patch | 37 ++++++++++++++++++++++ ...7.0.9.ebuild => seafile-client-7.0.9-r1.ebuild} | 17 +++++----- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch b/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch new file mode 100644 index 00000000000..ef9c2f7449b --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch @@ -0,0 +1,37 @@ +https://github.com/haiwen/seafile-client/pull/1297 + +From 86ebea086c6b78738b3140c922c909331d2b9a94 Mon Sep 17 00:00:00 2001 +From: Joffrey <j-...@live.fr> +Date: Fri, 29 May 2020 15:59:11 +0000 +Subject: [PATCH] Fix build with Qt5 v5.15.0 + +--- + src/ui/events-list-view.cpp | 1 + + src/ui/private-share-dialog.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/ui/events-list-view.cpp b/src/ui/events-list-view.cpp +index b1d04abb..09536b9e 100644 +--- a/src/ui/events-list-view.cpp ++++ b/src/ui/events-list-view.cpp +@@ -1,4 +1,5 @@ + #include <QPainter> ++#include <QPainterPath> + #include <QApplication> + #include <QPixmap> + #include <QToolTip> +diff --git a/src/ui/private-share-dialog.cpp b/src/ui/private-share-dialog.cpp +index 511d476b..284cc043 100644 +--- a/src/ui/private-share-dialog.cpp ++++ b/src/ui/private-share-dialog.cpp +@@ -2,6 +2,7 @@ + #include <QCompleter> + #include <QLineEdit> + #include <QPainter> ++#include <QPainterPath> + #include <QResizeEvent> + #include <QStringList> + #include <QStringListModel> +-- +2.26.2 + diff --git a/net-misc/seafile-client/seafile-client-7.0.9.ebuild b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild similarity index 79% rename from net-misc/seafile-client/seafile-client-7.0.9.ebuild rename to net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild index 8b0653e774d..649db5f1322 100644 --- a/net-misc/seafile-client/seafile-client-7.0.9.ebuild +++ b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild @@ -18,23 +18,24 @@ RESTRICT="!test? ( test )" RDEPEND="dev-db/sqlite:3 dev-libs/libevent dev-libs/jansson - <dev-qt/qtcore-5.15:5 - <dev-qt/qtdbus-5.15:5 - <dev-qt/qtgui-5.15:5 - <dev-qt/qtnetwork-5.15:5 - <dev-qt/qtwidgets-5.15:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) net-libs/libsearpc ~net-misc/seafile-${PV} - shibboleth? ( <dev-qt/qtwebengine-5.15:5[widgets] )" + shibboleth? ( dev-qt/qtwebengine:5[widgets] )" DEPEND="${RDEPEND} - test? ( <dev-qt/qttest-5.15:5 )" -BDEPEND="<dev-qt/linguist-tools-5.15:5" + test? ( dev-qt/qttest:5 )" +BDEPEND="dev-qt/linguist-tools:5" PATCHES=( "${FILESDIR}/${PN}-select-qt5.patch" "${FILESDIR}/${P}-libressl.patch" + "${FILESDIR}/${P}-qt-5.15.patch" ) src_configure() {
