diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-09-02 10:16:02 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-02 10:16:02 +0100 |
commit | 02fbebe9426ee05ab39e9b5a56e3529e64160ef6 (patch) | |
tree | 4c2a5db6966711f46fbc73aece931b17625e27b7 /media-gfx | |
parent | b052fbf151106a4f47cac7fdf0ffff983decb773 (diff) |
gentoo auto-resync : 02:09:2022 - 10:16:01
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/Manifest.gz | bin | 38327 -> 38336 bytes | |||
-rw-r--r-- | media-gfx/gmic/Manifest | 7 | ||||
-rw-r--r-- | media-gfx/gmic/files/gmic-3.1.6-ar_so.patch | 26 | ||||
-rw-r--r-- | media-gfx/gmic/gmic-3.0.1-r1.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/gmic/gmic-3.1.6.ebuild | 7 | ||||
-rw-r--r-- | media-gfx/gmic/metadata.xml | 2 | ||||
-rw-r--r-- | media-gfx/inkscape/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch | 73 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-1.2.1.ebuild | 4 | ||||
-rw-r--r-- | media-gfx/openscad/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/openscad/openscad-2021.01-r4.ebuild | 2 |
11 files changed, 116 insertions, 12 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 94eb9711717c..114f20dfa912 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index 7723480091dd..3f6e28ea4062 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,9 +1,10 @@ AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96 AUX gmic-3.0.1-openexr-3-imath.patch 1051 BLAKE2B 03d1cd6be5c5af76b6ecb071b46ee20abc4bd05d055fcd3ee21943ae5821c8c41e080b20d054b2f5e53cfbeb7326b8af6fa599182cdfd5e47679a57b47fa2f1d SHA512 83e9ec847328eef9f275f747ca6d2ac1071151cc7eb62ad70fa9de121d790e45d60514993274a44fe980537a793eaa56d397da5e207355fa2c9723bdafe7ff88 +AUX gmic-3.1.6-ar_so.patch 758 BLAKE2B 95031f8c3af292ef91d5cdf94406db158c74864c644571ad98630f9b3bd57d816c512a103cf6dd2adc86aa859d06bf73b3596f0c789d3e0d373f0ae0a7a6505f SHA512 19b424e189ddd3b3660a8a80821a907de86f79f22f6014f9af9f8f895bdef0e61c023b9d6859370bfec018274bacf3d13a0da5addf62430b6020f290ccca3f6f AUX gmic-3.1.6-makefile_automagic.patch 5378 BLAKE2B 161a06be29e9dc4ac9d4f6234d0da70831c2fd4be4f5f849a16957afee8b4436644591f0f5aecfdfb2b3b33b8ac4f65b8daa966afeb4ee97d340290fce83bfda SHA512 79157c017566e4d0b277169e9356dfaf71c2b46b7e70aa6c6bcc81c664006524bc8b2a86be83e88a1128c3dc527e294b5ea2a685d924975b8a22161e9adc6df0 AUX gmic-3.1.6-relative_rpath.patch 400 BLAKE2B 0f457f585d7efde1b05937f1baa240f6fd4590a3c05c2d988e88d8ee62e79c8ac39adb92bee247dcb999ef7654bf9c558802781e9933cb6de4b078cfe7b06ab9 SHA512 1c7da7542005d76f67a553ddec1d9291e34ff99adad3aae6c9761dde8aa93bba8f79eb388072fd43976ae4e45bae066d4726d642698bce36aafbca5dbae009b0 DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 -EBUILD gmic-3.0.1-r1.ebuild 4192 BLAKE2B e9da6acf816933b7a0e7becbe3f78dce521a05838ca397fc5e1d29154fa975eaa60cc9ca3fcd8c6287b1eac442382792dc4c1acf66a4376e7aa21968e74b1a9e SHA512 db4b500e695e6cc80b1b5b0df04659acf60e7018cf50f2c6a97fa325b070e20bdf180aaa46e1a693cab485cc00a1823cce1943306f4b9ed97d261bc490464684 -EBUILD gmic-3.1.6.ebuild 3471 BLAKE2B 3160f9ad8eaff999ebbf215bb5e94edaad9dec21effb257491dec57555895658287a90335a15064eb8cb94264b9d2ca84a045499d49e26803097688ee6550b82 SHA512 7400b70db9ea9f4a769a9be3ab045582627bc127aeb59011102531ca120327793604e58a7765228b14aef2de6e945cfa84376086de4fdd1ab014d2a6607bb259 -MISC metadata.xml 466 BLAKE2B aef1ab7a346d34ebdba8f6e09298d1bd96ed2771307fbd3e3cc15ed0774da1c29be9a3b260b9a7c287ce904685f708e56d59953fb92bf4d93d52227614f3c148 SHA512 755bfb920c6baa950716dff8a345540a730b1c6d179837d81ce1e1a3dcdc826665b61f9da8dcd007c44893f3310ace5dfe2a976a80926ab96170cb84a3f3555c +EBUILD gmic-3.0.1-r1.ebuild 4192 BLAKE2B b1f7b571f62257356eea906881ad631cd3f8bbb50c46848f7c4cb789210db834596c4a79042e98e9eda439a09c90238c411818abd6e6a32bb77c48aecdf526e5 SHA512 9ac13ce1dfa332573c7fe86aa21782e7035de7131226d5123e7fc3e882e959bd17d52b5b02bf02eabdd04f4602e54521e179a832fba3aad0a5d8f4140b05f9f4 +EBUILD gmic-3.1.6.ebuild 3410 BLAKE2B ad047dfb67351f2dc6eea2345ce9f06f08d27525f9a4f351706f36b5aec7cc1b534a241cc2406c4aec1d9136e0cb18ca39b0d08bab2478707ecbf9182618e837 SHA512 6aafd1b811f82126ddf27b10c4d8f106c60d05aa59848664f0d2a9d8f8b97ad140ad0f8c14b262110d9175d2b7ba5ca2ee01e79ff0ed39e0a9bf0f332e1de59f +MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530 diff --git a/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch b/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch new file mode 100644 index 000000000000..007cdfb50de5 --- /dev/null +++ b/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch @@ -0,0 +1,26 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -414,7 +414,6 @@ + _lib : libgmic.so use_libgmic + + libgmic.so: libgmic.o +- ar rcs libgmic.a libgmic.o + ifeq ($(OS),Darwin) + $(CXX) -shared -std=c++11 -pedantic -o libgmic.so.$(VERSION) libgmic.o $(LIBS) + else +@@ -508,7 +507,6 @@ + @echo " done!" + + libcgmic.so: libcgmic.o +- ar rcs libcgmic.a libcgmic.o + ifeq ($(OS),Darwin) + $(CXX) -shared -o libcgmic.so.$(VERSION) libcgmic.o libgmic.o $(LIBS) + else +@@ -558,7 +556,6 @@ + _libc_static: libcgmic_files libcgmic_static.so use_libcgmic_static + + libcgmic_static.so: libcgmic_static.o +- ar rcs libcgmic_static.a libcgmic_static.o + ifeq ($(OS),Darwin) + $(CXX) -shared -static -o libcgmic_static.so.$(VERSION) libcgmic_static.o libgmic.o $(PIC) $(CFLAGS) $(LIBS) + else diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild index 7ab9e4589957..1136691482d8 100644 --- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild +++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild @@ -14,7 +14,7 @@ else fi DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic" +HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic" LICENSE="CeCILL-2 GPL-3" SLOT="0" diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild index 06ca0c8a4cc3..936aba83276c 100644 --- a/media-gfx/gmic/gmic-3.1.6.ebuild +++ b/media-gfx/gmic/gmic-3.1.6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit bash-completion-r1 toolchain-funcs +inherit toolchain-funcs if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/dtschump/gmic.git" @@ -14,7 +14,7 @@ else fi DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic" +HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic" LICENSE="CeCILL-2 GPL-3" SLOT="0" @@ -66,6 +66,7 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}"/${PN}-3.1.6-ar_so.patch "${FILESDIR}"/${PN}-3.1.6-makefile_automagic.patch "${FILESDIR}"/${PN}-3.1.6-relative_rpath.patch ) @@ -100,8 +101,6 @@ gmic_emake() { $@ } -# FIXME: -# - honour user CFLAGS while building C binaries (i.e. 'use_libcgmic') src_compile() { gmic_emake lib libc use cli && gmic_emake cli_shared diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml index d725eae2d066..28dae0feb98a 100644 --- a/media-gfx/gmic/metadata.xml +++ b/media-gfx/gmic/metadata.xml @@ -10,6 +10,6 @@ <flag name="opencv">Enable support for webcams using the OpenCV library</flag> </use> <upstream> - <remote-id type="github">dtschump/gmic</remote-id> + <remote-id type="github">GreycLab/gmic</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 2b86bb08cb0b..5c2b22898b89 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -3,6 +3,7 @@ AUX inkscape-1.1.2-automagic-libX11.patch 6042 BLAKE2B 6a59ac91e4e867fddc4cb4cba AUX inkscape-1.1.2-poppler-22.03.0.patch 1782 BLAKE2B 0cad51f92dd5427a07d8602237cec4937764e28be627a70e97a24535de2732dad7a15e7f0d0dd8b91f574e0a01aeced57d7dc54db7b340733f5395d14d6ab70d SHA512 5e04dfdffdca6acf18f869c6c385d808680261f3cbceb67a7dc3473bcef58c8e893ee7646f8b4027cb1287687dc6bff14fe6f9f3cdb32e5de91cc722b339be95 AUX inkscape-1.1.2-r1-poppler-22.03.0.patch 1866 BLAKE2B f3f6ce5b6c5677999583af698b3984973b144125cad1801e33c4cce0b5f66739d7e3c178e27b2837da3a8dc8c5c1077c7f5d4afa1d62f76a99bbb1288e5b7933 SHA512 f2bec4d41ec707ac9617a59b02697c84c8a70ba96ee6efff39172ec54e16403a5416eb3f05590d3e23426168ad7307121739ae5ec5f99065e23b447e4de8fa2c AUX inkscape-1.1.2-r1-poppler-22.04.0.patch 4538 BLAKE2B bf60575e86dbfb3f483dc17c17f7cc42f9b947e64849b126a5fc4063036cfc14e93dcb2b2a6b16cf219033e59f890b0e4e58fe0014a382b77f056d87121355ff SHA512 043e2e85fecd8c657828871067801096e289a2b40c367c113047c0ec3a90b85436b6ca15df1a6cf8fef1a11e683033afda42098dc97b686d2d3ec7cd3a52e7af +AUX inkscape-1.2.1-poppler-22.09.0.patch 3123 BLAKE2B 9186cf3993059551c94d25aa613cc5a0a8790c04369aae76ae87f3acc6303e56443c77358f0de792d42cea689d65ef7d89b252dee87f20e47f60954c34c44e3f SHA512 0fb1bf88795669cb106b670363c66d728ec0cfe97ec549050bc3156e737b6d1358f4255459bd99165db9d98364b8924906af8d20a40beca76eb4be997dde040c DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668 DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16 @@ -15,6 +16,6 @@ EBUILD inkscape-1.1.2-r1.ebuild 4770 BLAKE2B f70037c5c2596f16e47058ca58964616b2f EBUILD inkscape-1.1.2-r2.ebuild 4972 BLAKE2B 26ef9465a2b40fd9bfcd0c9af8bf11bad6b2e1af11826c68c9d0f61679df79520401fbf45199e3a5ab1b29330abe33558d00574aa264722388acaf79eb7ffb23 SHA512 dd05eba12d4aa8c97eda4d828db6d00930aa6b56bd908e11f15ee129c5cf8a4863902d2692c06cc8cefdb37b9173a4793033821bd9647ddac8808237d28fcfff EBUILD inkscape-1.1.2.ebuild 4645 BLAKE2B 0777360387987f1b86b82c25b2d8e72ebb589b57554aa0b610c1f567fb7a46508008b1de7b41a9fe7061a8a77490b3c98f4ab9800bbab61b4d29dba08e223d7a SHA512 d1f2601504f58e82f92ae7ce19c0d745ec3ffeb631d9b0f21f67b621eb0b403f7f22d427e5911c220fc7bb7f8ac937dc44e6b3acbdd594a855534002fb4c89f7 EBUILD inkscape-1.2-r1.ebuild 5106 BLAKE2B 11ff95ce9b484bc2dcaf181e9ee036dfba42f4721c5098149e549814b9542d1cc9de9415f726f5bb7b0f415b4067147d8ee4e37ebc0734eefe253a41bd8f4ba9 SHA512 e6d86169f7349b2fb55fff18f91e12509bee229d27db2c0173a77ff5b1a7cecab2858bbaf6fb03d4c63b73b2aaf3fa12d555f59fa22d87efb01c56312735cc3c -EBUILD inkscape-1.2.1.ebuild 5138 BLAKE2B 011bb3cd383c4199483a129ab41e689873e7c0a05fe90ae96f09984fe7c81dbe2b6a86f183de648b66e9a43b012354ca8c805eb5365cfac54e2176903efac966 SHA512 da85491e40f939a1817af9a2b8a1bf0dd0c1699ec6b02254db8b5776d6a66e9ff2dd5191560ce83c1d9b693c6c0144f586b66d64045598b1d427f54937ff21cf +EBUILD inkscape-1.2.1.ebuild 5200 BLAKE2B b36546e469f4ae1cd3204b2619095b4fc36bfcc06a17ae932c8abc004f1b482a99c8c8b50419e9168889eb807daea45ec01a8058abb8708f7b615ab1d129f1eb SHA512 d6debcb97e3faf9bda70a67a332986ef0b337162d83686305799a22360a13e0ad12c9ed2c59c807e3bfa1b5fed34103a5b0e89ee77dd17b5a5001b84eb3b5a55 EBUILD inkscape-9999.ebuild 5159 BLAKE2B 8d84de64f1f6103599d9618dbacc585650a0eb2c159ed614fcd185bdb7ba9eeaa797d85b257762bde898d452ae2263d736eb141b0270c040c72712760673c102 SHA512 fcaf708c9696d7e26827ece7f75de9288007670924f0f4921d777e830f959442514d5b8655eff0e70ce6bc19745e6b2fc74262ecd70cedffb2d9d25cd148bd53 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0 diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch new file mode 100644 index 000000000000..87583019d6e3 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch @@ -0,0 +1,73 @@ +https://gitlab.com/inkscape/inkscape/-/merge_requests/4719 + +From dce083204c62f1185ad079fc124f7fb40a1d0bb6 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Sep 2022 06:21:28 +0100 +Subject: [PATCH] Fix build with Poppler 22.09.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With Poppler 22.09.0, inkscape fails to build with: +``` +/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:394:23: error: no matching function for call to ‘GfxState::getLineDash(double**, int*, double*)’ + 394 | state->getLineDash(&dash_pattern, &dash_length, &dash_start); + | ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:44: +/usr/include/poppler/GfxState.h:1506:32: note: candidate: ‘const std::vector<double>& GfxState::getLineDash(double*)’ + 1506 | const std::vector<double> &getLineDash(double *start) + | ^~~~~~~~~~~ +[...] +/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/pdf-parser.cpp:700:21: error: no matching function for call to ‘GfxState::setLineDash(double*&, int&, double)’ + 700 | state->setLineDash(dash, length, args[1].getNum()); + | ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``` + +Poppler changed the getLineDash interface: +``` +- void getLineDash(double **dash, int *length, double *start) ++ const std::vector<double> &getLineDash(double *start) +``` + +... and the setLineDash interface: +```` +- void setLineDash(double *dash, int length, double start); ++ void setLineDash(std::vector<double> &&dash, double start); +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/) + _POPPLER_FREE(obj); + } + } ++#if POPPLER_CHECK_VERSION(22, 9, 0) ++ state->setLineDash(std::vector<double> (*dash, length), args[1].getNum()); ++#else + state->setLineDash(dash, length, args[1].getNum()); ++#endif + builder->updateStyle(state); + } + +--- a/src/extension/internal/pdfinput/svg-builder.cpp ++++ b/src/extension/internal/pdfinput/svg-builder.cpp +@@ -388,10 +388,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) { + sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str()); + + // Line dash +- double *dash_pattern; + int dash_length; + double dash_start; ++#if POPPLER_CHECK_VERSION(22, 9, 0) ++ const double *dash_pattern; ++ const std::vector<double> &dash = state->getLineDash(&dash_start); ++ dash_pattern = dash.data(); ++ dash_length = dash.size(); ++#else ++ double *dash_pattern; + state->getLineDash(&dash_pattern, &dash_length, &dash_start); ++#endif + if ( dash_length > 0 ) { + Inkscape::CSSOStringStream os_array; + for ( int i = 0 ; i < dash_length ; i++ ) { diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild b/media-gfx/inkscape/inkscape-1.2.1.ebuild index e2183428d93b..a0df591ee0d9 100644 --- a/media-gfx/inkscape/inkscape-1.2.1.ebuild +++ b/media-gfx/inkscape/inkscape-1.2.1.ebuild @@ -108,6 +108,10 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-1.2.1-poppler-22.09.0.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 4146c026432b..6d020c18fa39 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -9,6 +9,6 @@ AUX openscad-2021.01-Fix-build-issue-with-overloaded-join.patch 3336 BLAKE2B c92 AUX openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch 775 BLAKE2B eed37277c3e7ea84635c0b8cd02cc4ffde7abea78400ee39e67bcc782800197c57dae07a82084df47705951ced8968be78243a1d0e14a551783b8adcb669d43f SHA512 94306e68e53b01e799a5feb6f16a8f44c965a4b653b60227833013712f23648d20ac8272a7bfe38bde201af42946f91fe17231f120adfbe5b16e42b07d9f8d10 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128 EBUILD openscad-2021.01-r3.ebuild 2235 BLAKE2B b25634d8dfcefc9ba34f3a41033a95384a932147760d3f0c905d686a150188bbbc0b9d17958bb1d309785ecee2dd3d50228261431401a672f1ab68e8e3518e95 SHA512 4b7a65b0e9c32ce2d1d58b6850d06ff40564c1ed70e2ca832ff1dea86bb8b3503dd0b006a38962cdab3ae664f4686973d7136dfaa03021510c09a7ec071b8d9f -EBUILD openscad-2021.01-r4.ebuild 2749 BLAKE2B 8636fe2d543ab71c7b8e6952d28ba6aeb12bf7c693ab7d0d743e95c4c915e611da6aff313b61ac26249f264bc6b311743c910be423d6d50afd52a562b427bcf3 SHA512 502159ef50394ee7b4f7ee164bb1d053994622cec2487d8831f3466a09651f39fec53eecd663f4e9d0afc57b58d9a15ee0fde49e60f79be89833e50092e68239 +EBUILD openscad-2021.01-r4.ebuild 2748 BLAKE2B 46c396688866709ff0cafa95df8c20a8d89e97632d4b18471605d54d2016ad8f4fd72771e1749b09f396b60150617ab1a1a4dd37a04c79fb6f18f720af603011 SHA512 cbdc31e4d7a58941b5ed62c19626613d00e113a6da8f2e41fb141603174e502b0ff3f642dce1dbdf4fadf825e982fbb3924657735d8c36dba5c4f66892e7bb1c EBUILD openscad-9999.ebuild 2508 BLAKE2B f3842eee85e9da815b3dda59c553f4cd97193bd7732d2bd65820b7283a2e8699c352cf8643b67fc3c4e8e411628b2262998d65ede1ca1154c4c0cec3edcd4f5c SHA512 a214cdebcb5be8a052b78b9b34741cf0680d262ce07a740803ee9a351a63d0e0f03fd733d754c4cdc161ffa35e6713eb8cd2ffe7627014e0851d647360eeb418 MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1 diff --git a/media-gfx/openscad/openscad-2021.01-r4.ebuild b/media-gfx/openscad/openscad-2021.01-r4.ebuild index 1ce925d70618..c7456da4cd38 100644 --- a/media-gfx/openscad/openscad-2021.01-r4.ebuild +++ b/media-gfx/openscad/openscad-2021.01-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz - LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="emacs" # tests are not fully working and need cmake which isn't yet # officially supported. |