diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-07-10 23:40:16 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-07-10 23:40:16 +0100 |
| commit | 51af5f0eb4cddbe6aa7953717873691d77aae9ff (patch) | |
| tree | 1541525274162b033ebbc3ed38abaf335fbbd49a /gnome-extra/gnome-commander | |
| parent | 7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff) | |
gentoo resync : 11.07.2019
Diffstat (limited to 'gnome-extra/gnome-commander')
3 files changed, 39 insertions, 4 deletions
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest index 98a0c7b42eab..c612d0324ace 100644 --- a/gnome-extra/gnome-commander/Manifest +++ b/gnome-extra/gnome-commander/Manifest @@ -1,5 +1,6 @@ +AUX gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch 832 BLAKE2B f4f730badc7ee5392091e5bce78d7389dd7d5c8612e1747e05d59983252b6e1ca13b27428055166b494d910fe672762b50877c37ac2de6d67d3175a3bda92e2f SHA512 0e3c3643949ad9d2e7bea7ee7b2a688ab2b64c8804220752e21f77573c20daf9259f8001fef9214755387568220f61a5d17ef6f3a374ba6cd07258a409e43087 DIST gnome-commander-1.10.0.tar.xz 7421328 BLAKE2B 4cfb6a5d445217de10007d4371cd5cce95319dd68a6e7f071def2258cd965cfbeab671c6016e624ef474501608214f309c56360216cc53c83a1660b38dbe77d9 SHA512 76e2cca3af7e11ae7f327fa25bb175ad28d36d8b71c4908ce8b91533ed53a444a30d861a24cf94ee34dd7954d1f9dd0a14d26c2214854424b80f8e7c107db60d DIST gnome-commander-1.8.1.tar.xz 7298888 BLAKE2B 57def43a8d8794ea813e6520c436d86f3fb9218e64f0b1e7280e03370870a29887737006e056ee0e2af78e12e225a8f5789c4f86f68eac13e27420cbef0fd2d7 SHA512 76efb88e1ee8843fcb9cf17c421dda1769d39b1bfd9d5c97e3ff570117bcac44dfd17a2efbda5079155115611b10b75644ec12df541bd6f7f8d0f65e471f6b32 -EBUILD gnome-commander-1.10.0.ebuild 1417 BLAKE2B dc919b0724dd57ef2dc524a760baa4aafdd1016af74dca9cbf620601ff73c25247e08a6a5595ff990b6800eb77c5cc8a9a7d9a7eecfd8455a5c02170e9417726 SHA512 fdbcb403ade6e0439d54baa0adb24cc5c609fde93273a762f773eed79f80e9c4abed987bf2c82cf1cc782bd7dcd7306669c294f8c222106fbbb317b358bb4457 +EBUILD gnome-commander-1.10.0.ebuild 1670 BLAKE2B a1cdd6bc666ce22c52344292ca80cc5d2495d75bd1688eb858cdc57a2a2f2daef0f225b4e0364713fe171eca2845f9726bc490433f053058fd59db7851381ed6 SHA512 2929e4eaaade1c3c82e7dba68827943e8ea26a3c7f51df4cdafd04378219c9196f4fb7cfbb9d2060c4565fe072c01ec257fc9b1f84a9180878de0236af595ab2 EBUILD gnome-commander-1.8.1.ebuild 1392 BLAKE2B d1c67d019e1a24dc28f3122012cd10aa208b9785f3e902124177c0c847ed12142b531b1c4ee7e53181837f3d33dc359a5b69e100c5819d79692a607edc2d29d4 SHA512 adc3f88d893737c1b9d2a4cb8f56260f40733d2e39a7e6a53bc813d8225b57b4321c88751935e916cb7329925ca016cf45de226dd0ba4dabb3646354431d5b1e MISC metadata.xml 1204 BLAKE2B 5a53c4f7ba14099a6875bca04d8a91d79c910265f89af7e2227f03b892406fd3be0137a10d096d41d18fe10fb7d4790d649d7c6c4b42f58014d3c30dff884200 SHA512 48f0f626f08698e731b0359ba63ef2a5a25e41a6cf9a1d848f0784d14a8214747e750d30ab5d2759d8fb92278a38690da25c20d5c751fcea72af04e224c41028 diff --git a/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch b/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch new file mode 100644 index 000000000000..01772528c4bc --- /dev/null +++ b/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch @@ -0,0 +1,25 @@ +From 1f98b4a87df3d68b8dd6a2eef24521db7a4d5c75 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Wed, 15 May 2019 18:13:29 +0900 +Subject: [PATCH] Fix compilation error with exiv2 0.27.1 + +Due to the change in https://github.com/Exiv2/exiv2/commit/71498411c19e6b97a24245b5a1a22063c76a972a , +gnome-cmd-tags-exiv2.cc does not compile with exiv2 0.27.1 . + +This commit is to fix the error. +--- + src/tags/gnome-cmd-tags-exiv2.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tags/gnome-cmd-tags-exiv2.cc b/src/tags/gnome-cmd-tags-exiv2.cc +index 807e6f43..e4b269f3 100644 +--- a/src/tags/gnome-cmd-tags-exiv2.cc ++++ b/src/tags/gnome-cmd-tags-exiv2.cc +@@ -33,6 +33,7 @@ + #ifdef HAVE_EXIV2 + #include <exiv2/exif.hpp> + #include <exiv2/image.hpp> ++#include <exiv2/error.hpp> + #endif + + using namespace std; diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild index a5e742b15f16..b21840a254d8 100644 --- a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild +++ b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" -inherit gnome2 +inherit gnome2 toolchain-funcs DESCRIPTION="A graphical, full featured, twin-panel file manager" HOMEPAGE="https://gcmd.github.io/" @@ -31,11 +31,13 @@ RDEPEND=" pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 ) " + +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1-missing-header.patch" ) + DEPEND=" ${RDEPEND} dev-util/gtk-doc-am sys-devel/gettext - >=sys-devel/gcc-8.2.0 virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) " @@ -52,6 +54,13 @@ src_configure() { $(use_with unique) } +pkg_pretend() { + if tc-is-gcc && [[ $(gcc-major-version) -lt 8 ]]; then + eerror "Compilation with gcc older than version 8 is not supported" + die "GCC too old, please use gcc-8 or above" + fi +} + pkg_postinst() { gnome2_pkg_postinst has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories." |