From 44c9f51ea5ea965f18efc14338822d7e9b1ca12e Mon Sep 17 00:00:00 2001 From: Alexander Kapshuna Date: Tue, 25 Aug 2020 11:48:33 +0300 Subject: [PATCH] remmina: version bump to 1.4.8 --- .../remmina/files/fix-share-paths.patch | 35 +++++++++++++++++++ ....3.6.exheres-0 => remmina-1.4.8.exheres-0} | 0 packages/net-misc/remmina/remmina.exlib | 13 ++++++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 packages/net-misc/remmina/files/fix-share-paths.patch rename packages/net-misc/remmina/{remmina-1.3.6.exheres-0 => remmina-1.4.8.exheres-0} (100%) diff --git a/packages/net-misc/remmina/files/fix-share-paths.patch b/packages/net-misc/remmina/files/fix-share-paths.patch new file mode 100644 index 0000000..7863776 --- /dev/null +++ b/packages/net-misc/remmina/files/fix-share-paths.patch @@ -0,0 +1,35 @@ +Upstream: yes https://gitlab.com/Remmina/Remmina/-/merge_requests/2108 + +commit db8cc0e3bb260c316832d4dfdb308641fcb100af +Author: Alexander Kapshuna +Date: Sat Aug 22 17:43:29 2020 +0300 + + Use previously defined DATADIR to install Kiosk files + +diff --git a/data/desktop/CMakeLists.txt b/data/desktop/CMakeLists.txt +index 4f492ce8..eb586af3 100644 +--- a/data/desktop/CMakeLists.txt ++++ b/data/desktop/CMakeLists.txt +@@ -154,19 +154,19 @@ if(WITH_KIOSK_SESSION) + message(STATUS "Kiosk desktop session files will be installed") + install( + FILES remmina-gnome-xsession.desktop +- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/xsessions ++ DESTINATION ${REMMINA_DATADIR}/xsessions + RENAME remmina-gnome.desktop + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ + ) + install( + FILES remmina-gnome.desktop +- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications ++ DESTINATION ${REMMINA_DATADIR}/applications + RENAME remmina-gnome.desktop + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ + ) + install( + FILES remmina-gnome.session +- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gnome-session/sessions ++ DESTINATION ${REMMINA_DATADIR}/gnome-session/sessions + RENAME remmina-gnome.session + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ + ) diff --git a/packages/net-misc/remmina/remmina-1.3.6.exheres-0 b/packages/net-misc/remmina/remmina-1.4.8.exheres-0 similarity index 100% rename from packages/net-misc/remmina/remmina-1.3.6.exheres-0 rename to packages/net-misc/remmina/remmina-1.4.8.exheres-0 diff --git a/packages/net-misc/remmina/remmina.exlib b/packages/net-misc/remmina/remmina.exlib index 6c833a9..e4b597a 100644 --- a/packages/net-misc/remmina/remmina.exlib +++ b/packages/net-misc/remmina/remmina.exlib @@ -13,6 +13,7 @@ HOMEPAGE+=" http://remmina.org/" LICENCES="GPL-2" MYOPTIONS=" + cups ssh ( providers: libressl openssl ) [[ number-selected = exactly-one ]] " @@ -27,14 +28,18 @@ DEPENDENCIES=" dev-libs/glib:2[>=2.30] dev-libs/libgcrypt dev-libs/libsecret:1 + dev-libs/libsodium gnome-desktop/libsoup:2.4 net-libs/libvncserver - net-remote/FreeRDP + net-remote/FreeRDP[>=2.0.0] x11-libs/cairo x11-libs/gdk-pixbuf:2.0 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile + cups? ( + net-print/cups + ) ssh? ( net-libs/libssh dev-libs/vte:2.91 @@ -45,6 +50,10 @@ DEPENDENCIES=" BUGS_TO="hasufell@posteo.de" +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}/fix-share-paths.patch" +) + CMAKE_SRC_CONFIGURE_PARAMS=( # on -DWITH_FREERDP=ON @@ -59,9 +68,11 @@ CMAKE_SRC_CONFIGURE_PARAMS=( -DWITH_AVAHI=OFF -DWITH_SPICE=OFF -DWITH_TELEPATHY=OFF + -DWITH_WWW=OFF ) CMAKE_SRC_CONFIGURE_OPTION_WITHS=( + "cups CUPS" "ssh LIBSSH" "ssh VTE" )