packages: ClanLib/ClanLib.spec, ClanLib/ClanLib-build.patch (NEW), ClanLib/...

arekm arekm at pld-linux.org
Tue Jul 14 13:23:12 CEST 2009 

Author: arekm                        Date: Tue Jul 14 11:23:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.0.2

---- Files affected:
packages/ClanLib:
   ClanLib.spec (1.108 -> 1.109) , ClanLib-build.patch (NONE -> 1.1)  (NEW), ClanLib-gcc4.patch (1.3 -> NONE)  (REMOVED), ClanLib-link.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ClanLib/ClanLib.spec
diff -u packages/ClanLib/ClanLib.spec:1.108 packages/ClanLib/ClanLib.spec:1.109
--- packages/ClanLib/ClanLib.spec:1.108	Sun Jul 12 15:15:48 2009
+++ packages/ClanLib/ClanLib.spec	Tue Jul 14 13:23:06 2009
@@ -1,17 +1,17 @@
 # $Revision$, $Date$
+%define	cvmajor	2.0
 Summary:	ClanLib, the platform independent game SDK
 Summary(pl.UTF-8):	ClanLib, niezależny od platformy SDK do gier
 Summary(pt_BR.UTF-8):	SDK Clanlib
 Name:		ClanLib
-Version:	0.8.1
-Release:	5
+Version:	2.0.2
+Release:	1
 License:	BSD-like (see COPYING)
 Group:		Libraries
 #Source0Download: http://www.clanlib.org/download.html
-Source0:	http://www.clanlib.org/download/releases-0.8/%{name}-%{version}.tgz
-# Source0-md5:	24e86202eb6d702f788ff16a2718aa97
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-gcc4.patch
+Source0:	http://www.clanlib.org/download/releases-2.0/%{name}-%{version}.tgz
+# Source0-md5:	81a9e30e035fbb73a698813f67289505
+Patch0:		%{name}-build.patch
 URL:		http://www.clanlib.org/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	SDL >= 1.2.0
@@ -21,13 +21,14 @@
 BuildRequires:	automake >= 1.6
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmikmod-devel
-BuildRequires:	libpng-devel >= 1.0.8
+BuildRequires:	libpng-devel >= 1.%{cvmajor}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.4d-3
 BuildRequires:	libvorbis-devel >= 1:1.0
 BuildRequires:	libxslt-progs
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
+BuildRequires:	sqlite3-devel
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
 Obsoletes:	ClanLib-TTF
@@ -258,7 +259,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 rm -rf autom4te.cache
 echo "dnl" >> acinclude.m4
@@ -272,19 +272,23 @@
 %configure \
 	--enable-static \
 	--enable-shared \
-	--%{?debug:en}%{!?debug:dis}able-debug \
+	--enable-docs \
 %ifarch %{ix86}
 	--enable-asm386 \
 %endif
-	--enable-dyn
+	--%{?debug:en}%{!?debug:dis}able-debug
 # directfb disabled now
 
 %{__make}
 
+(cd Documentation/Utilities/ReferenceDocs; ln -s ../../../Sources/API ClanLib)
+export PKG_CONFIG_PATH=$(pwd)/Setup/pkgconfig
+%{__make} html
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} install install-html \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # missing from make install
@@ -311,95 +315,114 @@
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING CREDITS NEWS README README.sdl TODO-RSN
-%attr(755,root,root) %{_libdir}/libclanApp-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanApp-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanCore-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanCore-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanDisplay-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanDisplay-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanGUI-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanGUI-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanGUIStyleSilver-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanGUIStyleSilver-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanNetwork-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanNetwork-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanSignals-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanSignals-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanSound-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanSound-0.8.so.1
+%doc COPYING CREDITS README
+%attr(755,root,root) %{_libdir}/libclanApp-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanApp-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclanCore-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanCore-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclanDatabase-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanDatabase-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclanDisplay-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanDisplay-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclanGDI-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanGDI-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclanGUI-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanGUI-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclanNetwork-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanNetwork-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclanRegExp-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanRegExp-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclanSound-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanSound-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclanSqlite-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanSqlite-%{cvmajor}.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%doc README.kdevelop README.upgrade
+%doc README.kdevelop UPGRADE.txt
 %attr(755,root,root) %{_libdir}/libclanApp.so
 %attr(755,root,root) %{_libdir}/libclanCore.so
+%attr(755,root,root) %{_libdir}/libclanDatabase.so
 %attr(755,root,root) %{_libdir}/libclanDisplay.so
+%attr(755,root,root) %{_libdir}/libclanGDI.so
 %attr(755,root,root) %{_libdir}/libclanGUI.so
