[arch-commits] Commit in megaglest/trunk (PKGBUILD fbd0cfb1.patch)

[Antonio Rojas]

    Date: Friday, July 8, 2022 @ 06:35:20
  Author: arojas
Revision: 1248608

wxwidgets 3.2 rebuild

Added:
  megaglest/trunk/fbd0cfb1.patch
Modified:
  megaglest/trunk/PKGBUILD

----------------+
 PKGBUILD       |   34 +++++++++++++++++++-----
 fbd0cfb1.patch |   75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-08 06:11:28 UTC (rev 1248607)
+++ PKGBUILD	2022-07-08 06:35:20 UTC (rev 1248608)
@@ -3,19 +3,39 @@
 
 pkgname=megaglest
 pkgver=3.13.0
-pkgrel=7
+pkgrel=8
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world"
 arch=('x86_64')
 url="https://megaglest.org"
 license=('GPL3')
 depends=('curl' 'megaglest-data' 'xerces-c' 'sdl2' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew'
-         'libircclient' 'miniupnpc' 'wxgtk3' 'glu' 'libx11' 'libminiupnpc.so')
+         'libircclient' 'miniupnpc' 'wxwidgets-gtk3' 'glu' 'libx11' 'libminiupnpc.so')
 makedepends=('ftjam' 'cmake' 'mesa')
-source=(https://github.com/MegaGlest/megaglest-source/releases/download/${pkgver}/megaglest-source-${pkgver}.tar.xz{,.asc})
+source=(https://github.com/MegaGlest/megaglest-source/releases/download/${pkgver}/megaglest-source-${pkgver}.tar.xz{,.asc}
+        https://github.com/MegaGlest/megaglest-source/commit/789e1cdf.patch
+        https://github.com/MegaGlest/megaglest-source/commit/5801b1fa.patch
+        https://github.com/MegaGlest/megaglest-source/commit/412b37d0.patch
+        https://github.com/MegaGlest/megaglest-source/commit/e09ba53c.patch
+        fbd0cfb1.patch)
 sha256sums=('09fef67bc6878b1afbb0b403fec9fcf7dc270d500fdc62ed98e5f210e398ccb9'
-            'SKIP')
+            'SKIP'
+            'dbb8e5b6953bd2f86ecbb9c60ac00c0c25299f2738fbdc39996adaed844cd6ed'
+            'f3e12b58b39f97109d5d077b7ea7b31a5f21355c55f837584aa2ea62030889c6'
+            '2acda6052ccedd7d0f77067c9b5f01a3a1c5f2ed6b46dc962b18dfdac9515906'
+            '1a01f115bc9653c151fed83b1e6c0b71a4508083777158934be975f8b5b089ff'
+            '5dc0096ea581ca9436b2de528f913ac99de7a1a5d00bc7e8d52117298fd1eeb5')
 validpgpkeys=('0DA321A44B30EF477E9A6DB8DE45EB9E71EEB59B')
 
+prepare() {
+  # Fix build with wxWidgets 3.2
+  cd $pkgname-$pkgver
+  patch -p1 < ../789e1cdf.patch
+  patch -p1 < ../5801b1fa.patch
+  patch -p1 < ../412b37d0.patch
+  patch -p1 < ../e09ba53c.patch
+  patch -p1 < ../fbd0cfb1.patch
+}
+
 build() {
   cd megaglest-${pkgver}
 
@@ -25,9 +45,9 @@
   cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_CXX_FLAGS="-lX11 ${CXXFLAGS}" \
-    -DWANT_GIT_STAMP=0 \
-    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+    -DCMAKE_C_FLAGS="${CXXFLAGS} -fcommon" \
+    -DCMAKE_CXX_FLAGS="-lX11 ${CXXFLAGS} -fcommon" \
+    -DWANT_GIT_STAMP=0
   make VERBOSE=1
 }
 

Added: fbd0cfb1.patch
===================================================================
--- fbd0cfb1.patch	                        (rev 0)
+++ fbd0cfb1.patch	2022-07-08 06:35:20 UTC (rev 1248608)
@@ -0,0 +1,75 @@
+From fbd0cfb17ed759d24aeb577a602b0d97f7895cc2 Mon Sep 17 00:00:00 2001
+From: titiger <titi_linux at megaglest.org>
+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) {