Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2eb28fa724159022a51d9bc6995fc81dada58401

commit 2eb28fa724159022a51d9bc6995fc81dada58401
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Thu Jun 11 21:04:29 2009 +0200

fltk2-r6140-2-i686
*rebuild with gcc4.4
*added patch for gcc

diff --git a/source/xlib-extra/fltk2/FrugalBuild 
b/source/xlib-extra/fltk2/FrugalBuild
index 88bb9a6..148ab1e 100644
--- a/source/xlib-extra/fltk2/FrugalBuild
+++ b/source/xlib-extra/fltk2/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=fltk2
pkgver=r6140
origname=fltk-2.0.x-${pkgver}
-pkgrel=1
+pkgrel=2
pkgdesc="FLTK2 is a cross-platform C++ GUI toolkit for X."
url="http://www.fltk.org/";
depends=('libxi' 'libxinerama' 'libjpeg' 'cairo' 'libxft' 'libgcc')
@@ -14,9 +14,11 @@ groups=('xlib-extra')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.fltk.org/|grep -m1 'VERSION=2'|sed 
's/.*=2.*.x-\(.*\).*/\1/'"
source=(http://ftp.easysw.com/pub/fltk/snapshots/$origname.tar.bz2 \
-       disable_crappy_test.patch)
+       disable_crappy_test.patch fixGcc43.diff fltk2-gcc44.patch)
sha1sums=('cc1d829933ab7882cff40b613d884196093a2790' \
-          '007ac0c6e19ea5afa4c8e7eb34bf480ab2f18f74')
+          '007ac0c6e19ea5afa4c8e7eb34bf480ab2f18f74' \
+          '1e7c5a3e4aa1a10d78daa99b66d474bef7d61192' \
+          'b486d2eebdfaa549f4b81663625c68b81aeb37df')

build()
{
diff --git a/source/xlib-extra/fltk2/fixGcc43.diff 
b/source/xlib-extra/fltk2/fixGcc43.diff
new file mode 100644
index 0000000..74da949
--- /dev/null
+++ b/source/xlib-extra/fltk2/fixGcc43.diff
@@ -0,0 +1,21 @@
+--- 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-b...@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
+
diff --git a/source/xlib-extra/fltk2/fltk2-gcc44.patch 
b/source/xlib-extra/fltk2/fltk2-gcc44.patch
new file mode 100644
index 0000000..db21be5
--- /dev/null
+++ b/source/xlib-extra/fltk2/fltk2-gcc44.patch
@@ -0,0 +1,11 @@
+--- src/filename_list.cxx      2007-06-01 08:13:08.000000000 -0500
++++ src/filename_list.cxx.gcc44        2009-06-01 15:38:51.425093964 -0500
+@@ -63,7 +63,7 @@ int fltk::filename_list(const char *d, d
+   // 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);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to