[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Andreas Sturmlechner]

commit: dd7b7dc71487060114f6aaf54451cd020d8152c6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 16 21:03:37 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 16 21:32:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd7b7dc7

kde-frameworks/kconfig: Drop IUSE nls

It is non-optional.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kconfig/kconfig-5.100.0.ebuild | 4 ++--
 kde-frameworks/kconfig/kconfig-5.99.0.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-frameworks/kconfig/kconfig-5.100.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.100.0.ebuild
index 879e6a4266d1..e17b870502e3 100644
--- a/kde-frameworks/kconfig/kconfig-5.100.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.100.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Framework for reading and writing configuration"
 
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="dbus nls qml"
+IUSE="dbus qml"
 
 # bug 560086
 RESTRICT="test"
@@ -25,7 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
 "
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
 
 DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
 

diff --git a/kde-frameworks/kconfig/kconfig-5.99.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.99.0.ebuild
index 85e62c7cf9e4..9e47b573ac06 100644
--- a/kde-frameworks/kconfig/kconfig-5.99.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.99.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Framework for reading and writing configuration"
 
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="dbus nls qml"
+IUSE="dbus qml"
 
 # bug 560086
 RESTRICT="test"
@@ -25,7 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
 "
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
 
 DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
 

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Andreas Sturmlechner]

commit: de731909d1a2930ee5197312b73fbe86237b1dbc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  6 08:17:33 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  6 09:05:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de731909

kde-frameworks/kconfig: Add CPE to metadata

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kconfig/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-frameworks/kconfig/metadata.xml 
b/kde-frameworks/kconfig/metadata.xml
index 6709562d0d64..d99f466aae3e 100644
--- a/kde-frameworks/kconfig/metadata.xml
+++ b/kde-frameworks/kconfig/metadata.xml
@@ -7,6 +7,7 @@


https://bugs.kde.org/
+   cpe:/a:kde:kconfig


Enable QML/QtQuick support via 
dev-qt/qtdeclarative

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Andreas Sturmlechner]

commit: da091a9a741178a6fae4dfdb9e1031b323b87fcb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 14 10:49:25 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 14 10:55:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da091a9a

kde-frameworks/kconfig: Fix IUSE qml

Upstream commit ee80eec19ad6cfc207b7970e2e6080ea00335d96

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kconfig/kconfig-5.97.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/kconfig/kconfig-5.97.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.97.0.ebuild
index 1ae080474ba4..879e6a4266d1 100644
--- a/kde-frameworks/kconfig/kconfig-5.97.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.97.0.ebuild
@@ -32,7 +32,7 @@ DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
 src_configure() {
local mycmakeargs=(
-DKCONFIG_USE_DBUS=$(usex dbus)
-   $(cmake_use_find_package qml Qt5Qml)
+   -DKCONFIG_USE_QML=$(usex qml)
)
ecm_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Andreas Sturmlechner]

commit: 3368d5e2fdca00d0dbfca1a10c7faa76d8221728
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 12 11:07:41 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 12 11:07:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3368d5e2

kde-frameworks/kconfig: Security cleanup 5.60.0 (r0)

Bug: https://bugs.gentoo.org/691858
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kconfig/kconfig-5.60.0.ebuild | 36 
 1 file changed, 36 deletions(-)

diff --git a/kde-frameworks/kconfig/kconfig-5.60.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.60.0.ebuild
deleted file mode 100644
index 113d6954350..000
--- a/kde-frameworks/kconfig/kconfig-5.60.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="dbus nls"
-
-BDEPEND="
-   nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtxml)
-   dbus? ( $(add_qt_dep qtdbus) )
-"
-DEPEND="${RDEPEND}
-   test? ( $(add_qt_dep qtconcurrent) )
-"
-
-# bug 560086
-RESTRICT+=" test"
-
-DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
-
-src_configure() {
-   local mycmakeargs=(
-   -DKCONFIG_USE_DBUS=$(usex dbus)
-   )
-   kde5_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Agostino Sarubbo]

commit: 354fd87d03f246bd7da80fd49969d67485f3898f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 12 09:11:04 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 12 09:11:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354fd87d

