summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/plasma5-kactivitymanagerd/distinfo6
-rw-r--r--x11/plasma5-kgamma5/distinfo6
-rw-r--r--x11/plasma5-kscreen/distinfo6
-rw-r--r--x11/plasma5-kwayland-integration/distinfo6
-rw-r--r--x11/plasma5-layer-shell-qt/distinfo6
-rw-r--r--x11/plasma5-libkscreen/distinfo6
-rw-r--r--x11/plasma5-libkscreen/pkg-plist1
-rw-r--r--x11/plasma5-plasma-bigscreen/distinfo6
-rw-r--r--x11/plasma5-plasma-desktop/distinfo6
-rw-r--r--x11/plasma5-plasma-desktop/pkg-plist17
-rw-r--r--x11/plasma5-plasma-integration/distinfo6
-rw-r--r--x11/plasma5-plasma-workspace/Makefile1
-rw-r--r--x11/plasma5-plasma-workspace/distinfo6
-rw-r--r--x11/plasma5-plasma-workspace/files/patch-kcmregionandlanguage312
-rw-r--r--x11/plasma5-plasma-workspace/files/patch-kcmregionandlanguage2143
-rw-r--r--x11/plasma5-plasma-workspace/pkg-plist1
16 files changed, 48 insertions, 487 deletions
diff --git a/x11/plasma5-kactivitymanagerd/distinfo b/x11/plasma5-kactivitymanagerd/distinfo
index 568847fa2c2e..1f6ca0f2a5f6 100644
--- a/x11/plasma5-kactivitymanagerd/distinfo
+++ b/x11/plasma5-kactivitymanagerd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022893
-SHA256 (KDE/plasma/5.27.6/kactivitymanagerd-5.27.6.tar.xz) = 06180b32ad64f88e2f3ea598e887c42cf68189dba14b220dceafcb0490c5b02d
-SIZE (KDE/plasma/5.27.6/kactivitymanagerd-5.27.6.tar.xz) = 127244
+TIMESTAMP = 1691385012
+SHA256 (KDE/plasma/5.27.7/kactivitymanagerd-5.27.7.tar.xz) = 2df245330612d79090980269ad7c4e776150598e583761ac83f628cc1ffafbb4
+SIZE (KDE/plasma/5.27.7/kactivitymanagerd-5.27.7.tar.xz) = 127232
diff --git a/x11/plasma5-kgamma5/distinfo b/x11/plasma5-kgamma5/distinfo
index c83cbeb826ec..78c2c58eb2a8 100644
--- a/x11/plasma5-kgamma5/distinfo
+++ b/x11/plasma5-kgamma5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022894
-SHA256 (KDE/plasma/5.27.6/kgamma5-5.27.6.tar.xz) = 61f111ecccd2fae7f46a1c7ef80d49a21bd80d8aadb65541453df134351fd692
-SIZE (KDE/plasma/5.27.6/kgamma5-5.27.6.tar.xz) = 88436
+TIMESTAMP = 1691385013
+SHA256 (KDE/plasma/5.27.7/kgamma5-5.27.7.tar.xz) = d45e88d4ee1c6cffa0b5ef085c4a7d028ade37e2daa72253e74941d9bcf5ae6c
+SIZE (KDE/plasma/5.27.7/kgamma5-5.27.7.tar.xz) = 88448
diff --git a/x11/plasma5-kscreen/distinfo b/x11/plasma5-kscreen/distinfo
index 97d0a98d134d..94ae9fa436d4 100644
--- a/x11/plasma5-kscreen/distinfo
+++ b/x11/plasma5-kscreen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022896
-SHA256 (KDE/plasma/5.27.6/kscreen-5.27.6.tar.xz) = ded0651eec67e22f22fa3d6b0dbb03e81bfb2d4e5a7468e9efc5f5a4598bf254
-SIZE (KDE/plasma/5.27.6/kscreen-5.27.6.tar.xz) = 185036
+TIMESTAMP = 1691385013
+SHA256 (KDE/plasma/5.27.7/kscreen-5.27.7.tar.xz) = 38d755e1b01584e1c21a925b2ab046c0f8f977bb1c4e75d436ebc9c633160a0f
+SIZE (KDE/plasma/5.27.7/kscreen-5.27.7.tar.xz) = 185132
diff --git a/x11/plasma5-kwayland-integration/distinfo b/x11/plasma5-kwayland-integration/distinfo
index e33a67ab0ec4..f8b168b7d472 100644
--- a/x11/plasma5-kwayland-integration/distinfo
+++ b/x11/plasma5-kwayland-integration/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022897
-SHA256 (KDE/plasma/5.27.6/kwayland-integration-5.27.6.tar.xz) = 10b7db4dfa276fe4e2398f742f60459367c5db1c91f8a9015e06e9f51e092c83
-SIZE (KDE/plasma/5.27.6/kwayland-integration-5.27.6.tar.xz) = 25768
+TIMESTAMP = 1691385014
+SHA256 (KDE/plasma/5.27.7/kwayland-integration-5.27.7.tar.xz) = 1e7997688a329563f62ce7534e82326a4317d9ecf12403d12e70d4d237316ebb
+SIZE (KDE/plasma/5.27.7/kwayland-integration-5.27.7.tar.xz) = 25776
diff --git a/x11/plasma5-layer-shell-qt/distinfo b/x11/plasma5-layer-shell-qt/distinfo
index 40ddf755589a..a946d962c03e 100644
--- a/x11/plasma5-layer-shell-qt/distinfo
+++ b/x11/plasma5-layer-shell-qt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022898
-SHA256 (KDE/plasma/5.27.6/layer-shell-qt-5.27.6.tar.xz) = e65c29ca65bf945da4f53bce9eb3614eb1105e57652e3fb1782ee9d24a9e8793
-SIZE (KDE/plasma/5.27.6/layer-shell-qt-5.27.6.tar.xz) = 18456
+TIMESTAMP = 1691385015
+SHA256 (KDE/plasma/5.27.7/layer-shell-qt-5.27.7.tar.xz) = 27c44e7db73bf2aa6728719e8bb848c1b0c1c7a704c86349a419577920c6f421
+SIZE (KDE/plasma/5.27.7/layer-shell-qt-5.27.7.tar.xz) = 18452
diff --git a/x11/plasma5-libkscreen/distinfo b/x11/plasma5-libkscreen/distinfo
index 11a35cea4b1e..2bc377501098 100644
--- a/x11/plasma5-libkscreen/distinfo
+++ b/x11/plasma5-libkscreen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022900
-SHA256 (KDE/plasma/5.27.6/libkscreen-5.27.6.tar.xz) = c1a9373faab5a7ec77980a696a7599583b4fda8e1f12da2c5716bc9562789efb
-SIZE (KDE/plasma/5.27.6/libkscreen-5.27.6.tar.xz) = 115816
+TIMESTAMP = 1691385016
+SHA256 (KDE/plasma/5.27.7/libkscreen-5.27.7.tar.xz) = 86b51bf3406c353afd7a2e1f47e2511d060313d8bd8a2ef7fa73a3bf153e3eab
+SIZE (KDE/plasma/5.27.7/libkscreen-5.27.7.tar.xz) = 116032
diff --git a/x11/plasma5-libkscreen/pkg-plist b/x11/plasma5-libkscreen/pkg-plist
index 253db7c48eb8..32548bd00229 100644
--- a/x11/plasma5-libkscreen/pkg-plist
+++ b/x11/plasma5-libkscreen/pkg-plist
@@ -70,6 +70,7 @@ share/locale/pt_BR/LC_MESSAGES/libkscreen5_qt.qm
share/locale/ru/LC_MESSAGES/libkscreen5_qt.qm
share/locale/sk/LC_MESSAGES/libkscreen5_qt.qm
share/locale/sl/LC_MESSAGES/libkscreen5_qt.qm
+share/locale/sv/LC_MESSAGES/libkscreen5_qt.qm
share/locale/tr/LC_MESSAGES/libkscreen5_qt.qm
share/locale/uk/LC_MESSAGES/libkscreen5_qt.qm
share/locale/zh_CN/LC_MESSAGES/libkscreen5_qt.qm
diff --git a/x11/plasma5-plasma-bigscreen/distinfo b/x11/plasma5-plasma-bigscreen/distinfo
index 9bf329fc7fa9..936c4f54f784 100644
--- a/x11/plasma5-plasma-bigscreen/distinfo
+++ b/x11/plasma5-plasma-bigscreen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022902
-SHA256 (KDE/plasma/5.27.6/plasma-bigscreen-5.27.6.tar.xz) = 8742074c33547833ef69bc16c01a179dbe93ae9ffed0f88f078af27b212fee24
-SIZE (KDE/plasma/5.27.6/plasma-bigscreen-5.27.6.tar.xz) = 1065160
+TIMESTAMP = 1691385017
+SHA256 (KDE/plasma/5.27.7/plasma-bigscreen-5.27.7.tar.xz) = 2ba028fe522e29bdc45a928fc41d92b9ba0471600ddb40d5a952e8c04b035c2c
+SIZE (KDE/plasma/5.27.7/plasma-bigscreen-5.27.7.tar.xz) = 1064804
diff --git a/x11/plasma5-plasma-desktop/distinfo b/x11/plasma5-plasma-desktop/distinfo
index b4248845d863..5cac7beee61b 100644
--- a/x11/plasma5-plasma-desktop/distinfo
+++ b/x11/plasma5-plasma-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022903
-SHA256 (KDE/plasma/5.27.6/plasma-desktop-5.27.6.tar.xz) = e2485ea25d695ba22c1f14957abe14af658741a5e788269543ab7ff33045a683
-SIZE (KDE/plasma/5.27.6/plasma-desktop-5.27.6.tar.xz) = 14359772
+TIMESTAMP = 1691385019
+SHA256 (KDE/plasma/5.27.7/plasma-desktop-5.27.7.tar.xz) = 229aa838869a05e351db5f2d81608c9dce216cfeb85f1fb7e7d575e8869353da
+SIZE (KDE/plasma/5.27.7/plasma-desktop-5.27.7.tar.xz) = 14715084
diff --git a/x11/plasma5-plasma-desktop/pkg-plist b/x11/plasma5-plasma-desktop/pkg-plist
index f182c227de83..ed8dbe20aa57 100644
--- a/x11/plasma5-plasma-desktop/pkg-plist
+++ b/x11/plasma5-plasma-desktop/pkg-plist
@@ -296,6 +296,8 @@ share/doc/HTML/es/kcontrol/kcmsmserver/index.cache.bz2
share/doc/HTML/es/kcontrol/kcmsmserver/index.docbook
share/doc/HTML/es/kcontrol/kded/index.cache.bz2
share/doc/HTML/es/kcontrol/kded/index.docbook
+share/doc/HTML/es/kcontrol/keyboard/index.cache.bz2
+share/doc/HTML/es/kcontrol/keyboard/index.docbook
share/doc/HTML/es/kcontrol/keys/index.cache.bz2
share/doc/HTML/es/kcontrol/keys/index.docbook
share/doc/HTML/es/kcontrol/mouse/index.cache.bz2
@@ -316,6 +318,8 @@ share/doc/HTML/es/kfontview/index.cache.bz2
share/doc/HTML/es/kfontview/index.docbook
share/doc/HTML/es/knetattach/index.cache.bz2
share/doc/HTML/es/knetattach/index.docbook
+share/doc/HTML/es/plasma-desktop/index.cache.bz2
+share/doc/HTML/es/plasma-desktop/index.docbook
share/doc/HTML/et/kcontrol/clock/index.cache.bz2
share/doc/HTML/et/kcontrol/clock/index.docbook
share/doc/HTML/et/kcontrol/solid-actions/index.cache.bz2
@@ -1707,6 +1711,7 @@ share/locale/gl/LC_MESSAGES/kcm_recentFiles.mo
share/locale/gl/LC_MESSAGES/kcm_smserver.mo
share/locale/gl/LC_MESSAGES/kcm_solid_actions.mo
share/locale/gl/LC_MESSAGES/kcm_splashscreen.mo
+share/locale/gl/LC_MESSAGES/kcm_tablet.mo
share/locale/gl/LC_MESSAGES/kcm_touchpad.mo
share/locale/gl/LC_MESSAGES/kcm_touchscreen.mo
share/locale/gl/LC_MESSAGES/kcm_workspace.mo
@@ -1715,6 +1720,7 @@ share/locale/gl/LC_MESSAGES/kcmkeyboard.mo
share/locale/gl/LC_MESSAGES/kcmmouse.mo
share/locale/gl/LC_MESSAGES/kcmqtquicksettings.mo
share/locale/gl/LC_MESSAGES/knetattach5.mo
+share/locale/gl/LC_MESSAGES/org.kde.plasma.emojier.mo
share/locale/gl/LC_MESSAGES/plasma_applet_org.kde.desktopcontainment.mo
share/locale/gl/LC_MESSAGES/plasma_applet_org.kde.panel.mo
share/locale/gl/LC_MESSAGES/plasma_applet_org.kde.plasma.keyboardlayout.mo
@@ -3254,6 +3260,7 @@ share/locale/sv/LC_MESSAGES/kcm_solid_actions.mo
share/locale/sv/LC_MESSAGES/kcm_splashscreen.mo
share/locale/sv/LC_MESSAGES/kcm_tablet.mo
share/locale/sv/LC_MESSAGES/kcm_touchpad.mo
+share/locale/sv/LC_MESSAGES/kcm_touchscreen.mo
share/locale/sv/LC_MESSAGES/kcm_workspace.mo
share/locale/sv/LC_MESSAGES/kcmkclock.mo
share/locale/sv/LC_MESSAGES/kcmkeyboard.mo
@@ -3722,6 +3729,7 @@ share/plasma/emoji/ast.dict
share/plasma/emoji/az.dict
share/plasma/emoji/be.dict
share/plasma/emoji/bg.dict
+share/plasma/emoji/bgn.dict
share/plasma/emoji/bn.dict
share/plasma/emoji/br.dict
share/plasma/emoji/bs.dict
@@ -3741,7 +3749,7 @@ share/plasma/emoji/en.dict
share/plasma/emoji/en_001.dict
share/plasma/emoji/en_AU.dict
share/plasma/emoji/en_CA.dict
-share/plasma/emoji/en_GB.dict
+share/plasma/emoji/en_IN.dict
share/plasma/emoji/es.dict
share/plasma/emoji/es_419.dict
share/plasma/emoji/es_MX.dict
@@ -3749,6 +3757,7 @@ share/plasma/emoji/es_US.dict
share/plasma/emoji/et.dict
share/plasma/emoji/eu.dict
share/plasma/emoji/fa.dict
+share/plasma/emoji/ff_Adlm.dict
share/plasma/emoji/fi.dict
share/plasma/emoji/fil.dict
share/plasma/emoji/fo.dict
@@ -3783,6 +3792,7 @@ share/plasma/emoji/ko.dict
share/plasma/emoji/kok.dict
share/plasma/emoji/ky.dict
share/plasma/emoji/lb.dict
+share/plasma/emoji/lij.dict
share/plasma/emoji/lo.dict
share/plasma/emoji/lt.dict
share/plasma/emoji/lv.dict
@@ -3799,6 +3809,8 @@ share/plasma/emoji/ne.dict
share/plasma/emoji/nl.dict
share/plasma/emoji/nn.dict
share/plasma/emoji/no.dict
+share/plasma/emoji/nso.dict
+share/plasma/emoji/oc.dict
share/plasma/emoji/or.dict
share/plasma/emoji/pa.dict
share/plasma/emoji/pa_Arab.dict
@@ -3808,10 +3820,12 @@ share/plasma/emoji/ps.dict
share/plasma/emoji/pt.dict
share/plasma/emoji/pt_PT.dict
share/plasma/emoji/qu.dict
+share/plasma/emoji/quc.dict
share/plasma/emoji/rm.dict
share/plasma/emoji/ro.dict
share/plasma/emoji/ru.dict
share/plasma/emoji/rw.dict
+share/plasma/emoji/sat.dict
share/plasma/emoji/sc.dict
share/plasma/emoji/sd.dict
share/plasma/emoji/si.dict
@@ -3832,6 +3846,7 @@ share/plasma/emoji/tg.dict
share/plasma/emoji/th.dict
share/plasma/emoji/ti.dict
share/plasma/emoji/tk.dict
+share/plasma/emoji/tn.dict
share/plasma/emoji/to.dict
share/plasma/emoji/tr.dict
share/plasma/emoji/ug.dict
diff --git a/x11/plasma5-plasma-integration/distinfo b/x11/plasma5-plasma-integration/distinfo
index 6bfb4ef50ab0..8287b73d41e6 100644
--- a/x11/plasma5-plasma-integration/distinfo
+++ b/x11/plasma5-plasma-integration/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022905
-SHA256 (KDE/plasma/5.27.6/plasma-integration-5.27.6.tar.xz) = a5fd5df218788b44c0bb2a437db1cad11917d4ebe6acefd89abd3f72104d8dab
-SIZE (KDE/plasma/5.27.6/plasma-integration-5.27.6.tar.xz) = 89864
+TIMESTAMP = 1691385020
+SHA256 (KDE/plasma/5.27.7/plasma-integration-5.27.7.tar.xz) = e3f266c60efb3d96f3a22782ba81b7c7071b010484ea717a169327c3f6641faa
+SIZE (KDE/plasma/5.27.7/plasma-integration-5.27.7.tar.xz) = 89868
diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile
index f0d6fb6851ec..684e7fec59eb 100644
--- a/x11/plasma5-plasma-workspace/Makefile
+++ b/x11/plasma5-plasma-workspace/Makefile
@@ -1,6 +1,5 @@
PORTNAME= plasma-workspace
DISTVERSION= ${KDE_PLASMA_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde kde-plasma
MAINTAINER= kde@FreeBSD.org
diff --git a/x11/plasma5-plasma-workspace/distinfo b/x11/plasma5-plasma-workspace/distinfo
index 05588488249c..9a76e660d171 100644
--- a/x11/plasma5-plasma-workspace/distinfo
+++ b/x11/plasma5-plasma-workspace/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688022907
-SHA256 (KDE/plasma/5.27.6/plasma-workspace-5.27.6.tar.xz) = 1ce6f70f7bb909b9ed9c213bc5528a4e7c264f570a9c94f2f4fb25c1528f8883
-SIZE (KDE/plasma/5.27.6/plasma-workspace-5.27.6.tar.xz) = 19459172
+TIMESTAMP = 1691385021
+SHA256 (KDE/plasma/5.27.7/plasma-workspace-5.27.7.tar.xz) = 0642941dcdf513ac201494897e2c5097a2f2db8be6dcdb597cae1a43d82ece5f
+SIZE (KDE/plasma/5.27.7/plasma-workspace-5.27.7.tar.xz) = 19465984
diff --git a/x11/plasma5-plasma-workspace/files/patch-kcmregionandlanguage b/x11/plasma5-plasma-workspace/files/patch-kcmregionandlanguage
deleted file mode 100644
index 6405463e5a20..000000000000
--- a/x11/plasma5-plasma-workspace/files/patch-kcmregionandlanguage
+++ /dev/null
@@ -1,312 +0,0 @@
-https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/3010
-
-From 27e0302155b788fe4e7440bf0db09de9ae596ee5 Mon Sep 17 00:00:00 2001
-From: Joshua Goins <josh@redstrate.com>
-Date: Mon, 22 May 2023 16:13:49 -0400
-Subject: [PATCH 1/6] kcms/region_language: Read the LANGUAGE environment
- variable for the default language value
-
-This has the same meaning in the kcfg, so we might as well read it
-from the environment variable like we're already doing with LANG.
-
-(cherry picked from commit 2e2f6b1469898383b6840d2c8e4c3733b13156d4)
----
- kcms/region_language/regionandlangsettingsbase.kcfg | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/kcms/region_language/regionandlangsettingsbase.kcfg ./kcms/region_language/regionandlangsettingsbase.kcfg
-index 3a4867ba49..17ac78291a 100644
---- a/kcms/region_language/regionandlangsettingsbase.kcfg
-+++ ./kcms/region_language/regionandlangsettingsbase.kcfg
-@@ -44,6 +44,10 @@
- </group>
- <group name="Translations">
- <entry key="LANGUAGE" name="language" type="String">
-+ <code>
-+ QString language = QString::fromLocal8Bit(qgetenv("LANGUAGE"));
-+ </code>
-+ <default code="true">language</default>
- </entry>
- </group>
- </kcfg>
---
-GitLab
-
-
-From 95920c1e67c660eb8db4efa059c8b062ad297b8b Mon Sep 17 00:00:00 2001
-From: Joshua Goins <josh@redstrate.com>
-Date: Mon, 22 May 2023 16:18:11 -0400
-Subject: [PATCH 2/6] kcms/region_language: Simplify the language settings read
-
-Now that we load both LANG and LANGUAGE from the environment variable,
-there's no reason to handle it on the C++ side because the branch should
-never get hit. Still detect whether it's an implicit language
- though.
-
-(cherry picked from commit e0171490533e95618f5fd5455041aa78af4af626)
----
- kcms/region_language/languagelistmodel.cpp | 33 ++++------------------
- kcms/region_language/languagelistmodel.h | 2 --
- 2 files changed, 6 insertions(+), 29 deletions(-)
-
-diff --git a/kcms/region_language/languagelistmodel.cpp ./kcms/region_language/languagelistmodel.cpp
-index a9e3ca00a1..1f11522d0a 100644
---- a/kcms/region_language/languagelistmodel.cpp
-+++ ./kcms/region_language/languagelistmodel.cpp
-@@ -205,30 +205,19 @@ void SelectedLanguageModel::setRegionAndLangSettings(RegionAndLangSettings *sett
- m_kcm = kcm;
-
- beginResetModel();
-- if (m_settings->language().isEmpty() && m_settings->isDefaultSetting(SettingType::Lang)) {
-+ if (m_settings->language().isEmpty()) {
- // no language but have lang
- m_selectedLanguages = {m_settings->lang()};
-- m_selectedLanguages.first().remove(QStringLiteral(".UTF-8"));
-- } else if (!m_settings->language().isEmpty()) {
-+ } else {
- // have language, ignore lang
- m_selectedLanguages = m_settings->language().split(QLatin1Char(':'));
-- } else {
-- // have nothing, figure out from env
-- QString lang = envLang();
-- QString language = envLanguage();
-- if (!language.isEmpty()) {
-- QStringList langlist = language.split(QLatin1Char(':'));
-- for (QString &lang : langlist) {
-- lang = lang.split(QLatin1Char('.'))[0];
-- }
-- m_selectedLanguages = langlist;
-- } else if (!lang.isEmpty()) {
-- lang.remove(QStringLiteral(".UTF-8"));
-- m_selectedLanguages = {lang};
-- }
-+ }
-+
-+ if (m_settings->isDefaultSetting(SettingType::Lang)) {
- m_hasImplicitLang = true;
- Q_EMIT hasImplicitLangChanged();
- }
-+
- endResetModel();
-
- // check for invalid lang
-@@ -404,13 +393,3 @@ const QString &SelectedLanguageModel::unsupportedLanguage() const
- {
- return m_unsupportedLanguage;
- }
--
--QString SelectedLanguageModel::envLang() const
--{
-- return qEnvironmentVariable("LANG");
--}
--
--QString SelectedLanguageModel::envLanguage() const
--{
-- return qEnvironmentVariable("LANGUAGE");
--}
-diff --git a/kcms/region_language/languagelistmodel.h ./kcms/region_language/languagelistmodel.h
-index 6c0866a55e..b3c6020dd4 100644
---- a/kcms/region_language/languagelistmodel.h
-+++ ./kcms/region_language/languagelistmodel.h
-@@ -97,8 +97,6 @@ Q_SIGNALS:
- void unsupportedLanguageChanged();
-
- private:
-- QString envLang() const;
-- QString envLanguage() const;
- void saveLanguages();
- RegionAndLangSettings *m_settings = nullptr;
- QList<QString> m_selectedLanguages;
---
-GitLab
-
-
-From af41a355d76d2a801796958219be79a004e38e48 Mon Sep 17 00:00:00 2001
-From: Joshua Goins <josh@redstrate.com>
-Date: Fri, 26 May 2023 13:36:43 -0400
-Subject: [PATCH 3/6] kcms/region_language: Check if the language setting is
- default as well
-
-(cherry picked from commit 514cefdbb6adaf9b8cab94963b37b27837d0a2c8)
----
- kcms/region_language/languagelistmodel.cpp | 2 +-
- kcms/region_language/localelistmodel.cpp | 1 +
- kcms/region_language/regionandlangsettings.cpp | 3 +++
- kcms/region_language/settingtype.h | 2 +-
- 4 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/kcms/region_language/languagelistmodel.cpp ./kcms/region_language/languagelistmodel.cpp
-index 1f11522d0a..434ec98869 100644
---- a/kcms/region_language/languagelistmodel.cpp
-+++ ./kcms/region_language/languagelistmodel.cpp
-@@ -213,7 +213,7 @@ void SelectedLanguageModel::setRegionAndLangSettings(RegionAndLangSettings *sett
- m_selectedLanguages = m_settings->language().split(QLatin1Char(':'));
- }
-
-- if (m_settings->isDefaultSetting(SettingType::Lang)) {
-+ if (m_settings->isDefaultSetting(SettingType::Lang) && m_settings->isDefaultSetting(SettingType::Language)) {
- m_hasImplicitLang = true;
- Q_EMIT hasImplicitLangChanged();
- }
-diff --git a/kcms/region_language/localelistmodel.cpp ./kcms/region_language/localelistmodel.cpp
-index f3ea2af32c..fedfafb6cd 100644
---- a/kcms/region_language/localelistmodel.cpp
-+++ ./kcms/region_language/localelistmodel.cpp
-@@ -92,6 +92,7 @@ QVariant LocaleListModel::data(const QModelIndex &index, int role) const
- case Example: {
- switch (m_configType) {
- case Lang:
-+ case Language:
- return {};
- case Numeric:
- return Utility::numericExample(data.locale);
-diff --git a/kcms/region_language/regionandlangsettings.cpp ./kcms/region_language/regionandlangsettings.cpp
-index 9146e1d1c9..53343b45c2 100644
---- a/kcms/region_language/regionandlangsettings.cpp
-+++ ./kcms/region_language/regionandlangsettings.cpp
-@@ -16,6 +16,8 @@ bool RegionAndLangSettings::isDefaultSetting(SettingType setting) const
- switch (setting) {
- case SettingType::Lang:
- return lang() == defaultLangValue();
-+ case SettingType::Language:
-+ return language() == defaultLanguageValue();
- case SettingType::Numeric:
- return numeric() == defaultNumericValue();
- case SettingType::Time:
-@@ -73,6 +75,7 @@ QString RegionAndLangSettings::LC_LocaleWithLang(SettingType setting) const
- case SettingType::PhoneNumbers:
- return phoneNumbers();
- case SettingType::Lang:
-+ case SettingType::Language:
- Q_UNREACHABLE();
- }
-
-diff --git a/kcms/region_language/settingtype.h ./kcms/region_language/settingtype.h
-index 07ce4cffc2..4865f341c6 100644
---- a/kcms/region_language/settingtype.h
-+++ ./kcms/region_language/settingtype.h
-@@ -12,6 +12,6 @@
- namespace KCM_RegionAndLang
- {
- Q_NAMESPACE_EXPORT()
--enum SettingType { Lang, Numeric, Time, Currency, Measurement, PaperSize, Address, NameStyle, PhoneNumbers };
-+enum SettingType { Lang, Numeric, Time, Currency, Measurement, PaperSize, Address, NameStyle, PhoneNumbers, Language };
- Q_ENUM_NS(SettingType)
- } // namespace KCM_RegionAndLang
---
-GitLab
-
-
-From c51b59a77e4c36161cf2d74e5ce26af83b44e335 Mon Sep 17 00:00:00 2001
-From: Joshua Goins <josh@redstrate.com>
-Date: Fri, 26 May 2023 14:17:30 -0400
-Subject: [PATCH 4/6] kcms/region_language: Chop off the UTF-8 codepoint again
-
-(cherry picked from commit 54af86fd470d1f37bea00867959f8f8f0b7cdcf7)
----
- kcms/region_language/languagelistmodel.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/kcms/region_language/languagelistmodel.cpp ./kcms/region_language/languagelistmodel.cpp
-index 434ec98869..6798286f2d 100644
---- a/kcms/region_language/languagelistmodel.cpp
-+++ ./kcms/region_language/languagelistmodel.cpp
-@@ -213,6 +213,11 @@ void SelectedLanguageModel::setRegionAndLangSettings(RegionAndLangSettings *sett
- m_selectedLanguages = m_settings->language().split(QLatin1Char(':'));
- }
-
-+ // Chop off the UTF-8 codepoint
-+ for (auto &language : m_selectedLanguages) {
-+ language.remove(QStringLiteral(".UTF-8"));
-+ }
-+
- if (m_settings->isDefaultSetting(SettingType::Lang) && m_settings->isDefaultSetting(SettingType::Language)) {
- m_hasImplicitLang = true;
- Q_EMIT hasImplicitLangChanged();
---
-GitLab
-
-
-From a5915bc59975080acb5e6b867ebb061a0b9adf3b Mon Sep 17 00:00:00 2001
-From: Joshua Goins <josh@redstrate.com>
-Date: Fri, 26 May 2023 14:37:11 -0400
-Subject: [PATCH 5/6] kcms/region_language: Improve isSupportedLanguage
- detection
-
-This prevents it considering languages with a territory attached as
-non-supported (like fr_FR) and checks it without a territory as a
-fallback.
-
-(cherry picked from commit 8d1f7d385cda8afcfc24ae61666f5f7ba1c869c7)
----
- kcms/region_language/languagelistmodel.cpp | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/region_language/languagelistmodel.cpp ./kcms/region_language/languagelistmodel.cpp
-index 6798286f2d..d9846226da 100644
---- a/kcms/region_language/languagelistmodel.cpp
-+++ ./kcms/region_language/languagelistmodel.cpp
-@@ -95,7 +95,19 @@ QString LanguageListModel::languageCodeToName(const QString &languageCode)
-
- bool LanguageListModel::isSupportedLanguage(const QString &language) const
- {
-- return m_availableLanguages.contains(language);
-+ // If the available language list contains the full language string outright, e.g. en_US
-+ if (m_availableLanguages.contains(language)) {
-+ return true;
-+ }
-+
-+ // If the language string passed has a territory attached (like fr_FR) then chop it off,
-+ // and try searching for just the language.
-+ if (language.contains('_')) {
-+ const QString languageName{language.left(language.indexOf('_'))};
-+ return m_availableLanguages.contains(languageName);
-+ }
-+
-+ return false;
- }
-
- int LanguageListModel::currentIndex() const
---
-GitLab
-
-
-From 0a00ee7639eb17a0159efba01de6e6cec34911f3 Mon Sep 17 00:00:00 2001
-From: Joshua Goins <josh@redstrate.com>
-Date: Wed, 7 Jun 2023 20:42:33 -0400
-Subject: [PATCH 6/6] kcms/region_language: Read from $LANGUAGE in options
- model
-
-(cherry picked from commit b5c675324c33c8a6f5e5817fc95217994f2188be)
----
- kcms/region_language/optionsmodel.cpp | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/region_language/optionsmodel.cpp ./kcms/region_language/optionsmodel.cpp
-index 339577332a..0c3bec97ea 100644
---- a/kcms/region_language/optionsmodel.cpp
-+++ ./kcms/region_language/optionsmodel.cpp
-@@ -112,10 +112,19 @@ QVariant OptionsModel::data(const QModelIndex &index, int role) const
- if (m_settings->defaultLangValue().isEmpty() && m_settings->isDefaultSetting(SettingType::Lang)) {
- // no Lang configured, no $LANG in env
- return i18nc("@info:title, the current setting is system default", "System Default");
-- } else if (!m_settings->lang().isEmpty()) {
-+ } else if (!m_settings->lang().isEmpty() && m_settings->lang() != m_settings->defaultLangValue()) {
- // Lang configured and not empty
- return getNativeName(m_settings->lang());
- } else {
-+ // Lang configured but empty, try to read from $LANGUAGE first.
-+ if (const QString languages = m_settings->defaultLanguageValue(); !languages.isEmpty()) {
-+ // If the first language is invalid, just fall through to $LANG
-+ const QStringList languageList = languages.split(QLatin1Char(':'));
-+ if (const QString firstLanguage = getNativeName(languageList[0]); !firstLanguage.isEmpty()) {
-+ return firstLanguage;
-+ }
-+ }
-+
- // Lang configured but empty, try to read from $LANG, shouldn't happen on a valid config file
- return getNativeName(m_settings->defaultLangValue());
- }
---
-GitLab
-
diff --git a/x11/plasma5-plasma-workspace/files/patch-kcmregionandlanguage2 b/x11/plasma5-plasma-workspace/files/patch-kcmregionandlanguage2
deleted file mode 100644
index a066d5d3a6c7..000000000000
--- a/x11/plasma5-plasma-workspace/files/patch-kcmregionandlanguage2
+++ /dev/null
@@ -1,143 +0,0 @@
-From eb78b22357d79fb4391285c4165a72364aeae35b Mon Sep 17 00:00:00 2001
-From: Gleb Popov <6yearold@gmail.com>
-Date: Mon, 26 Jun 2023 08:46:23 +0300
-Subject: [PATCH] Guard glibc code with an ifdef
-
----
- kcms/region_language/kcmregionandlang.cpp | 12 +++++++++++-
- kcms/region_language/kcmregionandlang.h | 5 +++++
- kcms/region_language/languagelistmodel.cpp | 4 ++++
- 3 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/region_language/kcmregionandlang.cpp ./kcms/region_language/kcmregionandlang.cpp
-index 9e99466a4..f94925334 100644
---- a/kcms/region_language/kcmregionandlang.cpp
-+++ ./kcms/region_language/kcmregionandlang.cpp
-@@ -5,7 +5,6 @@
-
- SPDX-License-Identifier: GPL-2.0-or-later
- */
--#include "config-workspace.h"
-
- #include "kcmregionandlang.h"
-
-@@ -60,6 +59,7 @@ KCMRegionAndLang::KCMRegionAndLang(QObject *parent, const KPluginMetaData &data,
- qRegisterMetaType<KCM_RegionAndLang::SettingType>();
- qmlRegisterUncreatableMetaObject(KCM_RegionAndLang::staticMetaObject, "kcmregionandlang", 1, 0, "SettingType", "Error: SettingType is an enum");
-
-+#ifdef GLIBC_LOCALE
- // fedora pre generate locales, fetch available locales from localectl. /usr/share/i18n/locales is empty in fedora
- QDir glibcLocaleDir(localeFileDirPath());
- if (glibcLocaleDir.isEmpty()) {
-@@ -80,6 +80,9 @@ KCMRegionAndLang::KCMRegionAndLang(QObject *parent, const KPluginMetaData &data,
- } else {
- m_enabled = true;
- }
-+#else
-+ m_enabled = true;
-+#endif
- }
-
- QString KCMRegionAndLang::failedFindLocalesMessage()
-@@ -124,6 +127,7 @@ void KCMRegionAndLang::save()
- if (!settings()->isDefaultSetting(SettingType::PhoneNumbers)) {
- locales.append(settings()->phoneNumbers());
- }
-+#ifdef GLIBC_LOCALE
- if (!settings()->language().isEmpty()) {
- QStringList languages = settings()->language().split(QLatin1Char(':'));
- for (const QString &lang : languages) {
-@@ -133,6 +137,7 @@ void KCMRegionAndLang::save()
- }
- }
- }
-+#endif
-
- auto setLangCall = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.Accounts"),
- QStringLiteral("/org/freedesktop/Accounts/User%1").arg(getuid()),
-@@ -226,6 +231,7 @@ bool KCMRegionAndLang::enabled() const
- return m_enabled;
- }
-
-+#ifdef GLIBC_LOCALE
- std::optional<QString> KCMRegionAndLang::toGlibcLocale(const QString &lang)
- {
- static std::unordered_map<QString, QString> map = constructGlibcLocaleMap();
-@@ -235,6 +241,7 @@ std::optional<QString> KCMRegionAndLang::toGlibcLocale(const QString &lang)
- }
- return std::nullopt;
- }
-+#endif
-
- QString KCMRegionAndLang::toUTF8Locale(const QString &locale)
- {
-@@ -252,6 +259,7 @@ QString KCMRegionAndLang::toUTF8Locale(const QString &locale)
- return locale + QLatin1String(".UTF-8");
- }
-
-+#ifdef GLIBC_LOCALE
- std::unordered_map<QString, QString> KCMRegionAndLang::constructGlibcLocaleMap()
- {
- std::unordered_map<QString, QString> localeMap;
-@@ -338,5 +346,7 @@ std::unordered_map<QString, QString> KCMRegionAndLang::constructGlibcLocaleMap()
- }
- return localeMap;
- }
-+#endif
-+
- #include "kcmregionandlang.moc"
- #include "moc_kcmregionandlang.cpp"
-diff --git a/kcms/region_language/kcmregionandlang.h ./kcms/region_language/kcmregionandlang.h
-index bdf9d19db..4f0e7fc72 100644
---- a/kcms/region_language/kcmregionandlang.h
-+++ ./kcms/region_language/kcmregionandlang.h
-@@ -11,6 +11,7 @@
- #include <optional>
- #include <unordered_map>
-
-+#include "config-workspace.h"
- #include "settingtype.h"
-
- #include <KConfigGroup>
-@@ -36,7 +37,9 @@ public:
- OptionsModel *optionsModel() const;
- bool enabled() const;
- static bool isGlibc();
-+#ifdef GLIBC_LOCALE
- std::optional<QString> toGlibcLocale(const QString &lang);
-+#endif
- Q_INVOKABLE void unset(KCM_RegionAndLang::SettingType setting);
- Q_INVOKABLE void reboot();
- Q_SIGNALS:
-@@ -53,7 +56,9 @@ private Q_SLOTS:
- void saveToConfigFile();
-
- private:
-+#ifdef GLIBC_LOCALE
- std::unordered_map<QString, QString> constructGlibcLocaleMap();
-+#endif
- static QString failedFindLocalesMessage();
- static QString localeFileDirPath();
- static QString toUTF8Locale(const QString &locale);
-diff --git a/kcms/region_language/languagelistmodel.cpp ./kcms/region_language/languagelistmodel.cpp
-index d9846226d..2f9870438 100644
---- a/kcms/region_language/languagelistmodel.cpp
-+++ ./kcms/region_language/languagelistmodel.cpp
-@@ -384,10 +384,14 @@ void SelectedLanguageModel::saveLanguages()
- Q_EMIT unsupportedLanguageChanged();
- }
-
-+#ifdef GLIBC_LOCALE
- auto glibcLang = m_kcm->toGlibcLocale(m_selectedLanguages.front());
- if (glibcLang.has_value()) {
- m_settings->setLang(glibcLang.value());
- }
-+#else
-+ m_settings->setLang(m_selectedLanguages.front());
-+#endif
- }
- QString languages;
- for (auto i = m_selectedLanguages.cbegin(); i != m_selectedLanguages.cend(); i++) {
---
-2.40.1
-
diff --git a/x11/plasma5-plasma-workspace/pkg-plist b/x11/plasma5-plasma-workspace/pkg-plist
index de21b1aff6a5..81ed31aad380 100644
--- a/x11/plasma5-plasma-workspace/pkg-plist
+++ b/x11/plasma5-plasma-workspace/pkg-plist
@@ -5313,6 +5313,7 @@ share/locale/sv/LC_MESSAGES/kcm_icons.mo
share/locale/sv/LC_MESSAGES/kcm_lookandfeel.mo
share/locale/sv/LC_MESSAGES/kcm_nightcolor.mo
share/locale/sv/LC_MESSAGES/kcm_notifications.mo
+share/locale/sv/LC_MESSAGES/kcm_regionandlang.mo
share/locale/sv/LC_MESSAGES/kcm_style.mo
share/locale/sv/LC_MESSAGES/kcm_users.mo
share/locale/sv/LC_MESSAGES/kcminit.mo
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 05:14:41 +0000