packages: fltk2/fltk2.spec, fltk2/fltk2-gcc43.patch (NEW), fltk2/fltk2-glib...

[arekm]

Author: arekm                        Date: Fri Jul 10 20:22:29 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build fixed

---- Files affected:
packages/fltk2:
   fltk2.spec (1.10 -> 1.11) , fltk2-gcc43.patch (NONE -> 1.1)  (NEW), fltk2-glibc2.10-scandir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/fltk2/fltk2.spec
diff -u packages/fltk2/fltk2.spec:1.10 packages/fltk2/fltk2.spec:1.11
--- packages/fltk2/fltk2.spec:1.10	Tue Mar 24 13:27:22 2009
+++ packages/fltk2/fltk2.spec	Fri Jul 10 22:22:24 2009
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 %define		_name		fltk
-%define		_snap		r6671
+%define		_snap		r6793
 %define		_version	2.0
 # Conditional build:
 %bcond_with	cairo	# without cairo support
@@ -9,14 +9,16 @@
 Summary(pl.UTF-8):	FLTK - "lekki" X11 toolkit wersja 2.x
 Summary(pt_BR.UTF-8):	Interface gráfica em C++ para X, OpenGL e Windows
 Name:		fltk2
-Version:	2.0.%{_snap}
-Release:	0.1
+Version:	2.0
+Release:	0.%{_snap}.1
 License:	LGPL with amendments (see COPYING)
 Group:		X11/Libraries
 Source0:	http://ftp.easysw.com/pub/fltk/snapshots/%{_name}-%{_version}.x-%{_snap}.tar.bz2
-# Source0-md5:	6bcef5fd51eb3bc4dd0702f3ae6da6ba
+# Source0-md5:	3e413b2063bdb3d1a6ad4832458d885d
 Patch0:		%{name}-rpath.patch
 Patch1:		%{name}-soname.patch
+Patch2:		%{name}-gcc43.patch
+Patch3:		%{name}-glibc2.10-scandir.patch
 URL:		http://www.fltk.org/
 BuildRequires:	autoconf
 BuildRequires:	Mesa-libGLU-devel
@@ -92,6 +94,8 @@
 %setup -q -n %{_name}-%{_version}.x-%{_snap}
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p0
 
 %build
 %{__sed} -i -e '/fltk2-config/s/^\t/\t$(DESTDIR)/' fluid/Makefile
@@ -174,6 +178,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2009/07/10 20:22:24  arekm
+- build fixed
+
 Revision 1.10  2009/03/24 12:27:22  duddits
 - symlinks made absolute; now it should be pretty failsafe (thanks
   glen)

================================================================
Index: packages/fltk2/fltk2-gcc43.patch
diff -u /dev/null packages/fltk2/fltk2-gcc43.patch:1.1
--- /dev/null	Fri Jul 10 22:22:30 2009
+++ packages/fltk2/fltk2-gcc43.patch	Fri Jul 10 22:22:24 2009
@@ -0,0 +1,20 @@
+--- fltk-2.0.x-r6671.orig/src/Image.cxx	2009-04-10 16:07:34.000000000 +0200
++++ fltk-2.0.x-r6671/src/Image.cxx	2009-04-10 16:03:22.000000000 +0200
+@@ -20,6 +20,7 @@
+ // Please report all bugs and problems to "fltk-bugs at fltk.org".
+ 
+ #include <config.h>
++#include <cstring>
+ #include <fltk/Image.h>
+ #include <fltk/Widget.h>
+ #include <fltk/events.h>
+--- fltk-2.0.x-r6671.orig/src/setcolor.cxx	2009-04-10 16:07:19.000000000 +0200
++++ fltk-2.0.x-r6671/src/setcolor.cxx	2009-04-10 16:08:27.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <fltk/Color.h>
+ #include <fltk/draw.h>
+ #include <config.h>
++#include <cstring>
+ #if defined(_WIN32) && USE_STOCK_BRUSH && _WIN32_WINNT<0x0500
+ # undef _WIN32_WINNT
+ # define _WIN32_WINNT 0x0500

================================================================
Index: packages/fltk2/fltk2-glibc2.10-scandir.patch
diff -u /dev/null packages/fltk2/fltk2-glibc2.10-scandir.patch:1.1
--- /dev/null	Fri Jul 10 22:22:30 2009
+++ packages/fltk2/fltk2-glibc2.10-scandir.patch	Fri Jul 10 22:22:24 2009
@@ -0,0 +1,11 @@
+--- src/filename_list.cxx	2009-06-17 09:47:57.000000000 +0200
++++ src/filename_list.cxx	2007-06-01 15:13:08.000000000 +0200
+@@ -63,7 +63,7 @@
+   // some Unix systems):
+   int n = scandir(d, list, 0, sort);
+ #elif defined(__linux) || defined (__FreeBSD__) || defined (__NetBSD__)
+-  int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
++  int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
+ #elif defined(__hpux) || defined(__CYGWIN__)
+   // HP-UX, Cygwin define the comparison function like this:
+   int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fltk2/fltk2.spec?r1=1.10&r2=1.11&f=u