| View previous topic :: View next topic |
| Author |
Message |
Linubie
Guru
Joined: 11 Jun 2004
Posts: 395
|
 Posted: Mon Feb 26, 2018 10:31 pm Post subject: [solved] wine-vanilla-9999 fails due patching process |
 |
|
| Code: | emerge wine-vanilla
Calculating dependencies... done!
>>> Verifying ebuild manifests
>>> Running pre-merge checks for app-emulation/wine-vanilla-9999
>>> Emerging (1 of 1) app-emulation/wine-vanilla-9999::gentoo
* gentoo-wine-patches-20180120.tar.xz BLAKE2B SHA512 size ;-) ... [ ok ]
>>> Unpacking source...
* Fetching https://source.winehq.org/git/wine.git ...
git fetch https://source.winehq.org/git/wine.git +refs/heads/master:refs/heads/master
From https://source.winehq.org/git/wine
7be8beab68c..9ae8b8c00f2 master -> master
git symbolic-ref refs/git-r3/app-emulation/wine-vanilla/9999/__main__ refs/heads/master
* Checking out https://source.winehq.org/git/wine.git to /var/tmp/portage/app-emulation/wine-vanilla-9999/work/wine-9999 ...
git checkout --quiet master
GIT update -->
repository: https://source.winehq.org/git/wine.git
updating from commit: 7be8beab68c5074e78c899acac7ccb6eb2f7e22e
to commit: 9ae8b8c00f2cca205fdf4ce76e221778b7dfbea7
dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec | 2 +-
dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec | 2 +-
dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec | 2 +-
dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec | 2 +-
dlls/avifil32/editstream.c | 1 -
dlls/avifil32/getframe.c | 1 -
dlls/avifil32/tmpfile.c | 1 -
dlls/d3d9/d3d9_private.h | 3 +-
dlls/d3d9/device.c | 6 +-
dlls/dmstyle/tests/dmstyle.c | 200 +++++++++
dlls/explorerframe/nstc.c | 16 +-
dlls/explorerframe/tests/msg.h | 12 +-
dlls/explorerframe/tests/nstc.c | 7 +-
dlls/ieframe/tests/ie.c | 3 +
dlls/kernel32/cpu.c | 9 +
dlls/kernel32/kernel32.spec | 4 +-
dlls/kernel32/tests/format_msg.c | 4 +
dlls/kernel32/tests/version.c | 662 ++++++++++++++++++++++-------
dlls/kernel32/thread.c | 20 +-
dlls/kernel32/winerror.mc | 9 +
dlls/kernelbase/kernelbase.spec | 4 +-
dlls/mshtml/binding.h | 1 +
dlls/mshtml/mutation.c | 36 ++
dlls/mshtml/navigate.c | 9 +-
dlls/mshtml/tests/protocol.c | 2 +-
dlls/ntdll/loader.c | 7 +-
dlls/quartz/systemclock.c | 2 +-
dlls/urlmon/http.c | 8 +-
dlls/urlmon/tests/protocol.c | 51 ++-
dlls/usp10/tests/usp10.c | 87 ++--
dlls/uxtheme/buffer.c | 5 +-
dlls/uxtheme/msstyles.c | 23 +-
dlls/uxtheme/uxini.c | 5 +-
dlls/windowscodecs/jpegformat.c | 10 +-
dlls/windowscodecs/tests/Makefile.in | 1 +
dlls/windowscodecs/tests/info.c | 318 +++++++++-----
dlls/windowscodecs/tests/jpegformat.c | 145 +++++++
dlls/winebus.sys/bus_udev.c | 3 +
dlls/wined3d/Makefile.in | 1 -
dlls/wined3d/arb_program_shader.c | 18 +-
dlls/wined3d/context.c | 886 +++++++++++++++++++++++++++++++++++---
dlls/wined3d/cs.c | 24 +-
dlls/wined3d/device.c | 43 +-
dlls/wined3d/directx.c | 2 +-
dlls/wined3d/drawprim.c | 788 ----------------------------------
dlls/wined3d/wined3d_private.h | 7 +-
dlls/winegstreamer/gst_cbs.c | 24 --
dlls/winegstreamer/gst_cbs.h | 14 -
dlls/winegstreamer/gstdemux.c | 35 +-
dlls/ws2_32/socket.c | 16 +
include/winbase.h | 1 +
include/winsock.h | 9 +
po/ar.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/bg.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/ca.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/cs.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/da.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/de.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/el.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/en.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/en_US.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/eo.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/es.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/fa.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/fi.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/fr.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/he.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/hi.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/hr.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/hu.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/it.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/ja.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/ko.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/lt.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/ml.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/nb_NO.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/nl.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/or.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/pa.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/pl.po | 1660 ++++++++++++++++++++++++++++++++++--------------------------------------
po/pt_BR.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/pt_PT.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/rm.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/ro.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/ru.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/sk.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/sl.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/sr_RS@cyrillic.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/sr_RS@latin.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/sv.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/te.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/th.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/tr.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/uk.po | 1488 ++++++++++++++++++++++++++++++++--------------------------------
po/wa.po | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/wine.pot | 1484 ++++++++++++++++++++++++++++++++--------------------------------
po/zh_CN.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
po/zh_TW.po | 1486 ++++++++++++++++++++++++++++++++--------------------------------
tools/makedep.c | 20 +-
99 files changed, 36524 insertions(+), 35539 deletions(-)
>>> Unpacking gentoo-wine-patches-20180120.tar.xz to /var/tmp/portage/app-emulation/wine-vanilla-9999/work
* Looking in /var/tmp/portage/app-emulation/wine-vanilla-9999/work/wine-9999/po for new locales ... [ ok ]
>>> Source unpacked in /var/tmp/portage/app-emulation/wine-vanilla-9999/work
>>> Preparing source in /var/tmp/portage/app-emulation/wine-vanilla-9999/work/wine-9999 ...
* Applying wine-1.5.26-winegcc.patch ... [ ok ]
* Applying wine-1.9.5-multilib-portage.patch ... [ ok ]
* Applying wine-1.6-memset-O3.patch ... [ ok ]
* Applying wine-2.0-multislot-apploader.patch ... [ ok ]
* Applying wine-2.0-rearrange-manpages.patch ...
1 out of 1 hunk FAILED -- saving rejects to file loader/Makefile.in.rej [ !! ]
* ERROR: app-emulation/wine-vanilla-9999::gentoo failed (prepare phase):
* patch -p1 failed with /var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-rearrange-manpages.patch
*
* Call stack:
* ebuild.sh, line 124: Called src_prepare
* environment, line 4613: Called default
* phase-functions.sh, line 853: Called default_src_prepare
* phase-functions.sh, line 918: Called __eapi6_src_prepare
* environment, line 493: Called eapply '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-1.5.26-winegcc.patch' '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-1.9.5-multilib-portage.patch' '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-1.6-memset-O3.patch' '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-multislot-apploader.patch' '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-rearrange-manpages.patch'
* environment, line 1352: Called _eapply_patch '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-rearrange-manpages.patch'
* environment, line 1290: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-rearrange-manpages.patch'
* isolated-functions.sh, line 117: Called die
* The specific snippet of code:
* die "$@"
*
* If you need support, post the output of `emerge --info '=app-emulation/wine-vanilla-9999::gentoo'`,
* the complete build log and the output of `emerge -pqv '=app-emulation/wine-vanilla-9999::gentoo'`.
* The complete build log is located at '/var/tmp/portage/app-emulation/wine-vanilla-9999/temp/build.log'.
* The ebuild environment file is located at '/var/tmp/portage/app-emulation/wine-vanilla-9999/temp/environment'.
* Working directory: '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/wine-9999'
* S: '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/wine-9999'
>>> Failed to emerge app-emulation/wine-vanilla-9999, Log file:
>>> '/var/tmp/portage/app-emulation/wine-vanilla-9999/temp/build.log'
* Messages for package app-emulation/wine-vanilla-9999:
* ERROR: app-emulation/wine-vanilla-9999::gentoo failed (prepare phase):
* patch -p1 failed with /var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-rearrange-manpages.patch
*
* Call stack:
* ebuild.sh, line 124: Called src_prepare
* environment, line 4613: Called default
* phase-functions.sh, line 853: Called default_src_prepare
* phase-functions.sh, line 918: Called __eapi6_src_prepare
* environment, line 493: Called eapply '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-1.5.26-winegcc.patch' '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-1.9.5-multilib-portage.patch' '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-1.6-memset-O3.patch' '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-multislot-apploader.patch' '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-rearrange-manpages.patch'
* environment, line 1352: Called _eapply_patch '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-rearrange-manpages.patch'
* environment, line 1290: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/app-emulation/wine-vanilla-9999/work/gentoo-wine-patches/patches/wine-2.0-rearrange-manpages.patch'
* isolated-functions.sh, line 117: Called die
* The specific snippet of code:
* die "$@"
*
* If you need support, post the output of `emerge --info '=app-emulation/wine-vanilla-9999::gentoo'`,
* the complete build log and the output of `emerge -pqv '=app-emulation/wine-vanilla-9999::gentoo'`.
* The complete build log is located at '/var/tmp/portage/app-emulation/wine-vanilla-9999/temp/build.log'.
* The ebuild environment file is located at '/var/tmp/portage/app-emulation/wine-vanilla-9999/temp/environment'.
* Working directory: '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/wine-9999'
* S: '/var/tmp/portage/app-emulation/wine-vanilla-9999/work/wine-9999' |
[Moderator edit: added [code] tags to preserve output layout. -Hu]
_________________
Mircosoft software is like having sex with a stranger, you always have to be careful not to get infected with something...
Last edited by Linubie on Wed Feb 28, 2018 11:38 pm; edited 1 time in total |
|
| Back to top |
|
 |
