x11-themes/canta-gtk-themes: Update to 2021-09-08

Changelog:	https://github.com/vinceliuice/Canta-theme/releases/tag/2021-09-08

PR:		258680

3 files changed, 18 insertions, 142 deletions

diff --git a/x11-themes/canta-gtk-themes/Makefile b/x11-themes/canta-gtk-themes/Makefile
index 1cf0a4e59340..106a8bbc4c91 100644
--- a/x11-themes/canta-gtk-themes/Makefile
+++ b/x11-themes/canta-gtk-themes/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexander Vereeken <Alexander88207@protonmail.com>
 
 PORTNAME=	canta-gtk-themes
-DISTVERSION=	2021-07-06
+DISTVERSION=	2021-09-08
 CATEGORIES=	x11-themes
 
 MAINTAINER=	Alexander88207@protonmail.com
@@ -11,6 +11,7 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash>0:shells/bash \
+		gsed:textproc/gsed \
 		sassc>0:textproc/sassc
 RUN_DEPENDS=	gtk-engines2>0:x11-themes/gtk-engines2 \
 		gtk-murrine-engine>0:x11-themes/gtk-murrine-engine
diff --git a/x11-themes/canta-gtk-themes/distinfo b/x11-themes/canta-gtk-themes/distinfo
index 3dfe0f154968..5c8750e1858c 100644
--- a/x11-themes/canta-gtk-themes/distinfo
+++ b/x11-themes/canta-gtk-themes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627066042
-SHA256 (vinceliuice-Canta-theme-2021-07-06_GH0.tar.gz) = 364f531dc3a346c0aabde57518e3b66c6ae1535d1e919489732ebb2cabfae419
-SIZE (vinceliuice-Canta-theme-2021-07-06_GH0.tar.gz) = 5006531
+TIMESTAMP = 1632326840
+SHA256 (vinceliuice-Canta-theme-2021-09-08_GH0.tar.gz) = 98f6b71fbc46b1b9e1b256588cf930f780952f95c57f48c9922065c8b333bacd
+SIZE (vinceliuice-Canta-theme-2021-09-08_GH0.tar.gz) = 4992868
diff --git a/x11-themes/canta-gtk-themes/files/patch-install.sh b/x11-themes/canta-gtk-themes/files/patch-install.sh
index 31e0b54ab769..2d6a0c84427a 100644
--- a/x11-themes/canta-gtk-themes/files/patch-install.sh
+++ b/x11-themes/canta-gtk-themes/files/patch-install.sh
@@ -1,143 +1,18 @@
---- install.sh.orig	2021-07-23 18:55:57 UTC
+--- install.sh.orig	2021-09-22 16:18:31 UTC
 +++ install.sh
