[arch-commits] Commit in inkscape/repos (12 files)

Jan de Groot jgc at archlinux.org
Sun Apr 12 10:22:18 EDT 2009


    Date: Sunday, April 12, 2009 @ 10:22:18
  Author: jgc
Revision: 35342

Merged revisions 35337 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/inkscape/trunk

........
  r35337 | jgc | 2009-04-12 13:56:15 +0000 (Sun, 12 Apr 2009) | 5 lines
  
  upgpkg: inkscape 0.46-11
      Disable gnome-vfs again, it does not crash without this anymore
  Synchronize patches with Fedora
  Enable python interpreter. Needs a fix in python itself (ln -s /usr/lib/libpython2.6.so /usr/lib/python/config/)
  Fix build with recent libpng versions
........

Added:
  inkscape/repos/extra-i686/inkscape-0.46-bitmap-fonts.patch
    (from rev 35337, inkscape/trunk/inkscape-0.46-bitmap-fonts.patch)
  inkscape/repos/extra-i686/inkscape-0.46-colors.patch
    (from rev 35337, inkscape/trunk/inkscape-0.46-colors.patch)
  inkscape/repos/extra-i686/inkscape-0.46-desktop.patch
    (from rev 35337, inkscape/trunk/inkscape-0.46-desktop.patch)
  inkscape/repos/extra-i686/inkscape-0.46-fixlatex.patch
    (from rev 35337, inkscape/trunk/inkscape-0.46-fixlatex.patch)
  inkscape/repos/extra-i686/inkscape-0.46-gtkopen.patch
    (from rev 35337, inkscape/trunk/inkscape-0.46-gtkopen.patch)
  inkscape/repos/extra-i686/inkscape-0.46-uniconv.patch
    (from rev 35337, inkscape/trunk/inkscape-0.46-uniconv.patch)
  inkscape/repos/extra-i686/inkscape-OOT-build-fix.patch
    (from rev 35337, inkscape/trunk/inkscape-OOT-build-fix.patch)
  inkscape/repos/extra-i686/libpng-setjmp.patch
    (from rev 35337, inkscape/trunk/libpng-setjmp.patch)
Modified:
  inkscape/repos/extra-i686/	(properties)
  inkscape/repos/extra-i686/PKGBUILD
  inkscape/repos/extra-i686/inkscape.install
Deleted:
  inkscape/repos/extra-i686/eqtexsvg.py_linux_shell_apply.patch

-------------------------------------+
 PKGBUILD                            |   61 ++++++++++++++-------
 eqtexsvg.py_linux_shell_apply.patch |   78 ---------------------------
 inkscape-0.46-bitmap-fonts.patch    |   98 ++++++++++++++++++++++++++++++++++
 inkscape-0.46-colors.patch          |   22 +++++++
 inkscape-0.46-desktop.patch         |   31 ++++++++++
 inkscape-0.46-fixlatex.patch        |   42 ++++++++++++++
 inkscape-0.46-gtkopen.patch         |   20 ++++++
 inkscape-0.46-uniconv.patch         |   54 ++++++++++++++++++
 inkscape-OOT-build-fix.patch        |   10 +++
 inkscape.install                    |   11 ---
 libpng-setjmp.patch                 |   62 +++++++++++++++++++++
 11 files changed, 383 insertions(+), 106 deletions(-)


Property changes on: inkscape/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /inkscape/trunk:1-26204
   + /inkscape/trunk:1-35341

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-12 14:18:27 UTC (rev 35341)
+++ extra-i686/PKGBUILD	2009-04-12 14:22:18 UTC (rev 35342)
@@ -4,42 +4,65 @@
 
 pkgname=inkscape
 pkgver=0.46
-pkgrel=10
+pkgrel=11
 pkgdesc="A vector-based drawing program - svg compliant"
 url="http://inkscape.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
