zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kreport: Add upstream patch to fix build of kexi with gcc 10

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-06-19 14:07:24 +02:00
parent e017132fb3
commit 3d66b8e1e5
2 changed files with 123 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
recipes-kde/apps/calligra/kreport/0001-Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch Normal file
View File

@@ -0,0 +1,122 @@
From 5d3053ea78b349b81b7a562974ad78f93d169791 Mon Sep 17 00:00:00 2001
From: Jaroslaw Staniek <staniek@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@piggz.co.uk
FIXED-IN:3.2.1
Upstream-Status: Applied[https://github.com/KDE/kreport/commit/5d3053ea78b349b81b7a562974ad78f93d169791]
---
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@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@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.26.2

1
recipes-kde/apps/calligra/kreport_3.2.0.bb
View File

@@ -26,6 +26,7 @@ DEPENDS += " \
SRC_URI = " \ SRC_URI = " \
${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \ ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
file://0001-Do-not-rely-on-python2.patch \ file://0001-Do-not-rely-on-python2.patch \
file://0001-Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch \
" "
SRC_URI[md5sum] = "f11fa519d7f5519c8e48906fa96cab2f" SRC_URI[md5sum] = "f11fa519d7f5519c8e48906fa96cab2f"
SRC_URI[sha256sum] = "22716d719654e8f887fe4d33654e252ddf3d3d818c44e15a8af0e6f2e7d6ccd7" SRC_URI[sha256sum] = "22716d719654e8f887fe4d33654e252ddf3d3d818c44e15a8af0e6f2e7d6ccd7"