From 673654d359c08e0e1cd7dad05615d9d9e4156a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 12 Aug 2018 05:21:18 +0200 Subject: [PATCH] remmina: fix build w/ libssh-0.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no libssh_threads.* anymore. Signed-off-by: Jürgen Buchmüller --- .../patches/remove-libssh-threads.patch | 20 +++++++++++++++++++ srcpkgs/remmina/template | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/remmina/patches/remove-libssh-threads.patch diff --git a/srcpkgs/remmina/patches/remove-libssh-threads.patch b/srcpkgs/remmina/patches/remove-libssh-threads.patch new file mode 100644 index 00000000000..0c14549e274 --- /dev/null +++ b/srcpkgs/remmina/patches/remove-libssh-threads.patch @@ -0,0 +1,20 @@ +--- cmake/FindLIBSSH.cmake 2018-07-31 14:53:53.000000000 +0200 ++++ cmake/FindLIBSSH.cmake 2018-08-12 05:19:14.943145715 +0200 +@@ -42,16 +42,11 @@ + PATHS ${PC_LIBSSH_PKGCONF_LIBRARY_DIRS} + ) + +-find_library(LIBSSH_THREADS_LIBRARY +- NAMES ssh_threads +- PATHS ${PC_LIBSSH_LIBDIR} ${PC_LIBSSH_LIBRARY_DIRS} +-) +- + include(FindPackageHandleStandardArgs) + + find_package_handle_standard_args(LIBSSH DEFAULT_MSG LIBSSH_LIBRARY LIBSSH_INCLUDE_DIR) + +-set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY}) ++set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY}) + set(LIBSSH_INCLUDE_DIRS ${LIBSSH_INCLUDE_DIR}) + + mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARY) diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template index e21ef8dcdb5..2f98753895c 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -4,7 +4,7 @@ version=1.2.31.2 revision=2 wrksrc="Remmina-${version}" build_style=cmake -configure_args="-DWITH_APPINDICATOR=OFF" +configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON" hostmakedepends="intltool pkg-config" makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel json-glib-devel libgnome-keyring-devel libsecret-devel