-depends=('gtkmm>=2.12.6' 'gc>=7.0' 'desktop-file-utils' 'libxslt>=1.1.22' 'perl>=5.10.0' 'pyxml' 'openssl>=0.9.8d' 'lcms' 'gtkspell' 'poppler-glib>=0.10.0' 'imagemagick>=6.4.8.10' 'popt' 'gnome-vfs>=2.24.0')
-makedepends=('perlxml' 'pkgconfig' 'boost')
+depends=('gtkmm>=2.16.0' 'gc>=7.1' 'desktop-file-utils' 'libxslt>=1.1.24' 'perl>=5.10.0' 'pyxml' 'openssl>=0.9.8k' 'lcms>=1.18' 'gtkspell>=2.0.15' 'poppler-glib>=0.10.5' 'imagemagick>=6.5.0.10' 'popt' 'python>=2.6')
+makedepends=('intltool' 'pkgconfig' 'boost')
 options=('!libtool')
 install=inkscape.install
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        perl-5.10.patch
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+	gtk-clist.patch
+	inkscape-0.46-bitmap-fonts.patch
+	inkscape-0.46-colors.patch
+	inkscape-0.46-desktop.patch
+	inkscape-0.46-fixlatex.patch
+	inkscape-0.46-gtkopen.patch
 	inkscape-0.46-poppler-0.8.3.patch
-	gtk-clist.patch
-	eqtexsvg.py_linux_shell_apply.patch)
+	inkscape-0.46-uniconv.patch
+	perl-5.10.patch
+	libpng-setjmp.patch
+	inkscape-OOT-build-fix.patch)
 md5sums=('3bae9034047379012127e52f9b138d32'
+         'c68e508b390257d5a79364ce998be95d'
+         'ab68758f0d5847ef5283a6d5bcc7c355'
+         'd4ffc1c63cebd49e974b6c3bcb1277f3'
+         'f1125806d944f6f30085852a348775a4'
+         '64606776db5d90d1032b614dd0024655'
+         '4a11011b2ca47c6deb1e8bb85612632e'
+         'fffe7ed73bdadcf0f90282d5afc4df30'
+         '0044088037f42743dcad66a7408ce8b5'
          'da1009efea12f6512e69cc3ec8604f4f'
-         'fffe7ed73bdadcf0f90282d5afc4df30'
-         'c68e508b390257d5a79364ce998be95d'
-         '8c8f32a44b9cc1ea829027b3197d18cb')
+         'dae4bdc3e6b6489e219cc6c0e143ae7e'
+         '569b73f9195f5b4d8522caab722fd600')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ../perl-5.10.patch || return 1
-  patch -Np1 -i ../inkscape-0.46-poppler-0.8.3.patch || return 1
-  patch -Np0 -i ../gtk-clist.patch || return 1
-  patch -Np0 -i ../eqtexsvg.py_linux_shell_apply.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/gtk-clist.patch" || return 1
+  patch -Np1 -i "${srcdir}/inkscape-0.46-bitmap-fonts.patch" || return 1
+  patch -Np2 -i "${srcdir}/inkscape-0.46-colors.patch" || return 1
+  patch -Np1 -i "${srcdir}/inkscape-0.46-desktop.patch" || return 1
+  patch -Np1 -i "${srcdir}/inkscape-0.46-fixlatex.patch" || return 1
+  patch -Np0 -i "${srcdir}/inkscape-0.46-gtkopen.patch" || return 1
+  patch -Np1 -i "${srcdir}/inkscape-0.46-poppler-0.8.3.patch" || return 1
+  patch -Np1 -i "${srcdir}/inkscape-0.46-uniconv.patch" || return 1
+  patch -Np1 -i "${srcdir}/perl-5.10.patch" || return 1
+  patch -Np1 -i "${srcdir}/libpng-setjmp.patch" || return 1
+  patch -Np0 -i "${srcdir}/inkscape-OOT-build-fix.patch" || return 1
+  aclocal || return 1
+  autoconf || return 1
+  automake || return 1
   CFLAGS="${CFLAGS} -I/usr/include/ImageMagick" \
   CXXFLAGS="${CXXFLAGS} -I/usr/include/ImageMagick" \
