[arch-commits] Commit in inkscape/trunk (15 files)

Jan de Groot jgc at archlinux.org
Sun Jan 3 21:42:55 UTC 2010


    Date: Sunday, January 3, 2010 @ 16:42:55
  Author: jgc
Revision: 62168

Fix build with poppler 0.12.2
Rework dependencies, should now only include needed dependencies, though we still depend on gnome-vfs

Added:
  inkscape/trunk/50-poppler-API.dpatch
Modified:
  inkscape/trunk/PKGBUILD
Deleted:
  inkscape/trunk/gtk-clist.patch
  inkscape/trunk/inkscape-0.46-Makefile.patch
  inkscape/trunk/inkscape-0.46-bitmap-fonts.patch
  inkscape/trunk/inkscape-0.46-colors.patch
  inkscape/trunk/inkscape-0.46-desktop.patch
  inkscape/trunk/inkscape-0.46-fixlatex.patch
  inkscape/trunk/inkscape-0.46-gcc44-glibc-2.10.patch
  inkscape/trunk/inkscape-0.46-gtkopen.patch
  inkscape/trunk/inkscape-0.46-poppler-0.8.3.patch
  inkscape/trunk/inkscape-0.46-uniconv.patch
  inkscape/trunk/inkscape-OOT-build-fix.patch
  inkscape/trunk/libpng-setjmp.patch
  inkscape/trunk/perl-5.10.patch

--------------------------------------+
 50-poppler-API.dpatch                |   97 +++++++++++
 PKGBUILD                             |   13 -
 gtk-clist.patch                      |   11 -
 inkscape-0.46-Makefile.patch         |   10 -
 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-gcc44-glibc-2.10.patch |  289 ---------------------------------
 inkscape-0.46-gtkopen.patch          |   20 --
 inkscape-0.46-poppler-0.8.3.patch    |   42 ----
 inkscape-0.46-uniconv.patch          |   54 ------
 inkscape-OOT-build-fix.patch         |   10 -
 libpng-setjmp.patch                  |   62 -------
 perl-5.10.patch                      |   25 --
 15 files changed, 104 insertions(+), 722 deletions(-)

Added: 50-poppler-API.dpatch
===================================================================
--- 50-poppler-API.dpatch	                        (rev 0)
+++ 50-poppler-API.dpatch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -0,0 +1,97 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-poppler-API.patch.dpatch by Kees Cook <kees at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: https://bugs.launchpad.net/inkscape/+bug/487038
+
+ at DPATCH@
+diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp
+--- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp	2009-10-10 12:17:47.000000000 -0700
++++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp	2009-12-23 22:34:13.000000000 -0800
+@@ -809,7 +809,7 @@
+ 	  blendingColorSpace = NULL;
+ 	  isolated = knockout = gFalse;
+ 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+-	    blendingColorSpace = GfxColorSpace::parse(&obj5);
++	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
+ 	  }
+ 	  obj5.free();
+ 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
+@@ -1009,9 +1009,9 @@
+   state->setFillPattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+   if (obj.isNull()) {
+-    colorSpace = GfxColorSpace::parse(&args[0]);
++    colorSpace = GfxColorSpace::parse(&args[0], NULL);
+   } else {
+-    colorSpace = GfxColorSpace::parse(&obj);
++    colorSpace = GfxColorSpace::parse(&obj, NULL);
+   }
+   obj.free();
+   if (colorSpace) {
+@@ -1032,9 +1032,9 @@
+   state->setStrokePattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+   if (obj.isNull()) {
+-    colorSpace = GfxColorSpace::parse(&args[0]);
++    colorSpace = GfxColorSpace::parse(&args[0], NULL);
+   } else {
+-    colorSpace = GfxColorSpace::parse(&obj);
++    colorSpace = GfxColorSpace::parse(&obj, NULL);
+   }
+   obj.free();
+   if (colorSpace) {
+@@ -1101,7 +1101,7 @@
+       builder->updateStyle(state);
+     }
+     if (args[numArgs-1].isName() &&
+-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
+       state->setFillPattern(pattern);
+       builder->updateStyle(state);
+     }
+@@ -1145,7 +1145,7 @@
+       builder->updateStyle(state);
+     }
+     if (args[numArgs-1].isName() &&
+-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
+       state->setStrokePattern(pattern);
+       builder->updateStyle(state);
+     }
+@@ -1543,7 +1543,7 @@
+   double *matrix = NULL;
+   GBool savedState = gFalse;
+ 
+-  if (!(shading = res->lookupShading(args[0].getName()))) {
++  if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
+     return;
+   }
+ 
+@@ -2507,7 +2507,7 @@
+       }
+     }
+     if (!obj1.isNull()) {
+-      colorSpace = GfxColorSpace::parse(&obj1);
++      colorSpace = GfxColorSpace::parse(&obj1, NULL);
+     } else if (csMode == streamCSDeviceGray) {
+       colorSpace = new GfxDeviceGrayColorSpace();
+     } else if (csMode == streamCSDeviceRGB) {
+@@ -2592,7 +2592,7 @@
+ 	  obj2.free();
+ 	}
+       }
+-      maskColorSpace = GfxColorSpace::parse(&obj1);
++      maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
+       obj1.free();
+       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
+ 	goto err1;
+@@ -2767,7 +2767,7 @@
+     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
+       transpGroup = gTrue;
+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+-	blendingColorSpace = GfxColorSpace::parse(&obj3);
++	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
+       }
+       obj3.free();
+       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-03 21:29:42 UTC (rev 62167)
+++ PKGBUILD	2010-01-03 21:42:55 UTC (rev 62168)
@@ -9,17 +9,18 @@
 url="http://inkscape.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