-%attr(755,root,root) %{_libdir}/libclanGUIStyleSilver.so
 %attr(755,root,root) %{_libdir}/libclanNetwork.so
-%attr(755,root,root) %{_libdir}/libclanSignals.so
+%attr(755,root,root) %{_libdir}/libclanRegExp.so
 %attr(755,root,root) %{_libdir}/libclanSound.so
+%attr(755,root,root) %{_libdir}/libclanSqlite.so
 %{_libdir}/libclanApp.la
 %{_libdir}/libclanCore.la
+%{_libdir}/libclanDatabase.la
 %{_libdir}/libclanDisplay.la
+%{_libdir}/libclanGDI.la
 %{_libdir}/libclanGUI.la
-%{_libdir}/libclanGUIStyleSilver.la
 %{_libdir}/libclanNetwork.la
-%{_libdir}/libclanSignals.la
+%{_libdir}/libclanRegExp.la
 %{_libdir}/libclanSound.la
-%dir %{_includedir}/ClanLib-0.8
-%dir %{_includedir}/ClanLib-0.8/ClanLib
-%{_includedir}/ClanLib-0.8/ClanLib/Application
-%{_includedir}/ClanLib-0.8/ClanLib/application.h
-%{_includedir}/ClanLib-0.8/ClanLib/Core
-%{_includedir}/ClanLib-0.8/ClanLib/core.h
-%{_includedir}/ClanLib-0.8/ClanLib/Display
-%{_includedir}/ClanLib-0.8/ClanLib/display.h
-%{_includedir}/ClanLib-0.8/ClanLib/GUI*
-%{_includedir}/ClanLib-0.8/ClanLib/gui*.h
-%{_includedir}/ClanLib-0.8/ClanLib/Network
-%{_includedir}/ClanLib-0.8/ClanLib/network.h
-%{_includedir}/ClanLib-0.8/ClanLib/Signals
-%{_includedir}/ClanLib-0.8/ClanLib/signals.h
-%{_includedir}/ClanLib-0.8/ClanLib/Sound
-%{_includedir}/ClanLib-0.8/ClanLib/sound.h
+%{_libdir}/libclanSqlite.la
+%dir %{_includedir}/ClanLib-%{cvmajor}
+%dir %{_includedir}/ClanLib-%{cvmajor}/ClanLib
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/App
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/application.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Core
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/core.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Database
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/database.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Display
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/display.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/GDI
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/gdi.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/GUI*
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/gui*.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Network
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/network.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/RegExp
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/regexp.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Sound
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/sound.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Sqlite
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/sqlite.h
 %{_aclocaldir}/*.m4
-%{_pkgconfigdir}/clanApp-0.8.pc
-%{_pkgconfigdir}/clanCore-0.8.pc
-%{_pkgconfigdir}/clanDisplay-0.8.pc
-%{_pkgconfigdir}/clanGUI*-0.8.pc
-%{_pkgconfigdir}/clanNetwork-0.8.pc
-%{_pkgconfigdir}/clanSignals-0.8.pc
-%{_pkgconfigdir}/clanSound-0.8.pc
+%{_pkgconfigdir}/clanApp-%{cvmajor}.pc
+%{_pkgconfigdir}/clanCore-%{cvmajor}.pc
+%{_pkgconfigdir}/clanDatabase-%{cvmajor}.pc
+%{_pkgconfigdir}/clanDisplay-%{cvmajor}.pc
+%{_pkgconfigdir}/clanGDI-%{cvmajor}.pc
+%{_pkgconfigdir}/clanGUI*-%{cvmajor}.pc
+%{_pkgconfigdir}/clanNetwork-%{cvmajor}.pc
+%{_pkgconfigdir}/clanRegExp-%{cvmajor}.pc
+%{_pkgconfigdir}/clanSound-%{cvmajor}.pc
+%{_pkgconfigdir}/clanSqlite-%{cvmajor}.pc
 
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/clanlib
+%{_docdir}/clanlib-*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libclanApp.a
 %{_libdir}/libclanCore.a
+%{_libdir}/libclanDatabase.a
 %{_libdir}/libclanDisplay.a
+%{_libdir}/libclanGDI.a
 %{_libdir}/libclanGUI.a
-%{_libdir}/libclanGUIStyleSilver.a
 %{_libdir}/libclanNetwork.a
-%{_libdir}/libclanSignals.a
+%{_libdir}/libclanRegExp.a
 %{_libdir}/libclanSound.a
+%{_libdir}/libclanSqlite.a
 
 %files OpenGL
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanGL-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanGL-0.8.so.1
+%attr(755,root,root) %{_libdir}/libclanGL-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanGL-%{cvmajor}.so.1
 
 %files OpenGL-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclanGL.so
 %{_libdir}/libclanGL.la
-%{_includedir}/ClanLib-0.8/ClanLib/GL
-%{_includedir}/ClanLib-0.8/ClanLib/gl.h
-%{_pkgconfigdir}/clanGL-0.8.pc
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/GL
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/gl.h
+%{_pkgconfigdir}/clanGL-%{cvmajor}.pc
 
 %files OpenGL-static
 %defattr(644,root,root,755)
@@ -407,16 +430,16 @@
 
 %files MikMod
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanMikMod-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanMikMod-0.8.so.1
+%attr(755,root,root) %{_libdir}/libclanMikMod-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanMikMod-%{cvmajor}.so.1
 
 %files MikMod-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclanMikMod.so
 %{_libdir}/libclanMikMod.la
-%{_includedir}/ClanLib-0.8/ClanLib/MikMod
-%{_includedir}/ClanLib-0.8/ClanLib/mikmod.h
-%{_pkgconfigdir}/clanMikMod-0.8.pc
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/MikMod
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/mikmod.h
+%{_pkgconfigdir}/clanMikMod-%{cvmajor}.pc
 
 %files MikMod-static
 %defattr(644,root,root,755)
@@ -424,16 +447,16 @@
 
 %files SDL
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanSDL-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanSDL-0.8.so.1
+%attr(755,root,root) %{_libdir}/libclanSDL-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanSDL-%{cvmajor}.so.1
 
 %files SDL-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclanSDL.so
 %{_libdir}/libclanSDL.la
-%{_includedir}/ClanLib-0.8/ClanLib/SDL
-%{_includedir}/ClanLib-0.8/ClanLib/sdl.h
-%{_pkgconfigdir}/clanSDL-0.8.pc
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/SDL
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/sdl.h
+%{_pkgconfigdir}/clanSDL-%{cvmajor}.pc
 
 %files SDL-static
 %defattr(644,root,root,755)
@@ -441,16 +464,16 @@
 
 %files Vorbis
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanVorbis-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanVorbis-0.8.so.1
+%attr(755,root,root) %{_libdir}/libclanVorbis-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanVorbis-%{cvmajor}.so.1
 
 %files Vorbis-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclanVorbis.so
 %{_libdir}/libclanVorbis.la
-%{_includedir}/ClanLib-0.8/ClanLib/Vorbis
-%{_includedir}/ClanLib-0.8/ClanLib/vorbis.h
-%{_pkgconfigdir}/clanVorbis-0.8.pc
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Vorbis
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/vorbis.h
+%{_pkgconfigdir}/clanVorbis-%{cvmajor}.pc
 
 %files Vorbis-static
 %defattr(644,root,root,755)
@@ -462,6 +485,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2009/07/14 11:23:06  arekm
+- up to 2.0.2
+
 Revision 1.108  2009/07/12 13:15:48  arekm
 - release 5
 
@@ -476,7 +502,7 @@
 - release 2
 
 Revision 1.104  2008/07/21 05:39:55  qboosh
-- updated to 0.8.1
+- updated to %{cvmajor}.1
 - removed obsolete void patch
 
 Revision 1.103  2007/09/05 17:47:16  baggins
@@ -503,12 +529,12 @@
   ClanLib-0_6 branched; if needed, can be readded as ClanLib06.spec
 
 Revision 1.85.2.14  2006/08/20 10:14:24  qboosh
-- updated to final 0.8.0, removed obsolete gcc4 patch
+- updated to final %{cvmajor}.0, removed obsolete gcc4 patch
 - killed /usr/X11R6 from link patch
 - license is not LGPL now, but something BSD-like
 
 Revision 1.85.2.13  2006/03/23 23:53:10  qboosh
-- updated to 0.8.0-RC2
+- updated to %{cvmajor}.0-RC2
 - switched to modular xorg, updated link patch to kill unnecessary linking
 
 Revision 1.85.2.12  2006/01/27 06:11:28  qboosh
@@ -519,7 +545,7 @@
 - Reenabled back auto* stuff.
 
 Revision 1.85.2.10  2006/01/22 20:50:05  matkor
-- Dumb update to 0.8.0 RC1.
+- Dumb update to %{cvmajor}.0 RC1.
 
 Revision 1.85.2.9  2005/07/22 00:30:58  gotar
 - BR: SDL_gfx-devel,
@@ -705,96 +731,3 @@
 
 Revision 1.40  2000/07/30 04:55:02  kloczek
 - cosmetics.
-
-Revision 1.39  2000/07/28 13:56:20  zagrodzki
-- release 3, built against libpng >= 1.0.8
-
-Revision 1.38  2000/07/28 13:03:37  kloczek
-- BuildRequires for Mesa-devel changed to OpenGL-devel.
-
-Revision 1.37  2000/07/28 13:02:53  kloczek
-- release 2,
-- rebuild agains OpenGL from XFree86 4.0.x.
-
-Revision 1.36  2000/06/09 07:54:38  kloczek
-- more %%{__make} macros.
-
-Revision 1.35  2000/06/09 07:22:44  kloczek
-- added using %%{__make} macro.
-
-Revision 1.34  2000/05/17 00:36:12  kloczek
-- spec adapterized.
-
-Revision 1.33  2000/04/19 11:21:59  kloczek
-- spec adapterized,
-- some cosmetics.
-
-Revision 1.32  2000/04/19 10:39:44  jajcus
-- make it work with new ImageMagick
-
-Revision 1.31  2000/04/17 16:03:03  jajcus
-- BuildRequires added
-
-Revision 1.30  2000/04/16 17:54:51  jajcus
-- use of $RPM_OPT_FLAGS
-- GGI support added
-
-Revision 1.29  2000/04/15 10:43:51  jajcus
-- updated to 0.4.3
-- divided into several subpackages for minimal dependencies
-
-Revision 1.28  2000/04/01 11:14:21  zagrodzki
-- changed all BuildRoot definitons
-- removed all applnkdir defs
-- changed some prereqs/requires
-- removed duplicate empty lines
-
-Revision 1.27  2000/03/28 16:54:13  baggins
-- translated kloczkish into english
-
-Revision 1.26  2000/03/23 16:37:47  jasio
-Poprawa literówki.
-
-Revision 1.25  1999/12/27 23:13:10  wiget
-0.2.3
-
-Revision 1.24  1999/11/25 14:49:45  mikrobi
-- added missing Requires and BuildRequires: Hermes >= 1.2.6
-
-Revision 1.23  1999/11/25 14:10:55  mikrobi
-- upgraded to 0.2.2
-- ./autogen.sh added in %configure
-
-Revision 1.22  1999/09/08 21:47:16  kloczek
-- added apssing LDFALGS="-s" to ./configure enviroent.
-
-Revision 1.21  1999/09/07 13:49:21  mikrobi
-- upgrade to version 0.1.16; do NOT upgrade to v0.1.17 or 0.1.18, they're
-  broken!
-
-Revision 1.20  1999/08/06 13:04:00  jasio
-Changed Cleanlib -> Clanlib.
-
-Revision 1.19  1999/07/20 12:48:04  wiget
-- switch to rpm 3.0.2
-
-Revision 1.18  1999/07/12 23:05:55  kloczek
-- added using CVS keywords in %changelog (for automating them).
-
-* Wed Jul 07 1999 Jan Rękorajski <baggins at pld.org.pl>
-  [0.1.15-1]
-- commented out static subpackage (don't know how to make it)
-
-* Mon Jun 07 1999 Jan Rękorajski <baggins at pld.org.pl>
-  [0.1.14-3]
-- fixed install
-
-* Tue Apr 20 1999 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
-  [0.1.14-2]
-- added BuildPrereq (libpng-devel, libz-devel, Hermes-devel).
-- added -q %setup patameter,
-- added static subpackage.
-
-* Mon Apr 19 1999 Konrad Stepień <kornad at interdata.com.pl>
-  [0.1.14-1]
-- initial version

================================================================
Index: packages/ClanLib/ClanLib-build.patch
diff -u /dev/null packages/ClanLib/ClanLib-build.patch:1.1
--- /dev/null	Tue Jul 14 13:23:12 2009
+++ packages/ClanLib/ClanLib-build.patch	Tue Jul 14 13:23:06 2009
@@ -0,0 +1,86 @@
+--- ClanLib-2.0.2/Sources/Display/X11/x11_window.cpp~	2009-05-15 10:13:14.000000000 +0200
++++ ClanLib-2.0.2/Sources/Display/X11/x11_window.cpp	2009-07-14 08:49:17.643976647 +0200
+@@ -53,6 +53,8 @@
+ #include "timer_provider_x11.h"
+ #include <X11/Xatom.h>
+ 
++#include <cstdio>
++
+ CL_X11Window::CL_X11Window(CL_DisplayMessageQueue_X11 *message_queue)
+ : window(0), window_last_focus(0), cmap(0), allow_resize(false), bpp(0), message_queue(message_queue), fullscreen(false),
+   disp(0), system_cursor(0), hidden_cursor(0), cursor_bitmap(0), 
+--- ClanLib-2.0.2/Sources/Display/X11/input_device_provider_x11keyboard.cpp~	2009-05-14 12:07:59.000000000 +0200
++++ ClanLib-2.0.2/Sources/Display/X11/input_device_provider_x11keyboard.cpp	2009-07-14 08:50:11.947877097 +0200
+@@ -34,6 +34,8 @@
+ #include "API/Core/Text/string_help.h"
+ #include "x11_window.h"
+ 
++#include <cstdio>
++
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_InputDeviceProvider_X11Keyboard construction:
+ 
+--- ClanLib-2.0.2/Sources/GL/GLX/opengl_window_provider_glx.cpp~	2009-05-14 17:13:42.000000000 +0200
++++ ClanLib-2.0.2/Sources/GL/GLX/opengl_window_provider_glx.cpp	2009-07-14 08:52:13.170573614 +0200
+@@ -49,6 +49,8 @@
+ #include "../opengl_target_provider.h"
+ #include "Display/X11/timer_provider_x11.h"
+ 
++#include <cstdio>
++
+ namespace
+ {
+ 	class RenderWindowProvider_GLX: public CL_RenderWindowProvider
+--- ClanLib-2.0.2/Sources/Core/Text/string_help.cpp~	2009-03-16 10:34:32.000000000 +0100
++++ ClanLib-2.0.2/Sources/Core/Text/string_help.cpp	2009-07-14 08:56:18.465131510 +0200
+@@ -35,6 +35,7 @@
+ #include <wctype.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <cstdio>
+ #else
+ #include <string.h>
+ #include <tchar.h>
+--- ClanLib-2.0.2/Sources/API/Makefile.am~	2009-05-06 18:09:22.000000000 +0200
++++ ClanLib-2.0.2/Sources/API/Makefile.am	2009-07-14 09:01:28.314442596 +0200
+@@ -322,7 +322,6 @@
+ 	Display/2D/sprite_description.h \
+ 	Display/2D/subtexture.h \
+ 	Display/2D/color.h \
+-	Display/2D/image.h \
+ 	Display/2D/span_layout.h \
+ 	Display/Collision/outline_accuracy.h \
+ 	Display/Collision/outline_provider_bitmap.h \
+--- ClanLib-2.0.2/Examples/Makefile.conf.in~	2009-07-14 12:28:45.199275223 +0200
++++ ClanLib-2.0.2/Examples/Makefile.conf.in	2009-07-14 12:28:58.112848194 +0200
+@@ -5,7 +5,7 @@
+ #
+ 
+ PACKAGES = $(patsubst %,%- at LT_RELEASE@,$(LIBS))
+-CXXFLAGS += `pkg-config --cflags $(PACKAGES)` -pthread
++CXXFLAGS += -I. `pkg-config --cflags $(PACKAGES)` -pthread
+ 
+ #EXAMPLE_BIN contains list of example binaries to build
+ 
+--- ClanLib-2.0.2/Documentation/Utilities/ReferenceDocs/Makefile~	2009-03-27 11:19:52.000000000 +0100
++++ ClanLib-2.0.2/Documentation/Utilities/ReferenceDocs/Makefile	2009-07-14 12:39:30.959210323 +0200
+@@ -1,7 +1,7 @@
+ EXAMPLE_BIN=ReferenceDocs
+ OBJF = reference_docs.o reference_all_classes.o reference_class.o reference_define.o reference_enum.o reference_function.o reference_grouped_classes.o reference_index.o reference_typedef.o
+ LIBS=clanCore
+-EXTRA_LIBS=-lpthread
++EXTRA_LIBS=-lpthread -L../../../Sources/Core/.libs/
+ 
+ include ../../../Examples/Makefile.conf
+ 
+--- ClanLib-2.0.2/Documentation/Reference/Makefile.am.org	2009-07-14 13:03:55.506979144 +0200
++++ ClanLib-2.0.2/Documentation/Reference/Makefile.am	2009-07-14 13:03:03.129200101 +0200
+@@ -11,7 +11,7 @@
+ 	mkdir reftest
+ 	doxygen ./clanlib.doxygen
+ 	make -C ../Utilities/ReferenceDocs
+-	../Utilities/ReferenceDocs/ReferenceDocs
++	LD_LIBRARY_PATH=../../Sources/Core/.libs/ ../Utilities/ReferenceDocs/ReferenceDocs
+ 
+ install-html:
+ 	$(INSTALL) -d $(DESTDIR)$(HTML_PREFIX)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ClanLib/ClanLib.spec?r1=1.108&r2=1.109&f=u

More information about the pld-cvs-commit mailing list