[gentoo-commits] repo/gentoo:master commit in: net-misc/seafile-client/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/seafile-client/files/

[Sam James]

commit:     874b27d8c1de97b061e326b25070bb88b5915700
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 18:31:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  3 18:45:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874b27d8

net-misc/seafile-client: drop obsolete LibreSSL patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/seafile-client-7.0.9-libressl.patch              | 14 --------------
 1 file changed, 14 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
deleted file mode 100644
index d7fdc2201d1..00000000000
--- a/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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)
- {

[gentoo-commits] repo/gentoo:master commit in: net-misc/seafile-client/files/

[Matthew Smith]

commit:     a72cbbc68e0655cadf6eed1e77363b10a663478a
Author:     Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 10:43:49 2022 +0000
Commit:     Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 10:44:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a72cbbc6

net-misc/seafile-client: Don't call qmake during build

Fixes call to command that does not exist.

Does not change build process or installed files.

Closes: https://bugs.gentoo.org/836689
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>

 .../files/seafile-client-8.0.6-select-qt5.patch               | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch
index 8b8e6d55aa08..4d3a3d172644 100644
--- a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch
+++ b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1c4a444..aae406c 100644
+index 1c4a4447..5747df46 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -133,11 +133,8 @@ ENDIF()
+@@ -133,14 +133,12 @@ ENDIF()
  ####################
  ###### BEGIN: QT configuration
  ####################
@@ -14,5 +14,10 @@ index 1c4a444..aae406c 100644
 +FIND_PACKAGE(Qt5Core)
 +SET(DETECTED_QT_VERSION ${Qt5Core_VERSION})
  MESSAGE("Qt version: ${DETECTED_QT_VERSION}")
++GET_TARGET_PROPERTY(QMAKE_EXECUTABLE_PATH Qt5::qmake IMPORTED_LOCATION)
  EXECUTE_PROCESS(COMMAND
-     bash -c "qmake --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'"
+-    bash -c "qmake --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'"
++    bash -c "${QMAKE_EXECUTABLE_PATH} --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'"
+     OUTPUT_VARIABLE QT_VERSION_MAJOR
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE("QT_VERSION_MAJOR: ${QT_VERSION_MAJOR}")

[gentoo-commits] repo/gentoo:master commit in: net-misc/seafile-client/files/

[David Seifert]

commit:     52ff9d818b402e4132e835ffe4bed1e537e7de24
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr  4 07:48:45 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 07:48:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ff9d81

net-misc/seafile-client: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24890
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/seafile-client-8.0.1-glib-2.68.0.patch             | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch b/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch
deleted file mode 100644
index 9b2dd42cc926..000000000000
--- a/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbf1d2f..05e8d4d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@ SET(SEAFILE_CLIENT_VERSION_MINOR 0)
- SET(SEAFILE_CLIENT_VERSION_PATCH 1)
- SET(PROJECT_VERSION "${SEAFILE_CLIENT_VERSION_MAJOR}.${SEAFILE_CLIENT_VERSION_MINOR}.${SEAFILE_CLIENT_VERSION_PATCH}")
- ADD_DEFINITIONS(-DSEAFILE_CLIENT_VERSION=${PROJECT_VERSION})
-+ADD_DEFINITIONS(-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26)
- INCLUDE(FindPkgConfig)
- 
- ## Build crash repoter on release build as default