* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kpackage/files/, kde-frameworks/kpackage/
@ 2017-10-14 16:07 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-10-14 16:07 UTC (permalink / raw
To: gentoo-commits
commit: b11db629639ce065c54101ec4415d4f199615cb5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 16:07:42 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 16:07:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11db629
kde-frameworks/kpackage: Try to fix tests once and for all
Gentoo-bug: 625734
Package-Manager: Portage-2.3.11, Repoman-2.3.3
.../kpackage/files/kpackage-5.39.0-tests.patch | 86 ++++++++++++++++++++++
kde-frameworks/kpackage/kpackage-5.39.0.ebuild | 2 +
2 files changed, 88 insertions(+)
diff --git a/kde-frameworks/kpackage/files/kpackage-5.39.0-tests.patch b/kde-frameworks/kpackage/files/kpackage-5.39.0-tests.patch
new file mode 100644
index 00000000000..bdef0c909c3
--- /dev/null
+++ b/kde-frameworks/kpackage/files/kpackage-5.39.0-tests.patch
@@ -0,0 +1,86 @@
+From 6a8e67b0c62349c57da492c19490f1a03e3c7d37 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Thu, 12 Oct 2017 12:36:19 +0200
+Subject: [PATCH] use the non installed service files
+
+---
+ autotests/CMakeLists.txt | 1 +
+ src/kpackage/CMakeLists.txt | 6 +++---
+ .../data/{servicetypes => kservicetypes5}/kpackage-generic.desktop | 0
+ .../{servicetypes => kservicetypes5}/kpackage-genericqml.desktop | 0
+ .../kpackage-packagestructure.desktop | 0
+ src/kpackage/kpackage.qrc | 2 +-
+ src/kpackagetool/kpackagetool.qrc | 2 +-
+ 7 files changed, 6 insertions(+), 5 deletions(-)
+ rename src/kpackage/data/{servicetypes => kservicetypes5}/kpackage-generic.desktop (100%)
+ rename src/kpackage/data/{servicetypes => kservicetypes5}/kpackage-genericqml.desktop (100%)
+ rename src/kpackage/data/{servicetypes => kservicetypes5}/kpackage-packagestructure.desktop (100%)
+
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+index 6126463..6d9767a 100644
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -32,6 +32,7 @@ function(kpackagetool5test testname)
+ -Doutput=${CMAKE_CURRENT_SOURCE_DIR}/data/${testname}/${testname}.testappdataxml
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/kpackagetoolappstreamtest.cmake
+ )
++ set_property(TEST ${testname}-appstream PROPERTY ENVIRONMENT "XDG_DATA_DIRS=${CMAKE_SOURCE_DIR}/src/kpackage/data:$XDG_DATA_DIRS")
+ endfunction()
+
+ foreach(var "testfallbackpackage" "testpackage" "testpackage-nodisplay" "testjsonmetadatapackage" "testpackagesdep" "testpackagesdepinvalid") # "customcontent" "simplecontent"
+diff --git a/src/kpackage/CMakeLists.txt b/src/kpackage/CMakeLists.txt
+index c5e0cb3..95d7bc5 100644
+--- a/src/kpackage/CMakeLists.txt
++++ b/src/kpackage/CMakeLists.txt
+@@ -82,9 +82,9 @@ install(FILES
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPackage/KPackage COMPONENT Devel)
+
+ install(FILES
+- data/servicetypes/kpackage-packagestructure.desktop
+- data/servicetypes/kpackage-generic.desktop
+- data/servicetypes/kpackage-genericqml.desktop
++ data/kservicetypes5/kpackage-packagestructure.desktop
++ data/kservicetypes5/kpackage-generic.desktop
++ data/kservicetypes5/kpackage-genericqml.desktop
+ DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+
+
+diff --git a/src/kpackage/data/servicetypes/kpackage-generic.desktop b/src/kpackage/data/kservicetypes5/kpackage-generic.desktop
+similarity index 100%
+rename from src/kpackage/data/servicetypes/kpackage-generic.desktop
+rename to src/kpackage/data/kservicetypes5/kpackage-generic.desktop
+diff --git a/src/kpackage/data/servicetypes/kpackage-genericqml.desktop b/src/kpackage/data/kservicetypes5/kpackage-genericqml.desktop
+similarity index 100%
+rename from src/kpackage/data/servicetypes/kpackage-genericqml.desktop
+rename to src/kpackage/data/kservicetypes5/kpackage-genericqml.desktop
+diff --git a/src/kpackage/data/servicetypes/kpackage-packagestructure.desktop b/src/kpackage/data/kservicetypes5/kpackage-packagestructure.desktop
+similarity index 100%
+rename from src/kpackage/data/servicetypes/kpackage-packagestructure.desktop
+rename to src/kpackage/data/kservicetypes5/kpackage-packagestructure.desktop
+diff --git a/src/kpackage/kpackage.qrc b/src/kpackage/kpackage.qrc
+index 5d4d077..6368c00 100644
+--- a/src/kpackage/kpackage.qrc
++++ b/src/kpackage/kpackage.qrc
+@@ -1,6 +1,6 @@
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+-<file alias="/kservicetypes5/kpackage-generic.desktop">../kpackage/data/servicetypes/kpackage-generic.desktop</file>
++<file alias="/kservicetypes5/kpackage-generic.desktop">../kpackage/data/kservicetypes5/kpackage-generic.desktop</file>
+ </qresource>
+ </RCC>
+
+diff --git a/src/kpackagetool/kpackagetool.qrc b/src/kpackagetool/kpackagetool.qrc
+index 5d4d077..6368c00 100644
+--- a/src/kpackagetool/kpackagetool.qrc
++++ b/src/kpackagetool/kpackagetool.qrc
+@@ -1,6 +1,6 @@
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+-<file alias="/kservicetypes5/kpackage-generic.desktop">../kpackage/data/servicetypes/kpackage-generic.desktop</file>
++<file alias="/kservicetypes5/kpackage-generic.desktop">../kpackage/data/kservicetypes5/kpackage-generic.desktop</file>
+ </qresource>
+ </RCC>
+
+--
+2.14.2
+
diff --git a/kde-frameworks/kpackage/kpackage-5.39.0.ebuild b/kde-frameworks/kpackage/kpackage-5.39.0.ebuild
index d9ec70903d3..dfe8d79b1bb 100644
--- a/kde-frameworks/kpackage/kpackage-5.39.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.39.0.ebuild
@@ -19,6 +19,8 @@ DEPEND="${RDEPEND}
man? ( $(add_frameworks_dep kdoctools) )
"
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package man KF5DocTools)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kpackage/files/, kde-frameworks/kpackage/
@ 2019-04-27 20:51 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2019-04-27 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 1c974e92352cf577f88b1c214ec6b29ff20f1cd3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 18:45:19 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 20:51:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c974e92
kde-frameworks/kpackage: Fix runtime crash
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kpackage-5.57.0-runtime-crashfix.patch | 42 ++++++++++++++++++++++
kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild | 37 +++++++++++++++++++
2 files changed, 79 insertions(+)
diff --git a/kde-frameworks/kpackage/files/kpackage-5.57.0-runtime-crashfix.patch b/kde-frameworks/kpackage/files/kpackage-5.57.0-runtime-crashfix.patch
new file mode 100644
index 00000000000..5d13d3f8c3a
--- /dev/null
+++ b/kde-frameworks/kpackage/files/kpackage-5.57.0-runtime-crashfix.patch
@@ -0,0 +1,42 @@
+From c3e896e02f9a8dc92d6e26cdbc87fe5c6b9cf3bf Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 14 Apr 2019 19:44:50 +0200
+Subject: Don't use qAsConst over a temporary variable
+
+Summary:
+(will crash because the temporary will be destroyed before being used)
+
+Detected with
+ ag -sr qAsConst'\([^)]*\(' .
+
+Test Plan: builds
+
+Reviewers: mlaurent, cfeck, apol
+
+Reviewed By: mlaurent
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D20552
+---
+ src/kpackage/package.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
+index 130eec6..801f1c2 100644
+--- a/src/kpackage/package.cpp
++++ b/src/kpackage/package.cpp
+@@ -429,7 +429,8 @@ QStringList Package::entryList(const QByteArray &key) const
+ QStringList list;
+ for (const QString &prefix : qAsConst(d->contentsPrefixPaths)) {
+ //qCDebug(KPACKAGE_LOG) << " looking in" << prefix;
+- for (const QString &path : qAsConst(it.value().paths)) {
++ const QStringList paths = it.value().paths;
++ for (const QString &path : paths) {
+ //qCDebug(KPACKAGE_LOG) << " looking in" << path;
+ if (it.value().directory) {
+ //qCDebug(KPACKAGE_LOG) << "it's a directory, so trying out" << d->path + prefix + path;
+--
+cgit v1.1
diff --git a/kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild b/kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild
new file mode 100644
index 00000000000..a65b0d91a0d
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde5
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="man"
+
+BDEPEND="
+ man? ( $(add_frameworks_dep kdoctools) )
+"
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-runtime-crashfix.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package man KF5DocTools)
+ )
+
+ kde5_src_configure
+}
+
+src_test() {
+ #bug 650214
+ local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
+ kde5_src_test
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-27 20:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-27 20:51 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kpackage/files/, kde-frameworks/kpackage/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2017-10-14 16:07 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox