Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 325655 - app-emulation/wine-1.2_rc5: pulseaudio patch doesn't apply
Summary: app-emulation/wine-1.2_rc5: pulseaudio patch doesn't apply
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Wine Maintainers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-06-26 05:41 UTC by Nikos Chantziaras
Modified: 2010-06-29 06:33 UTC (History)
14 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Trivial changes to patch (winepulse-0.37-winecfg.patch_hacked,12.76 KB, patch)
2010-06-26 15:51 UTC, Robert Coffree
Details | Diff
valid patch (winepulse-0.37-winecfg.patch,12.70 KB, text/plain)
2010-06-27 12:42 UTC, B@RT
Details
Here's a less hacked patch which seems to apply okay (winepulse-0.37-winecfg-1.2-rc5.patch,12.78 KB, patch)
2010-06-28 17:54 UTC, Ian Abbott
Details | Diff
Same as my previous patch but renamed. (winepulse-0.37-winecfg-1.2_rc5.patch,12.78 KB, patch)
2010-06-28 17:58 UTC, Ian Abbott
Details | Diff
Ebuild patch to use winepulse-0.37-winecfg-1.2_rc5.patch (wine-1.2_rc5-ebuild-pulseaudio.patch,765 bytes, patch)
2010-06-28 18:00 UTC, Ian Abbott
Details | Diff
new ebuild with winepulse-0.38-winecfg.patch (wine-1.2_rc5.ebuild,4.84 KB, text/plain)
2010-06-29 05:25 UTC, Andreas Mielke
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Nikos Chantziaras 2010-06-26 05:41:53 UTC
+++ This bug was initially created as a clone of Bug #324817 +++

'emerge wine' fails with:
...
 * Failed Patch: winepulse-0.37-winecfg.patch !
 *  ( /var/tmp/portage/app-emulation/wine-1.2_rc5/distdir/winepulse-0.37-winecfg.patch )

In bug 324817, SpanKY commented:

"you want reliability, dont USE=pulseaudio"

This has nothing to do with reliability.  It has to do with portage containing an ebuild that is known to be unable to emerge. This should never happen.  Either the pulse USE should be masked or completely removed and added again when upstream has rebased the patch (so that an emerge -uN will pick up the USE flag change and trigger a rebuild.)

I assume this is common sense.
Comment 1 Robert Coffree 2010-06-26 15:50:02 UTC
I understand your frustration, but sometimes comments are taken out of context for whatever reasons.

