rpms/SDL_Pango/devel SDL_Pango-0.1.2-suppress-warning.patch, NONE, 1.1 SDL_Pango.spec, NONE, 1.1 doxygen.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Thu Sep 28 12:09:14 UTC 2006
Author: thias
Update of /cvs/extras/rpms/SDL_Pango/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25781/devel
Modified Files:
.cvsignore sources
Added Files:
SDL_Pango-0.1.2-suppress-warning.patch SDL_Pango.spec
doxygen.png
Log Message:
auto-import SDL_Pango-0.1.2-3.fc6 on branch devel from SDL_Pango-0.1.2-3.fc6.src.rpm
SDL_Pango-0.1.2-suppress-warning.patch:
--- NEW FILE SDL_Pango-0.1.2-suppress-warning.patch ---
--- SDL_Pango-0.1.2/src/SDL_Pango.c.warn 2004-12-10 18:06:33.000000000 +0900
+++ SDL_Pango-0.1.2/src/SDL_Pango.c 2006-09-23 22:49:42.000000000 +0900
@@ -437,6 +437,10 @@
PangoRectangle ink_rect;
int x_off = 0;
+ /* only suppress warning */
+ fg_color.red = fg_color.green = fg_color.blue = 0;
+ bg_color.red = bg_color.green = bg_color.blue = 0;
+
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.
--- NEW FILE SDL_Pango.spec ---
Summary: Rendering of internationalized text for SDL (Simple DirectMedia Layer)
Name: SDL_Pango
Version: 0.1.2
Release: 3%{?dist}
License: LGPL
Group: System Environment/Libraries
URL: http://sdlpango.sourceforge.net/
Source0: http://dl.sf.net/sdlpango/SDL_Pango-%{version}.tar.gz
Source1: doxygen.png
Patch0: SDL_Pango-0.1.2-suppress-warning.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: pango-devel, SDL-devel, dos2unix
%description
Pango is the text rendering engine of GNOME 2. SDL_Pango connects that engine
to SDL, the Simple DirectMedia Layer.
%package devel
Summary: Development files for SDL_pango
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, pango-devel, SDL-devel, pkgconfig
%description devel
Development files for SDL_pango.
%prep
%setup -q
%patch0 -p1 -b .suppress-warning
# 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
%{__install} -m 0644 -p %{SOURCE1} docs/html/doxygen.png
# Fix the (many) DOS encoded files, not *.png since they get corrupt
find . -not -name \*.png -type f -exec dos2unix -k {} \;
%build
%configure
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
%clean
%{__rm} -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root, 0755)
%doc docs/html/*
%{_includedir}/SDL_Pango.h
%{_libdir}/pkgconfig/SDL_Pango.pc
%exclude %{_libdir}/*.a
%exclude %{_libdir}/*.la
%{_libdir}/*.so
%changelog
* Tue Sep 26 2006 Matthias Saou <http://freshrpms.net/> 0.1.2-3
- Use dos2unix to convert all DOS encoded files.
- Replace the corrupt doxygen.png file with a proper one.
* Tue Sep 26 2006 Matthias Saou <http://freshrpms.net/> 0.1.2-2
- Change %%makeinstall to using DESTDIR, according to the guidelines.
- Include patch from Mamoru Tasaka to remove all compilation warnings.
* Fri Sep 22 2006 Matthias Saou <http://freshrpms.net/> 0.1.2-1
- Initial RPM release.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SDL_Pango/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 28 Sep 2006 12:08:33 -0000 1.1
+++ .cvsignore 28 Sep 2006 12:09:14 -0000 1.2
@@ -0,0 +1 @@
+SDL_Pango-0.1.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SDL_Pango/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 28 Sep 2006 12:08:33 -0000 1.1
+++ sources 28 Sep 2006 12:09:14 -0000 1.2
@@ -0,0 +1 @@
+85bbf9bb7b1cee0538154dadd045418c SDL_Pango-0.1.2.tar.gz
More information about the scm-commits
mailing list