diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
| commit | e9d044d4b9b71200a96adfa280848858c0f468c9 (patch) | |
| tree | 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /media-gfx/inkscape | |
| parent | fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff) | |
gentoo resync : 13.11.2021
Diffstat (limited to 'media-gfx/inkscape')
| -rw-r--r-- | media-gfx/inkscape/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch | 20 | ||||
| -rw-r--r-- | media-gfx/inkscape/inkscape-1.1.ebuild | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index bff735126361..435620453714 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,8 +1,9 @@ AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172 +AUX inkscape-1.1-poppler-21.11.0.patch 690 BLAKE2B 61fbaf22fa86170d1a72393795fb195b5c93d1c9f3e512751d4a9a355acda28656978529c1022caf9df701bc86e3c2b6e50b14eeed5d0c013013090b51ff6716 SHA512 9c7a312de85d11aa8ff3f7347a5c08ef84050522bc8ab59f9aa1aa84c405ddb707275cab7d447e34b1593d633b99fb8e482864e9397c576d688dcd7d34035c6d DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80 EBUILD inkscape-1.0.2-r2.ebuild 4143 BLAKE2B 3ed501bf97ae01e72dcd644110f2dab770757eac39f5ec10cb89f7900a55ead460b4f712a9dc0266fdadb297e7a063a245e4a24cf841b9619996886678f6843d SHA512 7c57ca4263c701aa524eb5de03900ca95ad5135a6acd1a5c041f23f8c459efc1086c6e8f74f599ff57ad8a215b0eabebd29e80e54b855a21e818ea5d9e3548dd -EBUILD inkscape-1.1.ebuild 4300 BLAKE2B 77b5e57c53d9801e3f999e469909e0088552c365d60fed0cf8db0c95cddb9d3912d2da1998f6a139e7284fbd08585bf4ec5c7729b6ed968c13f0f38fa152fb52 SHA512 dfbbae2a1149457ef4a460f4067f197fe77148d32833f8a85074aeb4f33437c38b0f645e5f4f1aa62a07c6e259ab942027a0e64204f0788b4e4dd6b0385dc302 +EBUILD inkscape-1.1.ebuild 4347 BLAKE2B f5a03371d34e26b31cc77520c6fb683a9a8d6ad77b4eb3e561d3a98b8102b9e3c8de5ec751f0885056426e93e4b97da67e4160de7fe3586cf6ea523ec3c0e076 SHA512 7954f86e87fb472dad59ed28858ee8b8e145ff9d03b4baad3d379f57059dd7f80967a4af8c87318cc8c6c5c5c125d0de69bff05ea63314c1a272a9183d5ea028 EBUILD inkscape-9999.ebuild 4222 BLAKE2B f81dc2dd761939360a098e581fe0ed6eed633b3a93ad8a3898490f04b6213b8d629fa8a32f15c9d1934c393dad8e6f999bf7470e0c3f0167e7066295f6fb6b2d SHA512 147de0d941987a6ff35e1a2fefc07457fd05097150509128cea74a09faf676ae419b41fe0a036e632c68be18a5380b2468c45567c9040eab5374ad56f2dd47ad MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0 diff --git a/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch new file mode 100644 index 000000000000..7b02253d5f9a --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch @@ -0,0 +1,20 @@ +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Mon, 1 Nov 2021 21:45:38 +0200 +Subject: [PATCH] Fix build with poppler 21.11.0 + +GfxFont::tag is now of type std::string instead of GooString *. +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) + } + if (printCommands) { + printf(" font: tag=%s name='%s' %g\n", ++#if POPPLER_CHECK_VERSION(21,11,0) ++ font->getTag().c_str(), ++#else + font->getTag()->getCString(), ++#endif + font->getName() ? font->getName()->getCString() : "???", + args[1].getNum()); + fflush(stdout); +GitLab diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild index e62f8efdec2c..e59037214266 100644 --- a/media-gfx/inkscape/inkscape-1.1.ebuild +++ b/media-gfx/inkscape/inkscape-1.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell static-libs svg2 visio wpg" @@ -110,6 +110,7 @@ pkg_pretend() { src_prepare() { # Backport from master eapply "${WORKDIR}/inkscape-1.1-musl/"*.patch + eapply "${FILESDIR}"/${P}-poppler-21.11.0.patch cmake_src_prepare sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die |