since wine 1.5.18 isnt in portage yet i moved and renamed 1.5.17 to my local overlay. It fails at the src_prepare failing to patch 0005-dsound-create-a-primary_pwfx-separately-from-pwfx.patch
cat /var/tmp/notmpfs/portage/app-emulation/wine-1.5.18/temp/0005-dsound-create-a-primary_pwfx-separately-from-pwfx.patch.out ***** 0005-dsound-create-a-primary_pwfx-separately-from-pwfx.patch ***** PWD: /var/tmp/notmpfs/portage/app-emulation/wine-1.5.18/work/wine-1.5.18 ======================================================================== PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch < '../winepulse-patches-1.5.17/0005-dsound-create-a-primary_pwfx-separately-from-pwfx.patch' ======================================================================== can't find file to patch at input line 20 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From ef32e50906c4b122c01be89d7ec05a0de9c6a085 Mon Sep 17 00:00:00 2001 |From: Maarten Lankhorst <maarten.lankhorst@canonical.com> |Date: Fri, 9 Nov 2012 12:39:12 +0100 |Subject: [PATCH 05/31] dsound: create a primary_pwfx separately from pwfx | |I promised I would never touch it, but then I wanted to play skyrim | |V2: Limit channels to 2 in primary if not in writeprimary mode |--- | dlls/dsound/dsound.c | 37 ++++-- | dlls/dsound/dsound_private.h | 3 +- | dlls/dsound/mixer.c | 1 + | dlls/dsound/primary.c | 301 ++++++++++++++++++++----------------------- | 4 files changed, 170 insertions(+), 172 deletions(-) | |diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c |index e5b0e3c..90c0be8 100644 |--- a/dlls/dsound/dsound.c |+++ b/dlls/dsound/dsound.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 95 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h |index 247f229..4c4e04e 100644 |--- a/dlls/dsound/dsound_private.h |+++ b/dlls/dsound/dsound_private.h -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 116 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c |index 264d64d..84e029b 100644 |--- a/dlls/dsound/mixer.c |+++ b/dlls/dsound/mixer.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 128 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c |index 8da12e2..94bdf9c 100644 |--- a/dlls/dsound/primary.c |+++ b/dlls/dsound/primary.c -------------------------- No file to patch. Skipping patch. 11 out of 11 hunks ignored patch program exited with status 1 ======================================================================== PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < '../winepulse-patches-1.5.17/0005-dsound-create-a-primary_pwfx-separately-from-pwfx.patch' ======================================================================== patching file dlls/dsound/dsound.c Hunk #1 FAILED at 305. Hunk #2 FAILED at 612. 2 out of 2 hunks FAILED -- saving rejects to file dlls/dsound/dsound.c.rej patching file dlls/dsound/dsound_private.h Hunk #1 FAILED at 72. Hunk #2 FAILED at 211. 2 out of 2 hunks FAILED -- saving rejects to file dlls/dsound/dsound_private.h.rej patching file dlls/dsound/mixer.c Hunk #1 FAILED at 112. 1 out of 1 hunk FAILED -- saving rejects to file dlls/dsound/mixer.c.rej patching file dlls/dsound/primary.c Hunk #1 FAILED at 62. Hunk #2 succeeded at 188 with fuzz 2 (offset 98 lines). Hunk #3 succeeded at 259 (offset 98 lines). Hunk #4 FAILED at 206. Hunk #5 FAILED at 219. Hunk #6 FAILED at 263. Hunk #7 FAILED at 316. Hunk #8 FAILED at 405. Hunk #9 FAILED at 444. Hunk #10 FAILED at 901. Hunk #11 FAILED at 916. 9 out of 11 hunks FAILED -- saving rejects to file dlls/dsound/primary.c.rej patch program exited with status 1 ======================================================================== PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch < '../winepulse-patches-1.5.17/0005-dsound-create-a-primary_pwfx-separately-from-pwfx.patch' ======================================================================== can't find file to patch at input line 20 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From ef32e50906c4b122c01be89d7ec05a0de9c6a085 Mon Sep 17 00:00:00 2001 |From: Maarten Lankhorst <maarten.lankhorst@canonical.com> |Date: Fri, 9 Nov 2012 12:39:12 +0100 |Subject: [PATCH 05/31] dsound: create a primary_pwfx separately from pwfx | |I promised I would never touch it, but then I wanted to play skyrim | |V2: Limit channels to 2 in primary if not in writeprimary mode |--- | dlls/dsound/dsound.c | 37 ++++-- | dlls/dsound/dsound_private.h | 3 +- | dlls/dsound/mixer.c | 1 + | dlls/dsound/primary.c | 301 ++++++++++++++++++++----------------------- | 4 files changed, 170 insertions(+), 172 deletions(-) | |diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c |index e5b0e3c..90c0be8 100644 |--- a/dlls/dsound/dsound.c |+++ b/dlls/dsound/dsound.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 95 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h |index 247f229..4c4e04e 100644 |--- a/dlls/dsound/dsound_private.h |+++ b/dlls/dsound/dsound_private.h -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 116 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c |index 264d64d..84e029b 100644 |--- a/dlls/dsound/mixer.c |+++ b/dlls/dsound/mixer.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 128 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c |index 8da12e2..94bdf9c 100644 |--- a/dlls/dsound/primary.c |+++ b/dlls/dsound/primary.c -------------------------- No file to patch. Skipping patch. 11 out of 11 hunks ignored patch program exited with status 1 ======================================================================== PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch < '../winepulse-patches-1.5.17/0005-dsound-create-a-primary_pwfx-separately-from-pwfx.patch' ======================================================================== can't find file to patch at input line 20 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From ef32e50906c4b122c01be89d7ec05a0de9c6a085 Mon Sep 17 00:00:00 2001 |From: Maarten Lankhorst <maarten.lankhorst@canonical.com> |Date: Fri, 9 Nov 2012 12:39:12 +0100 |Subject: [PATCH 05/31] dsound: create a primary_pwfx separately from pwfx | |I promised I would never touch it, but then I wanted to play skyrim | |V2: Limit channels to 2 in primary if not in writeprimary mode |--- | dlls/dsound/dsound.c | 37 ++++-- | dlls/dsound/dsound_private.h | 3 +- | dlls/dsound/mixer.c | 1 + | dlls/dsound/primary.c | 301 ++++++++++++++++++++----------------------- | 4 files changed, 170 insertions(+), 172 deletions(-) | |diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c |index e5b0e3c..90c0be8 100644 |--- a/dlls/dsound/dsound.c |+++ b/dlls/dsound/dsound.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 95 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h |index 247f229..4c4e04e 100644 |--- a/dlls/dsound/dsound_private.h |+++ b/dlls/dsound/dsound_private.h -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 116 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c |index 264d64d..84e029b 100644 |--- a/dlls/dsound/mixer.c |+++ b/dlls/dsound/mixer.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 128 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c |index 8da12e2..94bdf9c 100644 |--- a/dlls/dsound/primary.c |+++ b/dlls/dsound/primary.c -------------------------- No file to patch. Skipping patch. 11 out of 11 hunks ignored patch program exited with status 1 ======================================================================== PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch < '../winepulse-patches-1.5.17/0005-dsound-create-a-primary_pwfx-separately-from-pwfx.patch' ======================================================================== can't find file to patch at input line 20 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From ef32e50906c4b122c01be89d7ec05a0de9c6a085 Mon Sep 17 00:00:00 2001 |From: Maarten Lankhorst <maarten.lankhorst@canonical.com> |Date: Fri, 9 Nov 2012 12:39:12 +0100 |Subject: [PATCH 05/31] dsound: create a primary_pwfx separately from pwfx | |I promised I would never touch it, but then I wanted to play skyrim | |V2: Limit channels to 2 in primary if not in writeprimary mode |--- | dlls/dsound/dsound.c | 37 ++++-- | dlls/dsound/dsound_private.h | 3 +- | dlls/dsound/mixer.c | 1 + | dlls/dsound/primary.c | 301 ++++++++++++++++++++----------------------- | 4 files changed, 170 insertions(+), 172 deletions(-) | |diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c |index e5b0e3c..90c0be8 100644 |--- a/dlls/dsound/dsound.c |+++ b/dlls/dsound/dsound.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 95 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h |index 247f229..4c4e04e 100644 |--- a/dlls/dsound/dsound_private.h |+++ b/dlls/dsound/dsound_private.h -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 116 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c |index 264d64d..84e029b 100644 |--- a/dlls/dsound/mixer.c |+++ b/dlls/dsound/mixer.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 128 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c |index 8da12e2..94bdf9c 100644 |--- a/dlls/dsound/primary.c |+++ b/dlls/dsound/primary.c -------------------------- No file to patch. Skipping patch. 11 out of 11 hunks ignored patch program exited with status 1
sorry should have put /var/tmp/notmpfs/portage/app-emulation/wine-1.5.18/temp/0005-dsound-create-a-primary_pwfx-separately-from-pwfx.patch.out as an attachment.
Patience recommended. That patch was merged in this release.
This version also includes the patch to close https://bugs.gentoo.org/show_bug.cgi?id=438532 .
(In reply to comment #4) > This version also includes the patch to close > https://bugs.gentoo.org/show_bug.cgi?id=438532 . TBH, I wonder why that one wasn't RESOLVED UPSTREAM.
Fixed, sorry for the wait. >*wine-1.5.18 (24 Nov 2012) > > 24 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.5.18.ebuild, > wine-9999.ebuild: > Bump, see http://www.winehq.org/announce/1.5.18 for the announcement (bug > #444512). Follow Ubuntu's example and install a Wine menu category and some > useful .desktop files and icons.
