[gentoo-commits] proj/kde:master commit in: kde-frameworks/kuserfeedback/
commit: ef2c172f3f49e0a72b48909e4ee20ee648ffe1e7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 24 21:13:51 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 24 21:15:06 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ef2c172f
kde-frameworks/kuserfeedback: Disable openglinfosourcetest
Closes: https://bugs.gentoo.org/921359
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-frameworks/kuserfeedback/kuserfeedback-.ebuild | 5 +
1 file changed, 5 insertions(+)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
index 3ded06e7b7..1fbf896c3b 100644
--- a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
@@ -42,3 +42,8 @@ src_configure() {
ecm_src_configure
}
+
+CMAKE_SKIP_TESTS=(
+ # bugs: 921359, requires virtualx
+ openglinfosourcetest
+)
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kuserfeedback/
commit: a423c77c291865dd5efd4152f46f6c2edfbf69fb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 15 13:54:54 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 15 14:05:00 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a423c77c
kde-frameworks/kuserfeedback: Add comment re Qt_6_PRIVATE_API
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-frameworks/kuserfeedback/kuserfeedback-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
index df5e7a9e5a..3ded06e7b7 100644
--- a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
KEYWORDS=""
IUSE="doc"
+# FIXME: Qt_6_PRIVATE_API matches UserFeedbackConsole, but where is it coming
from?
DEPEND="
>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
>=dev-qt/qtcharts-${QTMIN}:6
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kuserfeedback/
commit: 1d5f703a606e1c426a5a7f929a03ffaed0a7de22
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 17 15:57:20 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 17 16:01:02 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d5f703a
kde-frameworks/kuserfeedback: Add missing BDEPEND
Bug: https://bugs.gentoo.org/924755
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-frameworks/kuserfeedback/kuserfeedback-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
index 992ea1d2d7..df5e7a9e5a 100644
--- a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
@@ -27,7 +27,7 @@ RDEPEND="${DEPEND}
BDEPEND="
app-alternatives/lex
app-alternatives/yacc
- doc? ( >=dev-qt/qttools-${QTMIN}:6[assistant,qdoc] )
+ doc? ( >=dev-qt/qttools-${QTMIN}:6[assistant,qdoc,linguist] )
"
src_configure() {
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kuserfeedback/
commit: 3edf62b87fa451a3baf485b96240962a87f09b6d
Author: Sam James gentoo org>
AuthorDate: Mon Jan 8 11:49:24 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 11 23:02:23 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3edf62b8
kde-frameworks/kuserfeedback: sys-devel/flex -> app-alternatives/lex
All of these will be using app-alternatives/lex anyway as they're not unsetting
YACC or LEX, so make the dep reflect reality.
(Included both YACC and LEX out of conservatism.)
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-frameworks/kuserfeedback/kuserfeedback-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
index 9314ec6ab0..fdeb5cfea3 100644
--- a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
@@ -25,8 +25,8 @@ RDEPEND="${DEPEND}
!${CATEGORY}/${PN}:5[-kf6compat(-)]
"
BDEPEND="
+ app-alternatives/lex
sys-devel/bison
- sys-devel/flex
doc? ( >=dev-qt/qttools-${QTMIN}:6[assistant,qdoc] )
"
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kuserfeedback/
commit: 49d77abf9cc7e1ffda327ce0b3291acf2447b41a
Author: Sam James gentoo org>
AuthorDate: Mon Jan 8 12:07:29 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 11 23:07:15 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=49d77abf
kde-frameworks/kuserfeedback: sys-devel/bison -> app-alternatives/yacc
All of these will be using app-alternatives/yacc anyway as they're not unsetting
YACC or LEX, so make the dep reflect reality.
(Included both YACC and LEX out of conservatism.)
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-frameworks/kuserfeedback/kuserfeedback-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
index fdeb5cfea3..5d9689dab1 100644
--- a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}
"
BDEPEND="
app-alternatives/lex
- sys-devel/bison
+ app-alternatives/yacc
doc? ( >=dev-qt/qttools-${QTMIN}:6[assistant,qdoc] )
"
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kuserfeedback/
commit: b1dafdabea244cda3e391eec370c8b94a324061f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 18 21:18:23 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 18 21:18:23 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b1dafdab
kde-frameworks/kuserfeedback: Drop unused dependencies
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-frameworks/kuserfeedback/kuserfeedback-.ebuild | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
index 59e6968b93..032955ed49 100644
--- a/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
@@ -16,15 +16,10 @@ KEYWORDS=""
IUSE="doc"
DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[gui,network,sql,widgets]
+ >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
>=dev-qt/qtcharts-${QTMIN}:6
>=dev-qt/qtdeclarative-${QTMIN}:6
>=dev-qt/qtsvg-${QTMIN}:6
- >=kde-frameworks/kconfig-${PVCUT}:6
- >=kde-frameworks/kcoreaddons-${PVCUT}:6
- >=kde-frameworks/kdeclarative-${PVCUT}:6
- >=kde-frameworks/kguiaddons-${PVCUT}:6
- >=kde-frameworks/kwidgetsaddons-${PVCUT}:6
"
RDEPEND="${DEPEND}
!${CATEGORY}/${PN}:5[-kf6compat(-)]
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kuserfeedback/
commit: dd30e9fdafc4e5da916bc8d65d144d89159625b7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 16 09:59:33 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 16 10:00:01 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dd30e9fd
kde-frameworks/kuserfeedback: drop 1.3.0-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../kuserfeedback/kuserfeedback-1.3.0-r1.ebuild| 61 --
kde-frameworks/kuserfeedback/metadata.xml | 3 --
2 files changed, 64 deletions(-)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r1.ebuild
b/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r1.ebuild
deleted file mode 100644
index 8fccd1b041..00
--- a/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm kde.org
-
-DESCRIPTION="Framework to collect user feedback for applications via telemetry
and surveys"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="doc kf6compat"
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- kf6compat? (
- >=dev-qt/qtcharts-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- )
-"
-RDEPEND="${DEPEND}
- kf6compat? ( kde-frameworks/kuserfeedback:6 )
-"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- doc? (
- >=dev-qt/qdoc-${QTMIN}:5
- >=dev-qt/qthelp-${QTMIN}:5
- )
-"
-
-src_configure() {
- local mycmakeargs=(
- # disable server application
- -DENABLE_PHP=NO
- -DENABLE_PHP_UNIT=NO
- -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
- -DENABLE_DOCS=$(usex doc)
- -DENABLE_CLI=$(usex !kf6compat)
- -DENABLE_CONSOLE=$(usex !kf6compat)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kuserfeedback/metadata.xml
b/kde-frameworks/kuserfeedback/metadata.xml
index 6e6a289165..8dc2c044b2 100644
--- a/kde-frameworks/kuserfeedback/metadata.xml
+++ b/kde-frameworks/kuserfeedback/metadata.xml
@@ -9,7 +9,4 @@
https://bugs.kde.org/
frameworks/kuserfeedback
-
- Disable components colliding with KF6,
depend on KF6 components instead
-
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kuserfeedback/
commit: ecc43f053235c90393fc5bf2d5f24b2c1d78be09
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Nov 28 10:45:19 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Nov 28 12:22:23 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ecc43f05
kde-frameworks/kuserfeedback: add , drop 5.239. (KF6-only now)
Signed-off-by: Andreas Sturmlechner gentoo.org>
...5.239..ebuild => kuserfeedback-.ebuild} | 34 +-
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-5.239..ebuild
b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
similarity index 50%
rename from kde-frameworks/kuserfeedback/kuserfeedback-5.239..ebuild
rename to kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
index 9e97b44085..59e6968b93 100644
--- a/kde-frameworks/kuserfeedback/kuserfeedback-5.239..ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-.ebuild
@@ -6,39 +6,33 @@ EAPI=8
ECM_QTHELP="false"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.9
+QTMIN=6.6.0
inherit ecm frameworks.kde.org
DESCRIPTION="Framework to collect user feedback for applications via telemetry
and surveys"
-EGIT_BRANCH="master" # TODO: drop on move to
LICENSE="MIT"
KEYWORDS=""
IUSE="doc"
DEPEND="
- >=dev-qt/qtcharts-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kconfig-${PVCUT}:5
- >=kde-frameworks/kcoreaddons-${PVCUT}:5
- >=kde-frameworks/kdeclarative-${PVCUT}:5
- >=kde-frameworks/kguiaddons-${PVCUT}:5
- >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=dev-qt/qtbase-${QTMIN}:6[gui,network,sql,widgets]
+ >=dev-qt/qtcharts-${QTMIN}:6
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=kde-frameworks/kconfig-${PVCUT}:6
+ >=kde-frameworks/kcoreaddons-${PVCUT}:6
+ >=kde-frameworks/kdeclarative-${PVCUT}:6
+ >=kde-frameworks/kguiaddons-${PVCUT}:6
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:6
+"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
"
-RDEPEND="${DEPEND}"
BDEPEND="
sys-devel/bison
sys-devel/flex
- doc? (
- >=dev-qt/qdoc-${QTMIN}:5
- >=dev-qt/qthelp-${QTMIN}:5
- )
+ doc? ( >=dev-qt/qttools-${QTMIN}:6[assistant,qdoc] )
"
src_configure() {
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kuserfeedback/
commit: ea73af52d670b0d6a3dd58de6991ae4b440286d0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Nov 28 12:18:17 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Nov 28 12:22:23 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea73af52
kde-frameworks/kuserfeedback: Add IUSE=kf6compat
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../kuserfeedback/kuserfeedback-1.3.0-r1.ebuild| 61 ++
kde-frameworks/kuserfeedback/metadata.xml | 3 ++
2 files changed, 64 insertions(+)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r1.ebuild
b/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r1.ebuild
new file mode 100644
index 00..8fccd1b041
--- /dev/null
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Framework to collect user feedback for applications via telemetry
and surveys"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc kf6compat"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ kf6compat? (
+ >=dev-qt/qtcharts-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ )
+"
+RDEPEND="${DEPEND}
+ kf6compat? ( kde-frameworks/kuserfeedback:6 )
+"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ doc? (
+ >=dev-qt/qdoc-${QTMIN}:5
+ >=dev-qt/qthelp-${QTMIN}:5
+ )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ # disable server application
+ -DENABLE_PHP=NO
+ -DENABLE_PHP_UNIT=NO
+ -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
+ -DENABLE_DOCS=$(usex doc)
+ -DENABLE_CLI=$(usex !kf6compat)
+ -DENABLE_CONSOLE=$(usex !kf6compat)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kuserfeedback/metadata.xml
b/kde-frameworks/kuserfeedback/metadata.xml
index 8dc2c044b2..6e6a289165 100644
--- a/kde-frameworks/kuserfeedback/metadata.xml
+++ b/kde-frameworks/kuserfeedback/metadata.xml
@@ -9,4 +9,7 @@
https://bugs.kde.org/
frameworks/kuserfeedback
+
+ Disable components colliding with KF6,
depend on KF6 components instead
+
