CLD: исправлено скрытие плазмойда громкости при наличии пакета kmix

Вместо metadata.desktop в plasma-pa-5.14 используется metadata.json Шаблоны из live перенесены в merge, так как настройка зависит только от наличия пакетов в системе
6 years ago · d78f11c5ff
parent 72069b4b72
commit d78f11c5ff
6 changed files with 10 additions and 2 deletions
--- a/profiles/templates/3.6/2_ac_install_merge/Depends/kmix
+++ b/profiles/templates/3.6/2_ac_install_merge/Depends/kmix
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
@ -1,4 +1,4 @@
-# Calculate format=kde
+# Calculate format=kde pkg(kde-plasma/plasma-pa)<5.14

 [Desktop Entry]
 #?pkg(kde-apps/kmix)!=#
--- a/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.desktop.remove
+++ b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.desktop.remove
@ -0,0 +1 @@
+# Calculate name=metadata.desktop append=remove pkg(kde-plasma/plasma-pa)>=5.14
--- a/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.json
+++ b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.json
@ -0,0 +1,8 @@
+# Calculate format=json
+{
+#?pkg(kde-apps/kmix)!=#
+	"X-Plasma-NotificationArea": "false"
+#!pkg#
+	"X-Plasma-NotificationArea": "true"
+#pkg#
+}
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
@ -1 +0,0 @@
-# Calculate append=skip
				`@ -0,0 +1 @@`
				`# Calculate name=metadata.desktop append=remove pkg(kde-plasma/plasma-pa)>=5.14`