Updated patches

1 files changed, 9 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 48b559f4b504..5aa7e8b908ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,25 +8,29 @@ pkgdesc='A new version of the popular raw digital images manipulator ufraw.'
 arch=('i686' 'x86_64')
 url='https://sourceforge.net/projects/nufraw'
 license=('GPL')
-provides=(gimp-nufraw)
-depends=('gtkimageview' 'exiv2' 'lcms' 'desktop-file-utils' 'cfitsio' 'lensfun')
+provides=('gimp-nufraw')
+conflicts=('gimp-nufraw')
+depends=('gtkimageview' 'exiv2' 'lcms2' 'desktop-file-utils' 'cfitsio' 'lensfun')
 makedepends=('gimp')
 optdepends=('gimp: to use the gimp import plugin for raw images')
 source=(
 https://downloads.sourceforge.net/project/$pkgname/$pkgname-$_pkgver.tar.gz
-nufraw_cplusplus.patch
+nufraw-glib-2.70.patch
+exiv2-error.patch
 nufraw.desktop
 )
 noextract=($pkgname-$_pkgver.tar.gz)
 sha512sums=('60a6d764ca0248f8c388f4b16ff67cded954f642515bb706d1d45bdab189d159593c93f29ec83bbe6cbe4597d6f229a1839f32a450d5ee1d73a135a825933ec8'
-            '049176bb5379e0d8df651fc1f4ae0e3e50beb5bb604f5e84b9089df391eaac0e6d60c7626788793d9cbcfea78e1c17944f9ec961e572bc35501e755f57b95a90'
+            'dbf80fa7e87a6b424b9a79f8a10a4a5bed39e074cd8e74a540f40e05fa77605bd5801b648cab0d69c70f31aededb92ea2b11a593a810e66aad3a90b7898720dc'
+            'a6a902e3979deca594e25fccfea7787da443e9f8e9dc2e22ea175992161b01ee5054a860c963f268e49bb379b613172e5a7f2eadb38eb5b9279a80dbc7c406f5'
             'd906c384fe19ebda8e0e8a9207b193f2ca20fa5ef13ba70f6ecf4019babea6f20dbf3249bb766dd21db450db04bd6a41a8bbccb168ddb3a419cc6c27cd627688')
 prepare(){
   cd "$srcdir"
   tar zxf $pkgname-$_pkgver.tar.gz \
     --exclude doc-pak --exclude=.git
   cd "$pkgname-$_pkgver"
-  patch < ../nufraw_cplusplus.patch
+  patch < ../nufraw-glib-2.70.patch
+  patch < ../exiv2-error.patch
   chmod +x mkinstalldirs generate_schemas.sh
   mv nufraw.desktop.desktop nufraw.desktop
 #   msg2 "Fixing dcraw.cc: error: call of overloaded ‘abs(unsigned int&)’ is ambiguous"