kde-frameworks/kconfig: amd64 stable wrt bug #691858

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild 
b/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild
index c878f693259..051742601b4 100644
--- a/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for reading and writing configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="dbus nls"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Aaron Bauman]

commit: fe51f5c555c7ea518747a9840f96c31f8b8b83f1
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Aug  9 22:23:27 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Aug  9 22:23:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe51f5c5

kde-frameworks/kconfig: arm64 stable (bug #691858)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.71, Repoman-2.3.17
RepoMan-Options: --include-arches="arm64"

 kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild 
b/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild
index c2c4035e267..5520e8e4f92 100644
--- a/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for reading and writing configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~x86"
 IUSE="dbus nls"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/, kde-frameworks/kconfig/files/

[Andreas Sturmlechner]

commit: 46ef30b8118f412f7a989bd737dd60431fc2f2cd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  8 13:22:41 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  8 16:51:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ef30b8

kde-frameworks/kconfig: Fix CVE-2019-14744

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kconfig-5.60.0-CVE-2019-14744.patch  | 147 +
 kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild|  38 ++
 2 files changed, 185 insertions(+)

diff --git a/kde-frameworks/kconfig/files/kconfig-5.60.0-CVE-2019-14744.patch 
b/kde-frameworks/kconfig/files/kconfig-5.60.0-CVE-2019-14744.patch
new file mode 100644
index 000..e8a799ca5d2
--- /dev/null
+++ b/kde-frameworks/kconfig/files/kconfig-5.60.0-CVE-2019-14744.patch
@@ -0,0 +1,147 @@
+From 5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 Mon Sep 17 00:00:00 2001
+From: David Faure 
+Date: Wed, 7 Aug 2019 09:35:36 +0200
+Subject: Security: remove support for $(...) in config keys with [$e] marker.
+
+Summary:
+It is very unclear at this point what a valid use case for this feature
+would possibly be. The old documentation only mentions $(hostname) as
+an example, which can be done with $HOSTNAME instead.
+
+Note that $(...) is still supported in Exec lines of desktop files,
+this does not require [$e] anyway (and actually works better without it,
+otherwise the $ signs need to be doubled to obey kconfig $e escaping rules...).
+
+Test Plan:
+ctest passes; various testcases with $(...) in desktop files,
+directory files, and config files, no longer execute commands.
+
+Reviewers: mdawson, aacid, broulik, davidedmundson, kossebau, apol, sitter, 
security-team
+
+Reviewed By: mdawson, davidedmundson
+
+Subscribers: ZaWertun, rikmills, fvogt, ngraham, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D22979
+---
+ autotests/kconfigtest.cpp | 10 ++
+ docs/options.md   | 11 ---
+ src/core/kconfig.cpp  | 37 +
+ 3 files changed, 7 insertions(+), 51 deletions(-)
+
+diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
+index 410b5b8..9af3b46 100644
+--- a/autotests/kconfigtest.cpp
 b/autotests/kconfigtest.cpp
+@@ -38,7 +38,7 @@
+ #include 
+ #endif
+ #ifndef Q_OS_WIN
+-#include  // gethostname
++#include  // getuid
+ #endif
+ 
+ KCONFIGGROUP_DECLARE_ENUM_QOBJECT(KConfigTest, Testing)
+@@ -546,14 +546,8 @@ void KConfigTest::testPath()
+ QCOMPARE(group.readPathEntry("withBraces", QString()), QString("file://" 
+ HOMEPATH));
+ QVERIFY(group.hasKey("URL"));
+ QCOMPARE(group.readEntry("URL", QString()), QString("file://" + 
HOMEPATH));
+-#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC)
+-// I don't know if this will work on windows
+-// This test hangs on OS X
+ QVERIFY(group.hasKey("hostname"));
+-char hostname[256];
+-QVERIFY(::gethostname(hostname, sizeof(hostname)) == 0);
+-QCOMPARE(group.readEntry("hostname", QString()), 
QString::fromLatin1(hostname));
+-#endif
++QCOMPARE(group.readEntry("hostname", QString()), 
QStringLiteral("(hostname)")); // the $ got removed because empty var name
+ QVERIFY(group.hasKey("noeol"));
+ QCOMPARE(group.readEntry("noeol", QString()), QString("foo"));
+ 
+diff --git a/docs/options.md b/docs/options.md
+index c634c00..4a6e9bc 100644
+--- a/docs/options.md
 b/docs/options.md
+@@ -67,18 +67,15 @@ environment variables (and `XDG_CONFIG_HOME` in 
particular).
+ Shell Expansion
+ ---
+ 
+-If an entry is marked with `$e`, environment variables and shell commands will
+-be expanded.
++If an entry is marked with `$e`, environment variables will be expanded.
+ 
+ Name[$e]=$USER
+-Host[$e]=$(hostname)
+ 
+ When the "Name" entry is read `$USER` will be replaced with the value of the
+-`$USER` environment variable, and `$(hostname)` will be replaced with the 
output
+-of the `hostname` command.
++`$USER` environment variable.
+ 
+-Note that the application will replace `$USER` and `$(hostname)` with their
+-respective expanded values after saving. To prevent this combine the `$e` 
option
++Note that the application will replace `$USER` with its
++expanded value after saving. To prevent this combine the `$e` option
+ with `$i` (immmutable) option.  For example:
+ 
+ Name[$ei]=$USER
+diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
+index e1b11ed..f6824ce 100644
+--- a/src/core/kconfig.cpp
 b/src/core/kconfig.cpp
+@@ -28,19 +28,6 @@
+ #include 
+ #include 
+ 
+-#ifdef _MSC_VER
+-static inline FILE *popen(const char *cmd, const char *mode)
+-{
+-return _popen(cmd, mode);
+-}
+-static inline int pclose(FILE *stream)
+-{
+-return _pclose(stream);
+-}
+-#else
+-#include 
+-#endif
+-
+ #include "kconfigbackend_p.h"
+ #include "kconfiggroup.h"
+ 
+@@ -183,29 

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Andreas Sturmlechner]

