From 27661e900bfa74ab8d88d283b9b56b92db1db638 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Apr 05 2008 21:34:23 +0000
Subject: Merge from devel for LaTeX fix


---

diff --git a/inkscape-0.46-fixlatex.patch b/inkscape-0.46-fixlatex.patch
new file mode 100644
index 0000000..379ec6b
--- /dev/null
+++ b/inkscape-0.46-fixlatex.patch
@@ -0,0 +1,42 @@
+Patch to fix #441017: LaTeX rendering nonfunctional in Inkscape 0.46.
+
+First hunk is from Stéphane Bonnet, thanks!
+http://launchpadlibrarian.net/12978623/eqtexsvg.py.patch
+
+Second hunk is from here, unlike Ubuntu we support -quiet though
+https://bugs.launchpad.net/inkscape/+bug/195052/comments/1
+
+--- inkscape-0.46/share/extensions/eqtexsvg.py.orig	2008-04-05 22:12:35.000000000 +0200
++++ inkscape-0.46/share/extensions/eqtexsvg.py	2008-04-05 22:14:04.000000000 +0200
+@@ -49,16 +49,18 @@ def svg_open(self,filename):
+     doc_sizeW = max(doc_width,doc_height)
+ 
+     def clone_and_rewrite(self, node_in):
+-        if node_in.tag != 'svg':
+-            node_out = inkex.etree.Element(inkex.addNS(node_in.tag,'svg'))
++        in_tag = node_in.tag.rsplit('}',1)[-1]
++        if in_tag != 'svg':
++            node_out = inkex.etree.Element(inkex.addNS(in_tag,'svg'))
+             for name in node_in.attrib:
+                 node_out.set(name, node_in.attrib[name])
+         else:
+             node_out = inkex.etree.Element(inkex.addNS('g','svg'))
+         for c in node_in.iterchildren():
+-            if c.tag in ('g', 'path', 'polyline', 'polygon'):
++            c_tag = c.tag.rsplit('}',1)[-1]
++            if c_tag in ('g', 'path', 'polyline', 'polygon'):
+                 child = clone_and_rewrite(self, c)
+-                if c.tag == 'g':
++                if c_tag == 'g':
+                     child.set('transform','matrix('+str(doc_sizeH/700.)+',0,0,'+str(-doc_sizeH/700.)+','+str(-doc_sizeH*0.25)+','+str(doc_sizeW*0.75)+')')
+                 node_out.append(child)
+ 
+@@ -110,7 +112,7 @@ class EQTEXSVG(inkex.Effect):
+ 
+         os.system('dvips -q -f -E -D 600 -y 5000 -o ' + ps_file + ' ' + dvi_file)
+         #os.system('cd ' + base_dir)
+-        os.system('pstoedit -f plot-svg -dt -ssp ' + ps_file + ' ' + svg_file + '> ' + out_file)
++        os.system('pstoedit -quiet -f plot-svg -dt -ssp ' + ps_file + ' ' + svg_file + '> ' + out_file)
+         svg_open(self, svg_file)
+ 
+         clean()
diff --git a/inkscape.spec b/inkscape.spec
index 7fd2b02..b885c31 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.46
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -10,6 +10,7 @@ Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.
 Patch0:         inkscape-16571-cxxinclude.patch
 Patch1:         inkscape-0.45.1-desktop.patch
 Patch2:         inkscape-0.46pre2-icons.patch
+Patch3:         inkscape-0.46-fixlatex.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,6 +66,7 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
 %patch0 -p1 -b .cxxinclude
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .icons
+%patch3 -p1 -b .fixlatex
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
 dos2unix -k -q share/extensions/*.py
@@ -124,6 +126,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Sat Apr 05 2008 Lubomir Kundrak <lkundrak@redhat.com> - 0.46-2
+- Fix LaTeX rendering, #441017
+
 * Tue Mar 25 2008 Lubomir Kundrak <lkundrak@redhat.com> - 0.46-1
 - 0.46 released