Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (10b368da43a64aa33bfea46cc91f461dc20a8afc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (10b368da43a64aa33bfea46cc91f461dc20a8afc)
  • Date: Wed, 24 Jun 2015 21:51:21 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/sdl_pango/CONFIGURE | 2
libs/sdl_pango/HISTORY | 4
libs/sdl_pango/PRE_BUILD | 7 -
libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch | 116
--------------------------
4 files changed, 4 insertions(+), 125 deletions(-)

New commits:
commit 10b368da43a64aa33bfea46cc91f461dc20a8afc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

sdl_pango: Remove Frozen-Bubble patch, not needed anymore

diff --git a/libs/sdl_pango/CONFIGURE b/libs/sdl_pango/CONFIGURE
deleted file mode 100755
index 59f138d..0000000
--- a/libs/sdl_pango/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query FB_PATCH "Do you want to patch $SPELL for Frozen Bubble 2.0.0?"
n
-
diff --git a/libs/sdl_pango/HISTORY b/libs/sdl_pango/HISTORY
index 80ae893..2fb72e7 100644
--- a/libs/sdl_pango/HISTORY
+++ b/libs/sdl_pango/HISTORY
@@ -1,3 +1,7 @@
+2015-06-24 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFIGURE, PRE_BUILD: removed, not needed anymore
+ * SDL_Pango-0.1.2-API-adds.patch: removed, not needed anymore
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/libs/sdl_pango/PRE_BUILD b/libs/sdl_pango/PRE_BUILD
deleted file mode 100755
index ad7ed4d..0000000
--- a/libs/sdl_pango/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-if [[ "$FB_PATCH" == "y" ]]; then
- cd $SOURCE_DIRECTORY
- patch -p0 < $SPELL_DIRECTORY/SDL_Pango-0.1.2-API-adds.patch
-fi
-
-
diff --git a/libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
b/libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
deleted file mode 100644
index 1535a56..0000000
--- a/libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
+++ /dev/null
@@ -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,



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (10b368da43a64aa33bfea46cc91f461dc20a8afc), Ismael Luceno, 06/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page