From 15c4211b9a459f88a82ab356d0a869d1e11424de60ea6dec2aa349450202cd0f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 8 Dec 2021 12:04:11 +0000 Subject: [PATCH] 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 --- flatpak.changes | 6 ++++++ flatpak.spec | 3 +++ support-new-pyparsing.patch | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 support-new-pyparsing.patch diff --git a/flatpak.changes b/flatpak.changes index 82cd10e..46e8f0c 100644 --- a/flatpak.changes +++ b/flatpak.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 8 07:33:39 UTC 2021 - Steve Kowalik + +- Add patch support-new-pyparsing.patch: + * Support pyparsing >= 3.0.4. + ------------------------------------------------------------------- Wed Oct 13 19:26:14 UTC 2021 - Andreas Stieger diff --git a/flatpak.spec b/flatpak.spec index e05f862..daf49f8 100644 --- a/flatpak.spec +++ b/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 diff --git a/support-new-pyparsing.patch b/support-new-pyparsing.patch new file mode 100644 index 0000000..432c7be --- /dev/null +++ b/support-new-pyparsing.patch @@ -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 +