-   ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
     --enable-inkboard \
     --enable-lcms \
-    --with-gnome-print \
     --with-xft \
     --with-python \
     --with-perl \
-    --with-gnome-vfs || return 1
+    --without-gnome-vfs || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }

Deleted: extra-i686/eqtexsvg.py_linux_shell_apply.patch
===================================================================
--- extra-i686/eqtexsvg.py_linux_shell_apply.patch	2009-04-12 14:18:27 UTC (rev 35341)
+++ extra-i686/eqtexsvg.py_linux_shell_apply.patch	2009-04-12 14:22:18 UTC (rev 35342)
@@ -1,78 +0,0 @@
-Index: eqtexsvg.py
-===================================================================
---- share/extensions/eqtexsvg.py	(revision 16441)
-+++ share/extensions/eqtexsvg.py	(revision 18440)
-@@ -49,16 +49,18 @@
-     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)
- 
-@@ -86,6 +88,7 @@
-         dvi_file = os.path.join(base_dir, "eq.dvi")
-         svg_file = os.path.join(base_dir, "eq.svg")
-         out_file = os.path.join(base_dir, "eq.out")
-+        err_file = os.path.join(base_dir, "eq.err")
- 
-         def clean():
-             os.remove(latex_file)
-@@ -95,11 +98,13 @@
-             os.remove(dvi_file)
-             os.remove(svg_file)
-             os.remove(out_file)
-+            if os.path.exists(err_file):
-+                os.remove(err_file)
-             os.rmdir(base_dir)
- 
-         create_equation_tex(latex_file, self.options.formula)
--        #os.system('cd ' + base_dir)
--        os.system('latex -output-directory=' + base_dir + ' -halt-on-error ' + latex_file + ' > ' + out_file)
-+        os.system('latex "-output-directory=%s" -halt-on-error "%s" > "%s"' \
-+                  % (base_dir, latex_file, out_file))
- 	try:
- 	    os.stat(dvi_file)
- 	except OSError:
-@@ -108,9 +113,23 @@
-             print >>sys.stderr, "temporary files were left in:", base_dir
-             sys.exit(1)
- 
--        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('dvips -q -f -E -D 600 -y 5000 -o "%s" "%s"' % (ps_file, dvi_file))
-+        # cd to base_dir is necessary, because pstoedit writes
-+        # temporary files to cwd and needs write permissions
-+        separator = ';'
-+        if os.name == 'nt':
-+            separator = '&&'
-+        os.system('cd "%s" %s pstoedit -f plot-svg -dt -ssp "%s" "%s" > "%s" 2> "%s"' \
-+                  % (base_dir, separator, ps_file, svg_file, out_file, err_file))
-+
-+        # forward errors to stderr but skip pstoedit header
-+        if os.path.exists(err_file):
-+            err_stream = open(err_file, 'r')
-+            for line in err_stream:
-+                if not line.startswith('pstoedit: version'):
-+                    sys.stderr.write(line + '\n')
-+            err_stream.close()
-+ 
-         svg_open(self, svg_file)
- 
-         clean()

