From 0b94289233ddc94612a4542a59d1cf12d8eaef96 Mon Sep 17 00:00:00 2001 From: Stefan Ric Date: Tue, 23 Aug 2016 22:26:26 +0200 Subject: [PATCH] Fix broken patch --- ...api-adds.patch => 0001-Add-aditional-API.patch} | 251 +++++++++++---------- package.yml | 4 +- pspec_x86_64.xml | 6 +- 3 files changed, 136 insertions(+), 125 deletions(-) rename files/{sdl_pango-1-api-adds.patch => 0001-Add-aditional-API.patch} (75%) diff --git a/files/sdl_pango-1-api-adds.patch b/files/0001-Add-aditional-API.patch similarity index 75% rename from files/sdl_pango-1-api-adds.patch rename to files/0001-Add-aditional-API.patch index dbd2abe..84ce58b 100644 --- a/files/sdl_pango-1-api-adds.patch +++ b/files/0001-Add-aditional-API.patch @@ -1,122 +1,133 @@ -This file is part of MXE. -See index.html for further information. +From a8c537adf08752cd730852283705e409ee82747f Mon Sep 17 00:00:00 2001 +From: Stefan Ric +Date: Tue, 23 Aug 2016 17:26:47 +0200 +Subject: [PATCH] Add aditional API -This patch has been taken from: -http://zarb.org/~gc/t/SDL_Pango-0.1.2-API-adds.patch +--- + src/SDL_Pango.c | 41 ++++++++++++++++++++++++++++------------- + src/SDL_Pango.h | 16 +++++++++++++++- + 2 files changed, 43 insertions(+), 14 deletions(-) + +diff --git a/src/SDL_Pango.c b/src/SDL_Pango.c +index 2118cd2..cb4d56c 100644 +--- a/src/SDL_Pango.c ++++ b/src/SDL_Pango.c +@@ -723,13 +723,8 @@ SDLPango_CopyFTBitmapToSurface( + SDL_UnlockSurface(surface); + } + +-/*! +- Create a context which contains Pango objects. +- +- @return A pointer to the context as a SDLPango_Context*. +-*/ + SDLPango_Context* +-SDLPango_CreateContext() ++SDLPango_CreateContext_GivenFontDesc(const char* font_desc) + { + SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context)); + G_CONST_RETURN char *charset; +@@ -743,8 +738,7 @@ SDLPango_CreateContext() + pango_context_set_language (context->context, pango_language_from_string (charset)); + pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR); + +- context->font_desc = pango_font_description_from_string( +- MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE)); ++ context->font_desc = pango_font_description_from_string(font_desc); + + context->layout = pango_layout_new (context->context); + +@@ -762,6 +756,17 @@ SDLPango_CreateContext() + } + + /*! ++ Create a context which contains Pango objects. ++ ++ @return A pointer to the context as a SDLPango_Context*. ++*/ ++SDLPango_Context* ++SDLPango_CreateContext() ++{ ++ SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE)); ++} ++ ++/*! + Free a context. + + @param *context [i/o] Context to be free +@@ -1053,6 +1058,20 @@ SDLPango_SetMarkup( + pango_layout_set_font_description (context->layout, context->font_desc); + } + ++void ++SDLPango_SetText_GivenAlignment( ++ SDLPango_Context *context, ++ const char *text, ++ int length, ++ SDLPango_Alignment alignment) ++{ ++ pango_layout_set_attributes(context->layout, NULL); ++ pango_layout_set_text (context->layout, text, length); ++ pango_layout_set_auto_dir (context->layout, TRUE); ++ pango_layout_set_alignment (context->layout, alignment); ++ pango_layout_set_font_description (context->layout, context->font_desc); ++} ++ + /*! + Set plain text to context. + Text must be utf-8. +@@ -1067,11 +1086,7 @@ SDLPango_SetText( + const char *text, + int length) + { +- pango_layout_set_attributes(context->layout, NULL); +- pango_layout_set_text (context->layout, text, length); +- pango_layout_set_auto_dir (context->layout, TRUE); +- pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT); +- pango_layout_set_font_description (context->layout, context->font_desc); ++ SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT); + } + + /*! +diff --git a/src/SDL_Pango.h b/src/SDL_Pango.h +index 2433661..1acd96f 100644 +--- a/src/SDL_Pango.h ++++ b/src/SDL_Pango.h +@@ -109,12 +109,20 @@ typedef enum { + SDLPANGO_DIRECTION_NEUTRAL /*! Neutral */ + } SDLPango_Direction; + +- ++/*! ++ Specifies alignment of text. See Pango reference for detail ++*/ ++typedef enum { ++ SDLPANGO_ALIGN_LEFT, ++ SDLPANGO_ALIGN_CENTER, ++ SDLPANGO_ALIGN_RIGHT ++} SDLPango_Alignment; + + extern DECLSPEC int SDLCALL SDLPango_Init(); + + extern DECLSPEC int SDLCALL SDLPango_WasInit(); + ++extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc); + extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext(); + + extern DECLSPEC void SDLCALL SDLPango_FreeContext( +@@ -157,6 +165,12 @@ extern DECLSPEC void SDLCALL SDLPango_SetMarkup( + const char *markup, + int length); + ++extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment( ++ SDLPango_Context *context, ++ const char *text, ++ int length, ++ SDLPango_Alignment alignment); ++ + extern DECLSPEC void SDLCALL SDLPango_SetText( + SDLPango_Context *context, + const char *markup, +-- +2.9.2 ---- SDL_Pango-0.1.2.orig/src/SDL_Pango.c 2004-12-10 10:06:33.000000000 +0100 -+++ SDL_Pango-0.1.2/src/SDL_Pango.c 2006-09-24 22:46:24.000000000 +0200 -@@ -723,13 +723,8 @@ - SDL_UnlockSurface(surface); - } - --/*! -- Create a context which contains Pango objects. -- -- @return A pointer to the context as a SDLPango_Context*. --*/ - SDLPango_Context* --SDLPango_CreateContext() -+SDLPango_CreateContext_GivenFontDesc(const char* font_desc) - { - SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context)); - G_CONST_RETURN char *charset; -@@ -743,8 +738,7 @@ - pango_context_set_language (context->context, pango_language_from_string (charset)); - pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR); - -- context->font_desc = pango_font_description_from_string( -- MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE)); -+ context->font_desc = pango_font_description_from_string(font_desc); - - context->layout = pango_layout_new (context->context); - -@@ -762,6 +756,17 @@ - } - - /*! -+ Create a context which contains Pango objects. -+ -+ @return A pointer to the context as a SDLPango_Context*. -+*/ -+SDLPango_Context* -+SDLPango_CreateContext() -+{ -+ SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE)); -+} -+ -+/*! - Free a context. - - @param *context [i/o] Context to be free -@@ -1053,6 +1058,20 @@ - pango_layout_set_font_description (context->layout, context->font_desc); - } - -+void -+SDLPango_SetText_GivenAlignment( -+ SDLPango_Context *context, -+ const char *text, -+ int length, -+ SDLPango_Alignment alignment) -+{ -+ pango_layout_set_attributes(context->layout, NULL); -+ pango_layout_set_text (context->layout, text, length); -+ pango_layout_set_auto_dir (context->layout, TRUE); -+ pango_layout_set_alignment (context->layout, alignment); -+ pango_layout_set_font_description (context->layout, context->font_desc); -+} -+ - /*! - Set plain text to context. - Text must be utf-8. -@@ -1067,11 +1086,7 @@ - const char *text, - int length) - { -- pango_layout_set_attributes(context->layout, NULL); -- pango_layout_set_text (context->layout, text, length); -- pango_layout_set_auto_dir (context->layout, TRUE); -- pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT); -- pango_layout_set_font_description (context->layout, context->font_desc); -+ SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT); - } - - /*! ---- SDL_Pango-0.1.2.orig/src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100 -+++ SDL_Pango-0.1.2/src/SDL_Pango.h 2006-09-24 22:46:01.000000000 +0200 -@@ -109,12 +109,20 @@ - SDLPANGO_DIRECTION_NEUTRAL /*! Neutral */ - } SDLPango_Direction; - -- -+/*! -+ Specifies alignment of text. See Pango reference for detail -+*/ -+typedef enum { -+ SDLPANGO_ALIGN_LEFT, -+ SDLPANGO_ALIGN_CENTER, -+ SDLPANGO_ALIGN_RIGHT -+} SDLPango_Alignment; - - extern DECLSPEC int SDLCALL SDLPango_Init(); - - extern DECLSPEC int SDLCALL SDLPango_WasInit(); - -+extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc); - extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext(); - - extern DECLSPEC void SDLCALL SDLPango_FreeContext( -@@ -157,6 +165,12 @@ - const char *markup, - int length); - -+extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment( -+ SDLPango_Context *context, -+ const char *text, -+ int length, -+ SDLPango_Alignment alignment); -+ - extern DECLSPEC void SDLCALL SDLPango_SetText( - SDLPango_Context *context, - const char *markup, diff --git a/package.yml b/package.yml index afff389..9e6a333 100644 --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : sdl1-pango version : 0.1.2 -release : 1 +release : 2 source : - http://vorboss.dl.sourceforge.net/project/sdlpango/SDL_Pango/0.1.2/SDL_Pango-0.1.2.tar.gz : 7f75d3b97acf707c696ea126424906204ebfa07660162de925173cdd0257eba4 license : LGPL-2.0 @@ -12,7 +12,7 @@ builddeps : - pkgconfig(pango) - pkgconfig(sdl) setup : | - %patch -p1 < $pkgfiles/sdl_pango-1-api-adds.patch + %patch -p1 < $pkgfiles/0001-Add-aditional-API.patch %configure --disable-static build : | %make diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml index 421ccf4..f40709a 100644 --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -29,7 +29,7 @@ programming.devel - sdl1-pango + sdl1-pango /usr/include/ @@ -38,8 +38,8 @@ - - 2016-08-16 + + 2016-08-23 0.1.2 Packaging update Stefan Ric -- 2.9.2