diff --git a/desktop/user/00-init/01-init/.calculate/ini.env b/desktop/user/00-init/01-init/.calculate/ini.env index be6d94d..39ae9e5 100644 --- a/desktop/user/00-init/01-init/.calculate/ini.env +++ b/desktop/user/00-init/01-init/.calculate/ini.env @@ -14,7 +14,7 @@ ver = #-os_linux_ver-# #?exists(~/.kde4)==&&exists(~/.gconf)==&&exists(~/.config)==# [ver] -patch = 2.1.19 +patch = 2.1.18 #exists# [update] diff --git a/desktop/user/80-patches/patch-2.1.18/.calculate/ini.env b/desktop/user/80-patches/patch-2.1.18/.calculate/ini.env new file mode 100644 index 0000000..9f70b1b --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.calculate/ini.env @@ -0,0 +1,7 @@ +# Calculate format=samba + +[ver] +patch = 2.1.18 + +[update] +patch = on diff --git a/desktop/user/80-patches/patch-2.1.18/.calculate_directory b/desktop/user/80-patches/patch-2.1.18/.calculate_directory new file mode 100644 index 0000000..26d6939 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(ver.patch)<2.1.18 diff --git a/desktop/user/80-patches/patch-2.1.18/.config/xfce4/.calculate_directory b/desktop/user/80-patches/patch-2.1.18/.config/xfce4/.calculate_directory new file mode 100644 index 0000000..e305e8e --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.config/xfce4/.calculate_directory @@ -0,0 +1 @@ +# Calculate pkg(xfce-base/xfdesktop)>=4.6 diff --git a/desktop/user/80-patches/patch-2.1.18/.config/xfce4/helpers.rc b/desktop/user/80-patches/patch-2.1.18/.config/xfce4/helpers.rc new file mode 100644 index 0000000..de29c21 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.config/xfce4/helpers.rc @@ -0,0 +1,8 @@ +# Calculate format=procmail +#?pkg(www-client/chromium)!=# +WebBrowser=chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# +WebBrowser=firefox +#pkg# + diff --git a/desktop/user/80-patches/patch-2.1.18/.config/xfce4/panel/launcher-30.rc b/desktop/user/80-patches/patch-2.1.18/.config/xfce4/panel/launcher-30.rc new file mode 100644 index 0000000..853a846 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.config/xfce4/panel/launcher-30.rc @@ -0,0 +1,15 @@ +# Calculate format=kde +[Entry 0] +#?pkg(www-client/chromium)!=# +Icon=chromium-browser +Exec=chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# +Icon=browser +Exec=firefox +#pkg# +#?pkg(www-client/mozilla-firefox)==&&pkg(www-client/chromium)==# +Icon=browser +Exec=exo-open --launch WebBrowser +#pkg# + diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/.calculate_directory b/desktop/user/80-patches/patch-2.1.18/.gconf/.calculate_directory new file mode 100644 index 0000000..8d9572f --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gconf/.calculate_directory @@ -0,0 +1 @@ +# Calculate pkg(gnome-base/libgnome)>=2.26 diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml b/desktop/user/80-patches/patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml new file mode 100644 index 0000000..b3f95cc --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# + mozilla-firefox.desktop +#pkg# + + diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml new file mode 100644 index 0000000..cab7b3c --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# + firefox +#pkg# + + diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml new file mode 100644 index 0000000..c186ab1 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml new file mode 100644 index 0000000..9d9bb74 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml @@ -0,0 +1,14 @@ +# Calculate format=xml_gconf + + + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml new file mode 100644 index 0000000..c186ab1 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml new file mode 100644 index 0000000..c186ab1 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml new file mode 100644 index 0000000..c186ab1 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml new file mode 100644 index 0000000..c186ab1 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/desktop/user/80-patches/patch-2.1.18/.gnome2/.calculate_directory b/desktop/user/80-patches/patch-2.1.18/.gnome2/.calculate_directory new file mode 100644 index 0000000..8d9572f --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gnome2/.calculate_directory @@ -0,0 +1 @@ +# Calculate pkg(gnome-base/libgnome)>=2.26 diff --git a/desktop/user/80-patches/patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd b/desktop/user/80-patches/patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd new file mode 100644 index 0000000..0615eef --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd @@ -0,0 +1,9 @@ +# Calculate format=kde + +[Desktop Entry] +#?os_locale_language!=ru# +Exec=xdg-open /usr/calculate/install/doc/handbook.html +#os_locale_language# +#?os_locale_language==ru# +Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html +#os_locale_language# diff --git a/desktop/user/80-patches/patch-2.1.18/.kde4/.calculate_directory b/desktop/user/80-patches/patch-2.1.18/.kde4/.calculate_directory new file mode 100644 index 0000000..3f0dc89 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.kde4/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate pkg(kde-base/kdelibs)<4.5 + diff --git a/desktop/user/80-patches/patch-2.1.18/.kde4/share/config/kdeglobals b/desktop/user/80-patches/patch-2.1.18/.kde4/share/config/kdeglobals new file mode 100644 index 0000000..66997a9 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.kde4/share/config/kdeglobals @@ -0,0 +1,14 @@ +# Calculate format=kde + +[General] +# сделать chromium браузером по умолчанию, если он установлен +#?pkg(www-client/chromium)!=# +BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop +#pkg# +# сделать mozilla firefox браузером по умолчанию, если он установлен +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# +BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)==&&pkg(www-client/chromium)==# +BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop +#pkg# diff --git a/desktop/user/80-patches/patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc b/desktop/user/80-patches/patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc new file mode 100644 index 0000000..a0a3eb8 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc @@ -0,0 +1,36 @@ +# Calculate format=plasma +#------------------------------------------------------------------------------ +#нижняя панель +#------------------------------------------------------------------------------ + +#-sum(cont,,2)-# +#-sum(bs,,40)-# +#-sum(sp,,4)-# +#-sum(height,,bs+sp)-# +#-sum(width,,height*15)-# + +[Containments][#-sum(cont,cont+1)-#] +desktop=-1 +formfactor=2 +geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-# +immutability=1 +location=4 +plugin=panel +screen=0 +zvalue=150 + +[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] +geometry=#-sum(x,0)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-# +immutability=1 +plugin=icon +zvalue=0 +[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +#?pkg(www-client/chromium)!=# +Url=file:///usr/share/applications/chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==# +Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)==&&pkg(www-client/chromium)==# +Url=file:///usr/share/applications/kde4/konqbrowser.desktop +#pkg# diff --git a/desktop/user/80-patches/patch-2.1.18/.local/share/applications/defaults.list b/desktop/user/80-patches/patch-2.1.18/.local/share/applications/defaults.list new file mode 100644 index 0000000..de73771 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.local/share/applications/defaults.list @@ -0,0 +1,14 @@ +# Calculate format=compiz +[Default Applications] +application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/rtf=writer.desktop +application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop +application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop +application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop +application/xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop +application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop +text/html=chromium-chromium.desktop;mozilla-firefox.desktop + diff --git a/desktop/user/80-patches/patch-2.1.18/.local/share/applications/mimeapps.list b/desktop/user/80-patches/patch-2.1.18/.local/share/applications/mimeapps.list new file mode 100644 index 0000000..18b80b9 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/.local/share/applications/mimeapps.list @@ -0,0 +1,12 @@ +# Calculate format=compiz pkg(kdelibs)>=4.3 +[Added Associations] +application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop; +application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop; +application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +text/html=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; diff --git a/desktop/user/80-patches/patch-2.1.18/Desktop/README.desktop b/desktop/user/80-patches/patch-2.1.18/Desktop/README.desktop new file mode 100644 index 0000000..dd85e09 --- /dev/null +++ b/desktop/user/80-patches/patch-2.1.18/Desktop/README.desktop @@ -0,0 +1,9 @@ +# Calculate format=kde os_root_type==livecd chmod=0755 + +[Desktop Entry] +#?os_locale_language!=ru# +Exec=xdg-open /usr/calculate/install/doc/handbook.html +#os_locale_language# +#?os_locale_language==ru# +Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html +#os_locale_language#