From 98c19fb406d6fb1b90be812b0459a6c790ef6b02 Mon Sep 17 00:00:00 2001
From: Quentin Retornaz <gentoo@retornaz.com>
Date: Thu, 15 Oct 2020 17:50:06 +0200
Subject: net-misc/seafile-client: fix Qt5.15 build

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Quentin Retornaz <gentoo@retornaz.com>
Closes: https://github.com/gentoo/gentoo/pull/17938
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---
 .../files/seafile-client-7.0.9-qt-5.15.patch       | 37 +++++++++++++++
 .../seafile-client/seafile-client-7.0.9-r1.ebuild  | 55 ++++++++++++++++++++++
 .../seafile-client/seafile-client-7.0.9.ebuild     | 54 ---------------------
 3 files changed, 92 insertions(+), 54 deletions(-)
 create mode 100644 net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch
 create mode 100644 net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
 delete mode 100644 net-misc/seafile-client/seafile-client-7.0.9.ebuild

(limited to 'net-misc/seafile-client')

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 000000000000..ef9c2f7449b5
--- /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-off@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-r1.ebuild b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
new file mode 100644
index 000000000000..649db5f1322d
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/libevent
+	dev-libs/jansson
+	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[widgets] )"
+DEPEND="${RDEPEND}
+	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() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/seafile-client/seafile-client-7.0.9.ebuild b/net-misc/seafile-client/seafile-client-7.0.9.ebuild
deleted file mode 100644
index 8b0653e774de..000000000000
--- a/net-misc/seafile-client/seafile-client-7.0.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl shibboleth test"
-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
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( <dev-qt/qtwebengine-5.15:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( <dev-qt/qttest-5.15:5 )"
-BDEPEND="<dev-qt/linguist-tools-5.15:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
-- 
cgit v1.2.3-65-gdbad