-depends=('gtkmm>=2.18.2' 'gc>=7.1' 'desktop-file-utils' 'libxslt>=1.1.26' 'perl>=5.10.1' 'pyxml' 'openssl>=0.9.8l' 'lcms>=1.18' 'gtkspell>=2.0.16' 'poppler-glib>=0.12.2' 'imagemagick>=6.5.8.5' 'popt' 'python>=2.6' 'gnome-vfs>=2.24.2' 'libjpeg>=7' 'gsl>=1.13')
-makedepends=('intltool' 'pkgconfig' 'boost')
+depends=('poppler-glib>=0.12.2' 'imagemagick>=6.5.8.5' 'gnome-vfs>=2.24.2' 'gtkspell>=2.0.16' 'gc>=7.1' 'gtkmm>=2.18.2' 'libxslt>=1.1.26' 'gsl>=1.13' 'pyxml>=0.8.4' 'desktop-file-utils')
+makedepends=('boost' 'pkgconfig' 'intltool')
 options=('!libtool')
 install=inkscape.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('916c85b501bcfb0ae61fcf7318f36348')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        50-poppler-API.dpatch)
+md5sums=('916c85b501bcfb0ae61fcf7318f36348'
+         'b447272c9b282b49e86dca24c2581065')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-#CFLAGS="${CFLAGS} -I/usr/include/ImageMagick" \
-#CXXFLAGS="${CXXFLAGS} -I/usr/include/ImageMagick" \
+  patch -Np1 -i "${srcdir}/50-poppler-API.dpatch" || return 1
   ./configure --prefix=/usr \
     --with-python \
     --with-perl \

Deleted: gtk-clist.patch
===================================================================
--- gtk-clist.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ gtk-clist.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,11 +0,0 @@
---- src/widgets/sp-xmlview-attr-list.h	2008/06/07 22:06:52	1.1
-+++ src/widgets/sp-xmlview-attr-list.h	2008/06/07 22:09:22
-@@ -13,7 +13,7 @@
-  */
- 
- #include <stdio.h>
--#include <gtk/gtkclist.h>
-+#include <gtk/gtk.h>
- #include "../xml/repr.h"
- 
- #include <glib.h>

