diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /media-gfx/inkscape | |
parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) |
gentoo resync : 28.04.2019
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r-- | media-gfx/inkscape/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch | 44 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-0.92.4.ebuild | 1 |
3 files changed, 47 insertions, 1 deletions
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 80c0fb4ad568..88c28ed1ad5f 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -5,9 +5,10 @@ AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4 AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2 AUX inkscape-0.92.3-freetype_pkgconfig.patch 948 BLAKE2B 4a21ed3ef6c002a6fd756b31989d531f94f0bbf2c9bad2ac5fdb453f8a1a5c169e71d7ef5d71ca55072f76fd31646589a62c06b5d44809f6ef873cbe1edca1f9 SHA512 95a265b0e7e9fda74a9bcf31eb6d23afead4c71567126ca893b75c0dcc87f5b03e38c30e2917b4278dbf4fcaf35c2b3fe7a1b509a43b19212c814a2a2b9de53d +AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698 DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab587c677907588678222f53bc8305b9adf399b8237e8ac3e169a22a39e33a50f5e517ea4122d736134dfaf5bd675fb34e5c168eb42e30 SHA512 8254d5cc0651bc6ed389f4610aac5ed9451b8c662e82b5c0f9aa221be748f4cd2075a41234c2516a98159cbd3e23c9ada3d519edbe69f05bab418d2fb1af2ffa DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 EBUILD inkscape-0.92.3-r1.ebuild 4183 BLAKE2B 074d57b407abdc33e616d7d6229b9b7db12fc6ed6c5278797bd62296403815d6900081c5fd5adaf20ba4a12bdaf083314531ecb8f10212f51e9ae8293d113ada SHA512 09ec9080cc60458b98deaeda24ec08b27200db024f3f34270264576b4edb9d3a6beb241de0c0a2ff5d019e072538c7279385b0a242dae007d41395de5032a6c9 -EBUILD inkscape-0.92.4.ebuild 3785 BLAKE2B 84189598db59c7d51780eb3c664cc7796be22f176655d8ad36f4a7cfe72581bcb4872603d78f861c7c66a29b20574f736a18f0ce26458f2d283404ef7b730a62 SHA512 8e2cded9dc358b1b864b07003a3e134aca4c0bac6ba07818879339dd1586564478e08ad9d1e4b51339513401c99c5b68b19ea70b89747e41c507a25b41bea633 +EBUILD inkscape-0.92.4.ebuild 3842 BLAKE2B 65915e0d0f058d6eea2a5e404604ba0eb1d466ce0874e502815109e0874e6fe1a7164bb7deeb2b4bfc63e5cd4becd7c9b87986a8af8e560b4dfda007268b6bac SHA512 095f5e03f7228da21d9a230ad9764f9dc54395bc04a9c9a7c9cbc7026f85a4b5c431add5275ac52c0d03467300935c27347c0e2cc869f671b6cfaa192ffd2418 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch new file mode 100644 index 000000000000..11383d9aa338 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch @@ -0,0 +1,44 @@ +From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001 +From: Marc Jeanmougin <marc@jeanmougin.fr> +Date: Wed, 24 Apr 2019 14:11:26 +0200 +Subject: [PATCH] Tentative fix for poppler 0.76 + +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- + src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 2981d6ee51..ddbff7671f 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { + error(errInternal, -1, "Weird page contents"); + return; + } +- parser = new Parser(xref, new Lexer(xref, obj), gFalse); ++ parser = new _POPPLER_NEW_PARSER(xref, obj); + go(topLevel); + delete parser; + parser = NULL; +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 6e4dde7dee..21a60702fa 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -3,6 +3,13 @@ + + #include <glib/poppler-features.h> + ++#if POPPLER_CHECK_VERSION(0, 76, 0) ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) ++#else ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) ++#endif ++ ++ + #if POPPLER_CHECK_VERSION(0, 72, 0) + #define getCString c_str + #endif +-- +2.18.1 + diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild index b4bddca2ef6f..7d775127ec30 100644 --- a/media-gfx/inkscape/inkscape-0.92.4.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild @@ -97,6 +97,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.91_pre3-exif.patch" "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" "${FILESDIR}/${PN}-0.48.4-epython.patch" + "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 ) S="${WORKDIR}/${MY_P}" |