* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-commander/, gnome-extra/gnome-commander/files/
@ 2019-07-07 21:36 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2019-07-07 21:36 UTC (permalink / raw
To: gentoo-commits
commit: eefb5b9bd1af103688a7dee4c0db9a7fcee35a3a
Author: Uwe Scholz <uwescholz <AT> src <DOT> gnome <DOT> org>
AuthorDate: Sun Jul 7 10:10:30 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 21:36:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eefb5b9b
gnome-extra/gnome-commander: patch for compiling with exiv2-0.27.1
Closes: https://bugs.gentoo.org/688452
Signed-off-by: Uwe Scholz <uwescholz <AT> src.gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/12400
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...mander-1.10.0-exiv2-0.27.1-missing-header.patch | 25 ++++++++++++++++++++++
.../gnome-commander/gnome-commander-1.10.0.ebuild | 3 +++
2 files changed, 28 insertions(+)
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 00000000000..01772528c4b
--- /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 87303c532e8..4845978b379 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
@@ -31,6 +31,9 @@ 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-commander/, gnome-extra/gnome-commander/files/
@ 2020-06-20 19:04 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-06-20 19:04 UTC (permalink / raw
To: gentoo-commits
commit: 02572e7dd3b5b778eafde23cf3e2d43ef8c3ea73
Author: Uwe Scholz <uwescholz <AT> src <DOT> gnome <DOT> org>
AuthorDate: Sat Jun 20 17:30:10 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 19:04:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02572e7d
gnome-extra/gnome-commander: remove old
Signed-off-by: Uwe Scholz <uwescholz <AT> src.gnome.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
gnome-extra/gnome-commander/Manifest | 2 -
...mander-1.10.0-exiv2-0.27.1-missing-header.patch | 25 --------
.../gnome-commander/gnome-commander-1.10.0.ebuild | 69 ----------------------
.../gnome-commander/gnome-commander-1.10.1.ebuild | 69 ----------------------
4 files changed, 165 deletions(-)
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index 11f34de00e8..737aab628e1 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,4 +1,2 @@
-DIST gnome-commander-1.10.0.tar.xz 7421328 BLAKE2B 4cfb6a5d445217de10007d4371cd5cce95319dd68a6e7f071def2258cd965cfbeab671c6016e624ef474501608214f309c56360216cc53c83a1660b38dbe77d9 SHA512 76e2cca3af7e11ae7f327fa25bb175ad28d36d8b71c4908ce8b91533ed53a444a30d861a24cf94ee34dd7954d1f9dd0a14d26c2214854424b80f8e7c107db60d
-DIST gnome-commander-1.10.1.tar.xz 7424500 BLAKE2B 6abddf8dae4bc0a1d740ffee49ccc7d816d783bdb5c2b90c9d0681c1db5fa3f42700e65a780881400c1af038d7dfe7f458a98cf2f8f1c1b0fc6f93a3d58dc069 SHA512 b5bc548444149e00f29e6e3b7f785c99a08d27a0a2642cf78c203411a8d2937341a76685b09172047162afe3e0fc92ff13c82bdbd8105281d360c1df44b4702d
DIST gnome-commander-1.10.2.tar.xz 7433468 BLAKE2B a62a39490b154a8dc7a5e05c4d4c59fc79447b7b9ddae139542552f809b7a53cf729d636f1fabb85c6390520a25d84477ec6dfcd4394eefe59a8039b51b0ddf2 SHA512 7a411ca6f604771445119cb2b9d14f7f5d91622d28975e92ae5f5da3fc4f76fe51cca0de3712377ef95064879089c1c723dce9a824e5784cfcd484b869702dad
DIST gnome-commander-1.10.3.tar.xz 7474512 BLAKE2B f27f86a470bc919327980ba21c577241034290d74b663d4479195fa21249ce9bd238b12a0fae70c3cc6ab26953a595414efbe04508c73f8deb5e7c6e2de6f784 SHA512 87c4df1534747f21b15e48141180601aef02152b1eef097986b0f8675a6d24e75a81ccb7d0b41b2df38cd40eadae2b0bd09f8e0274a5e5cd8bbd8d23df6ffd7f
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
deleted file mode 100644
index 01772528c4b..00000000000
--- a/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index b145aee0dcb..00000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chm exif gsf pdf taglib samba test +unique"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-text/yelp-tools
- >=dev-libs/glib-2.44.0:2
- unique? ( >=dev-libs/libunique-0.9.3:1 )
- gnome-base/gnome-keyring
- >=gnome-base/gnome-vfs-2.0.0
- >=gnome-base/libgnome-2.0.0
- >=gnome-base/libgnomeui-2.4.0
- >=x11-libs/gtk+-2.18.0:2
- chm? ( dev-libs/chmlib )
- exif? ( >=media-gfx/exiv2-0.14 )
- gsf? ( >=gnome-extra/libgsf-1.12.0 )
- samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
- 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
- virtual/pkgconfig
- test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_with chm libchm) \
- $(use_with exif exiv2) \
- $(use_with gsf libgsf) \
- $(use_with pdf poppler) \
- $(use_with samba) \
- $(use_with taglib) \
- $(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."
- has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild
deleted file mode 100644
index 5087c582cc0..00000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf taglib samba test +unique"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-text/yelp-tools
- >=dev-libs/glib-2.44.0:2
- unique? ( >=dev-libs/libunique-0.9.3:1 )
- gnome-base/gnome-keyring
- >=gnome-base/gnome-vfs-2.0.0
- >=gnome-base/libgnome-2.0.0
- >=gnome-base/libgnomeui-2.4.0
- >=x11-libs/gtk+-2.18.0:2
- chm? ( dev-libs/chmlib )
- exif? ( >=media-gfx/exiv2-0.14 )
- gsf? ( >=gnome-extra/libgsf-1.12.0 )
- samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
- pdf? ( >=app-text/poppler-0.18 )
- taglib? ( >=media-libs/taglib-1.4 )
-"
-
-PATCHES=( "${FILESDIR}/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch" )
-
-DEPEND="
- ${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
- test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_with chm libchm) \
- $(use_with exif exiv2) \
- $(use_with gsf libgsf) \
- $(use_with pdf poppler) \
- $(use_with samba) \
- $(use_with taglib) \
- $(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."
- has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-20 19:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-07 21:36 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-commander/, gnome-extra/gnome-commander/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-06-20 19:04 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox