From 859c47ec7cf7cfdad0c4197e4808fbe2ecdc4b8d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Jun 03 2009 07:21:01 +0000 Subject: Merge from devel --- diff --git a/.cvsignore b/.cvsignore index 883ac0a..b4a5d39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -inkscape-0.46.tar.bz2 +inkscape.tar.lzma diff --git a/inkscape-0.46-bitmap-fonts.patch b/inkscape-0.46-bitmap-fonts.patch deleted file mode 100644 index fcb0d55..0000000 --- a/inkscape-0.46-bitmap-fonts.patch +++ /dev/null @@ -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 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 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]; -+ } - } - } - } diff --git a/inkscape-0.46-colors.patch b/inkscape-0.46-colors.patch deleted file mode 100644 index e77f5b5..0000000 --- a/inkscape-0.46-colors.patch +++ /dev/null @@ -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) { diff --git a/inkscape-0.46-cxxinclude.patch b/inkscape-0.46-cxxinclude.patch deleted file mode 100644 index 9f9e0b6..0000000 --- a/inkscape-0.46-cxxinclude.patch +++ /dev/null @@ -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 diff --git a/inkscape-0.46-desktop.patch b/inkscape-0.46-desktop.patch deleted file mode 100644 index 7fac2f0..0000000 --- a/inkscape-0.46-desktop.patch +++ /dev/null @@ -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 ) -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 diff --git a/inkscape-0.46-fixlatex.patch b/inkscape-0.46-fixlatex.patch deleted file mode 100644 index 379ec6b..0000000 --- a/inkscape-0.46-fixlatex.patch +++ /dev/null @@ -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() diff --git a/inkscape-0.46-gtk2.13.3.patch b/inkscape-0.46-gtk2.13.3.patch deleted file mode 100644 index 5d862e7..0000000 --- a/inkscape-0.46-gtk2.13.3.patch +++ /dev/null @@ -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 - ---- 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 -+#include - #include - #include "../xml/repr.h" - diff --git a/inkscape-0.46-gtkopen.patch b/inkscape-0.46-gtkopen.patch deleted file mode 100644 index 75e7fe3..0000000 --- a/inkscape-0.46-gtkopen.patch +++ /dev/null @@ -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 diff --git a/inkscape-0.46-poppler-0.8.3.patch b/inkscape-0.46-poppler-0.8.3.patch deleted file mode 100644 index 9d4b027..0000000 --- a/inkscape-0.46-poppler-0.8.3.patch +++ /dev/null @@ -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(); diff --git a/inkscape-0.46-uniconv.patch b/inkscape-0.46-uniconv.patch deleted file mode 100644 index 8672715..0000000 --- a/inkscape-0.46-uniconv.patch +++ /dev/null @@ -1,54 +0,0 @@ -See https://bugs.launchpad.net/inkscape/+bug/226383 -https://bugzilla.redhat.com/show_bug.cgi?id=458845 - -Lubomir Rintel - -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 @@ - - <_name>Corel DRAW Input - org.inkscape.input.cdr -- uniconv -+ unviconvertor - cdr2svg.sh - - .cdr -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 @@ - - <_name>Windows Metafile Input - org.inkscape.input.wmf -- uniconv -+ unviconvertor - cdr2svg.sh - - .wmf diff --git a/inkscape-0.46pre2-icons.patch b/inkscape-0.46pre2-icons.patch deleted file mode 100644 index 373e6cb..0000000 --- a/inkscape-0.46pre2-icons.patch +++ /dev/null @@ -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" - " \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" - " \n" - " \n" - " \n" -@@ -308,7 +308,7 @@ static char const preferences_skeleton[] - " \n" -+" small=\"1\" />\n" - " \n" - "\n" - " + +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 { diff --git a/inkscape-20090227svn-automake.patch b/inkscape-20090227svn-automake.patch new file mode 100644 index 0000000..35348aa --- /dev/null +++ b/inkscape-20090227svn-automake.patch @@ -0,0 +1,53 @@ +Be able to autogen with older automake, that doesn't correctly compile +assembly language source files. + +Lubomir Rintel + +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 diff --git a/inkscape-20090410svn-formats.patch b/inkscape-20090410svn-formats.patch new file mode 100644 index 0000000..e0f27a4 --- /dev/null +++ b/inkscape-20090410svn-formats.patch @@ -0,0 +1,16 @@ +See https://bugzilla.redhat.com/show_bug.cgi?id=458845 + +Lubomir Rintel + +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 --git a/inkscape-20090410svn-uniconv.patch b/inkscape-20090410svn-uniconv.patch new file mode 100644 index 0000000..a434116 --- /dev/null +++ b/inkscape-20090410svn-uniconv.patch @@ -0,0 +1,38 @@ +uniconvertor and uniconv are looked in in reversed order +(therefore we can call uniconv that's different from the uniconvertor one) +https://bugs.launchpad.net/inkscape/+bug/226383 + +Lubomir Rintel + +diff -up inkscape/share/extensions/uniconv-ext.py.uniconv inkscape/share/extensions/uniconv-ext.py +--- inkscape/share/extensions/uniconv-ext.py.uniconv 2009-03-01 18:06:19.000000000 +0100 ++++ inkscape/share/extensions/uniconv-ext.py 2009-04-10 15:22:21.916579400 +0200 +@@ -28,19 +28,21 @@ cmd = None + + try: + from subprocess import Popen, PIPE +- p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait() ++ p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait() + if p==0 : +- cmd = 'uniconv' ++ cmd = 'uniconvertor' + else: +- p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait() ++ p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait() + if p==0 : +- cmd = 'uniconvertor' ++ cmd = 'uniconv' + 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' ++ if p!=32512 : ++ cmd = 'uniconvertor' ++ else: ++ p = Popen3('uniconv', True).wait() ++ if p!=32512 : cmd = 'uniconv' + + if cmd == None: + # there's no succeffully-returning uniconv command; try to get the module directly (on Windows) diff --git a/inkscape-20090508svn-crc32.patch b/inkscape-20090508svn-crc32.patch new file mode 100644 index 0000000..41eabbe --- /dev/null +++ b/inkscape-20090508svn-crc32.patch @@ -0,0 +1,20 @@ +CRC-32 for 64-bit systems is calculated incorrectly, +resulting in corrupted ODG exported files. + +https://bugs.launchpad.net/inkscape/+bug/275519 +https://bugzilla.redhat.com/show_bug.cgi?id=499088 + +Lubomir Rintel + +diff -up inkscape/src/dom/util/ziptool.cpp.crc32 inkscape/src/dom/util/ziptool.cpp +--- inkscape/src/dom/util/ziptool.cpp.crc32 2009-05-18 06:12:56.000000000 +0200 ++++ inkscape/src/dom/util/ziptool.cpp 2009-05-18 06:13:31.000000000 +0200 +@@ -158,6 +158,8 @@ void Crc32::reset() + void Crc32::update(unsigned char b) + { + unsigned long c = ~value; ++ ++ c &= 0xffffffff; + c = crc_table[(c ^ b) & 0xff] ^ (c >> 8); + value = ~c; + } diff --git a/inkscape.spec b/inkscape.spec index 80b5c3e..bd84a00 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,22 +1,25 @@ Name: inkscape -Version: 0.46 -Release: 6%{?dist}.1 +Version: 0.47 +Release: 0.11.20090602svn%{?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 -r21467 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@21467 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}' = 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. +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. -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. + +%package view +Summary: Viewing program for SVG files +Group: Applications/Productivity + +%description view +Viewer for files in W3C standard Scalable Vector Graphics (SVG) file +format. + + +%package docs +Summary: Documentation for Inkscape +Group: Documentation +Requires: inkscape + +%description docs +Tutorial and examples for Inkscape, a graphics editor for vector +graphics in W3C standard Scalable Vector Graphics (SVG) file format. %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 .crc32 +%patch2 -p0 -b .oldcairo +%patch4 -p1 -b .formats +# 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,51 +173,130 @@ 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 - -%clean -rm -rf $RPM_BUILD_ROOT +%find_lang %{name} -%post -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%check +# XXX: Tests fail, ignore it for now +make -k check || : -%postun -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%clean +rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) +%{_bindir}/inkscape +%dir %{_datadir}/inkscape +%{_datadir}/inkscape/clipart +%{_datadir}/inkscape/extensions +%{_datadir}/inkscape/filters +%{_datadir}/inkscape/fonts +%{_datadir}/inkscape/gradients +%{_datadir}/inkscape/icons +%{_datadir}/inkscape/keys +%{_datadir}/inkscape/markers +%{_datadir}/inkscape/palettes +%{_datadir}/inkscape/patterns +%{_datadir}/inkscape/screens +%{_datadir}/inkscape/templates +%{_datadir}/inkscape/ui +%{_datadir}/applications/fedora-inkscape.desktop +%{_datadir}/pixmaps/inkscape.png +%{_mandir}/man1/inkscape.1* +%{_mandir}/man1/inkview.1* +%{_mandir}/fr/man1/inkscape.1* + + +%files view +%defattr(-,root,root,-) +%{_bindir}/inkview %doc AUTHORS COPYING ChangeLog NEWS README -%doc %{_mandir}/man1/* -%{_bindir}/* -%{_datadir}/%{name}/ -%{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/* -%{_mandir}/fr/man1/* + + +%files docs +%defattr(-,root,root,-) +%dir %{_datadir}/inkscape +%{_datadir}/inkscape/tutorials +%{_datadir}/inkscape/examples %changelog -* Tue Jan 13 2009 Lubomir Rintel - 0.46-6.1 -- Fix crash with bitmap font (#477158) +* Tue Jun 02 2009 Lubomir Rintel - 0.47-0.11.20090602svn +- More recent snapshot +- Upstream removed rasterized icons again + +* Sat May 23 2009 Lubomir Rintel - 0.47-0.10.20090518svn +- Rebuild for new poppler + +* Mon May 18 2009 Lubomir Rintel - 0.47-0.9.20090518svn +- Update past upstream Beta release + +* Mon May 18 2009 Lubomir Rintel - 0.47-0.8.20090508svn +- Fix ODG export + +* Fri May 08 2009 Lubomir Rintel - 0.47-0.7.20090508svn +- Update to a post-alpha snapshot +- Upstream applied our GCC 4.4 patch -* Fri Oct 17 2008 Lubomir Rintel - 0.46-6 -- Fix color sliders with recent GTK (#467431) +* Fri Apr 10 2009 Lubomir Rintel - 0.47-0.6.20090410svn +- Update to newer snapshot +- Fix doc/incview reversed subpackage content -* Wed Aug 13 2008 Lubomir Rintel - 0.46-5 +* Wed Mar 04 2009 Lubomir Rintel - 0.47-0.6.20090301svn +- Rebuild for new ImageMagick + +* Wed Mar 04 2009 Lubomir Rintel - 0.47-0.5.20090301svn +- Split documentation and inkview into subpackages + +* Mon Mar 02 2009 Lubomir Rintel - 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! :) + +* Fri Feb 27 2009 Lubomir Rintel - 0.47-0.4.20090227svn +- Enable the test suite + +* Fri Feb 27 2009 Lubomir Rintel - 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 + +* Thu Feb 26 2009 Lubomir Rintel - 0.47-0.3.20090226svn +- Later snapshot +- Compile with GCC 4.4 + +* Tue Jan 06 2009 Lubomir Rintel - 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 - 0.47-0.3.20080814svn +- Update to today's SVN snapshot +- Drop the upstreamed poppler patch + +* Wed Aug 13 2008 Lubomir Rintel - 0.47-0.2.20080705svn - Rediff patches for zero fuzz - Use uniconvertor to handle CDR and WMF (#458845) +* Wed Jul 09 2008 Lubomir Rintel - 0.47-0.1.20080705svn +- Subversion snapshot + * Wed Jul 09 2008 Lubomir Rintel - 0.46-4 - Fix compile issues with newer gtk and poppler diff --git a/sources b/sources index deb5c8b..f2cb33f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59997096c3640b2601c2b4afba8a3d75 inkscape-0.46.tar.bz2 +3627a522c67f6241ac41fde1e7158987 inkscape.tar.lzma