[Frugalware-git] wipv: fltk2-r7513-1-i686

[VÖRÖSKŐI András]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=39bf48e030ccf62d21e5d3bc71dbd032472fa43f

commit 39bf48e030ccf62d21e5d3bc71dbd032472fa43f
Author: VÖRÖSKŐI András <voros...@frugalware.org>
Date:   Fri Jul 2 07:44:25 2010 +0200

fltk2-r7513-1-i686

version bump
FB cleanups

diff --git a/source/xlib-extra/fltk2/FrugalBuild 
b/source/xlib-extra/fltk2/FrugalBuild
index eb3c3ad..9e8ee25 100644
--- a/source/xlib-extra/fltk2/FrugalBuild
+++ b/source/xlib-extra/fltk2/FrugalBuild
@@ -2,9 +2,9 @@
# Maintainer: crazy <cr...@frugalware.org>

pkgname=fltk2
-pkgver=r6786
+pkgver=r7513
origname=fltk-2.0.x-${pkgver}
-pkgrel=2
+pkgrel=1
pkgdesc="FLTK2 is a cross-platform C++ GUI toolkit for X."
url="http://www.fltk.org/";
depends=('libxi' 'libxinerama' 'libjpeg>=8a' 'cairo>=1.8.6-3' 
'libxft>=2.1.13-2' 'libgcc')
@@ -14,26 +14,17 @@ 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 fixGcc43.diff fltk2-gcc44.patch)
-sha1sums=('b3bfcff643b4b6a05ed377ad87bc4b8487ee1a37' \
-          '007ac0c6e19ea5afa4c8e7eb34bf480ab2f18f74' \
-          '1e7c5a3e4aa1a10d78daa99b66d474bef7d61192' \
-          'b486d2eebdfaa549f4b81663625c68b81aeb37df')
+       disable_crappy_test.patch)
+sha1sums=('224bfaa90e03d7cb18708226c89d03d74ea8f77c' \
+          '007ac0c6e19ea5afa4c8e7eb34bf480ab2f18f74')

build()
{
-       Fcd $origname
-       Fpatchall
-       autoconf || return 1
-       Fsed '$(bindir)/fltk2-config --post' \
-            '$(DESTDIR)$(bindir)/fltk2-config --post' fluid/Makefile
-       CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
-       ./configure $Fconfopts --enable-threads --enable-xft \
+       Fcd ${origname}
+       Fbuild --enable-threads --enable-xft \
--with-x --enable-cairo \
--with-optim="$CXXFLAGS -fno-strict-aliasing" \
--enable-shared
-       make || Fdie
-       Fmakeinstall
## lalala not - implemented  - heh
## man pages missing as well but I don't write any :-P
## themes broken
@@ -43,3 +34,5 @@ build()
Fmkdir usr/share/doc/$pkgname-$pkgver
cp -Ra documentation $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie
}
+
+# optimization OK
diff --git a/source/xlib-extra/fltk2/fixGcc43.diff 
b/source/xlib-extra/fltk2/fixGcc43.diff
deleted file mode 100644
index 74da949..0000000
--- a/source/xlib-extra/fltk2/fixGcc43.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index db21be5..0000000
--- a/source/xlib-extra/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);

_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git