From 0a648c5255c22a6092b8de20ffba9e235299a293 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2024 23:42:57 +0000 Subject: gentoo auto-resync : 03:03:2024 - 23:42:57 --- media-gfx/gthumb/Manifest | 11 +-- 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 | 113 ---------------------- media-gfx/gthumb/gthumb-3.12.3.ebuild | 5 +- media-gfx/gthumb/gthumb-3.12.4.ebuild | 5 +- media-gfx/gthumb/gthumb-3.12.5.ebuild | 107 ++++++++++++++++++++ 8 files changed, 119 insertions(+), 223 deletions(-) delete mode 100644 media-gfx/gthumb/files/3.12.2-date-format.patch delete mode 100644 media-gfx/gthumb/files/3.12.2-libraw-0.21.patch delete mode 100644 media-gfx/gthumb/files/3.12.2-link-with-x11.patch delete mode 100644 media-gfx/gthumb/gthumb-3.12.2-r5.ebuild create mode 100644 media-gfx/gthumb/gthumb-3.12.5.ebuild (limited to 'media-gfx/gthumb') diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index 2706b7f13703..73f7cda0ede5 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -1,10 +1,7 @@ -AUX 3.12.2-date-format.patch 1030 BLAKE2B 923887a29732aca84e24813594ed5543fa9561e94c6078a097a1b5d810f4a5207607aad0731539ec2a312930acbdaa234a37e6f85b07a96856d051f09a462250 SHA512 6af14e131aa401d0223879c4a42d615c3c798aac901e702fe93994e31bed5419f7438b05b7b8f739b8d3fea41255daf403da33582114f0c2cd7f94a0f799134f -AUX 3.12.2-libraw-0.21.patch 2037 BLAKE2B c70fce8223c08c4bb9dafa5c03251314a30e28aa0ce51672f8677fcd55451c29a96f9c92ad3fc383a867435737069e07a701a30dbc2ecbc6b1cdcf69a1a3d8c5 SHA512 eb8b83ca35612abf8433f1ad87b0e50defe4ed3dff3140c6de95df79842f5ecc1f6620d935cdf087a1fd3dd9efc035a2d36c21953f876a7f33933b386d5a6240 -AUX 3.12.2-link-with-x11.patch 419 BLAKE2B f13fc6aead441d83ba55fafd3528a96691c18bca894c5aed6f8e6e1a9084059ec1843668ef8f76697a866979de4d2aaed944ca1729dd6f49d0aa1af316ecb7cc SHA512 667aed7e8dae78b19e0df37ca7f03b565d87a2ffa05a8ef3e3460c3cc491c263ba29781b0659c9a57595e735d38d27ae78f37898011189514ff6a1c237d2b1bb -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 -EBUILD gthumb-3.12.2-r5.ebuild 2720 BLAKE2B ae9e821416a3a5a0bb8cebf87e0a5d6932832e85791455c7d6a9add356c40a562266f7aaf6d2a215b89c2f8a1f0bcf27d29baffc9e3972cd85bb477de7f1f4a2 SHA512 4eab6db2b4ecbd6dfceb92bcf91ba66abefb7fb66c047372e1590c7facfccefd3dff3f8c2f33cdb0c8f597c833644531f96f821486d01c715ce2f672b9e19775 -EBUILD gthumb-3.12.3.ebuild 2589 BLAKE2B 3c05da40aaa31f066fbc732d34270a9d705124f95fb0c2b65e07efe88a47998cd44a49a0619e14893ffeb12e52f482c37d55703b8d5df74a4f1b3324d9df9af0 SHA512 aa27fe962d353698ecc262bc32e4214b601fde10d3fb95a2fbe2b5f6d1c72d6f1fb6a3826713de41edb44a5e22d152179bd754e5c21baf37f52a8323dea664f4 -EBUILD gthumb-3.12.4.ebuild 2593 BLAKE2B 39546c5b8b908dc93d9f0d9e586d96e302c4daca8fb706270a53c26850071401c15d04528b39deefcda9ecc8bcfa898af1ad5b98e9b248c505d28d2c0971de31 SHA512 ab1d91b5e33840e5fb26c4b96e2c48d423bed8d5d86a848f115adc82959df53d2363b732a09f90872a777741505e9ada48b00f798e4ff4e52f5ac01a26d00a87 +DIST gthumb-3.12.5.tar.xz 7618720 BLAKE2B beeac0c62934555dd306ab2319598de7703a10f01498972e7d177286b5f298070274e44977abc665c5e33e996ae884ffb0dfe80641a396425bdf549252c8832d SHA512 acdaef8cddcd68d9dd269bf1c000c50ab8dcb359df18337de243398448407beef1fe6daaeb99e161486a5a5575919779eb7d335c38ea4a4196c2a32d46aa5517 +EBUILD gthumb-3.12.3.ebuild 2617 BLAKE2B 082d1dae7261dc526dad6f2c6694b1fae79a84d9777518e0340e9399d832b2a92f9acc13bebf657fb460bfa4197e3273b45b5cdc30d538e5085a020d9047a3c9 SHA512 b19863634dc2c6c38c693eec3fbd315f4dabe4c759ece8630f45ac6bd80a48890e28b47537472aee8f60e09ec1329062435bb92baac255a719caba16d4c53fd9 +EBUILD gthumb-3.12.4.ebuild 2621 BLAKE2B 8112e5577c316fcea6f09103831de0952f956e9770ecda50dfbd78bc072940ed467a39f572dab6a2766400047148445087a47fd7b3b8638ce41bd91c641a5a9f SHA512 ca6bb57df38bd085fa21049361d78a2dea93e1da980584fb172c8c3f92d3cedbcdcb6424599563a17792824f8d8174e4a2490dba5df14b0a8d258dd3fd65b1e8 +EBUILD gthumb-3.12.5.ebuild 2593 BLAKE2B 39546c5b8b908dc93d9f0d9e586d96e302c4daca8fb706270a53c26850071401c15d04528b39deefcda9ecc8bcfa898af1ad5b98e9b248c505d28d2c0971de31 SHA512 ab1d91b5e33840e5fb26c4b96e2c48d423bed8d5d86a848f115adc82959df53d2363b732a09f90872a777741505e9ada48b00f798e4ff4e52f5ac01a26d00a87 MISC metadata.xml 422 BLAKE2B 7d64079a62a7643024e096edf47d5605ef25c0ea566d2496763f6b18e254c19594317492b77d38f2e841b15160138a958d80d0fce0d399cf527ca53dbe438038 SHA512 d1894107a2dfdb5609c163e90322aece9b49fefc7f3f0f9bd2a4cf25688ab3f63d445ae0cdb688f8ef1defe5b1de9ab5430bfeb7c61fe737bafbfeb9e97b12d2 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 -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 -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 971f6ec08a16..000000000000 --- a/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild +++ /dev/null @@ -1,113 +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 ) - 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 -} diff --git a/media-gfx/gthumb/gthumb-3.12.3.ebuild b/media-gfx/gthumb/gthumb-3.12.3.ebuild index d32de8c3f4be..69cc7d97c322 100644 --- a/media-gfx/gthumb/gthumb-3.12.3.ebuild +++ b/media-gfx/gthumb/gthumb-3.12.3.ebuild @@ -41,7 +41,10 @@ RDEPEND=" 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 ) + jpegxl? ( + >=media-libs/libjxl-0.3.0 + =media-libs/libheif-1.11:= ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( diff --git a/media-gfx/gthumb/gthumb-3.12.4.ebuild b/media-gfx/gthumb/gthumb-3.12.4.ebuild index ad298e9c5a78..84b1bafa5aeb 100644 --- a/media-gfx/gthumb/gthumb-3.12.4.ebuild +++ b/media-gfx/gthumb/gthumb-3.12.4.ebuild @@ -41,7 +41,10 @@ RDEPEND=" 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:= ) + jpegxl? ( + >=media-libs/libjxl-0.3.0:= + =media-libs/libheif-1.11:= ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( diff --git a/media-gfx/gthumb/gthumb-3.12.5.ebuild b/media-gfx/gthumb/gthumb-3.12.5.ebuild new file mode 100644 index 000000000000..ad298e9c5a78 --- /dev/null +++ b/media-gfx/gthumb/gthumb-3.12.5.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +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:= ) + 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 +" + +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 +} -- cgit v1.2.3