wok rev 21342
cherokee fix build
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Apr 20 15:26:18 2019 +0200 (2019-04-20) |
parents | e44d58e5e7e8 |
children | 26c40b284cf0 |
files | cherokee/receipt icon-naming-utils/receipt linld/stuff/src/JUMP.ASM slitaz-tango-icon/receipt |
line diff
1.1 --- a/cherokee/receipt Sat Apr 20 14:21:52 2019 +0100 1.2 +++ b/cherokee/receipt Sat Apr 20 15:26:18 2019 +0200 1.3 @@ -12,7 +12,8 @@ 1.4 PROVIDE="lighttpd" 1.5 1.6 DEPENDS="pcre cyrus-sasl openssl python libmysqlclient libldap ffmpeg" 1.7 -BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake" 1.8 +BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev \ 1.9 +pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake libtool" 1.10 1.11 # Rules to configure and make the package. 1.12 compile_rules() 1.13 @@ -23,7 +24,7 @@ 1.14 # Use subdirectory for logs 1.15 sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre 1.16 1.17 - autoreconf -v 1.18 + autoreconf -vfi 1.19 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ 1.20 --with-wwwroot=/var/www/cherokee --disable-static \ 1.21 --with-wwwuser=www --with-wwwgroup=www \
2.1 --- a/icon-naming-utils/receipt Sat Apr 20 14:21:52 2019 +0100 2.2 +++ b/icon-naming-utils/receipt Sat Apr 20 15:26:18 2019 +0200 2.3 @@ -7,7 +7,7 @@ 2.4 MAINTAINER="pankso@slitaz.org" 2.5 LICENSE="GPL2" 2.6 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.7 -WEB_SITE="http://tango.freedesktop.org/" 2.8 +WEB_SITE="http://tango-project.org/" 2.9 WGET_URL="http://tango.freedesktop.org/releases/$TARBALL" 2.10 2.11 DEPENDS="perl perl-xml-simple"
3.1 --- a/linld/stuff/src/JUMP.ASM Sat Apr 20 14:21:52 2019 +0100 3.2 +++ b/linld/stuff/src/JUMP.ASM Sat Apr 20 15:26:18 2019 +0200 3.3 @@ -34,28 +34,28 @@ 3.4 ;*************************************************************** 3.5 3.6 macro dos_shutdown 3.7 - xor di,di 3.8 - mov ds,di 3.9 + xor si,si 3.10 + mov ds,si 3.11 ifndef NO386 3.12 - push [dword di+4] ; save step 3.13 - mov [word di+4],offset step19 3.14 + push [dword si+4] ; save step 3.15 + mov [word si+4],offset step19 3.16 else 3.17 mov ax,offset step19 3.18 - xchg ax,[word di+4] 3.19 - push [word di+6] 3.20 + xchg ax,[word si+4] 3.21 + push [word si+6] 3.22 push ax ; save step 3.23 endif 3.24 mov [word cs:sssp],sp 3.25 - ;cmp [byte di+7],0F0h 3.26 + ;cmp [byte si+7],0F0h 3.27 ;jnc notdos 3.28 - mov [di+6],cs 3.29 + mov [si+6],cs 3.30 pushf 3.31 pushf 3.32 pop ax 3.33 inc ah ; set TF 3.34 push ax 3.35 popf 3.36 - call [dword di+4*19h] 3.37 + call [dword si+4*19h] 3.38 notdos: 3.39 ifndef NO386 3.40 lss sp,[dword cs:sssp] 3.41 @@ -65,19 +65,19 @@ 3.42 pop ss 3.43 xchg ax,sp 3.44 endif 3.45 - xor di,di 3.46 - mov ds,di 3.47 - pop [dword di+4] ; restore step 3.48 + xor si,si 3.49 + mov ds,si 3.50 + pop [dword si+4] ; restore step 3.51 endm 3.52 macro step19code 3.53 step19: 3.54 - push di 3.55 + push si 3.56 push ds 3.57 - mov di,sp 3.58 - lds di,[dword ss:di+4] ; read cs:ip 3.59 - cmp [word di],19CDh ; int 19h ? 3.60 + mov si,sp 3.61 + lds si,[dword ss:si+4] ; read cs:ip 3.62 + cmp [word si],19CDh ; int 19h ? 3.63 pop ds 3.64 - pop di 3.65 + pop si 3.66 je notdos 3.67 iret 3.68 endm 3.69 @@ -164,7 +164,7 @@ 3.70 @@isipxe: 3.71 push cs 3.72 call @last_ditch$qv 3.73 - dos_shutdown ; clear di; ds=0 3.74 + dos_shutdown ; clear si; ds=0 3.75 push cs 3.76 pop ds 3.77 @@notzimage: 3.78 @@ -177,7 +177,7 @@ 3.79 jne @@isbzimage 3.80 extrn gdt_data 3.81 mov cx,offset gdt_data+8 3.82 - xor si,si ; A000 -9000 -0800(>movedend) 3.83 + xor di,di ; A000 -9000 -0800(>movedend) 3.84 rep 3.85 movsb 3.86 mov ax,[word _imgs+2+2] ; get pm->fallback high word
4.1 --- a/slitaz-tango-icon/receipt Sat Apr 20 14:21:52 2019 +0100 4.2 +++ b/slitaz-tango-icon/receipt Sat Apr 20 15:26:18 2019 +0200 4.3 @@ -7,7 +7,7 @@ 4.4 MAINTAINER="pankso@slitaz.org" 4.5 LICENSE="GPL3" 4.6 TARBALL="$PACKAGE-$VERSION.tar.gz" 4.7 -WEB_SITE="http://tango.freedesktop.org/" 4.8 +WEB_SITE="http://tango-project.org/" 4.9 WGET_URL="http://download.tuxfamily.org/slitaz/sources/artwok/$TARBALL" 4.10 4.11 # Rules to gen a SliTaz package suitable for Tazpkg.