summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2018-11-05 12:51:08 +0100
committer Matteo Bernardini2019-08-18 09:02:40 +0200
commitde412a0b7a6cfc2c4f49e2b3351dd2091390d4c5 (patch)
treee84b29d325242445436e8f4d4f15455fa98164d3
parentd04189e642ca17186cb9b2b5899fa9c12aceb782 (diff)
downloadslackbuilds-remmina.tar.gz
network/remmina: Added a patch to let cmake find libssh.remmina
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--network/remmina/find_libssh.patch25
-rw-r--r--network/remmina/remmina.SlackBuild2
2 files changed, 27 insertions, 0 deletions
diff --git a/network/remmina/find_libssh.patch b/network/remmina/find_libssh.patch
new file mode 100644
index 0000000000..77976db696
--- /dev/null
+++ b/network/remmina/find_libssh.patch
@@ -0,0 +1,25 @@
+From: "Matteo F. Vescovi" <mfv@debian.org>
+Date: Sun, 12 Aug 2018 14:22:40 +0200
+Subject: Fix_Cmake_rule_for_LibSSH
+
+---
+ cmake/FindLIBSSH.cmake | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/FindLIBSSH.cmake b/cmake/FindLIBSSH.cmake
+index f003e2d..d1bfe23 100644
+--- a/cmake/FindLIBSSH.cmake
++++ b/cmake/FindLIBSSH.cmake
+@@ -51,7 +51,11 @@ include(FindPackageHandleStandardArgs)
+
+ find_package_handle_standard_args(LIBSSH DEFAULT_MSG LIBSSH_LIBRARY LIBSSH_INCLUDE_DIR)
+
+-set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY})
++if (LIBSSH_THREADS_LIBRARY)
++ set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY})
++else()
++ set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY})
++endif()
+ set(LIBSSH_INCLUDE_DIRS ${LIBSSH_INCLUDE_DIR})
+
+ mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARY)
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 94e4e67f62..2dc05dbfa1 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -77,6 +77,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/find_libssh.patch
+
mkdir -p build
cd build
cmake \