[arch-commits] Commit in gimp-ufraw/trunk (PKGBUILD ufraw-0.15-glibc-2.10.patch)

[Eric Bélanger]

    Date: Monday, July 6, 2009 @ 22:26:53
  Author: eric
Revision: 45102

upgpkg: gimp-ufraw 0.15-4
    added build patch, fixed missing files in package

Added:
  gimp-ufraw/trunk/ufraw-0.15-glibc-2.10.patch
Modified:
  gimp-ufraw/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   16 ++++++++--------
 ufraw-0.15-glibc-2.10.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-07 01:47:37 UTC (rev 45101)
+++ PKGBUILD	2009-07-07 02:26:53 UTC (rev 45102)
@@ -5,7 +5,7 @@
 pkgname=gimp-ufraw
 _srcname=ufraw
 pkgver=0.15
-pkgrel=3
+pkgrel=4
 pkgdesc="standalone or gimp plugin converter for raw files"
 url="http://ufraw.sourceforge.net/"
 arch=(i686 x86_64)
@@ -14,19 +14,19 @@
 makedepends=('gimp' 'cinepaint' 'pkgconfig')
 optdepends=('gimp: to use the gimp import plugin for raw images' \
             'cinepaint: to use the cinepaint import plugin for raw images')
-source=(http://downloads.sourceforge.net/sourceforge/${_srcname}/${_srcname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/${_srcname}/${_srcname}-${pkgver}.tar.gz ufraw-0.15-glibc-2.10.patch)
+md5sums=('6d8f6c98a388c438784cd909dd82d540' '18774fd178266f18c398b22f99783860')
 
 build() {
   cd ${srcdir}/${_srcname}-${pkgver}
+  patch -p1 < ../ufraw-0.15-glibc-2.10.patch || return 1
   ./configure --prefix=/usr \
     --enable-extras \
 	 --enable-mime \
 	 --enable-openmp \
-    --with-libexif --with-exiv2
-  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
-  make
-  make DESTDIR=${pkgdir} install
+    --with-libexif --with-exiv2 || return 1
+  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile || return 1
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
   rm -f ${pkgdir}/usr/bin/dcraw
 }
-md5sums=('6d8f6c98a388c438784cd909dd82d540')
-md5sums=('6d8f6c98a388c438784cd909dd82d540')

Added: ufraw-0.15-glibc-2.10.patch
===================================================================
--- ufraw-0.15-glibc-2.10.patch	                        (rev 0)
+++ ufraw-0.15-glibc-2.10.patch	2009-07-07 02:26:53 UTC (rev 45102)
@@ -0,0 +1,12 @@
+--- ufraw-0.15.old/dcraw.cc	2008-12-23 07:19:41.000000000 +0000
++++ ufraw-0.15/dcraw.cc	2009-05-28 15:25:51.000000000 +0100
+@@ -8401,7 +8401,7 @@
+   argv[argc] = "";
+   for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
+     opt = argv[arg++][1];
+-    if ((cp = strchr (sp="nbrkStqmHAC", opt)))
++    if ((cp = (char*) strchr (sp="nbrkStqmHAC", opt)))
+       for (i=0; i < "11411111142"[cp-sp]-'0'; i++)
+ 	if (!isdigit(argv[arg+i][0])) {
+ 	  dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"), opt);
+