Accepting request 936431 from home:StevenK:branches:GNOME:Factory

- Add patch support-new-pyparsing.patch:
  * Support pyparsing >= 3.0.4.

OBS-URL: https://build.opensuse.org/request/show/936431
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=148
This commit is contained in:
Dominique Leuenberger 2021-12-08 12:04:11 +00:00 committed by Git OBS Bridge
parent a64923c845
commit 15c4211b9a
3 changed files with 22 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 8 07:33:39 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>

View File

@ -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

View File

@ -0,0 +1,13 @@
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
@@ -1740,7 +1740,7 @@ def handleNameableType(toks):
add_named_type(typename_prefix + name, type)
return type
-nameableType = (Optional((Suppress("'") + ident).leaveWhitespace()) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType)
+nameableType = (Optional((Suppress("'") + ident)) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType)
typeSpec <<= basicType ^ variantType ^ namedType ^ nameableType