Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 769164 - games-strategy/freeciv: Drop optional x11-libs/gtk+:2 support
Summary: games-strategy/freeciv: Drop optional x11-libs/gtk+:2 support
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Games
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks: gtk2-removal
  Show dependency tree
 
Reported: 2021-02-06 22:51 UTC by Andreas Sturmlechner
Modified: 2021-05-16 19:11 UTC (History)
1 user (show)

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


Attachments
=games-strategy/freeciv-2.6.3 without gtk2 and with gtk3 (freeciv-2.6.3.ebuild,4.62 KB, text/plain)
2021-03-19 03:52 UTC, Patrice Levesque
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Andreas Sturmlechner gentoo-dev 2021-02-06 22:51:30 UTC
x11-libs/gtk+:2 is EOL.
Comment 1 Patrice Levesque 2021-03-19 03:52:05 UTC
I modified the current 2.6.2 ebuild to support the 2.6.3 version and get rid of gtk2.

- Changed occurrences of `gtk2` by `gtk3`.
- Dropped the qt5 patch that's now upstreamed.
- Removed `sed` on a file that's not present anymore in the source tree.

I did not do intensive testing but I'm able to play a couple of turns using the gtk3 version without any issue.
Comment 2 Patrice Levesque 2021-03-19 03:52:58 UTC
Created attachment 692349 [details]
=games-strategy/freeciv-2.6.3 without gtk2 and with gtk3
Comment 3 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2021-03-19 04:12:37 UTC
(In reply to Patrice Levesque from comment #2)
> Created attachment 692349 [details]
> =games-strategy/freeciv-2.6.3 without gtk2 and with gtk3

Can you include this with a GCO sign off (Signed-off-by: real name <email>) if you agree with it, and ideally in git format-patch or GitHub PR format?
Comment 4 Patrice Levesque 2021-03-21 21:43:49 UTC
Created PR https://github.com/gentoo/gentoo/pull/20046 on github to address comment #3.
Comment 5 Larry the Git Cow gentoo-dev 2021-05-15 16:25:47 UTC
The bug has been closed via the following commit(s):

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

commit 26984cfb5749d6fcd3858e46eeb7257d060fd372
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2021-05-15 12:58:14 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2021-05-15 16:25:15 +0000

    games-strategy/freeciv: 2.6.4 version bump
    
    Switch to gtk+-3
    Fix BDEPEND/DEPEND
    
    Closes: https://bugs.gentoo.org/769164
    Thanks-to: Patrice Levesque <gentoo.wayne@ptaff.ca>
    Package-Manager: Portage-3.0.13, Repoman-3.0.2
    Closes: https://github.com/gentoo/gentoo/pull/20046
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 games-strategy/freeciv/Manifest             |   1 +
 games-strategy/freeciv/freeciv-2.6.4.ebuild | 182 ++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)
Comment 6 Larry the Git Cow gentoo-dev 2021-05-16 19:11:08 UTC
The bug has been closed via the following commit(s):

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

commit da8940e3d8eef6796436dcb7d4fc624665f19a9b
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2021-05-15 16:27:26 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2021-05-16 19:10:46 +0000

    games-strategy/freeciv: Drop 2.6.2
    
    Closes: https://bugs.gentoo.org/769164
    Package-Manager: Portage-3.0.18, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 games-strategy/freeciv/Manifest                    |   1 -
 .../freeciv/files/freeciv-2.6.2-qt515.patch        |  39 -----
 games-strategy/freeciv/freeciv-2.6.2.ebuild        | 190 ---------------------
 3 files changed, 230 deletions(-)