gentoo resync : 25.11.2020

2 files changed, 51 insertions, 0 deletions

diff --git a/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch b/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch
new file mode 100644
index 000000000000..d7fdc2201d12
--- /dev/null
+++ b/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch
@@ -0,0 +1,14 @@
+Upstream pull request: https://github.com/haiwen/seafile-client/pull/1314
+diff --git a/src/utils/rsa.cpp b/src/utils/rsa.cpp
+index 350b790..513733d 100644
+--- a/src/utils/rsa.cpp
++++ b/src/utils/rsa.cpp
+@@ -13,7 +13,7 @@ namespace {
+ 
+ /* Forward compatibility functions if libssl < 1.1.0. */
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ 
+ int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+ {
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
+