diff options
Diffstat (limited to 'gnome-extra/gnome-color-manager')
4 files changed, 54 insertions, 4 deletions
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest index 14be2a21469e..48f5fd86eca9 100644 --- a/gnome-extra/gnome-color-manager/Manifest +++ b/gnome-extra/gnome-color-manager/Manifest @@ -1,6 +1,7 @@ AUX 3.28-remove-unwvanted-check.patch 556 BLAKE2B 1037c7dfc3102ab7d10fc407e09b1948f3b666d81fb20678751ed3cd06fd2c8d59b9532a7b7487e3ab2bbfedacc447b4184b2789f069cd2ea1f1f327084e8bdb SHA512 0e27b8df076f211f2210a207005cf2f3f2b9e73ab7e7323c4edbd837957e5abe5abe0d657d528dd27fec8e85b410314e0efc1e8c0db1a1ea898c09457025bf90 +AUX gnome-color-manager-3.24.0-exiv2-0.27.patch 1179 BLAKE2B 10c0163f9a3f904dd925e3ee56c8bffa12810b691d883fd7c722ab44d5c34f03325d10d511a7df79f014c12ab5a45265bd7d8091b99804530f57637e5caf55d2 SHA512 a499ac862c6ec5090e88733ddd560c0f4d351ffacfab14f96a5534c6889ed03e8e13e643519a86aaca0a95b25a08617b0a0ab73b8714989b65350c86a3b9003a DIST gnome-color-manager-3.24.0.tar.xz 2857120 BLAKE2B c73c3718f77517a41fc74c12347101c57b9939101b2c816cc6390185fb0b21f87d16ed30b17a94f7bd03e28abb4bd5f5d411c086d350659f6686cfffb7e88cf2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003 DIST gnome-color-manager-3.30.0.tar.xz 2611088 BLAKE2B 2bbed2184d2c7afa9c4c4cd88470df3350f7deb2d776863dcd18ad6253538f1daee5f6397c598af8bdf1ce720980ede9280891139a9366edaffde3672d64b47a SHA512 ec28179f1089317b5a1920757e81b6126ab42a087831a92cd47174ddfbe6093fa868747c2a1d1d70c23f3fb87bc1b839627160407bf85c936ab0a3b125932ccc -EBUILD gnome-color-manager-3.24.0.ebuild 1537 BLAKE2B 084f0e787a17f17923e8996d81b8e01151abe110045e6fb5f7d2a229b96559d4dc25167a0f5dd738bc6d9ac78c9327748f303364f80f921c9fa33fffb62cc9ba SHA512 bf6667a55b0e63a9c5797e6cdfa13534be558f6ece1aa4ed15be39915ea203051e51f5e6c2a1a98933d115a35134b29d3fd95f107224d0a2a64ede099497a3f8 -EBUILD gnome-color-manager-3.30.0-r1.ebuild 1892 BLAKE2B 7f0845ab8fb49ab87a088e9f23deff36b950094423812febe0202996ce2ed1b3e7d2e6f33c3b114689e345a35958d223719448a645cbae31b2409674c9b91f89 SHA512 871d4d680471297a7d10fbe547ada0f4765289975d0d7c2c6ce6a298c0ecdfd1c6528b52b9cc075a11b895f71235a7848e11668295adb1b0987eb79913840fbc +EBUILD gnome-color-manager-3.24.0.ebuild 1660 BLAKE2B b2e823babb1fd2533c2bf5a6249d40f6b818af3f88252c06f80fbc5249af45ea80287335d2b28ab7eabaf595a14592fb5c3ba8921ab1fccde7784c0708b1fbe8 SHA512 6b6fd6acb3e41c7f44620a2a891222c0a800196546f2b54726be597439237d315f3103614ee11fa2a7419523ececcd8239e38496358e23b1ad036a7fc17f27e9 +EBUILD gnome-color-manager-3.30.0-r1.ebuild 2014 BLAKE2B 951f55cd37da169a0bf8483a10c57d108c21a1660385d6b67cf444c61d706da41e6b5f19c031874b616d9caf0bbcb752ae560185fdae2dcc035591e9a7c8dc53 SHA512 33e46a0f5ed513e8ebc41642b97c3fb9daa9466baacfb4970a2feb06d7e07461a34f5e1d1e53c2626c9f9060faa1daf6839258bbc2dfc1758063f8c3af5c65a2 MISC metadata.xml 394 BLAKE2B 1a38f315a074ea0d45493f48b8de54baccea3378a2c8e4a07aa097750487e8b32f10b6c1e7ccadbefd52762e4723a842fe20a58f3e7b3d044eec9a9bdcac04f3 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch new file mode 100644 index 000000000000..00878bc26a85 --- /dev/null +++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch @@ -0,0 +1,41 @@ +Patch kindly borrowed from Mageia. + +https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 + +diff -Nru a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp +--- a/src/gcm-helper-exiv.cpp 2018-09-04 13:50:05.000000000 +0200 ++++ b/src/gcm-helper-exiv.cpp 2018-12-31 15:39:52.288495398 +0100 +@@ -19,8 +19,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#include <exiv2/image.hpp> +-#include <exiv2/exif.hpp> ++#include <exiv2/exiv2.hpp> + #include <iostream> + #include <iomanip> + +@@ -51,7 +50,11 @@ + if (argc == 2) + filename = argv[1]; + if (filename.empty()) ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified"); ++#else + throw Exiv2::Error(1, "No filename specified"); ++#endif + image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + +@@ -60,7 +63,11 @@ + if (exifData.empty()) { + std::string error(argv[1]); + error += ": No Exif data found in the file"; ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::Error(Exiv2::kerErrorMessage, error); ++#else + throw Exiv2::Error(1, error); ++#endif + } + + /* try to find make, model and serial number */ diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild index 441b966300cd..3ab3d64df806 100644 --- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild +++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -39,6 +39,11 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( + # https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 + "${FILESDIR}"/${P}-exiv2-0.27.patch # bug 674086 +) + src_configure() { # Always enable tests since they are check_PROGRAMS anyway # appstream does not want to be relax by default ! diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild index 5f035f751268..4048b8ef3bf5 100644 --- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild +++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.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 @@ -42,6 +42,9 @@ DEPEND="${RDEPEND} PATCHES=( # https://bugzilla.gnome.org/show_bug.cgi?id=796428 "${FILESDIR}"/3.28-remove-unwvanted-check.patch + + # https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 + "${FILESDIR}"/${PN}-3.24.0-exiv2-0.27.patch # bug 674086 ) src_prepare() { |