rpms/SDL_Pango/devel SDL_Pango-0.1.2-matrix_declarations.patch, NONE, 1.1 SDL_Pango-0.1.2-suppress-warning.patch, 1.1, 1.2 SDL_Pango.spec, 1.6, 1.7

Matthias Saou thias at fedoraproject.org
Mon Dec 22 18:17:07 UTC 2008 

Author: thias

Update of /cvs/extras/rpms/SDL_Pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18298

Modified Files:
	SDL_Pango-0.1.2-suppress-warning.patch SDL_Pango.spec 
Added Files:
	SDL_Pango-0.1.2-matrix_declarations.patch 
Log Message:
Include matrix declaraction patch (#475118), adapted in order to not create a regression from the "supress warning" patch.


SDL_Pango-0.1.2-matrix_declarations.patch:

--- NEW FILE SDL_Pango-0.1.2-matrix_declarations.patch ---
diff -Naupr SDL_Pango-0.1.2.orig/src/SDL_Pango.c SDL_Pango-0.1.2/src/SDL_Pango.c
--- 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	2008-12-22 19:12:19.501265024 +0100
@@ -286,6 +286,59 @@ typedef struct _contextImpl {
 } contextImpl;
 
 
+const SDLPango_Matrix _MATRIX_WHITE_BACK
+= {{{255, 0, 0, 0},
+    {255, 0, 0, 0},
+    {255, 0, 0, 0},
+    {255, 255, 0, 0}}};
+
+/*!
+    Specifies white back and black letter.
+*/
+const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
+
+const SDLPango_Matrix _MATRIX_BLACK_BACK
+= {{{0, 255, 0, 0},
+    {0, 255, 0, 0},
+    {0, 255, 0, 0},
+    {255, 255, 0, 0}}};
+/*!
+    Specifies black back and white letter.
+*/
+const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
+
+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
+= {{{0, 0, 0, 0},
+    {0, 0, 0, 0},
+    {0, 0, 0, 0},
+    {0, 255, 0, 0}}};
+/*!
+    Specifies transparent back and black letter.
+*/
+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
+
+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
+= {{{255, 255, 0, 0},
+    {255, 255, 0, 0},
+    {255, 255, 0, 0},
+    {0, 255, 0, 0}}};
+/*!
+    Specifies transparent back and white letter.
+*/
+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
+
+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
+= {{{255, 255, 0, 0},
+    {255, 255, 0, 0},
+    {255, 255, 0, 0},
+    {0, 0, 0, 0}}};
+/*!
+    Specifies transparent back and transparent letter.
+    This is useful for KARAOKE like rendering.
+*/
+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
+
+
 /*!
     Initialize the Glib and Pango API.
     This must be called before using other functions in this library,
diff -Naupr SDL_Pango-0.1.2.orig/src/SDL_Pango.h SDL_Pango-0.1.2/src/SDL_Pango.h
--- 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	2008-12-22 19:09:17.181371664 +0100
@@ -46,57 +46,27 @@ typedef struct _SDLPango_Matrix {
     Uint8 m[4][4];  /*! Matrix variables */
 } SDLPango_Matrix;
 
-const SDLPango_Matrix _MATRIX_WHITE_BACK
-    = {255, 0, 0, 0,
-       255, 0, 0, 0,
-       255, 0, 0, 0,
-       255, 255, 0, 0,};
-
 /*!
     Specifies white back and black letter.
 */
-const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
-
-const SDLPango_Matrix _MATRIX_BLACK_BACK
-    = {0, 255, 0, 0,
-       0, 255, 0, 0,
-       0, 255, 0, 0,
-       255, 255, 0, 0,};
+extern const SDLPango_Matrix *MATRIX_WHITE_BACK;
 /*!
     Specifies black back and white letter.
 */
-const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
-
-const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
-    = {0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 255, 0, 0,};
+extern const SDLPango_Matrix *MATRIX_BLACK_BACK;
 /*!
     Specifies transparent back and black letter.
 */
-const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
-
-const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
-    = {255, 255, 0, 0,
-       255, 255, 0, 0,
-       255, 255, 0, 0,
-       0, 255, 0, 0,};
+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
 /*!
     Specifies transparent back and white letter.
 */
-const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
-
-const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
-    = {255, 255, 0, 0,
-       255, 255, 0, 0,
-       255, 255, 0, 0,
-       0, 0, 0, 0,};
+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
 /*!
     Specifies transparent back and transparent letter.
     This is useful for KARAOKE like rendering.
 */
