Hello community,
here is the log from the commit of package flatpak-builder for openSUSE:Factory
checked in at 2018-12-24 11:46:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/flatpak-builder (Old)
and /work/SRC/openSUSE:Factory/.flatpak-builder.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flatpak-builder"
Mon Dec 24 11:46:57 2018 rev:8 rq:660478 version:1.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/flatpak-builder/flatpak-builder.changes
2018-09-13 12:10:19.658374176 +0200
+++
/work/SRC/openSUSE:Factory/.flatpak-builder.new.28833/flatpak-builder.changes
2018-12-24 11:47:02.705152102 +0100
@@ -1,0 +2,10 @@
+Wed Dec 19 21:45:27 UTC 2018 - [email protected]
+
+- Update to version 1.0.1:
+ + Run appstream-util mirror-screenshots in the sandbox, rather
+ than on the host, as the host might not have a new enough
+ appstream-glib.
+ + Fix build cache when a module has uncommon characters in the
+ name.
+
+-------------------------------------------------------------------
Old:
----
flatpak-builder-1.0.0.tar.xz
New:
----
flatpak-builder-1.0.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ flatpak-builder.spec ++++++
--- /var/tmp/diff_new_pack.IesKdz/_old 2018-12-24 11:47:03.269151607 +0100
+++ /var/tmp/diff_new_pack.IesKdz/_new 2018-12-24 11:47:03.273151603 +0100
@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: flatpak-builder
-Version: 1.0.0
+Version: 1.0.1
Release: 0
Summary: Tool to build flatpaks from source
License: LGPL-2.1-or-later
++++++ flatpak-builder-1.0.0.tar.xz -> flatpak-builder-1.0.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flatpak-builder-1.0.0/NEWS
new/flatpak-builder-1.0.1/NEWS
--- old/flatpak-builder-1.0.0/NEWS 2018-08-20 11:03:23.000000000 +0200
+++ new/flatpak-builder-1.0.1/NEWS 2018-10-04 14:59:28.000000000 +0200
@@ -1,3 +1,10 @@
+Changes in 1.0.1
+================
+
+ * Run appstream-util mirror-screenshots in the sandbox, rather than on
+ the host, as the host might not have a new enough appstream-glib.
+ * Fix build cache when a module has uncommon characters in the name.
+
Changes in 1.0.0
================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flatpak-builder-1.0.0/configure
new/flatpak-builder-1.0.1/configure
--- old/flatpak-builder-1.0.0/configure 2018-08-20 11:04:25.000000000 +0200
+++ new/flatpak-builder-1.0.1/configure 2018-10-04 15:00:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for flatpak-builder 1.0.0.
+# Generated by GNU Autoconf 2.69 for flatpak-builder 1.0.1.
#
# Report bugs to <https://github.com/flatpak/flatpak-builder/issues>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='flatpak-builder'
PACKAGE_TARNAME='flatpak-builder'
-PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='flatpak-builder 1.0.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='flatpak-builder 1.0.1'
PACKAGE_BUGREPORT='https://github.com/flatpak/flatpak-builder/issues'
PACKAGE_URL='http://flatpak.org/'
@@ -1394,7 +1394,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures flatpak-builder 1.0.0 to adapt to many kinds of
systems.
+\`configure' configures flatpak-builder 1.0.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1464,7 +1464,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of flatpak-builder 1.0.0:";;
+ short | recursive ) echo "Configuration of flatpak-builder 1.0.1:";;
esac
cat <<\_ACEOF
@@ -1615,7 +1615,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-flatpak-builder configure 1.0.0
+flatpak-builder configure 1.0.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2030,7 +2030,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by flatpak-builder $as_me 1.0.0, which was
+It was created by flatpak-builder $as_me 1.0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -13249,7 +13249,7 @@
# Define the identity of the package.
PACKAGE='flatpak-builder'
- VERSION='1.0.0'
+ VERSION='1.0.1'
# Some tools Automake needs.
@@ -16935,7 +16935,7 @@
fi
-FLATPAK_BUILDER_VERSION=1.0.0
+FLATPAK_BUILDER_VERSION=1.0.1
ac_config_files="$ac_config_files Makefile doc/Makefile
doc/flatpak-builder-docs.xml"
@@ -17494,7 +17494,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by flatpak-builder $as_me 1.0.0, which was
+This file was extended by flatpak-builder $as_me 1.0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17561,7 +17561,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-flatpak-builder config.status 1.0.0
+flatpak-builder config.status 1.0.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flatpak-builder-1.0.0/configure.ac
new/flatpak-builder-1.0.1/configure.ac
--- old/flatpak-builder-1.0.0/configure.ac 2018-08-20 11:03:57.000000000
+0200
+++ new/flatpak-builder-1.0.1/configure.ac 2018-10-04 14:59:59.000000000
+0200
@@ -15,7 +15,7 @@
m4_define([flatpak_builder_major_version], [1])
m4_define([flatpak_builder_minor_version], [0])
-m4_define([flatpak_builder_micro_version], [0])
+m4_define([flatpak_builder_micro_version], [1])
m4_define([flatpak_builder_version],
[flatpak_builder_major_version.flatpak_builder_minor_version.flatpak_builder_micro_version])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flatpak-builder-1.0.0/src/builder-cache.c
new/flatpak-builder-1.0.1/src/builder-cache.c
--- old/flatpak-builder-1.0.0/src/builder-cache.c 2018-06-11
15:47:50.000000000 +0200
+++ new/flatpak-builder-1.0.1/src/builder-cache.c 2018-10-04
14:48:07.000000000 +0200
@@ -210,13 +210,10 @@
return self->checksum;
}
-static char *
-get_ref (BuilderCache *self, const char *stage)
+static void
+append_escaped_stage (GString *s,
+ const char *stage)
{
- GString *s = g_string_new (self->branch);
-
- g_string_append_c (s, '/');
-
while (*stage)
{
char c = *stage++;
@@ -228,6 +225,16 @@
else
g_string_append_printf (s, "%x", c);
}
+}
+
+static char *
+get_ref (BuilderCache *self, const char *stage)
+{
+ GString *s = g_string_new (self->branch);
+
+ g_string_append_c (s, '/');
+
+ append_escaped_stage (s, stage);
return g_string_free (s, FALSE);
}
@@ -376,11 +383,13 @@
{
g_autofree char *commit = NULL;
g_autofree char *ref = NULL;
+ g_autoptr(GString) s = g_string_new ("");
g_free (self->stage);
self->stage = g_strdup (stage);
- g_hash_table_remove (self->unused_stages, stage);
+ append_escaped_stage (s, stage);
+ g_hash_table_remove (self->unused_stages, s->str);
g_free (self->current_checksum);
self->current_checksum = g_strdup (g_checksum_get_string (self->checksum));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flatpak-builder-1.0.0/src/builder-main.c
new/flatpak-builder-1.0.1/src/builder-main.c
--- old/flatpak-builder-1.0.0/src/builder-main.c 2018-08-13
12:16:02.000000000 +0200
+++ new/flatpak-builder-1.0.1/src/builder-main.c 2018-10-04
14:48:07.000000000 +0200
@@ -891,7 +891,17 @@
g_autoptr(GFile) cache = flatpak_build_file
(builder_context_get_state_dir (build_context), "screenshots-cache", NULL);
g_autoptr(GFile) screenshots = flatpak_build_file (app_dir,
"screenshots", NULL);
g_autoptr(GFile) screenshots_sub = flatpak_build_file (screenshots,
screenshot_subdir, NULL);
+ g_autofree char *fs_app_dir = g_strdup_printf ("--filesystem=%s",
flatpak_file_get_path_cached (app_dir));
+ g_autofree char *fs_cache = g_strdup_printf ("--filesystem=%s",
flatpak_file_get_path_cached (cache));
const char *argv[] = {
+ "flatpak",
+ "build",
+ "--die-with-parent",
+ "--nofilesystem=host",
+ fs_app_dir,
+ fs_cache,
+ "--share=network",
+ flatpak_file_get_path_cached (app_dir),
"appstream-util",
"mirror-screenshots",
flatpak_file_get_path_cached (xml),
@@ -912,6 +922,16 @@
if (g_file_query_exists (xml, NULL))
{
+ if (!flatpak_mkdir_p (cache, NULL, &error))
+ {
+ g_printerr ("Error creating screenshot cache dir: %s\n",
error->message);
+ return 1;
+ }
+ if (!flatpak_break_hardlink (xml, &error))
+ {
+ g_printerr ("Error mirroring screenshots: %s\n", error->message);
+ return 1;
+ }
if (!builder_maybe_host_spawnv (NULL,
NULL,
0,
