diff options
Diffstat (limited to 'source/xfce')
28 files changed, 252 insertions, 44 deletions
diff --git a/source/xfce/Greybird/0001-Make-CSD-titlebars-slimmer.patch b/source/xfce/Greybird/0001-Make-CSD-titlebars-slimmer.patch new file mode 100644 index 000000000..ec5b54d27 --- /dev/null +++ b/source/xfce/Greybird/0001-Make-CSD-titlebars-slimmer.patch @@ -0,0 +1,115 @@ +From d6a43f7c080487bdde8157c767023a1f8d76a240 Mon Sep 17 00:00:00 2001 +From: Maurizio Galli <maurizio.galli@gmail.com> +Date: Thu, 17 Dec 2020 03:28:42 +0800 +Subject: [PATCH 1/2] Make CSD titlebars slimmer + +--- + light/gtk-3.0/_common.scss | 56 ++++++++++++++++++++++++++++---------- + 1 file changed, 41 insertions(+), 15 deletions(-) + +diff --git a/light/gtk-3.0/_common.scss b/light/gtk-3.0/_common.scss +index ad5f199..fdf1aa0 100644 +--- a/light/gtk-3.0/_common.scss ++++ b/light/gtk-3.0/_common.scss +@@ -1419,7 +1419,7 @@ searchbar, + %titlebar, + headerbar { + padding: 0 5px; +- min-height: 38px; ++ min-height: 32px; + border-width: 0 0 1px; + border-style: solid; + border-color: $borders_color; +@@ -1586,13 +1586,13 @@ headerbar { + } + + &.default-decoration { +- min-height: 28px; ++ min-height: 24px; + padding: 4px; + + button.titlebutton, + menubutton.titlebutton { +- min-height: 26px; +- min-width: 26px; ++ min-height: 22px; ++ min-width: 22px; + margin: 0; + padding: 0; + } +@@ -1621,35 +1621,61 @@ headerbar { + headerbar { + // add vertical margins to common widget on the headerbar to avoid them spanning the whole height + entry, +- spinbutton, +- separator, +- button { ++ separator { + margin-top: 3px; + margin-bottom: 3px; + } ++ spinbutton, ++ button { ++ margin-top: 2px; ++ margin-bottom: 2px; ++ padding-top: 0; ++ padding-bottom: 0; ++ } + button label { + min-width: 28px; +- min-height: 28px; ++ min-height: 22px; + } + button.titlebutton image { + min-width: 22px; + min-height: 22px; + } + button:not(.image-button):not(.titlebutton) image { +- min-width: 28px; +- min-height: 28px; ++ min-width: 22px; ++ min-height: 22px; + } + button.image-button { +- min-width: 28px; +- min-height: 28px; ++ min-width: 22px; ++ min-height: 22px; + padding-left: 2px; + padding-right: 2px; + } ++ .stack-switcher button { ++ min-width: 26px; ++ min-height: 26px; ++ &:not(.text-button) { ++ min-height: 22px; ++ min-width: 22px; ++ padding-left: 0px; ++ padding-right: 0px; ++ } ++ } ++ buttonbox { ++ padding: 0px; ++ button { ++ min-width: 26px; ++ min-height: 26px; ++ &:not(.text-button) { ++ min-width: 22px; ++ padding-left: 0px; ++ padding-right: 0px; ++ } ++ } ++ } + switch { +- margin-top: 9px; +- margin-bottom: 9px; ++ margin-top: 5px; ++ margin-bottom: 5px; + } +- buttonbox { padding: 0px; } + } + + .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar, +-- +2.29.2 + diff --git a/source/xfce/Greybird/0002-Reduce-messagedialog-buttonbox-size.patch b/source/xfce/Greybird/0002-Reduce-messagedialog-buttonbox-size.patch new file mode 100644 index 000000000..6f495cd4c --- /dev/null +++ b/source/xfce/Greybird/0002-Reduce-messagedialog-buttonbox-size.patch @@ -0,0 +1,61 @@ +From ede9f55e3f2ea64248f01801c394e70e85a8f824 Mon Sep 17 00:00:00 2001 +From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> +Date: Fri, 18 Dec 2020 00:33:05 +0100 +Subject: [PATCH 2/2] Reduce messagedialog buttonbox size + +--- + light/gtk-3.0/_common.scss | 36 +++++++++++++++++------------------- + 1 file changed, 17 insertions(+), 19 deletions(-) + +diff --git a/light/gtk-3.0/_common.scss b/light/gtk-3.0/_common.scss +index fdf1aa0..a75c10b 100644 +--- a/light/gtk-3.0/_common.scss ++++ b/light/gtk-3.0/_common.scss +@@ -3776,27 +3776,25 @@ messagedialog { // Message Dialog styling + border-bottom-right-radius: 9px; + } + +- buttonbox { ++ .dialog-action-area { + padding: 0px; +- button { padding: 6px; } +- } +- +- .dialog-action-area button { +- padding: 10px 14px; // labels are not vertically centered on message dialog, this is a workaround +- border-radius: 0; +- border-left-style: solid; +- border-right-style: none; +- border-bottom-style: none; +- +- &:first-child{ +- border-left-style: none; +- border-bottom-left-radius: 7px; +- -gtk-outline-bottom-left-radius: 5px; +- } ++ button { ++ padding: 3px; ++ border-radius: 0px; ++ border-left-style: solid; ++ border-right-style: none; ++ border-bottom-style: none; ++ ++ &:first-child{ ++ border-left-style: none; ++ border-bottom-left-radius: 7px; ++ -gtk-outline-bottom-left-radius: 5px; ++ } + +- &:last-child { +- border-bottom-right-radius: 7px; +- -gtk-outline-bottom-right-radius: 5px; ++ &:last-child { ++ border-bottom-right-radius: 7px; ++ -gtk-outline-bottom-right-radius: 5px; ++ } + } + } + } +-- +2.29.2 + diff --git a/source/xfce/Greybird/Greybird.SlackBuild b/source/xfce/Greybird/Greybird.SlackBuild index 939cbb209..e8e82aa0d 100755 --- a/source/xfce/Greybird/Greybird.SlackBuild +++ b/source/xfce/Greybird/Greybird.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=Greybird VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -76,6 +76,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/0001-Make-CSD-titlebars-slimmer.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/0002-Reduce-messagedialog-buttonbox-size.patch.gz | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/xfce/exo/exo.SlackBuild b/source/xfce/exo/exo.SlackBuild index f87ce2bbf..f41f73f18 100755 --- a/source/xfce/exo/exo.SlackBuild +++ b/source/xfce/exo/exo.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=exo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -133,6 +133,7 @@ cp -a \ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ $PKG/usr/doc/${PKGNAM}-$VERSION +ln -s /usr/share/gtk-doc/html/exo-2/ $PKG/usr/doc/${PKGNAM}-$VERSION/html # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild index 39ea7ce6e..1ef822a08 100755 --- a/source/xfce/garcon/garcon.SlackBuild +++ b/source/xfce/garcon/garcon.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=garcon VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -135,6 +135,7 @@ cp -a \ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ $PKG/usr/doc/${PKGNAM}-$VERSION +ln -s /usr/share/gtk-doc/html/garcon/ $PKG/usr/doc/${PKGNAM}-$VERSION/html # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild index e7b492b6e..1b53941f0 100755 --- a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild +++ b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxfce4ui VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -136,6 +136,7 @@ cp -a \ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ $PKG/usr/doc/${PKGNAM}-$VERSION +ln -s /usr/share/gtk-doc/html/libxfce4ui/ $PKG/usr/doc/${PKGNAM}-$VERSION/html # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/xfce/libxfce4util/libxfce4util.SlackBuild b/source/xfce/libxfce4util/libxfce4util.SlackBuild index 1feb12f5d..a8e9cae9f 100755 --- a/source/xfce/libxfce4util/libxfce4util.SlackBuild +++ b/source/xfce/libxfce4util/libxfce4util.SlackBuild @@ -134,6 +134,7 @@ cp -a \ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ $PKG/usr/doc/${PKGNAM}-$VERSION +ln -s /usr/share/gtk-doc/html/libxfce4util/ $PKG/usr/doc/${PKGNAM}-$VERSION/html # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/xfce/mousepad/mousepad.SlackBuild b/source/xfce/mousepad/mousepad.SlackBuild index 393251b4e..21a9583c8 100755 --- a/source/xfce/mousepad/mousepad.SlackBuild +++ b/source/xfce/mousepad/mousepad.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mousepad VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xfce/thunar-volman/thunar-volman.SlackBuild b/source/xfce/thunar-volman/thunar-volman.SlackBuild index dc0734658..b00f2bf68 100755 --- a/source/xfce/thunar-volman/thunar-volman.SlackBuild +++ b/source/xfce/thunar-volman/thunar-volman.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=thunar-volman VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/xfce/thunar/thunar.SlackBuild b/source/xfce/thunar/thunar.SlackBuild index a0d457936..d63023364 100755 --- a/source/xfce/thunar/thunar.SlackBuild +++ b/source/xfce/thunar/thunar.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=thunar VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -133,6 +133,7 @@ cp -a \ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ $PKG/usr/doc/${PKGNAM}-$VERSION +ln -s /usr/share/gtk-doc/html/thunarx/ $PKG/usr/doc/${PKGNAM}-$VERSION/html # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild index 7659fb893..96ccb5f91 100755 --- a/source/xfce/tumbler/tumbler.SlackBuild +++ b/source/xfce/tumbler/tumbler.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tumbler VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -135,6 +135,7 @@ cp -a \ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ $PKG/usr/doc/${PKGNAM}-$VERSION +ln -s /usr/share/gtk-doc/html/tumbler/ $PKG/usr/doc/${PKGNAM}-$VERSION/html # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild index 0a93dc6c2..cf2fbf970 100755 --- a/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild +++ b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-clipman-plugin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild index df8dda2d8..355616f4d 100755 --- a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild +++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-notifyd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild index d2326d423..7ad0bf495 100755 --- a/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild +++ b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-panel-profiles VERSION=${VERSION:-$(echo xfce4-panel-profiles-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xfce/xfce4-panel/libxfce4panel.max_blinking_count.8.diff b/source/xfce/xfce4-panel/libxfce4panel.max_blinking_count.8.diff deleted file mode 100644 index 3a2df6751..000000000 --- a/source/xfce/xfce4-panel/libxfce4panel.max_blinking_count.8.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- libxfce4panel/xfce-arrow-button.c.old 2013-05-05 17:47:07.000000000 +0200 -+++ libxfce4panel/xfce-arrow-button.c 2013-09-17 10:09:51.162754511 +0200 -@@ -52,7 +52,7 @@ - - - #define ARROW_WIDTH (8) --#define MAX_BLINKING_COUNT (G_MAXUINT) -+#define MAX_BLINKING_COUNT (8) - - enum - { - diff --git a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild index e737f273a..aa9aede6f 100755 --- a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild +++ b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild @@ -134,6 +134,7 @@ cp -a \ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ $PKG/usr/doc/${PKGNAM}-$VERSION +ln -s /usr/share/gtk-doc/html/libxfce4panel-2.0/ $PKG/usr/doc/${PKGNAM}-$VERSION/html # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild index add7f6e47..6290fbbda 100755 --- a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild +++ b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-pulseaudio-plugin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -97,7 +97,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ + --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ diff --git a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild index 80bc42657..c574e5b9b 100755 --- a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild +++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-screensaver VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -144,6 +144,7 @@ fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild index 8b3dc4261..571aeb10a 100755 --- a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild +++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild @@ -84,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ + --sysconfdir=/etc \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --mandir=/usr/man \ --enable-shared=yes \ diff --git a/source/xfce/xfce4-session/xfce4-session.SlackBuild b/source/xfce/xfce4-session/xfce4-session.SlackBuild index 7a3598f3f..05b9ecb83 100755 --- a/source/xfce/xfce4-session/xfce4-session.SlackBuild +++ b/source/xfce/xfce4-session/xfce4-session.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-session VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -100,7 +100,7 @@ make install DESTDIR=$PKG || exit 1 # Don't ship the xscreensaver autostart file: rm -f $PKG/etc/xdg/autostart/xscreensaver.desktop -rmdir --parents $PKG/etc/xdg/autostart/ +rmdir --parent $PKG/etc/xdg/autostart/ # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild index 83918e240..909a8faa5 100755 --- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild +++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-systemload-plugin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -83,7 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ + --sysconfdir=/etc \ --enable-shared=yes \ --enable-static=no \ --enable-debug=no \ diff --git a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild index c3caa83c9..e63d0b6a2 100755 --- a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild +++ b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-taskmanager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -81,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ + --sysconfdir=/etc \ --enable-shared=yes \ --enable-static=no \ --enable-debug=no \ diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild index 61bc620fe..fd8a38f83 100755 --- a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild +++ b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild @@ -82,7 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ + --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild index 073168233..3f170a5a0 100755 --- a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild +++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-weather-plugin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -84,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ + --sysconfdir=/etc \ --enable-shared=yes \ --enable-static=no \ --enable-debug=no \ diff --git a/source/xfce/xfconf/xfconf.SlackBuild b/source/xfce/xfconf/xfconf.SlackBuild index e99817e67..ef41991db 100755 --- a/source/xfce/xfconf/xfconf.SlackBuild +++ b/source/xfce/xfconf/xfconf.SlackBuild @@ -132,6 +132,7 @@ cp -a \ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ $PKG/usr/doc/${PKGNAM}-$VERSION +ln -s /usr/share/gtk-doc/html/xfconf/ $PKG/usr/doc/${PKGNAM}-$VERSION/html # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch b/source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch new file mode 100644 index 000000000..200432b31 --- /dev/null +++ b/source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch @@ -0,0 +1,36 @@ +From 56d273ee48fffc7fed67ec7b22afd8e4b1c23c6e Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <fourdan@xfce.org> +Date: Fri, 25 Dec 2020 18:39:52 +0100 +Subject: [PATCH] compositor: Ignore XError when changing background picture + +If xfwm4 is compiled with support for the root pixmap in the compositor, +changing the background image may cause an XError if the external pixmap +is already freed. + +Guard against such XError. + +Signed-off-by: Olivier Fourdan <fourdan@xfce.org> +Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/476 +--- + src/compositor.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/compositor.c b/src/compositor.c +index 9c5ceb454..8ff0dad42 100644 +--- a/src/compositor.c ++++ b/src/compositor.c +@@ -3774,8 +3774,11 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev) + ScreenInfo *screen_info = myDisplayGetScreenFromRoot (display_info, ev->window); + if ((screen_info) && (screen_info->compositor_active) && (screen_info->rootTile)) + { ++ myDisplayErrorTrapPush (display_info); + XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE); + XRenderFreePicture (display_info->dpy, screen_info->rootTile); ++ myDisplayErrorTrapPopIgnored (display_info); ++ + screen_info->rootTile = None; + damage_screen (screen_info); + +-- +2.29.2 + diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild index bb5fd18f9..6a5b3b67e 100755 --- a/source/xfce/xfwm4/xfwm4.SlackBuild +++ b/source/xfce/xfwm4/xfwm4.SlackBuild @@ -80,6 +80,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix Issue 476 +zcat $CWD/0001-compositor-Ignore-XError-when-changing-background-pi.patch.gz | patch -p1 --verbose || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xfce/xfwm4/xinitrc.xfce b/source/xfce/xfwm4/xinitrc.xfce index 82c0dd409..4665547a3 100644 --- a/source/xfce/xfwm4/xinitrc.xfce +++ b/source/xfce/xfwm4/xinitrc.xfce @@ -1,7 +1,4 @@ #!/bin/sh -# xinitrc.xfce - modified to work around xfce4session bug -# https://bugzilla.xfce.org/show_bug.cgi?id=8841 - ######################################################################## ## Merge in defaults and keymaps ## @@ -32,9 +29,5 @@ fi ## Start xfce Desktop Environment ## ######################################################################## -if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - exec ck-launch-session dbus-launch --exit-with-session /usr/bin/startxfce4 -else - exec dbus-launch --exit-with-session /usr/bin/startxfce4 -fi +exec /usr/bin/startxfce4 |