commit: c9c614a8e49431f59e273c6213bf1fcbfa9b8086 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Tue Jul 16 20:25:25 2024 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Tue Jul 16 20:27:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c614a8
media-gfx/geeqie: drop 2.1-r1, 2.2, 2.3 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> media-gfx/geeqie/Manifest | 6 - .../geeqie/files/geeqie-2.1-exiv2-0.28.0.patch | 151 --------------------- media-gfx/geeqie/files/geeqie-2.1-locale.patch | 22 --- media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch | 19 --- media-gfx/geeqie/files/geeqie-2.3-locale.patch | 11 -- media-gfx/geeqie/geeqie-2.1-r1.ebuild | 117 ---------------- media-gfx/geeqie/geeqie-2.2.ebuild | 115 ---------------- media-gfx/geeqie/geeqie-2.3.ebuild | 119 ---------------- 8 files changed, 560 deletions(-) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index f2a4ecce649a..a8bb11e9e73c 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,8 +1,2 @@ -DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d -DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f -DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a -DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe -DIST geeqie-2.3-docs.tar.xz 362412 BLAKE2B e05adbd6b277cfccae20c2ed7840e447016b32a9bf5c5ad6feb143993b4856fbb623feb6684a21c235ad846923463bed45cf887b1854189f01a46c3961f26a18 SHA512 cab4739adecd1dcb9cde3a58a2e2c2262f4014bc7594ae22af69b8bdbb14f6849b1e2267646301f31ebde76b2b2abc05e75aac3325e35cb88f9dc40703f2d943 -DIST geeqie-2.3.tar.xz 2184604 BLAKE2B dbd2d52d146d373a9694a7371a8ac44571e63895cf6cea7acb549a1135b4cf5869737cdf780ca6afdb14eda1338cb275791eaac1cd7596ed58eb07759cf75778 SHA512 9f45974d12c1f193a4a3624064b967fc06cf9c906c45160a4945a8f6a9d814b929b92c45a35006c7f1b20fa5fe360858f24fd54adbcd8863c3e7d787a3429899 DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b diff --git a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch deleted file mode 100644 index 13b6a171257d..000000000000 --- a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch +++ /dev/null @@ -1,151 +0,0 @@ -From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <[email protected]> -Date: Wed, 21 Jun 2023 12:23:33 +0100 -Subject: [PATCH] Add ExifData as extra argument to - exif_item_get_data_as_text(). - ---- - src/advanced-exif.cc | 2 +- - src/exif-common.cc | 2 +- - src/exif.cc | 8 ++++---- - src/exif.h | 2 +- - src/exiv2.cc | 4 ++-- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc -index 79a54b12..e3d3067a 100644 ---- a/src/advanced-exif.cc -+++ b/src/advanced-exif.cc -@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew) - tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item)); - tag_name = exif_item_get_tag_name(item); - format = exif_item_get_format_name(item, TRUE); -- text = exif_item_get_data_as_text(item); -+ text = exif_item_get_data_as_text(item, exif); - utf8_text = utf8_validate_or_convert(text); - g_free(text); - elements = g_strdup_printf("%d", exif_item_get_elements(item)); -diff --git a/src/exif-common.cc b/src/exif-common.cc -index 6a4c9740..b6f07ca6 100644 ---- a/src/exif-common.cc -+++ b/src/exif-common.cc -@@ -995,7 +995,7 @@ gchar *exif_get_data_as_text(ExifData *exif, const gchar *key) - if (key_valid) return text; - - item = exif_get_item(exif, key); -- if (item) return exif_item_get_data_as_text(item); -+ if (item) return exif_item_get_data_as_text(item, exif); - - return nullptr; - } -diff --git a/src/exif.cc b/src/exif.cc -index 8708ff53..cda2cb1a 100644 ---- a/src/exif.cc -+++ b/src/exif.cc -@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx)) - return exif_item_get_data_as_text_full(item, METADATA_PLAIN); - } - --gchar *exif_item_get_data_as_text(ExifItem *item) -+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif) - { - return exif_item_get_data_as_text_full(item, METADATA_FORMATTED); - } -@@ -1527,11 +1527,11 @@ gchar *exif_get_tag_description_by_key(const gchar *key) - return NULL; - } - --static void exif_write_item(FILE *f, ExifItem *item) -+static void exif_write_item(FILE *f, ExifItem *item, ExifData *exif) - { - gchar *text; - -- text = exif_item_get_data_as_text(item); -+ text = exif_item_get_data_as_text(item, exif); - if (text) - { - gchar *tag = exif_item_get_tag_name(item); -@@ -1578,7 +1578,7 @@ void exif_write_data_list(ExifData *exif, FILE *f, gint human_readable_list) - item = (ExifItem*)(work->data); - work = work->next; - -- exif_write_item(f, item); -+ exif_write_item(f, item, exif); - } - } - g_fprintf(f, "----------------------------------------------------\n"); -diff --git a/src/exif.h b/src/exif.h -index fcc7d8f5..4b03c201 100644 ---- a/src/exif.h -+++ b/src/exif.h -@@ -136,7 +136,7 @@ gchar *exif_item_get_data(ExifItem *item, guint *data_len); - gchar *exif_item_get_description(ExifItem *item); - guint exif_item_get_format_id(ExifItem *item); - const gchar *exif_item_get_format_name(ExifItem *item, gboolean brief); --gchar *exif_item_get_data_as_text(ExifItem *item); -+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif); - gint exif_item_get_integer(ExifItem *item, gint *value); - ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n); - -diff --git a/src/exiv2.cc b/src/exiv2.cc -index 33b779e7..dc62e8e0 100644 ---- a/src/exiv2.cc -+++ b/src/exiv2.cc -@@ -778,13 +778,13 @@ const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief)) - } - - --gchar *exif_item_get_data_as_text(ExifItem *item) -+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif) - { - try { - if (!item) return nullptr; - auto metadatum = reinterpret_cast<Exiv2::Metadatum *>(item); - #if EXIV2_TEST_VERSION(0,17,0) -- return utf8_validate_or_convert(metadatum->print().c_str()); -+ return utf8_validate_or_convert(metadatum->print(&exif->exifData()).c_str()); - #else - std::stringstream str; - Exiv2::Exifdatum *exifdatum; -From b04f7cd0546976dc4f7ea440648ac0eedd8df3ce Mon Sep 17 00:00:00 2001 -From: Colin Clark <[email protected]> -Date: Wed, 21 Jun 2023 14:24:41 +0100 -Subject: [PATCH] Remove exiv2 0.28.0 restriction - -https://github.com/BestImageViewer/geeqie/pull/1119 - -The bug was fixed in the above commit. ---- - meson.build | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/meson.build b/meson.build -index a4cab49c..412399fe 100644 ---- a/meson.build -+++ b/meson.build -@@ -280,15 +280,7 @@ else - endif - - exiv2_dep = [] --# See https://github.com/BestImageViewer/geeqie/issues/1090 --# for the reason for 0.28.0 exclusion --req_version = ['>=0.11', '!=0.28.0'] -- --req_version_str = '' --foreach req_version_str_ : req_version -- req_version_str += req_version_str_ --endforeach -- -+req_version = '>=0.11' - option = get_option('exiv2') - if not option.disabled() - exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2')) -@@ -296,7 +288,7 @@ if not option.disabled() - conf_data.set('HAVE_EXIV2', 1) - summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true) - else -- summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true) -+ summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true) - endif - else - summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true) diff --git a/media-gfx/geeqie/files/geeqie-2.1-locale.patch b/media-gfx/geeqie/files/geeqie-2.1-locale.patch deleted file mode 100644 index 10ae6b0169c5..000000000000 --- a/media-gfx/geeqie/files/geeqie-2.1-locale.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 01d8762d45a2f3871cfd09176edbccdbe73a6767 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <[email protected]> -Date: Sat, 17 Jun 2023 18:47:28 +0200 -Subject: [PATCH] Add missing header for setlocale(). - ---- - src/misc.cc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/misc.cc b/src/misc.cc -index 9942605ce..a2ad3eb69 100644 ---- a/src/misc.cc -+++ b/src/misc.cc -@@ -18,6 +18,8 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include <locale.h> -+ - #include "main.h" - #include "misc.h" - diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch deleted file mode 100644 index a0c816b5fb3c..000000000000 --- a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- - src/lua.cc | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/lua.cc b/src/lua.cc -index 84aa549a..458b658a 100644 ---- a/src/lua.cc -+++ b/src/lua.cc -@@ -24,9 +24,7 @@ - - #define _XOPEN_SOURCE - --#include <lua.h> --#include <lauxlib.h> --#include <lualib.h> -+#include <lua.hpp> - - #include <stdio.h> - #include <glib.h> diff --git a/media-gfx/geeqie/files/geeqie-2.3-locale.patch b/media-gfx/geeqie/files/geeqie-2.3-locale.patch deleted file mode 100644 index 05f8bdcfdaea..000000000000 --- a/media-gfx/geeqie/files/geeqie-2.3-locale.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur geeqie-2.3.orig/src/misc.cc geeqie-2.3/src/misc.cc ---- geeqie-2.3.orig/src/misc.cc 2024-03-06 16:56:22.000000000 +0100 -+++ geeqie-2.3/src/misc.cc 2024-03-25 21:03:18.655779225 +0100 -@@ -23,6 +23,7 @@ - #include <sys/stat.h> - #include <unistd.h> - -+#include <clocale> - #include <cstdio> - #include <cstdlib> - #include <cstring> diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild deleted file mode 100644 index 2a7751b70258..000000000000 --- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{3,4} ) - -inherit flag-o-matic lua-single meson optfeature xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org"; -SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz - https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc x86" -IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" - -RDEPEND="gnome-extra/zenity - virtual/libintl - x11-libs/gtk+:3 - djvu? ( app-text/djvu ) - exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - heif? ( >=media-libs/libheif-1.3.2 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( >=media-libs/libjxl-0.3.7:= ) - lcms? ( media-libs/lcms:2 ) - lua? ( ${LUA_DEPS} ) - map? ( media-libs/clutter-gtk - media-libs/libchamplain:0.12[gtk] ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - raw? ( >=media-libs/libraw-0.20:= ) - spell? ( app-text/gspell ) - tiff? ( media-libs/tiff:= ) - webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) - zip? ( >=app-arch/libarchive-3.4.0 )" -DEPEND="${RDEPEND}" -BDEPEND=" - || ( dev-util/xxdi app-editors/vim-core ) - dev-util/glib-utils - sys-devel/gettext - virtual/pkgconfig" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${P}-locale.patch - "${FILESDIR}"/${P}-lua_hpp.patch - "${FILESDIR}"/${P}-exiv2-0.28.0.patch -) - -pkg_setup() { - # Do not require setting LUA_SINGLE_TARGET if lua is not used - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - - # Disable doc build - not useful most of the time per upstream - sed -e "/subdir('doc')/d" -i meson.build || die -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/585432 - # https://github.com/BestImageViewer/geeqie/issues/1270 - filter-lto - - local emesonargs=( - -Dgq_helpdir="share/doc/${PF}" - -Dgq_htmldir="share/doc/${PF}/html" - $(meson_use debug) - $(meson_feature djvu) - $(meson_feature exif exiv2) - $(meson_feature ffmpegthumbnailer videothumbnailer) - $(meson_feature heif) - $(meson_feature jpeg) - $(meson_feature jpeg2k j2k) - $(meson_feature jpegxl) - $(meson_feature lcms cms) - $(meson_feature lua) - $(meson_feature map gps-map) - $(meson_feature pdf) - $(meson_feature raw libraw) - $(meson_feature spell) - $(meson_feature tiff) - $(meson_feature zip archive) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - # Manually generated ChangeLog - dodoc "${WORKDIR}"/${P}-docs/* - - # The application needs access to some uncompressed doc files. - docompress -x /usr/share/doc/${PF}/AUTHORS - docompress -x /usr/share/doc/${PF}/ChangeLog - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2 - optfeature "Lens ID plugin" media-libs/exiftool - optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick" - optfeature "Image rotate plugin (JPEG)" media-gfx/fbida - optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick - optfeature "Print preview functionality" app-text/evince -} diff --git a/media-gfx/geeqie/geeqie-2.2.ebuild b/media-gfx/geeqie/geeqie-2.2.ebuild deleted file mode 100644 index db97d02cdbaa..000000000000 --- a/media-gfx/geeqie/geeqie-2.2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{3,4} ) - -inherit flag-o-matic lua-single meson optfeature xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org"; -SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz - https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"; -# Doc build: -# clone git at matching tag -# mkdir build; ./gen_changelog.sh . build; -# pandoc README.md -o build/README.html - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" -IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" - -RDEPEND="gnome-extra/zenity - virtual/libintl - x11-libs/gtk+:3 - djvu? ( app-text/djvu ) - exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - heif? ( >=media-libs/libheif-1.3.2 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( >=media-libs/libjxl-0.3.7:= ) - lcms? ( media-libs/lcms:2 ) - lua? ( ${LUA_DEPS} ) - map? ( media-libs/clutter-gtk - media-libs/libchamplain:0.12[gtk] ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - raw? ( >=media-libs/libraw-0.20:= ) - spell? ( app-text/gspell ) - tiff? ( media-libs/tiff:= ) - webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) - zip? ( >=app-arch/libarchive-3.4.0 )" -DEPEND="${RDEPEND}" -BDEPEND=" - || ( dev-util/xxdi app-editors/vim-core ) - dev-util/glib-utils - sys-devel/gettext - virtual/pkgconfig" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -pkg_setup() { - # Do not require setting LUA_SINGLE_TARGET if lua is not used - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - - # Disable doc build - not useful most of the time per upstream - sed -e "/subdir('doc')/d" -i meson.build || die -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/585432 - # https://github.com/BestImageViewer/geeqie/issues/1270 - filter-lto - - local emesonargs=( - -Dgq_helpdir="share/doc/${PF}" - -Dgq_htmldir="share/doc/${PF}/html" - $(meson_use debug) - $(meson_feature djvu) - $(meson_feature exif exiv2) - $(meson_feature ffmpegthumbnailer videothumbnailer) - $(meson_feature heif) - $(meson_feature jpeg) - $(meson_feature jpeg2k j2k) - $(meson_feature jpegxl) - $(meson_feature lcms cms) - $(meson_feature lua) - $(meson_feature map gps-map) - $(meson_feature pdf) - $(meson_feature raw libraw) - $(meson_feature spell) - $(meson_feature tiff) - $(meson_feature zip archive) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - # Manually generated ChangeLog - dodoc "${WORKDIR}"/${P}-docs/* - - # The application needs access to some uncompressed doc files. - docompress -x /usr/share/doc/${PF}/AUTHORS - docompress -x /usr/share/doc/${PF}/ChangeLog - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2 - optfeature "Lens ID plugin" media-libs/exiftool - optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick" - optfeature "Image rotate plugin (JPEG)" media-gfx/fbida - optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick - optfeature "Print preview functionality" app-text/evince -} diff --git a/media-gfx/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild deleted file mode 100644 index dae22816e4fd..000000000000 --- a/media-gfx/geeqie/geeqie-2.3.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{3,4} ) - -inherit flag-o-matic lua-single meson optfeature xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org"; -SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz - https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"; -# Doc build: -# clone git at matching tag -# mkdir build; ./gen_changelog.sh . build; -# pandoc README.md -o build/README.html - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" -IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" - -RDEPEND="gnome-extra/zenity - virtual/libintl - x11-libs/gtk+:3 - djvu? ( app-text/djvu ) - exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - heif? ( >=media-libs/libheif-1.3.2 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( >=media-libs/libjxl-0.3.7:= ) - lcms? ( media-libs/lcms:2 ) - lua? ( ${LUA_DEPS} ) - map? ( media-libs/clutter-gtk - media-libs/libchamplain:0.12[gtk] ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - raw? ( >=media-libs/libraw-0.20:= ) - spell? ( app-text/gspell ) - tiff? ( media-libs/tiff:= ) - webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) - zip? ( >=app-arch/libarchive-3.4.0 )" -DEPEND="${RDEPEND}" -BDEPEND=" - || ( dev-util/xxdi app-editors/vim-core ) - dev-util/glib-utils - sys-devel/gettext - virtual/pkgconfig" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch - "${FILESDIR}"/${P}-locale.patch - ) - -pkg_setup() { - # Do not require setting LUA_SINGLE_TARGET if lua is not used - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - - # Disable doc build - not useful most of the time per upstream - sed -e "/subdir('doc')/d" -i meson.build || die -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/585432 - # https://github.com/BestImageViewer/geeqie/issues/1270 - filter-lto - - local emesonargs=( - -Dgq_helpdir="share/doc/${PF}" - -Dgq_htmldir="share/doc/${PF}/html" - $(meson_use debug) - $(meson_feature djvu) - $(meson_feature exif exiv2) - $(meson_feature ffmpegthumbnailer videothumbnailer) - $(meson_feature heif) - $(meson_feature jpeg) - $(meson_feature jpeg2k j2k) - $(meson_feature jpegxl) - $(meson_feature lcms cms) - $(meson_feature lua) - $(meson_feature map gps-map) - $(meson_feature pdf) - $(meson_feature raw libraw) - $(meson_feature spell) - $(meson_feature tiff) - $(meson_feature zip archive) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - # Manually generated ChangeLog - dodoc "${WORKDIR}"/${P}-docs/* - - # The application needs access to some uncompressed doc files. - docompress -x /usr/share/doc/${PF}/AUTHORS - docompress -x /usr/share/doc/${PF}/ChangeLog - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2 - optfeature "Lens ID plugin" media-libs/exiftool - optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick" - optfeature "Image rotate plugin (JPEG)" media-gfx/fbida - optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick - optfeature "Print preview functionality" app-text/evince -}
