diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
| commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
| tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /media-gfx/gthumb | |
| parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) | |
gentoo resync : 12.01.2019
Diffstat (limited to 'media-gfx/gthumb')
| -rw-r--r-- | media-gfx/gthumb/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch | 31 | ||||
| -rw-r--r-- | media-gfx/gthumb/gthumb-3.6.2.ebuild | 4 |
3 files changed, 36 insertions, 2 deletions
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index 36900d82a2e3..1d7cd798b16a 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -1,5 +1,6 @@ +AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528ef29f6d6b2a7ede9b0f16a5835f502bf24e8415f597146abde875e5dbd93fd1fec126a6bbb27d4b0f9881fe9c823ceb5 SHA512 e6f4549526d745d7fa0f42175508be7f6b5ffc9258a5b59a31f45e8c095870b13a0da55c50635723abe6235cf983b7730677906bbb16acf99e58447cc72d8c3d DIST gthumb-3.6.1.tar.xz 3415564 BLAKE2B 363c1c927557f69a4dc0980174b31dd414267c0110205b4406f7fbf02953fd9ad00255d327363c6dcab663e10401b42a7aa23bc33796e944540ad21e778db67d SHA512 8b545626b041f91b8a3ad9caa5930aa431529f660c5a705efff667c78ddccd25683e598f7b1fc08f8e73553cedec00f0187387833e6081f504fc67ebd86f7a42 DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454 EBUILD gthumb-3.6.1.ebuild 2595 BLAKE2B 64912212a1e032ee927272bd77fee83367a678569d7ef58b67e27629404019b5fd101445973a81a870563c756f49de3ee290a9ae50a50abc0b61e913bc02f4ce SHA512 4f7ab17a2331dc0b592a267254d70e7f80d3ecd66aa069200500acf8488f0bdbbfdd1874829468556e25d71c38a0e7d6ead8d894e5085ee68100abe9bfd4c424 -EBUILD gthumb-3.6.2.ebuild 2594 BLAKE2B a6c6a68c0914793b7cde5cc13e730944a0e3476dbfe6f2d47a4e61e3d60d2217dadd42e44355ac59f492422493d02c8ba35cb0ddc8dbd32635c6807f50bfefe3 SHA512 fea6507344884d23a5f298d98295f17b220d1987612f9f027ab07df1d06649acad8ce0bffad57ab1cfbe7ce18f6d85ae2e120195f6dd2cb9d1b2a653a75fcf3c +EBUILD gthumb-3.6.2.ebuild 2656 BLAKE2B 752a1054f960587ac1d9f9a149f6628adc033315310dfad48a7d45112b63fc636f2947986f3d5429348dccb68c9cae09a4590da41ed12a2e6dfb1e41797f7670 SHA512 d2fce54146d41acaf321fb450d2898d550b31388cac17dbfb9e1b58de487438a2cd4fa6e22c4a927b3eef68bae39e66aa67e9c671af575b26869c198793ac1ad MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e diff --git a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch new file mode 100644 index 000000000000..2bd8b94c3c11 --- /dev/null +++ b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch @@ -0,0 +1,31 @@ +Patch kindly borrowed from Mageia. + +* asturm@gentoo.org: Dropped unnecessary and backwards incompatible +xmp_exiv2.hpp include. + +https://gitlab.gnome.org/GNOME/gthumb/issues/30 + +diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp +--- a/extensions/exiv2_tools/exiv2-utils.cpp 2018-06-17 08:24:44.000000000 +0200 ++++ b/extensions/exiv2_tools/exiv2-utils.cpp 2018-12-31 15:51:50.912329232 +0100 +@@ -32,7 +32,7 @@ + #include <sstream> + #include <vector> + #include <iomanip> +-#include <exiv2/xmp.hpp> ++#include <exiv2/exiv2.hpp> + #include <gthumb.h> + #include "exiv2-utils.h" + +@@ -1073,7 +1073,11 @@ + + try { + if (exifData.empty()) { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file"); ++#else + throw Exiv2::Error(1, " No Exif data found in the file"); ++#endif + } + Exiv2::ExifData::const_iterator end = exifData.end(); + for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) { diff --git a/media-gfx/gthumb/gthumb-3.6.2.ebuild b/media-gfx/gthumb/gthumb-3.6.2.ebuild index 1eab1eda6c7d..fa3de15b5f1b 100644 --- a/media-gfx/gthumb/gthumb-3.6.2.ebuild +++ b/media-gfx/gthumb/gthumb-3.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,6 +54,8 @@ DEPEND="${RDEPEND} # eautoreconf needs: # gnome-base/gnome-common +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674092 + src_prepare() { # Remove unwanted CFLAGS added with USE=debug sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \ |