haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

cegui, revbump, patch and drop python3.9 (#11737)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-02-06 09:36:11 +01:00
committed by GitHub
parent 74008bdb97
commit b8a8e7e2ef
2 changed files with 72 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dev-games/cegui/cegui-0.8.7.recipe
View File

@@ -8,9 +8,10 @@ sub-systems..."
HOMEPAGE="http://www.cegui.org.uk/"
COPYRIGHT="2004-2015 Paul D. Turner and The CEGUI Development Team"
LICENSE="GNU LGPL v2.1"
REVISION="4"
REVISION="5"
SOURCE_URI="http://prdownloads.sourceforge.net/crayzedsgui/cegui-$portVersion.tar.bz2"
CHECKSUM_SHA256="b351e8957716d9c170612c13559e49530ef911ae4bac2feeb2dacd70b430e518"
PATCHES="cegui-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -42,7 +43,7 @@ REQUIRES="
lib:liblua$secondaryArchSuffix
lib:libminizip$secondaryArchSuffix
lib:libpcre$secondaryArchSuffix
lib:libpython3.9$secondaryArchSuffix
# lib:libpython3.9$secondaryArchSuffix
lib:libSDL2_2.0$secondaryArchSuffix
lib:libSDL2_image_2.0$secondaryArchSuffix
lib:libtinyxml$secondaryArchSuffix
@@ -79,7 +80,7 @@ BUILD_REQUIRES="
devel:liblua$secondaryArchSuffix
devel:libminizip$secondaryArchSuffix
devel:libpcre$secondaryArchSuffix
devel:libpython3.9$secondaryArchSuffix
# devel:libpython3.9$secondaryArchSuffix
devel:libSDL2$secondaryArchSuffix
devel:libSDL2_image$secondaryArchSuffix
devel:libtinyxml$secondaryArchSuffix
@@ -96,11 +97,13 @@ BUILD_PREREQUIRES="
BUILD()
{
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
-DSDL2_H_PATH="$portPackageLinksDir/devel~libsdl2_2.0/$relativeIncludeDir/SDL2" \
-DSDL2IMAGE_H_PATH="$portPackageLinksDir/devel~libsdl2_2.0/$relativeIncludeDir/SDL2" \
-DCEGUI_SAMPLES_ENABLED:BOOL=OFF
-DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
-Wno-dev
make -C build $jobArgs
}
@@ -128,3 +131,8 @@ INSTALL()
$developDir
}
TEST()
{
make -C build test
}

59
dev-games/cegui/patches/cegui-0.8.7.patchset Normal file
View File

@@ -0,0 +1,59 @@
From 243cf4d3e3ba38a176a07a515d3c2c22107e39d7 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Thu, 6 Feb 2025 09:25:20 +0100
Subject: Build fixes
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1eb336e..0456f65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ endif()
if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
set (CMAKE_C_STANDARD_REQUIRED TRUE)
set (CMAKE_C_STANDARD "99")
@@ -288,6 +288,10 @@ if (CEGUI_WARNINGS_AS_ERRORS)
endif ()
endif ()
+if(HAIKU)
+ add_definitions(-Wno-deprecated-declarations -Wno-deprecated-copy) # TODO too much spam for now
+endif()
+
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CEGUI_EXTRA_FLAGS}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEGUI_EXTRA_FLAGS}")
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CEGUI_EXTRA_FLAGS}")
diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp
index 73934d3..fe4cacc 100644
--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp
+++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp
@@ -99,7 +99,7 @@ void LibxmlParser::parseXML(XMLHandler& handler,
if (!doc)
{
- xmlError* err = xmlGetLastError();
+ const xmlError* err = xmlGetLastError();
CEGUI_THROW(GenericException(
String("xmlParseMemory failed in file: '") +
diff --git a/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp b/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp
index 1660499..005d17d 100644
--- a/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp
+++ b/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp
@@ -130,7 +130,7 @@ namespace CEGUI
processElement(childNode->ToElement());
break;
case TiXmlNode::CEGUI_TINYXML_TEXT:
- if (childNode->ToText()->Value() != '\0')
+ if (childNode->ToText()->Value() != nullptr)
d_handler->text((encoded_char*)childNode->ToText()->Value());
break;
--
2.45.2