Broken patches since 0.9.45 (problem with missing binary files)

[Victor]

Hello!
It looks like last two patches - wine-0.9.45.diff.bz2 and wine-0.9.46-diff.bz2 
are broken. It is not possible to compile wine-0.9.45 (if sources were 
created by patching 0.9.44 with wine-0.9.45.diff.bz2) due to missing 
notepad.ico :) :
---
make[2]: Leaving directory `/home/erv/distr/wine/wine-0.9.45/programs/net'
make[2]: Entering directory 
`/home/erv/distr/wine/wine-0.9.45/programs/notepad'
../../tools/makedep -C. -S../.. -T../.. -I../../include/msvcrt dialog.c main.c  
rsrc.rc
notepad.ico: No such file or directory
  notepad.ico was first included from rsrc.rc:47
make[2]: [Makefile] Error 1 (ignored)
../../tools/makedep -C. -S../.. -T../.. -I../../include/msvcrt dialog.c main.c  
rsrc.rc
notepad.ico: No such file or directory
  notepad.ico was first included from rsrc.rc:47
make[2]: *** [depend] Error 1
make[2]: Leaving directory `/home/erv/distr/wine/wine-0.9.45/programs/notepad'
make[1]: *** [notepad/__depend__] Error 2
make[1]: Leaving directory `/home/erv/distr/wine/wine-0.9.45/programs'
make: *** [programs/__depend__] Error 2

Compilation failed, aborting install.
---

 and it isn't possible to compile wine-0.9.46 (created by patching complete 
0.9.45 sources with wine-0.9.46.diff.bz2) due to missing c1.bmp in cards.dll:
---
make[2]: Leaving directory `/home/erv/distr/wine/wine-0.9.46/dlls/capi2032'
make[2]: Entering directory `/home/erv/distr/wine/wine-0.9.46/dlls/cards'
../../tools/makedep -C. -S../.. -T../..  cards.c  cards.rc
c1.bmp: No such file or directory
  c1.bmp was first included from cards.rc:23
make[2]: [Makefile] Error 1 (ignored)
../../tools/makedep -C. -S../.. -T../..  cards.c  cards.rc
c1.bmp: No such file or directory
  c1.bmp was first included from cards.rc:23
make[2]: *** [depend] Error 1
make[2]: Leaving directory `/home/erv/distr/wine/wine-0.9.46/dlls/cards'
make[1]: *** [cards/__depend__] Error 2
make[1]: Leaving directory `/home/erv/distr/wine/wine-0.9.46/dlls'
make: *** [dlls/__depend__] Error 2

Compilation failed, aborting install.
---

And here is a script I've been using to unpack patches (it should be placed in 
dir containing wine-0.9.30.tar.bz2 and patches (0.9.31, 0.9.32, etc) in 
*.diff.bz2 format :
---
#!/bin/sh
echo unpacking wine
BUILD=30
BASE=$BUILD
WINE='wine-0.9'
tar -xvvjf $WINE.$BUILD.tar.bz2 && cd $WINE
BUILD=$(($BUILD+1))
cd "$WINE.$BASE"
while [ -f ../$WINE.$BUILD.diff.bz2 ]; do
	echo $WINE.$BUILD
	bzcat ../$WINE.$BUILD.diff.bz2|patch -p1 &&
	BUILD=$(($BUILD+1))
done
cd ..
mv $WINE.$BASE $WINE.$(($BUILD-1))
---

Can someone fix this problem? (It looks like problem is related to binary 
files) It would be great if both patches were fixed and re-uploaded.

Thanks.
-- 
Victor Eremin (ErV2005(a)rambler.ru)

[Alexandre Julliard]

Victor <ErV2005(a)rambler.ru> writes:
> Can someone fix this problem? (It looks like problem is related to binary 
> files) It would be great if both patches were fixed and re-uploaded.

The patches are fine, but they are in git format, so you need to use
git-apply instead of patch to apply the binary changes properly.

-- 
Alexandre Julliard
julliard(a)winehq.org

[Victor]

On Saturday 29 September 2007 17:36:37 you wrote:
> The patches are fine, but they are in git format, so you need to use
> git-apply instead of patch to apply the binary changes properly.
> Thanks for your reply. I've fixed the script, now everything works without 
> problems.

Sorry for the "false alarm".

-- 
With best regards, Victor Eremin (ErV2005(a)rambler.ru)