diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-22 01:55:45 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-22 01:55:45 +0000 |
| commit | b2c59335bfbeb25c5644f32172e1e9b23c447710 (patch) | |
| tree | 0e8e19f47e39be0a7b9b06cb86db760c6d6b5965 /media-gfx/gthumb | |
| parent | 427ba64bd6bcdd59a1ae9bc7c5cec0299d135413 (diff) | |
gentoo auto-resync : 22:12:2022 - 01:55:45
Diffstat (limited to 'media-gfx/gthumb')
| -rw-r--r-- | media-gfx/gthumb/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/gthumb/files/3.12.2-libraw-0.21.patch | 55 | ||||
| -rw-r--r-- | media-gfx/gthumb/gthumb-3.12.2-r4.ebuild | 1 |
3 files changed, 58 insertions, 1 deletions
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index 5dfddfb97f55..32e7c03eeb08 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -1,4 +1,5 @@ +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 -EBUILD gthumb-3.12.2-r4.ebuild 2652 BLAKE2B a41952e340a9bd5d0c75c808a3eb8dc88a21ece0906626bc426ec93e106f744c02b8c58162bdc1709a911f7a463aa5eb8819e353b875853d7bf89b1ad56c49ea SHA512 053b68ec83e7bca0f8b9fa320e753c41eef18bf9e98e7d8cd174d4480b67e89914b55eb0431ad899fd141d6cbc00008143495fd38d38c72c31ab6d20b6365f1d +EBUILD gthumb-3.12.2-r4.ebuild 2691 BLAKE2B dbe19dcdb90f914d3b40c8d54661ff43b427080b7204f15c9d5eaabc5ee83aa91946b49ad6e909ff1818d16857d0b5454b31713e1b3a93fa844e82263d1ea1f4 SHA512 d2bd2a51629fc11339e6d472025ec4414da3f52be0d8af2b8f456cc9fe1d80d2800d36031db5c92ca528ee0fdbe59370ad49082adb67a36fb5c45ca604d60b2d MISC metadata.xml 713 BLAKE2B c66bef72062d57003de32cdd78ace96eb94cdf99ff488c4f9a84df450ca4753cace58656925ae1632d6ea4e32b460afbdd2fb9a20996a3e2d0014d8938415972 SHA512 f2895a3f2d081a11d8a83982b733a1f74fa51dae3e09fdadfdeebd7ee4db27a4cbdecab9e8d5814bd5044b4425a6e0e6db7481d4e75da90ed0b98ee8b3168b1e 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 000000000000..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 <aklhfex@gmail.com> +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/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() { |