diff options
Diffstat (limited to 'user/krdc')
| -rw-r--r-- | user/krdc/APKBUILD | 9 | ||||
| -rw-r--r-- | user/krdc/libvncserver-modern-c.patch | 124 |
2 files changed, 130 insertions, 3 deletions
diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index b49bd1056..249d99c72 100644 --- a/user/krdc/APKBUILD +++ b/user/krdc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krdc pkgver=22.04.2 -pkgrel=0 +pkgrel=1 pkgdesc="View and control remote desktops (VNC)" url="https://www.kde.org/applications/internet/krdc/" arch="all" @@ -14,7 +14,9 @@ makedepends="cmake extra-cmake-modules kcmutils-dev kdnssd-dev kiconthemes-dev kcompletion-dev kwallet-dev kwidgetsaddons-dev knotifyconfig-dev libvncserver-dev $depends_dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/krdc-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/krdc-$pkgver.tar.xz + libvncserver-modern-c.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -40,4 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="56e87131310708d81de044240917f6afa6d332209ef0468f73b944f3b5781e27b9adbb1b9bdde735d8a9aa5adf73f0c7142f37716b84e59307b39a31872db3fb krdc-22.04.2.tar.xz" +sha512sums="56e87131310708d81de044240917f6afa6d332209ef0468f73b944f3b5781e27b9adbb1b9bdde735d8a9aa5adf73f0c7142f37716b84e59307b39a31872db3fb krdc-22.04.2.tar.xz +7a9d01154b3eafec3d0d5f2aa93cf0608478e2e63c0b566ca7113d6f522f91c45b2264b05c190af5c10051ce47957b32684f2ab95fedd3c6a43d9c2da406a16a libvncserver-modern-c.patch" diff --git a/user/krdc/libvncserver-modern-c.patch b/user/krdc/libvncserver-modern-c.patch new file mode 100644 index 000000000..d68ee1e17 --- /dev/null +++ b/user/krdc/libvncserver-modern-c.patch @@ -0,0 +1,124 @@ +Needed for newer GCC. + +From 20c8099d34fc495784b360af131195c851c116f8 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Thu, 9 May 2024 16:53:56 +0200 +Subject: [PATCH] Use PkgConfig to find vncclient + +This is more robust than the custom find module +--- + CMakeLists.txt | 9 ++---- + cmake/modules/FindLibVNCServer.cmake | 48 ---------------------------- + vnc/CMakeLists.txt | 7 +--- + vnc/qtonly/CMakeLists.txt | 12 ++----- + 4 files changed, 6 insertions(+), 70 deletions(-) + delete mode 100644 cmake/modules/FindLibVNCServer.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c1318839..d5b6dd25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,13 +72,8 @@ set(CMAKE_CXX_STANDARD 20) + add_subdirectory(core) + + if(WITH_VNC) +- find_package(LibVNCServer) +- set_package_properties(LibVNCServer PROPERTIES +- DESCRIPTION "VNC server / client library" +- URL "http://libvncserver.sourceforge.net/" +- PURPOSE "Needed to build VNC client support in KRDC" +- TYPE REQUIRED +- ) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(VNCCLIENT libvncclient REQUIRED IMPORTED_TARGET) + + find_package(LibSSH) + set_package_properties(LibSSH PROPERTIES +diff --git a/cmake/modules/FindLibVNCServer.cmake b/cmake/modules/FindLibVNCServer.cmake +deleted file mode 100644 +index f6634b6e..00000000 +--- a/cmake/modules/FindLibVNCServer.cmake ++++ /dev/null +@@ -1,48 +0,0 @@ +-# cmake macro to test LIBVNCSERVER LIB +- +-# SPDX-FileCopyrightText: 2006 Alessandro Praduroux <pradu@pradu.it> +-# SPDX-FileCopyrightText: 2007 Urs Wolfer <uwolfer@kde.org> +-# +-# SPDX-License-Identifier: BSD-3-Clause +- +-IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES) +- # Already in cache, be silent +- SET(LIBVNCSERVER_FIND_QUIETLY TRUE) +-ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES) +- +-FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h) +- +-FIND_LIBRARY(LIBVNCSERVER_LIBRARIES NAMES vncserver libvncserver) +- +-# libvncserver and libvncclient are in the same package, so it does +-# not make sense to add a new cmake script for finding libvncclient. +-# instead just find the libvncclient also in this file. +-FIND_PATH(LIBVNCCLIENT_INCLUDE_DIR rfb/rfbclient.h) +-FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient) +- +-IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES) +- SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}") +- SET(_TEST_SOURCE_CODE " +-#include <rfb/rfbclient.h> +- +-int main() +-{ +- rfbClient* tmp; +- tmp->GotXCutText; +- return 0; +-} +- ") +- CHECK_CXX_SOURCE_COMPILES("${_TEST_SOURCE_CODE}" LIBVNCSERVER_FOUND) +-ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES) +- +-IF (LIBVNCSERVER_FOUND) +- IF (NOT LIBVNCSERVER_FIND_QUIETLY) +- MESSAGE(STATUS "Found LibVNCServer: ${LIBVNCSERVER_LIBRARIES}") +- ENDIF (NOT LIBVNCSERVER_FIND_QUIETLY) +-ELSE (LIBVNCSERVER_FOUND) +- IF (LIBVNCSERVER_FIND_REQUIRED) +- MESSAGE(FATAL_ERROR "Could NOT find acceptable version of LibVNCServer (version 0.9 or later required).") +- ENDIF (LIBVNCSERVER_FIND_REQUIRED) +-ENDIF (LIBVNCSERVER_FOUND) +- +-MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES) +diff --git a/vnc/CMakeLists.txt b/vnc/CMakeLists.txt +index 9bc06626..edd67f0d 100644 +--- a/vnc/CMakeLists.txt ++++ b/vnc/CMakeLists.txt +@@ -19,17 +19,13 @@ ki18n_wrap_ui(krdc_vncplugin + vncpreferences.ui + ) + +-target_include_directories(krdc_vncplugin PRIVATE +- ${LIBVNCCLIENT_INCLUDE_DIR} +-) +- + target_link_libraries(krdc_vncplugin + Qt::Core + KF5::ConfigCore + KF5::CoreAddons + KF5::XmlGui + Qt::Gui +- ${LIBVNCCLIENT_LIBRARIES} ++ PkgConfig::VNCCLIENT + krdccore + ) + +@@ -58,7 +54,6 @@ target_link_libraries(kcm_krdc_vncplugin + KF5::CoreAddons + KF5::XmlGui + Qt::Gui +- ${LIBVNCCLIENT_LIBRARIES} + krdccore + ) + +-- +GitLab + |