From 1551fe56fd6ba43a94509cffc61b6bf854b7ac9f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 1 Jun 2024 00:07:06 +0100 Subject: gentoo auto-resync : 01:06:2024 - 00:07:06 --- media-gfx/Manifest.gz | Bin 38012 -> 38013 bytes media-gfx/fig2dev/Manifest | 2 +- media-gfx/fig2dev/fig2dev-3.2.9-r4.ebuild | 102 ------ media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild | 99 ++++++ media-gfx/graphite2/Manifest | 2 +- .../graphite2/graphite2-1.3.14_p20210810-r3.ebuild | 2 +- media-gfx/inkscape/Manifest | 5 +- .../inkscape/files/inkscape-1.3.2-cxx20-2.patch | 11 + .../inkscape/files/inkscape-1.3.2-cxx20.patch | 91 +++++ .../files/inkscape-1.3.2-poppler-24.05.patch | 64 ++++ media-gfx/inkscape/inkscape-1.3.2-r2.ebuild | 3 + media-gfx/kgraphviewer/Manifest | 2 +- media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild | 2 +- media-gfx/sane-backends/Manifest | 8 +- .../files/sane-backends-1.1.1-gcc12-tests.patch | 78 ----- .../sane-backends-1.1.1-genesys-gl845-crash.patch | 12 - .../files/sane-backends-1.1.1-musl.patch | 34 -- .../sane-backends/sane-backends-1.1.1-r11.ebuild | 360 -------------------- .../sane-backends/sane-backends-1.1.1-r13.ebuild | 366 --------------------- media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 24 +- 20 files changed, 289 insertions(+), 978 deletions(-) delete mode 100644 media-gfx/fig2dev/fig2dev-3.2.9-r4.ebuild create mode 100644 media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild create mode 100644 media-gfx/inkscape/files/inkscape-1.3.2-cxx20-2.patch create mode 100644 media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch create mode 100644 media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch delete mode 100644 media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch delete mode 100644 media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch delete mode 100644 media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch delete mode 100644 media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild delete mode 100644 media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index edb4a84cfc83..3f43332c0b8a 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/fig2dev/Manifest b/media-gfx/fig2dev/Manifest index 602d3b1b36fe..e2c199cf0123 100644 --- a/media-gfx/fig2dev/Manifest +++ b/media-gfx/fig2dev/Manifest @@ -1,5 +1,5 @@ DIST fig2dev-3.2.9.tar.xz 529892 BLAKE2B d6b4f84f89f85b282e2e02a3a4129ab8c9f67b3376b670fb553fc89347bf2552bfc3b3bfc4d4a4a35da7f9e5659f6f6fdf5a1fb4f82fb87d140dc09d079d9ffa SHA512 4a92539d79027c73cd9fa53d7e960db40ae5616d3197023a98346de4727cd70b28cd7d64ba33063dbe3dcacada7e97bb0e0c595547781a4244aea8c75d43f406 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 EBUILD fig2dev-3.2.9-r2.ebuild 2299 BLAKE2B e52d451f49bfa3ecb700caf594e6218bc65b1398aff300baef91d49dff581a7819836d9c5c60d3760b99c3b37d050c73e39960248bab685553d09e23be880d74 SHA512 4375637aeb94840774f820512624753845252ccc0dbf93d4ac6dbdde7d05c0b07e5fe286b212bc5612ecf12c80f4cc3a1b69e1f4b041808f81dedcb04d534bbf -EBUILD fig2dev-3.2.9-r4.ebuild 2494 BLAKE2B 1c5fda1f5298915738ba19a53113b486beecf72c311e1591d14b9f17d9282f0cfce4ba3f56bb464f82f48e419398b935e75ee218d53ef0017c0f7f3639f05397 SHA512 f017192e1bebe15f1bad3e8c7fb64d2958ce752232835a2ac50528b2874dc3e44c8521e847ee748c68a24e825ea68c5244d6a3ce0dec845186ffb7e38f7c6f7f +EBUILD fig2dev-3.2.9-r5.ebuild 2420 BLAKE2B 0ec2968f64e2ba315496d5e5f65df7675a6f76ed2520a34aef69b53c4b8bc238f0682bec68998f809317aaade31b370edfb3599b3e984ba97864b28230d6525e SHA512 14598c4fc2f3ffa50578ef051a9eecdac925d7113816848c621ed61a77d4e4f9d63977237cdf95b3878b32f64b273ac02d3e9593dae97aa031a0f42b4527439f MISC metadata.xml 609 BLAKE2B f4f19f0cb2281cf5cddbdf11ac59b3c5c4881b04943e3a4c5d0ff0e5c7f66ffe7d066fc7cd9fb07f7db4f1ef727bcbe7d2033415681d619580a3bed3630474e5 SHA512 0bf3ae4eac46bd373650dfd16ba5b4abaf7f17352a1b59255352e2e9dba56cca03a3192ec99b2b0da6586d86349784de0df25628bf4b35f1e1b37bf38e0ccd6b diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r4.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r4.ebuild deleted file mode 100644 index 3366d8472211..000000000000 --- a/media-gfx/fig2dev/fig2dev-3.2.9-r4.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -#MY_P="${PN}.${PV}" - -DESCRIPTION="Set of tools for creating TeX documents with graphics" -HOMEPAGE="https://www.xfig.org/" -SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz - mirror://gentoo/fig2mpdf-1.1.2.tar.bz2" -#S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+ghostscript" - -RDEPEND=" - media-libs/libpng - media-libs/libjpeg-turbo:= - x11-apps/rgb - x11-libs/libXpm - !media-gfx/transfig - ghostscript? - ( - app-text/ghostscript-gpl - || ( - media-gfx/graphicsmagick[imagemagick,jpeg,png,postscript,tiff] - media-gfx/imagemagick[jpeg,png,postscript,tiff] - ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/rman - sys-devel/gcc -" - -DOCS=( README CHANGES NOTES ) -HTML_DOCS=( "${WORKDIR}/fig2mpdf/doc/." ) - -sed_Imakefile() { - # see fig2dev/Imakefile for details - vars2subs="BINDIR=${EPREFIX}/usr/bin - MANDIR=${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\) - XFIGLIBDIR=${EPREFIX}/usr/share/xfig - PNGINC=-I${EPREFIX}/usr/include/X11 - XPMINC=-I${EPREFIX}/usr/include/X11 - USEINLINE=-DUSE_INLINE - RGB=${EPREFIX}/usr/share/X11/rgb.txt - FIG2DEV_LIBDIR=${EPREFIX}/usr/share/fig2dev" - - for variable in ${vars2subs} ; do - varname=${variable%%=*} - varval=${variable##*=} - sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" || die - done -} - -src_configure() { - # export IMAKECPP=${IMAKECPP:-${CHOST}-gcc -E} - # CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die - econf --enable-transfig -} - -src_compile() { - # emake CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" Makefiles - - local myemakeargs=( - CC="$(tc-getCC)" - AR="$(tc-getAR)" - RANLIB="$(tc-getRANLIB)" - CDEBUGFLAGS="${CFLAGS}" - LOCAL_LDFLAGS="${LDFLAGS}" - USRLIBDIR="${EPREFIX}/usr/$(get_libdir)" - ) - emake "${myemakeargs[@]}" -} - -src_install() { - local myemakeargs=( - DESTDIR="${D}" - INSTDATFLAGS="-m 644" - INSTMANFLAGS="-m 644" - ) - emake "${myemakeargs[@]}" install - - dobin "${WORKDIR}/fig2mpdf/fig2mpdf" - doman "${WORKDIR}/fig2mpdf/fig2mpdf.1" - - einstalldocs - - rm "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die -} - -pkg_postinst() { - elog "Note, that defaults are changed and now if you don't want to ship" - elog "personal information into output files, use fig2dev with -a option." -} diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild new file mode 100644 index 000000000000..68d2d6c66ecb --- /dev/null +++ b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +#MY_P="${PN}.${PV}" + +DESCRIPTION="Set of tools for creating TeX documents with graphics" +HOMEPAGE="https://www.xfig.org/" +SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz + mirror://gentoo/fig2mpdf-1.1.2.tar.bz2" +#S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+ghostscript" + +RDEPEND=" + media-libs/libpng + media-libs/libjpeg-turbo:= + x11-apps/rgb + x11-libs/libXpm + !media-gfx/transfig + ghostscript? + ( + app-text/ghostscript-gpl + virtual/imagemagick-tools[jpeg,png,postscript,tiff] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/rman + sys-devel/gcc +" + +DOCS=( README CHANGES NOTES ) +HTML_DOCS=( "${WORKDIR}/fig2mpdf/doc/." ) + +sed_Imakefile() { + # see fig2dev/Imakefile for details + vars2subs="BINDIR=${EPREFIX}/usr/bin + MANDIR=${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\) + XFIGLIBDIR=${EPREFIX}/usr/share/xfig + PNGINC=-I${EPREFIX}/usr/include/X11 + XPMINC=-I${EPREFIX}/usr/include/X11 + USEINLINE=-DUSE_INLINE + RGB=${EPREFIX}/usr/share/X11/rgb.txt + FIG2DEV_LIBDIR=${EPREFIX}/usr/share/fig2dev" + + for variable in ${vars2subs} ; do + varname=${variable%%=*} + varval=${variable##*=} + sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" || die + done +} + +src_configure() { + # export IMAKECPP=${IMAKECPP:-${CHOST}-gcc -E} + # CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die + econf --enable-transfig +} + +src_compile() { + # emake CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" Makefiles + + local myemakeargs=( + CC="$(tc-getCC)" + AR="$(tc-getAR)" + RANLIB="$(tc-getRANLIB)" + CDEBUGFLAGS="${CFLAGS}" + LOCAL_LDFLAGS="${LDFLAGS}" + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)" + ) + emake "${myemakeargs[@]}" +} + +src_install() { + local myemakeargs=( + DESTDIR="${D}" + INSTDATFLAGS="-m 644" + INSTMANFLAGS="-m 644" + ) + emake "${myemakeargs[@]}" install + + dobin "${WORKDIR}/fig2mpdf/fig2mpdf" + doman "${WORKDIR}/fig2mpdf/fig2mpdf.1" + + einstalldocs + + rm "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die +} + +pkg_postinst() { + elog "Note, that defaults are changed and now if you don't want to ship" + elog "personal information into output files, use fig2dev with -a option." +} diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest index d78301e31884..fc0f4f4068d8 100644 --- a/media-gfx/graphite2/Manifest +++ b/media-gfx/graphite2/Manifest @@ -5,5 +5,5 @@ AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3 AUX graphite2-1.3.5-fix-gcc-linking.patch 580 BLAKE2B 7ab4d1848e0b0fdbd682fc81747a426c9bee7e2d0f72991dc963c955ba910035c6246d88f7eaded9c4a742a10470fd304ab2dd3fb1750795b8b9791ccfc0cfb8 SHA512 1e01c764f72204f30c916dcdc4f5bc7a4757d73275bb2007bf0c1f2e9898f138aa6c0581addc587e125cf6cbf9d5db725cb3d8a69875978a14ab316d2d561467 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff -EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3145 BLAKE2B 5f8818885d60d8eb6e0c81ed926cd8b3fa6fab1836a449d46284d881835ff0d1915dd5b898cd201c93bf4ecc1aa467ffdac8501c391d079849cdc474b7b0d205 SHA512 3ce35fc6253ff95bc54c330e862eead51140d3a3d0b89b6eeab03e86034ef139a41da46962facd6b3e265e73ae443d6684488e7bd2c7dcf86e3691e4c4bea634 +EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3145 BLAKE2B 2eaf91ffa1a9f88bb71bd5d3833f570b1021c2da70fb5692c046ebeb89639029bd1f69e92ed1859d607e6904cca1b34415ae96ba0091cecd879459789b5dfcfb SHA512 267912d81ad268caa0b18637cf8fc34e909b89e7eb06d67b41ea7c1395b963928541699a61c6b3b8d3d9280e60c0871583267b8daed83f768d0f62003dc1e9ff MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild index 9439faed0363..294ba366f782 100644 --- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild +++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild @@ -5,7 +5,7 @@ EAPI=8 COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380 GENTOO_DEPEND_ON_PERL="no" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic perl-module python-any-r1 cmake-multilib DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 21eb0f196c55..01f8c60e8900 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,6 +1,9 @@ +AUX inkscape-1.3.2-cxx20-2.patch 541 BLAKE2B f235b801beef5b869ec3720986336c4e0aaafda87556b12a0aa57e011839298562358dedd05e91e0347b79915af6edbb21e4dc41ed9e2a6f4aa562f91cc3967a SHA512 c3c3443669ac0b78c97ae144206c312bbab970d3e9c781dfeddacbe41a6181919b262316a6d2be7fe42b7f9205da4bdd0a5f2640958be06a63063d6feee0b194 +AUX inkscape-1.3.2-cxx20.patch 3811 BLAKE2B 308f70c1fa07894af3b223f800dd514c2affa1db38827f5d8da51a803bde473a51c9e813ea94e4cabb2c98b9209071e57898c3fe61a1342458c54bbb49b7526a SHA512 825f483844b907d6d022fd07d60865e940b23bbcdffc662c61133814a2927597878309471c27096c1608b9a56364442535b2ec68db398371f372fc04b7f497d8 AUX inkscape-1.3.2-libxml2-2.12.patch 916 BLAKE2B 06ff8b562f6eb703ae2b88a8f0c4ce68257066a8482c1e9b05144bf2fa188512fd6521bfaed700f5fae90dd7b9d927e3382220ebc2a67fdf01614fc9db08b30c SHA512 afdd6c92b16ecc7078cc15b13c40cb19ca2b326367729341003894004ba1fd36c6df8d04f954c65fbbe213201cee14bd5dc38766d87801a4b78934a9927957a4 AUX inkscape-1.3.2-poppler-24.03.patch 2982 BLAKE2B b8ed08ef09afbab15196ae6d0f198acc01a4000bc2688d0209d53108dac0c801f9d3d1d3be78893e6268f0e82ca7f61b6975252d29aa657487fe792d42c79532 SHA512 9bd8062599fe183de837804106aa2501cb77710f76214663dfd504d9a7cb4a4bc838311c87ed2bbacca4bbcab29a2f81e0831cbd4f8c2017816a0e6fbbfe306b +AUX inkscape-1.3.2-poppler-24.05.patch 2620 BLAKE2B 0fc615690c365cf1630b680f1b6c43d28667263e26c2dad7697e9f7ae56a91b05bf6457f99578ec2a8b771155349b5dbe125f00fcc28f148ba7d58c2887230a5 SHA512 8da5c3db83968a42e1e43b1dc7148724fe2b18299b8c6cf58ab8315566daaa8d2d5cc9030cdb9bc31b55cbd868410a314b7b097ae0f4bd5ccba99c073839e0dc DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343 -EBUILD inkscape-1.3.2-r2.ebuild 5735 BLAKE2B bbac4bc9fe98168bb73154d36f646b68a626a8b6f7dd4a37d0d2f81834464117da8f12ad05d0703b6a4709287ebaecee539c06df139127f5a40c53c66f81eb17 SHA512 e4301a59140a279b9f4e886d348b42ed036051d8debcae223ce4fb820f48728d8ff5d8bc6bdf5661905ba38dfd1f8d8e9f3e93f676984554f0d127cb5ca4a549 +EBUILD inkscape-1.3.2-r2.ebuild 5880 BLAKE2B f07c32e0321cd91a20ec4462297b1147a99a94a55ba90280b2e207731c3c7268a6e3de652a2826be11e876357ae86351cb578dd1b7f6409670b30de7d5e98c71 SHA512 edba7f70cc6200af742a68e1677bb53c88885aefe3c6d91fe2e6f03c728ed000cfc6053130e5a7769eb61bb57f0cf94dc7c5dbf3da2fce7cd790f49d5f4d58d0 EBUILD inkscape-9999.ebuild 5619 BLAKE2B 1df847047fbf31f8957455a4783dbf50662c838832c36a979057dd6fe1fbc7a27663562b98acb972784255df578b30be9acfe4452c4c8d0337db7f8f72555b90 SHA512 37bc139d98e7c727210dff9845e61fd085c34facbc204e87d12eb6f19f978d9675469309cf93da4813bdb7ea88ea0c355b389b63348447375ec93524ed6ffaaa MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-cxx20-2.patch b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20-2.patch new file mode 100644 index 000000000000..6364c3f88a9e --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20-2.patch @@ -0,0 +1,11 @@ +--- a/src/ui/dialog/filter-effects-dialog.cpp ++++ b/src/ui/dialog/filter-effects-dialog.cpp +@@ -202,7 +202,7 @@ + template< typename T> class ComboWithTooltip : public Gtk::EventBox + { + public: +- ComboWithTooltip(T default_value, const Util::EnumDataConverter& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr) ++ ComboWithTooltip(T default_value, const Util::EnumDataConverter& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr) + { + if (tip_text) { + set_tooltip_text(tip_text); diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch new file mode 100644 index 000000000000..3c61b1919278 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch @@ -0,0 +1,91 @@ +From 1798e9c13b786f3d077ba0132592c4d5c1d1fb9b Mon Sep 17 00:00:00 2001 +From: Tavmjong Bah +Date: Tue, 26 Sep 2023 19:23:27 +0000 +Subject: [PATCH] Up C++ version to C++20. + +--- + CMakeLists.txt | 4 ++-- + _clang-format | 2 +- + src/ui/knot/knot-holder-entity.cpp | 2 +- + src/ui/tools/pencil-tool.cpp | 9 ++++++--- + 4 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe6b10cda24..de2680bd651 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,9 +18,9 @@ message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}") + # ----------------------------------------------------------------------------- + # CMake Configuration + # ----------------------------------------------------------------------------- +-set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_CXX_STANDARD 20) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +-# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++17 instead of -std=gnu++17 ++# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++20 instead of -std=gnu++20 + # TODO: build currently fails with it as we actually depend on GNU compiler extensions... + # mostly use of the non-Standard M_PI et al. TODO: C++20: Use the header. + +diff --git a/_clang-format b/_clang-format +index 39396fad65a..48de4d2bd88 100644 +--- a/_clang-format ++++ b/_clang-format +@@ -103,7 +103,7 @@ SpacesInContainerLiterals: false + SpacesInCStyleCastParentheses: false + SpacesInParentheses: false + SpacesInSquareBrackets: false +-Standard: c++17 ++Standard: c++20 + StatementMacros: [] + TypenameMacros: [] + TabWidth: 4 +diff --git a/src/ui/knot/knot-holder-entity.cpp b/src/ui/knot/knot-holder-entity.cpp +index 8703f5975f7..add66d2fa29 100644 +--- a/src/ui/knot/knot-holder-entity.cpp ++++ b/src/ui/knot/knot-holder-entity.cpp +@@ -315,7 +315,7 @@ void PatternKnotHolderEntityScale::knot_set(Geom::Point const &p, Geom::Point co + double scale_x = std::clamp(new_extent[X] / _cached_diagonal[X], _cached_min_scale, 1e9); + double scale_y = std::clamp(new_extent[Y] / _cached_diagonal[Y], _cached_min_scale, 1e9); + +- Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale(lerp(0.5, scale_x, scale_y)) ++ Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale((scale_x + scale_y) * 0.5) + : Scale(scale_x, scale_y); + + // 2. Calculate offset to keep pattern origin aligned +diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp +index fd2d08cad0c..7324f7c8515 100644 +--- a/src/ui/tools/pencil-tool.cpp ++++ b/src/ui/tools/pencil-tool.cpp +@@ -17,7 +17,11 @@ + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ + +-#include // For std::accumulate ++#include "pencil-tool.h" ++ ++#include // std::lerp ++#include // std::accumulate ++ + #include + #include + +@@ -26,7 +30,6 @@ + #include <2geom/sbasis-to-bezier.h> + #include <2geom/svg-path-parser.h> + +-#include "pencil-tool.h" + + #include "context-fns.h" + #include "desktop.h" +@@ -806,7 +809,7 @@ void PencilTool::_addFreehandPoint(Geom::Point const &p, guint /*state*/, bool l + min = max; + } + double dezoomify_factor = 0.05 * 1000 / _desktop->current_zoom(); +- double const pressure_shrunk = pressure * (max - min) + min; // C++20 -> use std::lerp() ++ double const pressure_shrunk = std::lerp(min, max, pressure); + double pressure_computed = std::abs(pressure_shrunk * dezoomify_factor); + double pressure_computed_scaled = std::abs(pressure_computed * _desktop->getDocument()->getDocumentScale().inverse()[Geom::X]); + if (p != p_array[_npoints - 1]) { +-- +GitLab + diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch new file mode 100644 index 000000000000..bb2764032c44 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch @@ -0,0 +1,64 @@ +From 96ca7a6c215aa14336b52753f56244dc8796ec43 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Fri, 3 May 2024 14:52:00 +0200 +Subject: [PATCH] Fix build with poppler >= 24.05.0 + +GooString::hasUnicodeMarkerLE and GooString::hasUnicodeMarker were +rename and moved to UTF.h [1][2] + +[1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/98fabb298b0e8eaef9193bbce68c99c85473a314 +[2] https://gitlab.freedesktop.org/poppler/poppler/-/commit/1f06dca08c32ed18c3030530d98a0e30d41dd7a2 +--- + src/extension/internal/pdfinput/poppler-transition-api.h | 9 +++++++++ + src/extension/internal/pdfinput/poppler-utils.cpp | 6 ++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 58aa1ec921d..481aefadf46 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -13,6 +13,15 @@ + #define SEEN_POPPLER_TRANSITION_API_H + + #include ++#include ++ ++#if POPPLER_CHECK_VERSION(24, 5, 0) ++#define _POPPLER_HAS_UNICODE_BOM(value) (hasUnicodeByteOrderMark(value->toStr())) ++#define _POPPLER_HAS_UNICODE_BOMLE(value) (hasUnicodeByteOrderMarkLE(value->toStr())) ++#else ++#define _POPPLER_HAS_UNICODE_BOM(value) (value->hasUnicodeMarker()) ++#define _POPPLER_HAS_UNICODE_BOMLE(value) (value->hasUnicodeMarkerLE()) ++#endif + + #if POPPLER_CHECK_VERSION(24, 3, 0) + #define _POPPLER_FUNCTION_TYPE_SAMPLED Function::Type::Sampled +diff --git a/src/extension/internal/pdfinput/poppler-utils.cpp b/src/extension/internal/pdfinput/poppler-utils.cpp +index 78d90c66c9d..c02815f64b9 100644 +--- a/src/extension/internal/pdfinput/poppler-utils.cpp ++++ b/src/extension/internal/pdfinput/poppler-utils.cpp +@@ -12,6 +12,8 @@ + + #include "poppler-utils.h" + ++#include ++ + #include "2geom/affine.h" + #include "GfxFont.h" + #include "GfxState.h" +@@ -563,10 +565,10 @@ std::string getDictString(Dict *dict, const char *key) + */ + std::string getString(const GooString *value) + { +- if (value->hasUnicodeMarker()) { ++ if (_POPPLER_HAS_UNICODE_BOM(value)) { + return g_convert(value->getCString () + 2, value->getLength () - 2, + "UTF-8", "UTF-16BE", NULL, NULL, NULL); +- } else if (value->hasUnicodeMarkerLE()) { ++ } else if (_POPPLER_HAS_UNICODE_BOMLE(value)) { + return g_convert(value->getCString () + 2, value->getLength () - 2, + "UTF-8", "UTF-16LE", NULL, NULL, NULL); + } +-- +GitLab + diff --git a/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild index f746f1a32d60..a47b5b9d4390 100644 --- a/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild +++ b/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild @@ -112,6 +112,9 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/${P}-libxml2-2.12.patch "${FILESDIR}"/${P}-poppler-24.03.patch + "${FILESDIR}"/${P}-poppler-24.05.patch # bug 931917 + "${FILESDIR}"/${P}-cxx20.patch # bug 931917 + "${FILESDIR}"/${P}-cxx20-2.patch # bug 933216 ) pkg_pretend() { diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest index db5e7b3e06e3..92522657ded1 100644 --- a/media-gfx/kgraphviewer/Manifest +++ b/media-gfx/kgraphviewer/Manifest @@ -4,5 +4,5 @@ AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5e DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d DIST kgraphviewer-2.5.0.tar.xz 1571364 BLAKE2B 77a749f6b2c7707e26993685445fac679067b1188a5e2bf974d99ddc89844eeea19de9fbdf86b9c0738a95515c3a5155743df4232167e24350c8d356ea96f6e3 SHA512 80056703cd42b709925b771fe4bafe17771954705a607d6c352a0818c726bc7b48d299fffd7f3d2f75ac498059f79923d4de468db20f8538554c4d6b8baffedb EBUILD kgraphviewer-2.4.3-r2.ebuild 1097 BLAKE2B 312301205617180031aafc740d5749cdb436f601047e2433992d5f376c1b3e82e56dc8137a106faea8131da322dfcd6f2d6b392ad39009dcde368256d3212da7 SHA512 47208d70b25113a5d53168923bdcf16b03230758ace49fcca01fe071102f3f95b382f293c17e422c4ea6a8f6a764ea80c86e60ec5c6e107af0d106a41f00e38e -EBUILD kgraphviewer-2.5.0.ebuild 1004 BLAKE2B 774f872e1e32d72a65b562fc7ac93332cce74acbe06a48253066af27c92773dce26061647e1723c551db121a68ebb7d636010f7d1ae000e43e1f2b6f5771e318 SHA512 6a3e3be9cd4fc399f882eea816622b972cc10e032c388f8442aa20c51855052172e49a527065f13ac5c00ee82997640dc0d31740e75f3844c7758b47d757bc03 +EBUILD kgraphviewer-2.5.0.ebuild 992 BLAKE2B 03ba15df6d38c0d5088041e7cf6b51ad00ef31c25c8a3775bb7d354f01bba9288df653b874105034dec51fdea99b4d5730c6e802d163d6f8c8f1513a7a2f4d51 SHA512 cba6ce04e3ccff8f40a15e9077ec4ff14f7a9a704e0b47fab92ff52e01696564e4001a1e3bc81fa2715b4b59a8c7ac5eb75454aa52c81fd1a8dc09214418eb4e MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild index d8fd97400f04..a774a9f1eef7 100644 --- a/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild +++ b/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kgraphviewer/" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64" fi LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )" diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 5b2bfd9c1d51..6dee214e9049 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -4,18 +4,12 @@ AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3 AUX sane-backends-1.1.1-configure-clang16.patch 1537 BLAKE2B 5908f8a11ab78b37b1def559b3e59f7c84fa0d744d81fa130d1816b45ebf058c77caf7fd56ba6b8c97d864a018bcaedddb31525f6c8cd84bac8bb5d7d9a07da1 SHA512 2a1c2addde06841761051f93432da187241f4840568c39f074dc503c3038ab2d5cf57f4f807e728c15d40049c1e06eb8e7939b41daff33c937afd510fc676601 -AUX sane-backends-1.1.1-gcc12-tests.patch 2293 BLAKE2B bd25816934b11b857d226058578511916c8711af5bbe6cb31d0d5138dd4fca3353cb65c753c63b94be2f4f7562e162c8d384be1c9afaeaeaca450251ab40ff3c SHA512 2ac36d4a6fe0591fe78d245ec0927e5a00a29d1311bf2b9e6d3518d02536e802074f765eb7a35b0908cf1e983edee7041211a77774384a71b34779093b63fa65 -AUX sane-backends-1.1.1-genesys-gl845-crash.patch 553 BLAKE2B 8fafda9bf9904733c02db56975c0e6d7c594140f2c568f7d46524e726b69ebd33b4487fb9b5b7d701a4ddacf079ac75b1315139c4e377caf414211ac02652764 SHA512 a07a82d25e009b30056965974d6d3088772803632aa57030a4261ebf596f7cdf0a468212dd234a5dda7821ee75ff665dbcf66df43b1d3c9c10a649ad5e36483c -AUX sane-backends-1.1.1-musl.patch 1308 BLAKE2B 1dacf69a26e4955a07848f8cb89c5d7fbae71641de666b8f45a0ca0f57df48d335f0a609b6813114f730296752ef661fa2dd56b889bcf168489c725bd344c9de SHA512 febff2ff17ffe486122e8a5630adc01aed16398bf1d36628faa64b61d3cf423bcc66e683701e601071d2b3320b502c0416cd5b21b463004b516b75286eb64e3b AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965 AUX saned_at.service-r1 432 BLAKE2B e6dab788c0bf705087974642ed714b5f41b3e676b80b5197a753227934b977ce6d1175872163e831e916b6aa36d6c5dd86effa44801494cff6fc669e6c24acaf SHA512 2c8725f9981216129f94a7c4cd75efab37bb75c891fdf7dbd4297161d8d4cd3b1c5fa0eebcaabe1f038aab8500f8b5579d776935f180fb2553bd2cb77506c29d -DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 02ac1822beabb12f19ce2d7c053f0f727313d13e0f9380325492a2f0048094f78a118f7659b4c6e39b60c4ea319d862a242f8866a67c84e5649d9ae2691d9473 SHA512 25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d DIST sane-backends-1.2.1.tar.gz 7308040 BLAKE2B 8448a66e70548f159cfac63501e52417fb1d0599008ce7bf26bf2e7a25a946e688968f01ae64b72c3d5efce67cfbdc0e8e04d8ab3bc92dae0a7e01bc81bf0140 SHA512 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1 -EBUILD sane-backends-1.1.1-r11.ebuild 8968 BLAKE2B 4326e0b9910316a75fac005f1e19e8603e9e44bc19aea48133dc4f00f79f213ca8ee7cecc2a7947eec593804a2217215f9d32cbca8ed0cc18a893b3898b439a1 SHA512 964068339a56b1cc733b95852b4137e878599b48b42cf9096c78b3f6ffd6457ceb1472711fbeb716f8bb5b3388e7304e29f55ad79becd0433acf373009ea9d4b -EBUILD sane-backends-1.1.1-r13.ebuild 9130 BLAKE2B da0f9cb62b082ee2ae507a7ca3180ceacf218f882fca0cd350a5ac914369e5e91d51570fa5eeb90fa8c833ac6210098ed709990d90fb7ac8e7174f307e5e56e1 SHA512 47f0696fec3b9eee1eab791edf2cb2c79711d36697cf55956137f4b0d1a56859aacc987a46b07efd8a6b1cb20757cb9c3577c4112ff654ffbf1189345699a7e1 -EBUILD sane-backends-1.2.1.ebuild 8847 BLAKE2B 87d77537fdf266c3589a5ea3605eba1476d0b0ff3322a6655383a1f40eb20e47acd3b11dad3edc079e8e4ec97b482c385df98088cdd8a64fb4e18199b0297f15 SHA512 382ebf2021b85d313955278df15dfe26e1ee54b6a7651048376dd568d1d83bbe03353072eccd6f333d5d06dbf944ffdcb8ee0cd562dd9d68b875447e51aae790 +EBUILD sane-backends-1.2.1.ebuild 8843 BLAKE2B d4aafdb85f6c56429151bc7e281670197a000177383935aabdf54854e05fa1f90695d485b1623987eef152ec0cc347588e1f89f1c6fa1934c12dce3555b2ef77 SHA512 ec080b23ac102b6405f9ab0a71e4df931402ea71edde6823176d964ad66aea8a0373a7f9bc932719a9114fc0aba98f808cecb8f5a8508246a883311beba25e4e MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37 diff --git a/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch deleted file mode 100644 index 25a1e4db265e..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch +++ /dev/null @@ -1,78 +0,0 @@ -https://bugs.gentoo.org/840137 -https://gitlab.com/sane-project/backends/-/commit/6b99447f5b12758ff015b5c360a6dcbcf9b0a72d -https://gitlab.com/sane-project/backends/-/issues/597 -https://gitlab.com/sane-project/backends/-/issues/557 - -From edfc90450ee06149537fadb3095ba4b215c5c4fa Mon Sep 17 00:00:00 2001 -From: Ralph Little -Date: Sun, 2 Oct 2022 18:14:25 -0700 -Subject: [PATCH] genesys: corrections to include file order. - -minigtest.h has items that require the definitions in tests_printers.h. -Pre-GCC-12, this didn't seem to matter but GCC12 seems to have a -problem with this and requires the template definitions to have already -appeared. ---- a/testsuite/backend/genesys/minigtest.cpp -+++ b/testsuite/backend/genesys/minigtest.cpp -@@ -18,10 +18,10 @@ - along with this program. If not, see . - */ - --#include "minigtest.h" -- - #define DEBUG_DECLARE_ONLY - -+#include "minigtest.h" -+ - size_t s_num_successes = 0; - size_t s_num_failures = 0; - ---- a/testsuite/backend/genesys/tests_image.cpp -+++ b/testsuite/backend/genesys/tests_image.cpp -@@ -21,8 +21,8 @@ - #define DEBUG_DECLARE_ONLY - - #include "tests.h" --#include "minigtest.h" - #include "tests_printers.h" -+#include "minigtest.h" - - #include "../../../backend/genesys/image.h" - #include "../../../backend/genesys/image_pipeline.h" ---- a/testsuite/backend/genesys/tests_image_pipeline.cpp -+++ b/testsuite/backend/genesys/tests_image_pipeline.cpp -@@ -21,8 +21,8 @@ - #define DEBUG_DECLARE_ONLY - - #include "tests.h" --#include "minigtest.h" - #include "tests_printers.h" -+#include "minigtest.h" - - #include "../../../backend/genesys/image_pipeline.h" - ---- a/testsuite/backend/genesys/tests_motor.cpp -+++ b/testsuite/backend/genesys/tests_motor.cpp -@@ -21,8 +21,8 @@ - #define DEBUG_DECLARE_ONLY - - #include "tests.h" --#include "minigtest.h" - #include "tests_printers.h" -+#include "minigtest.h" - - #include "../../../backend/genesys/low.h" - #include "../../../backend/genesys/enums.h" ---- a/testsuite/backend/genesys/tests_utilities.cpp -+++ b/testsuite/backend/genesys/tests_utilities.cpp -@@ -21,8 +21,8 @@ - #define DEBUG_DECLARE_ONLY - - #include "tests.h" --#include "minigtest.h" - #include "tests_printers.h" -+#include "minigtest.h" - - #include "../../../backend/genesys/utilities.h" - -GitLab diff --git a/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch b/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch deleted file mode 100644 index f63a8e2100b9..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp -index 9552fa9..c95de7b 100644 ---- a/backend/genesys/genesys.cpp -+++ b/backend/genesys/genesys.cpp -@@ -367,6 +367,7 @@ void sanei_genesys_create_default_gamma_table(Genesys_Device* dev, - } - max = size - 1; - } else if (dev->model->asic_type == AsicType::GL124 || -+ dev->model->asic_type == AsicType::GL845 || - dev->model->asic_type == AsicType::GL846 || - dev->model->asic_type == AsicType::GL847) { - size = 257; diff --git a/media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch b/media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch deleted file mode 100644 index 8aebb50672a1..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://gitlab.com/sane-project/backends/-/commit/12560890a6e298091bd63b8093a35604416eb92a - -From 12560890a6e298091bd63b8093a35604416eb92a Mon Sep 17 00:00:00 2001 -From: David Ward -Date: Thu, 21 Apr 2022 23:37:33 -0400 -Subject: [PATCH] Fix header file used for poll() - -POSIX specifies the header to include is , not . -This results in a compiler warning with musl libc (on Alpine Linux). ---- a/configure.ac -+++ b/configure.ac -@@ -202,7 +202,7 @@ AC_HEADER_STDC - AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \ - sys/time.h sys/shm.h sys/ipc.h sys/scanio.h os2.h \ - sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \ -- dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h sys/poll.h \ -+ dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h poll.h \ - windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\ - netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h) - AC_CHECK_HEADERS([asm/io.h],,,[#include ]) ---- a/frontend/saned.c -+++ b/frontend/saned.c -@@ -84,8 +84,8 @@ - - #include "lgetopt.h" - --#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL) --# include -+#if defined(HAVE_POLL_H) && defined(HAVE_POLL) -+# include - #else - /* - * This replacement poll() using select() is only designed to cover -GitLab diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild deleted file mode 100644 index 7cda923f849d..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) - -# python-any-r1 required for a script in -# backends/pixma/scripts/ -inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev - -# gphoto and v4l are handled by their usual USE flags. -# The pint backend was disabled because I could not get it to compile. -IUSE_SANE_BACKENDS=( - abaton - agfafocus - apple - artec - artec_eplus48u - as6e - avision - bh - canon - canon630u - canon_dr - canon_lide70 - canon_pp - cardscan - coolscan - coolscan2 - coolscan3 - dc210 - dc240 - dc25 - dell1600n_net - dmc - epjitsu - epson - epson2 - escl - fujitsu - genesys - gt68xx - hp - hp3500 - hp3900 - hp4200 - hp5400 - hp5590 - hpljm1005 - hpsj5s - hs2p - ibm - kodak - kodakaio - kvs1025 - kvs20xx - kvs40xx - leo - lexmark - ma1509 - magicolor - matsushita - microtek - microtek2 - mustek - mustek_pp - mustek_usb - mustek_usb2 - nec - net - niash - p5 - pie - pieusb - pixma - plustek - plustek_pp - pnm - qcam - ricoh - ricoh2 - rts8891 - s9036 - sceptre - sharp - sm3600 - sm3840 - snapscan - sp15c - st400 - stv680 - tamarack - teco1 - teco2 - teco3 - test - u12 - umax - umax1220u - umax_pp - xerox_mfp -) - -IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf" - -for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do - case ${GBACKEND} in - # Disable backends that require parallel ports as no one has those anymore. - canon_pp|hpsj5s|mustek_pp|\ - pnm|mustek_usb2|kvs40xx) - IUSE+=" sane_backends_${GBACKEND}" - ;; - *) - IUSE+=" +sane_backends_${GBACKEND}" - esac -done - -REQUIRED_USE=" - sane_backends_escl? ( zeroconf ) - sane_backends_kvs40xx? ( threads ) - sane_backends_mustek_usb2? ( threads ) -" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.sane-project.org/" -SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz" - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - -# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build -RDEPEND=" - acct-user/saned - gphoto2? ( - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] - ) - sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - sane_backends_dell1600n_net? ( - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] - ) - sane_backends_escl? ( - app-text/poppler[cairo] - || ( - net-dns/avahi[dbus] - net-dns/avahi[gtk] - ) - net-dns/avahi[${MULTILIB_USEDEP}] - net-misc/curl[${MULTILIB_USEDEP}] - ) - sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - sane_backends_pixma? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - snmp? ( net-analyzer/net-snmp:= ) - systemd? ( sys-apps/systemd:= ) - usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) - v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) - xinetd? ( sys-apps/xinetd ) - zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND} - dev-libs/libxml2 - v4l? ( sys-kernel/linux-headers ) -" -BDEPEND=" - ${PYTHON_DEPS} - dev-build/autoconf-archive - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch - "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch - "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch - # https://gitlab.com/sane-project/backends/-/merge_requests/688 - "${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/sane-config -) - -src_prepare() { - default - - eautoreconf - - # don't bleed user LDFLAGS into pkgconfig files - sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die - - # Needed for udev rules generation/installation - multilib_copy_sources -} - -src_configure() { - # From Fedora - append-flags -fno-strict-aliasing - multilib-minimal_src_configure -} - -multilib_src_configure() { - # the blank is intended - an empty string would result in building ALL backends. - local lbackends=" " - - use gphoto2 && lbackends="gphoto2" - use v4l && lbackends+=" v4l" - use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl" - local backend - for backend in ${IUSE_SANE_BACKENDS[@]} ; do - if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then - lbackends+=" ${backend}" - fi - done - - local myconf=( - $(use_with usb) - $(multilib_native_use_with snmp) - - $(multilib_native_use_with sane_backends_escl poppler-glib) - # you can only enable this backend, not disable it... - $(usex sane_backends_pnm --enable-pnm-backend '') - $(usex sane_backends_mustek_pp --enable-parport-directio '') - ) - - if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then - myconf+=( sane_cv_use_libieee1284=no ) - fi - - # relative path must be used for tests to work properly - # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory - # that break in many ways, bug #636202, #668232, #668350 - # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html - myconf+=( - --disable-locking - $(use_with gphoto2) - $(multilib_native_use_with systemd) - $(use_with v4l) - $(use_enable ipv6) - $(use_enable threads pthread) - $(use_with zeroconf avahi) - ) - ECONF_SOURCE="${S}" \ - SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ - BACKENDS="${lbackends}" \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - emake VARTEXFONTS="${T}/fonts" - - if tc-is-cross-compiler ; then - pushd "${BUILD_DIR}"/tools >/dev/null || die - - # The build system sucks and doesn't handle this properly. - # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ - -I. -I../include -I"${S}"/include \ - "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ - "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die - local dirs=( hal hotplug hotplug-ng udev ) - local targets=( - hal/libsane.fdi - hotplug/libsane.usermap - hotplug-ng/libsane.db - udev/libsane.rules - ) - mkdir -p "${dirs[@]}" || die - emake "${targets[@]}" - - popd >/dev/null || die - fi - - if use usb ; then - sed -i -e '/^$/d' \ - tools/hotplug/libsane.usermap || die - fi -} - -multilib_src_install() { - emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ - docdir="${EPREFIX}"/usr/share/doc/${PF} - - if multilib_is_native_abi ; then - if use usb ; then - insinto /etc/hotplug/usb - doins tools/hotplug/libsane.usermap - fi - - insinto "/usr/share/pkgconfig" - doins tools/sane-backends.pc - - # From Fedora and Arch, prevent permission conflicts - # https://github.com/OpenPrinting/cups/issues/314 - # https://gitlab.com/sane-project/backends/-/issues/546 - # - # Generate udev udev+hwdb, not needing scanner group - install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die - tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die - tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die - # generate udev hwdb - install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die - tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" - # NOTE: an empty new line is required between the two .desc collections - printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die - tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die - # udev rule for saned (SANE scanning daemon) to be able to write on usb port - udev_dorules "${FILESDIR}/66-saned.rules" - fi -} - -multilib_src_install_all() { - dodir /etc/env.d - - if use systemd ; then - systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service" - systemd_newunit "${FILESDIR}"/saned.socket saned.socket - fi - - if use usb ; then - exeinto /etc/hotplug/usb - doexe tools/hotplug/libusbscanner - newdoc tools/hotplug/README README.hotplug - fi - - dodoc NEWS AUTHORS PROBLEMS README README.linux - find "${ED}" -name '*.la' -delete || die - - if use xinetd ; then - insinto /etc/xinetd.d - doins "${FILESDIR}"/saned - fi - - newinitd "${FILESDIR}"/saned.initd saned - newconfd "${FILESDIR}"/saned.confd saned -} - -pkg_postinst() { - optfeature "Network scanner backend" media-gfx/sane-airscan - optfeature "Epson-specific backend" media-gfx/iscan - optfeature "HP-specific backend" net-print/hplip - - if use xinetd ; then - elog "If you want remote clients to connect, edit" - elog "/etc/sane.d/saned.conf and /etc/hosts.allow" - fi - - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild deleted file mode 100644 index cc8ec2c60f74..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild +++ /dev/null @@ -1,366 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) - -# python-any-r1 required for a script in -# backends/pixma/scripts/ -inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev - -# gphoto and v4l are handled by their usual USE flags. -# The pint backend was disabled because I could not get it to compile. -IUSE_SANE_BACKENDS=( - abaton - agfafocus - apple - artec - artec_eplus48u - as6e - avision - bh - canon - canon630u - canon_dr - canon_lide70 - canon_pp - cardscan - coolscan - coolscan2 - coolscan3 - dc210 - dc240 - dc25 - dell1600n_net - dmc - epjitsu - epson - epson2 - epsonds - escl - fujitsu - genesys - gt68xx - hp - hp3500 - hp3900 - hp4200 - hp5400 - hp5590 - hpljm1005 - hpsj5s - hs2p - ibm - kodak - kodakaio - kvs1025 - kvs20xx - kvs40xx - leo - lexmark - ma1509 - magicolor - matsushita - microtek - microtek2 - mustek - mustek_pp - mustek_usb - mustek_usb2 - nec - net - niash - p5 - pie - pieusb - pixma - plustek - plustek_pp - pnm - qcam - ricoh - ricoh2 - rts8891 - s9036 - sceptre - sharp - sm3600 - sm3840 - snapscan - sp15c - st400 - stv680 - tamarack - teco1 - teco2 - teco3 - test - u12 - umax - umax1220u - umax_pp - xerox_mfp -) - -IUSE="gphoto2 snmp systemd threads usb v4l xinetd +zeroconf" - -for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do - case ${GBACKEND} in - # Disable backends that require parallel ports as no one has those anymore. - canon_pp|hpsj5s|mustek_pp|\ - pnm|mustek_usb2|kvs40xx) - IUSE+=" sane_backends_${GBACKEND}" - ;; - *) - IUSE+=" +sane_backends_${GBACKEND}" - esac -done - -REQUIRED_USE=" - sane_backends_escl? ( zeroconf ) - sane_backends_kvs40xx? ( threads ) - sane_backends_mustek_usb2? ( threads ) -" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.sane-project.org/" -SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz" - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - -# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build -RDEPEND=" - acct-user/saned - acct-group/scanner - gphoto2? ( - >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - ) - sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - sane_backends_dell1600n_net? ( - >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - ) - sane_backends_escl? ( - app-text/poppler[cairo] - || ( - net-dns/avahi[dbus] - net-dns/avahi[gtk] - ) - net-dns/avahi[${MULTILIB_USEDEP}] - net-misc/curl[${MULTILIB_USEDEP}] - ) - sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - sane_backends_pixma? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - snmp? ( net-analyzer/net-snmp:= ) - systemd? ( sys-apps/systemd:= ) - usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) - v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) - xinetd? ( sys-apps/xinetd ) - zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND} - dev-libs/libxml2 - v4l? ( sys-kernel/linux-headers ) -" -BDEPEND=" - ${PYTHON_DEPS} - dev-build/autoconf-archive - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch - "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch - "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch - # https://gitlab.com/sane-project/backends/-/merge_requests/688 - "${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch - "${FILESDIR}"/${P}-gcc12-tests.patch - "${FILESDIR}"/${PN}-1.1.1-configure-clang16.patch - "${FILESDIR}"/${P}-musl.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/sane-config -) - -src_prepare() { - default - - eautoreconf - - # don't bleed user LDFLAGS into pkgconfig files - sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die - - # Needed for udev rules generation/installation - multilib_copy_sources -} - -src_configure() { - # From Fedora - append-flags -fno-strict-aliasing - multilib-minimal_src_configure -} - -multilib_src_configure() { - # the blank is intended - an empty string would result in building ALL backends. - local lbackends=" " - - use gphoto2 && lbackends="gphoto2" - use v4l && lbackends+=" v4l" - use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl" - local backend - for backend in ${IUSE_SANE_BACKENDS[@]} ; do - if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then - lbackends+=" ${backend}" - fi - done - - local myconf=( - $(use_with usb) - $(multilib_native_use_with snmp) - - $(multilib_native_use_with sane_backends_escl poppler-glib) - # you can only enable this backend, not disable it... - $(usex sane_backends_pnm --enable-pnm-backend '') - $(usex sane_backends_mustek_pp --enable-parport-directio '') - ) - - if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then - myconf+=( sane_cv_use_libieee1284=no ) - fi - - # relative path must be used for tests to work properly - # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory - # that break in many ways, bug #636202, #668232, #668350 - # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html - myconf+=( - --enable-ipv6 - --disable-locking - $(use_with gphoto2) - $(multilib_native_use_with systemd) - $(use_with v4l) - $(use_enable threads pthread) - $(use_with zeroconf avahi) - ) - - ECONF_SOURCE="${S}" \ - SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ - BACKENDS="${lbackends}" \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - emake VARTEXFONTS="${T}/fonts" - - if tc-is-cross-compiler ; then - pushd "${BUILD_DIR}"/tools >/dev/null || die - - # The build system sucks and doesn't handle this properly. - # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ - -I. -I../include -I"${S}"/include \ - "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ - "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die - local dirs=( hal hotplug hotplug-ng udev ) - local targets=( - hal/libsane.fdi - hotplug/libsane.usermap - hotplug-ng/libsane.db - udev/libsane.rules - ) - mkdir -p "${dirs[@]}" || die - emake "${targets[@]}" - - popd >/dev/null || die - fi - - if use usb ; then - sed -i -e '/^$/d' \ - tools/hotplug/libsane.usermap || die - fi -} - -multilib_src_install() { - emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ - docdir="${EPREFIX}"/usr/share/doc/${PF} - - if multilib_is_native_abi ; then - if use usb ; then - insinto /etc/hotplug/usb - doins tools/hotplug/libsane.usermap - fi - - insinto "/usr/share/pkgconfig" - doins tools/sane-backends.pc - - # From Fedora and Arch, prevent permission conflicts - # https://github.com/OpenPrinting/cups/issues/314 - # https://gitlab.com/sane-project/backends/-/issues/546 - # - # Generate udev udev+hwdb, not needing scanner group - install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die - tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die - tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die - # generate udev hwdb - install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die - tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" - # NOTE: an empty new line is required between the two .desc collections - printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die - tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die - # udev rule for saned (SANE scanning daemon) to be able to write on usb port - udev_newrules "${FILESDIR}/66-saned.rules-r1" 66-saned.rules - fi -} - -multilib_src_install_all() { - dodir /etc/env.d - - if use systemd ; then - systemd_newunit "${FILESDIR}"/saned_at.service-r1 "saned@.service" - systemd_newunit "${FILESDIR}"/saned.socket saned.socket - fi - - if use usb ; then - exeinto /etc/hotplug/usb - doexe tools/hotplug/libusbscanner - newdoc tools/hotplug/README README.hotplug - fi - - dodoc NEWS AUTHORS PROBLEMS README README.linux - find "${ED}" -name '*.la' -delete || die - - if use xinetd ; then - insinto /etc/xinetd.d - doins "${FILESDIR}"/saned - fi - - newinitd "${FILESDIR}"/saned.initd saned - newconfd "${FILESDIR}"/saned.confd saned -} - -pkg_postrm() { - udev_reload -} - -pkg_postinst() { - udev_reload - - optfeature "Network scanner backend" media-gfx/sane-airscan - optfeature "Epson-specific backend" media-gfx/iscan - optfeature "HP-specific backend" net-print/hplip - - if use xinetd ; then - elog "If you want remote clients to connect, edit" - elog "/etc/sane.d/saned.conf and /etc/hosts.allow" - fi -} diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild index 2b69e30c7d17..cec6801c00ca 100644 --- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild @@ -3,11 +3,19 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) # python-any-r1 required for a script in backends/pixma/scripts/ inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" +SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/${P}.tar.gz" + +LICENSE="GPL-2 public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + # gphoto and v4l are handled by their usual USE flags. # The pint backend was disabled because I could not get it to compile. IUSE_SANE_BACKENDS=( @@ -122,14 +130,6 @@ REQUIRED_USE=" sane_backends_mustek_usb2? ( threads ) " -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.sane-project.org/" -SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/${P}.tar.gz" - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build RDEPEND=" acct-user/saned @@ -164,13 +164,11 @@ RDEPEND=" xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} dev-libs/libxml2 v4l? ( sys-kernel/linux-headers ) " -BDEPEND=" - ${PYTHON_DEPS} +BDEPEND="${PYTHON_DEPS} dev-build/autoconf-archive sys-devel/gettext virtual/pkgconfig -- cgit v1.2.3