Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16113 from Rmys/master

Browse Source 
kreport rebuild
This commit is contained in:
Rmys
2025-01-26 13:25:34 +03:00
committed by GitHub
parent 569c41d9b4 eb6be99f7b
commit fa9b1d4756
2 changed files with 136 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/applications/kreport/files/5d3053ea.patch
+120
View File
@@ -0,0 +1,120 @@
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
---
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
-
--
GitLab
desktop/kde/applications/kreport/pspec.xml
+16 -300
View File
@@ -10,6 +10,7 @@
<IsA>app:console</IsA>
<Summary>A framework for creation and generation of reports in multiple formats</Summary>
<Description>A framework for creation and generation of reports in multiple formats</Description>
<Archive sha1sum="3e5edfc4347684a0fa53689653d8d9b304ef4dee" type="tarxz">https://download.kde.org/stable/kreport/src/kreport-3.2.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>qt5-base-devel</Dependency>
@@ -17,15 +18,17 @@
<Dependency>qt5-webkit-devel</Dependency>
<Dependency>qt5-linguist</Dependency>
<Dependency>kproperty-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kguiaddons-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency versionFrom="22.04.0">marble-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
<Dependency>kconfig5-devel</Dependency>
<Dependency>kguiaddons5-devel</Dependency>
<Dependency>kwidgetsaddons5-devel</Dependency>
<Dependency>kcoreaddons5-devel</Dependency>
<!-- <Dependency versionFrom="22.04.0">marble-devel</Dependency> -->
<Dependency>ki18n5-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-webengine-devel</Dependency>
</BuildDependencies>
<Archive sha1sum="3e5edfc4347684a0fa53689653d8d9b304ef4dee" type="tarxz">https://download.kde.org/stable/kreport/src/kreport-3.2.0.tar.xz</Archive>
<Patches>
<Patch level="1">5d3053ea.patch</Patch>
</Patches>
</Source>
<Package>
@@ -33,13 +36,13 @@
<Summary>A framework for creation and generation of reports in multiple formats</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>marble</Dependency>
<Dependency>kconfig</Dependency>
<!-- <Dependency>marble</Dependency> -->
<Dependency>kconfig5</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>kproperty</Dependency>
<Dependency>qt5-webkit</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>kwidgetsaddons</Dependency>
<Dependency>kcoreaddons5</Dependency>
<Dependency>kwidgetsaddons5</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency versionFrom="5.6.0">qt5-webengine</Dependency>
</RuntimeDependencies>
@@ -68,300 +71,13 @@
</Package>
<History>
<Update release="43">
<Date>2023-12-07</Date>
<Update release="44">
<Date>2025-01-25</Date>
<Version>3.2.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="42">
<Date>2023-10-27</Date>
<Version>3.2.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="41">
<Date>2023-09-14</Date>
<Version>3.2.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="40">
<Date>2023-06-08</Date>
<Version>3.2.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="39">
<Date>2023-05-11</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="38">
<Date>2023-04-20</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="37">
<Date>2023-03-03</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="36">
<Date>2023-01-05</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="35">
<Date>2022-12-08</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="34">
<Date>2022-11-06</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="33">
<Date>2022-09-24</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="32">
<Date>2022-06-21</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="31">
<Date>2022-05-17</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="30">
<Date>2022-05-07</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="29">
<Date>2022-01-10</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="28">
<Date>2021-10-15</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="27">
<Date>2021-09-13</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="26">
<Date>2021-06-16</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="25">
<Date>2021-03-10</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="24">
<Date>2020-09-13</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="23">
<Date>2020-06-11</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="22">
<Date>2020-05-06</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="21">
<Date>2020-03-30</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="20">
<Date>2020-02-02</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="19">
<Date>2019-09-15</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="18">
<Date>2019-07-22</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="17">
<Date>2019-04-18</Date>
<Version>3.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="16">
<Date>2019-02-14</Date>
<Version>3.1.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="15">
<Date>2019-01-11</Date>
<Version>3.1.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14">
<Date>2018-12-26</Date>
<Version>3.1.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="13">
<Date>2018-11-11</Date>
<Version>3.1.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="12">
<Date>2018-10-18</Date>
<Version>3.1.0</Version>
<Comment>Version Bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11">
<Date>2018-09-10</Date>
<Version>3.1.0</Version>
<Comment>Version Bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="10">
<Date>2018-08-11</Date>
<Version>3.0.2</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="9">
<Date>2018-05-15</Date>
<Version>3.0.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2018-04-25</Date>
<Version>3.0.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2018-03-23</Date>
<Version>3.0.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-02-03</Date>
<Version>3.0.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2017-12-16</Date>
<Version>3.0.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2017-10-16</Date>
<Version>3.0.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3">
<Date>2017-07-14</Date>
<Version>3.0.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2017-06-30</Date>
<Version>3.0.1</Version>
<Comment>Release bump.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-12-31</Date>
<Version>3.0.0</Version>