Copied: inkscape/repos/extra-i686/inkscape-0.46-bitmap-fonts.patch (from rev 35337, inkscape/trunk/inkscape-0.46-bitmap-fonts.patch)
===================================================================
--- extra-i686/inkscape-0.46-bitmap-fonts.patch	                        (rev 0)
+++ extra-i686/inkscape-0.46-bitmap-fonts.patch	2009-04-12 14:22:18 UTC (rev 35342)
@@ -0,0 +1,98 @@
+Fix crash with bitmap fonts. Fixes #477158
+https://bugzilla.redhat.com/show_bug.cgi?id=477158
+
+Comes from this upstream commit:
+
+r19758 | buliabyak | 2008-08-28 20:35:16 +0200 (Thu, 28 Aug 2008) | 1 line
+null check fixes patch from bug 261475
+
+diff -up inkscape-0.46/src/libnrtype/FontFactory.cpp.bitmap-fonts inkscape-0.46/src/libnrtype/FontFactory.cpp
+--- inkscape-0.46/src/libnrtype/FontFactory.cpp.bitmap-fonts	2008-03-11 05:20:29.000000000 +0100
++++ inkscape-0.46/src/libnrtype/FontFactory.cpp	2009-01-13 21:37:13.000000000 +0100
+@@ -817,7 +817,8 @@ font_instance *font_factory::Face(PangoF
+         res->Ref();
+         AddInCache(res);
+     }
+-    res->InitTheFace();
++    if(res)
++	res->InitTheFace();
+     return res;
+ }
+ 
+diff -up inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp.bitmap-fonts inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp
+--- inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp.bitmap-fonts	2008-03-11 05:20:29.000000000 +0100
++++ inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp	2009-01-13 21:37:13.000000000 +0100
+@@ -475,9 +475,9 @@ class Layout::Calculator
+                 new_span.in_input_stream_item = unbroken_span.input_index;
+                 new_span.baseline_shift = _y_offset;
+                 new_span.block_progression = _block_progression;
+-                if (_flow._input_stream[unbroken_span.input_index]->Type() == TEXT_SOURCE) {
+-                    new_span.font = para.pango_items[unbroken_span.pango_item_index].font;
+-                    new_span.font->Ref();
++                if ((_flow._input_stream[unbroken_span.input_index]->Type() == TEXT_SOURCE) && (new_span.font = para.pango_items[unbroken_span.pango_item_index].font))
++                    {
++		    new_span.font->Ref();
+                     new_span.font_size = unbroken_span.font_size;
+                     new_span.direction = para.pango_items[unbroken_span.pango_item_index].item->analysis.level & 1 ? RIGHT_TO_LEFT : LEFT_TO_RIGHT;
+                     new_span.input_stream_first_character = Glib::ustring::const_iterator(unbroken_span.input_stream_first_character.base() + it_span->start.char_byte);
+@@ -562,7 +562,7 @@ class Layout::Calculator
+                             new_glyph.x = x + unbroken_span.glyph_string->glyphs[glyph_index].geometry.x_offset * font_size_multiplier;
+                             new_glyph.y = _y_offset + unbroken_span.glyph_string->glyphs[glyph_index].geometry.y_offset * font_size_multiplier;
+                             new_glyph.width = unbroken_span.glyph_string->glyphs[glyph_index].geometry.width * font_size_multiplier;
+-                            if (new_glyph.width == 0)
++                            if ((new_glyph.width == 0) && (para.pango_items[unbroken_span.pango_item_index].font))
+                                 new_glyph.width = new_span.font_size * para.pango_items[unbroken_span.pango_item_index].font->Advance(unbroken_span.glyph_string->glyphs[glyph_index].glyph, false);
+                                 // for some reason pango returns zero width for invalid glyph characters (those empty boxes), so go to freetype for the info
+                         }
+@@ -903,7 +903,8 @@ void Layout::Calculator::_computeFontLin
+         line_height->setZero();
+         *line_height_multiplier = 1.0;
+     }
+-    font->FontMetrics(line_height->ascent, line_height->descent, line_height->leading);
++    else
++	font->FontMetrics(line_height->ascent, line_height->descent, line_height->leading);
+     *line_height *= font_size;
+ 
+     // yet another borked SPStyle member that we're going to have to fix ourselves
+diff -up inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp.bitmap-fonts inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp
+--- inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp.bitmap-fonts	2008-03-11 05:20:29.000000000 +0100
++++ inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp	2009-01-13 21:39:18.000000000 +0100
+@@ -112,21 +112,23 @@ void Layout::getBoundingBox(NRRect *boun
+         _getGlyphTransformMatrix(glyph_index, &glyph_matrix);
+         NR::Matrix total_transform = glyph_matrix;
+         total_transform *= transform;
+-        NR::Maybe<NR::Rect> glyph_rect = _glyphs[glyph_index].span(this).font->BBox(_glyphs[glyph_index].glyph);
+-        if (glyph_rect) {
+-            NR::Point bmi = glyph_rect->min(), bma = glyph_rect->max();
+-            NR::Point tlp(bmi[0],bmi[1]), trp(bma[0],bmi[1]), blp(bmi[0],bma[1]), brp(bma[0],bma[1]);
+-            tlp *= total_transform;
+-            trp *= total_transform;
+-            blp *= total_transform;
+-            brp *= total_transform;
+-            *glyph_rect = NR::Rect(tlp,trp);
+-            glyph_rect->expandTo(blp);
+-            glyph_rect->expandTo(brp);
+-            if ( (glyph_rect->min())[0] < bounding_box->x0 ) bounding_box->x0=(glyph_rect->min())[0];
+-            if ( (glyph_rect->max())[0] > bounding_box->x1 ) bounding_box->x1=(glyph_rect->max())[0];
+-            if ( (glyph_rect->min())[1] < bounding_box->y0 ) bounding_box->y0=(glyph_rect->min())[1];
+-            if ( (glyph_rect->max())[1] > bounding_box->y1 ) bounding_box->y1=(glyph_rect->max())[1];
++        if (_glyphs[glyph_index].span(this).font) {
++            NR::Maybe<NR::Rect> glyph_rect = _glyphs[glyph_index].span(this).font->BBox(_glyphs[glyph_index].glyph);
++            if (glyph_rect) {
++                NR::Point bmi = glyph_rect->min(), bma = glyph_rect->max();
++                NR::Point tlp(bmi[0],bmi[1]), trp(bma[0],bmi[1]), blp(bmi[0],bma[1]), brp(bma[0],bma[1]);
++                tlp *= total_transform;
++                trp *= total_transform;
++                blp *= total_transform;
++                brp *= total_transform;
++                *glyph_rect = NR::Rect(tlp,trp);
++                glyph_rect->expandTo(blp);
++                glyph_rect->expandTo(brp);
++                if ( (glyph_rect->min())[0] < bounding_box->x0 ) bounding_box->x0=(glyph_rect->min())[0];
++                if ( (glyph_rect->max())[0] > bounding_box->x1 ) bounding_box->x1=(glyph_rect->max())[0];
++                if ( (glyph_rect->min())[1] < bounding_box->y0 ) bounding_box->y0=(glyph_rect->min())[1];
++                if ( (glyph_rect->max())[1] > bounding_box->y1 ) bounding_box->y1=(glyph_rect->max())[1];
++            }
+         }
+     }
+ }

