9 files changed, 31 insertions, 121 deletions

diff --git a/print/scribus/files/patch-export.cpp b/print/scribus/files/patch-export.cpp
deleted file mode 100644
index d08f176cda0a..000000000000
--- a/print/scribus/files/patch-export.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- scribus/plugins/pixmapexport/export.cpp.orig	Mon Jun  7 01:15:14 2004
-+++ scribus/plugins/pixmapexport/export.cpp	Mon Jun  7 01:18:23 2004
-@@ -116,7 +116,7 @@
- 				QObject::tr("No"),
- 				QObject::tr("Yes"),
- 				// hack for multiple overwritting (petr)
--				(single==TRUE) ? 0 : QObject::tr("Yes all"),
-+				(single==TRUE) ? QString::null : QObject::tr("Yes all"),
- 				0, 0);
- 		QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
- 		if (over == 1)
diff --git a/print/scribus/files/patch-scribus::helpbrowser.cpp b/print/scribus/files/patch-scribus::helpbrowser.cpp
deleted file mode 100644
index c02deeb72aca..000000000000
--- a/print/scribus/files/patch-scribus::helpbrowser.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- scribus/helpbrowser.cpp.orig	Fri Jan  7 05:18:30 2005
-+++ scribus/helpbrowser.cpp	Mon Jan 10 22:11:45 2005
-@@ -58,7 +58,7 @@
- 	QString fileName;
- 	mHistory.clear();
- 	struct histd his;
--	language = guiLanguage=="" ? "en" : guiLanguage.left(2);
-+	language = guiLanguage=="" ? QString( "en" ) : guiLanguage.left(2);
- 	helpBrowsermainLayout = new QVBoxLayout( this); 
- 	buttonLayout = new QHBoxLayout;
- 	buttonLayout->setSpacing( 6 );
diff --git a/print/scribus/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp b/print/scribus/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp
deleted file mode 100644
index acd6e36c2694..000000000000
--- a/print/scribus/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- scribus/plugins/fileloader/oodraw/sxwunzip.cpp.orig	Fri Dec 17 10:17:03 2004
-+++ scribus/plugins/fileloader/oodraw/sxwunzip.cpp	Mon Jan 10 20:43:53 2005
-@@ -24,6 +24,8 @@
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- # include <unistd.h>
- # include <utime.h>
diff --git a/print/scribus/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp b/print/scribus/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp
deleted file mode 100644
index 905dea924193..000000000000
--- a/print/scribus/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- scribus/plugins/gettext/sxwim/sxwunzip.cpp.orig	Wed Dec 15 05:46:22 2004
-+++ scribus/plugins/gettext/sxwim/sxwunzip.cpp	Mon Jan 10 20:34:50 2005
-@@ -26,6 +26,8 @@
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #include <utime.h>
- 
diff --git a/print/scribus/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp b/print/scribus/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp
deleted file mode 100644
index 2982e2b88c51..000000000000
--- a/print/scribus/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
---- scribus/plugins/scriptplugin/scriptplugin.cpp.orig	Tue Jan  4 07:45:50 2005
-+++ scribus/plugins/scriptplugin/scriptplugin.cpp	Mon Jan 10 21:21:27 2005
-@@ -52,6 +52,27 @@
- #include <qtextstream.h>
- #include <cstdlib>
- 
-+// XXX Implement strndup for FreeBSD.
-+#ifdef __FreeBSD__
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+static char *
-+mystrndup(const char *str, int len) {
-+    char *ret;
-+
-+    if ((str == NULL || len < 0)) return(NULL);
-+    ret = (char *)malloc(len + 1);
-+    if (ret == NULL) return(NULL);
-+    memcpy(ret, str, len);
-+    ret[len] = '\0';
-+    return(ret);
-+}
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
- // Exceptions; visible from cmdvar.h, set up in initscribus()
- PyObject* ScribusException;
- PyObject* NoDocOpenError;
-@@ -499,8 +520,13 @@
- {
- 	/* Work around the braindead Python/C API not using 'const' for
- 	 * strings it won't change. */
-+#ifdef __FreeBSD__
-+	char* newNameTemp = mystrndup(newName, strlen(newName));
-+	char* oldNameTemp = mystrndup(oldName, strlen(oldName));
-+#else
- 	char* newNameTemp = strndup(newName, strlen(newName));
- 	char* oldNameTemp = strndup(oldName, strlen(oldName));
-+#endif
- 	assert(newNameTemp != NULL);
- 	assert(oldNameTemp != NULL);
- 	/* We use PyMapping_GetItemString because unlike PyDict_GetItemString it
-@@ -563,7 +589,11 @@
- 	 */
- 	QCString utfTranslated = translated.utf8();
- 	const char* trch = utfTranslated.data();
-+#ifdef __FreeBSD__
-+	return mystrndup(trch, strlen(trch));
-+#else
- 	return strndup(trch, strlen(trch));
-+#endif
- }
- 
- /* Now we're using the more pythonic convention for names:
diff --git a/print/scribus/files/patch-scribus::scribus.h b/print/scribus/files/patch-scribus::scribus.h
deleted file mode 100644
index 3ff6aa800de5..000000000000
--- a/print/scribus/files/patch-scribus::scribus.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- scribus/scribus.h.orig	Wed Aug 18 04:58:31 2004
-+++ scribus/scribus.h	Sun Aug 29 19:34:45 2004
-@@ -565,7 +565,7 @@
- 	QPopupMenu *toolbarMenu;
- 	double mm2pts(int mm);
- 	double pts2mm(double pts);
--	void addNewPages(int wo, int where, int numPages, QString based1 = tr("Normal"), QString based2 = tr("Normal"));
-+	void addNewPages(int wo, int where, int numPages, QString based1 = QObject::tr("Normal"), QString based2 = QObject::tr("Normal"));
- 	QMap<int,QString> FontID;
- 	int HaveGS;
- 	void *PSDriver;
diff --git a/print/scribus/files/patch-scribus::utils.cpp b/print/scribus/files/patch-scribus::utils.cpp
deleted file mode 100644
index 2a4eb366ed78..000000000000
--- a/print/scribus/files/patch-scribus::utils.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- scribus/util.cpp.orig	Fri Jan  7 04:04:34 2005
-+++ scribus/util.cpp	Mon Jan 10 22:03:01 2005
-@@ -29,6 +29,7 @@
- #include <qdir.h>
- #include <qpointarray.h>
- #include <qmessagebox.h>
-+#include <algorithm>
- #include <cstdlib>
- #include <cmath>
- #include <unistd.h>
diff --git a/print/scribus/files/patch-scribus_plugins_scriptplugin_macro.cpp b/print/scribus/files/patch-scribus_plugins_scriptplugin_macro.cpp
new file mode 100644
index 000000000000..797f1fff526b
--- /dev/null
+++ b/print/scribus/files/patch-scribus_plugins_scriptplugin_macro.cpp
@@ -0,0 +1,20 @@
+--- scribus/plugins/scriptplugin/macro.cpp.orig	Sun Jul  3 16:34:04 2005
++++ scribus/plugins/scriptplugin/macro.cpp	Mon Jul  4 13:10:49 2005
+@@ -53,7 +53,7 @@
+ {
+ 	assert(!PyErr_Occurred());
+ 
+-	if ((newName == QString::null) or (newName == ""))
++	if ((newName == QString::null) || (newName == ""))
+ 		qDebug("Macro::Macro() called with NULL or '' name");
+ 
+ 	// set the macro name
+@@ -344,7 +344,7 @@
+ // Must not return with an exception set
+ void Macro::setMacroName(QString newName)
+ {
+-	if ((newName == QString::null) or (newName == ""))
++	if ((newName == QString::null) || (newName == ""))
+ 	{
+ 		qDebug("Macro::setMacroName(): called with NULL or '' name");
+ 		return;
diff --git a/print/scribus/files/patch-scribus_plugins_short-words_vlnadialog.cpp b/print/scribus/files/patch-scribus_plugins_short-words_vlnadialog.cpp
new file mode 100644
index 000000000000..6b49503b8c6e
--- /dev/null
+++ b/print/scribus/files/patch-scribus_plugins_short-words_vlnadialog.cpp
@@ -0,0 +1,11 @@
+--- scribus/plugins/short-words/vlnadialog.cpp.orig	Wed Feb  2 05:02:38 2005
++++ scribus/plugins/short-words/vlnadialog.cpp	Mon Jul  4 13:18:50 2005
+@@ -159,7 +159,7 @@
+ 
+ void VlnaDialog::selectAction(int aAction)
+ {
+-	if (aAction!=0 and aAction!=1 and aAction!=2) {
++	if (aAction!=0 && aAction!=1 && aAction!=2) {
+ 			aAction = 0;
+ 	}
+ 	buttonGroup->setButton(aAction);