Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 472896 - media-tv/mythtv-0.26.0_p20130526 - sys-devel/patch fails to apply git binary patch
Summary: media-tv/mythtv-0.26.0_p20130526 - sys-devel/patch fails to apply git binary ...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Doug Goldstein (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-10 17:32 UTC by David Kredba
Modified: 2013-06-14 11:06 UTC (History)
2 users (show)

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


Attachments
patch.out file (0152-Updated-MythFrontend-English-GB-translation.patch.out,36.56 KB, text/plain)
2013-06-10 17:33 UTC, David Kredba
Details
0152-Updated-MythFrontend-English-GB-translation.patch.out (0152-Updated-MythFrontend-English-GB-translation.patch.out,36.56 KB, text/plain)
2013-06-14 02:34 UTC, Nathan Caldwell
Details

Note You need to log in before you can comment on or make changes to this bug.
Description David Kredba 2013-06-10 17:32:20 UTC
Failed Patch: 0152-Updated-MythFrontend-English-GB-translation.patch !
 *  ( /var/tmp/portage/media-tv/mythtv-0.26.0_p20130526/work/mythtv-0.26.0/patches/0152-Updated-MythFrontend-English-GB-translation.patch 

Skipping the patch works. (By using ebuild unpack, rm that 0152 patch and ebuild prepare.)
It compiles without it.

Reproducible: Always

Actual Results:  
***** 0152-Updated-MythFrontend-English-GB-translation.patch *****
PWD: /var/tmp/portage/media-tv/mythtv-0.26.0_p20130526/work/mythtv-0.26.0

==================================================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  < '/var/tmp/portage/media-tv/mythtv-0.26.0_p20130526/work/mythtv-0.26.0/patches/0152-Updated-MythFrontend-English-GB-translation.patch'

==================================================================
can't find file to patch at input line 19
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From a1c79f7722bf5496dcba243b790157912b58f554 Mon Sep 17 00:00:00 2001
|From: Nick Morrott <knowledgejunkie@gmail.com>
|Date: Fri, 3 May 2013 21:42:11 -0400
|Subject: [PATCH 152/163] Updated MythFrontend English GB translation from Nick
| Morrott
|
|Thank you Nick!
|
|Refs #11522
|
|Signed-off-by: Nicolas Riendeau <nriendeau@mythtv.org>
|---
| mythtv/i18n/mythfrontend_en_gb.qm |  Bin 93877 -> 93673 bytes
| mythtv/i18n/mythfrontend_en_gb.ts | 1856 +++++++++++++++++++------------------
| 2 files changed, 936 insertions(+), 920 deletions(-)
|
|diff --git a/mythtv/i18n/mythfrontend_en_gb.qm b/mythtv/i18n/mythfrontend_en_gb.qm
|index 39a4671abea1eeac1b386d651e1dcc76fc275f44..f8b179ad09d2227fa73b690db68c1af2a9d1affb 100644
--------------------------
No file to patch.  Skipping patch.
can't find file to patch at input line 138
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
and continues.

Expected Results:  
No patch troubles.

Portage 2.2.0_alpha179 (default/linux/amd64/13.0/desktop/kde, gcc-4.8.1, glibc-2.17, 3.9.3-gentoo x86_64)
=================================================================
System uname: Linux-3.9.3-gentoo-x86_64-Intel-R-_Core-TM-2_Quad_CPU_Q9550_@_2.83GHz-with-gentoo-2.2
KiB Mem:     8170492 total,   2403580 free
KiB Swap:    8396796 total,   8392400 free
Timestamp of tree: Mon, 10 Jun 2013 16:30:01 +0000
ld GNU ld (GNU Binutils) 2.23.1
app-shells/bash:          4.2_p45
dev-java/java-config:     2.2.0
dev-lang/python:          2.7.5, 3.2.5, 3.3.2
dev-util/cmake:           2.8.11.1
dev-util/pkgconfig:       0.28
sys-apps/baselayout:      2.2
sys-apps/openrc:          0.11.8
sys-apps/sandbox:         2.6-r1
sys-devel/autoconf:       2.13, 2.69
sys-devel/automake:       1.11.6, 1.12.6, 1.13.2
sys-devel/binutils:       2.23.1
sys-devel/gcc:            4.7.3, 4.8.1
sys-devel/gcc-config:     1.8
sys-devel/libtool:        2.4.2
sys-devel/make:           3.82-r4
sys-kernel/linux-headers: 3.9 (virtual/os-headers)
sys-libs/glibc:           2.17
Repositories: gentoo
ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="* -@EULA"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -ggdb -pipe -march=native -mtune=native -flto=4 -fuse-linker-plugin"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt /usr/share/polkit-1/actions /var/bind /var/lib/hsqldb"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O2 -ggdb -pipe -march=native -mtune=native -flto=4 -fuse-linker-plugin"
DISTDIR="/usr/portage/distfiles"
EMERGE_DEFAULT_OPTS="--quiet-build=n"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned sandbox sfperms splitdebug strict unknown-features-warn unmerge-logs unmerge-orphans userfetch xattr"
FFLAGS="-O2 -ggdb -pipe -march=native -mtune=native -flto=4 -fuse-linker-plugin"
GENTOO_MIRRORS="ftp://gentoo.mirror.web4u.cz/"
LANG="cs_CZ.UTF-8"
LDFLAGS="-Wl,--as-needed -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -O2 -ggdb -pipe -march=native -mtune=native -flto=4 -fuse-linker-plugin"
MAKEOPTS="-j4"
PKGDIR="/usr/portage/packages"
PORTAGE_COMPRESS="echo"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY=""
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X a52 aac acl acpi alsa amd64 berkdb blas bluetooth branding bzip2 cairo caps cdda cddb cdparanoia cdr cli consolekit cracklib crypt cups cvs cxx dbus declarative djvu dri dts dv dvb dvd dvdr emboss encode exif fam ffmpeg fftw firefox flac fontconfig fortran ftp gd gdbm geoip gif gmp gnuplot gpm gps graphviz gsl gsm gstreamer gtk hdf5 iconv icu idn ieee1394 imagemagick imlib ipv6 ithreads javascript jbig jpeg jpeg2k kde kipi ladspa lame lapack lcms ldap libass libnotify libsamplerate lzma lzo mad matroska mms mmx mmxext mng modplug modules mp3 mp4 mpeg mplayer msn mtp mudflap multilib musepack musicbrainz ncurses netcdf nls nptl ocaml ocamlopt odbc ogg openal openexr opengl openmp pam pango pch pcre pdf perl phonon plasma plotutils png policykit postscript ppds pulseaudio python qt3support qt4 quicktime rdesktop readline ruby samba scanner sdl semantic-desktop session slang smp sndfile sox speex spell sse sse2 ssl ssse3 startup-notification svg szip tcpd theora threads tidy tiff truetype udev udisks unicode upower usb v4l vcd vdpau vnc vorbis wavpack wmf wxwidgets x264 xattr xcb xcomposite xft xine xinerama xml xosd xpm xscreensaver xv xvid xvmc zlib" ABI_X86="64" 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="kexi words flow plan sheets stage tables krita karbon braindump author" CAMERAS="ptp2 canon hp215 sony_dscf1 sony_dscf55" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" FFTOOLS="aviocat cws2fws ffescape ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher" GPSD_PROTOCOLS="aivdm ashtech earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 navcom nmea ntrip oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt tripmate tsip ubx fury geostar nmea2000" GRUB_PLATFORMS="pc" INPUT_DEVICES="evdev keyboard mouse joystick" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer scripting-beanshell scripting-javascript nlpsolver" LINGUAS="cs en" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-3" PYTHON_SINGLE_TARGET="python2_7" PYTHON_TARGETS="python2_7 python3_2" QEMU_SOFTMMU_TARGETS="x86_64 arm i386" QEMU_USER_TARGETS="arm i386 x86_64" RUBY_TARGETS="ruby19 ruby18" USERLAND="GNU" VIDEO_CARDS="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"
USE_PYTHON="2.7 3.2"
Unset:  CPPFLAGS, CTARGET, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Comment 1 David Kredba 2013-06-10 17:33:16 UTC
Created attachment 350696 [details]
patch.out file
Comment 2 Jeroen Roovers (RETIRED) gentoo-dev 2013-06-10 18:22:27 UTC
Please attach the entire build log to this bug report.
Comment 3 Jeroen Roovers (RETIRED) gentoo-dev 2013-06-10 18:40:10 UTC
Also, which version of sys-devel/patch do you have?
Comment 4 Rafał Mużyło 2013-06-10 19:44:36 UTC
> File i18n/mythfrontend_en_gb.qm: git binary diffs are not supported.

That (most likely) deals with build log problem - given the NEWS in patch 2.7, either in 2.6 those were skipped or the patch wasn't tested outside git.
Comment 5 Richard Freeman gentoo-dev 2013-06-10 21:01:24 UTC
(In reply to Rafał Mużyło from comment #4)
> > File i18n/mythfrontend_en_gb.qm: git binary diffs are not supported.
> 
> That (most likely) deals with build log problem - given the NEWS in patch
> 2.7, either in 2.6 those were skipped or the patch wasn't tested outside git.

Actually, I think they work fine in 2.6, but not in 2.7.  At the very least they don't generate errors.  Not really sure what is up with that (would be nice if these were supported).

I removed the patch - another case of bug 463828.  I'll try to keep a closer eye out for these in the future.

Might take a while for the new manifest to make its way through the mirrors/etc.  The new ebuild also includes subslot deps as well.
Comment 6 Rafał Mużyło 2013-06-10 22:24:56 UTC
(In reply to Richard Freeman from comment #5)
> (In reply to Rafał Mużyło from comment #4)
> > > File i18n/mythfrontend_en_gb.qm: git binary diffs are not supported.
> > 
> > That (most likely) deals with build log problem - given the NEWS in patch
> > 2.7, either in 2.6 those were skipped or the patch wasn't tested outside git.
> 
> Actually, I think they work fine in 2.6, but not in 2.7.  At the very least
> they don't generate errors.  Not really sure what is up with that (would be
> nice if these were supported).
> 

Not quite - AFAIU, in patch 2.6 '--git' was simply ignored and binary patches were simply skipped, in 2.7 '--git' is recognized, but binary patches are still unsupported.
The question is: should patch treat skipped binary patches as a reason for setting error status or not ?
Comment 7 David Kredba 2013-06-11 04:14:02 UTC
Hello, Thank you. Yes, I use sys-devel/patch-2.7.1-r1.
Comment 8 Nathan Caldwell 2013-06-14 02:32:03 UTC
(In reply to Richard Freeman from comment #5)
> (In reply to Rafał Mużyło from comment #4)
> > > File i18n/mythfrontend_en_gb.qm: git binary diffs are not supported.
> > 
> > That (most likely) deals with build log problem - given the NEWS in patch
> > 2.7, either in 2.6 those were skipped or the patch wasn't tested outside git.
> 
> I removed the patch - another case of bug 463828.  I'll try to keep a closer
> eye out for these in the future.
> 
> Might take a while for the new manifest to make its way through the
> mirrors/etc.  The new ebuild also includes subslot deps as well.

This is still failing for me on 0152-Updated-MythFrontend-English-GB-translation.patch
Comment 9 Nathan Caldwell 2013-06-14 02:34:42 UTC
Created attachment 350928 [details]
0152-Updated-MythFrontend-English-GB-translation.patch.out
Comment 10 Richard Freeman gentoo-dev 2013-06-14 11:06:34 UTC
Sorry, somehow managed to re-fetch the bad patch from the mirrors when creating the manifest.  I updated it with the correct patch file.  The mirrors should now delete/replace the bad one after a few hours.