pool/flatpak
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Also support pyparsing 2.4.7 with the new patch.

OBS-URL: https://build.opensuse.org/request/show/937375
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=149
This commit is contained in:
Dominique Leuenberger 2021-12-09 07:19:59 +00:00 committed by Git OBS Bridge
parent 15c4211b9a
commit 9477ae4cf9
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flatpak.changes
View File

@ -1,5 +1,5 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 8 07:33:39 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com> Thu Dec 9 04:29:19 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
- Add patch support-new-pyparsing.patch: - Add patch support-new-pyparsing.patch:
* Support pyparsing >= 3.0.4. * Support pyparsing >= 3.0.4.

14
support-new-pyparsing.patch
View File

@ -2,11 +2,19 @@ Index: flatpak-1.12.2/subprojects/variant-schema-compiler/variant-schema-compile
=================================================================== ===================================================================
--- flatpak-1.12.2.orig/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 +++ flatpak-1.12.2/subprojects/variant-schema-compiler/variant-schema-compiler
@@ -1740,7 +1740,7 @@ def handleNameableType(toks): @@ -4,6 +4,7 @@ import argparse
add_named_type(typename_prefix + name, type) 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 return type
-nameableType = (Optional((Suppress("'") + ident).leaveWhitespace()) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType) 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) + nameableType = (Optional((Suppress("'") + ident)) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType)
typeSpec <<= basicType ^ variantType ^ namedType ^ nameableType typeSpec <<= basicType ^ variantType ^ namedType ^ nameableType