Date: Tuesday, October 29, 2019 @ 22:16:16 Author: heftig Revision: 366082
1.5.2-1 Added: xdg-desktop-portal/trunk/hack.diff Modified: xdg-desktop-portal/trunk/PKGBUILD -----------+ PKGBUILD | 20 ++++-- hack.diff | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-29 21:58:45 UTC (rev 366081) +++ PKGBUILD 2019-10-29 22:16:16 UTC (rev 366082) @@ -2,7 +2,7 @@ # Contributor: Patrick Griffis <tingp...@tingping.se> pkgname=xdg-desktop-portal -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="Desktop integration portals for sandboxed apps" url="https://github.com/flatpak/xdg-desktop-portal" @@ -9,10 +9,13 @@ arch=(x86_64) license=(LGPL2.1) depends=(glib2 pipewire fuse2 geoclue2) -makedepends=(python xmlto docbook-xsl git flatpak libportal) -_commit=c9f727e26ce1ce7c504a92bf59d0fe88e824918f # tags/1.5.1^0 -source=("git+https://github.com/flatpak/xdg-desktop-portal#commit=$_commit") -sha256sums=('SKIP') +makedepends=(python xmlto docbook-xsl git flatpak) +checkdepends=(libportal epiphany gedit) +_commit=5a4e6ed3b4c9322a6e3e79dd10cb881f25e84335 # tags/1.5.2^0 +source=("git+https://github.com/flatpak/xdg-desktop-portal#commit=$_commit" + hack.diff) +sha256sums=('SKIP' + 'dfa41dea8882db18b2e9671118f09626a2cc1d17bafcffa578165cab9d58826c') pkgver() { cd $pkgname @@ -21,12 +24,17 @@ prepare() { cd $pkgname + + # 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 --enable-pipewire + ./configure --prefix=/usr --libexecdir=/usr/lib make } Added: hack.diff =================================================================== --- hack.diff (rev 0) +++ hack.diff 2019-10-29 22:16:16 UTC (rev 366082) @@ -0,0 +1,173 @@ +diff --git i/tests/camera.c w/tests/camera.c +index 4ef0176..197e77d 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, 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 0cb4f41..a60f736 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", FALSE, "test_file.txt", NULL, NULL, NULL, NULL, NULL, 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/openuri.c w/tests/openuri.c +index f55e064..3477dfa 100644 +--- i/tests/openuri.c ++++ w/tests/openuri.c +@@ -247,28 +247,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", FALSE, 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 3effde8..4a77359 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", FALSE, NULL, NULL, 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", FALSE, 0, path, NULL, print_cb, keyfile); + + while (!got_info) + g_main_context_iteration (NULL, TRUE); + + xdp_impl_lockdown_set_disable_printing (lockdown, FALSE); ++ sleep (1); + } + + void