Skip to content

Commit

Permalink
New upstream version 1.14.5
Browse files Browse the repository at this point in the history
  • Loading branch information
smcv committed Dec 8, 2023
2 parents 7e4a25f + 17455f9 commit 00bc1c2
Show file tree
Hide file tree
Showing 64 changed files with 2,105 additions and 2,309 deletions.
1 change: 1 addition & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ service_in_files = $(NULL)
dbus_service_DATA = $(NULL)
systemdsystemunit_DATA = $(NULL)
systemduserunit_DATA = $(NULL)
dist_tmpfiles_DATA = $(NULL)
CLEANFILES += $(dbus_service_DATA)
CLEANFILES += $(systemduserunit_DATA)
EXTRA_DIST += $(service_in_files)
Expand Down
34 changes: 17 additions & 17 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,16 @@ check_PROGRAMS = $(am__EXEEXT_5) $(am__EXEEXT_6)
@BUILD_AUTO_SIDELOADING_TRUE@am__append_27 = sideload-repos-systemd/flatpak-sideload-usb-repo.service.in
@BUILD_AUTO_SIDELOADING_TRUE@am__append_28 = sideload-repos-systemd/flatpak-sideload-usb-repo.service \
@BUILD_AUTO_SIDELOADING_TRUE@ sideload-repos-systemd/flatpak-sideload-usb-repo.path
@WITH_SYSTEM_DBUS_PROXY_TRUE@am__append_29 = FLATPAK_DBUSPROXY=$(DBUS_PROXY)
@WITH_SYSTEM_DBUS_PROXY_FALSE@am__append_30 = FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/flatpak-dbus-proxy
@WITH_SYSTEM_BWRAP_TRUE@am__append_31 = FLATPAK_BWRAP=$(BWRAP)
@WITH_SYSTEM_BWRAP_FALSE@am__append_32 = FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/flatpak-bwrap
@ENABLE_INSTALLED_TESTS_TRUE@am__append_33 = -rpath $(installed_testdir)
@ENABLE_INSTALLED_TESTS_FALSE@am__append_34 = -rpath ${abs_builddir}
@WITH_SYSTEM_DBUS_PROXY_FALSE@am__append_35 = flatpak-dbus-proxy
@BUILD_AUTO_SIDELOADING_TRUE@am__append_29 = sideload-repos-systemd/tmpfiles.d/flatpak-sideload-repos.conf
@WITH_SYSTEM_DBUS_PROXY_TRUE@am__append_30 = FLATPAK_DBUSPROXY=$(DBUS_PROXY)
@WITH_SYSTEM_DBUS_PROXY_FALSE@am__append_31 = FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/flatpak-dbus-proxy
@WITH_SYSTEM_BWRAP_TRUE@am__append_32 = FLATPAK_BWRAP=$(BWRAP)
@WITH_SYSTEM_BWRAP_FALSE@am__append_33 = FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/flatpak-bwrap
@ENABLE_INSTALLED_TESTS_TRUE@am__append_34 = -rpath $(installed_testdir)
@ENABLE_INSTALLED_TESTS_FALSE@am__append_35 = -rpath ${abs_builddir}
@WITH_SYSTEM_DBUS_PROXY_FALSE@am__append_36 = flatpak-dbus-proxy
@WITH_SYSTEM_BWRAP_FALSE@bwrap_PROGRAMS = flatpak-bwrap$(EXEEXT)
@INSTALL_GDM_ENV_FILE_TRUE@am__append_36 = flatpak.env
@INSTALL_GDM_ENV_FILE_TRUE@am__append_37 = flatpak.env
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/subprojects/libglnx/libglnx.m4 \
Expand Down Expand Up @@ -1154,7 +1155,7 @@ am__dist_installed_test_keyring_DATA_DIST = tests/test-keyring/README \
am__dist_installed_test_keyring2_DATA_DIST = \
tests/test-keyring2/README tests/test-keyring2/pubring.gpg \
tests/test-keyring2/secring.gpg
am__dist_tmpfiles_DATA_DIST = \
am__dist_tmpfiles_DATA_DIST = data/tmpfiles.d/flatpak.conf \
sideload-repos-systemd/tmpfiles.d/flatpak-sideload-repos.conf
DATA = $(bashcompletion_DATA) $(dbus_service_DATA) \
$(dbussystemservice_DATA) $(dist_dbusconf_DATA) \
Expand Down Expand Up @@ -1473,8 +1474,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPSTREAM_0_14_0_CFLAGS = @APPSTREAM_0_14_0_CFLAGS@
APPSTREAM_0_14_0_LIBS = @APPSTREAM_0_14_0_LIBS@
APPSTREAM_CFLAGS = @APPSTREAM_CFLAGS@
APPSTREAM_LIBS = @APPSTREAM_LIBS@
AR = @AR@
Expand Down Expand Up @@ -1718,6 +1717,7 @@ systemduserenvgendir = @systemduserenvgendir@
systemduserunitdir = @systemduserunitdir@
sysusersdir = @sysusersdir@
target_alias = @target_alias@
tmpfilesdir = @tmpfilesdir@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
Expand Down Expand Up @@ -1855,6 +1855,8 @@ systemduserunit_DATA = $(NULL) \
portal/flatpak-portal.service \
oci-authenticator/flatpak-oci-authenticator.service \
$(am__append_28)
dist_tmpfiles_DATA = $(NULL) data/tmpfiles.d/flatpak.conf \
$(am__append_29)
FLATPAK_BINDIR = $(bindir)
ACLOCAL_AMFLAGS = -I m4 -I subprojects/libglnx ${ACLOCAL_FLAGS}
AM_CPPFLAGS = -DFLATPAK_BINDIR=\"$(FLATPAK_BINDIR)\" \
Expand Down Expand Up @@ -2379,8 +2381,6 @@ revokefs_demo_LDADD = $(BASE_LIBS)
@BUILD_SELINUX_MODULE_TRUE@ selinux/flatpak.if
@BUILD_AUTO_SIDELOADING_TRUE@dist_libexec_SCRIPTS = sideload-repos-systemd/flatpak-create-sideload-symlinks.sh
@BUILD_AUTO_SIDELOADING_TRUE@path_in_files = sideload-repos-systemd/flatpak-sideload-usb-repo.path.in
@BUILD_AUTO_SIDELOADING_TRUE@tmpfilesdir = $(prefix)/lib/tmpfiles.d
@BUILD_AUTO_SIDELOADING_TRUE@dist_tmpfiles_DATA = sideload-repos-systemd/tmpfiles.d/flatpak-sideload-repos.conf
AM_TESTS_ENVIRONMENT = FLATPAK_TESTS_DEBUG=1 \
FLATPAK_CONFIG_DIR=/dev/null FLATPAK_PORTAL=$$(cd \
$(top_builddir) && pwd)/flatpak-portal \
Expand All @@ -2391,8 +2391,8 @@ AM_TESTS_ENVIRONMENT = FLATPAK_TESTS_DEBUG=1 \
$(top_builddir) && pwd)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH} \
LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && \
pwd)$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} PATH=$$(cd \
$(top_builddir) && pwd):$${PATH} $(NULL) $(am__append_29) \
$(am__append_30) $(am__append_31) $(am__append_32)
$(top_builddir) && pwd):$${PATH} $(NULL) $(am__append_30) \
$(am__append_31) $(am__append_32) $(am__append_33)
libtestlib_la_CFLAGS = \
$(AM_CFLAGS) \
$(BASE_CFLAGS) \
Expand Down Expand Up @@ -2539,7 +2539,7 @@ dist_installed_test_data = \
test_ltlibraries = tests/libpreload.la
tests_libpreload_la_SOURCES = tests/libpreload.c
tests_libpreload_la_LDFLAGS = -avoid-version -module -no-undefined \
$(NULL) $(am__append_33) $(am__append_34)
$(NULL) $(am__append_34) $(am__append_35)
installed_test_keyringdir = $(installed_testdir)/test-keyring
installed_test_keyring2dir = $(installed_testdir)/test-keyring2
@ENABLE_INSTALLED_TESTS_TRUE@dist_installed_test_keyring_DATA = \
Expand Down Expand Up @@ -2678,7 +2678,7 @@ profile_DATA = profile/flatpak.sh
fishconfdir = $(datadir)/fish/vendor_conf.d
fishconf_DATA = profile/flatpak.fish
envdir = $(datadir)/gdm/env.d
env_DATA = $(am__append_36)
env_DATA = $(am__append_37)
systemenvgendir = $(systemdsystemenvgendir)
systemenvgen_SCRIPTS = env.d/60-flatpak-system-only
userenvgendir = $(systemduserenvgendir)
Expand Down
46 changes: 46 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,49 @@
Changes in 1.14.5
~~~~~~~~~~~~~~~~~
Released: 2023-12-08

