diff options
Diffstat (limited to 'print')
| -rw-r--r-- | print/scribus/Makefile | 5 | ||||
| -rw-r--r-- | print/scribus/PLIST | 308 | ||||
| -rw-r--r-- | print/scribus/distinfo | 16 | ||||
| -rw-r--r-- | print/scribus/patches/patch-aa | 8 | ||||
| -rw-r--r-- | print/scribus/patches/patch-ab | 8 | ||||
| -rw-r--r-- | print/scribus/patches/patch-ac | 10 | ||||
| -rw-r--r-- | print/scribus/patches/patch-ad | 12 | ||||
| -rw-r--r-- | print/scribus/patches/patch-ae | 16 |
8 files changed, 213 insertions, 170 deletions
diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 09cc4da1266..82c70a58671 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2004/05/08 20:21:43 reed Exp $ +# $NetBSD: Makefile,v 1.18 2004/08/14 21:36:22 hubertf Exp $ -DISTNAME= scribus-1.1.1 -PKGREVISION= 1 +DISTNAME= scribus-1.1.7 CATEGORIES= print MASTER_SITES= http://scribus.planetmirror.com/ diff --git a/print/scribus/PLIST b/print/scribus/PLIST index 617aeabf7a4..f0b997d77b2 100644 --- a/print/scribus/PLIST +++ b/print/scribus/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2003/10/29 20:54:51 reed Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/08/14 21:36:22 hubertf Exp $ bin/scribus +include/scribus/alignselect.h include/scribus/bookmwin.h include/scribus/bookpalette.h include/scribus/cmykcolor.h @@ -7,6 +8,7 @@ include/scribus/colorm.h include/scribus/cpalette.h include/scribus/customfdialog.h include/scribus/fontcombo.h +include/scribus/fparser.h include/scribus/fpoint.h include/scribus/fpointarray.h include/scribus/frameedit.h @@ -24,17 +26,21 @@ include/scribus/mspinbox.h include/scribus/muster.h include/scribus/page.h include/scribus/pageitem.h +include/scribus/pageselector.h include/scribus/query.h include/scribus/scfonts.h include/scribus/scpainter.h include/scribus/scrap.h include/scribus/scribus.h +include/scribus/scribusXml.h include/scribus/scribusdoc.h include/scribus/scribusview.h include/scribus/scribuswin.h include/scribus/seiten.h +include/scribus/shadebutton.h include/scribus/spalette.h include/scribus/splash.h +include/scribus/styleselect.h include/scribus/tree.h include/scribus/vgradient.h include/scribus/vruler.h @@ -46,140 +52,21 @@ lib/scribus/dicts/hyph_de.dic lib/scribus/dicts/hyph_el.dic lib/scribus/dicts/hyph_en.dic lib/scribus/dicts/hyph_es.dic +lib/scribus/dicts/hyph_fi.dic lib/scribus/dicts/hyph_fr.dic +lib/scribus/dicts/hyph_ga.dic lib/scribus/dicts/hyph_hu.dic lib/scribus/dicts/hyph_it.dic +lib/scribus/dicts/hyph_lt.dic lib/scribus/dicts/hyph_nl.dic lib/scribus/dicts/hyph_pl.dic lib/scribus/dicts/hyph_pt.dic lib/scribus/dicts/hyph_ru.dic lib/scribus/dicts/hyph_sk.dic +lib/scribus/dicts/hyph_sl.dic +lib/scribus/dicts/hyph_sv.dic lib/scribus/dicts/hyph_uk.dic -lib/scribus/icons/AddNode.png -lib/scribus/icons/AddPoint.png -lib/scribus/icons/AppIcon.xpm -lib/scribus/icons/BevelJoin.png -lib/scribus/icons/BezierClose.png -lib/scribus/icons/Bild.xpm -lib/scribus/icons/ButtCap.png -lib/scribus/icons/Corner.xpm -lib/scribus/icons/DateiClos.xpm -lib/scribus/icons/DateiClos16.png -lib/scribus/icons/DateiNeu.xpm -lib/scribus/icons/DateiNeu16.png -lib/scribus/icons/DateiOpen.xpm -lib/scribus/icons/DateiOpen16.png -lib/scribus/icons/DateiPrint.xpm -lib/scribus/icons/DateiPrint16.png -lib/scribus/icons/DateiSave.xpm -lib/scribus/icons/DateiSave16.png -lib/scribus/icons/DelPoint.png -lib/scribus/icons/DeleteNode.png -lib/scribus/icons/Deletelayer.png -lib/scribus/icons/DragPix.xpm -lib/scribus/icons/Editm.xpm -lib/scribus/icons/FlipH.xpm -lib/scribus/icons/FlipV.xpm -lib/scribus/icons/Gross.xpm -lib/scribus/icons/HandC.xpm -lib/scribus/icons/Hoch.xpm -lib/scribus/icons/Kapital.xpm -lib/scribus/icons/Kern.xpm -lib/scribus/icons/Klein.xpm -lib/scribus/icons/Kreise.xpm -lib/scribus/icons/Kreuz.xpm -lib/scribus/icons/Layervisible.xpm -lib/scribus/icons/Lock.xpm -lib/scribus/icons/Lowerlayer.png -lib/scribus/icons/Lupe.xpm -lib/scribus/icons/LupeZ.xpm -lib/scribus/icons/MiterJoin.png -lib/scribus/icons/MoveAsym.png -lib/scribus/icons/MoveKontrol.png -lib/scribus/icons/MoveNode.png -lib/scribus/icons/MoveSym.png -lib/scribus/icons/Newlayer.png -lib/scribus/icons/NoPrint.png -lib/scribus/icons/PolyCut.png -lib/scribus/icons/Raiselayer.png -lib/scribus/icons/Rechtecke.xpm -lib/scribus/icons/Reset1Node.png -lib/scribus/icons/ResetNode.png -lib/scribus/icons/Revers.png -lib/scribus/icons/Rotieren.xpm -lib/scribus/icons/Rotieren2.xpm -lib/scribus/icons/RoundCap.png -lib/scribus/icons/RoundJoin.png -lib/scribus/icons/Spacing.xpm -lib/scribus/icons/Splash.png -lib/scribus/icons/Split.png -lib/scribus/icons/SquareCap.png -lib/scribus/icons/Stift.xpm -lib/scribus/icons/Stiftalt.xpm -lib/scribus/icons/Strike.xpm -lib/scribus/icons/Text.xpm -lib/scribus/icons/Text2.xpm -lib/scribus/icons/Tief.xpm -lib/scribus/icons/Unlock.xpm -lib/scribus/icons/Unter.xpm -lib/scribus/icons/Winkel.xpm -lib/scribus/icons/Zeichen.xpm -lib/scribus/icons/acrobat.png -lib/scribus/icons/back.png -lib/scribus/icons/beziertool.png -lib/scribus/icons/bottom.png -lib/scribus/icons/charset.png -lib/scribus/icons/checkbox.png -lib/scribus/icons/combobox.png -lib/scribus/icons/doc.png -lib/scribus/icons/document2.png -lib/scribus/icons/down.png -lib/scribus/icons/editcopy.png -lib/scribus/icons/editcut.png -lib/scribus/icons/editdelete.png -lib/scribus/icons/editpaste.png -lib/scribus/icons/exit.png -lib/scribus/icons/fill.png -lib/scribus/icons/finish.png -lib/scribus/icons/forward.png -lib/scribus/icons/gohome.png -lib/scribus/icons/goto.png -lib/scribus/icons/hmirror.png -lib/scribus/icons/image.png -lib/scribus/icons/irreg.png -lib/scribus/icons/listbox.png -lib/scribus/icons/locked.png -lib/scribus/icons/ok.png -lib/scribus/icons/outlined.png -lib/scribus/icons/oval.png -lib/scribus/icons/pdf.png -lib/scribus/icons/penciladd.png -lib/scribus/icons/pencilsub.png -lib/scribus/icons/postscript.png -lib/scribus/icons/pushbutton.png -lib/scribus/icons/rect.png -lib/scribus/icons/scribus_logo.jpg -lib/scribus/icons/scribusicon.png -lib/scribus/icons/shear_down.png -lib/scribus/icons/shear_left.png -lib/scribus/icons/shear_right.png -lib/scribus/icons/shear_up.png -lib/scribus/icons/spline.png -lib/scribus/icons/start.png -lib/scribus/icons/text_block.png -lib/scribus/icons/text_center.png -lib/scribus/icons/text_force.png -lib/scribus/icons/text_left.png -lib/scribus/icons/text_right.png -lib/scribus/icons/textview.png -lib/scribus/icons/top.png -lib/scribus/icons/trashcan.png -lib/scribus/icons/trashcan2.png -lib/scribus/icons/triangle.png -lib/scribus/icons/txt.png -lib/scribus/icons/unlock.png -lib/scribus/icons/up.png -lib/scribus/icons/vmirror.png +lib/scribus/import.prolog lib/scribus/libs/libabout.la lib/scribus/libs/libabout.so lib/scribus/libs/libabout.so.0 @@ -196,17 +83,26 @@ lib/scribus/libs/libpreferences.la lib/scribus/libs/libpreferences.so lib/scribus/libs/libpreferences.so.0 lib/scribus/libs/libpreferences.so.0.0 -lib/scribus/plugins/charselect.da.qm -lib/scribus/plugins/charselect.no.qm -lib/scribus/plugins/charselect.sk.qm lib/scribus/plugins/libcharselect.la lib/scribus/plugins/libcharselect.so lib/scribus/plugins/libcharselect.so.0 lib/scribus/plugins/libcharselect.so.0.0 +lib/scribus/plugins/libfontpreview.la +lib/scribus/plugins/libfontpreview.so +lib/scribus/plugins/libfontpreview.so.0 +lib/scribus/plugins/libfontpreview.so.0.0 +lib/scribus/plugins/libimportps.la +lib/scribus/plugins/libimportps.so +lib/scribus/plugins/libimportps.so.0 +lib/scribus/plugins/libimportps.so.0.0 lib/scribus/plugins/libpreview.la lib/scribus/plugins/libpreview.so lib/scribus/plugins/libpreview.so.0 lib/scribus/plugins/libpreview.so.0.0 +lib/scribus/plugins/libscribusexportpixmap.la +lib/scribus/plugins/libscribusexportpixmap.so +lib/scribus/plugins/libscribusexportpixmap.so.0 +lib/scribus/plugins/libscribusexportpixmap.so.0.0 lib/scribus/plugins/libsvgexplugin.la lib/scribus/plugins/libsvgexplugin.so lib/scribus/plugins/libsvgexplugin.so.0 @@ -215,31 +111,181 @@ lib/scribus/plugins/libsvgimplugin.la lib/scribus/plugins/libsvgimplugin.so lib/scribus/plugins/libsvgimplugin.so.0 lib/scribus/plugins/libsvgimplugin.so.0.0 -lib/scribus/plugins/svgexport.sk.qm lib/scribus/profiles/ReadMe +lib/scribus/rgbscribus.txt +lib/scribus/rgbscribusgnome.txt +lib/scribus/rgbscribusgreys.txt +lib/scribus/rgbsvg.txt lib/scribus/scribus.bg.qm +lib/scribus/scribus.br.qm +lib/scribus/scribus.ca.qm lib/scribus/scribus.cs.qm lib/scribus/scribus.cy.qm lib/scribus/scribus.da.qm lib/scribus/scribus.de.qm lib/scribus/scribus.en_GB.qm lib/scribus/scribus.es.qm +lib/scribus/scribus.eu.qm +lib/scribus/scribus.fi.qm lib/scribus/scribus.fr.qm lib/scribus/scribus.gl.qm lib/scribus/scribus.hu.qm lib/scribus/scribus.id.qm lib/scribus/scribus.it.qm +lib/scribus/scribus.lt.qm lib/scribus/scribus.nl.qm lib/scribus/scribus.no.qm lib/scribus/scribus.pl.qm lib/scribus/scribus.ru.qm lib/scribus/scribus.sk.qm +lib/scribus/scribus.sl.qm lib/scribus/scribus.tr.qm lib/scribus/scribus.uk.qm +share/scribus/icons/AddNode.png +share/scribus/icons/AddPoint.png +share/scribus/icons/AppIcon.png +share/scribus/icons/AppIcon2.png +share/scribus/icons/BevelJoin.png +share/scribus/icons/BezierClose.png +share/scribus/icons/Bild.xpm +share/scribus/icons/ButtCap.png +share/scribus/icons/Corner.xpm +share/scribus/icons/DateiClos.xpm +share/scribus/icons/DateiClos16.png +share/scribus/icons/DateiNeu.xpm +share/scribus/icons/DateiNeu16.png +share/scribus/icons/DateiOpen.xpm +share/scribus/icons/DateiOpen16.png +share/scribus/icons/DateiPrint.xpm +share/scribus/icons/DateiPrint16.png +share/scribus/icons/DateiSave.xpm +share/scribus/icons/DateiSave16.png +share/scribus/icons/DelPoint.png +share/scribus/icons/DeleteNode.png +share/scribus/icons/Deletelayer.png +share/scribus/icons/DragPix.xpm +share/scribus/icons/Editm.xpm +share/scribus/icons/FlipH.xpm +share/scribus/icons/FlipV.xpm +share/scribus/icons/Gross.xpm +share/scribus/icons/HandC.xpm +share/scribus/icons/Hoch.xpm +share/scribus/icons/Kapital.xpm +share/scribus/icons/Kern.xpm +share/scribus/icons/Klein.xpm +share/scribus/icons/Kreise.xpm +share/scribus/icons/Kreuz.xpm +share/scribus/icons/Layervisible.xpm +share/scribus/icons/Lock.xpm +share/scribus/icons/Lowerlayer.png +share/scribus/icons/Lupe.xpm +share/scribus/icons/LupeZ.xpm +share/scribus/icons/MiterJoin.png +share/scribus/icons/MoveAsym.png +share/scribus/icons/MoveKontrol.png +share/scribus/icons/MoveNode.png +share/scribus/icons/MoveSym.png +share/scribus/icons/Newlayer.png +share/scribus/icons/NoPrint.png +share/scribus/icons/PolyCut.png +share/scribus/icons/Raiselayer.png +share/scribus/icons/Rechtecke.xpm +share/scribus/icons/Reset1Node.png +share/scribus/icons/ResetNode.png +share/scribus/icons/Revers.png +share/scribus/icons/Rotieren.xpm +share/scribus/icons/Rotieren2.xpm +share/scribus/icons/RoundCap.png +share/scribus/icons/RoundJoin.png +share/scribus/icons/Spacing.xpm +share/scribus/icons/Splash.png +share/scribus/icons/Split.png +share/scribus/icons/SquareCap.png +share/scribus/icons/Stift.xpm +share/scribus/icons/Stiftalt.xpm +share/scribus/icons/Strike.xpm +share/scribus/icons/Text.xpm +share/scribus/icons/Text2.xpm +share/scribus/icons/Tief.xpm +share/scribus/icons/Unlock.xpm +share/scribus/icons/Unter.xpm +share/scribus/icons/Winkel.xpm +share/scribus/icons/Zeichen.xpm +share/scribus/icons/acrobat.png +share/scribus/icons/back.png +share/scribus/icons/beziertool.png +share/scribus/icons/bottom.png +share/scribus/icons/charset.png +share/scribus/icons/checkbox.png +share/scribus/icons/combobox.png +share/scribus/icons/crop.png +share/scribus/icons/dist.png +share/scribus/icons/doc.png +share/scribus/icons/document2.png +share/scribus/icons/down.png +share/scribus/icons/editcopy.png +share/scribus/icons/editcut.png +share/scribus/icons/editdelete.png +share/scribus/icons/editpaste.png +share/scribus/icons/exit.png +share/scribus/icons/expand.png +share/scribus/icons/fill.png +share/scribus/icons/finish.png +share/scribus/icons/forward.png +share/scribus/icons/frame_table.png +share/scribus/icons/framenoresize.png +share/scribus/icons/frameresize.png +share/scribus/icons/gohome.png +share/scribus/icons/goto.png +share/scribus/icons/hmirror.png +share/scribus/icons/image.png +share/scribus/icons/irreg.png +share/scribus/icons/listbox.png +share/scribus/icons/locked.png +share/scribus/icons/ok.png +share/scribus/icons/outlined.png +share/scribus/icons/pdf.png +share/scribus/icons/penciladd.png +share/scribus/icons/pencilsub.png +share/scribus/icons/postscript.png +share/scribus/icons/pushbutton.png +share/scribus/icons/rotate_ccw.png +share/scribus/icons/rotate_cw.png +share/scribus/icons/scribus_head.png +share/scribus/icons/scribus_logo.jpg +share/scribus/icons/scribusdoc.png +share/scribus/icons/scribusicon.png +share/scribus/icons/shear_down.png +share/scribus/icons/shear_left.png +share/scribus/icons/shear_right.png +share/scribus/icons/shear_up.png +share/scribus/icons/signature.png +share/scribus/icons/spline.png +share/scribus/icons/start.png +share/scribus/icons/tab.png +share/scribus/icons/testfill.png +share/scribus/icons/text_block.png +share/scribus/icons/text_center.png +share/scribus/icons/text_force.png +share/scribus/icons/text_left.png +share/scribus/icons/text_right.png +share/scribus/icons/textview.png +share/scribus/icons/top.png +share/scribus/icons/trashcan.png +share/scribus/icons/trashcan2.png +share/scribus/icons/triangle.png +share/scribus/icons/txt.png +share/scribus/icons/unlock.png +share/scribus/icons/up.png +share/scribus/icons/view.png +share/scribus/icons/vmirror.png +share/scribus/samples/LoremIpsum.txt +@dirrm share/scribus/samples +@dirrm share/scribus/icons +@dirrm share/scribus @dirrm lib/scribus/profiles @dirrm lib/scribus/plugins @dirrm lib/scribus/libs -@dirrm lib/scribus/icons @dirrm lib/scribus/dicts @dirrm lib/scribus @dirrm include/scribus/libpostscript diff --git a/print/scribus/distinfo b/print/scribus/distinfo index 0836c8a33fa..a3117d9260e 100644 --- a/print/scribus/distinfo +++ b/print/scribus/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2004/02/27 21:14:08 kristerw Exp $ +$NetBSD: distinfo,v 1.5 2004/08/14 21:36:22 hubertf Exp $ -SHA1 (scribus-1.1.1.tar.gz) = 640e1007fd0b16c1b4f797910d8628b2be0923a2 -Size (scribus-1.1.1.tar.gz) = 2053257 bytes -SHA1 (patch-aa) = 74c57344608436ab449f042016495d6895c80f76 -SHA1 (patch-ab) = d2430e5b81c2ff00390f8135a753ce6a40653af7 -SHA1 (patch-ac) = c874f71ca7d93ece073a11e73cb6ef54c62f968d -SHA1 (patch-ad) = 5c8e0cdacd63ce38a15bcb94c3473d531bb4b836 -SHA1 (patch-ae) = fa4f8e30c2492686ab4fb631910a07bf5e1dae3f +SHA1 (scribus-1.1.7.tar.gz) = 144a8d1c29c173b83023e9bb8f83db1924a1cf96 +Size (scribus-1.1.7.tar.gz) = 2555298 bytes +SHA1 (patch-aa) = 5cac75797519761bfbea3ebfb563125a51c32b05 +SHA1 (patch-ab) = 34bf150818f1fa9a53d23691a4f577f211750c02 +SHA1 (patch-ac) = 3478bbc02a41c955fb820048beb6935567d19a54 +SHA1 (patch-ad) = 9203829ecfb4d8da4ebf185fcd446f1ecbb044c1 +SHA1 (patch-ae) = 9b79846bd5ceb93ed04bf9ec86e3c1fc89a086ee diff --git a/print/scribus/patches/patch-aa b/print/scribus/patches/patch-aa index 58da56166b6..116ebc890c7 100644 --- a/print/scribus/patches/patch-aa +++ b/print/scribus/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.2 2003/10/29 20:54:51 reed Exp $ +$NetBSD: patch-aa,v 1.3 2004/08/14 21:36:22 hubertf Exp $ ---- scribus/scpreview.cpp.orig Wed Oct 15 18:44:36 2003 -+++ scribus/scpreview.cpp Wed Oct 15 19:39:15 2003 +--- scribus/scpreview.cpp.orig 2004-05-29 00:33:28.000000000 +0200 ++++ scribus/scpreview.cpp @@ -11,6 +11,7 @@ #include <qdir.h> #include <cmath> #include <cstdlib> +#include <iostream> #include "missing.h" - extern float QStoFloat(QString in); + extern double QStodouble(QString in); extern int QStoInt(QString in); diff --git a/print/scribus/patches/patch-ab b/print/scribus/patches/patch-ab index b166bfe4261..b2e8a293188 100644 --- a/print/scribus/patches/patch-ab +++ b/print/scribus/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1 2003/10/29 20:54:51 reed Exp $ +$NetBSD: patch-ab,v 1.2 2004/08/14 21:36:22 hubertf Exp $ ---- scribus/mpalette.cpp.orig Wed Oct 15 19:15:33 2003 -+++ scribus/mpalette.cpp Wed Oct 15 19:39:06 2003 +--- scribus/mpalette.cpp.orig 2004-06-04 22:00:51.000000000 +0200 ++++ scribus/mpalette.cpp @@ -4,6 +4,7 @@ #include <qpoint.h> #include <qwmatrix.h> @@ -9,4 +9,4 @@ $NetBSD: patch-ab,v 1.1 2003/10/29 20:54:51 reed Exp $ +#include <iostream> #include "query.h" #include "scribusview.h" - extern QPixmap loadIcon(QString nam); + #include "autoform.h" diff --git a/print/scribus/patches/patch-ac b/print/scribus/patches/patch-ac index af4b52bc5d6..4e1332799e7 100644 --- a/print/scribus/patches/patch-ac +++ b/print/scribus/patches/patch-ac @@ -1,10 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2003/11/19 11:54:48 agc Exp $ +$NetBSD: patch-ac,v 1.2 2004/08/14 21:36:22 hubertf Exp $ -Allow the configure script to find the buildlink'ed freetype-config script - ---- configure 2003/11/19 11:35:05 1.1 -+++ configure 2003/11/19 11:36:42 -@@ -1935,7 +1935,7 @@ +--- configure.orig 2004-06-05 09:55:44.000000000 +0200 ++++ configure +@@ -3132,7 +3132,7 @@ else ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR diff --git a/print/scribus/patches/patch-ad b/print/scribus/patches/patch-ad index 0cf5f94ff5e..af21f14cf66 100644 --- a/print/scribus/patches/patch-ad +++ b/print/scribus/patches/patch-ad @@ -1,16 +1,16 @@ -$NetBSD: patch-ad,v 1.1 2004/02/27 21:14:08 kristerw Exp $ +$NetBSD: patch-ad,v 1.2 2004/08/14 21:36:22 hubertf Exp $ ---- scribus/plugins/svgimplugin/svgplugin.cpp.orig Fri Feb 27 21:24:53 2004 -+++ scribus/plugins/svgimplugin/svgplugin.cpp Fri Feb 27 21:25:07 2004 +--- scribus/plugins/svgimplugin/svgplugin.cpp.orig 2004-06-04 22:39:11.000000000 +0200 ++++ scribus/plugins/svgimplugin/svgplugin.cpp @@ -1,3 +1,4 @@ +#include <cmath> #include "svgplugin.h" #include "svgplugin.moc" - #include "config.h" -@@ -7,7 +8,6 @@ - #include <qfile.h> + +@@ -15,7 +16,6 @@ #include <qtextstream.h> #include <qregexp.h> + #include <qcursor.h> -#include <cmath> #ifdef HAVE_LIBZ #include <zlib.h> diff --git a/print/scribus/patches/patch-ae b/print/scribus/patches/patch-ae index 189d42079d4..559fd623344 100644 --- a/print/scribus/patches/patch-ae +++ b/print/scribus/patches/patch-ae @@ -1,20 +1,20 @@ -$NetBSD: patch-ae,v 1.1 2004/02/27 21:14:08 kristerw Exp $ +$NetBSD: patch-ae,v 1.2 2004/08/14 21:36:22 hubertf Exp $ ---- scribus/scribusXml.cpp.orig Fri Feb 27 21:30:26 2004 -+++ scribus/scribusXml.cpp Fri Feb 27 21:30:45 2004 -@@ -5,6 +5,7 @@ - copyright : (C) 2001 by Christian Töpp +--- scribus/scribusXml.cpp.orig 2004-05-30 15:08:23.000000000 +0200 ++++ scribus/scribusXml.cpp +@@ -6,6 +6,7 @@ email : christian.toepp@mr-ct@gmx.de ***************************************************************************/ + +#include <cmath> #include "scribusXml.h" #include "scribusXml.moc" #include <qfile.h> -@@ -17,7 +18,6 @@ +@@ -18,7 +19,6 @@ #include <qdir.h> #include <qtextcodec.h> #include <cstdlib> -#include <cmath> #include "missing.h" - #include "config.h" - #ifdef HAVE_LIBZ + + #if (_MSC_VER >= 1200) |