Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package codelite for openSUSE:Factory checked in at 2022-01-31 22:57:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/codelite (Old)
and /work/SRC/openSUSE:Factory/.codelite.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "codelite"
Mon Jan 31 22:57:16 2022 rev:17 rq:950125 version:15.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/codelite/codelite.changes 2021-09-30 23:45:13.332594881 +0200
+++ /work/SRC/openSUSE:Factory/.codelite.new.1898/codelite.changes 2022-01-31 22:58:05.109273237 +0100
@@ -1,0 +2,8 @@
+Sun Jan 30 18:22:55 UTC 2022 - Atri Bhattacharya
+
+- Add codelite-SpellChecker-unnest-classes.patch -- Un-nest 2
+ nested classes: this fixes compilation with g++ 11.2.0;
+ patch taken from upstream commit and re-based for current
+ version (deb#997219).
+
+-------------------------------------------------------------------
New:
----
codelite-SpellChecker-unnest-classes.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ codelite.spec ++++++
--- /var/tmp/diff_new_pack.04Ae9C/_old 2022-01-31 22:58:06.621263057 +0100
+++ /var/tmp/diff_new_pack.04Ae9C/_new 2022-01-31 22:58:06.625263030 +0100
@@ -1,7 +1,7 @@
#
# spec file for package codelite
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2012-2019 Mariusz Fik .
#
# All modifications and additions to the file contributed by third parties
@@ -44,6 +44,8 @@
Patch1: fix_node_env-script-interpreter.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-Fix-compilation-with-recent-glibc-where-SIGSTKSZ-is-.patch
+# PATCH-FIX-UPSTREAM codelite-SpellChecker-unnest-classes.patch deb#997219 badshah400@gmail.com -- Un-nest 2 nested classes: this fixes compilation with g++ 11.2.0; patchtaken from upstream commit and re-based for current version
+Patch3: codelite-SpellChecker-unnest-classes.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
++++++ codelite-SpellChecker-unnest-classes.patch ++++++
From 1d57763c8a19b3f5e3ae0b0ca382024a8ac978c2 Mon Sep 17 00:00:00 2001
From: dghart
Date: Sun, 16 Jan 2022 16:31:20 +0000
Subject: [PATCH] Hunspell: Un-nest 2 nested classes: this fixes compilation
with g++ 11.2.0
See debian bug-report https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997219
---
SpellChecker/IHunSpell.h | 69 ++++++++++++++++++++--------------------
1 file changed, 35 insertions(+), 34 deletions(-)
Index: codelite-15.0/SpellChecker/IHunSpell.h
===================================================================
--- codelite-15.0.orig/SpellChecker/IHunSpell.h
+++ codelite-15.0/SpellChecker/IHunSpell.h
@@ -52,50 +52,50 @@ class CorrectSpellingDlg;
class SpellCheck;
class IEditor;
// ------------------------------------------------------------
-class IHunSpell
+class StringHashOptionalCase
{
- class StringHashOptionalCase
+public:
+ StringHashOptionalCase(const bool isCaseSensitive = true) :
+ m_isCaseSensitive(isCaseSensitive)
{
- public:
- StringHashOptionalCase(const bool isCaseSensitive = true) :
- m_isCaseSensitive(isCaseSensitive)
- {
- }
+ }
- size_t operator()(const wxString &str) const
- {
- if (m_isCaseSensitive) {
- return std::hash<wxString>()(str);
- }
- else {
- return std::hash<wxString>()(str.Upper());
- }
+ size_t operator()(const wxString &str) const
+ {
+ if (m_isCaseSensitive) {
+ return std::hash<wxString>()(str);
}
+ else {
+ return std::hash<wxString>()(str.Upper());
+ }
+ }
- private:
- bool m_isCaseSensitive;
- };
+private:
+ bool m_isCaseSensitive;
+};
- class StringCompareOptionalCase
+class StringCompareOptionalCase
+{
+public:
+ StringCompareOptionalCase(const bool isCaseSensitive = true) :
+ m_isCaseSensitive(isCaseSensitive)
{
- public:
- StringCompareOptionalCase(const bool isCaseSensitive = true) :
- m_isCaseSensitive(isCaseSensitive)
- {
- }
-
- bool operator()(const wxString &lhs, const wxString &rhs) const
- {
- if (m_isCaseSensitive)
- return (0 == lhs.Cmp(rhs));
- else
- return (0 == lhs.CmpNoCase(rhs));
- }
+ }
- private:
- bool m_isCaseSensitive;
- };
+ bool operator()(const wxString &lhs, const wxString &rhs) const
+ {
+ if (m_isCaseSensitive)
+ return (0 == lhs.Cmp(rhs));
+ else
+ return (0 == lhs.CmpNoCase(rhs));
+ }
+
+private:
+ bool m_isCaseSensitive;
+};
+class IHunSpell
+{
public:
IHunSpell();
virtual ~IHunSpell();