Bug 827940 – app-emulation/wine-vanilla-6.0.2 fails to get patched correctly

• Product: Gentoo Linux
• Status: RESOLVED INVALID

[Description Jakub Paluszak 2021-12-01 15:19:19 UTC]

When emerging wine-vanilla-6.0.2 on a stable AMD64 system the ebuild fails to emerge properly with patching error:

 * Applying 0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch ...
patching file tools/makedep.c
Hunk #1 succeeded at 181 (offset 9 lines).
Hunk #2 succeeded at 3148 (offset 111 lines).
Hunk #3 succeeded at 4252 (offset 69 lines).
Hunk #4 FAILED at 4191.
1 out of 4 hunks FAILED -- saving rejects to file tools/makedep.c.rej
 [ !! ]
 * ERROR: app-emulation/wine-vanilla-6.0.2::gentoo failed (prepare phase):
 *   patch -p1  failed with /etc/portage/patches/app-emulation/wine-vanilla/0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch
 * 
 * Call stack:
 *               ebuild.sh, line  127:  Called src_prepare
 *             environment, line 4176:  Called default
 *      phase-functions.sh, line  858:  Called default_src_prepare
 *      phase-functions.sh, line  923:  Called __eapi6_src_prepare
 *             environment, line  489:  Called eapply_user
 *             environment, line 1356:  Called eapply '/etc/portage/patches/app-emulation/wine-vanilla/0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch'
 *             environment, line 1326:  Called _eapply_patch '/etc/portage/patches/app-emulation/wine-vanilla/0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch'
 *             environment, line 1264:  Called __helpers_die 'patch -p1  failed with /etc/portage/patches/app-emulation/wine-vanilla/0002-makefiles-On
ly-apply-non-include-path-EXTRAINCL-flag.patch'
 *   isolated-functions.sh, line  112:  Called die


Reproducible: Always

Steps to Reproduce:
1. emerge =app-emulation/wine-vanilla-6.0.2

Actual Results:  
 * Applying 0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch ...
patching file tools/makedep.c
Hunk #1 succeeded at 181 (offset 9 lines).
Hunk #2 succeeded at 3148 (offset 111 lines).
Hunk #3 succeeded at 4252 (offset 69 lines).
Hunk #4 FAILED at 4191.
1 out of 4 hunks FAILED -- saving rejects to file tools/makedep.c.rej
 [ !! ]
 * ERROR: app-emulation/wine-vanilla-6.0.2::gentoo failed (prepare phase):
 *   patch -p1  failed with /etc/portage/patches/app-emulation/wine-vanilla/0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch
 * 
 * Call stack:
 *               ebuild.sh, line  127:  Called src_prepare
 *             environment, line 4176:  Called default
 *      phase-functions.sh, line  858:  Called default_src_prepare
 *      phase-functions.sh, line  923:  Called __eapi6_src_prepare
 *             environment, line  489:  Called eapply_user
 *             environment, line 1356:  Called eapply '/etc/portage/patches/app-emulation/wine-vanilla/0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch'
 *             environment, line 1326:  Called _eapply_patch '/etc/portage/patches/app-emulation/wine-vanilla/0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch'
 *             environment, line 1264:  Called __helpers_die 'patch -p1  failed with /etc/portage/patches/app-emulation/wine-vanilla/0002-makefiles-On
ly-apply-non-include-path-EXTRAINCL-flag.patch'
 *   isolated-functions.sh, line  112:  Called die


Expected Results:  
Proper emerge

emerge --info:

Portage 3.0.28 (python 3.9.9-final-0, default/linux/amd64/17.1/desktop/gnome/systemd, gcc-11.2.0, glibc-2.33-r7, 5.10.76-gentoo-r1 x86_64)
=================================================================
System uname: Linux-5.10.76-gentoo-r1-x86_64-AMD_Phenom-tm-_II_X4_955_Processor-with-glibc2.33
KiB Mem:     7897992 total,   2190660 free
KiB Swap:    8388604 total,   6467440 free
Timestamp of repository gentoo: Tue, 30 Nov 2021 23:15:01 +0000
Head commit of repository gentoo: 8e9aa59afe382070561d05ff44d0cbaf5d14f91a
Timestamp of repository gentoo-zh: Tue, 30 Nov 2021 02:05:46 +0000
Head commit of repository gentoo-zh: ff8f95eb7310e23523935b57c33d0f4a8b3307be

Timestamp of repository holgersson-overlay: Wed, 17 Nov 2021 23:06:24 +0000
Head commit of repository holgersson-overlay: 49598c66459bbec31d9e8a82df6dda5304b686cd

sh bash 5.1_p8
ld GNU ld (Gentoo 2.37_p1 p0) 2.37
distcc 3.4 x86_64-pc-linux-gnu [disabled]
ccache version 4.4.2 [enabled]
app-shells/bash:          5.1_p8::gentoo
dev-java/java-config:     2.3.1::gentoo
dev-lang/perl:            5.34.0-r3::gentoo
dev-lang/python:          2.7.18_p13::gentoo, 3.9.9::gentoo, 3.10.0_p1::gentoo
dev-lang/rust:            1.56.1::gentoo
dev-util/ccache:          4.4.2::gentoo
dev-util/cmake:           3.20.5::gentoo
sys-apps/baselayout:      2.7-r3::gentoo
sys-apps/sandbox:         2.25::gentoo
sys-devel/autoconf:       2.13-r1::gentoo, 2.71-r1::gentoo
sys-devel/automake:       1.13.4-r2::gentoo, 1.16.4::gentoo
sys-devel/binutils:       2.37_p1::gentoo
sys-devel/gcc:            11.2.0::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-r1::gentoo (virtual/os-headers)
sys-libs/glibc:           2.33-r7::gentoo
Repositories:

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

