diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | exiv2-error.patch | 58 | ||||
| -rw-r--r-- | nufraw-glib-2.70.patch | 20 | ||||
| -rw-r--r-- | nufraw_cplusplus.patch | 22 |
5 files changed, 93 insertions, 30 deletions
@@ -9,18 +9,21 @@ pkgbase = nufraw makedepends = gimp depends = gtkimageview depends = exiv2 - depends = lcms + depends = lcms2 depends = desktop-file-utils depends = cfitsio depends = lensfun optdepends = gimp: to use the gimp import plugin for raw images provides = gimp-nufraw + conflicts = gimp-nufraw noextract = nufraw-0.43-3.tar.gz source = https://downloads.sourceforge.net/project/nufraw/nufraw-0.43-3.tar.gz - source = nufraw_cplusplus.patch + source = nufraw-glib-2.70.patch + source = exiv2-error.patch source = nufraw.desktop sha512sums = 60a6d764ca0248f8c388f4b16ff67cded954f642515bb706d1d45bdab189d159593c93f29ec83bbe6cbe4597d6f229a1839f32a450d5ee1d73a135a825933ec8 - sha512sums = 049176bb5379e0d8df651fc1f4ae0e3e50beb5bb604f5e84b9089df391eaac0e6d60c7626788793d9cbcfea78e1c17944f9ec961e572bc35501e755f57b95a90 + sha512sums = dbf80fa7e87a6b424b9a79f8a10a4a5bed39e074cd8e74a540f40e05fa77605bd5801b648cab0d69c70f31aededb92ea2b11a593a810e66aad3a90b7898720dc + sha512sums = a6a902e3979deca594e25fccfea7787da443e9f8e9dc2e22ea175992161b01ee5054a860c963f268e49bb379b613172e5a7f2eadb38eb5b9279a80dbc7c406f5 sha512sums = d906c384fe19ebda8e0e8a9207b193f2ca20fa5ef13ba70f6ecf4019babea6f20dbf3249bb766dd21db450db04bd6a41a8bbccb168ddb3a419cc6c27cd627688 pkgname = nufraw @@ -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" diff --git a/exiv2-error.patch b/exiv2-error.patch new file mode 100644 index 000000000000..665221c58872 --- /dev/null +++ b/exiv2-error.patch @@ -0,0 +1,58 @@ +diff --git a/nufraw_exiv2.cc b/nufraw_exiv2.cc +index 2de4cc3..45aea87 100644 +--- a/nufraw_exiv2.cc ++++ b/nufraw_exiv2.cc +@@ -54,7 +54,7 @@ extern "C" int nufraw_exif_read_input(nufraw_data *uf) + uf->inputExifBuf = NULL; + uf->inputExifBufLen = 0; + +- Exiv2::Image::AutoPtr image; ++ Exiv2::Image::UniquePtr image; + if (uf->unzippedBuf != NULL) { + image = Exiv2::ImageFactory::open( + (const Exiv2::byte*)uf->unzippedBuf, uf->unzippedBufLen); +@@ -135,7 +135,7 @@ extern "C" int nufraw_exif_read_input(nufraw_data *uf) + nufraw_message(NUFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return NUFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + nufraw_message(NUFRAW_SET_WARNING, "%s\n", s.c_str()); +@@ -156,7 +156,7 @@ static Exiv2::ExifData nufraw_prepare_exifdata(nufraw_data *uf) + if ((pos = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) + != exifData.end()) { + nufraw_message(NUFRAW_SET_LOG, "Resetting %s from '%d' to '1'\n", +- pos->key().c_str(), pos->value().toLong()); ++ pos->key().c_str(), pos->value().toInt64()); + pos->setValue("1"); /* 1 = Normal orientation */ + } + } +@@ -327,7 +327,7 @@ extern "C" int nufraw_exif_prepare_output(nufraw_data *uf) + nufraw_message(NUFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return NUFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + nufraw_message(NUFRAW_SET_WARNING, "%s\n", s.c_str()); +@@ -347,7 +347,7 @@ extern "C" int nufraw_exif_write(nufraw_data *uf) + + char *filename = + uf_win32_locale_filename_from_utf8(uf->conf->outputFilename); +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename); + uf_win32_locale_filename_free(filename); + assert(image.get() != 0); + +@@ -367,7 +367,7 @@ extern "C" int nufraw_exif_write(nufraw_data *uf) + nufraw_message(NUFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return NUFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + nufraw_message(NUFRAW_SET_WARNING, "%s\n", s.c_str()); diff --git a/nufraw-glib-2.70.patch b/nufraw-glib-2.70.patch new file mode 100644 index 000000000000..41f10bfbafa1 --- /dev/null +++ b/nufraw-glib-2.70.patch @@ -0,0 +1,20 @@ +diff -ru nufraw/uf_glib.h nufraw/uf_glib.h +--- nufraw/uf_glib.h 2022-02-23 09:03:44.700472919 +0100 ++++ nufraw/uf_glib.h 2022-02-23 09:04:50.260308805 +0100 +@@ -13,13 +13,13 @@ + #ifndef _UF_GLIB_H + #define _UF_GLIB_H + ++#include <glib.h> ++#include <glib/gstdio.h> ++ + #ifdef __cplusplus + extern "C" { + #endif + +-#include <glib.h> +-#include <glib/gstdio.h> +- + // g_win32_locale_filename_from_utf8 is needed only on win32 + #ifdef _WIN32 + #define uf_win32_locale_filename_from_utf8(__some_string__) \ diff --git a/nufraw_cplusplus.patch b/nufraw_cplusplus.patch deleted file mode 100644 index 185cfdfe2566..000000000000 --- a/nufraw_cplusplus.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- uf_glib.h.orig 2023-03-12 20:46:53.712780919 +0700 -+++ uf_glib.h 2023-03-12 20:47:17.445817005 +0700 -@@ -13,10 +13,6 @@ - #ifndef _UF_GLIB_H - #define _UF_GLIB_H - --#ifdef __cplusplus --extern "C" { --#endif -- - #include <glib.h> - #include <glib/gstdio.h> - -@@ -40,8 +36,4 @@ - #define uf_win32_locale_free(__some_string__) (void)(__some_string__) - #endif - --#ifdef __cplusplus --} --#endif -- - #endif /*_UF_GLIB_H*/ |