Accepting request 937398 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/937398
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flatpak?expand=0&rev=63

flatpak.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  9 04:29:19 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch support-new-pyparsing.patch:
+  * Support pyparsing >= 3.0.4.
+
 -------------------------------------------------------------------
 Wed Oct 13 19:26:14 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
 

flatpak.spec

@@ -38,6 +38,9 @@ Group:          System/Packages
 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

@@ -0,0 +1,21 @@
+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
+