commit 007769e01cf2a16874ee55d2762383d94ea611c6
Author: Krzysztof Mrozowicz <[email protected]>
Date: Sun Aug 6 22:37:52 2023 +0000
- up to 1.16.10
gcc13.patch | 39 ---------------------------------------
wesnoth.spec | 6 ++----
2 files changed, 2 insertions(+), 43 deletions(-)
---
diff --git a/wesnoth.spec b/wesnoth.spec
index 95d45ab..a66d4d7 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -9,18 +9,17 @@ Summary: Strategy game with a fantasy theme
Summary(hu.UTF-8): Fantasy környezetben játszódó stratégiai játék
Summary(pl.UTF-8): Gra strategiczna z motywem fantasy
Name: wesnoth
-Version: 1.16.9
+Version: 1.16.10
Release: 1
Epoch: 1
License: GPL v2+
Group: X11/Applications/Games/Strategy
Source0:
http://downloads.sourceforge.net/wesnoth/%{name}-%{version}.tar.bz2
-# Source0-md5: 9b8aaf0d74b4a27b7d6792e0fbfe3a57
+# Source0-md5: b4ae6ae389193cdf0cf768e170f24fd1
Source1: %{name}d.init
Source2: %{name}.tmpfiles
Source3: %{name}.sysconfig
Source4: %{name}d.service
-Patch0: gcc13.patch
URL: http://www.wesnoth.org/
BuildRequires: SDL2-devel >= 2.0.8
BuildRequires: SDL2_image-devel >= 2.0.2
@@ -118,7 +117,6 @@ Ten pakiet zawiera pliki danych dla gry Wesnoth.
%prep
%setup -q
-%patch0 -p1
# don't install locales in %{_datadir}/%{name}
%{__sed} -i 's,${DATADIR}/${LOCALEDIR},${LOCALEDIR},' CMakeLists.txt
diff --git a/gcc13.patch b/gcc13.patch
deleted file mode 100644
index a425e17..0000000
--- a/gcc13.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f073493ebc279cefa391d364c48265058795e1d2 Mon Sep 17 00:00:00 2001
-From: Martin Liska <[email protected]>
-Date: Mon, 23 May 2022 13:44:39 +0200
-Subject: [PATCH] Fix building with GCC 13.
-
-Fixes the following issue:
-base64.hpp:23:49: error: 'uint8_t' was not declared in this scope
-
-and:
-deprecation.hpp:20:22: error: found ':' in nested-name-specifier, expected '::'
----
- src/deprecation.hpp | 1 +
- src/serialization/base64.hpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/deprecation.hpp b/src/deprecation.hpp
-index 33736df1b22c..ee09e73be1d0 100644
---- a/src/deprecation.hpp
-+++ b/src/deprecation.hpp
-@@ -14,6 +14,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <string>
-
- /** See https://wiki.wesnoth.org/CompatibilityStandards for more info. */
-diff --git a/src/serialization/base64.hpp b/src/serialization/base64.hpp
-index dbb3b3d32652..c5d8dd32d3fd 100644
---- a/src/serialization/base64.hpp
-+++ b/src/serialization/base64.hpp
-@@ -15,6 +15,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <string_view>
- #include <vector>
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wesnoth.git/commitdiff/007769e01cf2a16874ee55d2762383d94ea611c6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
