Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 868315

Summary: media-video/handbrake-9999 Failed Patch
Product: Gentoo Linux Reporter: Tom Poplawski <poplawtm>
Component: Current packagesAssignee: James Beddek <telans>
Status: RESOLVED FIXED    
Severity: normal CC: jstein, proxy-maint
Priority: Normal    
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---
Bug Depends on: 868327    
Bug Blocks:    
Attachments: Corrected patch for handbrake-9999

Description Tom Poplawski 2022-09-03 23:53:55 UTC
patch -p1  failed with /var/tmp/portage/media-video/handbrake-9999/files/handbrake-1.3.0-dont-search-for-python.patch

Patch for the failed patch

--- -	2022-09-03 18:35:26.256017124 -0500
+++ /var/db/repos/gentoo/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch	2022-09-03 18:35:00.900251221 -0500
@@ -14,7 +14,7 @@
 -            break
 -        fi
 -    done
--    if [ pp != "" ]; then
+-    if [ "$pp" != "" ]; then
 -        exec $pp `dirname $0`/make/configure.py "$@"
 -        exit 0
 -    else
Comment 1 Nick Pelepchan 2023-01-15 21:10:29 UTC
Created attachment 848609 [details, diff]
Corrected patch for handbrake-9999

The patch sync'd was incorrect, diff is below.

diff handbrake-1.3.0-dont-search-for-python.patch handbrake-1.3.0-dont-search-for-python.patch.bak
2c2
< index 68778e251..2f5834083 100755
---
> index 5c870e1d7..2f5834083 100755
17c17
< -    if [ "$pp" != "" ]; then
---
> -    if [ pp != "" ]; then
Comment 2 Nick Pelepchan 2023-01-15 21:11:31 UTC
Can confirm the patch is bad, diff is below.

Steps to fix (for users) are below, corrected patch is attached.

1) Replace /var/tmp/portage/media-video/handbrake-9999/files/handbrake-1.3.0-dont-search-for-python.patch with the attached patch file.
2) As root; ebuild $(portageq get_repo_path / gentoo)/media-video/handbrake/handbrake-9999.ebuild digest
3) As root; ebuild $(portageq get_repo_path / gentoo)/media-video/handbrake/handbrake-9999.ebuild clean prepare
4) emerge handbrake-9999 as normal
Comment 3 Alexey Chernyak 2023-01-31 00:23:12 UTC
The attached patch works for media-video/handbrake-9999 but it breaks media-video/handbrake-1.5.1.

Looks like the same patch can no longer be shared between ebuilds.
Comment 4 Alexey Chernyak 2023-01-31 00:32:04 UTC
Bug 868327 seems to be addressing all multiple -9999 build issues, including this patch.
Comment 5 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-04-09 06:59:39 UTC
commit 018626145ba44c7559d63102827faa151cc7e72a (origin/master, origin/HEAD)
Author: Sam James <sam@gentoo.org>
Date:   Sun Apr 9 07:56:37 2023 +0100

    media-video/handbrake: update live ebuild

    Thanks-to: James Beddek <telans@posteo.de>
    Signed-off-by: Sam James <sam@gentoo.org>