summaryrefslogtreecommitdiffstats
path: root/source/xfce
diff options
context:
space:
mode:
Diffstat (limited to 'source/xfce')
-rw-r--r--source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch28
-rw-r--r--source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch25
-rwxr-xr-xsource/xfce/Greybird/Greybird.SlackBuild12
3 files changed, 3 insertions, 62 deletions
diff --git a/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch b/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch
deleted file mode 100644
index 631d059d3..000000000
--- a/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 32a8e4d331fb06f58f0369e8c3422e2efc8ef56e Mon Sep 17 00:00:00 2001
-From: Nico Kaiser <nico.kaiser@boerse-go.de>
-Date: Mon, 27 Apr 2020 18:43:06 +0200
-Subject: [PATCH 1/2] Fix GTK3 dark colors
-
----
- light/gtk-3.0/_colors.scss | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/light/gtk-3.0/_colors.scss b/light/gtk-3.0/_colors.scss
-index d53071c..5d8a4af 100644
---- a/light/gtk-3.0/_colors.scss
-+++ b/light/gtk-3.0/_colors.scss
-@@ -2,9 +2,9 @@
- // it gets @if ed depending on $variant
-
-
--$base_color: if($variant == 'light', #fcfcfc, #292929);
-+$base_color: if($variant == 'light', #fcfcfc, #2d2e30);
- $text_color: if($variant == 'light', #212121, white);
--$bg_color: if($variant == 'light', #cecece, #393f3f);
-+$bg_color: if($variant == 'light', #cecece, #3b3e3f);
- $fg_color: if($variant == 'light', #3c3c3c, #eeeeec);
-
- $selected_fg_color: #ffffff;
---
-2.29.2
-
diff --git a/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch b/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch
deleted file mode 100644
index fbf091c9e..000000000
--- a/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 55c7a77386e440523b4b9bdc27dd4d553f2f8c52 Mon Sep 17 00:00:00 2001
-From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
-Date: Mon, 8 Jun 2020 23:30:11 +0200
-Subject: [PATCH 2/2] Fix Thunar CSD when not focused (Fixes #274)
-
----
- light/gtk-3.0/_xfce.scss | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/light/gtk-3.0/_xfce.scss b/light/gtk-3.0/_xfce.scss
-index 5ea4a2b..6c92174 100644
---- a/light/gtk-3.0/_xfce.scss
-+++ b/light/gtk-3.0/_xfce.scss
-@@ -149,7 +149,7 @@ wnck-pager {
-
- /* Thunar's sidebar top border */
- .thunar {
-- :backdrop { color: $insensitive_fg_color; }
-+ grid :backdrop { color: $insensitive_fg_color; }
- toolbar {
- border-bottom: none;
-
---
-2.29.2
-
diff --git a/source/xfce/Greybird/Greybird.SlackBuild b/source/xfce/Greybird/Greybird.SlackBuild
index 1383c1bcf..939cbb209 100755
--- a/source/xfce/Greybird/Greybird.SlackBuild
+++ b/source/xfce/Greybird/Greybird.SlackBuild
@@ -25,18 +25,16 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=Greybird
-VERSION=${VERSION:-3.22.12}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-ARCH=noarch
-
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
- echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ echo "$PKGNAM-$VERSION-noarch-$BUILD.txz"
exit 0
fi
@@ -78,10 +76,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Include a couple of patches from git:
-zcat $CWD/0001-Fix-GTK3-dark-colors.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch.gz | patch -p1 --verbose || exit 1
-
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
@@ -117,4 +111,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-noarch-$BUILD.txz