[packages/asc] - up to 2.8.0.2

[baggins]

commit 9fb206e35df93e267879b0a29fe50b702d89fc39
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Aug 13 08:51:17 2020 +0200

    - up to 2.8.0.2

 asc.spec    | 15 ++++++++++-----
 gcc10.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 5 deletions(-)
---
diff --git a/asc.spec b/asc.spec
index 9361103..0050863 100644
--- a/asc.spec
+++ b/asc.spec
@@ -4,16 +4,18 @@
 Summary:	Advanced Strategic Command - a free, turn based strategy game
 Summary(pl.UTF-8):	Advanced Strategic Command - turowa gra strategiczna
 Name:		asc
-Version:	2.6.0.0
-Release:	3
+Version:	2.8.0.2
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games/Strategy
-Source0:	http://downloads.sourceforge.net/asc-hq/%{name}-%{version}.tar.bz2
-# Source0-md5:	3f0002f1d3ccdf447b4721a171ed2ac3
+#Source0:	https://github.com/ValHaris/asc-hq/archive/ASC%{dashversion}/%{name}-%{version}.tar.gz
+Source0:	http://terdon.asc-hq.org/asc/builds/%{name}-%{version}.tar.bz2
+# Source0-md5:	f2dfaa794a3ba800f4095815be5b8009
 Source1:	%{name}.desktop
 Source2:	%{name}.xpm
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-lua.patch
+Patch2:		gcc10.patch
 URL:		http://www.asc-hq.org/
 BuildRequires:	SDL-devel >= 1.2.2
 BuildRequires:	SDL_image-devel
@@ -64,11 +66,14 @@ Map editor and other tools for ASC.
 Edytor map i inne narzędzia dla ASC.
 
 %prep
-%setup -q
+# upstream tarball is busted, contains 2.8.0.1 dir instead of 2.8.0.2
+%setup -q -n asc-2.8.0.1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
+export CXXFLAGS="%{rpmcxxflags} -std=c++11 -D__EXPORT__="
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..e8405ce
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,42 @@
+diff -Nrup a/source/libs/paragui/src/widgets/pgbutton.cpp b/source/libs/paragui/src/widgets/pgbutton.cpp
+--- a/source/libs/paragui/src/widgets/pgbutton.cpp	2018-02-26 17:20:08.000000000 -0700
++++ b/source/libs/paragui/src/widgets/pgbutton.cpp	2019-09-24 11:22:33.775554408 -0600
+@@ -102,31 +102,31 @@ void PG_Button::LoadThemeStyle(const std
+ 	SetFontColor(fontcolor);
+ 
+ 	switch (GetID()) {
+-		case OK:
++		case int(OK):
+ 			SetIcon(t->FindSurface(widgettype, objectname, "ok_icon"));
+ 			break;
+ 
+-		case YES:
++		case int(YES):
+ 			SetIcon(t->FindSurface(widgettype, objectname, "yes_icon"));
+ 			break;
+ 
+-		case NO:
++		case int(NO):
+ 			SetIcon(t->FindSurface(widgettype, objectname, "no_icon"));
+ 			break;
+ 
+-		case APPLY:
++		case int(APPLY):
+ 			SetIcon(t->FindSurface(widgettype, objectname, "apply_icon"));
+ 			break;
+ 
+-		case CANCEL:
++		case int (CANCEL):
+ 			SetIcon(t->FindSurface(widgettype, objectname, "cancel_icon"));
+ 			break;
+ 
+-		case CLOSE:
++		case int (CLOSE):
+ 			SetIcon(t->FindSurface(widgettype, objectname, "close_icon"));
+ 			break;
+ 
+-		case HELP:
++		case int (HELP):
+ 			SetIcon(t->FindSurface(widgettype, objectname, "help_icon"));
+ 			break;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/asc.git/commitdiff/9fb206e35df93e267879b0a29fe50b702d89fc39