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

[Allan McRae]

    Date: Tuesday, June 30, 2009 @ 01:56:35
  Author: allan
Revision: 43812

upgpkg: fltk 1.1.9-2
    libjpeg soname bump rebuild, add build patch

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

------------------------+
 PKGBUILD               |   12 ++++++++----
 fltk-1.1.9-gcc44.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-06-30 05:55:53 UTC (rev 43811)
+++ PKGBUILD	2009-06-30 05:56:35 UTC (rev 43812)
@@ -5,18 +5,22 @@
 
 pkgname=fltk
 pkgver=1.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Graphical user interface toolkit for X"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://www.fltk.org/"
-depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext')
+depends=('libjpeg>=7' 'libpng' 'gcc-libs' 'libxft' 'libxext')
 makedepends=('mesa')
-source=(http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2)
-md5sums=('e146fd264e1001b1313acfd41ef75552')
+source=(http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2
+        fltk-1.1.9-gcc44.patch)
+md5sums=('e146fd264e1001b1313acfd41ef75552'
+         '954d657d7831bd02aafb0e4ed9c8f8c6')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/fltk-1.1.9-gcc44.patch
+  
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
   make || return 1
   make DESTDIR=$startdir/pkg install

Added: fltk-1.1.9-gcc44.patch
===================================================================
--- fltk-1.1.9-gcc44.patch	                        (rev 0)
+++ fltk-1.1.9-gcc44.patch	2009-06-30 05:56:35 UTC (rev 43812)
@@ -0,0 +1,32 @@
+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
+       {