summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin41944 -> 41945 bytes
-rw-r--r--media-gfx/dawn/Manifest2
-rw-r--r--media-gfx/dawn/dawn-3.90b-r1.ebuild2
-rw-r--r--media-gfx/inkscape/Manifest3
-rw-r--r--media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch121
-rw-r--r--media-gfx/inkscape/inkscape-0.92.3.ebuild4
6 files changed, 127 insertions, 5 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index cb167ed92f8f..cfbce6ba9cda 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/dawn/Manifest b/media-gfx/dawn/Manifest
index 2e9193a4ea68..5c800789e6ce 100644
--- a/media-gfx/dawn/Manifest
+++ b/media-gfx/dawn/Manifest
@@ -1,6 +1,6 @@
AUX dawn-3.90b-gcc7.patch 513 BLAKE2B cf0e95894bbe85db5bfc45c1ef731dafd593c4531711bce931013b921a82b5306ca31e68dfd4f5a5b9fcf70b1bfc51f4b4c1a015725acaea6d7ac6703fb2cd8d SHA512 784659c383e1c240f5ea9def2bc39429fe726960356ca57ad07fc4e0415053f6bf9125a09ce54a1a1591b2ad9887dbc01619fa7f566d249d86767ed798f2345a
AUX dawn-3.90b-no-interactive.patch 5467 BLAKE2B 2d7bfe6cc17143dcd2c33492eb45a77ecc44bcad9685f147c4a69ad0ec6aecced69c9e9de6d27b66c2a6db57971019ce2fa7014e1e9d0a1a5e338bc79027254e SHA512 fa9be36122f1c97226c7096657c7b3fd43f23c30c2e7d3ecb0673aa09fc1327f86afe92abf26a078165ee959ee5edcfe77b628c614f92e56cc8ca91e6b612265
DIST dawn_3_90b.tgz 1334732 BLAKE2B 97f4e747b8f9d2eb60d9c8f0e7358fe549052e36a02127f02363c328775f33ae9fd36afd850ef06b365aaaa9723a541d89d7f2fccb37d1dd30f626054d7939b3 SHA512 5ff0b3572442ad1f435d5f894a0f1637efbc8eb3dae4f67dd456ff220a497cc59fe3bdf773cd38a0690d3689e9cda48f49c408ddab56f31efb9c87447d439fea
-EBUILD dawn-3.90b-r1.ebuild 1071 BLAKE2B 9b4aedf97dd297864285adbea88e2c1f67f7daabb52d8ffa149b82a5f10f2509dbb9a59f4ece69678f899f2a4be73f68187494ce22a189e2588d28146ca6232f SHA512 4d788eb2323670d98ece9508c6a8bb54dfb899a00962d654da21fb99276b8cee47c98ffcece8d05cffa2f9871c3051526709f5874ccbd53bedfffa7df7caa696
+EBUILD dawn-3.90b-r1.ebuild 1070 BLAKE2B fc32a8bbc1bb9c53514345b110a814ea33826edc100dbbcead03cc9079cd241d80e271b29445c1c9c164e4fdec88d3355688fdd82f074d7484046090b64be645 SHA512 eb42b1e670bfaf121802b51aca6f268dd6e93f97e78dc95e2c05a8802347b625542bdef620f7febc6cd8b893ec3968a5271dbb6de3887eeec2157beccfcbb96d
EBUILD dawn-3.90b.ebuild 1232 BLAKE2B f723d630092e5df1a4d37a5cddbfcea53123a5af42e7dd5e3634e27a1ca08a0677c0152cdac3173734a9c0791d534304c6cd52855b862c87637fd9336846a8fc SHA512 e7e40b06f1a6af969d985f22c79d6ecfa9006ac259a564dec9ec50471eca25dfc9bab6d042f7bc69554b684299a94f613541a97ee6eb88f46e7617a94aba5c74
MISC metadata.xml 1190 BLAKE2B 1d73439a17d21cf023760353df3691121b9c563264a7df26c17a04b5d1f56977faefcb9d3e289f494d6cffaa0c97bd4b444c463ff93d2b7217e34acf452e7b70 SHA512 e89f54b6c40745ace97ed1aa0acd4e3d7d7f69ef68883e17f43e9425016b7d883fee48e4d229543d99be1c66c274184f49c091ecc71cdf835a2b64e9016611d6
diff --git a/media-gfx/dawn/dawn-3.90b-r1.ebuild b/media-gfx/dawn/dawn-3.90b-r1.ebuild
index 12062962227b..8a48d386661e 100644
--- a/media-gfx/dawn/dawn-3.90b-r1.ebuild
+++ b/media-gfx/dawn/dawn-3.90b-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://geant4.kek.jp/~tanaka/src/${MY_P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
IUSE="doc opengl X"
RDEPEND="dev-lang/tk:*
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 123b4a1007fc..749b212cfab5 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 489 BLAKE2B 4f0e9dda521f21dc888267193ddba63ec89011cf8dbd32c0901991e58397f0c22134c1a7647239cb6bc26c4d45d5583bbaac83fb4a26681122cc8cf488a93a58 SHA512 da286f5eea8bdc443d0b4b3c2ffb6a403b4ea85f7f355545ea5dde05bb75e59e0a0bb42d28d5cbc77115acd2e0ebecf48536664a508ffb788c7f3e09a59557b4
+AUX inkscape-0.92.3-poppler-0.64.patch 4493 BLAKE2B 3ee9635cf8b287c1a530a8a70876c92c1e941e6d89a9a74e4f6bb3fdd445bc60a47c8adb6f567f8bc539241c0884ca093add00ede19dfba3220ffcccde0a5384 SHA512 dbfc28ec5dd7b96c7994ab57bcde95baa57ec600d2ec5458c242273407d822f0947d8fd2ef0ce7ac07125f108314a25eb1646aaad474fa150e3010031c1807bb
DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500
-EBUILD inkscape-0.92.3.ebuild 3930 BLAKE2B fe7b6e7abe4806624c35692799ffc5a93ce9dc5e52eeb37cc2eaec94ee00f3e1a3e3b71f5fba29a94107ea5174eae0cfdbaaa7e5751155fcae4ce01056fef5b2 SHA512 22355189fa8220e08d1120c830a58093bfe985a58bf739491e6ec23a9f421e3342fb5d2c9c6f6416b39926989167adfda32ea802b43803f7896b7d07f8eb596c
+EBUILD inkscape-0.92.3.ebuild 3911 BLAKE2B a351a676e95df783f9105922c90c89a9f68b2a81ec9e6cb516f943a4d6b5964c6eae212b2967aac4a6c1b37607df90da8f2fd9586c74249df315e29987c93a37 SHA512 c15f6a8b96b2eab7a4b2dc1bdd27104c048a6d5e43e0effdb987eeebda59e91cc14c2f47300128a620a1f53682724f6ec9b537b72dc18a44e992401811b1b103
MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch
new file mode 100644
index 000000000000..b31786add1b3
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch
@@ -0,0 +1,121 @@
+From f0697de012598ea84edafea9a326e5e101eccd2a Mon Sep 17 00:00:00 2001
+From: Eduard Braun <eduard.braun2@gmx.de>
+Date: Tue, 24 Apr 2018 19:18:26 +0200
+Subject: [PATCH] Fix compilation with poppler 0.64
+
+(cherry picked from commit a600c6438fef2f4c06f9a4a7d933d99fb054a973)
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 10 +++++-----
+ src/extension/internal/pdfinput/pdf-parser.h | 2 +-
+ src/extension/internal/pdfinput/svg-builder.cpp | 4 ++--
+ src/extension/internal/pdfinput/svg-builder.h | 3 +--
+ 4 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 604b7f8079..721524e10a 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2582,7 +2582,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
+ }
+ }
+
+-void PdfParser::doShowText(GooString *s) {
++void PdfParser::doShowText(const GooString *s) {
+ GfxFont *font;
+ int wMode;
+ double riseX, riseY;
+@@ -2601,7 +2601,7 @@ void PdfParser::doShowText(GooString *s) {
+ font = state->getFont();
+ wMode = font->getWMode();
+
+- builder->beginString(state, s);
++ builder->beginString(state);
+
+ // handle a Type 3 char
+ if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
+@@ -2631,7 +2631,7 @@ void PdfParser::doShowText(GooString *s) {
+ double lineX = state->getLineX();
+ double lineY = state->getLineY();
+ oldParser = parser;
+- p = s->getCString();
++ p = g_strdup(s->getCString());
+ len = s->getLength();
+ while (len > 0) {
+ n = font->getNextChar(p, len, &code,
+@@ -2686,7 +2686,7 @@ void PdfParser::doShowText(GooString *s) {
+
+ } else {
+ state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
+- p = s->getCString();
++ p = g_strdup(s->getCString());
+ len = s->getLength();
+ while (len > 0) {
+ n = font->getNextChar(p, len, &code,
+@@ -2732,7 +2732,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
+ {
+ Object obj1, obj2, obj3, refObj;
+
+- char *name = args[0].getName();
++ char *name = g_strdup(args[0].getName());
+ #if defined(POPPLER_NEW_OBJECT_API)
+ if ((obj1 = res->lookupXObject(name)).isNull()) {
+ #else
+diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
+index e28fecc2e1..f985b15cad 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.h
++++ b/src/extension/internal/pdfinput/pdf-parser.h
+@@ -287,7 +287,7 @@ private:
+ void opMoveShowText(Object args[], int numArgs);
+ void opMoveSetShowText(Object args[], int numArgs);
+ void opShowSpaceText(Object args[], int numArgs);
+- void doShowText(GooString *s);
++ void doShowText(const GooString *s);
+
+ // XObject operators
+ void opXObject(Object args[], int numArgs);
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index a448be6397..617861928d 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) {
+ GfxFont *font = state->getFont();
+ // Store original name
+ if (font->getName()) {
+- _font_specification = font->getName()->getCString();
++ _font_specification = g_strdup(font->getName()->getCString());
+ } else {
+ _font_specification = (char*) "Arial";
+ }
+@@ -1361,7 +1361,7 @@ void SvgBuilder::_flushText() {
+ _glyphs.clear();
+ }
+
+-void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) {
++void SvgBuilder::beginString(GfxState *state) {
+ if (_need_font_update) {
+ updateFont(state);
+ }
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index ad15c9c06f..ed2a4d48e0 100644
+--- a/src/extension/internal/pdfinput/svg-builder.h
++++ b/src/extension/internal/pdfinput/svg-builder.h
+@@ -29,7 +29,6 @@ namespace Inkscape {
+ #include <glibmm/ustring.h>
+
+ #include "CharTypes.h"
+-class GooString;
+ class Function;
+ class GfxState;
+ struct GfxColor;
+@@ -136,7 +135,7 @@ public:
+ void clearSoftMask(GfxState *state);
+
+ // Text handling
+- void beginString(GfxState *state, GooString *s);
++ void beginString(GfxState *state);
+ void endString(GfxState *state);
+ void addChar(GfxState *state, double x, double y,
+ double dx, double dy,
+--
+2.17.0
+
diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild
index cc1ee8f61d9e..97020416d36e 100644
--- a/media-gfx/inkscape/inkscape-0.92.3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild
@@ -11,8 +11,7 @@ MY_P="${P/_/}"
DESCRIPTION="A SVG based generic vector-drawing program"
HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
-https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
@@ -101,6 +100,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
"${FILESDIR}/${PN}-0.48.4-epython.patch"
"${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch"
+ "${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch"
)
S="${WORKDIR}/${MY_P}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 11:39:42 +0000