EP-local
    location: /usr/local/portage/local
    masters: gentoo
    priority: 0

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

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

crossdev
    location: /usr/local/portage-crossdev
    masters: gentoo
    priority: 10

ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="@FREE google-chrome AdobeFlash-11.x AdobeFlash-10.3 google-talkplugin PUEL dlj-1.1 skype-eula googleearth AdobeFlash-10.1 Oracle-BCLA-JavaSE skype-4.0.0.7-copyright Google-TOS RAR linux-fw-redistributable all-rights-reserved"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -march=native"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt /var/spool/munin-async/.ssh"
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="-O2 -pipe -march=native"
DISTDIR="/mnt/nowe/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="-O2 -march=native -pipe"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs ccache config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict 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="-O2 -march=native -pipe"
GENTOO_MIRRORS="http://mirror.leaseweb.com/gentoo/ rsync://mirror.netcologne.de/gentoo/ https://mirror.netcologne.de/gentoo/ ftp://gentoo.mirror.web4u.cz/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/gentoo/"
LANG="pl_PL.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="pl en zh-CN zh-TW bo"
MAKEOPTS="-j5 -l4"
PKGDIR="/usr/portage/packages"
PORTAGE_COMPRESS="xz"
PORTAGE_COMPRESS_FLAGS="-9"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_EXTRA_OPTS="--new-compress"
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"
RUSTFLAGS="-C target-cpu=native"
USE="16bit 3dnow 3dnowext X a52 aac acpi amd64 amuled archive atm avahi bidi branding brotli browserplugin bzip2 cairo cdr cjk cleartype cli compiz crypt css cups dav1d dbus dhcp djvu dri dts dvd dvdr emboss encode eselect-ldso evo exif faac faad fat fdk ffmpeg firefox3 flac fortran fuse gadu gdbm geoip ggz gif gimp gimpprint glib glitz gmailn gphoto2 gpm grammar gstreamer gtk gtkstyle gui gzip harfbuzz hddtemp http2 iconv icu imap immqt-bc infinality inotify introspection ipod iproute2 ipv6 java javascript jfs jit jpeg kdeenablefinal kdehiddenvisibility lame lcdfilter lcms libglvnd libnotify libsecret libtirpc live lm-sensors lzma mad magic mate matroska mmap mmx mmxext mng mp3 mp4 mpeg mplayer msn mtp multilib musepack myspace ncurses network newspr nls nptl nsplugin ntfs ntp ocr ogg opencl opengl openmp opus pam pango pch pcre pdf pidgin playlist png policykit pop ppds prediction prelink pulseaudio python3 qt5 rar readline real remote samba sdl seccomp smp sound spell split-usr sqlite srt sse sse3 sse4_1 ssl startup-notification stream subtitles subversion svg sysprof systemd t1lib tagwriting theora threads thumbnail tiff tracker truetype type1 udev udisks unicode upower usb v4l2 vaapi vdpau vorbis vpx wayland webgl webkit webkit2 webp wma wmf wxwidgets wxwindows x264 x265 xattr xcb xcomposite xfs xml xulrunner xv xvid xvmc youtube zeroconf zlib zstd" ABI_X86="64" ADA_TARGET="gnat_2020" 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" CAMERAS="ptp2" COLLECTD_PLUGINS="cgroups cpu cpufreq disk network ntpd openvpn sensors smart thermal uptime users hddtemp" CPU_FLAGS_X86="3dnow 3dnowext mmx mmxext popcnt sse sse2 sse3 sse4a" 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" GRUB_PLATFORMS="pc" INPUT_DEVICES="libinput" KERNEL="linux" L10N="pl en en-GB en-US zh-CN zh-TW bo" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport" 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 ruby27" USERLAND="GNU" VIDEO_CARDS="radeon r600" 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

[Comment 1 Sam James 2021-12-01 15:28:25 UTC]

(In reply to Jakub Paluszak from comment #0)
> Actual Results:  
>  * Applying 0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch
> ...
> patching file tools/makedep.c
> Hunk #1 succeeded at 181 (offset 9 lines).
> Hunk #2 succeeded at 3148 (offset 111 lines).
> Hunk #3 succeeded at 4252 (offset 69 lines).
> Hunk #4 FAILED at 4191.
> 1 out of 4 hunks FAILED -- saving rejects to file tools/makedep.c.rej
>  [ !! ]
>  * ERROR: app-emulation/wine-vanilla-6.0.2::gentoo failed (prepare phase):
>  *   patch -p1  failed with
> /etc/portage/patches/app-emulation/wine-vanilla/0002-makefiles-Only-apply-
> non-include-path-EXTRAINCL-flag.patch

This is your own patch :)

[Comment 2 Jakub Paluszak 2021-12-01 15:34:59 UTC]

Thx! I forgot about that patch. Feel stupid. ;)