commit: 6d29a0502eba28f9c02eebde2a6e7eb08342a29b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 20 16:22:27 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 20 18:54:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d29a050

kde-frameworks/kconfig: Drop 5.54.0 (r0)

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kconfig/kconfig-5.54.0.ebuild | 26 --
 1 file changed, 26 deletions(-)

diff --git a/kde-frameworks/kconfig/kconfig-5.54.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.54.0.ebuild
deleted file mode 100644
index 7edcbd74b81..000
--- a/kde-frameworks/kconfig/kconfig-5.54.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-   nls? ( $(add_qt_dep linguist-tools) )
-   test? ( $(add_qt_dep qtconcurrent) )
-"
-
-# bug 560086
-RESTRICT+=" test"
-
-DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Andreas Sturmlechner]

commit: d0e554ed37eeda6fb0dd394c07524c21239cf733
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 20 16:19:50 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 20 18:54:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e554ed

kde-frameworks/kconfig: Add missing dependency

Upstream commit 8579ec54838b7188ed016f7adb4a69bbf2e39712

Reported-by: Jochen Schlick  gmail.com>
Closes: https://bugs.gentoo.org/675880
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kconfig/kconfig-5.54.0-r1.ebuild | 34 +
 1 file changed, 34 insertions(+)

diff --git a/kde-frameworks/kconfig/kconfig-5.54.0-r1.ebuild 
b/kde-frameworks/kconfig/kconfig-5.54.0-r1.ebuild
new file mode 100644
index 000..d78a7023f20
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.54.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dbus nls"
+
+RDEPEND="
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtxml)
+   dbus? ( $(add_qt_dep qtdbus) )
+"
+DEPEND="${RDEPEND}
+   nls? ( $(add_qt_dep linguist-tools) )
+   test? ( $(add_qt_dep qtconcurrent) )
+"
+
+# bug 560086
+RESTRICT+=" test"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
+
+src_configure() {
+   local mycmakeargs=(
+   -DKCONFIG_USE_DBUS=$(usex dbus)
+   )
+   kde5_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Andreas Sturmlechner]

commit: 1cccd30024de1f8f054c728ce713c177d2ceb6b4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 11 18:01:48 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 11 18:19:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cccd300

kde-frameworks/kconfig: Tests are restricted, so don't build them

