wok-next rev 13375

Up wine (1.4.1)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Sep 17 14:39:13 2012 +0200 (2012-09-17)
parents 126b68f54ad4
children aab94419c5b6
files wine-dev/receipt wine/receipt wine/stuff/wine-1.2-cdrom.c.u
line diff
     1.1 --- a/wine-dev/receipt	Sun Sep 16 09:09:17 2012 +0200
     1.2 +++ b/wine-dev/receipt	Mon Sep 17 14:39:13 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="wine-dev"
     1.7 -VERSION="1.2.3"
     1.8 +VERSION="1.4.1"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Windows API for Linux development files."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -12,7 +12,7 @@
    1.13  genpkg_rules()
    1.14  {
    1.15  	mkdir -p $fs/usr/lib/wine $fs/usr/share
    1.16 -	cp -a $_pkg/usr/include $fs/usr
    1.17 -	cp -a $_pkg/usr/lib/wine/*.a $fs/usr/lib/wine
    1.18 -	cp -a $_pkg/usr/lib/wine/*.def* $fs/usr/lib/wine		
    1.19 +	cp -a $install/usr/include $fs/usr
    1.20 +	cp -a $install/usr/lib/wine/*.a $fs/usr/lib/wine
    1.21 +	cp -a $install/usr/lib/wine/*.def* $fs/usr/lib/wine		
    1.22  }
     2.1 --- a/wine/receipt	Sun Sep 16 09:09:17 2012 +0200
     2.2 +++ b/wine/receipt	Mon Sep 17 14:39:13 2012 +0200
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="wine"
     2.7 -VERSION="1.2.3"
     2.8 +VERSION="1.4.1"
     2.9  CATEGORY="misc"
    2.10  SHORT_DESC="Windows API for Linux."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12 @@ -19,8 +19,6 @@
    2.13  {
    2.14  	cd $src
    2.15  
    2.16 -	patch -p1 < $stuff/wine-1.2-cdrom.c.u || return 1
    2.17 -
    2.18  	./configure $CONFIGURE_ARGS &&
    2.19  	make $MAKEFLAGS && make install
    2.20  }
    2.21 @@ -29,11 +27,11 @@
    2.22  genpkg_rules()
    2.23  {
    2.24  	mkdir -p $fs/usr/lib/wine $fs/usr/share
    2.25 -	cp -a $_pkg/usr/bin $fs/usr
    2.26 -	cp -a $_pkg/usr/share/wine $fs/usr/share
    2.27 -	cp -a $_pkg/usr/share/applications $fs/usr/share
    2.28 -	cp -a $_pkg/usr/lib/lib* $fs/usr/lib
    2.29 -	cp -a $_pkg/usr/lib/wine/*.so $fs/usr/lib/wine
    2.30 +	cp -a $install/usr/bin $fs/usr
    2.31 +	cp -a $install/usr/share/wine $fs/usr/share
    2.32 +	cp -a $install/usr/share/applications $fs/usr/share
    2.33 +	cp -a $install/usr/lib/lib* $fs/usr/lib
    2.34 +	cp -a $install/usr/lib/wine/*.so $fs/usr/lib/wine
    2.35  }
    2.36  
    2.37  post_install()
     3.1 --- a/wine/stuff/wine-1.2-cdrom.c.u	Sun Sep 16 09:09:17 2012 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,14 +0,0 @@
     3.4 ---- wine-1.2-ori/dlls/ntdll/cdrom.c	Fri Jul 16 17:05:45 2010
     3.5 -+++ wine-1.2/dlls/ntdll/cdrom.c	Sun Aug  1 18:26:30 2010
     3.6 -@@ -2835,6 +2835,11 @@
     3.7 - static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD OutBufferSize)
     3.8 - {
     3.9 - #ifdef HAVE_SG_IO_HDR_T_INTERFACE_ID
    3.10 -+
    3.11 -+#ifndef INQUIRY
    3.12 -+#define INQUIRY 0x12
    3.13 -+#endif
    3.14 -+
    3.15 -     PSCSI_INQUIRY_DATA pInquiryData = NULL;
    3.16 -     UCHAR sense_buffer[32];
    3.17 -     int iochk, version;