diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-29 15:17:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-29 15:17:30 +0100 |
commit | 662f71ae67cd775d7fbb79b5091676c0e07a992b (patch) | |
tree | 74c7cb80b79b8886cd7466cf262878d1e8b9d546 /media-gfx | |
parent | b2d3769042cfd3d8ceadaa52f6a5aafabb0d4114 (diff) |
gentoo auto-resync : 29:05:2023 - 15:17:30
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/Manifest.gz | bin | 37986 -> 38011 bytes | |||
-rw-r--r-- | media-gfx/gthumb/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/gthumb/files/3.12.2-date-format.patch | 32 | ||||
-rw-r--r-- | media-gfx/gthumb/gthumb-3.12.2-r5.ebuild | 113 | ||||
-rw-r--r-- | media-gfx/lximage-qt/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/lximage-qt/lximage-qt-1.3.0.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/photoqt/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch | 116 | ||||
-rw-r--r-- | media-gfx/photoqt/photoqt-3.2.ebuild | 75 |
9 files changed, 343 insertions, 2 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex ada8cf302a98..8560c61255b9 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index c4f2c2f2d09e..b7cba1703a83 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -1,5 +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 EBUILD gthumb-3.12.2-r4.ebuild 2660 BLAKE2B ce92692529ae557f15592ac114473684e02edc247a52ca8611a7383c4796081c0e9384c8288cad3d5f82e50123f6fa640029d4cf7a6fa7f4a6737b4219ef3454 SHA512 3da687298918166df375ed7d9e4caa0944e5ea7a8078373bd98b711a9ea3ea9e7eddbddc6200370412e813d16db21aa0e7dba6a4cb5d0f4a06a1d6e4db9894e3 +EBUILD gthumb-3.12.2-r5.ebuild 2710 BLAKE2B 7fa13e12b3cd6592230444ee66b27d0fa219e28ef64b5defe9430296186255e8fa386fb1b917b243c108ced9554bceca6a3d7b4b6bdf31b5eb734e8e0ce3bdb3 SHA512 ddfbfc3ae3658f7e5e4ceec8980a7f35737230857034c95a8792fe267a782529be705b5bd5127aff1651bf7a7d18680a8a9f02f9c8754f99f8615f16a3fdb23f MISC metadata.xml 584 BLAKE2B 49bd5d8d4d882c9ca655abf836e8fa61a14739014af854003b3d938746d6544fce40889ed4fbc4a0ae6ca8e3403e417162370527fca052cde0e1768676593ca0 SHA512 07d09fddf781226efec422772818203b3bda7eba456f39930003c4e5bbefef2c0d89a52c2473bdb26c8d7611259852c8b4a892c95dd60c7952005995f8558184 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 000000000000..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 <paobac@src.gnome.org> +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 000000000000..65ef7e3cae52 --- /dev/null +++ b/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild @@ -0,0 +1,113 @@ +# 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 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/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest index 07288e35a97a..1f3e3cb72986 100644 --- a/media-gfx/lximage-qt/Manifest +++ b/media-gfx/lximage-qt/Manifest @@ -1,5 +1,5 @@ DIST lximage-qt-1.2.0.tar.xz 837692 BLAKE2B a51ad797882d2725e488226954672df1d6a175237ba5d0f21930af135c92afb46648ba3965f5e65c026eceb324a1e109a08b8f9921dff27d3f6685d35e898da7 SHA512 aa7cbc9f9e2e0ea1ea0cda446887002e285a17b54adb0bd87def1fabc9ad9dd5d25c5c1db56785e67f4767c2da8d8db9b4e73a440c676f80d7094434357b86e1 DIST lximage-qt-1.3.0.tar.xz 838632 BLAKE2B eceee2fcdd6eae2360c8c7d27417d4e165520155050dae6c0fadfa22184634372582ac52c6233924b54b9d94e814967eb0abdd8ee3e7c719cdfde85840b51400 SHA512 c3fc8e24f78a9cd65736ba1af07b7fd5ba241eab233a595f7b05982d64a0a7a88d81c60eafea632779faa44f76cdb3bb501d2dc3b3758e3f6256fe2da10c37ac EBUILD lximage-qt-1.2.0.ebuild 1087 BLAKE2B f8201d38252614c3f909584680dac82eb3a3e66a5e0a276fbf26e05267e0b7d93ddd6d4529ffe1c7a6c883848acc5f44968d145150a41a1c98514753f32a14fc SHA512 592a518a0d6087529c04a21b160c4cbe86fcf36500f75ce368df18c11211796857129344dcc5f705c203f39ab16f34fa8a9dd73882defbdb4f795289c7d391f7 -EBUILD lximage-qt-1.3.0.ebuild 1089 BLAKE2B 33b401f9f9343bbf14f73500f6a047408d777fccb1c00e35c7d0f8bf2746b55ad52d4bd9434293bd2bea52ff949eacadced625e7250397d81e84ff69ce2bbb48 SHA512 426f984452e8a1e9ea3675828c6ab2d4cb8687a75fd303ff08fd9d26f7e98209d168e4fa04a395f3f0e5c19e4a07a9c42467d7423a0849ca5718eaf940cf967f +EBUILD lximage-qt-1.3.0.ebuild 1088 BLAKE2B f33f4d233189fd932bdba25cd1a2651d1def239def5cc5cfa6c6a6683cd0761a913153d910f14f6000246a1821c2315ef9f58e7aaaeb83af13fed6a73549eae2 SHA512 e51457bc733b88b5a439af070207479dcc588510ba532f0f8b7ff627a3bc43b6ba14f9388de3a41936a83c1942044effb16cceb76d9e8dc97c8986a408b0a188 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f diff --git a/media-gfx/lximage-qt/lximage-qt-1.3.0.ebuild b/media-gfx/lximage-qt/lximage-qt-1.3.0.ebuild index d8f8fd279271..b55682179e61 100644 --- a/media-gfx/lximage-qt/lximage-qt-1.3.0.ebuild +++ b/media-gfx/lximage-qt/lximage-qt-1.3.0.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86" fi LICENSE="GPL-2 GPL-2+" diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest index 63e08d887a49..bd5e5758aeff 100644 --- a/media-gfx/photoqt/Manifest +++ b/media-gfx/photoqt/Manifest @@ -1,5 +1,8 @@ AUX photoqt-2.9.1-libmpv-api2.patch 927 BLAKE2B 5bc7066b172ebf8c5b044e83e66c0c4e529756dcc0d2e228fedadc7714690012ec431437a08e63509ce01ba3dd2c5792d695cf87aaab64bac43b46b519c9011e SHA512 57630f6c86ab3a32be443aea7299dcc39538973f2d3f1f03beedb1dbeb79dee4c38fc2889c306146c8fd78dff73de0a2d5d85372c983cf7ee9a615beb607d272 AUX photoqt-2.9.1-libraw-0.21.patch 935 BLAKE2B 3437071bc0a62122d71b536ce2f211b53e1242f1aeb3837f22e92d48ee7ea75d6e26ab240e46d1f38d76fd3d456ddf22512508d6fea9f3e6e4d0f8a2909de06a SHA512 c45089079fabcd084476ee0d3440402eefddfddbcd1ae71ac6fd498a17531059ff51251bc757a4f988ccb1b138042fdcf3b49f74b85b1ea12646c8c126183714 +AUX photoqt-3.2-exiv2-0.28.patch 5700 BLAKE2B d7387019460ed5b0edf7a79050f0ea8be4a4320c39cc53567d68d25a5f99f87c99e7aaf4932d2b96f8c0af22c7221082ba7323f720f5ea61ec461fa457b1c6ff SHA512 eadcfe4c5583cc6b6b1ab5e4036410c347ffee577e7231570736af8b405a631ad8bb86660854d2102cc9150f4fa7e439e2a3faa583806cbd4a04ba45015e8134 DIST photoqt-2.9.1.tar.gz 3708647 BLAKE2B dd8c958709ebd830558f150f59c90c317d3f5edb363f92e9fadcd1506de4c97a41f6766670e202081397081c231604028298771eb52911255dae53bfa92a1a8d SHA512 c2ac3bce2ffa0962b243808cdd2495d45af3bd5703389de5e9626a518a8edf25646a317ff420dc0fdd8dc60a53104b1b5ec7e473087454d5c2f0b967066dc192 +DIST photoqt-3.2.tar.gz 965895 BLAKE2B ae1e159401b24a1bede344e4d398dbd6c2ae13fd467a4eac9ef15ea2d15933dc1756325a5a4f305a5f447bfd1a9e2d636e0b9367d0201ca356393c033c4f2f0f SHA512 ab7030d0ed6edf79373b1a99b1b8469cd567f04e5c233a87496084424603d8c241f7b473c22d323f4df8480d3f74918a987d2d590ec5026f1b7ca2c92b5c6bba EBUILD photoqt-2.9.1-r2.ebuild 1835 BLAKE2B b0647232f94c3717f899a1e4c12ab7a05bc8ad39f3fbe3daf9f81aad0454c5d8239e9dcc9666a6f0c57a80271129c1956e97283c863a431e6d1d169eb3aac4eb SHA512 10ab70618ab15a0a412fa18d08d50cd06c6417a39a530d9f4ad9ff58636b72042ac5b5c77f301d45132b87f189a1cbcd88f2ac4026c134285bbbdf91317a37df +EBUILD photoqt-3.2.ebuild 1873 BLAKE2B 75ff494b9fdd05fd2c8273a2b31413cdc625cbca06a36db0db2321430783d6cf74f1476d8fe79d3ac576d256a4aac2aab8eba852304abde0984cf7c7d5e2c660 SHA512 c35b4175a0be4ec0c95dc18e95f77dc3170aa58267e73c94d8c3b59da8968a3b6160cb2e485608cadbdd850982514a509d4f086ec5fdc86603d2d2a9819ebd5a MISC metadata.xml 623 BLAKE2B 6a893c8a21086ca6a7a8d85855b6558171077bff426ac322a13fb70d7e183452ebc68c1a25664b359c0c863415686ce94ffe0cf94bb80e264616b0cf684d2a57 SHA512 7e01a6495e1add1920d9b314dc5bf6732c35d78a4fa0413be8ddbda921136bb8a1acca5af56cee37a1c95b5ec60521c42c8d2580e22ac5d36f0f076f0bc49e08 diff --git a/media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch b/media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch new file mode 100644 index 000000000000..b1da118c1537 --- /dev/null +++ b/media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch @@ -0,0 +1,116 @@ +From 376fe8c3ef6b16d63995f76a194e2c1d788b28b1 Mon Sep 17 00:00:00 2001 +From: Lukas Spies <Lukas@photoqt.org> +Date: Sun, 28 May 2023 20:23:32 -0500 +Subject: [PATCH 1/2] [exiv2] fix compilation with Exiv2 v0.28.0 + +--- + cplusplus/filefoldermodel/filefoldermodel.cpp | 4 ++++ + cplusplus/scripts/handlingfacetags.cpp | 4 ++++ + cplusplus/scripts/metadata.cpp | 4 ++++ + 3 files changed, 12 insertions(+) + +diff --git a/cplusplus/filefoldermodel/filefoldermodel.cpp b/cplusplus/filefoldermodel/filefoldermodel.cpp +index b6258735..56b120b7 100644 +--- a/cplusplus/filefoldermodel/filefoldermodel.cpp ++++ b/cplusplus/filefoldermodel/filefoldermodel.cpp +@@ -560,7 +560,11 @@ void PQFileFolderModel::advancedSortMainView() { + } catch (Exiv2::Error& e) { + // An error code of 11 means unknown file type + // Since we always try to read any file's meta data, this happens a lot ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) ++#else + if(e.code() != 11) ++#endif + LOG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL; + else + DBG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL; +diff --git a/cplusplus/scripts/handlingfacetags.cpp b/cplusplus/scripts/handlingfacetags.cpp +index d90ece73..562cf200 100644 +--- a/cplusplus/scripts/handlingfacetags.cpp ++++ b/cplusplus/scripts/handlingfacetags.cpp +@@ -57,7 +57,11 @@ QVariantList PQHandlingFaceTags::getFaceTags(QString filename) { + image->readMetadata(); + } catch (Exiv2::Error& e) { + // An error code of 11 means image not supported. This is much more reliable than, e.g., checking a file ending ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) ++#else + if(e.code() != 11) ++#endif + LOG << CURDATE << "PQHandlingFaceTags::getFaceTags() - ERROR reading metadata (caught exception): " << e << NL; + else + DBG << CURDATE << "PQHandlingFaceTags::getFaceTags() - ERROR reading metadata (caught exception): " << e << NL; +diff --git a/cplusplus/scripts/metadata.cpp b/cplusplus/scripts/metadata.cpp +index 87e23474..a7d3e076 100644 +--- a/cplusplus/scripts/metadata.cpp ++++ b/cplusplus/scripts/metadata.cpp +@@ -120,7 +120,11 @@ void PQMetaData::updateMetadata(QString path) { + } catch (Exiv2::Error& e) { + // An error code of 11 means unknown file type + // Since we always try to read any file's meta data, this happens a lot ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) ++#else + if(e.code() != 11) ++#endif + LOG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL; + else + DBG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL; +-- +2.40.1 + + +From 6190de9e47c358cf54748fa2a3593108831aa768 Mon Sep 17 00:00:00 2001 +From: Lukas Spies <Lukas@photoqt.org> +Date: Sun, 28 May 2023 20:27:08 -0500 +Subject: [PATCH 2/2] [exiv2] switch to proper exvi2 errorcode + +--- + cplusplus/filefoldermodel/filefoldermodel.cpp | 2 +- + cplusplus/scripts/handlingfacetags.cpp | 2 +- + cplusplus/scripts/metadata.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cplusplus/filefoldermodel/filefoldermodel.cpp b/cplusplus/filefoldermodel/filefoldermodel.cpp +index 56b120b7..c8cf199a 100644 +--- a/cplusplus/filefoldermodel/filefoldermodel.cpp ++++ b/cplusplus/filefoldermodel/filefoldermodel.cpp +@@ -561,7 +561,7 @@ void PQFileFolderModel::advancedSortMainView() { + // An error code of 11 means unknown file type + // Since we always try to read any file's meta data, this happens a lot + #if EXIV2_TEST_VERSION(0, 28, 0) +- if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) ++ if(e.code() != Exiv2::ErrorCode::kerFileContainsUnknownImageType) + #else + if(e.code() != 11) + #endif +diff --git a/cplusplus/scripts/handlingfacetags.cpp b/cplusplus/scripts/handlingfacetags.cpp +index 562cf200..94a7bca6 100644 +--- a/cplusplus/scripts/handlingfacetags.cpp ++++ b/cplusplus/scripts/handlingfacetags.cpp +@@ -58,7 +58,7 @@ QVariantList PQHandlingFaceTags::getFaceTags(QString filename) { + } catch (Exiv2::Error& e) { + // An error code of 11 means image not supported. This is much more reliable than, e.g., checking a file ending + #if EXIV2_TEST_VERSION(0, 28, 0) +- if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) ++ if(e.code() != Exiv2::ErrorCode::kerFileContainsUnknownImageType) + #else + if(e.code() != 11) + #endif +diff --git a/cplusplus/scripts/metadata.cpp b/cplusplus/scripts/metadata.cpp +index a7d3e076..fabc2d74 100644 +--- a/cplusplus/scripts/metadata.cpp ++++ b/cplusplus/scripts/metadata.cpp +@@ -121,7 +121,7 @@ void PQMetaData::updateMetadata(QString path) { + // An error code of 11 means unknown file type + // Since we always try to read any file's meta data, this happens a lot + #if EXIV2_TEST_VERSION(0, 28, 0) +- if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType) ++ if(e.code() != Exiv2::ErrorCode::kerFileContainsUnknownImageType) + #else + if(e.code() != 11) + #endif +-- +2.40.1 + diff --git a/media-gfx/photoqt/photoqt-3.2.ebuild b/media-gfx/photoqt/photoqt-3.2.ebuild new file mode 100644 index 000000000000..514da69340d7 --- /dev/null +++ b/media-gfx/photoqt/photoqt-3.2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_KDEINSTALLDIRS=false +inherit ecm optfeature + +DESCRIPTION="Simple but powerful Qt-based image viewer" +HOMEPAGE="https://photoqt.org/" +SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw" + +COMMON_DEPEND=" + app-arch/libarchive:= + app-arch/unrar + dev-libs/pugixml + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5[jpeg] + dev-qt/qtimageformats:5 + dev-qt/qtmultimedia:5[qml] + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + devil? ( media-libs/devil ) + exif? ( media-gfx/exiv2:=[bmff] ) + freeimage? ( media-libs/freeimage ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + mpv? ( media-video/mpv:=[libmpv] ) + pdf? ( app-text/poppler[qt5] ) + raw? ( media-libs/libraw:= ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/qtconcurrent:5 +" +RDEPEND="${COMMON_DEPEND} + dev-qt/qtgraphicaleffects:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtquickcontrols2:5 +" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # upstream git master, bug #906491 + +src_configure() { + local mycmakeargs=( + -DCHROMECAST=OFF # TODO needs python + -DDEVIL=$(usex devil) + -DEXIV2=$(usex exif) + -DEXIV2_ENABLE_BMFF=$(usex exif) + -DFREEIMAGE=$(usex freeimage) + -DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick)) + -DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick)) + -DVIDEO_MPV=$(usex mpv) + -DPOPPLER=$(usex pdf) + -DRAW=$(usex raw) + ) + ecm_src_configure +} + +pkg_postinst() { + optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." kde-frameworks/kimageformats + ecm_pkg_postinst +} |