-@@ -82,8 +82,8 @@ install() {
-   echo "Installing '${THEME_DIR}'..."
- 
-   mkdir -p                                                                           ${THEME_DIR}
--  cp -ur ${SRC_DIR}/COPYING                                                          ${THEME_DIR}
--  cp -ur ${SRC_DIR}/AUTHORS                                                          ${THEME_DIR}
-+  cp -pr ${SRC_DIR}/COPYING                                                          ${THEME_DIR}
-+  cp -pr ${SRC_DIR}/AUTHORS                                                          ${THEME_DIR}
- 
-   echo "[Desktop Entry]" >> ${THEME_DIR}/index.theme
-   echo "Type=X-GNOME-Metatheme" >> ${THEME_DIR}/index.theme
-@@ -99,10 +99,10 @@ install() {
-   echo "ButtonLayout=menu:minimize,maximize,close" >> ${THEME_DIR}/index.theme
- 
-   mkdir -p                                                                           ${THEME_DIR}/gnome-shell
--  cp -ur ${SRC_DIR}/src/gnome-shell/{*.svg,extensions,noise-texture.png,pad-osd.css} ${THEME_DIR}/gnome-shell
--  cp -ur ${SRC_DIR}/src/gnome-shell/gnome-shell-theme.gresource.xml                  ${THEME_DIR}/gnome-shell
--  cp -ur ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK}                               ${THEME_DIR}/gnome-shell/assets
--  cp -ur ${SRC_DIR}/src/gnome-shell/common-assets/*.svg                              ${THEME_DIR}/gnome-shell/assets
-+  cp -pr ${SRC_DIR}/src/gnome-shell/{*.svg,extensions,noise-texture.png,pad-osd.css} ${THEME_DIR}/gnome-shell
-+  cp -pr ${SRC_DIR}/src/gnome-shell/gnome-shell-theme.gresource.xml                  ${THEME_DIR}/gnome-shell
-+  cp -pr ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK}                               ${THEME_DIR}/gnome-shell/assets
-+  cp -pr ${SRC_DIR}/src/gnome-shell/common-assets/*.svg                              ${THEME_DIR}/gnome-shell/assets
- 
-   if [[ "${theme}" != '' ]]; then
-   if [[ "${GS_VERSION:-}" == 'new' ]]; then
-@@ -112,76 +112,76 @@ install() {
-   fi
-   else
-   if [[ "${GS_VERSION:-}" == 'new' ]]; then
--    cp -ur ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.css      ${THEME_DIR}/gnome-shell/gnome-shell.css
-+    cp -pr ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.css      ${THEME_DIR}/gnome-shell/gnome-shell.css
-   else
--    cp -ur ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.css      ${THEME_DIR}/gnome-shell/gnome-shell.css
-+    cp -pr ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.css      ${THEME_DIR}/gnome-shell/gnome-shell.css
-   fi
+@@ -403,13 +403,13 @@ theme_colors() {
+         theme_color='indigo'
+         ;;
+     esac
+-    sed -i "/\$color:/s/default/${theme_color}/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
++    gsed -i "/\$color:/s/default/${theme_color}/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
    fi
- 
-   mkdir -p                                                                           ${THEME_DIR}/gtk-2.0
--  cp -ur ${SRC_DIR}/src/gtk-2.0/{apps.rc,hacks.rc,panel.rc}                          ${THEME_DIR}/gtk-2.0
--  cp -ur ${SRC_DIR}/src/gtk-2.0/main.rc${theme}                                      ${THEME_DIR}/gtk-2.0/main.rc
--  cp -ur ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK}                                   ${THEME_DIR}/gtk-2.0/assets
-+  cp -pr ${SRC_DIR}/src/gtk-2.0/{apps.rc,hacks.rc,panel.rc}                          ${THEME_DIR}/gtk-2.0
-+  cp -pr ${SRC_DIR}/src/gtk-2.0/main.rc${theme}                                      ${THEME_DIR}/gtk-2.0/main.rc
-+  cp -pr ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK}                                   ${THEME_DIR}/gtk-2.0/assets
-   [[ ${theme} != '' && ${color} == '-dark' ]] && \
--  cp -ur ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png                              ${THEME_DIR}/gtk-2.0/assets
--  cp -ur ${SRC_DIR}/src/gtk-2.0/gtkrc${theme}${color}                                ${THEME_DIR}/gtk-2.0/gtkrc
-+  cp -pr ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png                              ${THEME_DIR}/gtk-2.0/assets
-+  cp -pr ${SRC_DIR}/src/gtk-2.0/gtkrc${theme}${color}                                ${THEME_DIR}/gtk-2.0/gtkrc
- 
-   mkdir -p                                                                           ${THEME_DIR}/gtk-3.0
--  cp -ur ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-3.0
--  cp -ur ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-3.0
-+  cp -pr ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-3.0
-+  cp -pr ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-3.0
- 
-   if [[ "${theme}" != '' ]]; then
-     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.scss                  ${THEME_DIR}/gtk-3.0/gtk.css
-     [[ ${color} != '-dark' ]] && \
-     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.scss                     ${THEME_DIR}/gtk-3.0/gtk-dark.css
-   else
--    cp -ur ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-3.0/gtk.css
-+    cp -pr ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-3.0/gtk.css
-     [[ ${color} != '-dark' ]] && \
--    cp -ur ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-3.0/gtk-dark.css
-+    cp -pr ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-3.0/gtk-dark.css
-   fi
- 
-   mkdir -p                                                                           ${THEME_DIR}/gtk-4.0
--  cp -ur ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-4.0
--  cp -ur ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-4.0
-+  cp -pr ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-4.0
-+  cp -pr ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-4.0
- 
-   if [[ "${theme}" != '' ]]; then
-     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.scss                  ${THEME_DIR}/gtk-4.0/gtk.css
-     [[ ${color} != '-dark' ]] && \
-     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.scss                     ${THEME_DIR}/gtk-4.0/gtk-dark.css
-   else
--    cp -ur ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-4.0/gtk.css
-+    cp -pr ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-4.0/gtk.css
-     [[ ${color} != '-dark' ]] && \
--    cp -ur ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-4.0/gtk-dark.css
-+    cp -pr ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-4.0/gtk-dark.css
-   fi
- 
-   mkdir -p                                                                           ${THEME_DIR}/metacity-1
--  cp -ur ${SRC_DIR}/src/metacity-1/assets/*.png                                      ${THEME_DIR}/metacity-1
--  cp -ur ${SRC_DIR}/src/metacity-1/metacity-theme-1${color}.xml                      ${THEME_DIR}/metacity-1/metacity-theme-1.xml
-+  cp -pr ${SRC_DIR}/src/metacity-1/assets/*.png                                      ${THEME_DIR}/metacity-1
-+  cp -pr ${SRC_DIR}/src/metacity-1/metacity-theme-1${color}.xml                      ${THEME_DIR}/metacity-1/metacity-theme-1.xml
-   cd ${THEME_DIR}/metacity-1
-   ln -s metacity-theme-1.xml metacity-theme-2.xml
-   ln -s metacity-theme-1.xml metacity-theme-3.xml
- 
-   mkdir -p                                                                           ${THEME_DIR}/unity
--  cp -ur ${SRC_DIR}/src/unity/{*.svg,*.png,dash-widgets.json}                        ${THEME_DIR}/unity
--  cp -ur ${SRC_DIR}/src/unity/assets${ELSE_LIGHT}                                    ${THEME_DIR}/unity/assets
-+  cp -pr ${SRC_DIR}/src/unity/{*.svg,*.png,dash-widgets.json}                        ${THEME_DIR}/unity
-+  cp -pr ${SRC_DIR}/src/unity/assets${ELSE_LIGHT}                                    ${THEME_DIR}/unity/assets
- 
-   mkdir -p                                                                           ${THEME_DIR}/xfwm4
--  cp -ur ${SRC_DIR}/src/xfwm4/{*.svg,themerc}                                        ${THEME_DIR}/xfwm4
--  cp -ur ${SRC_DIR}/src/xfwm4/assets${ELSE_LIGHT}                                    ${THEME_DIR}/xfwm4/assets
-+  cp -pr ${SRC_DIR}/src/xfwm4/{*.svg,themerc}                                        ${THEME_DIR}/xfwm4
-+  cp -pr ${SRC_DIR}/src/xfwm4/assets${ELSE_LIGHT}                                    ${THEME_DIR}/xfwm4/assets
- 
-   if [[ "${theme}" == '' ]]; then
-   mkdir -p                                                                           ${THEME_DIR}/cinnamon
--  cp -ur ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css                            ${THEME_DIR}/cinnamon/cinnamon.css
--  cp -ur ${SRC_DIR}/src/cinnamon/assets/common-assets                                ${THEME_DIR}/cinnamon/assets
--  cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/checkbox/*.svg            ${THEME_DIR}/cinnamon/assets/checkbox
--  cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/menu/*.svg                ${THEME_DIR}/cinnamon/assets/menu
--  cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/misc/*.svg                ${THEME_DIR}/cinnamon/assets/misc
--  cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/switch/*.svg              ${THEME_DIR}/cinnamon/assets/switch
--  cp -ur ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png                           ${THEME_DIR}/cinnamon/thumbnail.png
-+  cp -pr ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css                            ${THEME_DIR}/cinnamon/cinnamon.css
-+  cp -pr ${SRC_DIR}/src/cinnamon/assets/common-assets                                ${THEME_DIR}/cinnamon/assets
-+  cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/checkbox/*.svg            ${THEME_DIR}/cinnamon/assets/checkbox
-+  cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/menu/*.svg                ${THEME_DIR}/cinnamon/assets/menu
-+  cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/misc/*.svg                ${THEME_DIR}/cinnamon/assets/misc
-+  cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/switch/*.svg              ${THEME_DIR}/cinnamon/assets/switch
-+  cp -pr ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png                           ${THEME_DIR}/cinnamon/thumbnail.png
-   fi
- 
-   mkdir -p                                                                           ${THEME_DIR}/plank
--  cp -ur ${SRC_DIR}/src/plank/dock${ELSE_LIGHT}.theme                                ${THEME_DIR}/plank/dock.theme
-+  cp -pr ${SRC_DIR}/src/plank/dock${ELSE_LIGHT}.theme                                ${THEME_DIR}/plank/dock.theme
  }
  
- install_gdm() {
-@@ -213,7 +213,7 @@ install_icon() {
-   echo -e "\nInstalling Canta icon theme..."
- 
-   # Copying files
--  cp -ur ${SRC_DIR}/icons/Canta ${ICON_DEST_DIR}
-+  cp -pr ${SRC_DIR}/icons/Canta ${ICON_DEST_DIR}
+ bakground_image() {
+     echo "Install with no nautilus bakground image..."
+-    sed -i "/\$theme_image:/s/true/false/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
++    gsed -i "/\$theme_image:/s/true/false/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
+ }
  
-   # update icon caches
-   gtk-update-icon-cache ${ICON_DEST_DIR}/Canta
+ theme_tweaks() {