Deleted: inkscape-0.46-Makefile.patch
===================================================================
--- inkscape-0.46-Makefile.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-0.46-Makefile.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,10 +0,0 @@
---- share/templates/Makefile.orig	2009-07-06 23:02:33.000000000 -0400
-+++ share/templates/Makefile	2009-07-06 23:02:39.000000000 -0400
-@@ -239,7 +239,6 @@
- templatesdir = $(datadir)/inkscape/templates
- templates_DATA = \
- 	README \
--	default.svg \
- 	A4_landscape.svg \
- 	A4.svg \
- 	black_opaque.svg \

Deleted: inkscape-0.46-bitmap-fonts.patch
===================================================================
--- inkscape-0.46-bitmap-fonts.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-0.46-bitmap-fonts.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,98 +0,0 @@
-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];
-+            }
-         }
-     }
- }

Deleted: inkscape-0.46-colors.patch
===================================================================
--- inkscape-0.46-colors.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-0.46-colors.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,22 +0,0 @@
-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) {

Deleted: inkscape-0.46-desktop.patch
===================================================================
--- inkscape-0.46-desktop.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-0.46-desktop.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,31 +0,0 @@
-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

Deleted: inkscape-0.46-fixlatex.patch
===================================================================
--- inkscape-0.46-fixlatex.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-0.46-fixlatex.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,42 +0,0 @@
-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()

Deleted: inkscape-0.46-gcc44-glibc-2.10.patch
===================================================================
--- inkscape-0.46-gcc44-glibc-2.10.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-0.46-gcc44-glibc-2.10.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,289 +0,0 @@
-diff -ru src/dialogs/export.cpp src/dialogs/export.cpp
---- src/dialogs/export.cpp	2009-05-25 02:21:18.067302917 +0300
-+++ src/dialogs/export.cpp	2009-05-25 02:21:17.804059091 +0300
-@@ -1041,9 +1043,7 @@
- static gchar *
- filename_add_extension (const gchar *filename, const gchar *extension)
- {
--  gchar *dot;
--
--  dot = strrchr (filename, '.');
-+  const gchar *dot = strrchr (filename, '.');
-   if ( !dot )
-     return g_strconcat (filename, ".", extension, NULL);
-   {
-diff -ru src/document.cpp src/document.cpp
---- src/document.cpp	2009-05-25 02:21:18.052299751 +0300
-+++ src/document.cpp	2009-05-25 02:21:17.797058619 +0300
-@@ -746,7 +746,7 @@
-         }
-
-         if ( NULL != document_language ) {
--            gchar *pos = strchr(document_language, '_');
-+	    const char *pos = strchr(document_language, '_');
-             if ( NULL != pos ) {
-                 return Glib::ustring(document_language, pos - document_language);
-             }
-diff -ru src/dom/io/domstream.cpp src/dom/io/domstream.cpp
---- src/dom/io/domstream.cpp	2009-05-25 02:21:18.011048623 +0300
-+++ src/dom/io/domstream.cpp	2009-05-25 02:21:17.755301212 +0300
-@@ -34,6 +34,7 @@
-  *
-  */
-
-+#include <cstdio>
- #include <math.h>
- #include <stdarg.h>
-
-diff -ru src/dom/io/gzipstream.cpp src/dom/io/gzipstream.cpp
---- src/dom/io/gzipstream.cpp	2009-05-25 02:21:18.012048750 +0300
-+++ src/dom/io/gzipstream.cpp	2009-05-25 02:21:17.755301212 +0300
-@@ -29,6 +29,8 @@
-
- #include "gzipstream.h"
-
-+#include <cstdio>
-+
- #include "dom/util/ziptool.h"
-
-
-diff -ru src/dom/io/socket.cpp src/dom/io/socket.cpp
---- src/dom/io/socket.cpp	2009-05-25 02:21:18.011048623 +0300
-+++ src/dom/io/socket.cpp	2009-05-25 02:21:17.754336705 +0300
-@@ -35,6 +35,7 @@
- #include <sys/filio.h>   // needed on Solaris 8
- #endif
-
-+#include <cstdio>
- #include "socket.h"
- #include "dom/util/thread.h"
-
-diff -ru src/dom/io/uristream.cpp src/dom/io/uristream.cpp
---- src/dom/io/uristream.cpp	2009-05-25 02:21:18.012048750 +0300
-+++ src/dom/io/uristream.cpp	2009-05-25 02:21:17.755301212 +0300
-@@ -41,6 +41,7 @@
-
-
- #include "uristream.h"
-+#include <cstdio>
-
-
-
-diff -ru src/dom/lsimpl.cpp src/dom/lsimpl.cpp
---- src/dom/lsimpl.cpp	2009-05-25 02:21:18.014048586 +0300
-+++ src/dom/lsimpl.cpp	2009-05-25 02:21:17.760050211 +0300
-@@ -33,6 +33,7 @@
- #include "lsimpl.h"
-
- #include <stdarg.h>
-+#include <cstdio>
-
- namespace org
- {
-diff -ru src/dom/svg/svgparser.cpp src/dom/svg/svgparser.cpp
---- src/dom/svg/svgparser.cpp	2009-05-25 02:21:18.014048586 +0300
-+++ src/dom/svg/svgparser.cpp	2009-05-25 02:21:17.759333709 +0300
-@@ -32,6 +32,7 @@
- #include "dom/cssparser.h"
- #include "dom/charclass.h"
-
-+#include <cstdio>
- #include <stdarg.h>
-
- #define SVG_NAMESPACE "http://www.w3.org/2000/svg"
-diff -ru src/prefix.cpp src/prefix.cpp
---- src/prefix.cpp	2009-05-25 02:21:18.037083918 +0300
-+++ src/prefix.cpp	2009-05-25 02:21:17.787058605 +0300
-@@ -355,7 +355,8 @@
- char *
- br_extract_dir (const char *path)
- {
--	char *end, *result;
-+	const char *end;
-+	char *result;
-
- 	br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
-
-@@ -390,7 +391,8 @@
- char *
- br_extract_prefix (const char *path)
- {
--	char *end, *tmp, *result;
-+	const char *end;
-+	char *tmp, *result;
-
- 	br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
-
---- src/libavoid/vertices.h.orig	2009-07-06 20:37:23.000000000 -0400
-+++ src/libavoid/vertices.h	2009-07-06 20:37:46.000000000 -0400
-@@ -23,6 +23,7 @@
- #ifndef AVOID_VERTICES_H
- #define AVOID_VERTICES_H
- 
-+#include <cstdio>
- #include <list>
- #include <set>
- #include <map>
---- src/streams-handles.cpp~    2008-11-14 07:41:07.000000000 +0000
-+++ src/streams-handles.cpp     2008-11-14 07:41:14.000000000 +0000
-@@ -12,6 +12,7 @@
- #include "streams-handles.h"
- #include "uri.h"
- 
-+#include <cstdio>
- #include <iostream>
- 
- namespace Inkscape {
---- src/streams-zlib.cpp~       2008-11-14 07:41:24.000000000 +0000
-+++ src/streams-zlib.cpp        2008-11-14 07:41:30.000000000 +0000
-@@ -9,6 +9,7 @@
-  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
-  */
- 
-+#include <cstdio>
- #include <cstring>
- #include <string>
- #include <string.h>
---- src/dom/domimpl.cpp~        2008-11-14 07:49:10.000000000 +0000
-+++ src/dom/domimpl.cpp 2008-11-14 07:49:18.000000000 +0000
-@@ -30,6 +30,8 @@
- 
- #include "domimpl.h"
- 
-+#include <cstdio>
-+
- namespace org
- {
- namespace w3c
---- src/dom/io/domstream.h~     2008-11-14 07:51:18.000000000 +0000
-+++ src/dom/io/domstream.h      2008-11-14 07:51:28.000000000 +0000
-@@ -33,6 +33,8 @@
- 
- #include <dom/dom.h>
- 
-+#include <cstdio>
-+
- namespace org
- {
- namespace w3c
---- src/dom/xpathtoken.h~       2008-11-14 07:52:27.000000000 +0000
-+++ src/dom/xpathtoken.h        2008-11-14 07:52:36.000000000 +0000
-@@ -35,6 +35,7 @@
- 
- #include <math.h>
- 
-+#include <cstdio>
- #include <vector>
- 
- namespace org
---- src/dom/svg/svgtypes.h~     2008-11-14 07:53:23.000000000 +0000
-+++ src/dom/svg/svgtypes.h      2008-11-14 07:53:32.000000000 +0000
-@@ -47,6 +47,7 @@
- #include "dom/smil.h"
- 
- 
-+#include <cstdio>
- #include <math.h>
- 
- 
---- src/extension/internal/bitmap/imagemagick.cpp.gcc44	2009-01-28 22:12:57.000000000 +0100
-+++ src/extension/internal/bitmap/imagemagick.cpp	2009-03-02 17:05:57.000000000 +0100
-@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha
- 	char *search = (char *) g_strndup(xlink, 30);
- 	if (strstr(search, "base64") != (char*)NULL) {
- 		// 7 = strlen("base64") + strlen(",")
--		char* pureBase64 = strstr(xlink, "base64") + 7;		
-+		const char* pureBase64 = strstr(xlink, "base64") + 7;		
- 		Magick::Blob blob;
- 		blob.base64(pureBase64);
- 		image->read(blob);
---- src/libnr/nr-object.cpp.gcc44	2009-03-02 17:06:46.000000000 +0100
-+++ src/libnr/nr-object.cpp	2009-03-02 17:06:58.000000000 +0100
-@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
-     );
-     memset(object, 0xf0, c->isize);
- 
--    object->klass = c;
-     c->cpp_ctor(object);
-+    object->klass = c;
-     nr_class_tree_object_invoke_init (c, object);
- 
-     return object;
---- src/io/inkscapestream.h~    2008-11-14 08:02:53.000000000 +0000
-+++ src/io/inkscapestream.h     2008-11-14 08:03:00.000000000 +0000
-@@ -12,6 +12,7 @@
-  */
- 
- 
-+#include <cstdio>
- #include <glibmm.h>
- 
- namespace Inkscape
---- src/io/sys.cpp~     2008-11-14 08:04:54.000000000 +0000
-+++ src/io/sys.cpp      2008-11-14 08:05:11.000000000 +0000
-@@ -22,6 +22,8 @@
- #include <glibmm/ustring.h>
- #include <gtk/gtkmessagedialog.h>
- 
-+#include <cstdio>
-+
- #include "prefs-utils.h"
- #include "sys.h"
- 
---- src/2geom/svg-path-parser.h~        2008-11-14 08:06:45.000000000 +0000
-+++ src/2geom/svg-path-parser.h 2008-11-14 08:06:51.000000000 +0000
-@@ -32,6 +32,7 @@
- #ifndef SEEN_SVG_PATH_PARSER_H
- #define SEEN_SVG_PATH_PARSER_H
- 
-+#include <cstdio>
- #include <vector>
- #include <iterator>
- #include <stdexcept>
---- src/libnr/nr-matrix-fns.cpp~        2008-11-14 08:16:43.000000000 +0000
-+++ src/libnr/nr-matrix-fns.cpp 2008-11-14 08:16:48.000000000 +0000
-@@ -1,5 +1,7 @@
- #include <libnr/nr-matrix-fns.h>
- 
-+#include <cstdio>
-+
- namespace NR {
- 
- Matrix elliptic_quadratic_form(Matrix const &m) {
---- src/libnr/nr-matrix.cpp~    2008-11-14 08:19:20.000000000 +0000
-+++ src/libnr/nr-matrix.cpp     2008-11-14 08:19:26.000000000 +0000
-@@ -11,6 +11,7 @@
-  * This code is in public domain
-  */
- 
-+#include <cstdio>
- #include <cstdlib>
- #include "nr-matrix.h"
- 
---- src/xml/event.cpp~  2008-11-14 08:27:20.000000000 +0000
-+++ src/xml/event.cpp   2008-11-14 08:27:26.000000000 +0000
-@@ -14,6 +14,7 @@
-  */
- 
- #include <glib.h> // g_assert()
-+#include <cstdio>
- 
- #include "event.h"
- #include "event-fns.h"
---- src/2geom/sbasis-math.cpp~  2008-11-14 08:29:42.000000000 +0000
-+++ src/2geom/sbasis-math.cpp   2008-11-14 08:31:32.000000000 +0000
-@@ -38,11 +38,11 @@
- //#define ZERO 1e-3
- 
- 
--namespace Geom {
-+#include <math.h>
-+#include <cstdio>
- 
-+namespace Geom {
- 
--#include <stdio.h>
--#include <math.h>
- 
- //-|x|-----------------------------------------------------------------------
- Piecewise<SBasis> abs(SBasis const &f){

Deleted: inkscape-0.46-gtkopen.patch
===================================================================
--- inkscape-0.46-gtkopen.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-0.46-gtkopen.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,20 +0,0 @@
-------------------------------------------------------------------------
-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

Deleted: inkscape-0.46-poppler-0.8.3.patch
===================================================================
--- inkscape-0.46-poppler-0.8.3.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-0.46-poppler-0.8.3.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,42 +0,0 @@
-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();

Deleted: inkscape-0.46-uniconv.patch
===================================================================
--- inkscape-0.46-uniconv.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-0.46-uniconv.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,54 +0,0 @@
-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>

Deleted: inkscape-OOT-build-fix.patch
===================================================================
--- inkscape-OOT-build-fix.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ inkscape-OOT-build-fix.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,10 +0,0 @@
-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
-+

Deleted: libpng-setjmp.patch
===================================================================
--- libpng-setjmp.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ libpng-setjmp.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,62 +0,0 @@
-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 {

Deleted: perl-5.10.patch
===================================================================
--- perl-5.10.patch	2010-01-03 21:29:42 UTC (rev 62167)
+++ perl-5.10.patch	2010-01-03 21:42:55 UTC (rev 62168)
@@ -1,25 +0,0 @@
-diff -Naur inkscape-0.46/src/Makefile.am inkscape-0.46-p/src/Makefile.am
---- inkscape-0.46/src/Makefile.am	2008-03-11 05:44:31.000000000 +0100
-+++ inkscape-0.46-p/src/Makefile.am	2008-03-14 22:21:53.000000000 +0100
-@@ -25,7 +25,8 @@
- 	$(POPPLER_GLIB_CFLAGS)	\
- 	-DPOTRACE=\"potrace\"	\
- 	$(INKSCAPE_CFLAGS) \
--	-I$(top_srcdir)/cxxtest
-+	-I$(top_srcdir)/cxxtest \
-+	-I$(top_srcdir)/src/extension/script
-
- include Makefile_insert
- include application/Makefile_insert
-diff -Naur inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp inkscape-0.46-p/src/extension/script/inkscape_perl_wrap.cpp
---- inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp	2008-03-11 05:20:25.000000000 +0100
-+++ inkscape-0.46-p/src/extension/script/inkscape_perl_wrap.cpp	2008-03-14 22:36:24.000000000 +0100
-@@ -724,7 +724,7 @@
- /* #define SWIG_croakf(x...) { SWIG_SetErrorf(x); goto fail; } */
-
-
--typedef XS(SwigPerlWrapper);
-+typedef XSPROTO(SwigPerlWrapper);
- typedef SwigPerlWrapper *SwigPerlWrapperPtr;
-
- /* Structure for command table */




More information about the arch-commits mailing list