inkscape inkscape: adding poppler-0.8.3.patch (thanks gentoo fix to their bug #224883)

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2040 370017ae-e619-0410-ac65-c121f96126d4

3 files changed, 71 insertions, 2 deletions

diff --git a/media/gfx/inkscape/Manifest b/media/gfx/inkscape/Manifest
index 3486d2ec..f2a9f129 100644
--- a/media/gfx/inkscape/Manifest
+++ b/media/gfx/inkscape/Manifest
@@ -1,4 +1,6 @@
 DIST inkscape-0.46.tar.gz 18615326 MD5 3bae9034047379012127e52f9b138d32 SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a SHA512 279fc80dc0e8b46530353619457f26ea2cfd00ec4a9a45456c66a6a454784394484a059e191a565777b39110e6f8842a546c8bb518b91b25c91726b60fbd505c RMD160 449e07fa4caa71f20025774353d19cad674631ac
-MKBUILD inkscape.mkbuild 4721 MD5 cb52a0e078dd3f20b1dd234988b12be0 SHA1 a7c70bda1670dfdcfc684726d8f74f8b3ea86262 SHA256 fba82ca6429ac01721447e4ec33099d548aa7fd9e5c200dfb9afb0403b1e4e7e SHA512 6cb805ba3a420d745db0ba8468d56798ff99a26281a018d86902dd0639af84afe5a7eef65faa919be06da1300d2a38823080ade087c11c76f22e0bf8f4721249 RMD160 f134afce6a31daa767dffa70f5ab015b57a28923
+MISC inkscape-0.4.6.diff 1571 MD5 fffe7ed73bdadcf0f90282d5afc4df30 SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c SHA512 c0ff0125659f74d5047ea4e6c8bbc37a52f6c5dd75bced13ad93c2a82b1ca0969c64a65732f540699fa38a648ed39eefeb9660b493ff991604541657fab3499a RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba
+MKBUILD inkscape.mkbuild 4721 MD5 0ff562f12f4147e0c7b90ffc400d0ebe SHA1 c1a919c04ea0c6641aa1374ba1fbfde565e12ede SHA256 d625e267d038441ccb6d235fb03af66137c856c379aad82c2a0d6ee9af4741e6 SHA512 836314ef8c783867a0115869ab719a9d600ae18fda660af778d4ac01b1c81a8533c6d94ae5a58b4a3886ac5eea7fa574f7b367e2da3bf66de0cff8d3507c13b3 RMD160 206b3d2c1814a2196c584dffaac84bccf49deac5
+PATCH inkscape-0.4.6.diff 1571 MD5 fffe7ed73bdadcf0f90282d5afc4df30 SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c SHA512 c0ff0125659f74d5047ea4e6c8bbc37a52f6c5dd75bced13ad93c2a82b1ca0969c64a65732f540699fa38a648ed39eefeb9660b493ff991604541657fab3499a RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba
 SLACK-REQUIRED slack-required 195 MD5 f51bb1179ebcc7ce1565e15ef356bd3d SHA1 87e66c153cf0848645bdb0a3123bf2eb2dc5e2e5 SHA256 7f30ea4811cdb5d750b60a93a183ccd3e0f321520c4912f02d5d29590b7c6e1b SHA512 dca8465d1867aafa71b24fc0fbb1140db77b91a1160149ab6902549c0d3d4628d754ca6c94e1bf2240de2c1ee6583bbb3862825a694c537dfd64db1f0cdeda2a RMD160 f4a07ad0e8d39d7c616ef6541b03c200b1cd1f96
-SLACKBUILD inkscape.SlackBuild 8611 MD5 4424b4fcd2e8d6e553519eb89b7ae80a SHA1 1578cf9cf798bcbe9ea4ca936beb2fdb39b10b07 SHA256 e3304fcc2e1622a29cca658c277ba0f985fbb25fd0c44faf1fc2e6c47abfa52e SHA512 f4eecf832a54eb1fcbccdedba0a4c378c3b4dd09a0a29d905e0e95517b5861d401713416a14032ef3cddfa7d3fca9adddb24d0aa9ef966ac2aba1b054387d9ce RMD160 ffd3224fbe1d5eb23289db8f40fd421fb98bff81
+SLACKBUILD inkscape.SlackBuild 9589 MD5 6ff965fb41e0dca11c179fa5474b1d94 SHA1 d9d41d7ee07c97418e41309fad373bfd94a91e2c SHA256 d18bbfd18835b6f8a4a670db1822e94ee33c6afc9c5d93415083ffc3323cb28b SHA512 066407fea4fce6a28887850e20af4f6203ddfd013580107d63efbc03e3eaf164c01ed1d935e60445a2cbaa09b11f38a3464ce7f90bc25c7f557108b76f25e259 RMD160 2bcf7719a01dae3d74a8a9000ae5edf467ae94a2
diff --git a/media/gfx/inkscape/inkscape-0.4.6.diff b/media/gfx/inkscape/inkscape-0.4.6.diff
new file mode 100644
index 00000000..70f9a16a
--- /dev/null
+++ b/media/gfx/inkscape/inkscape-0.4.6.diff
@@ -0,0 +1,42 @@
+diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp
+--- inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:26:20.000000000 +0200
++++ inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:51:47.000000000 +0200
+@@ -2194,11 +2194,11 @@
+ void PdfParser::doShowText(GooString *s) {
+   GfxFont *font;
+   int wMode;
+   double riseX, riseY;
+   CharCode code;
+-  Unicode u[8];
++  Unicode *u = NULL;
+   double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
+   double originX, originY, tOriginX, tOriginY;
+   double oldCTM[6], newCTM[6];
+   double *mat;
+   Object charProc;
+@@ -2242,11 +2242,11 @@
+     oldParser = parser;
+     p = s->getCString();
+     len = s->getLength();
+     while (len > 0) {
+       n = font->getNextChar(p, len, &code,
+-			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
++			    &u, &uLen,
+ 			    &dx, &dy, &originX, &originY);
+       dx = dx * state->getFontSize() + state->getCharSpace();
+       if (n == 1 && *p == ' ') {
+ 	dx += state->getWordSpace();
+       }
+@@ -2291,11 +2291,11 @@
+     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
+     p = s->getCString();
+     len = s->getLength();
+     while (len > 0) {
+       n = font->getNextChar(p, len, &code,
+-			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
++			    &u, &uLen,
+ 			    &dx, &dy, &originX, &originY);
+       
+       if (wMode) {
+ 	dx *= state->getFontSize();
+ 	dy = dy * state->getFontSize() + state->getCharSpace();
diff --git a/media/gfx/inkscape/inkscape.SlackBuild b/media/gfx/inkscape/inkscape.SlackBuild
index 8a07c74e..2875bcc8 100755
--- a/media/gfx/inkscape/inkscape.SlackBuild
+++ b/media/gfx/inkscape/inkscape.SlackBuild
@@ -192,6 +192,31 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA
 PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
+# Patch source
+patches=" [[PATCH URLS]]
+         $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
+         $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
+for patch in $patches; do
+  patch="`basename $patch`"
+  if [ -f "$CWD/$patch" ]; then
+    patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
+  elif [ -f "$CWD/patches/$patch" ]; then
+    patch -Np1 < "$CWD/patches/$patch" || exit $ERROR_PATCH
+  elif [ -f "$CWD/$patch.gz" ]; then
+    gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
+  elif [ -f "$CWD/patches/$patch.gz" ]; then
+    gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
+  elif [ -f "$SRC_DIR/$patch" ]; then
+    if [ "`basename $patch .gz`" != "$patch" ]; then
+      gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
+    elif [ "`basename $patch .bz2`" != "$patch" ]; then
+      bzip2 -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
+    else
+      patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
+    fi
+  fi
+done
+
 # Configure
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \