This patch allows us to build libextractor against exiv2 0.27.x. Adapted from this upstream commit: commit 1ecee9a47717e36cb8a3925d011d1a6de11d631c Author: Christian Grothoff Date: Mon Jul 29 17:58:18 2019 +0200 importing patch from Gentoo/AS to address exiv2 build issue (#5820) diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc index 8741d40..ef402a8 100644 --- a/src/plugins/exiv2_extractor.cc +++ b/src/plugins/exiv2_extractor.cc @@ -27,10 +27,7 @@ #include #include #include -#include -#include -#include -#include +#include /** * Enable debugging to get error messages. @@ -180,7 +177,7 @@ public: * * @return -1 on error */ -#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) +#if EXIV2_TEST_VERSION(0,26,0) virtual size_t size (void) const; #else virtual long int size (void) const; @@ -316,7 +313,11 @@ ExtractorIO::getb () const unsigned char *r; if (1 != ec->read (ec->cls, &data, 1)) +#if EXIV2_TEST_VERSION(0,27,0) + throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); +#else throw Exiv2::BasicError (42 /* error code */); +#endif r = (const unsigned char *) data; return *r; } @@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) void ExtractorIO::transfer (Exiv2::BasicIo& src) { +#if EXIV2_TEST_VERSION(0,27,0) + throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); +#else throw Exiv2::BasicError (42 /* error code */); +#endif } @@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, Exiv2::byte * ExtractorIO::mmap (bool isWritable) { +#if EXIV2_TEST_VERSION(0,27,0) + throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); +#else throw Exiv2::BasicError (42 /* error code */); +#endif } @@ -449,7 +458,7 @@ ExtractorIO::tell (void) const * * @return -1 on error */ -#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) +#if EXIV2_TEST_VERSION(0,26,0) size_t #else long int @@ -504,7 +513,11 @@ ExtractorIO::eof () const std::string ExtractorIO::path () const { +#if EXIV2_TEST_VERSION(0,27,0) + throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); +#else throw Exiv2::BasicError (42 /* error code */); +#endif } @@ -517,7 +530,11 @@ ExtractorIO::path () const std::wstring ExtractorIO::wpath () const { +#if EXIV2_TEST_VERSION(0,27,0) + throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); +#else throw Exiv2::BasicError (42 /* error code */); +#endif } #endif @@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr ExtractorIO::temporary () const { fprintf (stderr, "throwing temporary error\n"); +#if EXIV2_TEST_VERSION(0,27,0) + throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); +#else throw Exiv2::BasicError (42 /* error code */); +#endif } @@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec) { try { -#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION +#if !EXIV2_TEST_VERSION(0,24,0) Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); #endif std::auto_ptr eio(new ExtractorIO (ec)); ve-inputs]: Add python-jinja2. [inputs]: Add util-linux:lib. * gnu/services/desktop.scm (elogind-dbus-service) <elogind-dbus-service-wrapper>: Add a symlink to elogind's share/dbus-1/system.d to expose D-Bus policy configurations. * gnu/tests/desktop.scm (run-elogind-test): Adjust expected result for the new "linger" value. * gnu/packages/patches/elogind-revert-polkit-detection.patch: Delete file. * gnu/packages/patches/elogind-fix-rpath.patch: New file. * gnu/local.mk (dist_patch_DATA): Update. Series-to: 64938@debbugs.gnu.org Series-prefix: elogind-updates Series-version: 2 Series-changes: 2 - Fix elogind system test - Install D-Bus policy files in elogind-dbus-service-wrapper - Remove duplicate 'dbussystemservicedir' configure flag Maxim Cournoyer 2023-05-14tests: elogind: Wait until 'elogind' is up....Previously we could find ourselves typing in too early. * gnu/tests/desktop.scm (run-elogind-test)["login on tty1"]: Wait for 'elogind in to 'term-tty1. ["screendump"]: New test. Ludovic Courtès 2022-08-26gnu: greetd-service-type: Add supplementary groups to greeter....* gnu/services/base.scm (<greetd-configuration>) [greeter-supplementary-groups]: New field. (%greetd-accounts): Rename to... (greetd-accounts): ... this. Convert to a function that takes a config argument. Use greeter-supplementary-groups. (greetd-service-type): Adjust accordingly. * gnu/tests/desktop.scm (%minimal-services): Add test for greeter-supplementary-groups. * doc/guix.texi ("Base Services")[greetd-service-type]: Document greeter-supplementary-groups. muradm 2022-08-26gnu: seatd-service-type: Use seat group....* gnu/services/desktop.scm (seatd-group-sanitizer): New variable. (<seatd-configuration>)[user]: Removed field. [group]: Changed to "seat". Sanitize via seatd-group-sanitizer. (seatd-accounts): New variable. (seatd-environment): Adjust to <seatd-configuration> ABI. (seatd-service-type)[extensions]: Add account-service-type with seatd-accounts. * gnu/tests/desktop.scm (run-minimal-desktop-test): Check for correct ownership of $SEATD_SOCK. * doc/guix.texi ("Desktop Services")[seatd-service-type]: Mention that users may need to become members of the "seat" group. Update default value for group field. Add explanation on seatd.sock file. Remove dropped user field. muradm 2022-06-17gnu: tests: Add seatd/greetd based minimal desktop system tests....* gnu/tests/desktop.scm (minimal-desktop): seatd/greetd based minimal desktop test Signed-off-by: Lars-Dominik Braun <ldb@leibniz-psychology.org> muradm