remmina: version bump to 1.4.3 #25
|
|
@ -0,0 +1,30 @@
|
|||
Upstream: no
|
||||
|
|
||||
Reason: respect Exherbo paths
|
||||
|
||||
diff --git a/data/desktop/CMakeLists.txt b/data/desktop/CMakeLists.txt
|
||||
index bc7986cf..aa306bf8 100644
|
||||
--- a/data/desktop/CMakeLists.txt
|
||||
+++ b/data/desktop/CMakeLists.txt
|
||||
@@ -144,19 +144,19 @@ install(
|
||||
# Kiosk Session Files
|
||||
install(
|
||||
FILES remmina-gnome-xsession.desktop
|
||||
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/xsessions
|
||||
kapsh
commented
puts .desktop files into /usr/x86_64-pc-linux-gnu/share puts .desktop files into /usr/x86_64-pc-linux-gnu/share
hasufell
commented
I'm not sure this should be I'm not sure this should be `REMMINA_DATADIR`. The build system, last I checked, uses `GNUInstallDirs`. Usually for such files that are not specific to the application runtime, CMAKE_INSTALL_DATAROOTDIR is used: https://github.com/Kitware/CMake/blob/master/Modules/GNUInstallDirs.cmake#L57
kapsh
commented
I don't know why remmina owners prefer to roll their own variable even with gnuinstalldirs in action (see https://gitlab.com/Remmina/Remmina/-/blob/master/CMakeLists.txt#L234). I'll follow your advice and try to upstream this patch and we'll see what they have to say about that. I don't know why remmina owners prefer to roll their own variable even with gnuinstalldirs in action (see https://gitlab.com/Remmina/Remmina/-/blob/master/CMakeLists.txt#L234). I'll follow your advice and try to upstream this patch and we'll see what they have to say about that.
|
||||
+ 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
|
||||
)
|
||||
|
|
@ -13,6 +13,7 @@ HOMEPAGE+=" http://remmina.org/"
|
|||
|
||||
LICENCES="GPL-2"
|
||||
MYOPTIONS="
|
||||
cups
|
||||
|
kapsh
commented
Option introduced because Option introduced because `cups` usually added this way for other packages.
|
||||
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
|
||||
|
|
@ -62,6 +71,7 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
|
|||
)
|
||||
|
||||
CMAKE_SRC_CONFIGURE_OPTION_WITHS=(
|
||||
"cups CUPS"
|
||||
"ssh LIBSSH"
|
||||
"ssh VTE"
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Why not? I provided patches to upstream before. We don't want to maintain it downstream.
https://gitlab.com/Remmina/Remmina