diff --git a/x11-themes/qogir-gtk-themes/Makefile b/x11-themes/qogir-gtk-themes/Makefile index 0d7f7066c982..401877474bc0 100644 --- a/x11-themes/qogir-gtk-themes/Makefile +++ b/x11-themes/qogir-gtk-themes/Makefile @@ -1,31 +1,31 @@ PORTNAME= qogir-gtk-themes -DISTVERSION= 2022-07-17 +DISTVERSION= 2022-10-16 CATEGORIES= x11-themes -MAINTAINER= Alexander88207@protonmail.com +MAINTAINER= duchateau.olivier@gmail.com COMMENT= Qogir is a flat Design theme for GTK WWW= https://github.com/vinceliuice/Qogir-theme LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash>0:shells/bash \ sassc>0:textproc/sassc RUN_DEPENDS= gtk-murrine-engine>0:x11-themes/gtk-murrine-engine \ gtk-engines2>0:x11-themes/gtk-engines2 \ adwaita-icon-theme>0:x11-themes/adwaita-icon-theme USES= shebangfix SHEBANG_FILES= install.sh USE_GITHUB= yes GH_ACCOUNT= vinceliuice GH_PROJECT= Qogir-theme NO_ARCH= yes NO_BUILD= yes do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/themes ${WRKSRC}/install.sh -t all -d ${STAGEDIR}${PREFIX}/share/themes .include diff --git a/x11-themes/qogir-gtk-themes/distinfo b/x11-themes/qogir-gtk-themes/distinfo index cd99af00aa1e..86b81bc01f64 100644 --- a/x11-themes/qogir-gtk-themes/distinfo +++ b/x11-themes/qogir-gtk-themes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665420403 -SHA256 (vinceliuice-Qogir-theme-2022-07-17_GH0.tar.gz) = cedee13d0b6bc969e206f402e3875212ca936e8843aa3406ada3f68430b70ac9 -SIZE (vinceliuice-Qogir-theme-2022-07-17_GH0.tar.gz) = 2600148 +TIMESTAMP = 1666284619 +SHA256 (vinceliuice-Qogir-theme-2022-10-16_GH0.tar.gz) = b79a1ac1a16327f67cb9db70c9948cb3f986edf6f6d545b797de2b4891c30444 +SIZE (vinceliuice-Qogir-theme-2022-10-16_GH0.tar.gz) = 2608962 diff --git a/x11-themes/qogir-gtk-themes/files/patch-install.sh b/x11-themes/qogir-gtk-themes/files/patch-install.sh index a89ab2db3840..394e09a2f30d 100644 --- a/x11-themes/qogir-gtk-themes/files/patch-install.sh +++ b/x11-themes/qogir-gtk-themes/files/patch-install.sh @@ -1,44 +1,55 @@ ---- install.sh.orig 2022-07-07 08:30:28 UTC +--- install.sh.orig 2022-10-16 06:48:19 UTC +++ install.sh -@@ -562,18 +562,13 @@ tweaks_temp() { +@@ -556,18 +556,13 @@ tweaks_temp() { cp -rf ${SRC_DIR}/src/_sass/_tweaks.scss ${SRC_DIR}/src/_sass/_tweaks-temp.scss } -install_image() { - sed -i "/\$background:/s/default/image/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss - echo -e "Install Nautilus with background image version ..." -} - install_win_titlebutton() { - sed -i "/\$titlebutton:/s/circle/square/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss + sed -i "" -e "s|titlebutton: 'circle|titlebutton: 'square|" ${SRC_DIR}/src/_sass/_tweaks-temp.scss echo -e "Install Square titlebutton version ..." } install_round_window() { - sed -i "/\$window:/s/default/round/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss + sed -i "" -e "s|window: 'default|window: 'round|" ${SRC_DIR}/src/_sass/_tweaks-temp.scss echo -e "Install Round window version ..." } -@@ -587,18 +582,14 @@ install_theme_color() { +@@ -581,20 +576,16 @@ install_theme_color() { theme_color='ubuntu' ;; esac - sed -i "/\$theme:/s/default/${theme_color}/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss + sed -i "" -e "s|theme: 'default|theme: '${theme_color}|" ${SRC_DIR}/src/_sass/_tweaks-temp.scss fi } theme_tweaks() { - if [[ "$image" == "true" || "$square" == "true" || "$accent" == 'true' || "$window" == 'round' ]]; then + if [[ "$square" == "true" || "$accent" == 'true' || "$window" == 'round' ]]; then tweaks='true' install_package; tweaks_temp -- fi -- + fi + - if [[ "$image" == "true" ]] ; then - install_image +- fi +- + if [[ "$square" == "true" ]] ; then + install_win_titlebutton fi +@@ -635,8 +626,6 @@ uninstall_theme() { + done + done + } +- +-./clean-old-theme.sh - if [[ "$square" == "true" ]] ; then + if [[ "${gdm:-}" != 'true' && "${remove:-}" != 'true' ]]; then + install_theme