#2 Patch for GCC 13 and offer upstream with the GCC 11 patch
Merged a year ago by martinkg. Opened a year ago by music.
rpms/ music/openclonk gcc13  into  rawhide

file added
+43
@@ -0,0 +1,43 @@ 

+ From e304efde2c8643bbc0fc1ad5e85024982744b233 Mon Sep 17 00:00:00 2001

+ From: "Benjamin A. Beasley" <code@musicinmybrain.net>

+ Date: Mon, 30 Jan 2023 10:47:11 -0500

+ Subject: [PATCH 1/2] Add missing #include needed for GCC 11

+ 

+ ---

+  src/C4Include.h | 1 +

+  1 file changed, 1 insertion(+)

+ 

+ diff --git a/src/C4Include.h b/src/C4Include.h

+ index d4b01612c7..b3ac83ee82 100644

+ --- a/src/C4Include.h

+ +++ b/src/C4Include.h

+ @@ -52,6 +52,7 @@ constexpr bool SOLIDMASK_DEBUG = false;

+  #include <ctime>

+  #include <iostream>

+  #include <list>

+ +#include <limits>

+  #include <map>

+  #include <memory>

+  #include <regex>

+ 

+ From c416d11069ef7b180be466024097f60abd849c8a Mon Sep 17 00:00:00 2001

+ From: "Benjamin A. Beasley" <code@musicinmybrain.net>

+ Date: Mon, 30 Jan 2023 10:42:35 -0500

+ Subject: [PATCH 2/2] Add missing #include needed for GCC 13

+ 

+ ---

+  tools/generate_license_headers.cpp | 1 +

+  1 file changed, 1 insertion(+)

+ 

+ diff --git a/tools/generate_license_headers.cpp b/tools/generate_license_headers.cpp

+ index 00bc82ba3d..095d078c75 100644

+ --- a/tools/generate_license_headers.cpp

+ +++ b/tools/generate_license_headers.cpp

+ @@ -9,6 +9,7 @@

+  #include <locale>

+  #include <regex>

+  #include <cstdlib>

+ +#include <cstdint>

+  

+  // Generating this file in a way that neither bad old clang, bad old xcode, or bad old msvc will choke on it is actually not that easy.

+  // MSVC limits the string length to 16K, but just doing ("x" "y") or ("x" + "y") doesn't constitute two strings

file removed
-12
@@ -1,12 +0,0 @@ 

- diff --git a/src/C4Include.h b/src/C4Include.h

- index d4b0161..84ebd67 100644

- --- a/src/C4Include.h

- +++ b/src/C4Include.h

- @@ -63,6 +63,7 @@ constexpr bool SOLIDMASK_DEBUG = false;

-  #include <vector>

-  #include <unordered_set>

-  #include <math.h>

- +#include <limits>

-  

-  #include "C4Prototypes.h"

-  #include "lib/C4Log.h"

file modified
+8 -3
@@ -11,15 +11,17 @@ 

  Name:           openclonk

  Summary:        Multiplayer action, tactics and skill game

  Version:        8.1

- Release:        20.%{date}git%{shortcommit}%{?dist}

+ Release:        21.%{date}git%{shortcommit}%{?dist}

  URL:            http://www.openclonk.org/

  Source0:        https://github.com/openclonk/openclonk/archive/%{commit}/%{name}-%{commit}.tar.gz

  License:        ISC and CC-BY-SA

  

  Source1:        %{name}-html.desktop

  Source2:        %{name}-docs.png

- Patch0:         %{name}-gcc11.patch

- Patch1:         %{name}-bin-path.patch

+ Patch:          %{name}-bin-path.patch

+ # Add missing #include directives needed for recent GCC versions

+ # https://github.com/openclonk/openclonk/pull/160

+ Patch:          https://github.com/openclonk/openclonk/pull/160.patch

  

  BuildRequires: make

  BuildRequires:  boost-devel
@@ -205,6 +207,9 @@ 

  %endif

  

  %changelog

+ * Mon Jan 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 8.1-21.20210103git701bcf3

+ - Patch for GCC 13 and offer upstream with the GCC 11 patch

+ 

  * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-20.20210103git701bcf3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

  

Fixes FTBFS in Rawhide/F38.

Pull-Request has been merged by martinkg

a year ago