manaplus, revbump for openssl3 + build fix (#11003)

This commit is contained in:
Schrijvers Luc
2024-08-31 13:00:26 +02:00
committed by GitHub
parent 77fab05db6
commit c4b5f8f5d8
2 changed files with 28 additions and 5 deletions

View File

@@ -5,7 +5,7 @@ COPYRIGHT="2004-2009 The Mana World Development Team
2009-2010 The Mana Developers
2011-2018 The ManaPlus Developers"
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="4"
SOURCE_URI="https://github.com/ManaPlus/ManaPlus/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="200ad08ce441238c125661f29a28a61ae91219a90cca04ddea0bd5b4f142c64c"
SOURCE_DIR="ManaPlus-$portVersion"
@@ -46,7 +46,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libcrypto$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix >= 3
devel:libcurl$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
@@ -58,7 +58,7 @@ BUILD_REQUIRES="
devel:libSDL_mixer_1.2$secondaryArchSuffix
devel:libSDL_net_1.2$secondaryArchSuffix
devel:libSDL_ttf_2.0$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libssl$secondaryArchSuffix >= 3
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"

View File

@@ -1,4 +1,4 @@
From c1a40be1f98376ce3eff6ced4f2148dadc8778a7 Mon Sep 17 00:00:00 2001
From 18b62c1cdf2287b869aa004ac302fff4680f38c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 19 May 2018 12:24:05 +0200
Subject: Use the cache folder for the game data
@@ -18,5 +18,28 @@ index c0badd3..f758e7d 100644
settings.localDataDir = getSpecialFolderLocation(CSIDL_LOCAL_APPDATA);
if (settings.localDataDir.empty())
--
2.16.2
2.45.2
From 31870188203701dfdd05acc021794bf5b0910d84 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 31 Aug 2024 12:52:44 +0200
Subject: Build fix
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp
index 7fcdfd7..1f43304 100644
--- a/src/utils/xml/libxml.cpp
+++ b/src/utils/xml/libxml.cpp
@@ -35,6 +35,8 @@
#include <fstream>
+#include <libxml/parser.h>
+
#include "debug.h"
namespace
--
2.45.2