Copied: inkscape/repos/extra-i686/inkscape-0.46-colors.patch (from rev 35337, inkscape/trunk/inkscape-0.46-colors.patch)
===================================================================
--- extra-i686/inkscape-0.46-colors.patch	                        (rev 0)
+++ extra-i686/inkscape-0.46-colors.patch	2009-04-12 14:22:18 UTC (rev 35342)
@@ -0,0 +1,22 @@
+Fix the color slider with a recent GTK, to fix #467431 [1], patch from
+upstream #19816 [2].
+
+[1] https://bugzilla.redhat.com/show_bug.cgi?id=467431
+[2] http://inkscape.svn.sourceforge.net/viewvc/inkscape/inkscape/trunk/src/widgets/sp-color-slider.cpp?r1=16358&r2=19816
+
+--- inkscape/trunk/src/widgets/sp-color-slider.cpp	2007/10/30 06:16:09	16358
++++ inkscape/trunk/src/widgets/sp-color-slider.cpp	2008/09/08 07:52:36	19816
+@@ -330,8 +330,11 @@
+ 	g_return_if_fail (SP_IS_COLOR_SLIDER (slider));
+ 
+ 	if (!adjustment) {
+-		adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.1, 0.1);
+-	}
++		adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.0, 0.0);
++	} else {
++        gtk_adjustment_set_page_increment(adjustment, 0.0);
++        gtk_adjustment_set_page_size(adjustment, 0.0);
++    }
+ 
+ 	if (slider->adjustment != adjustment) {
+ 		if (slider->adjustment) {

Copied: inkscape/repos/extra-i686/inkscape-0.46-desktop.patch (from rev 35337, inkscape/trunk/inkscape-0.46-desktop.patch)
===================================================================
--- extra-i686/inkscape-0.46-desktop.patch	                        (rev 0)
+++ extra-i686/inkscape-0.46-desktop.patch	2009-04-12 14:22:18 UTC (rev 35342)
@@ -0,0 +1,31 @@
+Make desktop-file-validate and rpmlint happy, handle compressed svgs (#245413)
+and let it conform enough not to break the build in Rawhide.
+
+(Lubomir Kundrak <lkundrak at redhat.com>)
+https://bugs.launchpad.net/inkscape/+bug/190420
+
+diff -up inkscape-0.46/inkscape.desktop.in.desktop inkscape-0.46/inkscape.desktop.in
+--- inkscape-0.46/inkscape.desktop.in.desktop	2008-03-11 05:21:19.000000000 +0100
++++ inkscape-0.46/inkscape.desktop.in	2008-08-13 23:29:56.000000000 +0200
+@@ -2,18 +2,16 @@
+ _Name=Inkscape Vector Graphics Editor
+ _Comment=Create and edit Scalable Vector Graphics images
+ 
+-Encoding=UTF-8
+ Version=1.0
+ 
+ Type=Application
+-Categories=Application;Graphics;VectorGraphics;GTK;
++Categories=Graphics;VectorGraphics;GTK;
+ 
+-MimeType=image/svg+xml
++MimeType=image/svg+xml;image/svg+xml-compressed;
+ 
+-FilePattern=inkscape
+ Exec=inkscape %F
+ TryExec=inkscape
+ Terminal=false
+ StartupNotify=true
+ 
+-Icon=inkscape.png
++Icon=inkscape

Copied: inkscape/repos/extra-i686/inkscape-0.46-fixlatex.patch (from rev 35337, inkscape/trunk/inkscape-0.46-fixlatex.patch)
===================================================================
--- extra-i686/inkscape-0.46-fixlatex.patch	                        (rev 0)
+++ extra-i686/inkscape-0.46-fixlatex.patch	2009-04-12 14:22:18 UTC (rev 35342)
@@ -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()

Copied: inkscape/repos/extra-i686/inkscape-0.46-gtkopen.patch (from rev 35337, inkscape/trunk/inkscape-0.46-gtkopen.patch)
===================================================================
--- extra-i686/inkscape-0.46-gtkopen.patch	                        (rev 0)
+++ extra-i686/inkscape-0.46-gtkopen.patch	2009-04-12 14:22:18 UTC (rev 35342)
@@ -0,0 +1,20 @@
+------------------------------------------------------------------------
+r18721 | buliabyak | 2008-05-24 21:32:40 +0200 (Sat, 24 May 2008) | 1 line
+
+this hack does not seem to be needed with modern gtk, and it prevents remembering of last-browsed directory from working
+
+Index: src/ui/dialog/filedialogimpl-gtkmm.cpp
+===================================================================
+--- src/ui/dialog/filedialogimpl-gtkmm.cpp	(revision 18720)
++++ src/ui/dialog/filedialogimpl-gtkmm.cpp	(revision 18721)
+@@ -761,10 +761,6 @@
+ bool
+ FileOpenDialogImplGtk::show()
+ {
+-    Glib::ustring s = Glib::filename_to_utf8 (get_current_folder());
+-    if (s.length() == 0)
+-        s = getcwd (NULL, 0);
+-    set_current_folder(Glib::filename_from_utf8(s)); //hack to force initial dir listing
+     set_modal (TRUE);                      //Window
+     sp_transientize((GtkWidget *)gobj());  //Make transient
+     gint b = run();                        //Dialog

Copied: inkscape/repos/extra-i686/inkscape-0.46-uniconv.patch (from rev 35337, inkscape/trunk/inkscape-0.46-uniconv.patch)
===================================================================
--- extra-i686/inkscape-0.46-uniconv.patch	                        (rev 0)
+++ extra-i686/inkscape-0.46-uniconv.patch	2009-04-12 14:22:18 UTC (rev 35342)
@@ -0,0 +1,54 @@
+See https://bugs.launchpad.net/inkscape/+bug/226383
+https://bugzilla.redhat.com/show_bug.cgi?id=458845
+
+Lubomir Rintel <lkundrak at v3.sk>
+
+diff -up inkscape-0.46/inkscape.desktop.in.uniconv inkscape-0.46/inkscape.desktop.in
+diff -up inkscape-0.46/inkscape.desktop.in.uniconv inkscape-0.46/inkscape.desktop.in
+--- inkscape-0.46/inkscape.desktop.in.uniconv	2008-08-13 23:31:17.000000000 +0200
++++ inkscape-0.46/inkscape.desktop.in	2008-08-13 23:32:35.000000000 +0200
+@@ -7,7 +7,7 @@ Version=1.0
+ Type=Application
+ Categories=Graphics;VectorGraphics;GTK;
+ 
+-MimeType=image/svg+xml;image/svg+xml-compressed;
++MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;image/x-wmf;
+ 
+ Exec=inkscape %F
+ TryExec=inkscape
+diff -up inkscape-0.46/share/extensions/cdr2svg.sh.uniconv inkscape-0.46/share/extensions/cdr2svg.sh
+--- inkscape-0.46/share/extensions/cdr2svg.sh.uniconv	2008-03-11 05:21:10.000000000 +0100
++++ inkscape-0.46/share/extensions/cdr2svg.sh	2008-08-13 23:31:17.000000000 +0200
+@@ -4,7 +4,7 @@ TMPDIR="${TMPDIR-/tmp}"
+ TEMPFILENAME=`mktemp 2>/dev/null || echo "$TMPDIR/$$"`
+ TEMPFILENAME=${TEMPFILENAME}.svg
+ 
+-uniconv "$1" "${TEMPFILENAME}" > /dev/null 2>&1 || rc=1
++unviconvertor "$1" "${TEMPFILENAME}" > /dev/null 2>&1 || rc=1
+ 
+ cat < "${TEMPFILENAME}" || rc=1
+ rm -f "${TEMPFILENAME}"
+diff -up inkscape-0.46/share/extensions/cdr_input.inx.uniconv inkscape-0.46/share/extensions/cdr_input.inx
+--- inkscape-0.46/share/extensions/cdr_input.inx.uniconv	2008-03-11 05:21:07.000000000 +0100
++++ inkscape-0.46/share/extensions/cdr_input.inx	2008-08-13 23:31:17.000000000 +0200
+@@ -1,7 +1,7 @@
+ <inkscape-extension>
+     <_name>Corel DRAW Input</_name>
+     <id>org.inkscape.input.cdr</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">unviconvertor</dependency>
+     <dependency type="executable" location="extensions">cdr2svg.sh</dependency>
+     <input>
+         <extension>.cdr</extension>
+diff -up inkscape-0.46/share/extensions/wmf_input.inx.uniconv inkscape-0.46/share/extensions/wmf_input.inx
+--- inkscape-0.46/share/extensions/wmf_input.inx.uniconv	2008-03-11 05:21:10.000000000 +0100
++++ inkscape-0.46/share/extensions/wmf_input.inx	2008-08-13 23:31:17.000000000 +0200
+@@ -1,7 +1,7 @@
+ <inkscape-extension>
+     <_name>Windows Metafile Input</_name>
+     <id>org.inkscape.input.wmf</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">unviconvertor</dependency>
+     <dependency type="executable" location="extensions">cdr2svg.sh</dependency>
+     <input>
+         <extension>.wmf</extension>

Copied: inkscape/repos/extra-i686/inkscape-OOT-build-fix.patch (from rev 35337, inkscape/trunk/inkscape-OOT-build-fix.patch)
===================================================================
--- extra-i686/inkscape-OOT-build-fix.patch	                        (rev 0)
+++ extra-i686/inkscape-OOT-build-fix.patch	2009-04-12 14:22:18 UTC (rev 35342)
@@ -0,0 +1,10 @@
+Index: src/extension/script/Makefile_insert
+===================================================================
+--- src/extension/script/Makefile_insert	(revision 16636)
++++ src/extension/script/Makefile_insert	(working copy)
+@@ -42,3 +42,5 @@
+ 	$(perl_sources)	\
+ 	$(python_sources)
+ 
++extension_script_libscript_a_CPPFLAGS = -I$(srcdir)/extension/script
++

Modified: extra-i686/inkscape.install
===================================================================
--- extra-i686/inkscape.install	2009-04-12 14:18:27 UTC (rev 35341)
+++ extra-i686/inkscape.install	2009-04-12 14:22:18 UTC (rev 35342)
@@ -1,19 +1,12 @@
 post_install() {
-  echo "update desktop mime database ..."
   update-desktop-database -q
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 
 post_remove() {
-  echo -e "\nupdate desktop mime database ..."
-  update-desktop-database -q
+  post_install
 }
-
-op=$1
-shift
-
-$op $*

Copied: inkscape/repos/extra-i686/libpng-setjmp.patch (from rev 35337, inkscape/trunk/libpng-setjmp.patch)
===================================================================
--- extra-i686/libpng-setjmp.patch	                        (rev 0)
+++ extra-i686/libpng-setjmp.patch	2009-04-12 14:22:18 UTC (rev 35342)
@@ -0,0 +1,62 @@
+Include <png.h> as early as possible to make sure <setjmp.h> is not
+included before it.
+
+See http://thread.gmane.org/gmane.linux.distributions.nixos/1501 .
+
+--- inkscape-0.46/src/sp-image.cpp	2008-03-11 05:19:56.000000000 +0100
++++ inkscape-0.46/src/sp-image.cpp	2009-01-26 15:34:33.000000000 +0100
+@@ -17,6 +17,8 @@
+ # include "config.h"
+ #endif
+ 
++#include <png.h>
++
+ #include <cstring>
+ #include <string>
+ #include <libnr/nr-matrix-fns.h>
+@@ -41,7 +43,6 @@
+ #include "libnr/nr-matrix-fns.h"
+ 
+ #include "io/sys.h"
+-#include <png.h>
+ #if ENABLE_LCMS
+ #include "color-profile-fns.h"
+ #include "color-profile.h"
+
+--- inkscape-0.46/src/dialogs/export.cpp	2008-03-11 05:19:54.000000000 +0100
++++ inkscape-0.46/src/dialogs/export.cpp	2009-01-26 17:01:13.000000000 +0100
+@@ -20,6 +20,7 @@
+ # include "config.h"
+ #endif
+ 
++#include <png.h>
+ #include <gtk/gtk.h>
+ #include <gtkmm/box.h>
+ #include <gtkmm/buttonbox.h>
+@@ -60,7 +61,6 @@
+ #include "io/sys.h"
+ 
+ #include "helper/png-write.h"
+-#include <png.h>
+ 
+ 
+ #define SP_EXPORT_MIN_SIZE 1.0
+
+--- inkscape-0.46/src/main.cpp	2008-03-11 05:20:50.000000000 +0100
++++ inkscape-0.46/src/main.cpp	2009-01-26 17:57:12.000000000 +0100
+@@ -26,6 +26,7 @@
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+ #endif
++#include <png.h>
+ #include "path-prefix.h"
+ 
+ #include <gtk/gtkmessagedialog.h>
+@@ -111,7 +112,6 @@ using Inkscape::Extension::Internal::Pri
+ 
+ #include "main-cmdlineact.h"
+ 
+-#include <png.h>
+ #include <errno.h>
+ 
+ enum {



More information about the arch-commits mailing list