commit: ab0f84d215f069f6d321c214d3467270b88943c4 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sun Mar 3 18:40:54 2024 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sun Mar 3 18:40:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0f84d2
media-gfx/gthumb: drop 3.12.2-r5 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> media-gfx/gthumb/Manifest | 1 - media-gfx/gthumb/files/3.12.2-date-format.patch | 32 ------ media-gfx/gthumb/files/3.12.2-libraw-0.21.patch | 55 ---------- media-gfx/gthumb/files/3.12.2-link-with-x11.patch | 14 --- media-gfx/gthumb/gthumb-3.12.2-r5.ebuild | 116 ---------------------- 5 files changed, 218 deletions(-) diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index c25d4c6ec8f2..850c36f96289 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -1,4 +1,3 @@ -DIST gthumb-3.12.2.tar.xz 7585700 BLAKE2B 9fb4fd934975fb775b82cf17028abd6d4ac3c31ee30458c377d36d3af97e59218e621d09768eebec096c64e3d01697bd3080409fd2191c2af29d84c9b53508c1 SHA512 5304b5cfefa4ced6a244db5a6e2880dad4f5a598654c9ea6c7707ddc0a766bdfa108f827a74e400168dbc338e35db519fffb7ac7382e0ee564771d56af3ac97c DIST gthumb-3.12.3.tar.xz 7604504 BLAKE2B 1db5007a8ea659d59d8ac1b3c3c07c494db719788678588e801560796c0453ccf83abbfb2c9976a7977d19e6fbb2d4540cc5c6675629219e8aba3a031acb61be SHA512 d538d7b306dac391283229147eccc2eef8933107676c0645b08371754d5956729d3747a5b7393366e25967924dee73255fde3d96d3d8e2fc8e7d47a91ceafa94 DIST gthumb-3.12.4.tar.xz 7617528 BLAKE2B 2119692d460d12351273b8e7a9e14cf97c486cf283331f3e5d842cdc3c8b42edf4cdaf87d19962c1a162b956682a7aed34dba7e43130d49603d30441c5f8d12c SHA512 0a15f78e65c7dc8e45b6410052a2ebd480247828e48dbb59d80447d97f2d83a3914fa513b1cf5a9f3a0ce620fb49245a919e3ca5b61cf8a144806c724e14a747 DIST gthumb-3.12.5.tar.xz 7618720 BLAKE2B beeac0c62934555dd306ab2319598de7703a10f01498972e7d177286b5f298070274e44977abc665c5e33e996ae884ffb0dfe80641a396425bdf549252c8832d SHA512 acdaef8cddcd68d9dd269bf1c000c50ab8dcb359df18337de243398448407beef1fe6daaeb99e161486a5a5575919779eb7d335c38ea4a4196c2a32d46aa5517 diff --git a/media-gfx/gthumb/files/3.12.2-date-format.patch b/media-gfx/gthumb/files/3.12.2-date-format.patch deleted file mode 100644 index 1bc2309abf20..000000000000 --- a/media-gfx/gthumb/files/3.12.2-date-format.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://gitlab.gnome.org/GNOME/gthumb/-/issues/235 - -From 77b0e6186579fccfca8a516b1399564228e01793 Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega <[email protected]> -Date: Wed, 10 Aug 2022 07:49:00 +0200 -Subject: [PATCH] rename series: fixed date format not applied correctly - -Closes #235 ---- - extensions/rename_series/dlg-rename-series.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/extensions/rename_series/dlg-rename-series.c b/extensions/rename_series/dlg-rename-series.c -index 60c784fe..cc0612da 100644 ---- a/extensions/rename_series/dlg-rename-series.c -+++ b/extensions/rename_series/dlg-rename-series.c -@@ -162,6 +162,12 @@ template_eval_cb (TemplateFlags flags, - char *path; - GTimeVal timeval; - -+ if ((parent_code == 'D') || (parent_code == 'M')) { -+ /* strftime code, return the code itself. */ -+ _g_string_append_template_code (result, code, args); -+ return FALSE; -+ } -+ - switch (code) { - case '#': - text = _g_template_replace_enumerator (args[0], template_data->n); --- -GitLab - diff --git a/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch b/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch deleted file mode 100644 index 4fef16dc9843..000000000000 --- a/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch +++ /dev/null @@ -1,55 +0,0 @@ -https://bugs.gentoo.org/887769 -https://gitlab.gnome.org/GNOME/gthumb/-/merge_requests/42 - -From 2133520496afd179702953a5d07aa99b5209f9cf Mon Sep 17 00:00:00 2001 -From: Chris Mayo <[email protected]> -Date: Wed, 21 Dec 2022 19:21:12 +0000 -Subject: [PATCH] raw: make compatible with LibRaw 0.21.0 release - -Memory error callback removed -https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L127 - -Typo in LIBRAW_OPTIONS_* flag names fixed -https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L170 ---- a/extensions/raw_files/gth-metadata-provider-raw.c -+++ b/extensions/raw_files/gth-metadata-provider-raw.c -@@ -62,7 +62,11 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self, - if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data))) - return; - -+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) -+ raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK); -+#else - raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); -+#endif - if (raw_data == NULL) - goto fatal_error; - ---- a/extensions/raw_files/main.c -+++ b/extensions/raw_files/main.c -@@ -213,7 +213,11 @@ _cairo_image_surface_create_from_raw (GInputStream *istream, - size_t size; - GthImage *image = NULL; - -+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) -+ raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK); -+#else - raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); -+#endif - if (raw_data == NULL) { - _libraw_set_gerror (error, errno); - goto fatal_error; -@@ -300,7 +304,11 @@ _cairo_image_surface_create_from_raw (GInputStream *istream, - if ((original_width != NULL) && (original_height != NULL)) { - libraw_close (raw_data); - -+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) -+ raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK); -+#else - raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); -+#endif - if (raw_data == NULL) - goto fatal_error; - --- -GitLab diff --git a/media-gfx/gthumb/files/3.12.2-link-with-x11.patch b/media-gfx/gthumb/files/3.12.2-link-with-x11.patch deleted file mode 100644 index b5e84710e5e1..000000000000 --- a/media-gfx/gthumb/files/3.12.2-link-with-x11.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://gitlab.gnome.org/GNOME/gthumb/-/issues/222 - -diff --git a/meson.build b/meson.build -index 2a970673..4cdc1a5e 100644 ---- a/meson.build -+++ b/meson.build -@@ -232,6 +232,7 @@ common_deps = [ - dependency('gmodule-2.0'), - dependency('gio-unix-2.0'), - dependency('gtk+-3.0', version : gtk_version), -+ dependency('x11'), - dependency('libpng'), - dependency('zlib'), - dependency('gsettings-desktop-schemas') diff --git a/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild b/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild deleted file mode 100644 index 7c65adc4b829..000000000000 --- a/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit gnome.org gnome2-utils meson python-any-r1 xdg - -DESCRIPTION="Image viewer and browser for Gnome" -HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="cdr colord exif keyring gstreamer heif jpegxl lcms raw slideshow svg tiff webkit webp" - -# libX11 dep is a workaround. See files/3.12.2-link-with-x11.patch -RDEPEND=" - x11-libs/libX11 - - >=dev-libs/glib-2.54.0:2 - >=x11-libs/gtk+-3.16.0:3 - exif? ( >=media-gfx/exiv2-0.21:= ) - slideshow? ( - >=media-libs/clutter-1.12.0:1.0 - >=media-libs/clutter-gtk-1:1.0 - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-plugins/gst-plugins-gtk:1.0 - ) - raw? ( - >=media-libs/libraw-0.14:= - ) - webkit? ( - >=net-libs/libsoup-2.42.0:2.4 - >=dev-libs/json-glib-0.15.0 - >=net-libs/webkit-gtk-1.10.0:4 - ) - keyring? ( >=app-crypt/libsecret-0.11 ) - cdr? ( >=app-cdr/brasero-3.2.0 ) - svg? ( >=gnome-base/librsvg-2.34:2 ) - webp? ( >=media-libs/libwebp-0.2.0:= ) - jpegxl? ( - >=media-libs/libjxl-0.3.0 - <media-libs/libjxl-0.9 - ) - heif? ( >=media-libs/libheif-1.11:= ) - lcms? ( >=media-libs/lcms-2.6:2 ) - colord? ( - >=x11-misc/colord-1.3 - >=media-libs/lcms-2.6:2 - ) - - sys-libs/zlib - media-libs/libjpeg-turbo:= - tiff? ( media-libs/tiff:= ) - media-libs/libpng:0= - >=gnome-base/gsettings-desktop-schemas-0.1.4 -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/appstream-0.14.6 - dev-util/glib-utils - dev-util/itstool - app-alternatives/yacc - app-alternatives/lex - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PV}-link-with-x11.patch - "${FILESDIR}"/${PV}-libraw-0.21.patch - "${FILESDIR}"/${PV}-date-format.patch -) - -src_configure() { - local emesonargs=( - -Drun-in-place=false - $(meson_use exif exiv2) - $(meson_use slideshow clutter) - $(meson_use gstreamer) - -Dlibchamplain=false # Upstream still doesn't seem to consider this ready - $(meson_use colord) - $(meson_use tiff libtiff) - $(meson_use webp libwebp) - $(meson_use jpegxl libjxl) - $(meson_use heif libheif) - $(meson_use raw libraw) - $(meson_use svg librsvg) - $(meson_use keyring libsecret) - $(meson_use webkit webservices) - $(meson_use cdr libbrasero) - ) - - # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; - # some of upstream HAVE_COLORD code depends on HAVE_LCMS2 - if use lcms || use colord; then - emesonargs+=( -Dlcms2=true ) - else - emesonargs+=( -Dlcms2=false ) - fi - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -}
