remmina: version bump to 1.4.8

This commit is contained in:
Alexander Kapshuna 2020-08-25 11:48:33 +03:00
parent 0a9e434c93
commit 44c9f51ea5
3 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,35 @@
Upstream: yes https://gitlab.com/Remmina/Remmina/-/merge_requests/2108
commit db8cc0e3bb260c316832d4dfdb308641fcb100af
Author: Alexander Kapshuna <kapsh@kap.sh>
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
)

View File

@ -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"
)