[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (5bb7e9bcb0dc6ad1611ab7b08d43714a1f062a90)

Ladislav Hagara scm at sourcemage.org
Fri Feb 12 06:15:04 EST 2010


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

 x11-toolkits/fltk2/DETAILS           |    4 ++--
 x11-toolkits/fltk2/HISTORY           |    4 ++++
 x11-toolkits/fltk2/PRE_BUILD         |    6 +-----
 x11-toolkits/fltk2/fltk2-gcc44.patch |   11 -----------
 4 files changed, 7 insertions(+), 18 deletions(-)

New commits:
commit 5bb7e9bcb0dc6ad1611ab7b08d43714a1f062a90
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    fltk2 2.0.x-r6970

diff --git a/x11-toolkits/fltk2/DETAILS b/x11-toolkits/fltk2/DETAILS
index 84bd19a..0383049 100755
--- a/x11-toolkits/fltk2/DETAILS
+++ b/x11-toolkits/fltk2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=fltk2
-         VERSION=2.0.x-r6793
-     SOURCE_HASH=sha512:94ddc7576edbdfe9792c67e2eb5fb6510deae9bf07e046b2053ce356c8aac61eb18965d5fb362d216ec9b6910a9da7a68bc2ba3107f74a7edd11f41551f6adc4
+         VERSION=2.0.x-r6970
+     SOURCE_HASH=sha512:1ee628083603f9abff47e45563b80d78cba925ac8bcb58aa629fd8e801ccf766c081683578ec12dcf15be11384e8c8c72abd3be97f6138637eaeaee9f38314a3
           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 455b99f..9e87114 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/HISTORY
@@ -1,3 +1,7 @@
+2010-02-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.x-r6970
+	* PRE_BUILD, fltk2-gcc44.patch: removed patch
+
 2009-08-07 Peng Chang (Charles) <chp at sourcemage.org>
 	* PRE_BUILD: check the version of glibc before applying the
 	  patch since the patch doesn't build with glibc 2.9 at least
diff --git a/x11-toolkits/fltk2/PRE_BUILD b/x11-toolkits/fltk2/PRE_BUILD
index c229fda..7667321 100755
--- a/x11-toolkits/fltk2/PRE_BUILD
+++ b/x11-toolkits/fltk2/PRE_BUILD
@@ -1,8 +1,4 @@
 default_pre_build      &&
 cd $SOURCE_DIRECTORY   &&
 # disable tests, as the makefile is bad
-sed -i "s/glut test/glut/" Makefile &&
-
-if [ $(installed_version glibc | cut -d. -f2) -gt 9 ]; then
-  patch -p0 < $SPELL_DIRECTORY/fltk2-gcc44.patch
-fi
+sed -i "s/glut test/glut/" Makefile
diff --git a/x11-toolkits/fltk2/fltk2-gcc44.patch b/x11-toolkits/fltk2/fltk2-gcc44.patch
deleted file mode 100644
index db21be5..0000000
--- a/x11-toolkits/fltk2/fltk2-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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