gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

games-emulation/libretro-snes9x: fix build with GCC 11

Browse Source 
Closes: https://bugs.gentoo.org/787116
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-06-15 02:02:15 +00:00
parent dea12a74cc
commit ab67174af2
2 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
games-emulation/libretro-snes9x/files/libretro-snes9x-0.0.2_pre20200107-gcc11-const.patch Normal file
View File

@@ -0,0 +1,52 @@
https://bugs.gentoo.org/787116
https://github.com/libretro/snes9x/commit/da1fc9a69d8fc776f1b13b080bc27cf329c52a1f
From da1fc9a69d8fc776f1b13b080bc27cf329c52a1f Mon Sep 17 00:00:00 2001
From: Alberto Fustinoni <alberto@aftnet.net>
Date: Thu, 10 Sep 2020 22:22:46 +0900
Subject: [PATCH] Build fix
---
conffile.cpp | 2 +-
conffile.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/conffile.cpp b/conffile.cpp
index 817afae7f..5e121e2cc 100644
--- a/conffile.cpp
+++ b/conffile.cpp
@@ -452,7 +452,7 @@ void ConfigFile::ClearLines()
}
}
-bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) {
+bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) const {
if(curConfigFile && a.section!=b.section){
const int sva = curConfigFile->GetSectionSize(a.section);
const int svb = curConfigFile->GetSectionSize(b.section);
diff --git a/conffile.h b/conffile.h
index ba69812df..c09cea362 100644
--- a/conffile.h
+++ b/conffile.h
@@ -90,18 +90,18 @@ class ConfigFile {
mutable bool used;
struct section_then_key_less {
- bool operator()(const ConfigEntry &a, const ConfigEntry &b);
+ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const;
};
struct key_less {
- bool operator()(const ConfigEntry &a, const ConfigEntry &b) const{
+ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const {
if(a.section!=b.section) return a.section<b.section;
return a.key<b.key;
}
};
struct line_less {
- bool operator()(const ConfigEntry &a, const ConfigEntry &b){
+ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const {
if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
if(b.line<0) return true;
if(a.line<0) return false;

10
games-emulation/libretro-snes9x/libretro-snes9x-0.0.2_pre20200107.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,3 +15,11 @@ DESCRIPTION="Snes9x libretro port"
LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
RESTRICT="bindist"
SLOT="0"
src_prepare() {
cd .. || die
eapply "${FILESDIR}"/${PN}-0.0.2_pre20200107-gcc11-const.patch
cd "${S}" || die
libretro-core_src_prepare
}