[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (32b3cfcca4a9e42c037788ea45ff8a07ec4e0efc)

Ladislav Hagara scm at sourcemage.org
Sun Jun 7 15:29:18 EDT 2009


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 x11-toolkits/fltk2/DETAILS           |    4 ++--
 x11-toolkits/fltk2/HISTORY           |    5 +++++
 x11-toolkits/fltk2/PRE_BUILD         |    3 ++-
 x11-toolkits/fltk2/fltk2-gcc44.patch |   11 +++++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 32b3cfcca4a9e42c037788ea45ff8a07ec4e0efc
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    fltk2 2.0.x-r6786

diff --git a/x11-toolkits/fltk2/DETAILS b/x11-toolkits/fltk2/DETAILS
index 1841dac..dac0298 100755
--- a/x11-toolkits/fltk2/DETAILS
+++ b/x11-toolkits/fltk2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=fltk2
-         VERSION=2.0.x-r6403
-     SOURCE_HASH=sha512:d4324d7c1fe864a48f335d17dccb47a4b2f31a65b2f3a1a05ba0d0a4ee286fdbfcd01fc5cafb74984f93cc7677062268925cbe453afb6e937acef13aa3f5a875
+         VERSION=2.0.x-r6786
+     SOURCE_HASH=sha512:ac9637d176ae1a37ec9df2cdaa8647034fef58993b611ef5d1b5ed84d4a85a17317c3537a90aaaf2270810691033e7fd01abf87b6d2b74b26e39f3eef0947c56
           SOURCE=${SPELL//2}-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2}-$VERSION
         FLTK_URI=ftp.easysw.com/pub/fltk/snapshots/$SOURCE
diff --git a/x11-toolkits/fltk2/HISTORY b/x11-toolkits/fltk2/HISTORY
index 79bde8a..0ceca8d 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/HISTORY
@@ -1,3 +1,8 @@
+2009-06-07 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.x-r6786
+	* PRE_BUILD, fltk2-gcc44.patch: added patch due to glibc 2.10.1 from
+	  http://bugs.gentoo.org/show_bug.cgi?id=270487
+
 2008-10-19 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: xorg-libs -> libx11
 
diff --git a/x11-toolkits/fltk2/PRE_BUILD b/x11-toolkits/fltk2/PRE_BUILD
index 7667321..62951a9 100755
--- a/x11-toolkits/fltk2/PRE_BUILD
+++ b/x11-toolkits/fltk2/PRE_BUILD
@@ -1,4 +1,5 @@
 default_pre_build      &&
 cd $SOURCE_DIRECTORY   &&
 # disable tests, as the makefile is bad
-sed -i "s/glut test/glut/" Makefile
+sed -i "s/glut test/glut/" Makefile &&
+patch -p0 < $SPELL_DIRECTORY/fltk2-gcc44.patch
diff --git a/x11-toolkits/fltk2/fltk2-gcc44.patch b/x11-toolkits/fltk2/fltk2-gcc44.patch
new file mode 100644
index 0000000..db21be5
--- /dev/null
+++ b/x11-toolkits/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);



More information about the SM-Commit mailing list