-const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
 
 /*!
     Specifies direction of text. See Pango reference for detail

SDL_Pango-0.1.2-suppress-warning.patch:

Index: SDL_Pango-0.1.2-suppress-warning.patch
===================================================================
RCS file: /cvs/extras/rpms/SDL_Pango/devel/SDL_Pango-0.1.2-suppress-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SDL_Pango-0.1.2-suppress-warning.patch	28 Sep 2006 12:09:14 -0000	1.1
+++ SDL_Pango-0.1.2-suppress-warning.patch	22 Dec 2008 18:16:37 -0000	1.2
@@ -11,77 +11,3 @@
      while (tmp_list) {
  	SDLPango_Matrix color_matrix = context->color_matrix;
  	PangoUnderline uline = PANGO_UNDERLINE_NONE;
---- SDL_Pango-0.1.2/src/SDL_Pango.h.warn	2004-12-10 18:06:33.000000000 +0900
-+++ SDL_Pango-0.1.2/src/SDL_Pango.h	2006-09-23 22:49:42.000000000 +0900
-@@ -47,10 +47,10 @@
- } SDLPango_Matrix;
- 
- const SDLPango_Matrix _MATRIX_WHITE_BACK
--    = {255, 0, 0, 0,
--       255, 0, 0, 0,
--       255, 0, 0, 0,
--       255, 255, 0, 0,};
-+= {{{255, 0, 0, 0},
-+    {255, 0, 0, 0},
-+    {255, 0, 0, 0},
-+    {255, 255, 0, 0}}};
- 
- /*!
-     Specifies white back and black letter.
-@@ -58,40 +58,40 @@
- const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
- 
- const SDLPango_Matrix _MATRIX_BLACK_BACK
--    = {0, 255, 0, 0,
--       0, 255, 0, 0,
--       0, 255, 0, 0,
--       255, 255, 0, 0,};
-+= {{{0, 255, 0, 0},
-+    {0, 255, 0, 0},
-+    {0, 255, 0, 0},
-+    {255, 255, 0, 0}}};
- /*!
-     Specifies black back and white letter.
- */
- const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
- 
- const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
--    = {0, 0, 0, 0,
--       0, 0, 0, 0,
--       0, 0, 0, 0,
--       0, 255, 0, 0,};
-+= {{{0, 0, 0, 0},
-+    {0, 0, 0, 0},
-+    {0, 0, 0, 0},
-+    {0, 255, 0, 0}}};
- /*!
-     Specifies transparent back and black letter.
- */
- const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
- 
- const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
--    = {255, 255, 0, 0,
--       255, 255, 0, 0,
--       255, 255, 0, 0,
--       0, 255, 0, 0,};
-+= {{{255, 255, 0, 0},
-+    {255, 255, 0, 0},
-+    {255, 255, 0, 0},
-+    {0, 255, 0, 0}}};
- /*!
-     Specifies transparent back and white letter.
- */
- const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
- 
- const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
--    = {255, 255, 0, 0,
--       255, 255, 0, 0,
--       255, 255, 0, 0,
--       0, 0, 0, 0,};
-+= {{{255, 255, 0, 0},
-+    {255, 255, 0, 0},
-+    {255, 255, 0, 0},
-+    {0, 0, 0, 0}}};
- /*!
-     Specifies transparent back and transparent letter.
-     This is useful for KARAOKE like rendering.


Index: SDL_Pango.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_Pango/devel/SDL_Pango.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SDL_Pango.spec	20 Feb 2008 03:54:31 -0000	1.6
+++ SDL_Pango.spec	22 Dec 2008 18:16:37 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Rendering of internationalized text for SDL (Simple DirectMedia Layer)
 Name: SDL_Pango
 Version: 0.1.2
-Release: 8
+Release: 9
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://sdlpango.sourceforge.net/
@@ -9,6 +9,7 @@
 Source1: doxygen.png
 Patch0: SDL_Pango-0.1.2-suppress-warning.patch
 Patch1: SDL_Pango-0.1.2-API-adds.patch
+Patch2: SDL_Pango-0.1.2-matrix_declarations.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pango-devel, SDL-devel, dos2unix
 BuildRequires: autoconf, automake, libtool
@@ -32,6 +33,7 @@
 %setup -q
 %patch0 -p1 -b .suppress-warning
 %patch1 -p1 -b .API-adds
+%patch2 -p1 -b .matrix_declarations
 # Clean up, we include the entire "docs/html" content for the devel package
 %{__rm} -rf docs/html/CVS/
 # Replace the corrupt doxygen.png file with a proper one
@@ -77,7 +79,11 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.2-8
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 0.1.2-9
+- Include matrix declaraction patch (#475118), adapted in order to not
+  create a regression from the "supress warning" patch.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 0.1.2-7

More information about the fedora-extras-commits mailing list