Arch Linux

soupcan

Member

From: ?

Registered: 2008-10-25

Posts: 268

Patching wine in ABS, x86-64

Hi all, I'm trying to apply a patch to wine to see if it fixes a problem I'm having with Stalker: SOC. I ran makepkg -o in ~/abs/wine, then I downloaded the patch from here named it ttffix.patch, and placed it into ~/abs/wine. Next I edited the source line of the PKGBUILD to include ttffix.patch. I added the md5sum of ttffix.patch to the md5sum line, and added patch -p0 -i  $srcdir/ttffix.patch to the build() section. However, attempting to build this package results in the following output:

can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
|index 4823750..51a674b 100644
|--- a/dlls/wined3d/shader.c
|+++ b/dlls/wined3d/shader.c
--------------------------
File to patch: 

I'm not sure what I'm doing wrong, experimenting with the location of ttffix.patch and the value after -p in the patch command hasn't helped. Any help would be appreciated.
Here is my edited PKGBUILD: http://pastebin.com/5LyQkVG1

brebs

Member

Registered: 2007-04-03

Posts: 3,742

Re: Patching wine in ABS, x86-64

Should be -p1, to cut off the "a" and "b" leading dirs. Then, you need to be in the directory that has a subdir "dlls".

soupcan

Member

From: ?

Registered: 2008-10-25

Posts: 268

Re: Patching wine in ABS, x86-64

I changed the cd command in the build() function to the following:

cd "${srcdir}"/${pkgname}-${pkgver}

which I think should be right, as the "dlls" directory is in "wine-1.3.35". It starts to patch, however, the build fails with

mv: cannot stat `wine-1.3.35': No such file or directory

.

soupcan

Member

From: ?

Registered: 2008-10-25

Posts: 268

Re: Patching wine in ABS, x86-64

I resolved the "No such directory" error by changing the build function to the following:

build() {
  cd "$srcdir"/wine-1.3.35

  patch -p1 < ttffix.patch 

  cd "$srcdir"

The build no longer fails, but I'm still not sure the patch is applying correctly.