rpms/inkscape
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to SVN snapshot with solemn intent of annoying users. And compile

Browse Source 
with GCC 4.4 as well
This commit is contained in:
Lubomir Rintel 2009-03-02 21:27:11 +00:00
parent 2466cd89d9
commit c68497ff47
17 changed files with 377 additions and 445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
inkscape-0.46.tar.bz2
inkscape.tar.lzma

108
inkscape-0.46+devel-uniconv.patch Normal file
View File

@ -0,0 +1,108 @@
See https://bugs.launchpad.net/inkscape/+bug/226383
https://bugzilla.redhat.com/show_bug.cgi?id=458845
Lubomir Rintel <lkundrak@v3.sk>
diff -up inkscape/inkscape.desktop.in.uniconv inkscape/inkscape.desktop.in
--- inkscape/inkscape.desktop.in.uniconv 2009-01-06 11:38:13.000000000 +0100
+++ inkscape/inkscape.desktop.in 2009-01-06 11:38:39.000000000 +0100
@@ -4,7 +4,7 @@ _Name=Inkscape Vector Graphics Editor
_Comment=Create and edit Scalable Vector Graphics images
Type=Application
Categories=Graphics;VectorGraphics;GTK;
-MimeType=image/svg+xml;image/svg+xml-compressed;
+MimeType=image/svg+xml;image/svg+xml-compressed;image/cgm;image/x-wmf;application/vnd.corel-draw;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;
Exec=inkscape %F
TryExec=inkscape
Terminal=false
diff -up inkscape/share/extensions/ccx_input.inx.uniconv inkscape/share/extensions/ccx_input.inx
--- inkscape/share/extensions/ccx_input.inx.uniconv 2009-01-05 14:23:27.000000000 +0100
+++ inkscape/share/extensions/ccx_input.inx 2009-01-06 11:37:02.000000000 +0100
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Corel DRAW Compressed Exchange files input</_name>
<id>org.inkscape.input.ccx</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.ccx</extension>
diff -up inkscape/share/extensions/cdr_input.inx.uniconv inkscape/share/extensions/cdr_input.inx
diff -up inkscape/share/extensions/cdt_input.inx.uniconv inkscape/share/extensions/cdt_input.inx
--- inkscape/share/extensions/cdt_input.inx.uniconv 2009-01-05 14:23:28.000000000 +0100
+++ inkscape/share/extensions/cdt_input.inx 2009-01-06 11:37:02.000000000 +0100
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Corel DRAW templates input</_name>
<id>org.inkscape.input.cdt</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.cdt</extension>
diff -up inkscape/share/extensions/cgm_input.inx.uniconv inkscape/share/extensions/cgm_input.inx
--- inkscape/share/extensions/cgm_input.inx.uniconv 2009-01-05 14:23:26.000000000 +0100
+++ inkscape/share/extensions/cgm_input.inx 2009-01-06 11:37:02.000000000 +0100
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Computer Graphics Metafile files input</_name>
<id>org.inkscape.input.cgm</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.cgm</extension>
diff -up inkscape/share/extensions/cmx_input.inx.uniconv inkscape/share/extensions/cmx_input.inx
--- inkscape/share/extensions/cmx_input.inx.uniconv 2009-01-05 14:23:26.000000000 +0100
+++ inkscape/share/extensions/cmx_input.inx 2009-01-06 11:37:02.000000000 +0100
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Corel DRAW Presentation Exchange files input</_name>
<id>org.inkscape.input.cmx</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.cmx</extension>
diff -up inkscape/share/extensions/sk1_input.inx.uniconv inkscape/share/extensions/sk1_input.inx
--- inkscape/share/extensions/sk1_input.inx.uniconv 2009-01-05 14:23:27.000000000 +0100
+++ inkscape/share/extensions/sk1_input.inx 2009-01-06 11:37:02.000000000 +0100
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>sK1 vector graphics files input</_name>
<id>org.inkscape.input.sk1</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.sk1</extension>
diff -up inkscape/share/extensions/uniconv-ext.py.uniconv inkscape/share/extensions/uniconv-ext.py
--- inkscape/share/extensions/uniconv-ext.py.uniconv 2009-01-05 14:23:28.000000000 +0100
+++ inkscape/share/extensions/uniconv-ext.py 2009-01-06 11:41:29.000000000 +0100
@@ -28,14 +28,10 @@ from subprocess import Popen, PIPE
cmd = 'none'
try:
- p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait()
- if p!=127 : cmd = 'uniconv'
p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait()
if p!=127 : cmd = 'uniconvertor'
except ImportError:
from popen2 import Popen3
- p = Popen3('uniconv', True).wait()
- if p!=32512 : cmd = 'uniconv'
p = Popen3('uniconvertor', True).wait()
if p!=32512 : cmd = 'uniconvertor'
diff -up inkscape/share/extensions/wmf_input.inx.uniconv inkscape/share/extensions/wmf_input.inx
--- inkscape/share/extensions/wmf_input.inx.uniconv 2009-01-05 14:23:28.000000000 +0100
+++ inkscape/share/extensions/wmf_input.inx 2009-01-06 11:37:02.000000000 +0100
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/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">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.wmf</extension>

