[neon/extras/kreport/Neon/release] debian: fix symbols loss with gcc 10 (#975745)

Pino Toscano null at kde.org
Thu Sep 8 15:43:55 BST 2022


Git commit 4683d09732ee34701a26530a35302fbbf0da2593 by Pino Toscano.
Committed on 26/11/2020 at 15:56.
Pushed by jriddell into branch 'Neon/release'.

fix symbols loss with gcc 10 (#975745)

backport upstream commit 5d3053ea78b349b81b7a562974ad78f93d169791

M  +6    -0    debian/changelog
M  +8    -1    debian/libkreport3-4.symbols
A  +1    -0    debian/patches/series
A  +120  -0    debian/patches/upstream_Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch

https://invent.kde.org/neon/extras/kreport/commit/4683d09732ee34701a26530a35302fbbf0da2593

diff --git a/debian/changelog b/debian/changelog
index 7bdc0c3..5ade06f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 kreport (3.2.0-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit 5d3053ea78b349b81b7a562974ad78f93d169791 to export
+    KReportGroupTracker when built with GCC 10; patch
+    upstream_Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch.
+    (Closes: #975745)
+    - update symbols files as they were before 3.2.0-2
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Nov 2020 16:48:54 +0100
 
diff --git a/debian/libkreport3-4.symbols b/debian/libkreport3-4.symbols
index 63b2320..6d1bda8 100644
--- a/debian/libkreport3-4.symbols
+++ b/debian/libkreport3-4.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 3.2.0 amd64 i386
+# SymbolsHelper-Confirmed: 3.1.0 amd64
 libKReport3.so.4 libkreport3-4 #MINVER#
 * Build-Depends-Package: libkreport3-dev
  _Z5qHashRK14KReportElementj at Base 3.0.0
@@ -344,6 +344,9 @@ libKReport3.so.4 libkreport3-4 #MINVER#
  _ZN18KReportSectionDataD1Ev at Base 3.1.0
  _ZN18KReportSectionDataD2Ev at Base 3.1.0
  (optional=templinst)_ZN18QSharedDataPointerIN14KReportElement4DataEE5cloneEv at Base 3.0.0
+ _ZN19KReportGroupTracker11qt_metacallEN11QMetaObject4CallEiPPv at Base 3.0.0
+ _ZN19KReportGroupTracker11qt_metacastEPKc at Base 3.0.0
+ _ZN19KReportGroupTracker16staticMetaObjectE at Base 3.0.0
  _ZN19KReportLabelElementD0Ev at Base 3.0.0
  _ZN19KReportLabelElementD1Ev at Base 3.0.0
  _ZN19KReportLabelElementD2Ev at Base 3.0.0
@@ -689,6 +692,7 @@ libKReport3.so.4 libkreport3-4 #MINVER#
  _ZNK18KReportSectionData6heightEv at Base 3.1.0
  _ZNK18KReportSectionData7isValidEv at Base 3.1.0
  _ZNK18KReportSectionData7objectsEv at Base 3.1.0
+ _ZNK19KReportGroupTracker10metaObjectEv at Base 3.0.0
  _ZNK20KReportAsyncItemBase10metaObjectEv at Base 3.0.0
  _ZNK20KReportAsyncItemBase12realItemDataERK8QVariant at Base 3.1.0
  _ZNK20KReportPluginManager10metaObjectEv at Base 3.0.0
@@ -772,6 +776,7 @@ libKReport3.so.4 libkreport3-4 #MINVER#
  _ZTI17KReportDataSource at Base 3.1.0
  _ZTI18KReportPreRenderer at Base 3.0.0
  _ZTI18KReportSectionData at Base 3.1.0
+ _ZTI19KReportGroupTracker at Base 3.0.0
  _ZTI19KReportLabelElement at Base 3.0.0
  _ZTI19KReportRendererBase at Base 3.0.0
  _ZTI19KReportScriptSource at Base 3.1.0
@@ -809,6 +814,7 @@ libKReport3.so.4 libkreport3-4 #MINVER#
  _ZTS17KReportDataSource at Base 3.1.0
  _ZTS18KReportPreRenderer at Base 3.0.0
  _ZTS18KReportSectionData at Base 3.1.0
+ _ZTS19KReportGroupTracker at Base 3.0.0
  _ZTS19KReportLabelElement at Base 3.0.0
  _ZTS19KReportRendererBase at Base 3.0.0
  _ZTS19KReportScriptSource at Base 3.1.0
@@ -845,6 +851,7 @@ libKReport3.so.4 libkreport3-4 #MINVER#
  _ZTV17KReportDataSource at Base 3.1.0
  _ZTV18KReportPreRenderer at Base 3.0.0
  _ZTV18KReportSectionData at Base 3.1.0
+ _ZTV19KReportGroupTracker at Base 3.0.0
  _ZTV19KReportLabelElement at Base 3.0.0
  _ZTV19KReportRendererBase at Base 3.0.0
  _ZTV19KReportScriptSource at Base 3.1.0
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8a42bc0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch
diff --git a/debian/patches/upstream_Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch b/debian/patches/upstream_Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch
new file mode 100644
index 0000000..f030b67
--- /dev/null
+++ b/debian/patches/upstream_Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch
@@ -0,0 +1,120 @@
+From 5d3053ea78b349b81b7a562974ad78f93d169791 Mon Sep 17 00:00:00 2001
+From: Jaroslaw Staniek <staniek at kde.org>
+Date: Tue, 16 Jun 2020 21:59:12 +0200
+Subject: [PATCH] Fix build with GCC 10 (make KReportGroupTracker use C++ file)
+
+BUG:422886
+CCMAIL:adam at piggz.co.uk
+
+FIXED-IN:3.2.1
+---
+ src/CMakeLists.txt                            |  5 +---
+ .../scripting/KReportGroupTracker.cpp         | 26 +++++++++++++++++++
+ src/renderer/scripting/KReportGroupTracker.h  | 25 +++++++++++++++---
+ 3 files changed, 48 insertions(+), 8 deletions(-)
+ create mode 100644 src/renderer/scripting/KReportGroupTracker.cpp
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1cf0b389..65bcf6e5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -106,6 +106,7 @@ set(kreport_TARGET_INCLUDE_DIRS
+ 
+ if(KREPORT_SCRIPTING)
+     list(APPEND kreport_LIB_SRCS
++        renderer/scripting/KReportGroupTracker.cpp
+         renderer/scripting/KReportScriptHandler.cpp
+         renderer/scripting/KReportScriptConstants.cpp
+         renderer/scripting/KReportScriptDebug.cpp
+@@ -133,10 +134,6 @@ if(KREPORT_SCRIPTING)
+         items/text/KReportScriptText.cpp
+     )
+ 
+-    qt_wrap_cpp(KReport kreport_LIB_SRCS
+-        renderer/scripting/KReportGroupTracker.h
+-    )
+-
+     list(APPEND kreport_INCLUDE_DIRS
+         ${CMAKE_CURRENT_SOURCE_DIR}/renderer/scripting
+     )
+diff --git a/src/renderer/scripting/KReportGroupTracker.cpp b/src/renderer/scripting/KReportGroupTracker.cpp
+new file mode 100644
+index 00000000..9274d4a5
+--- /dev/null
++++ b/src/renderer/scripting/KReportGroupTracker.cpp
+@@ -0,0 +1,26 @@
++/* This file is part of the KDE project
++ * Copyright (C) 2015 by Adam Pigg (adam at piggz.co.uk)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "KReportGroupTracker.h"
++
++KReportGroupTracker::KReportGroupTracker()
++{
++}
++
++KReportGroupTracker::~KReportGroupTracker()
++{
++}
+diff --git a/src/renderer/scripting/KReportGroupTracker.h b/src/renderer/scripting/KReportGroupTracker.h
+index e434e05a..4c0852ea 100644
+--- a/src/renderer/scripting/KReportGroupTracker.h
++++ b/src/renderer/scripting/KReportGroupTracker.h
+@@ -1,3 +1,20 @@
++/* This file is part of the KDE project
++ * Copyright (C) 2015 by Adam Pigg (adam at piggz.co.uk)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
+ #ifndef KREPORTGROUPTRACKER_H
+ #define KREPORTGROUPTRACKER_H
+ 
+@@ -7,16 +24,16 @@
+ /*!
+  * @brief Keeps track of groups as the data for the group changes
+  */
+-class KREPORT_EXPORT KReportGroupTracker : public QObject {
++class KREPORT_EXPORT KReportGroupTracker : public QObject
++{
+     Q_OBJECT
+ 
+ protected:
+-    KReportGroupTracker() {}
+-    ~KReportGroupTracker() override{}
++    KReportGroupTracker();
++    ~KReportGroupTracker() override;
+ 
+ public:
+     Q_SLOT virtual void setGroupData(const QMap<QString, QVariant> &groupData) = 0;
+ };
+ 
+ #endif // KREPORTGROUPTRACKER_H
+-
+-- 
+2.29.2
+



More information about the Neon-commits mailing list