!3 Add patch to fix build with gcc-12 & fix yaml
From: @misaka00251 Reviewed-by: @panchenbo Signed-off-by: @panchenbo
This commit is contained in:
commit
e3a8c95a2a
@ -1,12 +1,14 @@
|
|||||||
Name: maliit-framework
|
Name: maliit-framework
|
||||||
Version: 2.2.0
|
Version: 2.2.0
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Input method framework
|
Summary: Input method framework
|
||||||
|
|
||||||
License: LGPLv2
|
License: LGPLv2
|
||||||
URL: https://maliit.github.io/
|
URL: https://maliit.github.io/
|
||||||
Source0: https://github.com/maliit/framework/archive/refs/tags/framework-%{version}.tar.gz
|
Source0: https://github.com/maliit/framework/archive/refs/tags/framework-%{version}.tar.gz
|
||||||
|
|
||||||
|
Patch1: move-the-operator-definition-to-global-namespace.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
|
||||||
@ -131,5 +133,8 @@ make install/fast DESTDIR=%{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 14 2023 misaka00251 <liuxin@iscas.ac.cn> - 2.2.0-2
|
||||||
|
- Add patch to fix build with gcc-12 & fix yaml
|
||||||
|
|
||||||
* Wed Jul 20 2022 misaka00251 <misaka00251@misakanet.cn> - 2.2.0-1
|
* Wed Jul 20 2022 misaka00251 <misaka00251@misakanet.cn> - 2.2.0-1
|
||||||
- Init package
|
- Init package
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
version_control: git
|
version_control: github
|
||||||
src_repo: maliit/framework
|
src_repo: maliit/framework
|
||||||
tag_prefix: ""
|
tag_prefix: ""
|
||||||
separator: "."
|
separator: "."
|
||||||
|
|||||||
39
move-the-operator-definition-to-global-namespace.patch
Normal file
39
move-the-operator-definition-to-global-namespace.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From 86e55980e3025678882cb9c4c78614f86cdc1f04 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rodney Dawes <dobey.pwns@gmail.com>
|
||||||
|
Date: Tue, 9 Aug 2022 13:57:39 -0400
|
||||||
|
Subject: [PATCH] ut_mimserveroptions: Move the operator== definition to global
|
||||||
|
namespace
|
||||||
|
|
||||||
|
With gcc-12 having the operator== in anonymous namespace for a struct which
|
||||||
|
is in the global namespace results in a lengthy compilation error. Moving
|
||||||
|
this non-mmember function into the global namespace fixes the issue.
|
||||||
|
|
||||||
|
Fixes #112
|
||||||
|
---
|
||||||
|
tests/ut_mimserveroptions/ut_mimserveroptions.cpp | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/ut_mimserveroptions/ut_mimserveroptions.cpp b/tests/ut_mimserveroptions/ut_mimserveroptions.cpp
|
||||||
|
index 7c904db..f533927 100644
|
||||||
|
--- a/tests/ut_mimserveroptions/ut_mimserveroptions.cpp
|
||||||
|
+++ b/tests/ut_mimserveroptions/ut_mimserveroptions.cpp
|
||||||
|
@@ -42,12 +42,12 @@ namespace {
|
||||||
|
"-testability", "TESTABILITY", "-qdevel", "-reverse",
|
||||||
|
"-stylesheet", "-widgetcount", "-qdebug",
|
||||||
|
"-software" } };
|
||||||
|
+}
|
||||||
|
|
||||||
|
- bool operator==(const MImServerCommonOptions &x,
|
||||||
|
- const MImServerCommonOptions &y)
|
||||||
|
- {
|
||||||
|
- return (x.showHelp == y.showHelp);
|
||||||
|
- }
|
||||||
|
+bool operator==(const MImServerCommonOptions &x,
|
||||||
|
+ const MImServerCommonOptions &y)
|
||||||
|
+{
|
||||||
|
+ return (x.showHelp == y.showHelp);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
2.37.1
|
||||||
Loading…
x
Reference in New Issue
Block a user