98
inkscape-0.46-bitmap-fonts.patch
View File

@ -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];
+ }
}
}
}

22
inkscape-0.46-colors.patch
View File

@ -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) {

13
inkscape-0.46-cxxinclude.patch
View File

@ -1,13 +0,0 @@
diff -up inkscape-0.46/src/Makefile.in.cxxinclude inkscape-0.46/src/Makefile.in
--- inkscape-0.46/src/Makefile.in.cxxinclude 2008-03-11 05:47:10.000000000 +0100
+++ inkscape-0.46/src/Makefile.in 2008-08-13 23:26:52.000000000 +0200
@@ -1487,7 +1487,8 @@ INCLUDES = \
$(POPPLER_GLIB_CFLAGS) \
-DPOTRACE=\"potrace\" \
$(INKSCAPE_CFLAGS) \
- -I$(top_srcdir)/cxxtest
+ -I$(top_srcdir)/cxxtest \
+ -I$(top_srcdir)/src/extension/script
@PLATFORM_WIN32_TRUE@win32_sources = winmain.cpp registrytool.cpp registrytool.h
@PLATFORM_WIN32_TRUE@win32ldflags = -lcomdlg32

31
inkscape-0.46-desktop.patch
View File

@ -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@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

42
inkscape-0.46-fixlatex.patch
View File

@ -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()

16
inkscape-0.46-gtk2.13.3.patch
View File

@ -1,16 +0,0 @@
gtkctree.h and gtkclist.h include each other, the order of inclusion
is important in gtk-2.13.3
https://bugs.launchpad.net/inkscape/+bug/246868
Lubomir Rintel <lkundrak@v3.sk>
--- inkscape-0.46+devel.orig/src/widgets/sp-xmlview-attr-list.h 2008-06-24 13:38:07.000000000 +0200
+++ inkscape-0.46+devel/src/widgets/sp-xmlview-attr-list.h 2008-07-05 13:03:50.000000000 +0200
@@ -13,6 +13,7 @@
*/
#include <stdio.h>
+#include <gtk/gtkctree.h>
#include <gtk/gtkclist.h>
#include "../xml/repr.h"

20
inkscape-0.46-gtkopen.patch
View File

@ -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

45
inkscape-0.46-poppler-0.8.3.patch
View File

@ -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();

54
inkscape-0.46-uniconv.patch
View File

@ -1,54 +0,0 @@
See https://bugs.launchpad.net/inkscape/+bug/226383
https://bugzilla.redhat.com/show_bug.cgi?id=458845
Lubomir Rintel <lkundrak@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>

23
inkscape-0.46pre2-icons.patch
View File

@ -1,23 +0,0 @@
Default to small icons and Sans font.
diff -urp inkscape-0.45+0.46pre2.orig/src/preferences-skeleton.h inkscape-0.45+0.46pre2/src/preferences-skeleton.h
--- inkscape-0.45+0.46pre2.orig/src/preferences-skeleton.h 2008-02-17 05:24:14.000000000 +0100
+++ inkscape-0.45+0.46pre2/src/preferences-skeleton.h 2008-02-22 09:34:12.000000000 +0100
@@ -73,7 +73,7 @@ static char const preferences_skeleton[]
" tracebackground=\"0\" usepressure=\"1\" usetilt=\"0\" keep_selected=\"1\"/>\n"
" <eventcontext id=\"text\" usecurrent=\"0\" gradientdrag=\"1\"\n"
" font_sample=\"AaBbCcIiPpQq12369$\342\202\254\302\242?.;/()\"\n"
-" style=\"fill:black;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;font-style:normal;font-weight:normal;font-size:40px;\" selcue=\"1\"/>\n"
+" style=\"fill:black;fill-opacity:1;stroke:none;font-family:Sans;font-style:normal;font-weight:normal;font-size:40px;-inkscape-font-specification:Sans;font-stretch:normal;font-variant:normal\" selcue=\"1\"/>\n"
" <eventcontext id=\"nodes\" selcue=\"1\" gradientdrag=\"1\" show_handles=\"1\" sculpting_profile=\"1\" />\n"
" <eventcontext id=\"tweak\" selcue=\"0\" gradientdrag=\"0\" show_handles=\"0\" width=\"0.2\" force=\"0.2\" fidelity=\"0.5\" usepressure=\"1\" style=\"fill:red;stroke:none;\" usecurrent=\"0\"/>\n"
" <eventcontext id=\"gradient\" selcue=\"1\"/>\n"
@@ -308,7 +308,7 @@ static char const preferences_skeleton[]
" <group\n"
" id=\"tools\"\n"
" icononly=\"1\"\n"
-" small=\"0\" />\n"
+" small=\"1\" />\n"
" </group>\n"
"\n"
" <group\n"

20
inkscape-20090226svn-oldcairo.patch Normal file
View File

@ -0,0 +1,20 @@
Solves the compilation issue with older cairo (tested with EL-5's 1.2.8)
Lubomir Rintel <lkundrak@v3.sk>
Index: src/extension/internal/cairo-ps-out.cpp
===================================================================
--- src/extension/internal/cairo-ps-out.cpp (revision 20786)
+++ src/extension/internal/cairo-ps-out.cpp (working copy)
@@ -38,6 +38,11 @@
#include "io/sys.h"
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 5, 1)
+# define CAIRO_PS_LEVEL_2 0
+# define CAIRO_PS_LEVEL_3 1
+#endif
+
namespace Inkscape {
namespace Extension {
namespace Internal {

53
inkscape-20090227svn-automake.patch Normal file
View File

@ -0,0 +1,53 @@
Be able to autogen with older automake, that doesn't correctly compile
assembly language source files.
Lubomir Rintel <lkundrak@v3.sk>
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (revision 20789)
+++ src/Makefile.am (working copy)
@@ -282,3 +282,8 @@
distclean-local:
rm -f cxxtests.xml cxxtests.log
+
+# Work around old Automake bug (fixed in 1.10)
+CCASCOMPILE ?= $(CPPASCOMPILE)
+.S.o:
+ $(CCASCOMPILE) -c -o $@ $<
Index: autogen.sh
===================================================================
--- autogen.sh (revision 20789)
+++ autogen.sh (working copy)
@@ -15,7 +15,7 @@
FILE=inkscape.spec.in
AUTOCONF_REQUIRED_VERSION=2.52
-AUTOMAKE_REQUIRED_VERSION=1.10
+AUTOMAKE_REQUIRED_VERSION=1.9.6
GLIB_REQUIRED_VERSION=2.0.0
INTLTOOL_REQUIRED_VERSION=0.17
@@ -86,9 +86,9 @@
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
# Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
- AUTOMAKE=automake-1.10
- ACLOCAL=aclocal-1.10
+if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION
+ ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION
elif (automake --version) < /dev/null > /dev/null 2>&1; then
# Leave unversioned automake for a last resort: it may be a version earlier
# than what we require.
@@ -98,7 +98,7 @@
ACLOCAL=aclocal
else
echo
- echo " You must have automake 1.10 or newer installed to compile $PROJECT."
+ echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
DIE=1
fi
if test x$AUTOMAKE != x; then

29
inkscape-20090227svn-gcc44.patch Normal file
View File

@ -0,0 +1,29 @@
One more typing fix for GCC 4.4, and fix a NULL dereference on startup.
Lubomir Rintel <lkundrak@v3.sk>
diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp
--- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 2009-01-28 22:12:57.000000000 +0100
+++ inkscape/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);
diff -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp
--- inkscape/src/libnr/nr-object.cpp.gcc44 2009-03-02 17:06:46.000000000 +0100
+++ inkscape/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;

244
inkscape.spec
View File

@ -1,22 +1,28 @@
# Preserve lot of debugging information for now. This effectively
# disables FORTIFY_SOURCE, so it must be enabled before Gold
%define optflags %(rpm --eval %%optflags |sed 's/-O2/-O0/')
Name: inkscape
Version: 0.46
Release: 11%{?dist}
Version: 0.47
Release: 0.4.20090301svn%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
License: GPLv2+
URL: http://inkscape.sourceforge.net/
Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
Patch0: inkscape-0.46-cxxinclude.patch
Patch1: inkscape-0.46-desktop.patch
Patch2: inkscape-0.46pre2-icons.patch
Patch3: inkscape-0.46-fixlatex.patch
Patch4: inkscape-0.46-gtkopen.patch
Patch5: inkscape-0.46-gtk2.13.3.patch
Patch6: inkscape-0.46-poppler-0.8.3.patch
Patch7: inkscape-0.46-uniconv.patch
Patch8: inkscape-0.46-colors.patch
Patch9: inkscape-0.46-bitmap-fonts.patch
#Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
# svn export -r20798 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@20798 inkscape
# tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma
# Chuck the SVN snapshot specific blocks when bumping to a release:
# perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
Source0: %{name}.tar.lzma
Patch0: inkscape-0.46+devel-uniconv.patch
Patch1: inkscape-20090227svn-gcc44.patch
Patch2: inkscape-20090226svn-oldcairo.patch
# BEGIN SVN SNAPSHOT SPECIFIC
Patch3: inkscape-20090227svn-automake.patch
# END SVN SNAPSHOT SPECIFIC
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -35,75 +41,114 @@ BuildRequires: pango-devel
BuildRequires: pkgconfig
BuildRequires: lcms-devel >= 1.13
BuildRequires: cairo-devel
BuildRequires: openssl-devel
BuildRequires: dos2unix
BuildRequires: perl-XML-Parser
BuildRequires: python-devel
BuildRequires: poppler-devel
BuildRequires: loudmouth-devel
BuildRequires: boost-devel
# Use popt-devel if Fedora 8, RHEL 6, newer or unknown,
# rely on popt otherwise
%if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6
BuildRequires: popt
%else
BuildRequires: gsl-devel
BuildRequires: libwpg-devel
BuildRequires: ImageMagick-c++-devel
BuildRequires: perl(XML::Parser)
BuildRequires: perl(ExtUtils::Embed)
BuildRequires: intltool
# A packaging bug in EL-5
%if 0%{?fedora > 6}
BuildRequires: popt-devel
%else
BuildRequires: popt
%endif
# BEGIN SVN SNAPSHOT SPECIFIC
BuildRequires: autoconf
BuildRequires: automake
# END SVN SNAPSHOT SPECIFIC
# Incompatible license
BuildConflicts: openssl-devel
# Disable all for now. TODO: Be smarter
%if 0
Requires: dia
Requires: pstoedit
Requires: ghostscript
Requires: perl(Image::Magick)
Requires: tex(latex)
Requires: tex(dvips)
Requires: transfig
Requires: gimp
Requires: numpy
Requires: PyXML
Requires: python-lxml
Requires: uniconvertor
# TODO: Deal with these (autoreqs, disabled now):
# perl(Cwd)
# perl(Exporter)
# perl(File::Basename)
# perl(Getopt::Long)
# perl(Getopt::Std)
# perl(MIME::Base64)
# perl(Pod::Usage)
# perl(SVG)
# perl(SVG::Parser)
# perl(XML::XQL)
# perl(XML::XQL::DOM)
# perl(strict)
# perl(vars)
# perl(warnings)
%endif
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
# Filter out perl requires and provides
# XXX: For now _all_
%global __perl_provides %{nil}
%global __perl_requires %{nil}
%description
Inkscape is a vector-based drawing program, like CorelDraw® or Adobe
Illustrator® from the proprietary software world, and Sketch or Karbon14 from
the free software world. It is free software, distributed under the terms of
the Gnu General Public License, Version 2.
Inkscape is a vector graphics editor, with capabilities similar to
Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector
Graphics (SVG) file format. It is therefore a very useful tool for web
designers and as an interchange format for desktop publishing.
Inkscape uses W3C SVG as its native file format. It is therefore a very useful
tool for web designers and as an interchange format for desktop publishing.
It has a relatively modern display engine, giving you finely antialiased
display, alpha transparencies, vector fonts and so on. Inkscape is written in
C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
Inkscape supports many advanced SVG features (markers, clones, alpha
blending, etc.) and great care is taken in designing a streamlined
interface. It is very easy to edit nodes, perform complex path operations,
trace bitmaps and much more.
%prep
%setup -q
%patch0 -p1 -b .cxxinclude
%patch1 -p1 -b .desktop
%patch2 -p1 -b .icons
%patch3 -p1 -b .fixlatex
%patch4 -p0 -b .gtkopen
%patch5 -p1 -b .gtk2.13.3
%patch6 -p1 -b .poppler-0.8.3
%patch7 -p1 -b .uniconv
%patch8 -p2 -b .colors
%patch9 -p1 -b .bitmap-fonts
find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
%setup -q -n %{name}
%patch0 -p1 -b .uniconv
%patch1 -p1 -b .gcc44
%patch2 -p0 -b .oldcairo
# BEGIN SVN SNAPSHOT SPECIFIC
%patch3 -p0 -b .automake
# END SVN SNAPSHOT SPECIFIC
# https://bugs.launchpad.net/inkscape/+bug/314381
# A couple of files have executable bits set,
# despite not being executable
(find . \( -name '*.cpp' -o -name '*.h' \) -perm +111
find share/extensions -name '*.py' -perm +111
) |xargs chmod -x
# Fix end of line encodings
dos2unix -k -q share/extensions/*.py
%build
%configure \
--disable-dependency-tracking \
--with-xinerama \
--enable-static=no \
--with-python \
--with-perl \
--with-gnome-vfs \
--with-inkjar \
--enable-inkboard \
--enable-lcms \
--enable-poppler-cairo
# BEGIN SVN SNAPSHOT SPECIFIC
sh autogen.sh
# END SVN SNAPSHOT SPECIFIC
%configure \
--with-python \
--with-perl \
--with-gnome-vfs \
--with-xft \
--enable-lcms \
--enable-poppler-cairo \
--disable-dependency-tracking
# --enable-inkboard \
make %{?_smp_mflags}
@ -111,15 +156,21 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/outline2svg.*
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.*
desktop-file-install --vendor fedora --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
desktop-file-install --vendor fedora --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
# No skencil anymore
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
%find_lang %{name}
%check
# XXX: Tests fail, ignore it for now
make -k check || :
%clean
@ -127,27 +178,64 @@ rm -rf $RPM_BUILD_ROOT
%post
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
exec >/dev/null 2>&1
update-desktop-database %{_datadir}/applications || :
touch --no-create %{_datadir}/icons/hicolor
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
exec >/dev/null 2>&1
update-desktop-database %{_datadir}/applications || :
touch --no-create %{_datadir}/icons/hicolor
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc %{_mandir}/man1/*
%{_bindir}/*
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*
%{_mandir}/fr/man1/*
%{_bindir}/inkscape
%{_bindir}/inkview
%{_datadir}/inkscape
%{_datadir}/applications/fedora-inkscape.desktop
%{_datadir}/icons/hicolor/scalable/apps/inkscape.svg
%{_datadir}/pixmaps/inkscape.png
%{_mandir}/man1/inkscape.1*
%{_mandir}/man1/inkview.1*
%{_mandir}/fr/man1/inkscape.1*
%changelog
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.46-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Tue Mar 01 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.4.20090301svn
- Bump to later SVN snapshot to fix inkscape/+bug/331864
- Fix a startup crash when compiled with GCC 4.4
- It even runs now! :)
* Tue Feb 27 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.4.20090227svn
- Enable the test suite
* Tue Feb 27 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.3.20090227svn
- Past midnight! :)
- More recent snapshot, our gcc44 fixes now upstream
- One more gcc44 fix, it even compiles now
- We install icons now, update icon cache
- Disable inkboard, for it won't currently compile
* Tue Feb 26 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.3.20090226svn
- Later snapshot
- Compile with GCC 4.4
* Tue Jan 06 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.3.20090105svn
- Update to newer SVN
- Drop upstreamed patches
- Enable WordPerfect Graphics support
- Enable embedded Perl scripting
- Enable Imagemagick support
- Disable OpenSSL due to licensing issues
* 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
* Sat Jan 17 2009 Tomas Mraz <tmraz@redhat.com> - 0.46-10
- rebuild with new openssl
@ -157,17 +245,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.46-8
- Rebuild for Python 2.6
>>>>>>> 1.63
* Fri Nov 28 2008 Caolán McNamara <caolanm@redhat.com> - 0.46-7
- rebuild for dependencies
* Fri Oct 17 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.46-6
- Fix color sliders with recent GTK (#467431)
* Wed Aug 13 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.46-5
* 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)
* Wed Jul 09 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.1.20080705svn
- Subversion snapshot
* Wed Jul 09 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.46-4
- Fix compile issues with newer gtk and poppler

2
sources
View File

@ -1 +1 @@
59997096c3640b2601c2b4afba8a3d75 inkscape-0.46.tar.bz2
8803034773154e5d90e3bdac7de7ab30 inkscape.tar.lzma