[arch-commits] Commit in fltk/trunk (PKGBUILD fltk-1.1.9-gcc44.patch)

[Pierre Schmitz]

    Date: Friday, March 5, 2010 @ 20:40:12
  Author: pierre
Revision: 71291

upgpkg: fltk 1.1.10-1
fix FS#18333

Modified:
  fltk/trunk/PKGBUILD
Deleted:
  fltk/trunk/fltk-1.1.9-gcc44.patch

------------------------+
 PKGBUILD               |   27 +++++++++++++--------------
 fltk-1.1.9-gcc44.patch |   32 --------------------------------
 2 files changed, 13 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-05 23:22:18 UTC (rev 71290)
+++ PKGBUILD	2010-03-06 01:40:12 UTC (rev 71291)
@@ -1,27 +1,26 @@
 # $Id$
-# Maintainer: roberto <roberto at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Updated to produce shared libs: Andrew Rose <ody at netrux.com>
 
 pkgname=fltk
-pkgver=1.1.9
-pkgrel=3
+pkgver=1.1.10
+pkgrel=1
 pkgdesc="Graphical user interface toolkit for X"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://www.fltk.org/"
 depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext')
 makedepends=('mesa')
-source=(http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2
-        fltk-1.1.9-gcc44.patch)
-md5sums=('e146fd264e1001b1313acfd41ef75552'
-         '954d657d7831bd02aafb0e4ed9c8f8c6')
+source=("http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2")
+md5sums=('a1765594bc427ff892e36089fe1fa672')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/fltk-1.1.9-gcc44.patch
-  
+  cd $srcdir/$pkgname-$pkgver
+  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+  export LDFLAGS="${LDFLAGS//,--as-needed}"
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
   make || return 1
-  make DESTDIR=$startdir/pkg install
 }
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: fltk-1.1.9-gcc44.patch
===================================================================
--- fltk-1.1.9-gcc44.patch	2010-03-05 23:22:18 UTC (rev 71290)
+++ fltk-1.1.9-gcc44.patch	2010-03-06 01:40:12 UTC (rev 71291)
@@ -1,32 +0,0 @@
-diff -up fltk-1.1.9/src/filename_list.cxx.gcc44 fltk-1.1.9/src/filename_list.cxx
---- fltk-1.1.9/src/filename_list.cxx.gcc44	2006-06-09 11:16:34.000000000 -0500
-+++ fltk-1.1.9/src/filename_list.cxx	2009-05-13 09:46:42.372917879 -0500
-@@ -67,7 +67,7 @@ int fl_filename_list(const char *d, dire
-   // The vast majority of UNIX systems want the sort function to have this
-   // prototype, most likely so that it can be passed to qsort without any
-   // changes:
--  int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
-+  int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
- #else
-   // This version is when we define our own scandir (WIN32 and perhaps
-   // some Unix systems) and apparently on IRIX:
-diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx fltk-1.1.9/src/fl_set_fonts_xft.cxx
---- fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx	2009-03-04 10:58:49.000000000 +0000
-+++ fltk-1.1.9/src/fl_set_fonts_xft.cxx	2009-03-04 11:01:25.000000000 +0000
-@@ -253,13 +253,13 @@
-       // So the bit we want is up to the first comma - BUT some strings have
-       // more than one name, separated by, guess what?, a comma...
-       stop = start = first = 0;
--      stop = strchr((const char *)font, ',');
--      start = strchr((const char *)font, ':');
-+      stop = strchr((char *)font, ',');
-+      start = strchr((char *)font, ':');
-       if ((stop) && (start) && (stop < start))
-       {
-         first = stop + 1; // discard first version of name
-         // find first comma *after* the end of the name
--        stop = strchr((const char *)start, ',');
-+        stop = strchr((char *)start, ',');
-       }
-       else
-       {