Closes: https://bugs.gentoo.org/663372
Package-Manager: Portage-2.3.45, Repoman-2.3.10

 kde-frameworks/kconfig/kconfig-5.49.0.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/kde-frameworks/kconfig/kconfig-5.49.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.49.0.ebuild
index 9701c9a5063..2ba890a20f7 100644
--- a/kde-frameworks/kconfig/kconfig-5.49.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.49.0.ebuild
@@ -24,3 +24,8 @@ DEPEND="${RDEPEND}
 RESTRICT+=" test"
 
 DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
+
+src_prepare() {
+   kde5_src_prepare
+   cmake_comment_add_subdirectory autotests # bug 663372
+}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Alexis Ballier]

commit: acbf6080bb8d4b7c3c91d7538a1fae89029d0625
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jun 26 07:52:29 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jun 26 07:52:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbf6080

kde-frameworks/kconfig: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 kde-frameworks/kconfig/kconfig-5.35.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/kconfig/kconfig-5.35.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.35.0.ebuild
index 0a7cd169db4..e8447d66f02 100644
--- a/kde-frameworks/kconfig/kconfig-5.35.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.35.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for reading and writing configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="nls"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/files/, kde-frameworks/kconfig/

[Andreas Sturmlechner]

commit: 25c13ec9aa6daad7f4a16f36de0264d2a4cd38aa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 27 18:50:05 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 29 11:56:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c13ec9

kde-frameworks/kconfig: Add fix for relativePath

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/kconfig-5.33.0-relativePath.patch| 88 ++
 kde-frameworks/kconfig/kconfig-5.33.0-r1.ebuild| 28 +++
 2 files changed, 116 insertions(+)

diff --git a/kde-frameworks/kconfig/files/kconfig-5.33.0-relativePath.patch 
b/kde-frameworks/kconfig/files/kconfig-5.33.0-relativePath.patch
new file mode 100644
index 000..80bffc15a29
--- /dev/null
+++ b/kde-frameworks/kconfig/files/kconfig-5.33.0-relativePath.patch
@@ -0,0 +1,88 @@
+commit 3ad00c4e56eb9fe6ea7386f8ca1db6e15c26ac11
+Author: Wolfgang Bauer 
+Date:   Tue Apr 25 23:37:11 2017 +0200
+
+Fix relativePath calculation in KDesktopFile::locateLocal()
+
+The "dir" and "path" variables were obviously swapped here by mistake.
+This resulted in the relativePath always being empty, and made the
+function return "~/.local/share/" (or "~/.config/") instead of the
+correct path.
+
+BUG: 345100
+FIXED-IN: 5.34.0
+Differential Revision: https://phabricator.kde.org/D5502
+
+diff --git a/autotests/kdesktopfiletest.cpp b/autotests/kdesktopfiletest.cpp
+index 393a6a0..a046196 100644
+--- a/autotests/kdesktopfiletest.cpp
 b/autotests/kdesktopfiletest.cpp
