# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1347885553 -7200
# Node ID 4493a1991b1446652c399e0c8f30a50764b62b25
# Parent  126b68f54ad4aec99d440ae2de7a334a28095dda
Up wine (1.4.1)

diff -r 126b68f54ad4 -r 4493a1991b14 wine-dev/receipt
--- a/wine-dev/receipt	Sun Sep 16 09:09:17 2012 +0200
+++ b/wine-dev/receipt	Mon Sep 17 14:39:13 2012 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="wine-dev"
-VERSION="1.2.3"
+VERSION="1.4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Windows API for Linux development files."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -12,7 +12,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/wine $fs/usr/share
-	cp -a $_pkg/usr/include $fs/usr
-	cp -a $_pkg/usr/lib/wine/*.a $fs/usr/lib/wine
-	cp -a $_pkg/usr/lib/wine/*.def* $fs/usr/lib/wine		
+	cp -a $install/usr/include $fs/usr
+	cp -a $install/usr/lib/wine/*.a $fs/usr/lib/wine
+	cp -a $install/usr/lib/wine/*.def* $fs/usr/lib/wine		
 }
diff -r 126b68f54ad4 -r 4493a1991b14 wine/receipt
--- a/wine/receipt	Sun Sep 16 09:09:17 2012 +0200
+++ b/wine/receipt	Mon Sep 17 14:39:13 2012 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="wine"
-VERSION="1.2.3"
+VERSION="1.4.1"
 CATEGORY="misc"
 SHORT_DESC="Windows API for Linux."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -19,8 +19,6 @@
 {
 	cd $src
 
-	patch -p1 < $stuff/wine-1.2-cdrom.c.u || return 1
-
 	./configure $CONFIGURE_ARGS &&
 	make $MAKEFLAGS && make install
 }
@@ -29,11 +27,11 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/wine $fs/usr/share
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/share/wine $fs/usr/share
-	cp -a $_pkg/usr/share/applications $fs/usr/share
-	cp -a $_pkg/usr/lib/lib* $fs/usr/lib
-	cp -a $_pkg/usr/lib/wine/*.so $fs/usr/lib/wine
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/share/wine $fs/usr/share
+	cp -a $install/usr/share/applications $fs/usr/share
+	cp -a $install/usr/lib/lib* $fs/usr/lib
+	cp -a $install/usr/lib/wine/*.so $fs/usr/lib/wine
 }
 
 post_install()
diff -r 126b68f54ad4 -r 4493a1991b14 wine/stuff/wine-1.2-cdrom.c.u
--- a/wine/stuff/wine-1.2-cdrom.c.u	Sun Sep 16 09:09:17 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- wine-1.2-ori/dlls/ntdll/cdrom.c	Fri Jul 16 17:05:45 2010
-+++ wine-1.2/dlls/ntdll/cdrom.c	Sun Aug  1 18:26:30 2010
-@@ -2835,6 +2835,11 @@
- static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD OutBufferSize)
- {
- #ifdef HAVE_SG_IO_HDR_T_INTERFACE_ID
-+
-+#ifndef INQUIRY
-+#define INQUIRY 0x12
-+#endif
-+
-     PSCSI_INQUIRY_DATA pInquiryData = NULL;
-     UCHAR sense_buffer[32];
-     int iochk, version;