[arch-commits] Commit in xdg-desktop-portal/trunk (PKGBUILD hack.diff)
Date: Friday, December 20, 2019 @ 14:34:51
Author: heftig
Revision: 371994
1.6.0-1
Modified:
xdg-desktop-portal/trunk/PKGBUILD
xdg-desktop-portal/trunk/hack.diff
---+
PKGBUILD |6 +++---
hack.diff | 22 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-20 14:32:09 UTC (rev 371993)
+++ PKGBUILD2019-12-20 14:34:51 UTC (rev 371994)
@@ -2,7 +2,7 @@
# Contributor: Patrick Griffis
pkgname=xdg-desktop-portal
-pkgver=1.5.4
+pkgver=1.6.0
pkgrel=1
pkgdesc="Desktop integration portals for sandboxed apps"
url="https://github.com/flatpak/xdg-desktop-portal;
@@ -11,11 +11,11 @@
depends=(glib2 pipewire fuse2 geoclue2)
makedepends=(python xmlto docbook-xsl git flatpak libportal)
checkdepends=(epiphany gedit gvfs)
-_commit=5f14b2703a994041dda543ed2d57c47b0ff251b1 # tags/1.5.4^0
+_commit=28b93e213a83c78bb6d65d5a1a65c57d62957827 # tags/1.6.0^0
source=("git+https://github.com/flatpak/xdg-desktop-portal#commit=$_commit;
hack.diff)
sha256sums=('SKIP'
-'9b5097ce035fff9f9bebb6963e509b6597b3d5f0cceda26321cf228d8d59cf5d')
+'949ce781ed3393e05f3bffdd0048aca976e0a35d9babeea9ec9d86ab8a00e871')
pkgver() {
cd $pkgname
Modified: hack.diff
===
--- hack.diff 2019-12-20 14:32:09 UTC (rev 371993)
+++ hack.diff 2019-12-20 14:34:51 UTC (rev 371994)
@@ -1,5 +1,5 @@
diff --git i/tests/camera.c w/tests/camera.c
-index 4ef0176..197e77d 100644
+index 4fefbe4..7957d72 100644
--- i/tests/camera.c
+++ w/tests/camera.c
@@ -239,29 +239,31 @@ test_camera_lockdown (void)
@@ -24,7 +24,7 @@
portal = xdp_portal_new ();
got_info = 0;
- xdp_portal_access_camera (portal, NULL, NULL, camera_cb, keyfile);
+ xdp_portal_access_camera (portal, NULL, 0, NULL, camera_cb, keyfile);
while (!got_info)
g_main_context_iteration (NULL, TRUE);
@@ -35,7 +35,7 @@
/* Test the effect of the user denying the access dialog */
diff --git i/tests/filechooser.c w/tests/filechooser.c
-index 0cb4f41..a60f736 100644
+index a5f9b2c..799f24b 100644
--- i/tests/filechooser.c
+++ w/tests/filechooser.c
@@ -871,29 +871,31 @@ test_save_file_lockdown (void)
@@ -60,7 +60,7 @@
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);
+ 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);
@@ -71,7 +71,7 @@
void
diff --git i/tests/location.c w/tests/location.c
-index 207ed3f..ced3406 100644
+index 0395f77..89cdef6 100644
--- i/tests/location.c
+++ w/tests/location.c
@@ -30,10 +30,8 @@ test_location_basic (void)
@@ -97,10 +97,10 @@
portal = xdp_portal_new ();
diff --git i/tests/openuri.c w/tests/openuri.c
-index cacf1f8..c252696 100644
+index ddff074..ba02bfd 100644
--- i/tests/openuri.c
+++ w/tests/openuri.c
-@@ -328,28 +328,30 @@ test_open_uri_lockdown (void)
+@@ -366,28 +366,30 @@ test_open_uri_lockdown (void)
g_autofree char *path = NULL;
xdp_impl_lockdown_set_disable_application_handlers (lockdown, TRUE);
@@ -121,7 +121,7 @@
portal = xdp_portal_new ();
got_info = 0;
- xdp_portal_open_uri (portal, NULL, "http://www.flatpak.org;, FALSE, NULL,
open_uri_cb, keyfile);
+ 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);
@@ -132,7 +132,7 @@
static void
diff --git i/tests/print.c w/tests/print.c
-index 3effde8..4a77359 100644
+index 1b9be72..ddcac42 100644
--- i/tests/print.c
+++ w/tests/print.c
@@ -187,28 +187,30 @@ test_prepare_print_lockdown (void)
@@ -156,7 +156,7 @@
portal = xdp_portal_new ();
got_info = 0;
- xdp_portal_prepare_print (portal, NULL, "test", FALSE, NULL, NULL, NULL,
prepare_cb, keyfile);
+ xdp_portal_prepare_print (portal, NULL, "test", NULL, NULL, 0, NULL,
prepare_cb, keyfile);
while (!got_info)
g_main_context_iteration (NULL, TRUE);
@@ -187,7 +187,7 @@
portal = xdp_portal_new ();
got_info = 0;
- xdp_portal_print_file (portal, NULL, "test", FALSE, 0, path, NULL,
print_cb, keyfile);
+ xdp_portal_print_file (portal, NULL, "test", 0, path, 0, NULL, print_cb,
keyfile);
while (!got_info)
g_main_context_iteration (NULL, TRUE);
[arch-commits] Commit in xdg-desktop-portal/trunk (PKGBUILD hack.diff)
Date: Wednesday, November 27, 2019 @ 22:35:36
Author: heftig
Revision: 369850
1.5.3-1
Modified:
xdg-desktop-portal/trunk/PKGBUILD
xdg-desktop-portal/trunk/hack.diff
---+
PKGBUILD |8
hack.diff | 30 --
2 files changed, 32 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-27 22:35:26 UTC (rev 369849)
+++ PKGBUILD2019-11-27 22:35:36 UTC (rev 369850)
@@ -2,7 +2,7 @@
# Contributor: Patrick Griffis
pkgname=xdg-desktop-portal
-pkgver=1.5.2
+pkgver=1.5.3
pkgrel=1
pkgdesc="Desktop integration portals for sandboxed apps"
url="https://github.com/flatpak/xdg-desktop-portal;
@@ -10,12 +10,12 @@
license=(LGPL2.1)
depends=(glib2 pipewire fuse2 geoclue2)
makedepends=(python xmlto docbook-xsl git flatpak libportal)
-checkdepends=(epiphany gedit)
-_commit=5a4e6ed3b4c9322a6e3e79dd10cb881f25e84335 # tags/1.5.2^0
+checkdepends=(epiphany gedit gvfs)
+_commit=10f5120f8fa88975885975fa7cc384570969122c # tags/1.5.3^0
source=("git+https://github.com/flatpak/xdg-desktop-portal#commit=$_commit;
hack.diff)
sha256sums=('SKIP'
-'dfa41dea8882db18b2e9671118f09626a2cc1d17bafcffa578165cab9d58826c')
+'9b5097ce035fff9f9bebb6963e509b6597b3d5f0cceda26321cf228d8d59cf5d')
pkgver() {
cd $pkgname
Modified: hack.diff
===
--- hack.diff 2019-11-27 22:35:26 UTC (rev 369849)
+++ hack.diff 2019-11-27 22:35:36 UTC (rev 369850)
@@ -70,11 +70,37 @@
}
void
+diff --git i/tests/location.c w/tests/location.c
+index 207ed3f..ced3406 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 f55e064..3477dfa 100644
+index cacf1f8..c252696 100644
--- i/tests/openuri.c
+++ w/tests/openuri.c
-@@ -247,28 +247,30 @@ test_open_uri_lockdown (void)
+@@ -328,28 +328,30 @@ test_open_uri_lockdown (void)
g_autofree char *path = NULL;
xdp_impl_lockdown_set_disable_application_handlers (lockdown, TRUE);
[arch-commits] Commit in xdg-desktop-portal/trunk (PKGBUILD hack.diff)
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
===
--- PKGBUILD2019-10-29 21:58:45 UTC (rev 366081)
+++ PKGBUILD2019-10-29 22:16:16 UTC (rev 366082)
@@ -2,7 +2,7 @@
# Contributor: Patrick Griffis
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, );
+ 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, );
+ 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,
