[packages/scummvm] - up to 2.8.1

[baggins]

commit 1a519a8a4dc276d16bc4e84eff63ba550e009bfb
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Dec 16 19:33:38 2024 +0100

    - up to 2.8.1

 gcc14.patch  | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 scummvm.spec | 17 +++++++++--------
 2 files changed, 64 insertions(+), 8 deletions(-)
---
diff --git a/scummvm.spec b/scummvm.spec
index a43680c..87a489e 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -2,17 +2,18 @@
 Summary:	Graphic adventure game interpreter
 Summary(pl.UTF-8):	Interpreter gier przygodowych
 Name:		scummvm
-Version:	2.7.1
+Version:	2.8.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	https://downloads.scummvm.org/frs/scummvm/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	24275e3caa26b9dc0d21020411db77c9
+# Source0-md5:	641a3937baf17ac6123ae6ed664e5ce3
 Source1:	https://downloads.scummvm.org/frs/scummvm-tools/%{version_tools}/%{name}-tools-%{version_tools}.tar.xz
 # Source1-md5:	0f93bc0d423c6d93bfade50a7e6f2bbe
 Patch0:		%{name}-wx-config.patch
 Patch1:		dwarf-debug.patch
 Patch2:		fluidsynth-printf-attr.patch
+Patch3:		gcc14.patch
 URL:		http://scummvm.org/
 BuildRequires:	SDL2-devel
 BuildRequires:	SDL2_net-devel
@@ -166,11 +167,12 @@ Zestaw narzędzi mogących być użytecznymi w połączeniu ze ScummVM.
 
 %prep
 %setup -q -a 1
-%patch1 -p1
+%patch -P 1 -p1
 cd scummvm-tools-%{version_tools}
-%patch0 -p2
+%patch -P 0 -p2
 cd ..
-%patch2 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
 
 %{__sed} -i -e 's:"plugins":"%{_libdir}/scummvm":' base/plugins.cpp
 
@@ -223,9 +225,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/*
 %{_desktopdir}/*.desktop
 %{_datadir}/%{name}
-%{_iconsdir}/hicolor/scalable/apps/scummvm.svg
-%{_datadir}/metainfo/scummvm.appdata.xml
-
+%{_iconsdir}/hicolor/scalable/apps/org.scummvm.scummvm.svg
+%{_datadir}/metainfo/org.scummvm.scummvm.metainfo.xml
 
 %files tools
 %defattr(644,root,root,755)
diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644
index 0000000..e0253bd
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,55 @@
+--- scummvm-2.8.1/engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp.orig	2024-03-15 23:57:03.000000000 +0100
++++ scummvm-2.8.1/engines/ags/lib/freetype-2.1.3/autohint/ahglyph.cpp	2024-12-16 18:59:23.796592920 +0100
+@@ -296,7 +296,7 @@
+ 	AH_Point point = outline->points;
+ 	AH_Point point_limit = point + outline->num_points;
+ 	FT_Vector *vec = gloader->current.outline.points;
+-	char *tag = gloader->current.outline.tags;
++	unsigned char *tag = gloader->current.outline.tags;
+ 
+ 	/* we assume that the glyph loader has already been checked for storage */
+ 	for (; point < point_limit; point++, vec++, tag++) {
+@@ -408,7 +408,7 @@
+ 
+ 		/* compute Bezier flags */
+ 		{
+-			char *tag = source->tags;
++			unsigned char *tag = source->tags;
+ 
+ 			for (point = points; point < point_limit; point++, tag++) {
+ 				switch (FT_CURVE_TAG(*tag)) {
+@@ -457,7 +457,7 @@
+ 		{
+ 			AH_Point *contour = outline->contours;
+ 			AH_Point *contour_limit = contour + outline->num_contours;
+-			short *end = source->contours;
++			unsigned short *end = source->contours;
+ 			short idx = 0;
+ 
+ 			for (; contour < contour_limit; contour++, end++) {
+--- a/engines/icb/common/px_array.h
++++ b/engines/icb/common/px_array.h
+@@ -100,9 +100,9 @@ const Type &T_MYACTARRAY::operator[](uint32 n) const {
+ 	// It is permissable to look at an element that has not been defined, as the constructor assures
+ 	// that the contents are valid
+ 	if (n >= m_userPosition) {
+-		// We must cast this to a type that can change
+-		((const rcActArray<Type> *)this)->ResizeArray(n);
+-		((const rcActArray<Type> *)this)->m_userPosition = n + 1;
++		// Remove any 'constness' for a resize
++		(const_cast<rcActArray<Type> *>(this))->ResizeArray(n);
++		(const_cast<rcActArray<Type> *>(this))->m_userPosition = n + 1;
+ 	}
+ 
+ 	return (*(m_contents[n]));
+@@ -304,8 +304,8 @@ template <class Type> const Type rcIntArray<Type>::operator[](uint32 index) cons
+ 	// It is permissable to look at an element that has not been defined, as it will have been set to 0
+ 	if (index >= m_userPosition) {
+ 		// Remove any 'constness' for a resize
+-		((const rcIntArray<Type> *)this)->ResizeArray(index);
+-		((const rcIntArray<Type> *)this)->m_userPosition = index + 1;
++		(const_cast<rcIntArray<Type> *>(this))->ResizeArray(index);
++		(const_cast<rcIntArray<Type> *>(this))->m_userPosition = index + 1;
+ 	}
+ 
+ 	return m_contents[index];
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/scummvm.git/commitdiff/1a519a8a4dc276d16bc4e84eff63ba550e009bfb