commit: 31c1225c42f4e630ab18a10609674262053235b3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Nov 27 20:20:12 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 28 20:30:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31c1225c
games-strategy/megaglest: Put wxWidgets-3.2 upstream backports into tarball One of the SRC_URI patches was actually unused/a rebased FILESDIR version used instead. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-strategy/megaglest/Manifest | 6 +- .../files/megaglest-3.13.0-fbd0cfb1.patch | 75 ---------------------- .../megaglest/megaglest-3.13.0-r5.ebuild | 13 +--- 3 files changed, 3 insertions(+), 91 deletions(-) diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest index 2e49657c50e6..1eca6faa3eb2 100644 --- a/games-strategy/megaglest/Manifest +++ b/games-strategy/megaglest/Manifest @@ -1,6 +1,2 @@ -DIST megaglest-3.13.0-412b37d0.patch 779 BLAKE2B 317743191d54eb4d57d96ce5793cfc059e9f82f2e9ca9c2bba197909e40b2574b05aab47e5ba07b8181eb705e9668b7673a8c88468c3120b4d3ff3e22ae55b24 SHA512 3ececb0b9f4e704bbf6e072c8b12c02a86b27b8289843afd6d1ea5342fae25a347b342c8204873a5954f5cb9dbed6af7d6ea9c9d3f1ac1de46152a23fde4b828 -DIST megaglest-3.13.0-5801b1fa.patch 5691 BLAKE2B 3f0b01ed1bce432c6d5f7d882d6e846475015919f1a0c1f1c740582accc3b957d73edda3a3dfc488706424041b5fe1141ce9a911500baab599cea9505a2958e2 SHA512 93c4a9e829c5eb9d1924f423c62a3213421121cd14781e1c80f4fb1a0ffdcbb492bae12e7b0ef0f8e3018c4da886d02b2ac122e05738901edfdb16a5b653e824 -DIST megaglest-3.13.0-789e1cdf.patch 1543 BLAKE2B f75ce901683b6a9f9578ec6987101f10e9c5f3e5295aab4e3ccbe0ca37a8136d70f775654321d67614c31bec96312bc3ea334ed97e599ec73825771bb657045d SHA512 6ee86999341bb12dbc6db8c3f532c052400ab685d0c3ec3e286682eba30fd075623073dbb2427155f255f0555b42c3884ac8405f07ab2429e6809e1a5dbd5aa0 -DIST megaglest-3.13.0-e09ba53c.patch 3485 BLAKE2B fa0c94b88726f239957b3fb950c6be2be18e564bbf2cfbc809a069961edae0023d69d629cdaab73ca31bb731fbf0dbbd2103a8b84c3f857f423d08addacde706 SHA512 4785ff6c1967aaacd8e674cdd6f3a2ecd038cd1951a2337899f5d9654376c7549360f65ed36bc9f0e108f6fff809486f38a6f641afc694b248c6a47b1b1f1ebb -DIST megaglest-3.13.0-fbd0cfb1.patch 1820 BLAKE2B b3a1bf7ca1b51d948b354e4b9cd2d675dadac7b9f072e11032f117479c5199d1f7cfd87146da46a40387bfeaef8433144e37410aa8c92865048744ae31ffd730 SHA512 960fe1be66eb1737e9292c5956c09902e6761ed8de56d864950268e3e8a5184f59b7cf3521629aeb460842f4423699526d5dd71fa0494c7ac2899cab117e7f45 +DIST megaglest-3.13.0-wxWidgets-3.2.tar.xz 3584 BLAKE2B 2083ce8db1e81c827b8be6fefe9c56a677ad8b8e63ec89ee1b3a7421f1314d792ccb5b49b345bcbd2151101f29156255444d26ed5421409ddb838fba6395d40a SHA512 4efae817002df37f9ff20583a8c5d62524d64fe31f165c52999714f7de0c5322658793ecedd247438bdc855ac5293c22339249cd64b1957458ddf39bd49b34b1 DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153 SHA512 5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c diff --git a/games-strategy/megaglest/files/megaglest-3.13.0-fbd0cfb1.patch b/games-strategy/megaglest/files/megaglest-3.13.0-fbd0cfb1.patch deleted file mode 100644 index 6f2eb91847e2..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.13.0-fbd0cfb1.patch +++ /dev/null @@ -1,75 +0,0 @@ -From fbd0cfb17ed759d24aeb577a602b0d97f7895cc2 Mon Sep 17 00:00:00 2001 -From: titiger <[email protected]> -Date: Sat, 29 May 2021 02:41:40 +0200 -Subject: [PATCH] get rid of manual wxPaintEvent creation - ---- - source/glest_map_editor/main.cpp | 19 +++++++------------ - 1 file changed, 7 insertions(+), 12 deletions(-) - -diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp -index 3a799c864..889a1dea8 100644 ---- a/source/glest_map_editor/main.cpp -+++ b/source/glest_map_editor/main.cpp -@@ -545,8 +545,7 @@ MainWindow::~MainWindow() { - } - - void MainWindow::setDirty(bool val) { -- wxPaintEvent ev; -- onPaint(ev); -+ refreshThings(); - if (fileModified && val) { - return; - } -@@ -582,8 +581,8 @@ void MainWindow::onMouseDown(wxMouseEvent &event, int x, int y) { - if (!isDirty()) { - setDirty(true); - } -- wxPaintEvent ev; -- onPaint(ev); -+ -+ refreshThings(); - } - event.Skip(); - } -@@ -593,18 +592,16 @@ void MainWindow::onMouseWheelDown(wxMouseEvent &event) { - if(program == NULL) { - return; - } -- wxPaintEvent ev; - program->incCellSize(1); -- onPaint(ev); -+ refreshThings(); - } - - void MainWindow::onMouseWheelUp(wxMouseEvent &event) { - if(program == NULL) { - return; - } -- wxPaintEvent ev; - program->incCellSize(-1); -- onPaint(ev); -+ refreshThings(); - } - - void MainWindow::onMouseMove(wxMouseEvent &event, int x, int y) { -@@ -651,8 +648,7 @@ void MainWindow::onMouseMove(wxMouseEvent &event, int x, int y) { - lastY = y; - - if (repaint) { -- wxPaintEvent ev; -- onPaint(ev); -+ refreshThings(); - } - event.Skip(); - } -@@ -866,8 +862,7 @@ void MainWindow::onMenuEditReset(wxCommandEvent &event) { - currentFile = ""; - fileName = "New (unsaved) map"; - -- wxPaintEvent ev; -- onPaint(ev); -+ refreshThings(); - } - - void MainWindow::onMenuEditResetPlayers(wxCommandEvent &event) { diff --git a/games-strategy/megaglest/megaglest-3.13.0-r5.ebuild b/games-strategy/megaglest/megaglest-3.13.0-r5.ebuild index 108f0f374121..c55df0dd7c6b 100644 --- a/games-strategy/megaglest/megaglest-3.13.0-r5.ebuild +++ b/games-strategy/megaglest/megaglest-3.13.0-r5.ebuild @@ -19,11 +19,7 @@ inherit cmake desktop flag-o-matic lua-single readme.gentoo-r1 virtualx wxwidget DESCRIPTION="Cross-platform 3D realtime strategy game" HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source"; SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz - https://github.com/MegaGlest/megaglest-source/commit/789e1cdf.patch -> ${P}-789e1cdf.patch - https://github.com/MegaGlest/megaglest-source/commit/5801b1fa.patch -> ${P}-5801b1fa.patch - https://github.com/MegaGlest/megaglest-source/commit/412b37d0.patch -> ${P}-412b37d0.patch - https://github.com/MegaGlest/megaglest-source/commit/e09ba53c.patch -> ${P}-e09ba53c.patch - https://github.com/MegaGlest/megaglest-source/commit/fbd0cfb1.patch -> ${P}-fbd0cfb1.patch + https://dev.gentoo.org/~asturm/distfiles/${P}-wxWidgets-3.2.tar.xz " LICENSE="GPL-3 BitstreamVera" @@ -80,12 +76,7 @@ PATCHES=( "${FILESDIR}/${P}-GLEW_ERROR_NO_GLX_DISPLAY.patch" "${FILESDIR}/${P}-help2man.patch" - # Fix build with wxWidgets 3.2 - "${DISTDIR}/${P}-789e1cdf.patch" - "${DISTDIR}/${P}-5801b1fa.patch" - "${DISTDIR}/${P}-412b37d0.patch" - "${DISTDIR}/${P}-e09ba53c.patch" - "${FILESDIR}/${P}-fbd0cfb1.patch" + "${WORKDIR}/${P}-wxWidgets-3.2" # upstream git master ) DISABLE_AUTOFORMATTING="yes"
