summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-12-24 08:28:31 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-12-24 08:28:31 +0100
commit94087281f14a572c1d58567553514701c100fa08 (patch)
tree5e4410242e914622a8787ef59e063d966eb5c43b
parentde2d4fc91d006a8895839fe2d801a59e0860f485 (diff)
downloaddrakx-94087281f14a572c1d58567553514701c100fa08.tar
drakx-94087281f14a572c1d58567553514701c100fa08.tar.gz
drakx-94087281f14a572c1d58567553514701c100fa08.tar.bz2
drakx-94087281f14a572c1d58567553514701c100fa08.tar.xz
drakx-94087281f14a572c1d58567553514701c100fa08.zip
use mutter instead of matchbox (fix black screen)
also reduce stage2 size by stripping gtk+2 we still have to get some dialog decorations though with mutter...
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/share/list.xml7
-rw-r--r--perl-install/install/steps_gtk.pm2
3 files changed, 4 insertions, 7 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d331ceff3..195d1adb8 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- use mutter instead of matchbox (fix black screen)
+
Version 17.9 - 24 December 2015
- include 60-evdev.rules instead of no more existing 60-keyboard.rules
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index cd79b8429..0b30bd8b1 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -269,8 +269,7 @@
/sbin/mageia-setup-keyboard
- /usr/bin/drakx-matchbox-window-manager
- /usr/share/matchbox/mbnoapp.xpm
+ /usr/bin/mutter
/usr/share/themes/Adwaita/gtk-3.0/gtk.css
@@ -328,10 +327,6 @@
</if>
<from expand="glob">
- <!-- needed by matchbox -->
- <from spaces_in_filename="1">
- /usr/share/themes/Ia Ora*/matchbox/*
- </from>
/usr/LIB/gdk-pixbuf-2.0/*/loaders.cache
/usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-png.so
/usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 999120e91..0bd2352e8 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -46,7 +46,7 @@ sub new($$) {
run_program::run('xset', 'm', '1/8', '1');
}
any::disable_x_screensaver();
- run_program::raw({ detach => 1 }, 'drakx-matchbox-window-manager');
+ run_program::raw({ detach => 1 }, 'mutter');
install::gtk::init_gtk($o);
install::gtk::init_sizes($o);
install::gtk::install_theme($o);