Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 806366 - app-emulation/wine-vanilla-6.14 - patching file tools/winegcc/winegcc.c Hunk #1 FAILED at 1982.
Summary: app-emulation/wine-vanilla-6.14 - patching file tools/winegcc/winegcc.c Hunk ...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Wine Maintainers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-08-04 09:02 UTC by Michal Plichta
Modified: 2021-08-04 18:13 UTC (History)
1 user (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Michal Plichta 2021-08-04 09:02:54 UTC
>>> Emerging (1 of 1) app-emulation/wine-vanilla-6.14::gentoo
 * wine-6.14.tar.xz BLAKE2B SHA512 size ;-) ...                                                                                                                                [ ok ]
 * gentoo-wine-patches-20200523.tar.xz BLAKE2B SHA512 size ;-) ...                                                                                                             [ ok ]
>>> Unpacking source...
>>> Unpacking wine-6.14.tar.xz to /var/tmp/portage/app-emulation/wine-vanilla-6.14/work
>>> Unpacking gentoo-wine-patches-20200523.tar.xz to /var/tmp/portage/app-emulation/wine-vanilla-6.14/work
 * Looking in /var/tmp/portage/app-emulation/wine-vanilla-6.14/work/wine-6.14/po for new locales ...                                                                           [ ok ]
>>> Source unpacked in /var/tmp/portage/app-emulation/wine-vanilla-6.14/work
>>> Preparing source in /var/tmp/portage/app-emulation/wine-vanilla-6.14/work/wine-6.14 ...
 * Applying wine-5.0-winegcc.patch ...
patching file tools/winebuild/main.c
Hunk #1 succeeded at 51 with fuzz 2 (offset 3 lines).
Hunk #2 succeeded at 705 (offset 67 lines).
patching file tools/winegcc/winegcc.c
Hunk #1 succeeded at 243 (offset 14 lines).
Hunk #2 succeeded at 1696 with fuzz 1 (offset 251 lines).                                                                                                                      [ ok ]
 * Applying wine-4.7-multilib-portage.patch ...
patching file configure.ac
Hunk #1 succeeded at 147 (offset -6 lines).
Hunk #2 succeeded at 170 with fuzz 1 (offset -5 lines).                                                                                                                        [ ok ]
 * Applying wine-2.0-multislot-apploader.patch ...                                                                                                                             [ ok ]
 * Applying wine-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch ...                                                                                            [ ok ]
 * Applying wine-vanilla-6.12-winegcc-equals-args.patch ...
patching file tools/winegcc/winegcc.c
Hunk #1 FAILED at 1982.
1 out of 1 hunk FAILED -- saving rejects to file tools/winegcc/winegcc.c.rej                                                                                                   [ !! ]
 * ERROR: app-emulation/wine-vanilla-6.14::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/app-emulation/wine-vanilla-6.14/files/wine-vanilla-6.12-winegcc-equals-args.patch
 * 
 * Call stack:
 *               ebuild.sh, line  127:  Called src_prepare
 *             environment, line 4160:  Called default
 *      phase-functions.sh, line  858:  Called default_src_prepare
 *      phase-functions.sh, line  923:  Called __eapi6_src_prepare
 *             environment, line  468:  Called eapply '/var/tmp/portage/app-emulation/wine-vanilla-6.14/work/gentoo-wine-patches/patches/wine-5.0-winegcc.patch' '/var/tmp/portage/app-emulation/wine-vanilla-6.14/work/gentoo-wine-patches/patches/wine-4.7-multilib-portage.patch' '/var/tmp/portage/app-emulation/wine-vanilla-6.14/work/gentoo-wine-patches/patches/wine-2.0-multislot-apploader.patch' '/var/tmp/portage/app-emulation/wine-vanilla-6.14/work/gentoo-wine-patches/patches/wine-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch' '/var/tmp/portage/app-emulation/wine-vanilla-6.14/files/wine-vanilla-6.12-winegcc-equals-args.patch'
 *             environment, line 1311:  Called _eapply_patch '/var/tmp/portage/app-emulation/wine-vanilla-6.14/files/wine-vanilla-6.12-winegcc-equals-args.patch'
 *             environment, line 1249:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/app-emulation/wine-vanilla-6.14/files/wine-vanilla-6.12-winegcc-equals-args.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"
 * 


Reproducible: Always




emerge --info
Portage 3.0.20 (python 3.9.6-final-0, default/linux/amd64/17.1/desktop/plasma, gcc-10.3.0, glibc-2.33-r5, 5.13.2-gentoo-x86_64 x86_64)
=================================================================
System uname: Linux-5.13.2-gentoo-x86_64-x86_64-Intel-R-_Core-TM-2_Duo_CPU_E8500_@_3.16GHz-with-glibc2.33
KiB Mem:     8079888 total,   3001224 free
KiB Swap:   17835004 total,  17205948 free
Timestamp of repository gentoo: Wed, 04 Aug 2021 08:30:01 +0000
Head commit of repository gentoo: 659e44e507c880979f9b59a6f0dbcd1d2bca7983
Timestamp of repository dotnet: Sat, 17 Jul 2021 08:07:04 +0000
Head commit of repository dotnet: 0559135eb5807259095cade234ee4d807d2f0a8c