Features:

* Stop http transfers if a download in progress becomes very slow (#5519)

* Add anchors to link to sections of flatpak-metadata documentation (#5582)

Bug fixes:

* Avoid warnings processing symbolic links with GLib >= 2.77.0, and
with GLib 2.76.0 (GLib 2.76.1 or later silences these warnings)

* Bypass page cache for backend requests in revokefs, fixing installation
errors with libostree 2023.4 (#5452)

* Show AppStream metadata in `flatpak remote-info` as intended
(#5523; regression in 1.9.1)

* Don't let Flatpak apps inherit VK_DRIVER_FILES or VK_ICD_FILENAMES
from the host system, which would be wrong for the sandbox (#5553)

* Fix build failure with prereleases of libappstream 0.17.x (#5472)

* Forward-compatibility with libappstream 1.0 (#5563)

* Fix a memory leak (#5329)

* Fix compiler warnings (#5362, #5366)

* Make the tests fail more comprehensibly if a required tool is missing
(#5020)

* Clean up `/var/tmp/flatpak-cache-*` directories on boot (#1119)

* Don't force `GIO_USE_VFS=local` for programs launched via flatpak-spawn
(#5567)

* Clarify documentation for D-Bus name ownership (#5582)

Internal changes:

* CI improvements (#5381)

Changes in 1.14.4
~~~~~~~~~~~~~~~~~
Released: 2023-03-16
Expand Down
22 changes: 11 additions & 11 deletions app/flatpak-builtins-remote-info.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,24 +180,24 @@ flatpak_builtin_remote_info (int argc, char **argv, GCancellable *cancellable, G
int rows, cols;
int width;
g_autoptr(AsMetadata) mdata = as_metadata_new ();
AsComponent *app = NULL;
AsComponent *cpt = NULL;
const char *version = NULL;
const char *license = NULL;
g_autofree char *id = flatpak_decomposed_dup_id (ref);
g_autofree char *arch = flatpak_decomposed_dup_arch (ref);

flatpak_get_window_size (&rows, &cols);

flatpak_dir_load_appstream_store (preferred_dir, remote, id, mdata, NULL, NULL);
app = as_store_find_app (mdata, flatpak_decomposed_get_ref (ref));
if (app)
flatpak_dir_load_appstream_data (preferred_dir, remote, arch, mdata, NULL, NULL);
cpt = metadata_find_component (mdata, flatpak_decomposed_get_ref (ref));
if (cpt)
{
const char *name = as_component_get_name (app);
const char *comment = as_component_get_summary (app);
const char *name = as_component_get_name (cpt);
const char *comment = as_component_get_summary (cpt);

print_wrapped (MIN (cols, 80), "\n%s - %s\n", name, comment);

version = as_app_get_version (app);
license = as_component_get_project_license (app);
version = component_get_version_latest (cpt);
license = as_component_get_project_license (cpt);
}

if (commit_v)
Expand Down Expand Up @@ -267,9 +267,9 @@ flatpak_builtin_remote_info (int argc, char **argv, GCancellable *cancellable, G

width = cols - (len + 1);

print_aligned (len, _("ID:"), id);
print_aligned_take (len, _("ID:"), flatpak_decomposed_dup_id (ref));
print_aligned (len, _("Ref:"), flatpak_decomposed_get_ref (ref));
print_aligned_take (len, _("Arch:"), flatpak_decomposed_dup_arch (ref));
print_aligned (len, _("Arch:"), arch);
print_aligned_take (len, _("Branch:"), flatpak_decomposed_dup_branch (ref));
if (version != NULL)
print_aligned (len, _("Version:"), version);
Expand Down
16 changes: 8 additions & 8 deletions app/flatpak-builtins-remote-ls.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
if (need_appstream_data)
{
mdata = as_metadata_new ();
flatpak_dir_load_appstream_store (dir, remote, NULL, mdata, NULL, NULL);
flatpak_dir_load_appstream_data (dir, remote, NULL, mdata, NULL, NULL);
}

keys = (FlatpakDecomposed **) g_hash_table_get_keys_as_array (names, &n_keys);
Expand All @@ -244,7 +244,7 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
guint64 installed_size;
guint64 download_size;
g_autofree char *runtime = NULL;
AsComponent *app = NULL;
AsComponent *cpt = NULL;
gboolean has_sparse_cache;
VarMetadataRef sparse_cache;
g_autofree char *id = flatpak_decomposed_dup_id (ref);
Expand Down Expand Up @@ -278,7 +278,7 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
}

if (need_appstream_data)
app = as_store_find_app (mdata, ref_str);
cpt = metadata_find_component (mdata, ref_str);

if (app_runtime && runtime)
{
Expand All @@ -296,8 +296,8 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
const char *name = NULL;
g_autofree char *readable_id = NULL;

if (app)
name = as_component_get_name (app);
if (cpt)
name = as_component_get_name (cpt);

if (name == NULL)
readable_id = flatpak_decomposed_dup_readable_id (ref);
Expand All @@ -307,13 +307,13 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
else if (strcmp (columns[j].name, "description") == 0)
{
const char *comment = NULL;
if (app)
comment = as_component_get_summary (app);
if (cpt)
comment = as_component_get_summary (cpt);

flatpak_table_printer_add_column (printer, comment);
}
else if (strcmp (columns[j].name, "version") == 0)
flatpak_table_printer_add_column (printer, app ? as_app_get_version (app) : "");
flatpak_table_printer_add_column (printer, cpt ? component_get_version_latest (cpt) : "");
else if (strcmp (columns[j].name, "ref") == 0)
flatpak_table_printer_add_column (printer, ref_str);
else if (strcmp (columns[j].name, "application") == 0)
Expand Down
5 changes: 3 additions & 2 deletions app/flatpak-builtins-run.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ flatpak_builtin_run (int argc, char **argv, GCancellable *cancellable, GError **
g_autoptr(FlatpakDecomposed) runtime_ref = NULL;
const char *pref;
int i;
int rest_argv_start, rest_argc;
int rest_argv_start = 0, rest_argc = 0;
g_autoptr(FlatpakContext) arg_context = NULL;
g_autofree char *id = NULL;
g_autofree char *arch = NULL;
Expand All @@ -114,7 +114,6 @@ flatpak_builtin_run (int argc, char **argv, GCancellable *cancellable, GError **
context = g_option_context_new (_("APP [ARGUMENT…] - Run an app"));
g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);

rest_argc = 0;
for (i = 1; i < argc; i++)
{
/* The non-option is the command, take it out of the arguments */
Expand Down Expand Up @@ -155,6 +154,8 @@ flatpak_builtin_run (int argc, char **argv, GCancellable *cancellable, GError **
if (rest_argc == 0)
return usage_error (context, _("APP must be specified"), error);

/* If we get here, then rest_argv_start must have been set >= 1 */
g_assert (rest_argv_start > 0);
pref = argv[rest_argv_start];

if (!flatpak_split_partial_ref_arg (pref, FLATPAK_KINDS_APP | FLATPAK_KINDS_RUNTIME,
Expand Down
17 changes: 13 additions & 4 deletions app/flatpak-builtins-search.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ get_remote_stores (GPtrArray *dirs, const char *arch, GCancellable *cancellable)
{
g_autoptr(AsMetadata) mdata = as_metadata_new ();

flatpak_dir_load_appstream_store (dir, remotes[j], arch, mdata, cancellable, &error);
flatpak_dir_load_appstream_data (dir, remotes[j], arch, mdata, cancellable, &error);

if (error)
{
Expand Down Expand Up @@ -185,7 +185,7 @@ component_get_branch (AsComponent *app)
static void
print_app (Column *columns, MatchResult *res, FlatpakTablePrinter *printer)
{
const char *version = as_app_get_version (res->app);
const char *version = component_get_version_latest (res->app);
g_autofree char *id = component_get_flatpak_id (res->app);
const char *name = as_component_get_name (res->app);
const char *comment = as_component_get_summary (res->app);
Expand Down Expand Up @@ -272,12 +272,21 @@ flatpak_builtin_search (int argc, char **argv, GCancellable *cancellable, GError
for (j = 0; j < remote_stores->len; ++j)
{
AsMetadata *mdata = g_ptr_array_index (remote_stores, j);
#if AS_CHECK_VERSION(1, 0, 0)
AsComponentBox *apps = as_metadata_get_components (mdata);
#else
GPtrArray *apps = as_metadata_get_components (mdata);
guint i;
#endif

for (i = 0; i < apps->len; ++i)
#if AS_CHECK_VERSION(1, 0, 0)
for (guint i = 0; i < as_component_box_len (apps); ++i)
{
AsComponent *app = as_component_box_index (apps, i);
#else
for (guint i = 0; i < apps->len; ++i)
{
AsComponent *app = g_ptr_array_index (apps, i);
#endif
const char *remote_name = g_object_get_data (G_OBJECT (mdata), "remote-name");
g_autoptr(FlatpakDecomposed) decomposed = NULL;

Expand Down
Loading

0 comments on commit 00bc1c2

Please sign in to comment.