diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-03-20 08:59:18 +0100 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-03-20 11:44:23 +0000 |
| commit | f59e398a50a16ce6951475a6f077f6bcb8f51597 (patch) | |
| tree | 7e8c43402cf0ceb81c15165e1be1152bff542e2b /testing/flatpak/musl-fixes.patch | |
| parent | 7c5404f01b0f24adbd3b22a33d1c00b56e1013c6 (diff) | |
| download | aports-f59e398a50a16ce6951475a6f077f6bcb8f51597.tar.bz2 aports-f59e398a50a16ce6951475a6f077f6bcb8f51597.tar.xz | |
testing/flatpak: upgrade to 0.9.1
* Remove merged patches
Diffstat (limited to 'testing/flatpak/musl-fixes.patch')
| -rw-r--r-- | testing/flatpak/musl-fixes.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/testing/flatpak/musl-fixes.patch b/testing/flatpak/musl-fixes.patch index 0a84cf374e..406a06d834 100644 --- a/testing/flatpak/musl-fixes.patch +++ b/testing/flatpak/musl-fixes.patch @@ -1,13 +1,3 @@ ---- a/common/flatpak-utils.c -+++ b/common/flatpak-utils.c -@@ -36,6 +36,7 @@ - #include <fcntl.h> - #include <string.h> - #include <sys/stat.h> -+#include <sys/file.h> - #include <sys/types.h> - #include <sys/utsname.h> - --- a/config.h.in +++ b/config.h.in @@ -140,3 +140,14 @@ @@ -25,36 +15,3 @@ + __result; })) +#endif + ---- a/builder/builder-module.c -+++ b/builder/builder-module.c -@@ -771,7 +771,7 @@ - g_ptr_array_add (args, g_strdup ("flatpak")); - g_ptr_array_add (args, g_strdup ("build")); - -- source_dir_path_canonical = canonicalize_file_name (source_dir_path); -+ source_dir_path_canonical = realpath (source_dir_path, NULL); - - if (builder_context_get_build_runtime (context)) - builddir = "/run/build-runtime/"; ---- a/builder/builder-source-shell.c -+++ b/builder/builder-source-shell.c -@@ -130,7 +130,7 @@ - g_ptr_array_add (args, g_strdup ("flatpak")); - g_ptr_array_add (args, g_strdup ("build")); - -- source_dir_path_canonical = canonicalize_file_name (source_dir_path); -+ source_dir_path_canonical = realpath (source_dir_path, NULL); - - g_ptr_array_add (args, g_strdup ("--nofilesystem=host")); - g_ptr_array_add (args, g_strdup_printf ("--filesystem=%s", source_dir_path_canonical)); ---- a/common/flatpak-dir.c -+++ b/common/flatpak-dir.c -@@ -2862,7 +2862,7 @@ - somewhere the bind mount will be on the target of that, not - at that exact path. */ - g_autofree char *basedir_orig = g_file_get_path (self->basedir); -- g_autofree char *basedir = canonicalize_file_name (basedir_orig); -+ g_autofree char *basedir = realpath (basedir_orig, NULL); - - g_debug ("running trigger %s", name); - |