Merge branch 'develop' of git.calculate-linux.org:/repo/calculate into develop

profiles/default/package.keywords/depends

@@ -101,7 +101,7 @@
 ~app-crypt/nwipe-0.25 amd64
 ~app-crypt/onak-0.5.0 amd64
 ~app-crypt/openvpn-blacklist-0.5 amd64
-~app-crypt/pdfcrack-0.16 amd64
+~app-crypt/pdfcrack-0.19 amd64
 ~app-crypt/pesign-0.113 amd64
 ~app-crypt/pius-2.2.4 amd64
 ~app-crypt/pkcrack-1.2.2 amd64
@@ -764,7 +764,7 @@
 ~media-libs/libogg-1.3.4 amd64
 ~media-libs/libopenraw-0.1.2 amd64
 ~media-libs/libprojectm-3.1.2 amd64
-~media-libs/libtgvoip-2.4.4_p20200525 amd64
+~media-libs/libtgvoip-2.4.4_p20200627 amd64
 ~media-libs/libvpx-1.8.2 amd64
 ~media-libs/libwebp-1.1.0 amd64
 ~media-libs/libXcm-0.5.4 amd64
@@ -1145,7 +1145,7 @@ net-vpn/wireguard-tools amd64
 ~x11-misc/mugshot-0.4.1 amd64
 ~x11-misc/nts-82 amd64
 ~x11-misc/obconf-2.0.4 amd64
-~x11-misc/obmenu-generator-0.85 amd64
+~x11-misc/obmenu-generator-0.88 amd64
 ~x11-misc/oroborus-deskmenu-1.4.5 amd64
 ~x11-misc/oroborus-keylaunch-1.3.9 amd64
 ~x11-misc/peksystray-0.4.0 amd64

profiles/templates/3.6/2_ac_install_merge/xfce-extra/xfce4-notifyd/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip mergepkg()>=0.6

profiles/templates/3.6/2_ac_install_merge/xfce-extra/xfce4-notifyd/gtk.css

@@ -0,0 +1,44 @@
+# Calculate path=/usr/share/themes/Calculate/xfce-notify-4.0
+
+#XfceNotifyWindow {
+    background-color: alpha(#282a33,0.9);
+    border-radius: 0 0 2px 2px;
+    border-width: 0 1px 1px 1px;
+    padding: 10px;
+    border-style: solid;
+    border-color: rgba(13, 14, 17, 0.4);
+}
+
+#XfceNotifyWindow:hover {
+    border-radius: 0 0 2px 2px;
+    border-width: 0 1px 1px 1px;
+    padding: 10px;
+    border-style: solid;
+    border-color: rgba(13, 14, 17, 0.4);
+}
+
+#XfceNotifyWindow label,
+#XfceNotifyWindow image {
+    color: #ffffff;
+}
+
+#XfceNotifyWindow label#summary {
+    font-weight: Bold;
+}
+
+#XfceNotifyWindow button {
+    border-color: rgba(13, 14, 17, 0.4);
+    background-image: none;
+    background-color: rgba(82, 148, 226, 0);
+    color: #d3dae3;
+    box-shadow: inset 0 1px rgba(255,255,255,0.5);
+    text-shadow: none;
+}
+
+#XfceNotifyWindow button:hover {
+    background-image: none;
+    background-color: rgba(105, 110, 134, 0.5);
+    color: #d3dae3;
+    box-shadow: inset 0 1px rgba(255,255,255,0.5);
+    text-shadow: none;
+}

profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml

@@ -6,7 +6,10 @@
 #?pkg(xfce-extra/xfce4-notifyd)<0.4#
   <property name="theme" type="string" value="lightdm-calculate"/>
 #pkg#
-#?pkg(xfce-extra/xfce4-notifyd)>=0.4#
+#?pkg(xfce-extra/xfce4-notifyd)>=0.4&&pkg(xfce-extra/xfce4-notifyd)<0.6#
   <property name="theme" type="string" value="Default"/>
 #pkg#
+#?pkg(xfce-extra/xfce4-notifyd)>=0.6#
+  <property name="theme" type="string" value="Calculate"/>
+#pkg#
 </channel>

profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-extra/xfce4-notifyd-0.4/.calculate_directory

@@ -0,0 +1 @@
+# Calculate mergepkg()>=0.4&&mergepkg()<0.6&&ini(update.xfce4-notifyd)!=off&&ini(ver.xfce4-notifyd)<0.4 append=skip

profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-extra/xfce4-notifyd-0.6/.calculate_directory

@@ -0,0 +1 @@
+# Calculate mergepkg()>=0.6&&ini(update.xfce4-notifyd)!=off&&ini(ver.xfce4-notifyd)<0.6 append=skip

profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-extra/xfce4-notifyd-0.6/ini.env

@@ -0,0 +1,7 @@
+# Calculate format=samba path=~/.calculate
+
+[ver]
+xfce4-notifyd = 0.6
+
+[update]
+xfce4-notifyd = on

profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-extra/xfce4-notifyd-0.6/xfce4-notifyd.xml

@@ -0,0 +1,3 @@
+# Calculate multiline format=patch path=~/.config/xfce4/xfconf/xfce-perchannel-xml
+<reg>(&lt;property name="theme" type="string" value=)"[^"]+"(/&gt;)</reg>
+<text>\1"Calculate"\2</text>

profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-extra/xfce4-notifyd/.calculate_directory

@@ -1 +0,0 @@
-# Calculate mergepkg()>=0.4&&ini(update.xfce4-notifyd)!=off&&ini(ver.xfce4-notifyd)<0.4 append=skip

profiles/templates/3.6/6_ac_update_sync/remerge/0-ini

@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20200624
+remerge = 20200630

profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200630

@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=xfce-extra/xfce4-notifyd
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#