[arch-commits] Commit in gnome-remote-desktop/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Wednesday, September 9, 2020 @ 18:52:33
  Author: heftig
Revision: 395651

archrelease: copy trunk to extra-x86_64

Added:
  gnome-remote-desktop/repos/extra-x86_64/PKGBUILD
    (from rev 395650, gnome-remote-desktop/trunk/PKGBUILD)
Deleted:
  gnome-remote-desktop/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  106 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 58 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-09 18:52:22 UTC (rev 395650)
+++ PKGBUILD	2020-09-09 18:52:33 UTC (rev 395651)
@@ -1,48 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-remote-desktop
-pkgver=0.1.8
-pkgrel=1
-pkgdesc="GNOME Remote Desktop server"
-url="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
-arch=(x86_64)
-license=(GPL2)
-depends=(glib2 pipewire systemd libvncserver libsecret libnotify dconf)
-makedepends=(git meson)
-checkdepends=(xorg-server-xvfb python-dbus python-gobject mutter)
-groups=(gnome)
-_commit=3141a7efec1529f06e2bcc64b68d8bad02d9a4c1  # tags/0.1.8^0
-source=("git+https://gitlab.gnome.org/jadahl/gnome-remote-desktop.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # Disable the Xvfb abstract socket which leaks out of our containers
-  sed -i 's|-noreset|& -nolisten local|' tests/vnc-test-runner.sh
-}
-
-build() {
-  arch-meson $pkgname build
-  ninja -C build
-}
-
-check() (
-  mkdir -p -m 700 "${XDG_RUNTIME_DIR:=$PWD/runtime-dir}"
-  glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/build/src}"
-  export XDG_RUNTIME_DIR GSETTINGS_SCHEMA_DIR
-
-  pipewire &
-  trap "kill $!; wait" EXIT
-
-  meson test -C build --print-errorlogs
-)
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}

Copied: gnome-remote-desktop/repos/extra-x86_64/PKGBUILD (from rev 395650, gnome-remote-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-09 18:52:33 UTC (rev 395651)
@@ -0,0 +1,58 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=gnome-remote-desktop
+pkgver=0.1.9
+pkgrel=1
+pkgdesc="GNOME Remote Desktop server"
+url="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
+arch=(x86_64)
+license=(GPL2)
+depends=(cairo freerdp glib2 pipewire systemd libvncserver libsecret libnotify dconf)
+makedepends=(git meson)
+checkdepends=(xorg-server-xvfb python-dbus python-gobject mutter)
+groups=(gnome)
+_commit=ba216dc82c7cdfcd2b99066b8be480e6a76cc60b  # tags/0.1.9^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-remote-desktop.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Test fixes
+  sed -e 's|-noreset|& -nolisten local|' \
+      -e 's|dbus-run-session --||' \
+      -i tests/vnc-test-runner.sh
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+_run_tests() {
+  mkdir -p -m 700 "${XDG_RUNTIME_DIR:=$PWD/runtime-dir}"
+  glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/build/src}"
+  export XDG_RUNTIME_DIR GSETTINGS_SCHEMA_DIR
+
+  sed 's/exec pipewire-media-session .*/exec pipewire-media-session -d bluez5,alsa-seq,alsa-pcm/' \
+    </etc/pipewire/pipewire.conf >pipewire.conf
+  export PIPEWIRE_CONFIG_FILE="$PWD/pipewire.conf"
+
+  pipewire &
+  trap "kill $!; wait" EXIT
+
+  meson test -C build --print-errorlogs
+}
+
+check() {
+  dbus-run-session bash -c "$(declare -f _run_tests); _run_tests"
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}