Anyhow, this patch appears to be taken from some 3rd party site (http://art.ified.ca/) and this would seem to be the source of the problem?
Comment 2 Robert Coffree 2010-06-26 15:51:46 UTC
Created attachment 236643 [details, diff]
Trivial changes to patch 

2 line number changes was about the only thing I found, in two files. programs/.../audio.c and programs/..../Ko.rc
Comment 3 Tom Flair 2010-06-27 00:19:55 UTC
(In reply to comment #2)
> Created an attachment (id=236643) [details]
> Trivial changes to patch 
> 
> 2 line number changes was about the only thing I found, in two files.
> programs/.../audio.c and programs/..../Ko.rc
> 

This doesn't seem to work for me.  The build keeps crashing at the same point each time.  Building with -pulseaudio (and without applying the patch obviously) works fine.
Comment 4 L. Axton Malsbury 2010-06-27 03:18:26 UTC
(In reply to comment #2)
> Created an attachment (id=236643) [details]
> Trivial changes to patch 
> 
> 2 line number changes was about the only thing I found, in two files.
> programs/.../audio.c and programs/..../Ko.rc
> 

LD_LIBRARY_PATH="../../libs/wine:$LD_LIBRARY_PATH" ../../tools/wrc/wrc --nostdinc -I. -I. -I../../include -I../../include  -DWINE_STRICT_PROTOTYPES   -foKo.res Ko.rc
Ko.rc:285:41: Error: Invalid character in string 'PulseAudio ��������' for codepage 65001
make[1]: *** [Ko.res] Error 1
make[1]: Leaving directory `/var/tmp/portage/app-emulation/wine-1.2_rc5/work/wine-1.2-rc5/programs/winecfg'
make: *** [programs/winecfg] Error 2
Comment 5 tman 2010-06-27 04:24:26 UTC
i can confirm this too
Comment 6 B@RT 2010-06-27 12:42:49 UTC
Created attachment 236727 [details]
valid patch

during the installation of wine, after checking the files to put this patch in the folder disfiles
Comment 7 Fitzcarraldo 2010-06-27 19:35:17 UTC
(In reply to comment #6)
> Created an attachment (id=236727) [details]
> valid patch
> 
> during the installation of wine, after checking the files to put this patch in
> the folder disfiles
> 

Still fails in my case. Here are the contents of /var/tmp/portage/app-emulation/wine-1.2_rc5/temp/winepulse-0.37-winecfg.patch.out

***** winepulse-0.37-winecfg.patch *****

========================================

PATCH COMMAND:  patch -p0 -p1 < '/var/tmp/portage/app-emulation/wine-1.2_rc5/distdir/winepulse-0.37-winecfg.patch'

========================================
patching file programs/winecfg/Bg.rc
patching file programs/winecfg/Cs.rc
patching file programs/winecfg/Da.rc
patching file programs/winecfg/De.rc
patching file programs/winecfg/En.rc
patching file programs/winecfg/Es.rc
patching file programs/winecfg/Fi.rc
patching file programs/winecfg/Fr.rc
patching file programs/winecfg/Hu.rc
patching file programs/winecfg/It.rc
patching file programs/winecfg/Ja.rc
patching file programs/winecfg/Ko.rc
Hunk #1 FAILED at 281.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/Ko.rc.rej
patching file programs/winecfg/Lt.rc
patching file programs/winecfg/Nl.rc
patching file programs/winecfg/No.rc
patching file programs/winecfg/Pl.rc
patching file programs/winecfg/Pt.rc
Hunk #1 succeeded at 611 (offset 151 lines).
patching file programs/winecfg/Ro.rc
patching file programs/winecfg/Ru.rc
patching file programs/winecfg/Si.rc
patching file programs/winecfg/Sv.rc
patching file programs/winecfg/Tr.rc
patching file programs/winecfg/Zh.rc
patching file programs/winecfg/audio.c
Hunk #1 FAILED at 89.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/audio.c.rej
patching file programs/winecfg/libraries.c
patching file programs/winecfg/resource.h
========================================

PATCH COMMAND:  patch -p1 -p1 < '/var/tmp/portage/app-emulation/wine-1.2_rc5/distdir/winepulse-0.37-winecfg.patch'

========================================
patching file programs/winecfg/Bg.rc
patching file programs/winecfg/Cs.rc
patching file programs/winecfg/Da.rc
patching file programs/winecfg/De.rc
patching file programs/winecfg/En.rc
patching file programs/winecfg/Es.rc
patching file programs/winecfg/Fi.rc
patching file programs/winecfg/Fr.rc
patching file programs/winecfg/Hu.rc
patching file programs/winecfg/It.rc
patching file programs/winecfg/Ja.rc
patching file programs/winecfg/Ko.rc
Hunk #1 FAILED at 281.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/Ko.rc.rej
patching file programs/winecfg/Lt.rc
patching file programs/winecfg/Nl.rc
patching file programs/winecfg/No.rc
patching file programs/winecfg/Pl.rc
patching file programs/winecfg/Pt.rc
Hunk #1 succeeded at 611 (offset 151 lines).
patching file programs/winecfg/Ro.rc
patching file programs/winecfg/Ru.rc
patching file programs/winecfg/Si.rc
patching file programs/winecfg/Sv.rc
patching file programs/winecfg/Tr.rc
patching file programs/winecfg/Zh.rc
patching file programs/winecfg/audio.c
Hunk #1 FAILED at 89.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/audio.c.rej
patching file programs/winecfg/libraries.c
patching file programs/winecfg/resource.h
========================================

PATCH COMMAND:  patch -p2 -p1 < '/var/tmp/portage/app-emulation/wine-1.2_rc5/distdir/winepulse-0.37-winecfg.patch'

========================================
patching file programs/winecfg/Bg.rc
patching file programs/winecfg/Cs.rc
patching file programs/winecfg/Da.rc
patching file programs/winecfg/De.rc
patching file programs/winecfg/En.rc
patching file programs/winecfg/Es.rc
patching file programs/winecfg/Fi.rc
patching file programs/winecfg/Fr.rc
patching file programs/winecfg/Hu.rc
patching file programs/winecfg/It.rc
patching file programs/winecfg/Ja.rc
patching file programs/winecfg/Ko.rc
Hunk #1 FAILED at 281.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/Ko.rc.rej
patching file programs/winecfg/Lt.rc
patching file programs/winecfg/Nl.rc
patching file programs/winecfg/No.rc
patching file programs/winecfg/Pl.rc
patching file programs/winecfg/Pt.rc
Hunk #1 succeeded at 611 (offset 151 lines).
patching file programs/winecfg/Ro.rc
patching file programs/winecfg/Ru.rc
patching file programs/winecfg/Si.rc
patching file programs/winecfg/Sv.rc
patching file programs/winecfg/Tr.rc
patching file programs/winecfg/Zh.rc
patching file programs/winecfg/audio.c
Hunk #1 FAILED at 89.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/audio.c.rej
patching file programs/winecfg/libraries.c
patching file programs/winecfg/resource.h
========================================

PATCH COMMAND:  patch -p3 -p1 < '/var/tmp/portage/app-emulation/wine-1.2_rc5/distdir/winepulse-0.37-winecfg.patch'

========================================
patching file programs/winecfg/Bg.rc
patching file programs/winecfg/Cs.rc
patching file programs/winecfg/Da.rc
patching file programs/winecfg/De.rc
patching file programs/winecfg/En.rc
patching file programs/winecfg/Es.rc
patching file programs/winecfg/Fi.rc
patching file programs/winecfg/Fr.rc
patching file programs/winecfg/Hu.rc
patching file programs/winecfg/It.rc
patching file programs/winecfg/Ja.rc
patching file programs/winecfg/Ko.rc
Hunk #1 FAILED at 281.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/Ko.rc.rej
patching file programs/winecfg/Lt.rc
patching file programs/winecfg/Nl.rc
patching file programs/winecfg/No.rc
patching file programs/winecfg/Pl.rc
patching file programs/winecfg/Pt.rc
Hunk #1 succeeded at 611 (offset 151 lines).
patching file programs/winecfg/Ro.rc
patching file programs/winecfg/Ru.rc
patching file programs/winecfg/Si.rc
patching file programs/winecfg/Sv.rc
patching file programs/winecfg/Tr.rc
patching file programs/winecfg/Zh.rc
patching file programs/winecfg/audio.c
Hunk #1 FAILED at 89.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/audio.c.rej
patching file programs/winecfg/libraries.c
patching file programs/winecfg/resource.h
========================================

PATCH COMMAND:  patch -p4 -p1 < '/var/tmp/portage/app-emulation/wine-1.2_rc5/distdir/winepulse-0.37-winecfg.patch'

========================================
patching file programs/winecfg/Bg.rc
patching file programs/winecfg/Cs.rc
patching file programs/winecfg/Da.rc
patching file programs/winecfg/De.rc
patching file programs/winecfg/En.rc
patching file programs/winecfg/Es.rc
patching file programs/winecfg/Fi.rc
patching file programs/winecfg/Fr.rc
patching file programs/winecfg/Hu.rc
patching file programs/winecfg/It.rc
patching file programs/winecfg/Ja.rc
patching file programs/winecfg/Ko.rc
Hunk #1 FAILED at 281.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/Ko.rc.rej
patching file programs/winecfg/Lt.rc
patching file programs/winecfg/Nl.rc
patching file programs/winecfg/No.rc
patching file programs/winecfg/Pl.rc
patching file programs/winecfg/Pt.rc
Hunk #1 succeeded at 611 (offset 151 lines).
patching file programs/winecfg/Ro.rc
patching file programs/winecfg/Ru.rc
patching file programs/winecfg/Si.rc
patching file programs/winecfg/Sv.rc
patching file programs/winecfg/Tr.rc
patching file programs/winecfg/Zh.rc
patching file programs/winecfg/audio.c
Hunk #1 FAILED at 89.
1 out of 1 hunk FAILED -- saving rejects to file programs/winecfg/audio.c.rej
patching file programs/winecfg/libraries.c
patching file programs/winecfg/resource.h
Comment 8 L. Axton Malsbury 2010-06-28 02:18:06 UTC
(In reply to comment #6)
> Created an attachment (id=236727) [details]
> valid patch
> 
> during the installation of wine, after checking the files to put this patch in
> the folder disfiles
> 

Patch works for me.  Thanks!
Comment 9 Tom Flair 2010-06-28 13:02:52 UTC
(In reply to comment #6)
> Created an attachment (id=236727) [details]
> valid patch
> 
> during the installation of wine, after checking the files to put this patch in
> the folder disfiles
> 

This allows wine to compile, but when running winecfg, I receive the following error:
"Found driver in registry that is not available!
Remove 'pulse' from registery?
Yes No Cancel"
Comment 10 Tom Flair 2010-06-28 13:21:16 UTC
With regards to my previous comment, ignore it.  User error.   When following the directions correctly, it applies fine and I still have the pulseaudio option in winecfg.
Comment 11 Ian Abbott 2010-06-28 17:54:08 UTC
Created attachment 236829 [details, diff]
Here's a less hacked patch which seems to apply okay

I edited the original winepulse-0.37-winecfg.patch in vim opened with latin1 encoding (it's 8-bit safe), and edited the two broken hunks, using lines from the original files to repair the broken hunks. I renamed the patch to "winepulse-0.37-winecfg-1.2-rc5.patch" to avoid conflicting with the original patch and put it in the ebuild's "files" directory.

An ebuild patch to use it will follow...
Comment 12 Ian Abbott 2010-06-28 17:58:23 UTC
Created attachment 236831 [details, diff]
Same as my previous patch but renamed.

I should have used 1.2_rc5 in the patch file name, not 1.2-rc5, so here it is again with the correct name.

Ebuild patch will follow...
Comment 13 Ian Abbott 2010-06-28 18:00:15 UTC
Created attachment 236833 [details, diff]
Ebuild patch to use winepulse-0.37-winecfg-1.2_rc5.patch
Comment 14 SpanKY gentoo-dev 2010-06-28 20:58:11 UTC
please send the updated winecfg.patch to:
    * theycallhimart < at > gmail dot com
Comment 15 Andreas Mielke 2010-06-29 05:19:52 UTC
(In reply to comment #13)
> Created an attachment (id=236833) [details]
> Ebuild patch to use winepulse-0.37-winecfg-1.2_rc5.patch
> 

This patch does not work. The new patch is winepulse-0.38-winecfg.
Comment 16 Andreas Mielke 2010-06-29 05:25:44 UTC
Created attachment 236879 [details]
new ebuild with winepulse-0.38-winecfg.patch
Comment 17 SpanKY gentoo-dev 2010-06-29 06:33:11 UTC
thanks, added 0.38 to the 1.2_rc5 ebuild

USE=pulseaudio support hasnt changed in the ebuild.  it isnt supported and if it breaks, the only thing reported to this site is "an updated patch is available".

if people insist on whining about the situation, i'll simply drop the pulseaudio patches from the ebuild.  i could care less about them.