+@@ -255,3 +255,34 @@ void KDesktopFileTest::testTryExecWithAuthorizeAction()
+ QVERIFY(!desktopFile.tryExec());
+ }
+ }
++
++void KDesktopFileTest::testLocateLocal_data()
++{
++QString systemConfigLocation = 
QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation).last();
++QString writableConfigLocation = 
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
++QString systemDataLocation = 
QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).last();
++QString writableDataLocation = 
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
++
++QTest::addColumn("path");
++QTest::addColumn("result");
++
++QTest::newRow("configLocation, system-wide") << systemConfigLocation + 
"/test.desktop" << writableConfigLocation + "/test.desktop";
++QTest::newRow("autostart, system-wide") << systemConfigLocation + 
"/autostart/test.desktop" << writableConfigLocation + "/autostart/test.desktop";
++QTest::newRow("dataLocation, system-wide") << systemDataLocation + 
"/test.desktop" << writableDataLocation + "/test.desktop";
++QTest::newRow("applications, system-wide") << systemDataLocation + 
"/applications/test.desktop" << writableDataLocation + 
"/applications/test.desktop";
++QTest::newRow("desktop-directories, system-wide") << systemDataLocation + 
"/desktop-directories/test.directory" << writableDataLocation + 
"/desktop-directories/test.directory";
++QTest::newRow("configLocation, writable") << writableConfigLocation + 
"/test.desktop" << writableConfigLocation + "/test.desktop";
++QTest::newRow("autostart, writable") << writableConfigLocation + 
"/autostart/test.desktop" << writableConfigLocation + "/autostart/test.desktop";
++QTest::newRow("dataLocation, writable") << writableDataLocation + 
"/test.desktop" << writableDataLocation + "/test.desktop";
++QTest::newRow("applications, writable") << writableDataLocation + 
"/applications/test.desktop" << writableDataLocation + 
"/applications/test.desktop";
++QTest::newRow("desktop-directories, writable") << writableDataLocation + 
"/desktop-directories/test.directory" << writableDataLocation + 
"/desktop-directories/test.directory";
++QTest::newRow("unknown location") << "/test.desktop" << 
writableDataLocation + "/test.desktop";
++}
++
++void KDesktopFileTest::testLocateLocal()
++{
++QFETCH(QString, path);
++QFETCH(QString, result);
++
++QCOMPARE(KDesktopFile::locateLocal(path), result);
++}
+diff --git a/autotests/kdesktopfiletest.h b/autotests/kdesktopfiletest.h
+index eb0bd1d..ed6679a 100644
+--- a/autotests/kdesktopfiletest.h
 b/autotests/kdesktopfiletest.h
+@@ -34,6 +34,8 @@ private Q_SLOTS:
+ void testActionGroup();
+ void testIsAuthorizedDesktopFile();
+ void testTryExecWithAuthorizeAction();
++void testLocateLocal_data();
++void testLocateLocal();
+ 
+ };
+ 
+diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp
+index 4a55030..52a97ec 100644
+--- a/src/core/kdesktopfile.cpp
 b/src/core/kdesktopfile.cpp
+@@ -83,14 +83,14 @@ QString KDesktopFile::locateLocal(const QString )
+ // Relative to config? (e.g. for autostart)
+ Q_FOREACH (const QString , 
QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
+ if (path.startsWith(dir + plus)) {

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Andreas Sturmlechner]

commit: c245096e0ae07aa6ea47a624c8b4355eedb49764
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 27 18:51:01 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 29 11:56:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c245096e

kde-frameworks/kconfig: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-frameworks/kconfig/kconfig-5.33.0.ebuild | 26 --
 1 file changed, 26 deletions(-)

diff --git a/kde-frameworks/kconfig/kconfig-5.33.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.33.0.ebuild
deleted file mode 100644
index 0a7cd169db4..000
--- a/kde-frameworks/kconfig/kconfig-5.33.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nls"
-
-RDEPEND="
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-   nls? ( $(add_qt_dep linguist-tools) )
-   test? ( $(add_qt_dep qtconcurrent) )
-"
-
-# bug 560086
-RESTRICT+=" test"
-
-DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kconfig/

[Michael Palimaka]

commit: c803ee7f4cace1f0de12be5e7735f0cade312169
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Nov 16 15:30:46 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Nov 16 15:30:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c803ee7f

kde-frameworks/kconfig: restrict tests

Gentoo-bug: 560086

Package-Manager: portage-2.2.24

 kde-frameworks/kconfig/kconfig-5.15.0.ebuild | 3 +++
 kde-frameworks/kconfig/kconfig-5.16.0.ebuild | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/kde-frameworks/kconfig/kconfig-5.15.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
index 88b2df9..ffb7c62 100644
--- a/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
@@ -21,4 +21,7 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qtconcurrent:5 )
 "
 
+# bug 560086
+RESTRICT="test"
+
 DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )

diff --git a/kde-frameworks/kconfig/kconfig-5.16.0.ebuild 
b/kde-frameworks/kconfig/kconfig-5.16.0.ebuild
index f91ed19..d5defde 100644
--- a/kde-frameworks/kconfig/kconfig-5.16.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.16.0.ebuild
@@ -21,4 +21,7 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qtconcurrent:5 )
 "
 
+# bug 560086
+RESTRICT="test"
+
 DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )