Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package flatpak-builder for openSUSE:Factory checked in at 2021-03-18 22:56:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flatpak-builder (Old) and /work/SRC/openSUSE:Factory/.flatpak-builder.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flatpak-builder" Thu Mar 18 22:56:05 2021 rev:15 rq:879955 version:1.0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/flatpak-builder/flatpak-builder.changes 2020-08-25 09:36:44.396140169 +0200 +++ /work/SRC/openSUSE:Factory/.flatpak-builder.new.2401/flatpak-builder.changes 2021-03-18 22:56:07.475606339 +0100 @@ -1,0 +2,7 @@ +Wed Mar 3 16:31:08 UTC 2021 - andy great <andythe_gr...@pm.me> + +- Update to version 1.0.12. + * Make --run work if manifest has --metadata in build-finish. + * Don't try to extract git submodules if they were disabled. + +------------------------------------------------------------------- Old: ---- flatpak-builder-1.0.11.tar.xz New: ---- flatpak-builder-1.0.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flatpak-builder.spec ++++++ --- /var/tmp/diff_new_pack.bzc8pB/_old 2021-03-18 22:56:07.943606819 +0100 +++ /var/tmp/diff_new_pack.bzc8pB/_new 2021-03-18 22:56:07.943606819 +0100 @@ -1,7 +1,7 @@ # # spec file for package flatpak-builder # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: flatpak-builder -Version: 1.0.11 +Version: 1.0.12 Release: 0 Summary: Tool to build flatpaks from source License: LGPL-2.1-or-later ++++++ flatpak-builder-1.0.11.tar.xz -> flatpak-builder-1.0.12.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/Makefile.in new/flatpak-builder-1.0.12/Makefile.in --- old/flatpak-builder-1.0.11/Makefile.in 2020-07-03 16:24:04.000000000 +0200 +++ new/flatpak-builder-1.0.12/Makefile.in 2021-02-17 11:03:52.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -412,8 +412,8 @@ AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope check recheck distdir distdir-am dist dist-all \ distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -2558,6 +2558,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -2600,6 +2604,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -2899,12 +2905,12 @@ clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \ clean-noinstPROGRAMS cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_installed_test_keyring2DATA \ + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dist_installed_test_keyring2DATA \ install-dist_installed_test_keyringDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/NEWS new/flatpak-builder-1.0.12/NEWS --- old/flatpak-builder-1.0.11/NEWS 2020-07-03 16:23:43.000000000 +0200 +++ new/flatpak-builder-1.0.12/NEWS 2021-02-17 11:03:11.000000000 +0100 @@ -1,3 +1,9 @@ +Changes in 1.0.12 +================= + + * Make --run work if manifest has --metadata in build-finish + * Don't try to extract git submodules if they were disabled + Changes in 1.0.11 ================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/aclocal.m4 new/flatpak-builder-1.0.12/aclocal.m4 --- old/flatpak-builder-1.0.11/aclocal.m4 2020-07-03 16:24:04.000000000 +0200 +++ new/flatpak-builder-1.0.12/aclocal.m4 2021-02-17 11:03:51.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -364,7 +364,7 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -379,7 +379,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -395,14 +395,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -454,7 +454,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -485,7 +485,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -676,7 +676,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -715,7 +715,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -742,7 +744,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -939,7 +941,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -960,7 +962,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -982,7 +984,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1017,7 +1019,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1060,7 +1062,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1099,7 +1101,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1128,7 +1130,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1175,7 +1177,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1194,7 +1196,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1275,7 +1277,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1335,7 +1337,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1363,7 +1365,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1382,7 +1384,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/configure new/flatpak-builder-1.0.12/configure --- old/flatpak-builder-1.0.11/configure 2020-07-03 16:24:04.000000000 +0200 +++ new/flatpak-builder-1.0.12/configure 2021-02-17 11:03:52.000000000 +0100 @@ -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.11. +# Generated by GNU Autoconf 2.69 for flatpak-builder 1.0.12. # # 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.11' -PACKAGE_STRING='flatpak-builder 1.0.11' +PACKAGE_VERSION='1.0.12' +PACKAGE_STRING='flatpak-builder 1.0.12' 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.11 to adapt to many kinds of systems. +\`configure' configures flatpak-builder 1.0.12 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.11:";; + short | recursive ) echo "Configuration of flatpak-builder 1.0.12:";; 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.11 +flatpak-builder configure 1.0.12 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.11, which was +It was created by flatpak-builder $as_me 1.0.12, 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.11' + VERSION='1.0.12' # Some tools Automake needs. @@ -16935,7 +16935,7 @@ fi -FLATPAK_BUILDER_VERSION=1.0.11 +FLATPAK_BUILDER_VERSION=1.0.12 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.11, which was +This file was extended by flatpak-builder $as_me 1.0.12, 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.11 +flatpak-builder config.status 1.0.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -19207,7 +19207,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/configure.ac new/flatpak-builder-1.0.12/configure.ac --- old/flatpak-builder-1.0.11/configure.ac 2020-07-03 16:21:58.000000000 +0200 +++ new/flatpak-builder-1.0.12/configure.ac 2021-02-17 11:01:22.000000000 +0100 @@ -15,7 +15,7 @@ m4_define([flatpak_builder_major_version], [1]) m4_define([flatpak_builder_minor_version], [0]) -m4_define([flatpak_builder_micro_version], [11]) +m4_define([flatpak_builder_micro_version], [12]) 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.11/doc/Makefile.in new/flatpak-builder-1.0.12/doc/Makefile.in --- old/flatpak-builder-1.0.11/doc/Makefile.in 2020-07-03 16:24:04.000000000 +0200 +++ new/flatpak-builder-1.0.12/doc/Makefile.in 2021-02-17 11:03:52.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/src/builder-context.c new/flatpak-builder-1.0.12/src/builder-context.c --- old/flatpak-builder-1.0.11/src/builder-context.c 2019-09-13 15:08:05.000000000 +0200 +++ new/flatpak-builder-1.0.12/src/builder-context.c 2021-02-17 11:00:31.000000000 +0100 @@ -770,7 +770,7 @@ NULL }; argv[2] = rofiles_unmount_path; - g_debug ("unmounting rofiles-fuse %s", rofiles_unmount_path); + g_debug ("Unmounting read-only fs: %s %s %s", argv[0], argv[1], argv[2]); g_spawn_sync (NULL, (char **)argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_CLOEXEC_PIPES | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -874,7 +874,7 @@ rofiles_dir = g_object_ref (self->rofiles_allocated_dir); argv[4] = (char *)flatpak_file_get_path_cached (rofiles_dir); - g_debug ("starting: rofiles-fuse %s %s", argv[3], argv[4]); + g_debug ("Mounting read-only fs: %s %s %s", argv[0], argv[3], argv[4]); if (!g_spawn_sync (NULL, (char **)argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_CLOEXEC_PIPES, rofiles_child_setup, NULL, NULL, NULL, &exit_status, error)) { g_prefix_error (error, "Can't spawn rofiles-fuse"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/src/builder-flatpak-utils.c new/flatpak-builder-1.0.12/src/builder-flatpak-utils.c --- old/flatpak-builder-1.0.11/src/builder-flatpak-utils.c 2019-04-03 11:26:40.000000000 +0200 +++ new/flatpak-builder-1.0.12/src/builder-flatpak-utils.c 2021-02-17 11:00:31.000000000 +0100 @@ -1173,7 +1173,7 @@ }; /* We don't want to export paths pointing into these, because they are readonly - (so we can't create mountpoints there) and don't match whats on the host anyway */ + (so we can't create mountpoints there) and don't match what's on the host anyway */ const char *dont_export_in[] = { "/lib", "/lib32", "/lib64", "/bin", "/sbin", "/usr", "/etc", "/app", NULL }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/src/builder-git.c new/flatpak-builder-1.0.12/src/builder-git.c --- old/flatpak-builder-1.0.11/src/builder-git.c 2019-06-26 12:40:13.000000000 +0200 +++ new/flatpak-builder-1.0.12/src/builder-git.c 2021-02-17 11:00:31.000000000 +0100 @@ -828,6 +828,7 @@ const char *branch, GFile *dest, BuilderContext *context, + FlatpakGitMirrorFlags mirror_flags, GError **error) { g_autoptr(GFile) mirror_dir = NULL; @@ -857,8 +858,9 @@ "checkout", branch, NULL)) return FALSE; - if (!git_extract_submodule (repo_location, dest, branch, context, error)) - return FALSE; + if (mirror_flags & FLATPAK_GIT_MIRROR_FLAGS_MIRROR_SUBMODULES) + if (!git_extract_submodule (repo_location, dest, branch, context, error)) + return FALSE; return TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/src/builder-git.h new/flatpak-builder-1.0.12/src/builder-git.h --- old/flatpak-builder-1.0.11/src/builder-git.h 2019-02-08 11:18:07.000000000 +0100 +++ new/flatpak-builder-1.0.12/src/builder-git.h 2021-02-17 11:00:31.000000000 +0100 @@ -48,6 +48,7 @@ const char *branch, GFile *dest, BuilderContext *context, + FlatpakGitMirrorFlags mirror_flags, GError **error); gboolean builder_git_shallow_mirror_ref (const char *repo_location, const char *destination_path, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/src/builder-main.c new/flatpak-builder-1.0.12/src/builder-main.c --- old/flatpak-builder-1.0.11/src/builder-main.c 2020-03-19 16:30:19.000000000 +0100 +++ new/flatpak-builder-1.0.12/src/builder-main.c 2021-02-17 11:00:31.000000000 +0100 @@ -621,6 +621,7 @@ git_branch, build_subdir, build_context, + mirror_flags, &error)) { g_printerr ("Can't check out manifest repo: %s\n", error->message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/src/builder-manifest.c new/flatpak-builder-1.0.12/src/builder-manifest.c --- old/flatpak-builder-1.0.11/src/builder-manifest.c 2020-07-03 16:21:39.000000000 +0200 +++ new/flatpak-builder-1.0.12/src/builder-manifest.c 2021-02-17 11:00:31.000000000 +0100 @@ -4135,7 +4135,8 @@ !g_str_has_prefix (arg, "--runtime") && !g_str_has_prefix (arg, "--command") && !g_str_has_prefix (arg, "--extra-data") && - !g_str_has_prefix (arg, "--require-version")) + !g_str_has_prefix (arg, "--require-version") && + !g_str_has_prefix (arg, "--metadata")) g_ptr_array_add (args, g_strdup (arg)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flatpak-builder-1.0.11/src/builder-source-git.c new/flatpak-builder-1.0.12/src/builder-source-git.c --- old/flatpak-builder-1.0.11/src/builder-source-git.c 2019-09-13 15:08:05.000000000 +0200 +++ new/flatpak-builder-1.0.12/src/builder-source-git.c 2021-02-17 11:00:31.000000000 +0100 @@ -285,13 +285,17 @@ { BuilderSourceGit *self = BUILDER_SOURCE_GIT (source); g_autofree char *location = NULL; + FlatpakGitMirrorFlags mirror_flags = 0; location = get_url_or_path (self, context, error); if (location == NULL) return FALSE; + if (!self->disable_submodules) + mirror_flags |= FLATPAK_GIT_MIRROR_FLAGS_MIRROR_SUBMODULES; + if (!builder_git_checkout (location, get_branch (self), - dest, context, error)) + dest, context, mirror_flags, error)) return FALSE; return TRUE;