Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package flatpak for openSUSE:Factory checked in at 2021-12-09 19:45:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flatpak (Old) and /work/SRC/openSUSE:Factory/.flatpak.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flatpak" Thu Dec 9 19:45:23 2021 rev:63 rq:937398 version:1.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/flatpak/flatpak.changes 2021-10-29 22:34:24.979686270 +0200 +++ /work/SRC/openSUSE:Factory/.flatpak.new.2520/flatpak.changes 2021-12-09 19:45:44.397137029 +0100 @@ -1,0 +2,6 @@ +Thu Dec 9 04:29:19 UTC 2021 - Steve Kowalik <steven.kowa...@suse.com> + +- Add patch support-new-pyparsing.patch: + * Support pyparsing >= 3.0.4. + +------------------------------------------------------------------- New: ---- support-new-pyparsing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flatpak.spec ++++++ --- /var/tmp/diff_new_pack.ceLPoU/_old 2021-12-09 19:45:45.077137357 +0100 +++ /var/tmp/diff_new_pack.ceLPoU/_new 2021-12-09 19:45:45.081137358 +0100 @@ -38,6 +38,9 @@ URL: https://flatpak.github.io/ Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz Patch0: polkit_rules_usability.patch +# https://github.com/flatpak/flatpak/issues/4534 +# https://gitlab.gnome.org/alexl/variant-schema-compiler/-/issues/4 +Patch1: support-new-pyparsing.patch BuildRequires: bison BuildRequires: bubblewrap >= 0.4.1 BuildRequires: docbook-xsl-stylesheets ++++++ support-new-pyparsing.patch ++++++ Index: flatpak-1.12.2/subprojects/variant-schema-compiler/variant-schema-compiler =================================================================== --- flatpak-1.12.2.orig/subprojects/variant-schema-compiler/variant-schema-compiler +++ flatpak-1.12.2/subprojects/variant-schema-compiler/variant-schema-compiler @@ -4,6 +4,7 @@ import argparse import sys import os from pyparsing import * +pyparsing_version = tuple(int(x) for x in __version__.split('.')) typename_prefix = "" funcname_prefix = "" @@ -1741,6 +1742,8 @@ def handleNameableType(toks): return type nameableType = (Optional((Suppress("'") + ident).leaveWhitespace()) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType) +if pyparsing_version >= (3, 0, 4): + nameableType = (Optional((Suppress("'") + ident)) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType) typeSpec <<= basicType ^ variantType ^ namedType ^ nameableType
