[staging-next] xdg-desktop-portal: 1.18.4 -> 1.20.0 #387894
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,32 @@ | ||
| { | ||
| lib, | ||
| pkgs, | ||
| makeInstalledTest, | ||
| ... | ||
| }: | ||
|
|
||
| makeInstalledTest { | ||
| tested = pkgs.xdg-desktop-portal; | ||
|
|
||
| testConfig = { | ||
| environment.variables = { | ||
| GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" [ | ||
| pkgs.glib.out | ||
| pkgs.umockdev.out | ||
| ]; | ||
| # need to set this ourselves, because the tests will set LD_PRELOAD=libumockdev-preload.so, | ||
| # which can't be found because it's not in default rpath | ||
| LD_PRELOAD = "${pkgs.umockdev.out}/lib/libumockdev-preload.so"; | ||
| XDP_TEST_IN_CI = 1; | ||
| }; | ||
| environment.systemPackages = with pkgs; [ | ||
| umockdev | ||
| wireless-regdb | ||
| ]; | ||
| services.geoclue2 = { | ||
| enable = true; | ||
| enableDemoAgent = true; | ||
| }; | ||
| location.provider = "geoclue2"; | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| diff --git a/src/validate-icon.c b/src/validate-icon.c | ||
| index c42265b..320f028 100644 | ||
| --- a/src/validate-icon.c | ||
| +++ b/src/validate-icon.c | ||
| @@ -254,7 +254,7 @@ flatpak_get_bwrap (void) | ||
| static int | ||
| rerun_in_sandbox (int input_fd) | ||
| { | ||
| - const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" }; | ||
| + const char * const usrmerged_dirs[] = { }; | ||
| g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free); | ||
| g_autofree char* arg_input_fd = NULL; | ||
| char validate_icon[PATH_MAX + 1]; | ||
| @@ -276,8 +276,7 @@ rerun_in_sandbox (int input_fd) | ||
| "--unshare-ipc", | ||
| "--unshare-net", | ||
| "--unshare-pid", | ||
| - "--ro-bind", "/usr", "/usr", | ||
| - "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", | ||
| + "--ro-bind", "@storeDir@", "@storeDir@", | ||
| "--ro-bind", validate_icon, validate_icon, | ||
| NULL); | ||
|
|
||
| @@ -320,6 +319,9 @@ rerun_in_sandbox (int input_fd) | ||
| if (g_getenv ("G_MESSAGES_PREFIXED")) | ||
| add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); | ||
|
|
||
| + if (g_getenv ("GDK_PIXBUF_MODULE_FILE")) | ||
| + add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL); | ||
| + | ||
| arg_input_fd = g_strdup_printf ("%d", input_fd); | ||
| add_args (args, | ||
| validate_icon, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| diff --git a/src/validate-sound.c b/src/validate-sound.c | ||
| index 7348d46..8b87c78 100644 | ||
| --- a/src/validate-sound.c | ||
| +++ b/src/validate-sound.c | ||
| @@ -234,7 +234,7 @@ flatpak_get_bwrap (void) | ||
| static int | ||
| rerun_in_sandbox (int input_fd) | ||
| { | ||
| - const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" }; | ||
| + const char * const usrmerged_dirs[] = { }; | ||
| int i; | ||
| g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free); | ||
| char validate_sound[PATH_MAX + 1]; | ||
| @@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd) | ||
| "--unshare-ipc", | ||
| "--unshare-net", | ||
| "--unshare-pid", | ||
| - "--ro-bind", "/usr", "/usr", | ||
| - "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", | ||
| + "--ro-bind", "@storeDir@", "@storeDir@", | ||
| "--ro-bind", validate_sound, validate_sound, | ||
| NULL); | ||
|
|
||
| @@ -299,6 +298,8 @@ rerun_in_sandbox (int input_fd) | ||
| if (g_getenv ("G_MESSAGES_PREFIXED")) | ||
| add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); | ||
|
|
||
| + if (g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0")) | ||
| + add_args (args, "--setenv", "GST_PLUGIN_SYSTEM_PATH_1_0", g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0"), NULL); | ||
|
|
||
| arg_input_fd = g_strdup_printf ("%d", input_fd); | ||
| add_args (args, validate_sound, "--fd", arg_input_fd, NULL); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if this was not supposed to be handled by the
wrapGApp.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kinda, but wrapGApp-ing the Python tests doesn't really work as they're not called directly, they're imported by pytest.