calculate-overlay/sys-apps/calculate-templates/files/calculate-templates-2.2.24-r18.patch

diff --git desktop/00-desktop-init/empty_dir/0ini.env desktop/00-desktop-init/empty_dir/0ini.env
index fd0937a..6560917 100644
--- desktop/00-desktop-init/empty_dir/0ini.env
+++ desktop/00-desktop-init/empty_dir/0ini.env
@@ -4,7 +4,7 @@
 update = on
 
 [ver]
-patch = 2.2.13
+patch = 2.2.24
 
 [update]
 patch = on
diff --git desktop/desktop/00-patch-2.2.10/.calculate_directory desktop/desktop/00-patch-2.2.10/.calculate_directory
index 9ea3814..7b5186f 100644
--- desktop/desktop/00-patch-2.2.10/.calculate_directory
+++ desktop/desktop/00-patch-2.2.10/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10
diff --git desktop/desktop/00-patch-2.2.12/.calculate_directory desktop/desktop/00-patch-2.2.12/.calculate_directory
index 3f135e2..3bad719 100644
--- desktop/desktop/00-patch-2.2.12/.calculate_directory
+++ desktop/desktop/00-patch-2.2.12/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12
diff --git desktop/desktop/00-patch-2.2.13/.calculate_directory desktop/desktop/00-patch-2.2.13/.calculate_directory
index 81943f4..3932c91 100644
--- desktop/desktop/00-patch-2.2.13/.calculate_directory
+++ desktop/desktop/00-patch-2.2.13/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13
diff --git desktop/desktop/00-patch-2.2.22/.calculate_directory desktop/desktop/00-patch-2.2.22/.calculate_directory
index 9259f63..0ed217d 100644
--- desktop/desktop/00-patch-2.2.22/.calculate_directory
+++ desktop/desktop/00-patch-2.2.22/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22
diff --git desktop/desktop/00-patch-2.2.23/.calculate_directory desktop/desktop/00-patch-2.2.23/.calculate_directory
index dd6d923..3c18666 100644
--- desktop/desktop/00-patch-2.2.23/.calculate_directory
+++ desktop/desktop/00-patch-2.2.23/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.23
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.23
diff --git desktop/desktop/00-patch-2.2.24/.calculate_directory desktop/desktop/00-patch-2.2.24/.calculate_directory
new file mode 100644
index 0000000..4d30994
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.24
diff --git desktop/desktop/00-patch-2.2.24/adblock-fix.sh desktop/desktop/00-patch-2.2.24/adblock-fix.sh
new file mode 100644
index 0000000..acf4f7f
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/adblock-fix.sh
@@ -0,0 +1,7 @@
+# Calculate path=/tmp pkg(www-apps/chromium-adblock)!= exec=/bin/bash name=adblock-fix-#-ur_login-#.sh
+
+if [[ -d #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom ]]
+then
+    chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom &>/dev/null
+fi
+exit 0
diff --git desktop/desktop/00-patch-2.2.24/ini.env desktop/desktop/00-patch-2.2.24/ini.env
new file mode 100644
index 0000000..8d9b683
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba path=~/.calculate
+
+[ver]
+patch = 2.2.24
+
+[update]
+patch = on
diff --git desktop/desktop/20-kwallet-4.6/kwalletrc desktop/desktop/20-kwallet-4.6/kwalletrc
index d317bc0..38aa932 100644
--- desktop/desktop/20-kwallet-4.6/kwalletrc
+++ desktop/desktop/20-kwallet-4.6/kwalletrc
@@ -3,40 +3,40 @@
 # Applications that access is allowed
 [Auto Allow]
 #?os_locale_lang==en_US#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon,IMAP Account 1 of type IMAP E-Mail Server
 #os_locale_lang#
 #?os_locale_lang==ru_RU#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Источник данных Akonadi,Служба KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Источник данных Akonadi,Служба KDE,IMAP Account 1 of type Почтовый сервер IMAP
 #os_locale_lang#
 #?os_locale_lang==de_DE#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi-Ressource,KDE-Dienst
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi-Ressource,KDE-Dienst,IMAP Account 1 of type IMAP-E-Mail-Server
 #os_locale_lang#
 #?os_locale_lang==es_ES#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso de Akonadi,Servicio de KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso de Akonadi,Servicio de KDE,IMAP Account 1 of type Servidor de correo IMAP
 #os_locale_lang#
 #?os_locale_lang==it_IT#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Risorsa Akonadi,Demone KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Risorsa Akonadi,Demone KDE,IMAP Account 1 of type Server di posta IMAP
 #os_locale_lang#
 #?os_locale_lang==fr_FR#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ressource Akonadi,Démon de KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ressource Akonadi,Démon de KDE,IMAP Account 1 of type Serveur de courriels IMAP
 #os_locale_lang#
 #?os_locale_lang==pl_PL#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Zasób Akonadi,KDE Daemon
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Zasób Akonadi,KDE Daemon,IMAP Account 1 of type Serwer poczty IMAP
 #os_locale_lang#
 #?os_locale_lang==pt_PT#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Servidor do KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Servidor do KDE,IMAP Account 1 of type Servidor de E-Mail IMAP
 #os_locale_lang#
 #?os_locale_lang==pt_BR#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Serviço do KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Serviço do KDE IMAP Account 1 of type Servidor de e-mails IMAP
 #os_locale_lang#
 #?os_locale_lang==bg_BG#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon,IMAP Account 1 of type IMAP E-Mail Server
 #os_locale_lang#
 #?os_locale_lang==ro_RO#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,Demon KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,Demon KDE,IMAP Account 1 of type Server de poștă IMAP
 #os_locale_lang#
 #?os_locale_lang==uk_UA#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ресурс Akonadi,Фонова служба KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ресурс Akonadi,Фонова служба KDE,IMAP Account 1 of type Сервер пошти IMAP
 #os_locale_lang#
 
 [Wallet]
diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
index 1e6fad0..04633df 100644
--- desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
+++ desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
@@ -1,4 +1,5 @@
 # Calculate path=/tmp pkg(www-apps/chromium-adblock)!= exec=/bin/bash name=adblock-install-#-ur_login-#.sh
 
 cp -r /usr/share/chromium-adblock/gighmmpiobklfepjocnamgkkbiglidom #-ur_home_path-#/.config/chromium/Default/Extensions/
+chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom &>/dev/null
 exit 0
diff --git desktop/desktop/60-chromium-6.0/.config/chromium/First Run desktop/desktop/60-chromium-6.0/.config/chromium/First Run
index 8b3bbff..8d1c8b6 100644
--- desktop/desktop/60-chromium-6.0/.config/chromium/First Run	
+++ desktop/desktop/60-chromium-6.0/.config/chromium/First Run	
@@ -1,2 +1 @@
-# Calculate exists(~/.mozilla)==
-# will not migrate if Firefox had not run
\ No newline at end of file
+ 
diff --git desktop/desktop/60-smplayer-0.6/smplayer.ini desktop/desktop/60-smplayer-0.6/smplayer.ini
index eb351cd..35a3391 100644
--- desktop/desktop/60-smplayer-0.6/smplayer.ini
+++ desktop/desktop/60-smplayer-0.6/smplayer.ini
@@ -14,6 +14,8 @@ language=#-os_locale_lang-#
 use_single_instance=false
 
 [performance]
+#set cache for mount resources
+cache_for_files=1000
 #петелевой фильтр (1-включено, 0-пропускать всегда, 2-пропускать только для HD видео)
 h264_skip_loop_filter=2
 
diff --git install/1live/xorg-server/default/xdm install/1live/xorg-server/default/xdm
index 44a7cc4..1e6bcf7 100644
--- install/1live/xorg-server/default/xdm
+++ install/1live/xorg-server/default/xdm
@@ -1 +1 @@
-# Calculate link=/etc/init.d/xdm symbolic pkg(gnome-base/gdm)!=||pkg(kde-base/kdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=
+# Calculate link=/etc/init.d/xdm symbolic pkg(gnome-base/gdm)!=||pkg(kde-base/kdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=||cl_autologin!=&&os_install_root_type!=livecd
diff --git install/1live/xorg-server/default/xdm.del install/1live/xorg-server/default/xdm.del
index 53a8a85..f02cc98 100644
--- install/1live/xorg-server/default/xdm.del
+++ install/1live/xorg-server/default/xdm.del
@@ -1 +1 @@
-# Calculate append=remove pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==
+# Calculate append=remove pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&cl_autologin==||pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&os_install_root_type==livecd