Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 358233 - app-emulation/wine-9999: patch mouse-warp doesn't apply
Summary: app-emulation/wine-9999: patch mouse-warp doesn't apply
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: AMD64 Linux
: Normal normal (vote)
Assignee: Wine Maintainers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-03-10 13:40 UTC by Xangel2Net
Modified: 2011-04-27 21:33 UTC (History)
2 users (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 Xangel2Net 2011-03-10 13:40:48 UTC
mouse-warp patch doesn't apply on last git snapshot.

Reproducible: Always

Steps to Reproduce:
1.unmasking app-emulation/wine-9999
2.emerge -v =app-emulation/wine-9999
Actual Results:  
Failed Patch: wine-1.3.14-mouse-warp.patch !
( /usr/portage/app-emulation/wine/files/wine-1.3.14-mouse-warp.patch )


Expected Results:  
Continuing emerge

Part of /var/tmp/portage/app-emulation/wine-9999/temp/wine-1.3.14-mouse-warp.patch.out file:
PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch < '/usr/portage/app-emulation/wine/files/wine-1.3.14-mouse-warp.patch'

========================================
patching file configure
Hunk #1 succeeded at 8030 (offset 58 lines).
Hunk #2 succeeded at 8227 (offset 58 lines).
patching file configure.ac
Hunk #1 succeeded at 932 (offset 35 lines).
Hunk #2 succeeded at 971 (offset 35 lines).
patching file dlls/dinput/dinput_main.c
Hunk #1 succeeded at 96 (offset 11 lines).
Hunk #2 succeeded at 113 (offset 11 lines).
Hunk #3 succeeded at 914 (offset 22 lines).
Hunk #4 succeeded at 1057 (offset 22 lines).
patching file dlls/dinput/mouse.c
Hunk #1 succeeded at 334 (offset 30 lines).
Hunk #2 succeeded at 363 (offset 30 lines).
patching file dlls/winex11.drv/event.c
patching file dlls/winex11.drv/mouse.c
Hunk #3 succeeded at 148 with fuzz 1 (offset -2 lines).
Hunk #4 succeeded at 1101 with fuzz 2 (offset -238 lines).
patching file dlls/winex11.drv/winex11.drv.spec
Hunk #1 succeeded at 158 (offset -4 lines).
patching file dlls/winex11.drv/x11drv.h
Hunk #1 succeeded at 731 (offset 18 lines).
Hunk #2 FAILED at 844.
1 out of 2 hunks FAILED -- saving rejects to file dlls/winex11.drv/x11drv.h.rej
patching file dlls/winex11.drv/x11drv_main.c
Hunk #1 succeeded at 582 (offset 20 lines).
patching file include/config.h.in
Hunk #1 succeeded at 377 (offset 10 lines).
Hunk #2 succeeded at 1103 (offset 25 lines).
========================================

emerge --info =app-emulation/wine-9999
Portage 2.1.9.42 (default/linux/amd64/10.0/desktop/kde, gcc-4.5.2, glibc-2.13-r1, 2.6.37-gentoo-r1 x86_64)
=================================================================
                         System Settings
=================================================================
System uname: Linux-2.6.37-gentoo-r1-x86_64-AMD_Athlon-tm-_64_X2_Dual_Core_Processor_4600+-with-gentoo-2.0.1
Timestamp of tree: Thu, 10 Mar 2011 09:30:01 +0000
ccache version 3.1.4 [enabled]
app-shells/bash:     4.2_p7
dev-java/java-config: 2.1.11-r3
dev-lang/python:     2.7.1-r1, 3.1.3-r1
dev-util/ccache:     3.1.4
dev-util/cmake:      2.8.4
sys-apps/baselayout: 2.0.1-r1
sys-apps/openrc:     0.7.0
sys-apps/sandbox:    2.5
sys-devel/autoconf:  2.13, 2.68
sys-devel/automake:  1.9.6-r3, 1.10.3, 1.11.1
sys-devel/binutils:  2.21
sys-devel/gcc:       4.5.2
sys-devel/gcc-config: 1.4.1
sys-devel/libtool:   2.4-r1
sys-devel/make:      3.82
virtual/os-headers:  2.6.36.1 (sys-kernel/linux-headers)
ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="* -@EULA AdobeFlash-10 AdobeFlash-10.1 dlj-1.1 PUEL Nero-EULA-US"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -march=native -ggdb"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/config"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/cli-php5.3/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-O2 -pipe -march=native -ggdb"
DISTDIR="/usr/portage/distfiles"
FEATURES="assume-digests binpkg-logs candy ccache compress-build-logs distlocks fixlafiles fixpackages news parallel-fetch protect-owned sandbox sfperms splitdebug strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync"
FFLAGS=""
GENTOO_MIRRORS="http://mirror.yandex.ru/gentoo-distfiles/ ftp://mirror.yandex.ru/gentoo-distfiles/"
LANG="ru_RU.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="en ru"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/var/lib/layman/multimedia /var/lib/layman/zugaina /var/lib/layman/rion /var/lib/layman/arcon /var/lib/layman/mozilla /var/lib/layman/amielke-overlay /var/lib/layman/thousand-parsec"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="3dnow 3dnowext X a52 aac acl acpi alsa amd64 bash-completion branding bzip2 cdda cdr cli consolekit cracklib css cxx dbus dhcp dri drm dts dvd dvdr emboss encode exif fam fat fbcon ffmpeg firefox flac fontconfig gallium gd gdbm gdu gif gpm gtk gzip hal handbook hddtemp iconv jpeg kde lame libnotify libsamplerate mad matroska mikmod minimal mmx mng modules mp3 mp4 mpeg mudflap multilib nls nptl nptlonly nsplugin ntfs ogg opengl pam pango pcre pdf perl plasma png policykit ppds pppd python qt3support qt4 readline sdl session sse sse2 ssl ssse3 startup-notification svg symlink sysfs tcpd threads truetype udev unicode usb vaapi vdpau vorbis x264 xcb xcomposite xml xorg xulrunner xv xvid zlib" 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" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="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" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en ru" PHP_TARGETS="php5-3" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="fbcon nouveau nvidia" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" 
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

=================================================================
                        Package Settings
=================================================================

app-emulation/wine-9999 was built with the following:
USE="X alsa dbus fontconfig gecko gsm jpeg mousewarp mp3 (multilib) opengl perl png ssl threads truetype win32 xcomposite xml -capi -cups -custom-cflags (-esd) -gnutls -gphoto2 (-gstreamer) (-hal) -jack -lcms -ldap -nas -ncurses (-nls) -openal -oss -pulseaudio -samba -scanner -test -win64 -xinerama"
Comment 1 SpanKY gentoo-dev 2011-03-10 20:35:50 UTC
upstream bug has an updated patch which i added to cvs