Timestamp of repository guru: Tue, 03 Aug 2021 11:36:57 +0000
Head commit of repository guru: 146e32472bf4dbab8c00937a5eaf727c3c40f1bd

Timestamp of repository torbrowser: Tue, 03 Aug 2021 11:36:50 +0000
Head commit of repository torbrowser: a19004cd103252e33b515319df1acb22c9e1b83e

sh bash 5.1_p8
ld GNU ld (Gentoo 2.35.2 p1) 2.35.2
ccache version 4.3 [enabled]
app-shells/bash:          5.1_p8::gentoo
dev-java/java-config:     2.3.1::gentoo
dev-lang/perl:            5.34.0::gentoo
dev-lang/python:          2.7.18_p11::gentoo, 3.8.11::gentoo, 3.9.6::gentoo
dev-lang/rust:            1.53.0::gentoo
dev-util/ccache:          4.3-r2::gentoo
dev-util/cmake:           3.18.5::gentoo
dev-util/pkgconfig:       0.29.2::gentoo
sys-apps/baselayout:      2.7::gentoo
sys-apps/openrc:          0.42.1-r1::gentoo
sys-apps/sandbox:         2.24::gentoo
sys-devel/autoconf:       2.13-r1::gentoo, 2.69-r5::gentoo
sys-devel/automake:       1.16.3-r1::gentoo
sys-devel/binutils:       2.35.2::gentoo
sys-devel/gcc:            10.3.0-r2::gentoo
sys-devel/gcc-config:     2.4::gentoo
sys-devel/libtool:        2.4.6-r6::gentoo
sys-devel/make:           4.3::gentoo
sys-kernel/linux-headers: 5.10::gentoo (virtual/os-headers)
sys-libs/glibc:           2.33-r5::gentoo
Repositories:

gentoo
    location: /usr/portage
    sync-type: rsync
    sync-uri: rsync://rsync.gentoo.org/gentoo-portage
    priority: -1000
    sync-rsync-verify-max-age: 24
    sync-rsync-verify-metamanifest: yes
    sync-rsync-verify-jobs: 1
    sync-rsync-extra-opts: 

dotnet
    location: /var/db/repos/dotnet
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/dotnet.git
    masters: gentoo

guru
    location: /var/db/repos/guru
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/guru.git
    masters: gentoo

phoebe
    location: /usr/local/portage
    masters: gentoo

torbrowser
    location: /var/db/repos/torbrowser
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/torbrowser.git
    masters: gentoo

ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="@FREE"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt /usr/share/themes/oxygen-gtk/gtk-2.0"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
DISTDIR="/usr/portage/distfiles"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
FCFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs ccache config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
GENTOO_MIRRORS="ftp://ftp.vectranet.pl/gentoo/ ftp://mirror.leaseweb.com/gentoo/ ftp://gentoo.wheel.sk/pub/linux/gentoo/ http://mirror.dkm.cz/gentoo/ http://ftp.fau.de/gentoo"
LANG="en_US.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="en en-US pl"
MAKEOPTS="-j5"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
USE="X a52 aac acl acpi activities alsa amd64 branding bzip2 cairo cdda cdr cli crypt cups dbus declarative dri dts dvd dvdr elogind emboss encode exif flac fortran gdbm gif gpm gtk gui iconv icu ipv6 jpeg kde kipi kwallet lcms libglvnd libnotify libtirpc mad mng mp3 mp4 mpeg multilib ncurses nls nptl ogg opengl openmp pam pango pcre pdf phonon plasma png policykit ppds qml qt5 readline sdl seccomp semantic-desktop spell split-usr ssl startup-notification svg tcpd tiff tk truetype udev udisks unicode upower usb vorbis widgets wxwidgets x264 xattr xcb xinerama xml xv xvid zlib" ABI_X86="64" ADA_TARGET="gnat_2018" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="mmx mmxext sse sse2 sse3 sse4_1 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="libinput" KERNEL="linux" L10N="en en-US pl" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-3 php7-4" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_9" PYTHON_TARGETS="python3_9" RUBY_TARGETS="ruby26" USERLAND="GNU" VIDEO_CARDS="nouveau" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RUSTFLAGS
Comment 1 Sebastian Pipping gentoo-dev 2021-08-04 18:12:39 UTC
That seems fixed in https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed42e92cbc5e64d83bfd8c1e98406c2ab019231 .  Closing, please re-open as needed.