diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-11-20 22:31:45 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-11-20 23:26:51 +0100 |
| commit | 5d92deb02d6980b5aa264d0b59d4b289d49cf099 (patch) | |
| tree | 94019d52179b5e027187aed6480a17c65eecc27f | |
| parent | a2fb82c97414795f71f1e6fbfebebbb141edc5d9 (diff) | |
| download | drakx-5d92deb02d6980b5aa264d0b59d4b289d49cf099.tar drakx-5d92deb02d6980b5aa264d0b59d4b289d49cf099.tar.gz drakx-5d92deb02d6980b5aa264d0b59d4b289d49cf099.tar.bz2 drakx-5d92deb02d6980b5aa264d0b59d4b289d49cf099.tar.xz drakx-5d92deb02d6980b5aa264d0b59d4b289d49cf099.zip | |
use scrot instead of fb2png (mga#19810)
rationale: fb2png only work with the 'fbdev' driver and thus doesn't
work at all when fallbacking to the 'vesa' driver
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/share/list.xml | 9 |
3 files changed, 12 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index c372c533c..7adad78c2 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- screenshots: + o use scrot instead of fb2png as the later doesn't work with vesa (mga#19810) + Version 17.60 - 15 November 2016 - partitioning: diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 90e5cae86..8eb0d91a1 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -1555,7 +1555,7 @@ sub take_screenshot { } my $nb = 1; $nb++ while -e "$dir/$nb.png"; - run_program::run('fb2png', '-p', "$dir/$nb.png"); + run_program::run('scrot', "$dir/$nb.png"); # help doesn't remember warning has been shown (one shot processes): $warned ||= -e "$dir/2.png"; diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 62972992b..6398dd86a 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -43,7 +43,7 @@ xset xkbcomp setxkbmap - fb2png + scrot perl monitor-edid <if ARCH="i.86|x86_64"> @@ -98,6 +98,13 @@ webkit2gtk-4.0/WebKitWebProcess </from> +<from dir="/usr/LIB/imlib2/loaders"> <!-- for scrot/giblib --> + argb.so + jpeg.so + png.so + zlib.so +</from> + <!-- needed by Gtk3 introspection --> <from dir="/usr/LIB/girepository-1.0"> Atk-1.0.typelib |