Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 728996 - games-simulation/flightgear-9999 - patching file CMakeLists.txt failed
Summary: games-simulation/flightgear-9999 - patching file CMakeLists.txt failed
Status: RESOLVED NEEDINFO
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Maciej Mrozowski
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-06-21 12:40 UTC by Michal Plichta
Modified: 2020-08-02 22:31 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 Michal Plichta 2020-06-21 12:40:18 UTC
* Fetching git://git.code.sf.net/p/flightgear/flightgear ...
git fetch git://git.code.sf.net/p/flightgear/flightgear +refs/heads/next:refs/heads/next
git symbolic-ref refs/git-r3/games-simulation/flightgear/0/__main__ refs/heads/next
 * Checking out git://git.code.sf.net/p/flightgear/flightgear to /var/tmp/portage/games-simulation/flightgear-9999/work/flightgear-9999 ...
git checkout --quiet next
GIT update -->
   repository:               git://git.code.sf.net/p/flightgear/flightgear
   at the commit:            b35bf51fa0e6e4ebec7328e853e3d5817eeba1af
>>> Source unpacked in /var/tmp/portage/games-simulation/flightgear-9999/work
>>> Preparing source in /var/tmp/portage/games-simulation/flightgear-9999/work/flightgear-9999 ...
 * Applying flightgear-2018.3.2-cmake.patch ...
patching file CMakeLists.txt
Hunk #1 FAILED at 323.
1 out of 1 hunk FAILED -- saving rejects to file CMakeLists.txt.rej
patching file src/GUI/CMakeLists.txt
Hunk #1 FAILED at 127.
1 out of 1 hunk FAILED -- saving rejects to file src/GUI/CMakeLists.txt.rej     

Reproducible: Always
Comment 1 Maciej Mrozowski gentoo-dev 2020-08-02 20:10:37 UTC
Oh well, I think I should drop live ebuild alltogether. Unless someone is willing to rebase patches...
Comment 2 Larry the Git Cow gentoo-dev 2020-08-02 22:30:44 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfd4818dec077ddfc863298bc209ffdd08a7766

commit ecfd4818dec077ddfc863298bc209ffdd08a7766
Author:     Maciej Mrozowski <reavertm@gentoo.org>
AuthorDate: 2020-08-02 21:02:34 +0000
Commit:     Maciej Mrozowski <reavertm@gentoo.org>
CommitDate: 2020-08-02 22:30:10 +0000

    games-simulation/flightgear: Version bump, remove old, fixes
    
    Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>
    Closes: https://bugs.gentoo.org/724694
    Bug: https://bugs.gentoo.org/728996

 dev-games/simgear/Manifest                         |  2 +-
 ...ear-2019.1.1.ebuild => simgear-2020.1.2.ebuild} |  6 +--
 dev-games/simgear/simgear-9999.ebuild              |  6 +--
 games-simulation/flightgear-data/Manifest          |  2 +-
 ....1.1.ebuild => flightgear-data-2020.1.2.ebuild} |  2 +-
 .../flightgear-data/flightgear-data-9999.ebuild    |  2 +-
 games-simulation/flightgear/Manifest               |  2 +-
 .../files/flightgear-2018.3.2-cmake.patch          | 24 ------------
 .../files/flightgear-2020.1.2-cmake.patch          | 45 ++++++++++++++++++++++
 ...-2019.1.1.ebuild => flightgear-2020.1.2.ebuild} | 19 +++++----
 games-simulation/flightgear/flightgear-9999.ebuild | 14 ++++---
 11 files changed, 76 insertions(+), 48 deletions(-)