diff --git a/maliit-framework.spec b/maliit-framework.spec index 4fcdfda797c0cd467db6109da14b979efa636a46..1821c1376c6c1629194a57e0acd58204e345c2b8 100644 --- a/maliit-framework.spec +++ b/maliit-framework.spec @@ -1,12 +1,14 @@ Name: maliit-framework Version: 2.2.0 -Release: 1 +Release: 2 Summary: Input method framework License: LGPLv2 URL: https://maliit.github.io/ 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: gcc-c++ @@ -131,5 +133,8 @@ make install/fast DESTDIR=%{buildroot} %changelog +* Thu Sep 14 2023 misaka00251 - 2.2.0-2 +- Add patch to fix build with gcc-12 & fix yaml + * Wed Jul 20 2022 misaka00251 - 2.2.0-1 - Init package diff --git a/mallit-framework.yaml b/mallit-framework.yaml index f0cbb76ee400b74c95c2a5f62e217b304f3ce0c9..4b32e73d8dc96727c364a3750eaef864a912aa86 100644 --- a/mallit-framework.yaml +++ b/mallit-framework.yaml @@ -1,4 +1,4 @@ -version_control: git +version_control: github src_repo: maliit/framework tag_prefix: "" separator: "." diff --git a/move-the-operator-definition-to-global-namespace.patch b/move-the-operator-definition-to-global-namespace.patch new file mode 100644 index 0000000000000000000000000000000000000000..97ad89999ac41ae35d15e2a1c3aed0cdc35c9be1 --- /dev/null +++ b/move-the-operator-definition-to-global-namespace.patch @@ -0,0 +1,39 @@ +From 86e55980e3025678882cb9c4c78614f86cdc1f04 Mon Sep 17 00:00:00 2001 +From: Rodney Dawes +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