commit: 9a9314b45e1677f2e23718c03912fb9f44545528 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Apr 25 19:28:20 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 26 08:45:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9314b4
net-misc/remmina: Port KWallet plugin to KF6 Bug: https://bugs.gentoo.org/950750 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../remmina/files/remmina-1.4.40-kf6wallet.patch | 75 +++++++++++++++ net-misc/remmina/remmina-1.4.40-r2.ebuild | 105 +++++++++++++++++++++ 2 files changed, 180 insertions(+) diff --git a/net-misc/remmina/files/remmina-1.4.40-kf6wallet.patch b/net-misc/remmina/files/remmina-1.4.40-kf6wallet.patch new file mode 100644 index 000000000000..8d4ac546cd09 --- /dev/null +++ b/net-misc/remmina/files/remmina-1.4.40-kf6wallet.patch @@ -0,0 +1,75 @@ +From f182bf745768b6891037032371fab5e44d8579ba Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Fri, 25 Apr 2025 21:14:54 +0200 +Subject: [PATCH] Switch KF5Wallet -> KF6Wallet + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + plugins/CMakeLists.txt | 12 ++++++------ + plugins/kwallet/CMakeLists.txt | 14 +++++++------- + 2 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 1aa0878..02daa41 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -127,15 +127,15 @@ endif() + + add_subdirectory(exec) + +-option(WITH_KF5WALLET "Building KF5WALLET plugin" OFF) +-if(WITH_KF5WALLET) +- CheckHasModule(KF5Wallet) +- if(HAS_MODULE_KF5Wallet) ++option(WITH_KF6WALLET "Building KF6WALLET plugin" OFF) ++if(WITH_KF6WALLET) ++ CheckHasModule(KF6Wallet) ++ if(HAS_MODULE_KF6Wallet) + message(STATUS "Enabling KDE Wallet plugin.") +- add_definitions(-DWITH_KF5WALLET) ++ add_definitions(-DWITH_KF6WALLET) + add_subdirectory(kwallet) + else() +- message(FATAL_ERROR "libKF5wallet not found but requested") ++ message(FATAL_ERROR "libKF6wallet not found but requested") + endif() + endif() + +diff --git a/plugins/kwallet/CMakeLists.txt b/plugins/kwallet/CMakeLists.txt +index a448e31..7564bdb 100644 +--- a/plugins/kwallet/CMakeLists.txt ++++ b/plugins/kwallet/CMakeLists.txt +@@ -32,23 +32,23 @@ + + + +-# find_suggested_package(KF5Wallet) has already been run on main CMakeLists.txt ++# find_suggested_package(KF6Wallet) has already been run on main CMakeLists.txt + +-find_suggested_package(KF5Wallet) +-if(KF5Wallet_FOUND) +- message(STATUS "KF5Wallet library found.") +- set(REMMINA_PLUGIN_KF5WALLET_SRCS ++find_suggested_package(KF6Wallet) ++if(KF6Wallet_FOUND) ++ message(STATUS "KF6Wallet library found.") ++ set(REMMINA_PLUGIN_KF6WALLET_SRCS + src/kwallet_plugin_main.c + src/kwallet_plugin.cpp + src/kwallet_plugin.h + ) + +- add_library(remmina-plugin-kwallet MODULE ${REMMINA_PLUGIN_KF5WALLET_SRCS}) ++ add_library(remmina-plugin-kwallet MODULE ${REMMINA_PLUGIN_KF6WALLET_SRCS}) + set_target_properties(remmina-plugin-kwallet PROPERTIES PREFIX "") + set_target_properties(remmina-plugin-kwallet PROPERTIES NO_SONAME 1) + + include_directories(${GTK_INCLUDE_DIRS}) +- target_link_libraries(remmina-plugin-kwallet KF5::Wallet ${GLib_LIBRARY}) ++ target_link_libraries(remmina-plugin-kwallet KF6::Wallet ${GLib_LIBRARY}) + + install(TARGETS remmina-plugin-kwallet DESTINATION ${REMMINA_PLUGINDIR}) + endif() +-- +2.49.0 + diff --git a/net-misc/remmina/remmina-1.4.40-r2.ebuild b/net-misc/remmina/remmina-1.4.40-r2.ebuild new file mode 100644 index 000000000000..827f17d363eb --- /dev/null +++ b/net-misc/remmina/remmina-1.4.40-r2.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +MY_P="${PN^}-v${PV}" +inherit cmake python-single-r1 xdg + +DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client" +HOMEPAGE="https://remmina.org/"; +SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"; +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf X" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) || ( X wayland )" + +COMMON_DEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libpcre2 + dev-libs/libsodium:= + dev-libs/openssl:0= + x11-libs/gdk-pixbuf + x11-libs/gtk+:3[X?,wayland?] + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) + appindicator? ( dev-libs/libayatana-appindicator ) + crypt? ( dev-libs/libgcrypt:0= ) + keyring? ( app-crypt/libsecret ) + gvnc? ( net-libs/gtk-vnc ) + kwallet? ( kde-frameworks/kwallet:6 ) + python? ( ${PYTHON_DEPS} ) + rdp? ( >=net-misc/freerdp-3.11.0:3= + cups? ( net-print/cups:= ) ) + spice? ( net-misc/spice-gtk[gtk3] ) + ssh? ( net-libs/libssh:0=[sftp] + x11-libs/vte:2.91 ) + vnc? ( net-libs/libvncserver[jpeg] ) + webkit? ( net-libs/webkit-gtk:4.1 ) + zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) +" +DEPEND=" + ${COMMON_DEPEND} + spice? ( app-emulation/spice-protocol ) +" +RDEPEND=" + ${COMMON_DEPEND} + virtual/freedesktop-icon-theme +" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) + +PATCHES=( + "${FILESDIR}/${P}-libssh-no.patch" + "${FILESDIR}/${P}-kf6wallet.patch" # bug 950750; TODO: upstream +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + xdg_environment_reset + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF) + -DWITH_AVAHI=$(usex zeroconf) + -DWITH_CUPS=$(usex cups) + -DWITH_EXAMPLES=$(usex examples) + -DWITH_FREERDP=$(usex rdp) + -DWITH_FREERDP3=ON + -DWITH_GCRYPT=$(usex crypt) + -DWITH_GETTEXT=$(usex nls) + -DWITH_ICON_CACHE=OFF + -DWITH_KF6WALLET=$(usex kwallet) + -DWITH_LIBSECRET=$(usex keyring) + -DWITH_LIBSSH=$(usex ssh) + -DWITH_LIBVNCSERVER=$(usex vnc) + -DWITH_PYTHONLIBS=$(usex python ON OFF) + -DWITH_SPICE=$(usex spice) + -DWITH_TRANSLATIONS=$(usex nls) + -DWITH_UPDATE_DESKTOP_DB=OFF + -DWITH_VTE=$(usex ssh) + -DWITH_WWW=$(usex webkit) + -DWITH_X2GO=OFF + # when this feature is stable, add python eclass usage to optionally enable + -DWITH_PYTHON=OFF + ) + cmake_src_configure +}
