diff options
author | drochner <drochner@pkgsrc.org> | 2007-01-11 19:19:01 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2007-01-11 19:19:01 +0000 |
commit | 30db0e3d523cb2abe3bdf58a7ad3c82777ee65c5 (patch) | |
tree | 1063b2f0ed569704b8e4220d435c755fc993b372 /print/scribus/patches | |
parent | 979bee578442d4ced40091b2e2d4ca5076da887b (diff) | |
download | pkgsrc-30db0e3d523cb2abe3bdf58a7ad3c82777ee65c5.tar.gz |
update to 1.3.3.7
This switches the pkg to the 1.3 branch which is declared stable now.
Diffstat (limited to 'print/scribus/patches')
-rw-r--r-- | print/scribus/patches/patch-aa | 10 | ||||
-rw-r--r-- | print/scribus/patches/patch-ab | 16 | ||||
-rw-r--r-- | print/scribus/patches/patch-ad | 16 | ||||
-rw-r--r-- | print/scribus/patches/patch-ae | 16 |
4 files changed, 29 insertions, 29 deletions
diff --git a/print/scribus/patches/patch-aa b/print/scribus/patches/patch-aa index d39ed39e318..1ddb0d478d6 100644 --- a/print/scribus/patches/patch-aa +++ b/print/scribus/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.5 2006/03/17 23:53:31 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2007/01/11 19:19:01 drochner Exp $ ---- scribus/scpreview.cpp.orig 2005-07-03 09:13:14.000000000 +0000 +--- scribus/scpreview.cpp.orig 2006-02-20 22:09:51.000000000 +0100 +++ scribus/scpreview.cpp -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ for which a new license (GPL+exception) #include <qdir.h> #include <cmath> #include <cstdlib> +#include <iostream> - #include "missing.h" - #include "scribus.h" + #include "missing.h" + #include "sccolor.h" diff --git a/print/scribus/patches/patch-ab b/print/scribus/patches/patch-ab index 9e36172c439..7b3e75c3e49 100644 --- a/print/scribus/patches/patch-ab +++ b/print/scribus/patches/patch-ab @@ -1,12 +1,12 @@ -$NetBSD: patch-ab,v 1.3 2006/03/17 23:53:31 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2007/01/11 19:19:01 drochner Exp $ ---- scribus/mpalette.cpp.orig 2005-11-20 12:04:43.000000000 +0000 +--- scribus/mpalette.cpp.orig 2006-12-02 01:08:17.000000000 +0100 +++ scribus/mpalette.cpp -@@ -12,6 +12,7 @@ - #include <qpoint.h> - #include <qwmatrix.h> - #include <qmessagebox.h> +@@ -17,6 +17,7 @@ for which a new license (GPL+exception) + #include <qobjectlist.h> + #include <qvalidator.h> + #include <qregexp.h> +#include <iostream> - #include "query.h" - #include "scribusview.h" + + #include "arrowchooser.h" #include "autoform.h" diff --git a/print/scribus/patches/patch-ad b/print/scribus/patches/patch-ad index 35bcc8ad8b4..0f68c838e1d 100644 --- a/print/scribus/patches/patch-ad +++ b/print/scribus/patches/patch-ad @@ -1,17 +1,17 @@ -$NetBSD: patch-ad,v 1.3 2006/03/17 23:53:31 wiz Exp $ +$NetBSD: patch-ad,v 1.4 2007/01/11 19:19:01 drochner Exp $ ---- scribus/plugins/svgimplugin/svgplugin.cpp.orig 2005-07-03 09:13:18.000000000 +0000 +--- scribus/plugins/svgimplugin/svgplugin.cpp.orig 2007-01-05 22:25:56.000000000 +0100 +++ scribus/plugins/svgimplugin/svgplugin.cpp -@@ -6,6 +6,7 @@ - * (at your option) any later version. * - * * - ***************************************************************************/ +@@ -4,6 +4,7 @@ to the COPYING file provided with the pr + a copyright and/or license notice that predates the release of Scribus 1.3.2 + for which a new license (GPL+exception) is in place. + */ +#include <cmath> #include "svgplugin.h" #include "svgplugin.moc" -@@ -26,7 +27,6 @@ - #include <qtextstream.h> +@@ -20,7 +21,6 @@ for which a new license (GPL+exception) + #include <qdragobject.h> #include <qregexp.h> #include <qcursor.h> -#include <cmath> diff --git a/print/scribus/patches/patch-ae b/print/scribus/patches/patch-ae index 00e08a15b95..ee291bcf5cb 100644 --- a/print/scribus/patches/patch-ae +++ b/print/scribus/patches/patch-ae @@ -1,20 +1,20 @@ -$NetBSD: patch-ae,v 1.4 2005/07/06 18:05:32 drochner Exp $ +$NetBSD: patch-ae,v 1.5 2007/01/11 19:19:01 drochner Exp $ ---- scribus/scribusXml.cpp.orig 2005-07-03 09:19:40.000000000 +0200 +--- scribus/scribusXml.cpp.orig 2006-12-01 09:33:45.000000000 +0100 +++ scribus/scribusXml.cpp -@@ -13,6 +13,7 @@ - * (at your option) any later version. * - * * +@@ -12,6 +12,7 @@ for which a new license (GPL+exception) + email : christian.toepp@mr-ct@gmx.de ***************************************************************************/ + +#include <cmath> #include "scribusXml.h" #include "scribusXml.moc" #include <qfile.h> -@@ -25,7 +26,6 @@ +@@ -23,7 +24,6 @@ for which a new license (GPL+exception) #include <qdir.h> #include <qtextcodec.h> #include <cstdlib> -#include <cmath> #include "missing.h" - #include "splash.h" - + #include "page.h" + #include "pageitem.h" |