wok-6.x rev 19179
sc-im: fix build
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Jun 04 10:10:15 2016 +0200 (2016-06-04) |
parents | 2ffe75bd99f7 |
children | 1d8128c6e726 |
files | memtest/stuff/memtest86+-5.01-setup.patch sc-im/receipt |
line diff
1.1 --- a/memtest/stuff/memtest86+-5.01-setup.patch Fri Jun 03 21:06:09 2016 +0100 1.2 +++ b/memtest/stuff/memtest86+-5.01-setup.patch Sat Jun 04 10:10:15 2016 +0200 1.3 @@ -13,6 +13,25 @@ 1.4 push %cs 1.5 pop %ds 1.6 lidt idt_48 - start # load idt with 0,0 1.7 +@@ -50,13 +49,13 @@ 1.8 + jz alt_a20_done 1.9 + 1.10 + /* set or clear bit1, the ALT_A20_GATE bit */ 1.11 +- movb 4(%esp), %ah 1.12 +- testb %ah, %ah 1.13 +- jz alt_a20_cont1 1.14 ++ //movb 4(%esp), %ah 1.15 ++ //testb %ah, %ah 1.16 ++ //jz alt_a20_cont1 1.17 + orb $2, %al 1.18 +- jmp alt_a20_cont2 1.19 ++ //jmp alt_a20_cont2 1.20 + alt_a20_cont1: 1.21 +- and $0xfd, %al 1.22 ++ //and $0xfd, %al 1.23 + 1.24 + /* clear the INIT_NOW bit; don't accidently reset the machine */ 1.25 + alt_a20_cont2: 1.26 @@ -87,8 +86,8 @@ 1.27 movw $KERNEL_DS, %ax 1.28 movw %ax, %ds
2.1 --- a/sc-im/receipt Fri Jun 03 21:06:09 2016 +0100 2.2 +++ b/sc-im/receipt Sat Jun 04 10:10:15 2016 +0200 2.3 @@ -5,7 +5,7 @@ 2.4 CATEGORY="office" 2.5 SHORT_DESC="Spreadsheet Calculator Improvised." 2.6 MAINTAINER="paul@slitaz.org" 2.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 2.8 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.9 WEB_SITE="https://github.com/andmarti1424/sc-im" 2.10 WGET_URL="git|git://github.com/andmarti1424/sc-im" 2.11 2.12 @@ -16,7 +16,7 @@ 2.13 compile_rules() 2.14 { 2.15 cd $src/src 2.16 - export LDFLAGS="-Wl,--copy-dt-needed-entries" 2.17 + sed -i 's|ncursesw/curses|curses|' *.c *.h 2.18 make -j1 2.19 make DESTDIR=$DESTDIR install 2.20 }