Package: libsdl-pango-dev Version: 0.1.2-1 Severity: wishlist Tags: patch The attached patch fixes the line endings to DOS style in the patch from debian/patches/ so that SDL_Pango.h has a consistent line ending style instead of a DOS/Unix mixture. Please note that I nevertheless *strongly* suggest to change SDL_Pango.h to Unix style during the build. (It's not possible to get this fixed in the upstream tar package, right?)
I really like the functionality of api_additions.patch and need it for hex-a-hop. Nevertheless I wonder why it was added to Debian and not to upstream. Did upstream rejected this patch? I want to be compatible with it ... Jens
diff -ur sdlpango-0.1.2.unchanged/debian/patches/api_additions.patch sdlpango-0.1.2/debian/patches/api_additions.patch --- sdlpango-0.1.2.unchanged/debian/patches/api_additions.patch 2007-08-13 02:57:46.000000000 +0200 +++ sdlpango-0.1.2/debian/patches/api_additions.patch 2007-08-13 03:14:46.000000000 +0200 @@ -11,7 +11,7 @@ -*/ -SDLPango_Context* -SDLPango_CreateContext() -+SDLPango_Context* ++SDLPango_Context* +SDLPango_CreateContext_GivenFontDesc(const char* font_desc) { SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context)); @@ -30,17 +30,17 @@ return context; } -+ ++ +/*! + 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)); -+} ++*/ ++SDLPango_Context* ++SDLPango_CreateContext() ++{ ++ SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE)); ++} /*! Free a context. @@ -48,20 +48,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); -+} -+ ++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. @@ -75,7 +75,7 @@ - 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); } @@ -88,19 +88,19 @@ - - -+/*! -+ Specifies alignment of text. See Pango reference for detail -+*/ -+typedef enum { -+ SDLPANGO_ALIGN_LEFT, -+ SDLPANGO_ALIGN_CENTER, -+ SDLPANGO_ALIGN_RIGHT -+} SDLPango_Alignment; ++/*! ++ 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(); @@ -109,12 +109,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_GivenAlignment( ++ SDLPango_Context *context, ++ const char *text, ++ int length, ++ SDLPango_Alignment alignment); ++ extern DECLSPEC void SDLCALL SDLPango_SetText( SDLPango_Context *context, const char *markup,