Bug 659540

Summary:	www-client/firefox-60.1.0 2005_ffmpeg4.patch reverses but not patches
Product:	Gentoo Linux	Reporter:	Ulenrich <ulenrich>
Component:	Current packages	Assignee:	Mozilla Gentoo Team <mozilla>
Status:	RESOLVED FIXED
Severity:	normal	CC:	alexander
Priority:	Normal
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---

Description Ulenrich 2018-06-28 20:27:14 UTC

without patching the source get successfully reversed patched:

# cat firefox/2005_ffmpeg4.patch  |patch -p1 --reverse
patching file dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
patching file dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
Hunk #1 succeeded at 56 (offset -2 lines).
Hunk #2 succeeded at 81 (offset -2 lines).
Hunk #3 succeeded at 129 (offset -2 lines).
patching file dom/media/platforms/ffmpeg/FFmpegLibs.h
patching file dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
patching file dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h
patching file dom/media/platforms/ffmpeg/ffmpeg58/moz.build
patching file dom/media/platforms/ffmpeg/moz.build
---
what means the new release has this patch already:
*   2004_fix_lto_builds.patch ...
 [ ok ]
 *   2005_ffmpeg4.patch ...
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp.rej
3 out of 3 hunks FAILED -- saving rejects to file dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/FFmpegLibs.h.rej
2 out of 2 hunks FAILED -- saving rejects to file dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/ffmpeg58/moz.build.rej
1 out of 1 hunk FAILED -- saving rejects to file dom/media/platforms/ffmpeg/moz.build.rej

Comment 1 Ulenrich 2018-06-28 20:57:03 UTC

Now trying with my own firefox-60.1-patches
only using this series without 2005:

1001_gentoo_prefs.patch
1002_drop_build_id.patch
1003_gentoo_specific_pgo.patch
1004_fix_pie_detection.patch
1005_fix_fortify_sources.patch
2000_system_harfbuzz.patch
2001_system_graphite2.patch
2002_musl_getid.patch
2003_nICER_implicit_decls.patch
2004_fix_lto_builds.patch
6001_add_missing_header_for_basename.patch
6002_add_alternate_name_for_private_siginfo_struct_member.patch
6003_fix_syscall_wrappers_on_musl.patch
6004_musl_drop_alloc_hooks.patch
6005_musl_memory_report.patch
6006_musl_pthread_setname.patch
6007_musl_fix_tools.patch

Comment 2 Jory A. Pratt gentoo-dev

2018-06-28 21:44:25 UTC

Has already been fixed in tree, we just rm the patch as it landed on the esr branch.