From d3419aa304ff2564036398be5e8ed4bdeaeaa007 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 Jan 2024 20:08:51 +0000 Subject: gentoo auto-resync : 20:01:2024 - 20:08:51 --- media-gfx/Manifest.gz | Bin 37698 -> 37686 bytes media-gfx/converseen/Manifest | 2 +- media-gfx/converseen/converseen-0.12.0.1.ebuild | 4 +- media-gfx/frogr/Manifest | 2 + media-gfx/frogr/frogr-1.8.1.ebuild | 46 +++ media-gfx/iscan/Manifest | 3 +- .../files/iscan-3.65.0-boost-1.84-headers.patch | 353 +++++++++++++++++++++ media-gfx/iscan/iscan-3.65.0-r1.ebuild | 108 ------- media-gfx/iscan/iscan-3.65.0-r2.ebuild | 109 +++++++ 9 files changed, 515 insertions(+), 112 deletions(-) create mode 100644 media-gfx/frogr/frogr-1.8.1.ebuild create mode 100644 media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch delete mode 100644 media-gfx/iscan/iscan-3.65.0-r1.ebuild create mode 100644 media-gfx/iscan/iscan-3.65.0-r2.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index d6a14974cead..9c2df076cf4f 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest index 49fec8662709..e6ee77664c6f 100644 --- a/media-gfx/converseen/Manifest +++ b/media-gfx/converseen/Manifest @@ -4,6 +4,6 @@ AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b DIST converseen-0.12.0.1.tar.gz 2296100 BLAKE2B 83a0271e1451fa196852d717332fa7446cd22bac7b675f3f306692aa1e11d4c5500d033fd9bbb7dd4ec9190ff3b15149bad1e9646006f533d930fc1d686b0a9b SHA512 4e6efa44953b097f8c6af19e3d849caf570a0fa2db673133e1d8ca2abee98b43d2fbd2d12e6c8c2a8ec6a9dd61a1ca3f25ee7a7787791cc783d8c967eacb9d9d DIST converseen-0.9.11.1.tar.gz 770024 BLAKE2B 671599099abf5b143bde7c57efc547626c14e15bebbd3a70ce4ec43d4febbaf69eebedebaaac935572b785afaa086c383b68bae0f02bc16ca68625dfb55b8c85 SHA512 1d61fa88d9e3d6ed23fb98d0495b00315adca880fd1d0d95e8322c48d9fdcd161ee00b5e2f5f52212c4db66d97e26ac0da561926e55de4bc047d3ad98b6f69dd -EBUILD converseen-0.12.0.1.ebuild 1749 BLAKE2B 175b9b0a2d16b32e0880cbe4eac8df8bf88bc3fb6702d17507a23e8aabd79e23efd7fc18aa39cd9368f419bd008854590c517d0a4a7eb6d1289f349b1ca8fa7b SHA512 23c92b0a1e6a3c039c3ad3d93e5fba3c9c7b94e1e953d6fdd48431c63aef039e516d1d4beb9556ad27b5315885767e778513f46ea48a8827db91b29fd924a201 +EBUILD converseen-0.12.0.1.ebuild 1751 BLAKE2B 07c7ce57ec7c83451fa9bede3890c0d22ed0e8e54311ad70fa2b46b3f9bd10d5ee9605c879a2ced843b0cc92d60576014f3b63e9527ae0b42466e6b53eae48b8 SHA512 6671778c0214ad8024a044ceb23558e4272a4567ec08391af31659d456667dbefa7735d31ae5860205cd2e50fc8b186dd1a995bdcd7a1d77531329faece5a8e0 EBUILD converseen-0.9.11.1.ebuild 1759 BLAKE2B 5e73dd22acb4bed2e4555c07f79a956fa6049ed32956509ed76609d1419dedd0bbb1f39dbf7ea04d414686236d2378a0e24a1d47b3a8dcc83384e41b3756b49b SHA512 383d4445fa649dd36adfb32bf4430dcecf6b5091491c70adbefccc4238a65c6d796b17afcde27052f5d6a419b3b7fb6ac2ad148498c74d2185ec85e9db65cf3d MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6 diff --git a/media-gfx/converseen/converseen-0.12.0.1.ebuild b/media-gfx/converseen/converseen-0.12.0.1.ebuild index 1ab74418a96e..92a8857d6b3e 100644 --- a/media-gfx/converseen/converseen-0.12.0.1.ebuild +++ b/media-gfx/converseen/converseen-0.12.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.t LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="graphicsmagick debug" RDEPEND=" diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest index ee5b56580da4..b9166e44e4aa 100644 --- a/media-gfx/frogr/Manifest +++ b/media-gfx/frogr/Manifest @@ -1,3 +1,5 @@ DIST frogr-1.7.tar.xz 2247476 BLAKE2B 16b5c546b61234310390f4dadee0094e671f141121023833123e57de7f90666a38a117dedece0cba53a1500e8bce20e79dd690c598e010327a32aee7b11afe1a SHA512 73531186dbe3fdb4b937d54c02b471b444bac059de4ea02913b5fef255816af0b0ef89bbb449e443ee5b50f0d156960efe190f5988a1a50f8ecfe2eb1e10b89f +DIST frogr-1.8.1.tar.xz 2250676 BLAKE2B 812927e509ee40c004c31cffb5fa028dc5f654d82380666c87a9be861775df8e74ffd188420ffadd8de0a5ee339248ef2a7a0da692a6323ac3ab1ec42c8bbec9 SHA512 24c15f81e3a97cff16001353a311d2ca2be5e3ca94730075db52fdf91e85c093962f3963e7f5dde387bb64e860985d1a7ca7a303533d4898263312e67e518796 EBUILD frogr-1.7.ebuild 885 BLAKE2B a01a8662b054629c5175e4931d14048402de3081c127d8e4679d5e5778bb36c908fe88a7432a543fa73ba3bb548681c96cd01d9f47355b9f1d8e037e519d2b71 SHA512 5c1fe8bd3f4a933fa8c6a432fe8e4ec7f36a85e30744941ec4c2c337486acb9f857e7e31e8325d07fc7ae1ce18f4ac35410cdad78a5a4dee7b7bdd90193fbf33 +EBUILD frogr-1.8.1.ebuild 915 BLAKE2B 7bb48f267d82fab4774282ac6d9921a5ee87464cf42f21ca98ba3a113e3d24d561e597aa6c6b1f192a93480850e3d1b6427c1a3633bbf60f1eb9e6b6d03932b0 SHA512 973f21b7efe28060382beda5e3aa2e2706a1f9ba415aa4a6848f94675d5c522f0c8ce885982577f14d6ebae4682826ef34c72f0b69c0e86b0c8a16f80e0b5144 MISC metadata.xml 709 BLAKE2B a81cb2f0bfe655765fb3fd3ec14c2d1618bd7ccb4ac4a11d2c9f5692d450303cc05fa43fe9a474d5de16314b8d426fb6d62c2d1fdb56725d0a2d40e3b6cdf325 SHA512 894700cc8301eef0202979ff212edbdcaf1665651a97cfef201f8c92fe7f63dd8205972215e3dbbf6a012c09a8637020503fe2ec2597bcb8816e18f13a7b2149 diff --git a/media-gfx/frogr/frogr-1.8.1.ebuild b/media-gfx/frogr/frogr-1.8.1.ebuild new file mode 100644 index 000000000000..472697bd7a66 --- /dev/null +++ b/media-gfx/frogr/frogr-1.8.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="flickr applications for GNOME" +HOMEPAGE="https://live.gnome.org/Frogr" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-libs/glib-2.56:2 + >=dev-libs/json-glib-1.1.2 + >=dev-libs/libgcrypt-1.5:= + >=dev-libs/libxml2-2.6.8:2 + media-libs/gstreamer:1.0 + >=media-libs/libexif-0.6.14 + >=net-libs/libsoup-3.0:3.0 + >=x11-libs/gtk+-3.16:3[introspection] + x11-libs/gdk-pixbuf:2 +" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + dev-util/itstool + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig +" +# TODO add a useflag for enable-video or header-bar??? +# libsoup2 option not needed + +pkg_postinst() { + xdg_pkg_postinst + xdg_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest index 7371da31568f..d39a842cda25 100644 --- a/media-gfx/iscan/Manifest +++ b/media-gfx/iscan/Manifest @@ -15,11 +15,12 @@ AUX iscan-3.62.0-tests-boost.patch 2819 BLAKE2B 8c11f7bd80c5cbc0c34c0aacf605a914 AUX iscan-3.62.0-tests-linkage.patch 3921 BLAKE2B 0dedae75fbbe387d2db900eb88b0e839746cfcbfa2b2ed7d52f9fd1b6756f14aa8fc53708ab2d1e461dff25ebe4e73e97f647ba4792bd263021f9b94f7b50139 SHA512 0b84829871ef45acf0ac209a0ba315b88409429c454b4655a4004c9d1afddf88d1ae0b1fff891078f5cf68541f7a8d896d50a550b650f1157517d5dbc99bfbd4 AUX iscan-3.62.0-tests-tesseract.patch 3825 BLAKE2B ee16bab5f36e866d2a212f832f90b8fa078cfea51dd81ae8175086ce896b718c52f2dd5c56ba15ddf89427abde6231b93672a71467d18fc47c45fdd166efce54 SHA512 63cf6b7f42f6cc1dfc05e9a5d333514aa56ba658e96a860b753d9a120df79a41abbd0fcc04070e103908bf05648dcdff96eab343981fa0f5293aee4258309980 AUX iscan-3.63.0-autoconf-2.70.patch 1147 BLAKE2B d87e32fa8510096fe965ec24a21276e0c7ba0b838cb2eb5228bb0a336db037dd77240895d61eb574abbc03334d44b0c1467c4bf1dc48a69c72518cfd64d90a51 SHA512 6a58a0df2cd579ea85ea30c263d4538dae8abbfc65d3e102ac546e282bbc8ef72762894c926fc0500322b99364b815f29eb86a098989e4c67675d5d92efa304a +AUX iscan-3.65.0-boost-1.84-headers.patch 14361 BLAKE2B c007e82f8491420e18cf126db3f33328213ffd70c0380cba5d5b4698ceb932bf3e4c312a068ce9f5baea9ed010a5d2ad0e7416236fd57ab543cf471edcb0273a SHA512 4535388021b7c62a9f915bb7fb9a459dbe44b5684382ee3f31a71e6eea39f07b4c2d1135dd9f475483bcfa63934df2ea3f1e65241d70d41093440a89005e56cb AUX iscan-3.65.0-sane-backends-1.1.patch 353 BLAKE2B 07ddf999ab1c3b1cd9fae482425ef86080dc07cb5323093cd89a9f0622db6efc0bb5473fd45d913459aebb2052eeb2b2c65dd2c0223b3be51d791fe28f688a39 SHA512 e88f6aa3b0f86153db1c24ad19862fe97dd6a71dcc5b822e643d50d0e0c82ec4cea1fa61f1809f382fd0abb7568ab3b42b1c8587d2f6e49cacb29a5b30c151c6 DIST imagescan_3.65.0.orig.tar.gz 12651383 BLAKE2B e1436b6d6bf9fc3fc4e5185706fc814e1a4351bf37cd733a3fb88cd16a1c3422ebe0bf4cca77ac00c431edc990aaa50b8994e3bc0f72acba3b0e0608882b63ae SHA512 c719ac540af496efe72b2be87a2b89cbec8eee61a2a985574d0db766c00b7187315378382d8501e26dad132e93de3d3e9431c8e679b569f3c35ea8181b1ca022 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90 EBUILD iscan-2.30.4.2-r3.ebuild 4012 BLAKE2B 11bba57421eda6c24c285fb0bd1e39e2e9618790b48dded5cace806a3b15fff661fcaef9ca0dddef13589387c0b490036c279b5026e1cfde3edd1519bc89c89c SHA512 27dafa8850935ab565f174b343c341bc96035ff3522fd33b32ec2642a85ec60173b231b7fa18ab5e2d7425fde7494c1c7e7f0a276519c36fa496e9518ad281ec -EBUILD iscan-3.65.0-r1.ebuild 3017 BLAKE2B d05fcf13d112e68b4282e61845bc3b060d453bd199c79e6205253926377bf3634ab79cd978c2d80aeed7f7251f6f644c029685abd8b43475b2eedc5a48cfebfb SHA512 31a2426f7ccad6d7b960b017691e8ddce83ee880342151cedf8d43f797ad7dbd50079c1079a4c4e6a7388c9ab6ad7108df6e8522362df0d05fb07e72dac2280a +EBUILD iscan-3.65.0-r2.ebuild 3070 BLAKE2B c52c3d075b0fd665bb3fb3449b7065e8cf4b70b2392335f3e7466a952c60a820ad1d60dcb7a7416e411a4328e87ad50b6c61ecc07a6e1a8dd51d552d8eee1aac SHA512 93cce9123d8a71543dcd708b0736f7751b48113b22fcb801067888be5028f74fb09ef36a07a422f975e5b5abf29a32fc297765900923b708f464987b6375085d MISC metadata.xml 817 BLAKE2B 950bbe19f60e4a52f29d7a2a00dc5c48383dfcd7ce194fc8f8be7265e65de3bfd59235697e3d9ed11bd44c3ef576a711e989da568794bf28b6d67a1c042ebabc SHA512 938ae05d7f9f6ebb283a9e6b36a6279a54e891f1f1ce569cc77dfc7fe306857d7dc9d3cd410b0e4b949530870cd5d13b4c3e2fc7d70bb3c754b42bc12001ee49 diff --git a/media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch b/media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch new file mode 100644 index 000000000000..426b3345f1c7 --- /dev/null +++ b/media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch @@ -0,0 +1,353 @@ +--- utsushi-0.65.0/drivers/esci/grammar-automatic-feed.hpp 2024-01-08 22:20:05.171112996 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-automatic-feed.hpp 2024-01-08 22:25:43.442258670 +0100 +@@ -24,8 +24,7 @@ + //! \copydoc grammar.hpp + + #include +-#include +-#include ++#include + + #include "buffer.hpp" + #include "code-token.hpp" +--- utsushi-0.65.0/drivers/esci/grammar-automatic-feed.ipp 2024-01-08 22:20:05.167779489 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-automatic-feed.ipp 2024-01-08 22:22:23.921745849 +0100 +@@ -24,11 +24,7 @@ + //! \copydoc grammar.ipp + + // encoding::basic_grammar_automatic_feed implementation requirements +-#include +-#include +- +-// Support for debugging of parser and generator rules +-#include ++#include + + #include "code-point.hpp" + #include "grammar-automatic-feed.hpp" +--- utsushi-0.65.0/drivers/esci/grammar-capabilities.hpp 2024-01-08 22:21:32.725717869 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-capabilities.hpp 2024-01-08 22:27:49.542243597 +0100 +@@ -28,7 +28,7 @@ + + #include + #include +-#include ++#include + #include + + #include +--- utsushi-0.65.0/drivers/esci/grammar-capabilities.ipp 2024-01-08 22:21:32.722384361 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-capabilities.ipp 2024-01-08 22:26:39.831899213 +0100 +@@ -24,23 +24,11 @@ + //! \copydoc grammar.ipp + + // decoding::basic_grammar_capabilities implementation requirements +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + // *::basic_grammar_capabilities implementation requirements + #include + +-// Support for debugging of parser rules +-#include +- + #include "grammar-capabilities.hpp" + + namespace utsushi { +--- utsushi-0.65.0/drivers/esci/grammar-formats.hpp 2024-01-08 22:21:32.725717869 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-formats.hpp 2024-01-08 22:23:48.012841294 +0100 +@@ -26,10 +26,8 @@ + #include + #include + +-#include +-#include +-#include +-#include ++#include ++#include + + #include + +--- utsushi-0.65.0/drivers/esci/grammar-formats.ipp 2024-01-08 22:21:32.725717869 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-formats.ipp 2024-01-08 22:28:50.565464000 +0100 +@@ -24,37 +24,16 @@ + //! \copydoc grammar.ipp + + // decoding::basic_grammar_formats implementation requirements +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + // encoding::basic_grammar_formats implementation requirements +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + #include "upstream/include/no_attribute_directive.hpp" + + // *::basic_grammar_formats implementation requirements +-#include +-#include ++#include + #include + +-// Support for debugging of parser and generator rules +-#include +-#include +- + #include "code-point.hpp" + #include "grammar-formats.hpp" + +--- utsushi-0.65.0/drivers/esci/grammar.hpp 2024-01-08 22:21:32.719050852 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar.hpp 2024-01-08 22:22:42.532725739 +0100 +@@ -35,10 +35,8 @@ + + #include + #include +-#include +-#include +-#include +-#include ++#include ++#include + + #include "buffer.hpp" + #include "code-token.hpp" +--- utsushi-0.65.0/drivers/esci/grammar-information.hpp 2024-01-08 22:21:32.719050852 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-information.hpp 2024-01-08 22:26:20.097525012 +0100 +@@ -28,7 +28,7 @@ + + #include + #include +-#include ++#include + + #include "code-token.hpp" + #include "grammar-formats.hpp" +--- utsushi-0.65.0/drivers/esci/grammar-information.ipp 2024-01-08 22:21:32.722384361 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-information.ipp 2024-01-08 22:27:01.883062422 +0100 +@@ -24,23 +24,11 @@ + //! \copydoc grammar.ipp + + // decoding::basic_grammar_information implementation requirements +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + // *::basic_grammar_information implementation requirements + #include + +-// Support for debugging of parser rules +-#include +- + #include "grammar-information.hpp" + + namespace utsushi { +--- utsushi-0.65.0/drivers/esci/grammar.ipp 2024-01-08 22:21:32.725717869 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar.ipp 2024-01-08 22:29:05.462917002 +0100 +@@ -33,31 +33,14 @@ + */ + + // decoding::basic_grammar implementation requirements +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + // encoding::basic_grammar implementation requirements +-#include +-#include +-#include ++#include + + // *::basic_grammar implementation requirements + #include +-#include +- +-// Support for debugging of parser and generator rules +-#include +-#include ++#include + + #include "grammar.hpp" + +--- utsushi-0.65.0/drivers/esci/grammar-mechanics.hpp 2024-01-08 22:20:05.171112996 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-mechanics.hpp 2024-01-08 22:22:23.921745849 +0100 +@@ -24,8 +24,7 @@ + //! \copydoc grammar.hpp + + #include +-#include +-#include ++#include + + #include "buffer.hpp" + #include "code-token.hpp" +--- utsushi-0.65.0/drivers/esci/grammar-mechanics.ipp 2024-01-08 22:20:05.167779489 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-mechanics.ipp 2024-01-08 22:22:23.921745849 +0100 +@@ -24,21 +24,11 @@ + //! \copydoc grammar.ipp + + // encoding::basic_grammar_mechanics implementation requirements +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + // *::basic_grammar_mechanics implementation requirements + #include + +-// Support for debugging of parser and generator rules +-#include +- + #include "code-point.hpp" + #include "grammar-mechanics.hpp" + +--- utsushi-0.65.0/drivers/esci/grammar-parameters.hpp 2024-01-08 22:21:32.722384361 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-parameters.hpp 2024-01-08 22:22:55.200059463 +0100 +@@ -28,9 +28,8 @@ + + #include + #include +-#include +-#include +-#include ++#include ++#include + + #include + #include +--- utsushi-0.65.0/drivers/esci/grammar-parameters.ipp 2024-01-08 22:21:32.722384361 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-parameters.ipp 2024-01-08 22:23:31.538640070 +0100 +@@ -24,35 +24,14 @@ + //! \copydoc grammar.ipp + + // decoding::basic_grammar_parameters implementation requirements +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + // encoding::basic_grammar_parameters implementation requirements +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + // *::basic_grammar_parameters implementation requirements + #include + +-// Support for debugging of parser and generator rules +-#include +-#include +- + #include "grammar-parameters.hpp" + + namespace utsushi { +--- utsushi-0.65.0/drivers/esci/grammar-status.hpp 2024-01-08 22:21:32.722384361 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-status.hpp 2024-01-08 22:27:35.678178729 +0100 +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + #include + +--- utsushi-0.65.0/drivers/esci/grammar-status.ipp 2024-01-08 22:21:32.722384361 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-status.ipp 2024-01-08 22:27:22.694160350 +0100 +@@ -24,21 +24,11 @@ + //! \copydoc grammar.ipp + + // decoding::basic_grammar_status implementation requirements +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + // *::basic_grammar_status implementation requirements + #include + +-// Support for debugging of parser rules +-#include +- + #include "grammar-status.hpp" + + namespace utsushi { +--- utsushi-0.65.0/drivers/esci/grammar-tracer.hpp 2024-01-08 22:21:32.725717869 +0100 ++++ utsushi-0.65.0/drivers/esci/grammar-tracer.hpp 2024-01-08 22:25:58.496385824 +0100 +@@ -24,8 +24,8 @@ + #include + + #include +-#include +-#include ++#include ++#include + #include + + #if !defined (ESCI_GRAMMAR_TRACE_INDENT) diff --git a/media-gfx/iscan/iscan-3.65.0-r1.ebuild b/media-gfx/iscan/iscan-3.65.0-r1.ebuild deleted file mode 100644 index 21dc24242f01..000000000000 --- a/media-gfx/iscan/iscan-3.65.0-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop flag-o-matic udev xdg-utils - -DESCRIPTION="EPSON Image Scan v3 for Linux" -HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi" -SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="graphicsmagick gui test" -KEYWORDS="~amd64 ~x86" - -# Disable opencl as during reorient.utr test it produces inconsistent results -BDEPEND=" - virtual/pkgconfig - test? ( - app-text/tesseract[png,tiff,training,-opencl] - dev-util/uncrustify - media-fonts/dejavu - virtual/imagemagick-tools[png,tiff] - ) -" -RDEPEND=" - dev-libs/boost:= - media-gfx/sane-backends - media-libs/libjpeg-turbo:= - media-libs/tiff:= - virtual/libusb:1 - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - gui? ( dev-cpp/gtkmm:2.4 ) -" -DEPEND="${RDEPEND}" -RESTRICT="!test? ( test )" -S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)" - -PATCHES=( - "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch - "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch - "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch - "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch - "${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch - "${FILESDIR}"/${PN}-3.62.0-tests-boost.patch - "${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch - "${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch - "${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch - "${FILESDIR}"/${PN}-3.65.0-sane-backends-1.1.patch -) - -src_prepare() { - default - - # Remove vendored libraries - rm -r upstream/boost || die - # Workaround for deprecation warnings: - # https://gitlab.com/utsushi/utsushi/issues/90 - sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die - # Disable check-soname test - sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || die - eautoreconf -} - -src_configure() { - # Workaround for: - # /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory - append-ldflags $(no-as-needed) - # https://bugs.gentoo.org/720994 - append-ldflags -pthread - local myconf=( - $(use_with gui gtkmm) - --enable-sane-config - --enable-udev-config - --with-boost=yes - --with-jpeg - --with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick) - --with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick) - --with-sane - --with-tiff - --with-udev-confdir="$(get_udevdir)" - ) - econf "${myconf[@]}" -} - -src_install() { - default - dodoc lib/devices.conf - find "${ED}" -name '*.la' -delete || die - if use gui; then - newicon -s scalable doc/icon.svg "${PN}".svg - make_desktop_entry utsushi "Image Scan" - fi -} - -pkg_postinst() { - udev_reload - use gui && xdg_icon_cache_update - elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution)," - elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs." -} - -pkg_postrm() { - udev_reload - use gui && xdg_icon_cache_update -} diff --git a/media-gfx/iscan/iscan-3.65.0-r2.ebuild b/media-gfx/iscan/iscan-3.65.0-r2.ebuild new file mode 100644 index 000000000000..fe66b5c9f143 --- /dev/null +++ b/media-gfx/iscan/iscan-3.65.0-r2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop flag-o-matic udev xdg-utils + +DESCRIPTION="EPSON Image Scan v3 for Linux" +HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi" +SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="graphicsmagick gui test" +KEYWORDS="~amd64 ~x86" + +# Disable opencl as during reorient.utr test it produces inconsistent results +BDEPEND=" + virtual/pkgconfig + test? ( + app-text/tesseract[png,tiff,training,-opencl] + dev-util/uncrustify + media-fonts/dejavu + virtual/imagemagick-tools[png,tiff] + ) +" +RDEPEND=" + dev-libs/boost:= + media-gfx/sane-backends + media-libs/libjpeg-turbo:= + media-libs/tiff:= + virtual/libusb:1 + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + gui? ( dev-cpp/gtkmm:2.4 ) +" +DEPEND="${RDEPEND}" +RESTRICT="!test? ( test )" +S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)" + +PATCHES=( + "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch + "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch + "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch + "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch + "${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch + "${FILESDIR}"/${PN}-3.62.0-tests-boost.patch + "${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch + "${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch + "${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch + "${FILESDIR}"/${PN}-3.65.0-sane-backends-1.1.patch + "${FILESDIR}"/${PN}-3.65.0-boost-1.84-headers.patch +) + +src_prepare() { + default + + # Remove vendored libraries + rm -r upstream/boost || die + # Workaround for deprecation warnings: + # https://gitlab.com/utsushi/utsushi/issues/90 + sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die + # Disable check-soname test + sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || die + eautoreconf +} + +src_configure() { + # Workaround for: + # /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory + append-ldflags $(no-as-needed) + # https://bugs.gentoo.org/720994 + append-ldflags -pthread + local myconf=( + $(use_with gui gtkmm) + --enable-sane-config + --enable-udev-config + --with-boost=yes + --with-jpeg + --with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick) + --with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick) + --with-sane + --with-tiff + --with-udev-confdir="$(get_udevdir)" + ) + econf "${myconf[@]}" +} + +src_install() { + default + dodoc lib/devices.conf + find "${ED}" -name '*.la' -delete || die + if use gui; then + newicon -s scalable doc/icon.svg "${PN}".svg + make_desktop_entry utsushi "Image Scan" + fi +} + +pkg_postinst() { + udev_reload + use gui && xdg_icon_cache_update + elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution)," + elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs." +} + +pkg_postrm() { + udev_reload + use gui && xdg_icon_cache_update +} -- cgit v1.2.3