[gentoo-commits] repo/gentoo:master commit in: media-gfx/gthumb/, media-gfx/gthumb/files/
commit: ab0f84d215f069f6d321c214d3467270b88943c4
Author: Mart Raudsepp gentoo org>
AuthorDate: Sun Mar 3 18:40:54 2024 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Mar 3 18:40:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0f84d2
media-gfx/gthumb: drop 3.12.2-r5
Signed-off-by: Mart Raudsepp 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..
--- 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..
--- 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 +
-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 @@
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gthumb/, media-gfx/gthumb/files/
commit: 448aa70aeb5890d17fa2ffe349c5203b58c5871d
Author: Pacho Ramos gentoo org>
AuthorDate: Mon May 29 08:50:32 2023 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon May 29 08:50:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448aa70a
media-gfx/gthumb: Rename USE "http" to "webkit"
That allows people wanting to globally avoid pulling in webkit-gtk to do it
more easily. Also apply upstream fix for date formatting not being used
properly.
Closes: https://bugs.gentoo.org/907203
Signed-off-by: Pacho Ramos gentoo.org>
media-gfx/gthumb/files/3.12.2-date-format.patch | 32 +++
media-gfx/gthumb/gthumb-3.12.2-r5.ebuild| 112
2 files changed, 144 insertions(+)
diff --git a/media-gfx/gthumb/files/3.12.2-date-format.patch
b/media-gfx/gthumb/files/3.12.2-date-format.patch
new file mode 100644
index ..1bc2309abf20
--- /dev/null
+++ b/media-gfx/gthumb/files/3.12.2-date-format.patch
@@ -0,0 +1,32 @@
+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/gthumb-3.12.2-r5.ebuild
b/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild
new file mode 100644
index ..043f387c00a2
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 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
+ sys-devel/bison
+ sys-devel/flex
+ >=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 libtif
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gthumb/, media-gfx/gthumb/files/
commit: 1693061313af2aabb5c987deb1b7670b5c67ffb2
Author: Sam James gentoo org>
AuthorDate: Wed Dec 21 23:49:20 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 21 23:52:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16930613
media-gfx/gthumb: fix build w/ libraw-0.21
Closes: https://bugs.gentoo.org/887769
Signed-off-by: Sam James gentoo.org>
media-gfx/gthumb/files/3.12.2-libraw-0.21.patch | 55 +
media-gfx/gthumb/gthumb-3.12.2-r4.ebuild| 1 +
2 files changed, 56 insertions(+)
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
new file mode 100644
index ..4fef16dc9843
--- /dev/null
+++ b/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch
@@ -0,0 +1,55 @@
+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 +
+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/gthumb-3.12.2-r4.ebuild
b/media-gfx/gthumb/gthumb-3.12.2-r4.ebuild
index f7c6ddec1cc9..9b101beaf8d0 100644
--- a/media-gfx/gthumb/gthumb-3.12.2-r4.ebuild
+++ b/media-gfx/gthumb/gthumb-3.12.2-r4.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PV}-link-with-x11.patch
+ "${FILESDIR}"/${PV}-libraw-0.21.patch
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gthumb/, media-gfx/gthumb/files/
commit: a430106ef87cdbffc6cefbc1ac1a8e5bb3ea6242
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 9 21:07:52 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jan 11 11:57:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a430106e
media-gfx/gthumb: Fix build with exiv2-0.27
Using exiv2.hpp instead of individual includes is exiv2 recommendation for some
time already while the headers are subject to refactoring.
Standard fix as seen in other affected packages.
Closes: https://bugs.gentoo.org/674092
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../gthumb/files/gthumb-3.6.2-exiv2-0.27.patch | 31 ++
media-gfx/gthumb/gthumb-3.6.2.ebuild | 4 ++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
new file mode 100644
index 000..2bd8b94c3c1
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
@@ -0,0 +1,31 @@
+Patch kindly borrowed from Mageia.
+
+* ast...@gentoo.org: Dropped unnecessary and backwards incompatible
+xmp_exiv2.hpp include.
+
+https://gitlab.gnome.org/GNOME/gthumb/issues/30
+
+diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp
b/extensions/exiv2_tools/exiv2-utils.cpp
+--- a/extensions/exiv2_tools/exiv2-utils.cpp 2018-06-17 08:24:44.0
+0200
b/extensions/exiv2_tools/exiv2-utils.cpp 2018-12-31 15:51:50.912329232
+0100
+@@ -32,7 +32,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include "exiv2-utils.h"
+
+@@ -1073,7 +1073,11 @@
+
+ try {
+ if (exifData.empty()) {
++#if EXIV2_TEST_VERSION(0,27,0)
++ throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif
data found in the file");
++#else
+ throw Exiv2::Error(1, " No Exif data found in the
file");
++#endif
+ }
+ Exiv2::ExifData::const_iterator end = exifData.end();
+ for (Exiv2::ExifData::const_iterator i = exifData.begin(); i !=
end; ++i) {
diff --git a/media-gfx/gthumb/gthumb-3.6.2.ebuild
b/media-gfx/gthumb/gthumb-3.6.2.ebuild
index 1eab1eda6c7..fa3de15b5f1 100644
--- a/media-gfx/gthumb/gthumb-3.6.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
# eautoreconf needs:
# gnome-base/gnome-common
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674092
+
src_prepare() {
# Remove unwanted CFLAGS added with USE=debug
sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
