ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: KDE Framework: Update 5.98.0.

Browse source 
* gnu/packages/kde-frameworks.scm(extra-cmake-modules, attica, bluez-qt,
breeze-icons, kapidox, karchive, kcalendarcore, kcodecs, kconfig,
kcoreaddons, kdbusaddons, kdnssd, kguiaddons, kholidays, ki18n, kidletime,
kirigami, kitemmodels, kitemviews, kplotting,
ksyntaxhighlighting, kwayland, kwidgetsaddons, kwindowsystem, modemmanager-qt,
networkmanager-qt, oxygen-icons, prison, qqc2-desktop-style, solid, sonnet,
threadweaver, kactivities, kauth, kcompletion, kcontacts, kcrash, kdoctools,
kfilemetadata, kimageformats, kjobwidgets, knotifications, kpackage, kpty,
kunitconversion, syndication, baloo, kactivities-stats, kbookmarks,
kcmutils, kconfigwidgets,
kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit, kemoticons,
kglobalaccel, kiconthemes, kinit, kio, knewstuff, knotifyconfig,
kparts, kpeople, krunner, kservice, ktexteditor, ktextwidgets,kwallet,
kxmlgui, kxmlrpcclient, plasma-framework, purpose,
kde-frameworkintegration, kdelibs4support, khtml, kjs, kjsembed,
kmediaplayer, kross, kdav): Update to 5.96.0.
(kwayland)[inputs]: Add libxkbcommon.
(kcontacts)[arguments]: Enable old test, disable new failing tests.
(kiconthemes)[inputs]: Add qtdeclarative-5.
(kwallet)[inputs]: Add qca.
[arguments]: Disable failing test.
(kcontacts)[arguments]: Enable tests.
[source](patches): Add patch.
* gnu/packages/patches/kcontacts-incorrect-country-name.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly

Signed-off-by: Marius Bakke <marius@gnu.org>
This commit is contained in:
Petr Hodina 2022-09-22 21:31:26 +02:00 committed by Marius Bakke
parent 2ecb9af51c
commit 430df96a9c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 266 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1387,6 +1387,7 @@ dist_patch_DATA = \
%D%/packages/patches/lightdm-vncserver-check.patch \
%D%/packages/patches/lightdm-vnc-color-depth.patch \
%D%/packages/patches/localed-xorg-keyboard.patch \
%D%/packages/patches/kcontacts-incorrect-country-name.patch \
%D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \
%D%/packages/patches/kiki-level-selection-crash.patch \
%D%/packages/patches/kiki-makefile.patch \

342
gnu/packages/kde-frameworks.scm
View file

File diff suppressed because it is too large Load diff

85
gnu/packages/patches/kcontacts-incorrect-country-name.patch Normal file
View file

@ -0,0 +1,85 @@
From 5fc2ce8b9f34ea3218a030aeede01b70bedb2546 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Wed, 28 Sep 2022 20:58:43 +0200
Subject: [PATCH] autotests: Fix incorrect name of country in comparison.
diff --git a/autotests/addresstest.cpp b/autotests/addresstest.cpp
index fc6a9bc7..01e474b6 100644
--- a/autotests/addresstest.cpp
+++ b/autotests/addresstest.cpp
@@ -157,7 +157,7 @@ void AddressTest::formatTest()
const QString result(
QStringLiteral("Jim Knopf\nLummerlandstr. 1\n"
- "12345 Lummerstadt\n\nGERMANIA"));
+ "12345 Lummerstadt\n\nGERMANY"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Jim Knopf")), result);
#if KCONTACTS_BUILD_DEPRECATED_SINCE(5, 92)
@@ -175,7 +175,7 @@ void AddressTest::formatTest()
const QString result(
QStringLiteral("Huck Finn\n457 Foobar Ave\nNERVOUSBREAKTOWN,"
- " DC 1A2B3C\n\nSTATI UNITI"));
+ " DC 1A2B3C\n\nUNITED STATES"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Huck Finn")), result);
}
@@ -188,7 +188,7 @@ void AddressTest::formatTest()
const QString result(
QStringLiteral("Jim Knopf\nLummerlandstr. 1\n"
- "12345 Lummerstadt\n\nGERMANIA"));
+ "12345 Lummerstadt\n\nGERMANY"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Jim Knopf")), result);
}
@@ -214,7 +214,7 @@ void AddressTest::formatTest()
address.setCountry(QStringLiteral("Schweiz"));
// we want the Italian variant of the Swiss format for it_CH
- const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSVIZZERA"));
+ const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSWITZERLAND"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Dr. Konqui")), result);
}
@@ -228,14 +228,14 @@ void AddressTest::formatTest()
address.setCountry(QStringLiteral("CH"));
// we want the Italian variant of the Swiss format for it_CH
- const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSVIZZERA"));
+ const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSWITZERLAND"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Dr. Konqui")), result);
}
{
KContacts::Address address;
address.setCountry(QStringLiteral("CH"));
- QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QString()), QLatin1String("SVIZZERA"));
+ QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QString()), QLatin1String("SWITZERLAND"));
}
{
@@ -257,14 +257,14 @@ void AddressTest::formatTest()
address.setLocality(QStringLiteral("Minato-ku"));
address.setPostalCode(QStringLiteral("106-0047"));
address.setStreet(QStringLiteral("4-6-28 Minami-Azabu"));
- auto result = QString::fromUtf8("4-6-28 Minami-Azabu, Minato-ku\nTOKYO 106-0047\n\nGIAPPONE");
+ auto result = QString::fromUtf8("4-6-28 Minami-Azabu, Minato-ku\nTOKYO 106-0047\n\nJAPAN");
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal), result);
address.setRegion(QStringLiteral("東京"));
address.setLocality(QStringLiteral("都港区"));
address.setPostalCode(QStringLiteral("106-0047"));
address.setStreet(QStringLiteral("南麻布 4-6-28"));
- result = QString::fromUtf8("〒106-0047\n東京都港区南麻布 4-6-28\n\nGIAPPONE");
+ result = QString::fromUtf8("〒106-0047\n東京都港区南麻布 4-6-28\n\nJAPAN");
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal), result);
}
}
base-commit: 1d757eba019718cab5d3b33a231d19daf31eb8ba
--
2.37.2