cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak after libssh update

Browse Source
This commit is contained in:
jasper 2018-10-23 19:28:47 +00:00
parent ec6db39f19
commit d984c0b20b
4 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/remmina/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2018/07/10 12:35:01 sthen Exp $
# $OpenBSD: Makefile,v 1.34 2018/10/23 19:28:47 jasper Exp $
COMMENT= GTK+3 remote desktop client
@ -6,7 +6,7 @@ GH_TAGNAME= v1.2.30
GH_PROJECT= Remmina
GH_ACCOUNT= FreeRDP
PKGNAME= remmina-${GH_TAGNAME:S/v//}
REVISION= 3
REVISION= 4
CATEGORIES= x11 net
@ -20,7 +20,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ICE SM X11 Xext atk-1.0 avahi-client avahi-common avahi-ui-gtk3
WANTLIB += c cairo freerdp2 freerdp-client2 gcrypt gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-3 intl pango-1.0 pthread ssh ssh_threads
WANTLIB += gthread-2.0 gtk-3 intl pango-1.0 pthread ssh
WANTLIB += telepathy-glib vncclient vte-2.91 xkbfile
WANTLIB += winpr2 soup-2.4 json-glib-1.0 crypto dbus-1 dbus-glib-1 ssl
WANTLIB += cairo-gobject fribidi pangocairo-1.0 secret-1 spice-client-glib-2.0
@ -36,7 +36,7 @@ LIB_DEPENDS= devel/gettext \
devel/vte3 \
net/avahi,,-gtk3 \
net/libvncserver \
security/libssh \
security/libssh>=0.8.4 \
x11/freerdp \
x11/spice-gtk \
x11/gnome/libsecret \

23
x11/remmina/patches/patch-cmake_FindLIBSSH_cmake Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-cmake_FindLIBSSH_cmake,v 1.1 2018/10/23 19:28:47 jasper Exp $
From 8d654eca784d5e1b2c6e853b7beb7ad3d8322290 Mon Sep 17 00:00:00 2001
From: Giovanni Panozzo <giovanni@panozzo.it>
Date: Sun, 12 Aug 2018 00:51:32 +0200
Subject: [PATCH] cmake: include libssh_threads only when available
Index: cmake/FindLIBSSH.cmake
--- cmake/FindLIBSSH.cmake.orig
+++ 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)

8
x11/x2goclient/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2018/09/10 15:47:23 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2018/10/23 19:28:47 jasper Exp $
COMMENT = Qt4 client for the X2Go system
DISTNAME = x2goclient-4.1.2.1
REVISION = 0
REVISION = 1
CATEGORIES = x11
@ -16,13 +16,13 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} ICE QtGui QtNetwork QtSvg SM X11
WANTLIB += Xext Xi Xinerama Xpm Xrender c cups fontconfig freetype
WANTLIB += ldap m ssh ssh_threads
WANTLIB += ldap m ssh
MASTER_SITES = https://code.x2go.org/releases/source/x2goclient/
MODULES += x11/qt4
LIB_DEPENDS += security/libssh \
LIB_DEPENDS += security/libssh>=0.8.4 \
databases/openldap \
print/cups,-libs

14
x11/x2goclient/patches/patch-x2goclient_pro
View File

@ -1,7 +1,19 @@
$OpenBSD: patch-x2goclient_pro,v 1.4 2018/09/10 15:47:23 sthen Exp $
$OpenBSD: patch-x2goclient_pro,v 1.5 2018/10/23 19:28:47 jasper Exp $
It's not required to link with libssh_threads anymore since libssh 0.8
Index: x2goclient.pro
--- x2goclient.pro.orig
+++ x2goclient.pro
@@ -132,7 +132,7 @@ SOURCES += src/sharewidget.cpp \
src/compat.cpp \
src/pulsemanager.cpp
-LIBS += -lssh -lssh_threads
+LIBS += -lssh
win32:LIBS += -lAdvAPI32 -lshell32 -lUser32
RC_FILE = res/x2goclient.rc
@@ -168,7 +168,7 @@ else:message("No translation files in project")
TEMPLATE = app