[arch-commits] Commit in xdg-desktop-portal/repos (3 files)
Jan Steffens
heftig at archlinux.org
Sun Mar 8 08:13:46 UTC 2020
Date: Sunday, March 8, 2020 @ 08:13:45
Author: heftig
Revision: 377129
archrelease: copy trunk to testing-x86_64
Added:
xdg-desktop-portal/repos/testing-x86_64/
xdg-desktop-portal/repos/testing-x86_64/PKGBUILD
(from rev 377127, xdg-desktop-portal/trunk/PKGBUILD)
xdg-desktop-portal/repos/testing-x86_64/hack.diff
(from rev 377127, xdg-desktop-portal/trunk/hack.diff)
-----------+
PKGBUILD | 53 +++++++++++++++
hack.diff | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 252 insertions(+)
Copied: xdg-desktop-portal/repos/testing-x86_64/PKGBUILD (from rev 377127, xdg-desktop-portal/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2020-03-08 08:13:45 UTC (rev 377129)
@@ -0,0 +1,53 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Patrick Griffis <tingping at tingping.se>
+
+pkgname=xdg-desktop-portal
+pkgver=1.6.0
+pkgrel=2
+pkgdesc="Desktop integration portals for sandboxed apps"
+url="https://github.com/flatpak/xdg-desktop-portal"
+arch=(x86_64)
+license=(LGPL2.1)
+depends=(glib2 pipewire fuse2 geoclue2)
+makedepends=(python xmlto docbook-xsl git flatpak libportal)
+checkdepends=(epiphany gedit gvfs)
+_commit=28b93e213a83c78bb6d65d5a1a65c57d62957827 # tags/1.6.0^0
+source=("git+https://github.com/flatpak/xdg-desktop-portal#commit=$_commit"
+ hack.diff)
+sha256sums=('SKIP'
+ '949ce781ed3393e05f3bffdd0048aca976e0a35d9babeea9ec9d86ab8a00e871')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # pipewire 0.3
+ git cherry-pick -n a38901e5e7f835efe7b7a06c55790c8c20bc91a2
+
+ # Make tests pass
+ # https://github.com/flatpak/xdg-desktop-portal/issues/394
+ git apply -3 ../hack.diff
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ make
+}
+
+check() {
+ cd $pkgname
+ make check
+}
+
+package() {
+ depends+=(xdg-desktop-portal-impl)
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Copied: xdg-desktop-portal/repos/testing-x86_64/hack.diff (from rev 377127, xdg-desktop-portal/trunk/hack.diff)
===================================================================
--- testing-x86_64/hack.diff (rev 0)
+++ testing-x86_64/hack.diff 2020-03-08 08:13:45 UTC (rev 377129)
@@ -0,0 +1,199 @@
+diff --git i/tests/camera.c w/tests/camera.c
+index 4fefbe4..7957d72 100644
+--- i/tests/camera.c
++++ w/tests/camera.c
+@@ -239,29 +239,31 @@ test_camera_lockdown (void)
+ require_pipewire ();
+ reset_camera_permissions ();
+ xdp_impl_lockdown_set_disable_camera (lockdown, TRUE);
++ sleep (1);
+
+ keyfile = g_key_file_new ();
+
+ g_key_file_set_integer (keyfile, "backend", "delay", 200);
+ g_key_file_set_integer (keyfile, "result", "marker", 4);
+ g_key_file_set_integer (keyfile, "backend", "response", 0);
+ g_key_file_set_integer (keyfile, "result", "response", 2);
+ g_key_file_set_integer (keyfile, "result", "error_domain", XDG_DESKTOP_PORTAL_ERROR);
+ g_key_file_set_integer (keyfile, "result", "error_code", XDG_DESKTOP_PORTAL_ERROR_NOT_ALLOWED);
+
+ path = g_build_filename (outdir, "access", NULL);
+ g_key_file_save_to_file (keyfile, path, &error);
+ g_assert_no_error (error);
+
+ portal = xdp_portal_new ();
+
+ got_info = 0;
+ xdp_portal_access_camera (portal, NULL, 0, NULL, camera_cb, keyfile);
+
+ while (!got_info)
+ g_main_context_iteration (NULL, TRUE);
+
+ xdp_impl_lockdown_set_disable_camera (lockdown, FALSE);
++ sleep (1);
+ }
+
+ /* Test the effect of the user denying the access dialog */
+diff --git i/tests/filechooser.c w/tests/filechooser.c
+index a5f9b2c..799f24b 100644
+--- i/tests/filechooser.c
++++ w/tests/filechooser.c
+@@ -871,29 +871,31 @@ test_save_file_lockdown (void)
+ };
+
+ xdp_impl_lockdown_set_disable_save_to_disk (lockdown, TRUE);
++ sleep (1);
+
+ keyfile = g_key_file_new ();
+
+ g_key_file_set_integer (keyfile, "backend", "delay", 200);
+ g_key_file_set_integer (keyfile, "backend", "response", 0);
+ g_key_file_set_integer (keyfile, "result", "response", 2);
+ g_key_file_set_integer (keyfile, "result", "error_domain", XDG_DESKTOP_PORTAL_ERROR);
+ g_key_file_set_integer (keyfile, "result", "error_code", XDG_DESKTOP_PORTAL_ERROR_NOT_ALLOWED);
+ g_key_file_set_string_list (keyfile, "result", "uris", uris, g_strv_length ((char **)uris));
+
+ path = g_build_filename (outdir, "filechooser", NULL);
+ g_key_file_save_to_file (keyfile, path, &error);
+ g_assert_no_error (error);
+
+ portal = xdp_portal_new ();
+
+ got_info = 0;
+ xdp_portal_save_file (portal, NULL, "test", "test_file.txt", NULL, NULL, NULL, NULL, NULL, 0, NULL, save_file_cb, keyfile);
+
+ while (!got_info)
+ g_main_context_iteration (NULL, TRUE);
+
+ xdp_impl_lockdown_set_disable_save_to_disk (lockdown, FALSE);
++ sleep (1);
+ }
+
+ void
+diff --git i/tests/location.c w/tests/location.c
+index 0395f77..89cdef6 100644
+--- i/tests/location.c
++++ w/tests/location.c
+@@ -30,10 +30,8 @@ test_location_basic (void)
+ {
+ g_autoptr(XdpPortal) portal = NULL;
+
+-#ifndef HAVE_GEOCLUE
+ g_test_skip ("Skipping tests that require geoclue");
+ return;
+-#endif
+
+ portal = xdp_portal_new ();
+
+@@ -67,10 +65,8 @@ test_location_accuracy (void)
+ {
+ g_autoptr(XdpPortal) portal = NULL;
+
+-#ifndef HAVE_GEOCLUE
+ g_test_skip ("Skipping tests that require geoclue");
+ return;
+-#endif
+
+ portal = xdp_portal_new ();
+
+diff --git i/tests/openuri.c w/tests/openuri.c
+index ddff074..ba02bfd 100644
+--- i/tests/openuri.c
++++ w/tests/openuri.c
+@@ -366,28 +366,30 @@ test_open_uri_lockdown (void)
+ g_autofree char *path = NULL;
+
+ xdp_impl_lockdown_set_disable_application_handlers (lockdown, TRUE);
++ sleep (1);
+
+ keyfile = g_key_file_new ();
+
+ g_key_file_set_integer (keyfile, "backend", "delay", 200);
+ g_key_file_set_integer (keyfile, "backend", "response", 0);
+ g_key_file_set_integer (keyfile, "result", "response", 2);
+ g_key_file_set_integer (keyfile, "result", "error_domain", XDG_DESKTOP_PORTAL_ERROR);
+ g_key_file_set_integer (keyfile, "result", "error_code", XDG_DESKTOP_PORTAL_ERROR_NOT_ALLOWED);
+
+ path = g_build_filename (outdir, "appchooser", NULL);
+ g_key_file_save_to_file (keyfile, path, &error);
+ g_assert_no_error (error);
+
+ portal = xdp_portal_new ();
+
+ got_info = 0;
+ xdp_portal_open_uri (portal, NULL, "http://www.flatpak.org", 0, NULL, open_uri_cb, keyfile);
+
+ while (!got_info)
+ g_main_context_iteration (NULL, TRUE);
+
+ xdp_impl_lockdown_set_disable_application_handlers (lockdown, FALSE);
++ sleep (1);
+ }
+
+ static void
+diff --git i/tests/print.c w/tests/print.c
+index 1b9be72..ddcac42 100644
+--- i/tests/print.c
++++ w/tests/print.c
+@@ -187,28 +187,30 @@ test_prepare_print_lockdown (void)
+ g_autofree char *path = NULL;
+
+ xdp_impl_lockdown_set_disable_printing (lockdown, TRUE);
++ sleep (1);
+
+ keyfile = g_key_file_new ();
+
+ g_key_file_set_integer (keyfile, "backend", "delay", 200);
+ g_key_file_set_integer (keyfile, "backend", "response", 0);
+ g_key_file_set_integer (keyfile, "result", "response", 2);
+ g_key_file_set_integer (keyfile, "result", "error_domain", XDG_DESKTOP_PORTAL_ERROR);
+ g_key_file_set_integer (keyfile, "result", "error_code", XDG_DESKTOP_PORTAL_ERROR_NOT_ALLOWED);
+
+ path = g_build_filename (outdir, "print", NULL);
+ g_key_file_save_to_file (keyfile, path, &error);
+ g_assert_no_error (error);
+
+ portal = xdp_portal_new ();
+
+ got_info = 0;
+ xdp_portal_prepare_print (portal, NULL, "test", NULL, NULL, 0, NULL, prepare_cb, keyfile);
+
+ while (!got_info)
+ g_main_context_iteration (NULL, TRUE);
+
+ xdp_impl_lockdown_set_disable_printing (lockdown, FALSE);
++ sleep (1);
+ }
+
+ void
+@@ -427,28 +429,30 @@ test_print_lockdown (void)
+ g_autoptr(GDBusConnection) session_bus = NULL;
+
+ xdp_impl_lockdown_set_disable_printing (lockdown, TRUE);
++ sleep (1);
+
+ keyfile = g_key_file_new ();
+
+ g_key_file_set_integer (keyfile, "backend", "delay", 200);
+ g_key_file_set_integer (keyfile, "backend", "response", 0);
+ g_key_file_set_integer (keyfile, "result", "response", 2);
+ g_key_file_set_integer (keyfile, "result", "error_domain", XDG_DESKTOP_PORTAL_ERROR);
+ g_key_file_set_integer (keyfile, "result", "error_code", XDG_DESKTOP_PORTAL_ERROR_NOT_ALLOWED);
+
+ path = g_build_filename (outdir, "print", NULL);
+ g_key_file_save_to_file (keyfile, path, &error);
+ g_assert_no_error (error);
+
+ portal = xdp_portal_new ();
+
+ got_info = 0;
+ xdp_portal_print_file (portal, NULL, "test", 0, path, 0, NULL, print_cb, keyfile);
+
+ while (!got_info)
+ g_main_context_iteration (NULL, TRUE);
+
+ xdp_impl_lockdown_set_disable_printing (lockdown, FALSE);
++ sleep (1);
+ }
+
+ void
More information about the arch-commits
mailing list