Commit 009e1722 authored by Stefano Capitani's avatar Stefano Capitani

dtd workaround for gnome-shell v3.36 and wayland

Signed-off-by: Stefano Capitani's avatarStefano Capitani <stefano@manjaro.org>
parent af5f8d35
......@@ -3,7 +3,7 @@
pkgname=manjaro-system
pkgver=20200323
pkgrel=1
pkgrel=2
pkgdesc="Manjaro Linux System - Update script"
arch=('any')
url="http://www.manjaro.org"
......@@ -11,8 +11,12 @@ license=('GPL')
# groups=('base')
depends=('mkinitcpio>=0.12.0-2' 'linux>=3.4' 'pacman>=5.0' 'coreutils' 'sed' 'awk')
install=manjaro-update-system.sh
source=('fsck.overlay')
sha256sums=('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
source=('fsck.overlay'
'dtd-wayland'
'dtd-wayland.desktop')
sha256sums=('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
'14000890d59c03d761f63b40b83e59b72adff0983f7963eb756e87dd2182305a'
'1e8c6b709d915532f11ba39beedd3a9eebd3dc9658a7c343e20419417e2dbdf7')
pkgver() {
date +%Y%m%d
......@@ -20,4 +24,6 @@ pkgver() {
package() {
install -Dm755 "$srcdir/fsck.overlay" "$pkgdir/usr/bin/fsck.overlay"
install -Dm755 "$srcdir/dtd-wayland" "$pkgdir/usr/bin/dtd-wayland"
install -Dm644 "$srcdir/dtd-wayland.desktop" "$pkgdir /etc/xdg/autostart/dtd-wayland.desktop"
}
#!/bin/bash
# disabling Wayland for Gnome 3.36 (gnome-shell-extension-dash-to-dock >= 67-7)
if [[ "$(pacman -Qq | grep 'gnome-shell-extension-dash-to-dock' -m1)" == "gnome-shell-extension-dash-to-dock" ]] && \
[[ "$(vercmp $(pacman -Q | grep 'gnome-shell-extension-dash-to-dock' -m1 | cut -d' ' -f2) 67-7)" -le 0 ]] && \
[[ $XDG_SESSION_TYPE == wayland ]]; then
sleep 1
gnome-extensions disable dash-to-dock@micxgx.gmail.com
sleep 1
gnome-extensions enable dash-to-dock@micxgx.gmail.com
fi
[Desktop Entry]
Exec=dtd-wayland
Name=dtd-wayland
Comment=Workaround for use dash to dock in wayland and gnome v3.36
Type=Application
Icon=applications-system
StartupNotify=false
X-GNOME-Autostart-enabled=true
......@@ -42,16 +42,6 @@ detectDE()
post_upgrade() {
# disabling Wayland for Gnome 3.36 (gnome-shell-extension-dash-to-dock >= 67-7)
if [[ "$(pacman -Qq | grep 'gnome-shell-extension-dash-to-dock' -m1)" == "gnome-shell-extension-dash-to-dock" ]] && \
[[ "$(vercmp $(pacman -Q | grep 'gnome-shell-extension-dash-to-dock' -m1 | cut -d' ' -f2) 67-7)" -le 0 ]]; then
if [[ -e /etc/gdm/custom.conf ]]; then
msg "disabling Wayland for Gnome 3.36 due to Shell Extensions issues ..."
cp /etc/gdm/custom.conf /etc/gdm/backup-$(date +%F-%H%M%S)-custom.conf
sed -i -e 's,.*WaylandEnable=.*,WaylandEnable=false,' /etc/gdm/custom.conf
fi
fi
# replace gtk3-classic with regular upstream gtk3 unless reinstalled since m-s 20191208-1
if [[ "$(vercmp $2 20191208)" -lt 0 ]] && \
[[ "$(pacman -Qq | grep 'gtk3-classic' -m1)" == "gtk3-classic" ]]; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment