[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: b0ebe017b1b96095d6cabc68af55b93115451f41 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 17 09:56:09 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 17 09:56:45 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0ebe017 kde-frameworks/kcoreaddons: Drop IUSE qml Too big burden to support. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 6 +++--- kde-frameworks/kcoreaddons/metadata.xml| 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index aa24d1dd1f..d1c8a6f1bb 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -10,12 +10,12 @@ DESCRIPTION="Framework for solving common problems such as caching, randomisatio LICENSE="LGPL-2+" KEYWORDS="" -IUSE="dbus qml" +IUSE="dbus" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus?,icu] + >=dev-qt/qtdeclarative-${QTMIN}:6 virtual/libudev:= - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 ) " RDEPEND="${DEPEND} >=dev-qt/qttranslations-${QTMIN}:6 @@ -24,8 +24,8 @@ BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" src_configure() { local mycmakeargs=( + -DKCOREADDONS_USE_QML=ON $(cmake_use_find_package dbus Qt6DBus) - -DKCOREADDONS_USE_QML=$(usex qml) ) ecm_src_configure diff --git a/kde-frameworks/kcoreaddons/metadata.xml b/kde-frameworks/kcoreaddons/metadata.xml index 6709562d0d..506ecf605b 100644 --- a/kde-frameworks/kcoreaddons/metadata.xml +++ b/kde-frameworks/kcoreaddons/metadata.xml @@ -8,9 +8,6 @@ https://bugs.kde.org/ - - Enable QML/QtQuick support via dev-qt/qtdeclarative - Must only be used by packages that are known to use private parts of the Frameworks API.
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: e91398158a5671317ead5508387a9dd944e36d29 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 16 21:03:43 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 16 21:03:43 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e9139815 kde-frameworks/kcoreaddons: Drop IUSE nls It is non-optional. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index e6160071fe..9ac1278c69 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Framework for solving common problems such as caching, randomisatio LICENSE="LGPL-2+" KEYWORDS="" -IUSE="dbus fam nls" +IUSE="dbus fam" DEPEND=" >=dev-qt/qtcore-${QTMIN}:5[icu] @@ -19,9 +19,9 @@ DEPEND=" fam? ( virtual/fam ) " RDEPEND="${DEPEND} - nls? ( >=dev-qt/qttranslations-${QTMIN}:5 ) + >=dev-qt/qttranslations-${QTMIN}:5 " -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" src_configure() { local mycmakeargs=(
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 01bd7235d36da4e3a4ebabe058f86c0ba7110a2e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 2 09:31:34 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 2 09:31:34 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=01bd7235 kde-frameworks/kcoreaddons: Add IUSE dbus Upstream commit 593d3343a30e842a2764faec86347510e8183f91 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index 352bb46897..b5ebb3fb8a 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -10,23 +10,23 @@ DESCRIPTION="Framework for solving common problems such as caching, randomisatio LICENSE="LGPL-2+" KEYWORDS="" -IUSE="fam nls" +IUSE="dbus fam nls" DEPEND=" >=dev-qt/qtcore-${QTMIN}:5[icu] + dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) fam? ( virtual/fam ) " RDEPEND="${DEPEND} nls? ( >=dev-qt/qttranslations-${QTMIN}:5 ) " -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" +BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" src_configure() { local mycmakeargs=( -D_KDE4_DEFAULT_HOME_POSTFIX=4 $(cmake_use_find_package fam FAM) + $(cmake_use_find_package dbus Qt5DBus) ) ecm_src_configure
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 63e6266e092b22fcdd3dd7db746e8e1d9b3ff39c Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 17 16:04:38 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 17 16:04:38 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=63e6266e kde-frameworks/kcoreaddons: RDEPEND on dev-qt/qttranslations:5 Use upstream's recommendation to pull in dev-qt/qttranslations:5 in a lower-tier framework. See also: https://mail.kde.org/pipermail/distributions/2021-December/001110.html Bug: https://bugs.gentoo.org/810802 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index b2ee272601..74a7b78aaa 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -7,18 +7,21 @@ QTMIN=5.15.2 inherit ecm kde.org xdg-utils DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more" + LICENSE="LGPL-2+" KEYWORDS="" IUSE="fam nls" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" DEPEND=" >=dev-qt/qtcore-${QTMIN}:5[icu] fam? ( virtual/fam ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + nls? ( >=dev-qt/qttranslations-${QTMIN}:5 ) +" +BDEPEND=" + nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) +" src_configure() { local mycmakeargs=(
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 6bfa4fa2e5702676d93f0bd5b99dee59a7899ef9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 10 09:44:42 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 10 11:43:23 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6bfa4fa2 kde-frameworks/kcoreaddons: Set ENABLE_PROCSTAT=OFF to silence cmake Only relevant in FreeBSD, not packaged in Gentoo. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kcoreaddons/kcoreaddons-5.75.0.ebuild | 1 + kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.75.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.75.0.ebuild index afa2e41e99..32b23d7192 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.75.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.75.0.ebuild @@ -23,6 +23,7 @@ RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( -D_KDE4_DEFAULT_HOME_POSTFIX=4 + -DENABLE_PROCSTAT=OFF # silence FreeBSD spam -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866 $(cmake_use_find_package fam FAM) ) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index eb9af63af3..a91cf6add3 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -23,6 +23,7 @@ RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( -D_KDE4_DEFAULT_HOME_POSTFIX=4 + -DENABLE_PROCSTAT=OFF # silence FreeBSD spam -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866 $(cmake_use_find_package fam FAM) )
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: b51e003462713e736b200f4041a1fc3e0e483ef8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Aug 3 22:26:47 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Aug 3 22:39:26 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b51e0034 kde-frameworks/kcoreaddons: Add missing xdg_mimeinfo_database_update Thankfully, the only Framework needing this. Closes: https://bugs.gentoo.org/735724 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kcoreaddons/kcoreaddons-5.73.0.ebuild | 12 +++- kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 12 +++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.73.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.73.0.ebuild index d76fdb4f92..4e2dc41468 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.73.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.73.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 QTMIN=5.14.2 -inherit ecm kde.org +inherit ecm kde.org xdg-utils DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more" LICENSE="LGPL-2+" @@ -38,3 +38,13 @@ src_test() { ecm_src_test } + +pkg_postinst() { + ecm_pkg_postinst + xdg_mimeinfo_database_update +} + +pkg_postrm() { + ecm_pkg_postrm + xdg_mimeinfo_database_update +} diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index 29d90bf214..1d9a96ae4d 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -4,7 +4,7 @@ EAPI=7 QTMIN=5.14.2 -inherit ecm kde.org +inherit ecm kde.org xdg-utils DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more" LICENSE="LGPL-2+" @@ -38,3 +38,13 @@ src_test() { ecm_src_test } + +pkg_postinst() { + ecm_pkg_postinst + xdg_mimeinfo_database_update +} + +pkg_postrm() { + ecm_pkg_postrm + xdg_mimeinfo_database_update +}
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 809a52bcaddea6e2e53c1aac5f6da0b8928986b5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 27 12:34:57 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 27 12:34:57 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=809a52bc kde-frameworks/kcoreaddons: Disable kdirwatch_stat_unittest Closes: https://bugs.gentoo.org/687120 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index ee67cb326a..aefadaa652 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -32,7 +32,7 @@ src_test() { # bugs: 619656, 632398, 647414, 665682 local myctestargs=( -j1 - -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kformattest)" + -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)" ) kde5_src_test
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: f2cf30a15dba49e3d8115114f043ca8f93080d47 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 17 10:18:00 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 23 18:42:19 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2cf30a1 kde-frameworks/kcoreaddons: Re-disable broken test Bug: https://bugs.gentoo.org/668860 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.50, Repoman-2.3.11 kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index 5627618255..805ed4db9c 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -29,10 +29,10 @@ src_configure() { } src_test() { - # bugs: 619656, 632398, 647414 + # bugs: 619656, 632398, 647414, 665682 local myctestargs=( -j1 - -E "(kautosavefiletest|kdirwatch_qfswatch_unittest)" + -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kformattest)" ) kde5_src_test
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/, kde-frameworks/kcoreaddons/files/
commit: 5620ce2e0d5b6728069f81787fd2420b1d3715f2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 13 17:00:24 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 13 17:00:24 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5620ce2e kde-frameworks/kcoreaddons: Revert Debian patch for kformattest This was fixed within kde-frameworks/plasma-5.47.0. Upstream commit d15f0fa8322dc2632f15024457bea41e7dd058d7 This reverts commit 8b24d9fc2dc8edaa4f3c1acdd9630aef948d0862. .../files/kcoreaddons-5.46.0-kformattest.patch | 56 -- kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 8 2 files changed, 64 deletions(-) diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch deleted file mode 100644 index 64031659fd..00 --- a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Maximiliano Curia -Date: Tue, 15 May 2018 13:06:53 +0200 -Subject: fix kformattest plural forms - - autotests/kformattest.cpp | 24 - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/autotests/kformattest.cpp b/autotests/kformattest.cpp -index 15080be..6cc3c52 100644 a/autotests/kformattest.cpp -+++ b/autotests/kformattest.cpp -@@ -248,8 +248,8 @@ void KFormatTest::formatDecimalDuration() - { - KFormat format(QLocale::c()); - --QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)")); --QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)")); -+QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 milliseconds")); -+QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 milliseconds")); - QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds")); - QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds")); - QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes")); -@@ -264,22 +264,22 @@ void KFormatTest::formatSpelloutDuration() - { - KFormat format(QLocale::c()); - --QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)")); --QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)")); --QCOMPARE(format.formatSpelloutDuration(6), QStringLiteral("1 minute(s)")); --QCOMPARE(format.formatSpelloutDuration(30), QStringLiteral("5 minute(s)")); --QCOMPARE(format.formatSpelloutDuration(360), QStringLiteral("1 hour(s)")); --QCOMPARE(format.formatSpelloutDuration(1800), QStringLiteral("5 hour(s)")); --QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute(s) and 15 second(s)")); -+QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second")); -+QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 seconds")); -+QCOMPARE(format.formatSpelloutDuration(6), QStringLiteral("1 minute")); -+QCOMPARE(format.formatSpelloutDuration(30), QStringLiteral("5 minutes")); -+QCOMPARE(format.formatSpelloutDuration(360), QStringLiteral("1 hour")); -+QCOMPARE(format.formatSpelloutDuration(1800), QStringLiteral("5 hours")); -+QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute and 15 seconds")); - // Problematic case #1 (there is a reference to this case on kformat.cpp) --QCOMPARE(format.formatSpelloutDuration(11), QStringLiteral("2 minute(s)")); -+QCOMPARE(format.formatSpelloutDuration(11), QStringLiteral("2 minutes")); - // This case is strictly 2 hours, 15 minutes and 59 seconds. However, since the range is - // pretty high between hours and seconds, formatSpelloutDuration always omits seconds when there - // are hours in scene. --QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)")); -+QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hours and 15 minutes")); - // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration - // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result. --QCOMPARE(format.formatSpelloutDuration(361), QStringLiteral("1 hour(s)")); -+QCOMPARE(format.formatSpelloutDuration(361), QStringLiteral("1 hour")); - } - - void KFormatTest::formatRelativeDate() diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index 987782c458..5627618255 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -19,14 +19,6 @@ DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) "
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/, kde-frameworks/kcoreaddons/files/
commit: 8b24d9fc2dc8edaa4f3c1acdd9630aef948d0862 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 6 11:55:05 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 6 14:27:00 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8b24d9fc kde-frameworks/kcoreaddons: Add Debian patch for kformattest failure Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../files/kcoreaddons-5.46.0-kformattest.patch | 56 ++ .../kcoreaddons/kcoreaddons-5.47.0.ebuild | 8 kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 8 3 files changed, 72 insertions(+) diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch new file mode 100644 index 00..64031659fd --- /dev/null +++ b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch @@ -0,0 +1,56 @@ +From: Maximiliano Curia +Date: Tue, 15 May 2018 13:06:53 +0200 +Subject: fix kformattest plural forms + +--- + autotests/kformattest.cpp | 24 + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/autotests/kformattest.cpp b/autotests/kformattest.cpp +index 15080be..6cc3c52 100644 +--- a/autotests/kformattest.cpp b/autotests/kformattest.cpp +@@ -248,8 +248,8 @@ void KFormatTest::formatDecimalDuration() + { + KFormat format(QLocale::c()); + +-QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)")); +-QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)")); ++QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 milliseconds")); ++QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 milliseconds")); + QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds")); + QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds")); + QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes")); +@@ -264,22 +264,22 @@ void KFormatTest::formatSpelloutDuration() + { + KFormat format(QLocale::c()); + +-QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)")); +-QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)")); +-QCOMPARE(format.formatSpelloutDuration(6), QStringLiteral("1 minute(s)")); +-QCOMPARE(format.formatSpelloutDuration(30), QStringLiteral("5 minute(s)")); +-QCOMPARE(format.formatSpelloutDuration(360), QStringLiteral("1 hour(s)")); +-QCOMPARE(format.formatSpelloutDuration(1800), QStringLiteral("5 hour(s)")); +-QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute(s) and 15 second(s)")); ++QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second")); ++QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 seconds")); ++QCOMPARE(format.formatSpelloutDuration(6), QStringLiteral("1 minute")); ++QCOMPARE(format.formatSpelloutDuration(30), QStringLiteral("5 minutes")); ++QCOMPARE(format.formatSpelloutDuration(360), QStringLiteral("1 hour")); ++QCOMPARE(format.formatSpelloutDuration(1800), QStringLiteral("5 hours")); ++QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute and 15 seconds")); + // Problematic case #1 (there is a reference to this case on kformat.cpp) +-QCOMPARE(format.formatSpelloutDuration(11), QStringLiteral("2 minute(s)")); ++QCOMPARE(format.formatSpelloutDuration(11), QStringLiteral("2 minutes")); + // This case is strictly 2 hours, 15 minutes and 59 seconds. However, since the range is + // pretty high between hours and seconds, formatSpelloutDuration always omits seconds when there + // are hours in scene. +-QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)")); ++QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hours and 15 minutes")); + // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration + // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result. +-QCOMPARE(format.formatSpelloutDuration(361), QStringLiteral("1 hour(s)")); ++QCOMPARE(format.formatSpelloutDuration(361), QStringLiteral("1 hour")); + } + + void KFormatTest::formatRelativeDate() diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.47.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.47.0.ebuild index 4e70e58a43..ddee6b3ca9 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.47.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.47.0.ebuild @@ -19,6 +19,14 @@ DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) " +src_prepare() { + # bug 650280 +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 54202e8466eacc2cec9f1de5bdae1bba08bf6c2a Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 7 16:07:31 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 7 16:10:08 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54202e84 kde-frameworks/kcoreaddons: Disable broken tests Package-Manager: Portage-2.3.24, Repoman-2.3.6 kde-frameworks/kcoreaddons/kcoreaddons-5.44.0.ebuild | 7 +-- kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 7 +-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.44.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.44.0.ebuild index 3d7d47b799..4e70e58a43 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.44.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.44.0.ebuild @@ -29,8 +29,11 @@ src_configure() { } src_test() { - # bug: 619656 - local myctestargs=( -j1 ) + # bugs: 619656, 632398, 647414 + local myctestargs=( + -j1 + -E "(kautosavefiletest|kdirwatch_qfswatch_unittest)" + ) kde5_src_test } diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index 3a6da724c0..5627618255 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -29,8 +29,11 @@ src_configure() { } src_test() { - # bug: 619656 - local myctestargs=( -j1 ) + # bugs: 619656, 632398, 647414 + local myctestargs=( + -j1 + -E "(kautosavefiletest|kdirwatch_qfswatch_unittest)" + ) kde5_src_test }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 588a89a1a093d00a2727947dfd6ba7e773f04b97 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 26 16:14:02 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 26 16:14:02 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=588a89a1 kde-frameworks/kcoreaddons: Don't run tests in parallel Gentoo-bug: 619656 Package-Manager: Portage-2.3.5, Repoman-2.3.1 kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index 30bf3a4507..f8ba172fb4 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -13,7 +13,6 @@ IUSE="fam nls" RDEPEND=" $(add_qt_dep qtcore 'icu') fam? ( virtual/fam ) -
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 8a761f7588a843e953f589e4e5dc7f2bc64a9210 Author: Michael Palimaka gentoo org> AuthorDate: Fri Jan 29 10:30:09 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Jan 29 10:30:16 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a761f75 kde-frameworks/kcoreaddons: mime database updates now handled by eclass Package-Manager: portage-2.2.27 kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index 1263e1b..dfbaeb7 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit fdo-mime kde5 +inherit kde5 DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more" LICENSE="LGPL-2+" @@ -29,13 +29,3 @@ src_configure() { kde5_src_configure } - -pkg_postinst() { - kde5_pkg_postinst - fdo-mime_mime_database_update -} - -pkg_postrm() { - kde5_pkg_postinst - fdo-mime_mime_database_update -}
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 133c167f0e6d7c044844e9457353701c844361e9 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Sun Oct 5 15:49:50 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Sun Oct 5 15:49:50 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=133c167f [kde-frameworks/kcoreaddons] Specify SLOT. Package-Manager: portage-2.2.12 --- kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild | 2 +- kde-frameworks/kcoreaddons/kcoreaddons-5.3.0.ebuild | 2 +- kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild index 460db7c..a64ad75 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild @@ -14,7 +14,7 @@ IUSE=fam RDEPEND= dev-qt/qtcore:5[icu] fam? ( virtual/fam ) - !kde-frameworks/kservice-5.2.0 + !kde-frameworks/kservice-5.2.0:5 DEPEND=${RDEPEND} x11-misc/shared-mime-info diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.3.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.3.0.ebuild index d4fb540..780ce84 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.3.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.3.0.ebuild @@ -14,7 +14,7 @@ IUSE=fam RDEPEND= dev-qt/qtcore:5[icu] fam? ( virtual/fam ) - !kde-frameworks/kservice-5.2.0 + !kde-frameworks/kservice-5.2.0:5 DEPEND=${RDEPEND} x11-misc/shared-mime-info diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index cb06474..c775a17 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -14,7 +14,7 @@ IUSE=fam RDEPEND= dev-qt/qtcore:5[icu] fam? ( virtual/fam ) - !kde-frameworks/kservice-5.2.0 + !kde-frameworks/kservice-5.2.0:5 DEPEND=${RDEPEND} x11-misc/shared-mime-info
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 8d2f70e26413aec923cfadc861b0a4e6c1cc74b1 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Sat Oct 4 16:58:55 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Sat Oct 4 16:58:55 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8d2f70e2 [kde-frameworks/kcoreaddons] Specify KDE4 home prefix. This is required because kdelibs:4 was built with -DKDE_DEFAULT_HOME=.kde4 and Kdelibs4Migration no longer autodetects the directory name. Upstream commit: d36771ebfc6e8a3bbeafb42be0580cfc6e8f2daf Package-Manager: portage-2.2.12 --- kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index 69fcaae..cb06474 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -23,6 +23,7 @@ DEPEND=${RDEPEND} src_configure() { local mycmakeargs=( + -D_KDE4_DEFAULT_HOME_POSTFIX=4 $(cmake-utils_use_find_package fam FAM) )
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 71a3e06d960fbcd5fab442afbf36c778d85bc3a8 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Tue Sep 9 12:22:18 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Tue Sep 9 12:22:18 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=71a3e06d [kde-frameworks/kcoreaddons] Add blocker as desktoptojson was moved here from kservice in 5.2.0 Package-Manager: portage-2.2.10 --- kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild | 1 + kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild index dda6c10..460db7c 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild @@ -14,6 +14,7 @@ IUSE=fam RDEPEND= dev-qt/qtcore:5[icu] fam? ( virtual/fam ) + !kde-frameworks/kservice-5.2.0 DEPEND=${RDEPEND} x11-misc/shared-mime-info diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index c74f867..69fcaae 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -14,6 +14,7 @@ IUSE=fam RDEPEND= dev-qt/qtcore:5[icu] fam? ( virtual/fam ) + !kde-frameworks/kservice-5.2.0 DEPEND=${RDEPEND} x11-misc/shared-mime-info
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/files/
commit: 4499f8fac0f216eb7892ce7a48af1b78dfc6a6d1 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Tue Jun 10 13:59:49 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Tue Jun 10 13:59:49 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4499f8fa [kde-frameworks/kcoreaddons] Remove unused patch. Package-Manager: portage-2.2.10 --- .../kcoreaddons/files/kcoreaddons-mimetypes.patch | 39 -- 1 file changed, 39 deletions(-) diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-mimetypes.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-mimetypes.patch deleted file mode 100644 index 184c12b..000 --- a/kde-frameworks/kcoreaddons/files/kcoreaddons-mimetypes.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/tier1/kcoreaddons/src/mimetypes/kde5.xml b/tier1/kcoreaddons/src/mimetypes/kde5.xml -index 905392b..fb32a8e 100644 a/tier1/kcoreaddons/src/mimetypes/kde5.xml -+++ b/tier1/kcoreaddons/src/mimetypes/kde5.xml -@@ -174,34 +174,6 @@ Notes: - glob pattern=*.abc/ - /mime-type - -- !-- all/ fake mime types -- -- mime-type type=all/all --commentall files and folders/comment -- /mime-type -- mime-type type=all/allfiles --commentall files/comment -- /mime-type -- -- !-- uri/ fake mime types -- -- mime-type type=uri/mms --commentmms: URIs/comment -- /mime-type -- mime-type type=uri/mmst --commentmmst: URIs/comment -- /mime-type -- mime-type type=uri/mmsu --commentmmsu: URIs/comment -- /mime-type -- mime-type type=uri/pnm --commentpnm: URIs/comment -- /mime-type -- mime-type type=uri/rtspt --commentrtspt: URIs/comment -- /mime-type -- mime-type type=uri/rtspu --commentrtspu: URIs/comment -- /mime-type -- - mime-type type=application/vnd.kde.fontspackage - sub-class-of type=application/zip/ - commentfonts package/comment
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 464ba3708c0af3db723f7115cab51c15386ce5da Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Mon May 5 14:58:19 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Mon May 5 14:58:19 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=464ba370 [kde-frameworks/kcoreaddons] Add nls dependency. Package-Manager: portage-2.2.8-r1 --- kde-frameworks/kcoreaddons/kcoreaddons-4.99.0.ebuild | 1 + kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-4.99.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-4.99.0.ebuild index 4dd4eac..5ccd32c 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-4.99.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-4.99.0.ebuild @@ -17,6 +17,7 @@ RDEPEND= DEPEND=${RDEPEND} x11-misc/shared-mime-info + nls? ( dev-qt/linguist-tools:5 ) src_configure() { diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index 4b9b4e5..c74f867 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -17,6 +17,7 @@ RDEPEND= DEPEND=${RDEPEND} x11-misc/shared-mime-info + nls? ( dev-qt/linguist-tools:5 ) src_configure() {
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/
commit: 0ee47cf2fe72a4a4e3cba58fc1b408b391bb88b4 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Fri Mar 28 15:02:39 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Fri Mar 28 15:02:39 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0ee47cf2 [kde-frameworks/kcoreaddons] Remove patch that is merged upstream. Upstream commit: 36ff1bf60c9b12c28ed4d7566abceac10cab345e Package-Manager: portage-2.2.8-r1 --- kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild index c2abfc0..b146e89 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild @@ -19,8 +19,6 @@ DEPEND=${RDEPEND} x11-misc/shared-mime-info -PATCHES=( ${FILESDIR}/${PN}-mimetypes.patch ) - src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package fam FAM)