[arch-commits] Commit in gimp-ufraw/trunk (PKGBUILD exiv2-0.14.patch)

[Giovanni Scafora]

    Date: Sunday, July 5, 2009 @ 15:50:53
  Author: giovanni
Revision: 44950

upgpkg: gimp-ufraw 0.15-3
    libjpeg-7 rebuilds

Modified:
  gimp-ufraw/trunk/PKGBUILD
Deleted:
  gimp-ufraw/trunk/exiv2-0.14.patch

------------------+
 PKGBUILD         |   12 ++++++------
 exiv2-0.14.patch |   31 -------------------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-05 19:33:55 UTC (rev 44949)
+++ PKGBUILD	2009-07-05 19:50:53 UTC (rev 44950)
@@ -5,19 +5,19 @@
 pkgname=gimp-ufraw
 _srcname=ufraw
 pkgver=0.15
-pkgrel=2
+pkgrel=3
 pkgdesc="standalone or gimp plugin converter for raw files"
 url="http://ufraw.sourceforge.net/"
 arch=(i686 x86_64)
 license=(GPL2)
 depends=('lcms' 'gtk2' 'libexif' 'exiv2>=0.18')
-makedepends=('gimp' 'cinepaint')
+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)
 
 build() {
-  cd ${startdir}/src/${_srcname}-${pkgver}
+  cd ${srcdir}/${_srcname}-${pkgver}
   ./configure --prefix=/usr \
     --enable-extras \
 	 --enable-mime \
@@ -25,8 +25,8 @@
     --with-libexif --with-exiv2
   sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
   make
-  make DESTDIR=${startdir}/pkg install
-  rm -f ${startdir}/pkg/usr/bin/dcraw
+  make DESTDIR=${pkgdir} install
+  rm -f ${pkgdir}/usr/bin/dcraw
 }
 md5sums=('6d8f6c98a388c438784cd909dd82d540')
 md5sums=('6d8f6c98a388c438784cd909dd82d540')

Deleted: exiv2-0.14.patch
===================================================================
--- exiv2-0.14.patch	2009-07-05 19:33:55 UTC (rev 44949)
+++ exiv2-0.14.patch	2009-07-05 19:50:53 UTC (rev 44950)
@@ -1,31 +0,0 @@
---- ufraw-0.11/configure.ac.exiv2	2007-03-06 15:02:40.000000000 -0600
-+++ ufraw-0.11/configure.ac	2007-04-25 13:09:06.000000000 -0500
-@@ -185,12 +185,17 @@
- AC_MSG_RESULT($with_exiv2)
- have_exiv2=no
- if test $with_exiv2 = yes; then
-+PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.14,
-+ [ have_exiv2=yes
-+   AC_DEFINE(HAVE_EXIV2, 1, have exiv2)],
-+ [ 
-   AC_CHECK_PROGS(EXIV2_CONFIG, exiv2-config, , $PATH)
-   if test -n "$EXIV2_CONFIG"; then
-     have_exiv2=yes
-     AC_DEFINE(HAVE_EXIV2, 1, have exiv2)
-     EXIV2_LIBS=`$EXIV2_CONFIG --libs`
-   fi
-+ ])
- fi
- 
- UFRAW_CFLAGS="$UFRAW_CFLAGS $EXIF_CFLAGS $GIMP_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LCMS_CFLAGS"
---- ufraw-0.11/ufraw_exiv2.cc.exiv2	2007-02-08 15:28:41.000000000 -0600
-+++ ufraw-0.11/ufraw_exiv2.cc	2007-04-25 13:10:16.000000000 -0500
-@@ -201,7 +201,7 @@
- }
- catch (Exiv2::AnyError& e) {
-     std::cerr.rdbuf(savecerr);
--    ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what().c_str());
-+    ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what());
-     return UFRAW_ERROR;
- }
-