[Pkg-sdl-commits] r97 - in unstable/sdlpango/debian: . patches
Josselin Mouette
joss at costa.debian.org
Thu Sep 28 21:50:35 UTC 2006
Author: joss
Date: 2006-09-28 21:50:34 +0000 (Thu, 28 Sep 2006)
New Revision: 97
Added:
unstable/sdlpango/debian/patches/api_additions.patch
Removed:
unstable/sdlpango/debian/patches/SDL_Pango-0.1.2-API-adds.patch
Modified:
unstable/sdlpango/debian/changelog
Log:
* api_additions.patch: patch from Guillaume Cottenceau to add some
missing functions.
Modified: unstable/sdlpango/debian/changelog
===================================================================
--- unstable/sdlpango/debian/changelog 2006-09-28 21:39:27 UTC (rev 96)
+++ unstable/sdlpango/debian/changelog 2006-09-28 21:50:34 UTC (rev 97)
@@ -1,5 +1,7 @@
sdlpango (0.1.2-1) unstable; urgency=low
* Initial release (closes: #389648).
+ * api_additions.patch: patch from Guillaume Cottenceau to add some
+ missing functions.
- -- Josselin Mouette <joss at debian.org> Thu, 28 Sep 2006 23:34:20 +0200
+ -- Josselin Mouette <joss at debian.org> Thu, 28 Sep 2006 23:50:02 +0200
Deleted: unstable/sdlpango/debian/patches/SDL_Pango-0.1.2-API-adds.patch
===================================================================
--- unstable/sdlpango/debian/patches/SDL_Pango-0.1.2-API-adds.patch 2006-09-28 21:39:27 UTC (rev 96)
+++ unstable/sdlpango/debian/patches/SDL_Pango-0.1.2-API-adds.patch 2006-09-28 21:50:34 UTC (rev 97)
@@ -1,116 +0,0 @@
---- src/SDL_Pango.c 2004-12-10 10:06:33.000000000 +0100
-+++ 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);
- }
-
- /*!
---- src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100
-+++ 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,
Added: unstable/sdlpango/debian/patches/api_additions.patch
===================================================================
--- unstable/sdlpango/debian/patches/api_additions.patch (rev 0)
+++ unstable/sdlpango/debian/patches/api_additions.patch 2006-09-28 21:50:34 UTC (rev 97)
@@ -0,0 +1,120 @@
+--- src/SDL_Pango.c~ 2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.c 2006-09-28 23:47:15.000000000 +0200
+@@ -723,13 +723,9 @@
+ 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_Context*
++SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
+ {
+ SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
+ G_CONST_RETURN char *charset;
+@@ -743,8 +739,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);
+
+@@ -760,6 +755,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));
++}
+
+ /*!
+ Free a context.
+@@ -1053,6 +1059,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.
+@@ -1066,12 +1086,8 @@
+ SDLPango_Context *context,
+ 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);
+ }
+
+ /*!
+--- src/SDL_Pango.h~ 2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.h 2006-09-28 23:48:45.000000000 +0200
+@@ -109,12 +109,19 @@
+ 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 +164,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,
More information about the Pkg-sdl-commits
mailing list