wok-next rev 19446
dillo: add stuff/fltk-1.3.3.u
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Oct 15 18:21:21 2016 +0200 (2016-10-15) |
parents | 3aff5e562b09 |
children | e1759a3c14ec |
files | dillo/receipt dillo/stuff/fltk-1.3.3.u qemu-x86_64/receipt qemu/receipt |
line diff
1.1 --- a/dillo/receipt Fri Oct 14 21:20:04 2016 +0200 1.2 +++ b/dillo/receipt Sat Oct 15 18:21:21 2016 +0200 1.3 @@ -18,6 +18,7 @@ 1.4 # Rules to configure and make the package. 1.5 compile_rules() 1.6 { 1.7 + patch -p0 < $stuff/fltk-1.3.3.u 1.8 cp -f $stuff/pixmaps.slitaz.h src/pixmaps.h && 1.9 ./configure \ 1.10 --sysconfdir=/etc \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/dillo/stuff/fltk-1.3.3.u Sat Oct 15 18:21:21 2016 +0200 2.3 @@ -0,0 +1,22 @@ 2.4 +--- dw/fltkviewbase.cc 2.5 ++++ dw/fltkviewbase.cc 2.6 +@@ -27,8 +27,6 @@ 2.7 + #include <stdio.h> 2.8 + #include "../lout/msg.h" 2.9 + 2.10 +-extern Fl_Widget* fl_oldfocus; 2.11 +- 2.12 + using namespace lout::object; 2.13 + using namespace lout::container::typed; 2.14 + 2.15 +@@ -364,7 +362,9 @@ 2.16 + } 2.17 + return 1; 2.18 + case FL_UNFOCUS: 2.19 +- focused_child = fl_oldfocus; 2.20 ++ //focused_child = fl_oldfocus; 2.21 ++ for (Fl_Widget *p = this; p; p = p->parent()) 2.22 ++ focused_child = p; 2.23 + return 0; 2.24 + case FL_KEYBOARD: 2.25 + if (Fl::event_key() == FL_Tab)
3.1 --- a/qemu-x86_64/receipt Fri Oct 14 21:20:04 2016 +0200 3.2 +++ b/qemu-x86_64/receipt Sat Oct 15 18:21:21 2016 +0200 3.3 @@ -7,6 +7,8 @@ 3.4 MAINTAINER="erjo@slitaz.org" 3.5 LICENSE="GPL2" 3.6 WEB_SITE="http://qemu.org" 3.7 +UEFIZIP="OVMF-X64-r15214.zip" 3.8 +EXTRA_SOURCE_FILES="$UEFIZIP" 3.9 TAGS="virtualization" 3.10 WANTED="qemu" 3.11 3.12 @@ -15,8 +17,11 @@ 3.13 # Rules to gen a SliTaz package suitable for Tazpkg. 3.14 genpkg_rules() 3.15 { 3.16 - mkdir -p $fs/usr/bin $fs/etc 3.17 + mkdir -p $fs/usr/bin $fs/usr/share/qemu/x64 $fs/etc 3.18 cp -a $install/etc/qemu $fs/etc 3.19 cp -a $install/usr/bin/qemu-*${PACKAGE#qemu-} $fs/usr/bin 3.20 cd $fs/usr/bin && ln -s qemu-system-${PACKAGE#qemu-} $PACKAGE 3.21 + [ -s $SOURCES_REPOSITORY/$UEFIZIP ] || wget -P $SOURCES_REPOSITORY \ 3.22 + http://netassist.dl.sourceforge.net/project/edk2/OVMF/$UEFIZIP 3.23 + unzip $SOURCES_REPOSITORY/$UEFIZIP OVMF.fd -d $fs/usr/share/qemu/x64 3.24 }
4.1 --- a/qemu/receipt Fri Oct 14 21:20:04 2016 +0200 4.2 +++ b/qemu/receipt Sat Oct 15 18:21:21 2016 +0200 4.3 @@ -9,6 +9,8 @@ 4.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 4.5 WEB_SITE="http://qemu.org" 4.6 WGET_URL="http://wiki.qemu.org/download/$TARBALL" 4.7 +UEFIZIP="OVMF-IA32-r15214.zip" 4.8 +EXTRA_SOURCE_FILES="$UEFIZIP" 4.9 TAGS="virtualization emulator" 4.10 4.11 DEPENDS="alsa-lib gnutls libsdl bluez libtasn1 libsasl vde2 libcurl ncurses \ 4.12 @@ -20,6 +22,12 @@ 4.13 # Rules to configure and make the package. 4.14 compile_rules() 4.15 { 4.16 + mkdir -p $DESTIDR/usr/share/qemu/ia32 4.17 + 4.18 + [ -s $SOURCES_REPOSITORY/$UEFIZIP ] || wget -P $SOURCES_REPOSITORY \ 4.19 + http://netassist.dl.sourceforge.net/project/edk2/OVMF/$UEFIZIP 4.20 + unzip $SOURCES_REPOSITORY/$UEFIZIP OVMF.fd -d $DESTIDR/usr/share/qemu/ia32 4.21 + 4.22 patch -p0 < $stuff/cloop.u 4.23 4.24 TARGET="i386-softmmu, x86_64-softmmu, \