From 5f6fb74b4f227bf49021b7527cbdebb91d7a4b3c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 21 Sep 2021 08:48:37 +0200 Subject: [PATCH] gnome-remote-desktop: update to 41.2. --- .../patches/remove-systemd-dep.patch | 26 ++++++++++++++++ srcpkgs/gnome-remote-desktop/template | 30 ++++--------------- 2 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch new file mode 100644 index 0000000000..129a59dcfa --- /dev/null +++ b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch @@ -0,0 +1,26 @@ +--- a/meson.build ++++ b/meson.build +@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68') + gio_dep = dependency('gio-2.0') + gio_unix_dep = dependency('gio-unix-2.0') + pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0') +-systemd_dep = dependency('systemd', required: get_option('systemd')) + libsecret_dep = dependency('libsecret-1') + libnotify_dep = dependency('libnotify') + epoxy_dep = dependency('epoxy') +@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson', + configinc = include_directories('.') + + servicedir = get_option('systemd_user_unit_dir') +-if systemd_dep.found() +- if servicedir == '' +- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir') +- endif +- +- if servicedir == '' +- error('Couldn\'t determine systemd user unit service directory') +- endif +-endif + + top_srcdir = meson.current_source_dir() + builddir = meson.current_build_dir() diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template index ade928ed6a..30e9b3b2c2 100644 --- a/srcpkgs/gnome-remote-desktop/template +++ b/srcpkgs/gnome-remote-desktop/template @@ -1,37 +1,17 @@ # Template file for 'gnome-remote-desktop' pkgname=gnome-remote-desktop -version=40.1 +version=41.2 revision=1 build_style=meson -configure_args="$(vopt_bool rdp rdp) $(vopt_bool vnc vnc) - -Dsystemd_user_unit_dir=/tmp" +configure_args="-Drdp=true -Dvnc=true -Dnvenc=false + -Dsystemd_user_unit_dir=/var/lib/systemd/user" hostmakedepends="pkg-config glib-devel" makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel - $(vopt_if rdp "freerdp-devel freerdp-server-devel fuse3-devel") - $(vopt_if vnc libvncserver-devel)" + freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel" short_desc="GNOME remote desktop server" maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop" distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz" -checksum=9afa6e525570a372093f9730338270903894f3b1f9f8a9df5f57836ea1d29de9 +checksum=10151e69b648c2247c5e33d9a2ef419f4e037ee5b2bae49e6ed6aca77eb1ba58 make_check=no # xvfb failed to start - -build_options="rdp vnc" -desc_option_rdp="RDP support" -desc_option_vnc="VNC support" -# RDP doesn't currently have GUI in gcs, so it's disabled by default -build_options_default="vnc" - -pre_configure() { - if [ -z "$build_option_rdp" ] && [ -z "$build_option_vnc" ]; then - echo at least one of vnc and rdp options has to be enabled - exit 1 - fi - - vsed -e '/systemd_dep/d' -i meson.build -} - -post_install() { - rm -rf ${DESTDIR}/tmp -}