[arch-commits] Commit in springlobby/trunk (PKGBUILD springlobby-wxgtk-3.1.patch)

[Sven-Hendrik Haase]

    Date: Wednesday, July 15, 2020 @ 06:48:20
  Author: svenstaro
Revision: 663833

upgpkg: springlobby 0.270-1

Modified:
  springlobby/trunk/PKGBUILD
Deleted:
  springlobby/trunk/springlobby-wxgtk-3.1.patch

-----------------------------+
 PKGBUILD                    |   11 ++++-------
 springlobby-wxgtk-3.1.patch |   11 -----------
 2 files changed, 4 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-15 06:09:12 UTC (rev 663832)
+++ PKGBUILD	2020-07-15 06:48:20 UTC (rev 663833)
@@ -2,8 +2,8 @@
 # Contributor: DuGi <dugi at irc.pl>
 
 pkgname=springlobby
-pkgver=0.269
-pkgrel=2
+pkgver=0.270
+pkgrel=1
 pkgdesc="A free cross-platform lobby client for the Spring RTS project"
 arch=('x86_64')
 url="http://springlobby.info/"
@@ -13,15 +13,12 @@
 optdepends=('sdl' 'sdl_sound' 'sdl_mixer')
 makedepends=('boost' 'cmake' 'git')
 source=("git+https://github.com/springlobby/springlobby.git#tag=$pkgver"
-        "git+https://github.com/spring/pr-downloader.git"
-        "springlobby-wxgtk-3.1.patch")
+        "git+https://github.com/spring/pr-downloader.git")
 sha512sums=('SKIP'
-            'SKIP'
-            'bf70703c5f001bfc92699d4c21e6ca63b35994319f1096e50b07dba4ceb48cd7d67798fa1668c3c654b0372465a5ad383d9cbae9488f08dea6d78dee8901d418')
+            'SKIP')
 
 prepare() {
   cd $pkgname
-  patch -p1 -i ../springlobby-wxgtk-3.1.patch # Fix build with wxgtk 3.1
 
   git submodule init
   git config submodule."src/downloader/lib".url "$srcdir"/pr-downloader

Deleted: springlobby-wxgtk-3.1.patch
===================================================================
--- springlobby-wxgtk-3.1.patch	2020-07-15 06:09:12 UTC (rev 663832)
+++ springlobby-wxgtk-3.1.patch	2020-07-15 06:48:20 UTC (rev 663833)
@@ -1,11 +0,0 @@
---- springlobby-0.267/src/springsettings/tab_abstract.cpp.orig	2019-03-26 07:45:27.981903360 +0000
-+++ springlobby-0.267/src/springsettings/tab_abstract.cpp	2019-03-26 07:45:42.628735154 +0000
-@@ -95,7 +95,7 @@
- {
- 	try {
- 		//special treatment for resolution that'll set proper defaults for res
--		wxDisplay display(0);
-+		wxDisplay display(0U);
- 		//		wxRect display_rect ( display.GetGeometry() );
- 		//		const int current_x_res = LSL::susynclib().GetSpringConfigInt(RC_TEXT[0].key,display_rect.width);
- 		//		const int current_y_res = LSL::susynclib().GetSpringConfigInt(RC_TEXT[1].key,display_rect.height);