diff --git a/SDL_Pango.changes b/SDL_Pango.changes index 9193bda..1bc70af 100644 --- a/SDL_Pango.changes +++ b/SDL_Pango.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 12:48:49 UTC 2024 - Jan Engelhardt + +- Add gcc14.patch + ------------------------------------------------------------------- Wed May 18 16:00:45 UTC 2022 - Jan Engelhardt diff --git a/SDL_Pango.spec b/SDL_Pango.spec index 06e2891..e6984a9 100644 --- a/SDL_Pango.spec +++ b/SDL_Pango.spec @@ -27,6 +27,7 @@ URL: http://sdlpango.sourceforge.net/ #CVS-Clone: -d:pserver:anonymous@sdlpango.cvs.sourceforge.net:/cvsroot/sdlpango co -P SDL_Pango Source: %name-%version.tar.bz2 Patch1: %name-%version-API-adds.patch +Patch2: gcc14.patch BuildRequires: dos2unix BuildRequires: libtool BuildRequires: pkg-config diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 8e5d3d3..06683fe 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1652993361 -commit: b0f7f07cdc3e0457510d84361a8efef9121f4d2ffc8ed7dbf004b33a8b5fe8f3 +mtime: 1724244574 +commit: 0cfd18917c796883c41d5e83258886d260708dbaa9facec3ba691fdf0226353e url: https://src.opensuse.org/jengelh/SDL_Pango revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index e2bfe18..32ae108 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edb3a0f4d4209968ff0c9522515592abeb1e60ec7ce21933c537d1a54630235a +oid sha256:c10e53b20ba6d913b832f8ce8db2fdaf474517c21f98bca163b871b35932a64f size 256 diff --git a/gcc14.patch b/gcc14.patch new file mode 100644 index 0000000..583204f --- /dev/null +++ b/gcc14.patch @@ -0,0 +1,48 @@ +From: Jan Engelhardt +Date: 2024-08-21 14:44:53.847192112 +0200 + +SDL_Pango.c: In function 'drawGlyphString': +SDL_Pango.c:349:5: error: implicit declaration of function 'SDLPango_CopyFTBitmapToSurface' [-Wimplicit-function-declaration] + 349 | SDLPango_CopyFTBitmapToSurface( +Take inspiration from +https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e529a13405f08edca871efbe73a0392f507051c + +--- + src/SDL_Pango.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: SDL_Pango-0.1.2/src/SDL_Pango.c +=================================================================== +--- SDL_Pango-0.1.2.orig/src/SDL_Pango.c ++++ SDL_Pango-0.1.2/src/SDL_Pango.c +@@ -228,6 +228,7 @@ + + #include + #include ++#define __FT2_BUILD_UNIX_H__ + + #include "SDL_Pango.h" + +@@ -298,7 +299,6 @@ typedef struct _contextImpl { + int + SDLPango_Init() + { +- g_type_init(); + + IS_INITIALIZED = -1; + +@@ -727,12 +727,12 @@ SDLPango_Context* + SDLPango_CreateContext_GivenFontDesc(const char* font_desc) + { + SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context)); +- G_CONST_RETURN char *charset; ++ const char *charset; + + context->font_map = pango_ft2_font_map_new (); + pango_ft2_font_map_set_resolution (PANGO_FT2_FONT_MAP (context->font_map), DEFAULT_DPI, DEFAULT_DPI); + +- context->context = pango_ft2_font_map_create_context (PANGO_FT2_FONT_MAP (context->font_map)); ++ context->context = pango_font_map_create_context (PANGO_FONT_MAP (context->font_map)); + + g_get_charset(&charset); + pango_context_set_language (context->context, pango_language_from_string (charset));