ct85711
Veteran
Joined: 27 Sep 2005
Posts: 1791
|
| Posted: Tue Feb 27, 2018 12:07 am Post subject: |
|
|
| This is expected on development versions (-9999 packages are considered development version), as the sources changed since the patch was made. Generally, you should NOT be using any -9999 packages unless you have a specific reason to do so, even then it ends up being you pick up the pieces. I recommend you remove any packages that you keyworded -9999 (keyword ** shouldn't be used either, unless you are testing for a different arch, and then you'd know what you are doing in those cases) and use a package that is supported. |
|
| Back to top |
|
|
saboya
Guru
Joined: 28 Nov 2006
Posts: 552
Location: Brazil
|
| Posted: Tue Feb 27, 2018 2:08 am Post subject: |
|
|
For now you can do this in your /etc/portage/bashrc:
| Code: | pre_src_unpack() {
if [[ "$PN" == "wine-vanilla" && "$PV" == "9999" ]]; then
PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
)
fi
}
|
No guarantees. |
|
| Back to top |
|
|
Linubie
Guru
Joined: 11 Jun 2004
Posts: 395
|
| Posted: Tue Feb 27, 2018 8:57 am Post subject: |
|
|
| ct85711 wrote: | | This is expected on development versions (-9999 packages are considered development version), as the sources changed since the patch was made. Generally, you should NOT be using any -9999 packages unless you have a specific reason to do so, even then it ends up being you pick up the pieces. I recommend you remove any packages that you keyworded -9999 (keyword ** shouldn't be used either, unless you are testing for a different arch, and then you'd know what you are doing in those cases) and use a package that is supported. |
Well I am using wine-9999 since years and only had some issued,which where fixed after a while when reported.
| saboya wrote: | pre_src_unpack() {
if [[ "$PN" == "wine-vanilla" && "$PV" == "9999" ]]; then
PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
)
fi
} |
Thank you wil give it a try, or wait for a fix from maintainer in portage
_________________
Mircosoft software is like having sex with a stranger, you always have to be careful not to get infected with something... |
|
| Back to top |
|
|
ct85711
Veteran
Joined: 27 Sep 2005
Posts: 1791
|
| Posted: Tue Feb 27, 2018 3:24 pm Post subject: |
|
|
| The problem with waiting for the maintainer to do something, is that they are going to make a patch to a release version (so everyone could get the same version). Where the -9999 ebuilds, you are pulling directly what the (upstream) devs are doing; so what the devs patch one day may be completely different the next day. This makes it very unlikely a patch to be valid for too long. |
|
| Back to top |
|
|
Linubie
Guru
Joined: 11 Jun 2004
Posts: 395
|
| Posted: Wed Feb 28, 2018 11:37 pm Post subject: |
|
|
In this case this is only the manpages, no big deal for me at least.
Thank you saboya for your helping hand, your suggestion works for me.
filed a bug
https://bugs.gentoo.org/649132
_________________
Mircosoft software is like having sex with a stranger, you always have to be careful not to get infected with something... |
|
| Back to top |
|
|
|
|
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
|
|
Portage & Programming
