krdc: add recipe for version 18.08.0

This commit is contained in:
Sergei Reznikov
2018-08-24 18:18:59 +03:00
parent 0ce168cf03
commit 3e8a7a7ebd
2 changed files with 175 additions and 0 deletions

View File

@@ -0,0 +1,109 @@
SUMMARY="Remote Desktop Client"
DESCRIPTION="KRDC is a client application that allows you to view or even \
control the desktop session on another machine that is running a compatible \
server. VNC and RDP is supported."
HOMEPAGE="https://github.com/KDE/krdc/"
COPYRIGHT="2010-2018 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://github.com/KDE/krdc/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="1d5fa9f3577975bedc0e346d5d69b95edf6f4a5ef1bf4b4536af5df27e056d1f"
PATCHES="krdc-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
krdc$secondaryArchSuffix = $portVersion
cmd:krdc$secondaryArchSuffix = $portVersion
lib:libkrdccore$secondaryArchSuffix = $portVersion
app:KRDC$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libKF5Auth$secondaryArchSuffix
lib:libKF5Bookmarks$secondaryArchSuffix
lib:libKF5Codecs$secondaryArchSuffix
lib:libKF5Completion$secondaryArchSuffix
lib:libKF5ConfigCore$secondaryArchSuffix
lib:libKF5ConfigGui$secondaryArchSuffix
lib:libKF5ConfigWidgets$secondaryArchSuffix
lib:libKF5CoreAddons$secondaryArchSuffix
lib:libKF5DNSSD$secondaryArchSuffix
lib:libKF5I18n$secondaryArchSuffix
lib:libKF5IconThemes$secondaryArchSuffix
lib:libKF5ItemViews$secondaryArchSuffix
lib:libKF5KCMUtils$secondaryArchSuffix
lib:libKF5Notifications$secondaryArchSuffix
lib:libKF5NotifyConfig$secondaryArchSuffix
lib:libKF5Service$secondaryArchSuffix
lib:libKF5Wallet$secondaryArchSuffix
lib:libKF5TextWidgets$secondaryArchSuffix
lib:libKF5WidgetsAddons$secondaryArchSuffix
lib:libKF5XmlGui$secondaryArchSuffix
lib:libQt5DBus$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
lib:libQt5Script$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
# lib:libssh2$secondaryArchSuffix
lib:libvncserver$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules >= 5.47
devel:libKF5Auth$secondaryArchSuffix
devel:libKF5Bookmarks$secondaryArchSuffix
devel:libKF5Codecs$secondaryArchSuffix
devel:libKF5Completion$secondaryArchSuffix
devel:libKF5ConfigCore$secondaryArchSuffix
devel:libKF5ConfigWidgets$secondaryArchSuffix
devel:libKF5CoreAddons$secondaryArchSuffix
devel:libKF5DNSSD$secondaryArchSuffix
devel:libKF5I18n$secondaryArchSuffix
devel:libKF5IconThemes$secondaryArchSuffix
devel:libKF5ItemViews$secondaryArchSuffix
devel:libKF5KCMUtils$secondaryArchSuffix
devel:libKF5Notifications$secondaryArchSuffix
devel:libKF5NotifyConfig$secondaryArchSuffix
devel:libKF5Service$secondaryArchSuffix
devel:libKF5Wallet$secondaryArchSuffix
devel:libKF5WidgetsAddons$secondaryArchSuffix
devel:libKF5XmlGui$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix >= 5.7
# devel:libssh2$secondaryArchSuffix
devel:libvncserver$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:make
cmd:python2
"
BUILD()
{
mkdir -p build
cd build
cmake .. $cmakeDirArgs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5
make $jobArgs
}
INSTALL()
{
cd build
make install
}
TEST()
{
cd build
make test
}

View File

@@ -0,0 +1,66 @@
From 25d57fccd5c9760e04fe5aa3fae0aebd23ee2ad0 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 24 Aug 2018 17:55:51 +0300
Subject: Fix build on Haiku
diff --git a/cmake/modules/FindLibSSH.cmake b/cmake/modules/FindLibSSH.cmake
index d9577ea..dc8bd53 100644
--- a/cmake/modules/FindLibSSH.cmake
+++ b/cmake/modules/FindLibSSH.cmake
@@ -20,6 +20,7 @@ find_path(LIBSSH_INCLUDE_DIR
/usr/local/include
/opt/local/include
/sw/include
+ /system/develop/headers
${CMAKE_INCLUDE_PATH}
${CMAKE_INSTALL_PREFIX}/include
)
@@ -33,6 +34,7 @@ find_library(SSH_LIBRARY
/usr/local/lib
/opt/local/lib
/sw/lib
+ /system/develop/lib
${CMAKE_LIBRARY_PATH}
${CMAKE_INSTALL_PREFIX}/lib
)
diff --git a/vnc/CMakeLists.txt b/vnc/CMakeLists.txt
index f76fdf3..e75f284 100644
--- a/vnc/CMakeLists.txt
+++ b/vnc/CMakeLists.txt
@@ -36,6 +36,10 @@ if(LIBVNCSERVER_FOUND)
krdccore
)
+ if(HAIKU)
+ target_link_libraries(krdc_vncplugin network)
+ endif ()
+
if(JPEG_FOUND)
target_link_libraries(krdc_vncplugin ${JPEG_LIBRARIES})
endif(JPEG_FOUND)
diff --git a/vnc/vncclientthread.cpp b/vnc/vncclientthread.cpp
index 39c0342..3d0e06f 100644
--- a/vnc/vncclientthread.cpp
+++ b/vnc/vncclientthread.cpp
@@ -603,7 +603,7 @@ void VncClientThread::clientSetKeepalive()
}
optval = m_keepalive.intervalSeconds;
- if (setsockopt(cl->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) {
+/* if (setsockopt(cl->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) {
qCritical(KRDC) << "setsockopt(TCP_KEEPIDLE)" << strerror(errno);
return;
}
@@ -619,7 +619,7 @@ void VncClientThread::clientSetKeepalive()
qCritical(KRDC) << "setsockopt(TCP_KEEPCNT)" << strerror(errno);
return;
}
- m_keepalive.set = true;
+*/ m_keepalive.set = true;
qCDebug(KRDC) << "TCP keepalive set";
}
--
2.16.4