diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest new file mode 100644 index 0000000..c9139fb --- /dev/null +++ b/media-gfx/geeqie/Manifest @@ -0,0 +1,4 @@ +AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9 +DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef +EBUILD geeqie-1.6-r1.ebuild 2137 BLAKE2B a142435d2859b0dfcaf54521740326e54fb18ed546d71028c954ebe3f90e6172176391c97ff7b7b903f6dd62e6cb48b0c0b49e263e633582ff4b0a62ab11c426 SHA512 ac19e13acbc28c089ff95b2d74609698c2782aad53e2368f8dc5b0d50300fa14794ded3075ee473984a3cf811f9ef35e6894904b8527adf5cf7cf4780bcd7a1f +MISC metadata.xml 924 BLAKE2B 9bafd79f0d60d1237da4b35aeb2142384c188b503c151f8e0a26cd6ea9a2658876c66fb6f248af34eb33f6d2218bafeb1f34521d23c55e244c7ee1b4c0234dda SHA512 73f82d929d6479d81dde14c922ac048feaccf4bf5ea8ffe8aea56cf7cbe0cc8f76c528f3363bbbad3e881640608265a2e583d8b675fce3aa43ad7646023167fc 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 0000000..058e226 --- /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 +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 +--- + 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.6-r1.ebuild b/media-gfx/geeqie/geeqie-1.6-r1.ebuild new file mode 100644 index 0000000..0ba4fe3 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.6-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +LUA_COMPAT=( lua5-{1..3} ) + +inherit autotools lua-single xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org" +SRC_URI="http://www.geeqie.org/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="debug doc exif ffmpegthumbnailer jpeg lcms lirc lua nls pdf tiff xmp" + +RDEPEND=" + virtual/libintl + x11-libs/gtk+:2 + doc? ( app-text/gnome-doc-utils ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( ${LUA_DEPS} ) + 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:= ) )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +PATCHES=( "${FILESDIR}"/${P}-yelp.patch ) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + # Remove -Werror (gcc changes may add new warnings) + sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable debug debug-log) + $(use_enable ffmpegthumbnailer) + --disable-gpu-accel + --disable-gtk3 + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + --disable-map + $(use_enable nls) + $(use_enable pdf) + $(use_enable tiff) + ) + + if use exif || use xmp; then + myeconfargs+=( --enable-exiv2 ) + else + myeconfargs+=( --disable-exiv2) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +} diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml new file mode 100644 index 0000000..6bc08d2 --- /dev/null +++ b/media-gfx/geeqie/metadata.xml @@ -0,0 +1,15 @@ + + + + + voyageur@gentoo.org + Bernard Cafarelli + + Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool + + Enable video thumbnail support with media-video/ffmpegthumbnailer + Enable GPU acceleration support - experimental + Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2 + Enable items map display - experimental + +