diff options
Diffstat (limited to 'media-gfx/geeqie')
| -rw-r--r-- | media-gfx/geeqie/Manifest | 5 | ||||
| -rw-r--r-- | media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch | 75 | ||||
| -rw-r--r-- | media-gfx/geeqie/geeqie-1.5.1.ebuild | 22 | ||||
| -rw-r--r-- | media-gfx/geeqie/geeqie-9999.ebuild | 13 |
4 files changed, 99 insertions, 16 deletions
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 987dbb9ab708..9efd8d75d7c1 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,4 +1,5 @@ +AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac -EBUILD geeqie-1.5.1.ebuild 2211 BLAKE2B 60e09480c32ed15924e77dde7dd598ef5ffe231ff306ec69748302775a9407a59d7402c1c9a711b732ab74e091cc0d78062c0d018aa75415f0b4152d6b69e968 SHA512 27edac026322f122ad0e92bb285a207fcb29e4a7300dc9a332874ebb9eca26e34e2b3485b0891d1a8d80af1fe0783778c9906b1ed01bbdeefac222312b2f3ce0 -EBUILD geeqie-9999.ebuild 2205 BLAKE2B 66b7e06022214a479a57bfc9d162a054411f409074ceec3d0a5ff07b8917c1b7ada20451b5af30d0377e5046f408347ba7fcb6d2e5b5db205ca34f3adea687dc SHA512 f9808d2f779af157583c44b0c1ce8ca2cca71663487aa5918340f19c429da53e186b3eca865a92e49b033456e3de0134f2ac4d9deed2d408a35651785d5a0fa4 +EBUILD geeqie-1.5.1.ebuild 2253 BLAKE2B a239b59a09826ee473bb40c64a717a42ad69b3a31c4c4b237a802b25bff67fe58de072599463f5ebf57b0b40ed88bd343d3057be8d6bfea6adc2e006d4355798 SHA512 1a0545f0d0a500d3ad0192ca27ad8f21c7591332a2f3b17903d264eaf5c4042c2b524351fb99dcffe54590ccfe0d36b50932c0c96ae25d509ee5c979e07de59c +EBUILD geeqie-9999.ebuild 2303 BLAKE2B 843adc3720b57e36eea9891895fc88bc3a464a6e8384feec8af492c3f30033a4f2cb689ba1ab1b22eaf2f2e80c67ad1e7aff104660fda969669212ee0a1cb6d1 SHA512 2dbec10b4da1df46897f58906678a63a207882451ec3107d55e2a58e1ac25d923cccd61a9679449effa1db854051acc4d14d1ef543a54d5e183bdfa601643005 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58 diff --git a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch b/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch new file mode 100644 index 000000000000..058e22686250 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch @@ -0,0 +1,75 @@ +From 543ea6d903a50c353d9e129d380240f277a670aa Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Thu, 23 Jan 2020 08:24:52 +0000 +Subject: [PATCH] src/options: fix build failure against gcc-10 + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` + CXXLD geeqie +ld: ui_fileops.o:(.bss+0x0): + multiple definition of `options'; ui_bookmark.o:(.bss+0x0): first defined here +ld: ui_fileops.o:(.bss+0x8): + multiple definition of `command_line'; ui_bookmark.o:(.bss+0x8): first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Reported-by: Anthony Parsons +Bug: https://bugs.gentoo.org/706132 +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + src/bar_exif.h | 3 --- + src/options.c | 3 +++ + src/options.h | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/bar_exif.h b/src/bar_exif.h +index 63c30d4b..1395e842 100644 +--- a/src/bar_exif.h ++++ b/src/bar_exif.h +@@ -28,9 +28,6 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n + void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); + + /* these are exposed for when duplication of the exif bar's text is needed */ +- +-const gchar **bar_exif_key_list; +-const gint bar_exif_key_count; + GList *bar_pane_exif_list(); + + #endif +diff --git a/src/options.c b/src/options.c +index 99459381..bab26acb 100644 +--- a/src/options.c ++++ b/src/options.c +@@ -32,6 +32,9 @@ + #include "ui_fileops.h" + #include "window.h" + ++ConfOptions *options; ++CommandLine *command_line; ++ + ConfOptions *init_options(ConfOptions *options) + { + gint i; +diff --git a/src/options.h b/src/options.h +index fcfe961a..02ff8fac 100644 +--- a/src/options.h ++++ b/src/options.h +@@ -329,8 +329,8 @@ struct _ConfOptions + GList *disabled_plugins; + }; + +-ConfOptions *options; +-CommandLine *command_line; ++extern ConfOptions *options; ++extern CommandLine *command_line; + + ConfOptions *init_options(ConfOptions *options); + void setup_default_options(ConfOptions *options); +-- +2.25.0 + diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild index 88c65fbe11e3..85d8651bf878 100644 --- a/media-gfx/geeqie/geeqie-1.5.1.ebuild +++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,9 +30,9 @@ RDEPEND=" tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND} - dev-util/glib-utils" +DEPEND="${RDEPEND}" BDEPEND=" + dev-util/glib-utils dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )" @@ -40,6 +40,8 @@ BDEPEND=" REQUIRED_USE="gpu-accel? ( gtk3 ) map? ( gpu-accel )" +PATCHES=( "${FILESDIR}"/${P}-no_common.patch ) + src_prepare() { default @@ -50,7 +52,8 @@ src_prepare() { } src_configure() { - local myconf="--disable-dependency-tracking + local myeconfargs=( + --disable-dependency-tracking --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} $(use_enable debug debug-log) $(use_enable ffmpegthumbnailer) @@ -63,19 +66,20 @@ src_configure() { $(use_enable map) $(use_enable nls) $(use_enable pdf) - $(use_enable tiff)" + $(use_enable tiff) + ) if use exif || use xmp; then - myconf="${myconf} --enable-exiv2" + myeconfargs+=( --enable-exiv2 ) else - myconf="${myconf} --disable-exiv2" + myeconfargs+=( --disable-exiv2) fi - econf ${myconf} + econf "${myeconfargs[@]}" } src_install() { - emake DESTDIR="${D}" install + default rm -f "${D}/usr/share/doc/${PF}/COPYING" # Application needs access to the uncompressed file diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild index 3f25e162490a..a0e3b2f1b761 100644 --- a/media-gfx/geeqie/geeqie-9999.ebuild +++ b/media-gfx/geeqie/geeqie-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map tiff xmp" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND=" virtual/libintl @@ -28,6 +28,7 @@ RDEPEND=" lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) + pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" @@ -35,8 +36,8 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-util/glib-utils dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" + virtual/pkgconfig + nls? ( sys-devel/gettext )" REQUIRED_USE="gpu-accel? ( gtk3 ) map? ( gpu-accel )" @@ -45,7 +46,7 @@ src_prepare() { default # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die + sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die eautoreconf } @@ -63,6 +64,8 @@ src_configure() { $(use_enable lua) $(use_enable lirc) $(use_enable map) + $(use_enable nls) + $(use_enable pdf) $(use_enable tiff) ) |