From 74ca4f507326d4b948dcaa9fc6e0e4b0c77b4f0e Mon Sep 17 00:00:00 2001
From: starlet-dx <15929766099@163.com>
Date: Tue, 11 Jan 2022 17:06:37 +0800
Subject: [PATCH] Fix compilation failure of flatpak

---
 flatpak.spec                | 10 +++++++---
 support-new-pyparsing.patch | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 support-new-pyparsing.patch

diff --git a/flatpak.spec b/flatpak.spec
index 4e3276f..5d6065f 100644
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -1,6 +1,6 @@
 Name:           flatpak
 Version:        1.10.2
-Release:        2
+Release:        3
 Summary:        Application deployment framework for desktop apps
 License:        LGPLv2+
 URL:            http://flatpak.org/
@@ -19,6 +19,7 @@ Patch6006:      backport-0007-CVE-2021-41133.patch
 Patch6007:      backport-0008-CVE-2021-41133.patch
 Patch6008:      backport-run-Handle-unknown-syscalls-as-intended.patch
 Patch6009:      backport-Fix-handling-of-syscalls-only-allowed-by-de.patch
+Patch6010:      support-new-pyparsing.patch
 
 BuildRequires:  pkgconfig(appstream-glib) pkgconfig(gio-unix-2.0) pkgconfig(gobject-introspection-1.0) >= 1.40.0 pkgconfig(json-glib-1.0) pkgconfig(libarchive) >= 2.8.0
 BuildRequires:  pkgconfig(libsoup-2.4) pkgconfig(libxml-2.0) >= 2.4 pkgconfig(ostree-1) >= 2020.8 pkgconfig(polkit-gobject-1) pkgconfig(libseccomp) pkgconfig(xau)
@@ -30,7 +31,7 @@ Requires:       ostree%{?_isa} >= 2020.8 bubblewrap >= 0.4.0 ostree-libs%{?_isa}
 Requires:	librsvg2 xdg-dbus-proxy systemd
 Recommends:     p11-kit xdg-desktop-portal > 0.10
 Provides:       %{name}-libs = %{version}-%{release}
-Obsoletes:      %{name}-libs
+Obsoletes:      %{name}-libs < %{version}-%{release}
 
 %description
 flatpak is a system for building, distributing and running sandboxed desktop
@@ -124,6 +125,9 @@ flatpak remote-list --system &> /dev/null || :
 %{_mandir}/man5/flatpak-remote.5*
 
 %changelog
+* Tue Jan 11 2022 yaoxin <yaoxin30@huawei.com> - 1.10.2-3
+- Fix compilation failure of flatpak
+
 * Thu Oct 21 2021 yaqiangchen <chenyaqiang@huawei.com> - 1.10.2-2
 - Fix CVE-2021-41133
 
@@ -145,4 +149,4 @@ flatpak remote-list --system &> /dev/null || :
 - Fix CVE-2021-21261
 
 * Thu Nov 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.0.3-2
-- Package init
\ No newline at end of file
+- Package init
diff --git a/support-new-pyparsing.patch b/support-new-pyparsing.patch
new file mode 100644
index 0000000..f1cf403
--- /dev/null
+++ b/support-new-pyparsing.patch
@@ -0,0 +1,24 @@
+diff --git a/variant-schema-compiler/variant-schema-compiler b/variant-schema-compiler/variant-schema-compiler
+index 8b54232..7807f7c 100755
+--- a/variant-schema-compiler/variant-schema-compiler
++++ b/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
+ 
+-- 
+2.30.0
+
-- 
Gitee