From 7b5ec70df28abac1695cf8091223a314ce0d1567 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Aug 14 2008 19:59:16 +0000
Subject: - Update to today's SVN snapshot

- Drop the upstreamed poppler patch

---

diff --git a/inkscape-0.46-poppler-0.8.3.patch b/inkscape-0.46-poppler-0.8.3.patch
deleted file mode 100644
index 9d4b027..0000000
--- a/inkscape-0.46-poppler-0.8.3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Inkscape 0.46 fails to compile with poppler-0.8.3 
-Filed upstream: https://bugs.launchpad.net/inkscape/+bug/237574
-
-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/inkscape.spec b/inkscape.spec
index 7c1b911..8f8639a 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.2.20080705svn%{?dist}
+Release:        0.2.20080814svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -12,7 +12,6 @@ Patch0:         inkscape-0.46-cxxinclude.patch
 Patch1:         inkscape-0.46+devel-desktop.patch
 Patch2:         inkscape-0.46+devel-icons.patch
 Patch5:         inkscape-0.46-gtk2.13.3.patch
-Patch6:         inkscape-0.46-poppler-0.8.3.patch
 Patch7:         inkscape-0.46+devel-uniconv.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,7 +78,6 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .icons
 %patch5 -p1 -b .gtk2.13.3
-%patch6 -p1 -b .poppler-0.8.3
 %patch7 -p1 -b .uniconv
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
@@ -140,6 +138,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Thu Aug 14 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.3.20080814svn
+- Update to today's SVN snapshot
+- Drop the upstreamed poppler patch
+
 * Wed Aug 13 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.2.20080705svn
 - Rediff patches for zero fuzz
 - Use uniconvertor to handle CDR and WMF (#458845)
diff --git a/sources b/sources
index 56bc8d0..14f6b61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17af28857c3b07c08e87e0475c09d85c  inkscape-0.46+devel.tar.gz
+688fa4d72740e147d87e0dc30a7c4ca6  inkscape-0.46+devel.tar.gz