rpms/inkscape/devel inkscape-0.46-fixlatex.patch, NONE, 1.1 inkscape.spec, 1.51, 1.52

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21405

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.46-fixlatex.patch 
Log Message:
* Sat Apr 05 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-2
- Fix LaTeX rendering, #441017


inkscape-0.46-fixlatex.patch:

--- NEW FILE inkscape-0.46-fixlatex.patch ---
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()


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- inkscape.spec	25 Mar 2008 16:27:22 -0000	1.51
+++ inkscape.spec	5 Apr 2008 20:19:51 -0000	1.52
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Sat Apr 05 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-2
+- Fix LaTeX rendering, #441017
+
 * Tue Mar 25 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-1
 - 0.46 released