Rewrite patch to be more minimal and elegant

scribus/scribus.patch

@@ -1,84 +1,66 @@
 diff -Naur scribus-0.9.9.orig/scribus/scribus.cpp scribus-0.9.9/scribus/scribus.cpp
 --- scribus-0.9.9.orig/scribus/scribus.cpp	Sat Apr 19 12:09:44 2003
-+++ scribus-0.9.9/scribus/scribus.cpp	Tue May 13 13:42:03 2003
-@@ -2890,7 +2890,7 @@
- 		}
- 	dlerror();
- 	demo = (sdem)dlsym(mo, "Run");
--	if ((error = dlerror()) != NULL)
-+	if ((error = (char *)dlerror()) != NULL)
- 		{
- 		std::cout << "Can't find Symbol" << endl;
- 		dlclose(mo);
-@@ -4446,7 +4446,7 @@
- 		}
- 	dlerror();
- 	demo = (sdem)dlsym(mo, "Run");
--	if ((error = dlerror()) != NULL)
-+	if ((error = (char *)dlerror()) != NULL)
- 		{
- 		std::cout << "Can't find Symbol" << endl;
- 		dlclose(mo);
-@@ -4844,7 +4844,7 @@
- 		}
- 	dlerror();
- 	demo = (sdem)dlsym(PSDriver, "Run");
--	if ((error = dlerror()) != NULL)
-+	if ((error = (char *)dlerror()) != NULL)
- 		{
- 		std::cout << "Can't find Symbol" << endl;
- 		dlclose(PSDriver);
-@@ -4874,7 +4874,7 @@
- 		}
- 	dlerror();
- 	demo = (sdem)dlsym(PDFDriver, "Run");
--	if ((error = dlerror()) != NULL)
-+	if ((error = (char *)dlerror()) != NULL)
- 		{
- 		std::cout << "Can't find Symbol" << endl;
- 		dlclose(PDFDriver);
-@@ -5429,7 +5429,7 @@
- 			{
- 			dlerror();
- 			demo2 = (sdem2)dlsym(it.data().Zeiger, "CleanUpPlug");
--			if ((error = dlerror()) != NULL)
-+			if ((error = (char *)dlerror()) != NULL)
- 				{
- 				dlclose(it.data().Zeiger);
- 				continue;
-@@ -5503,7 +5503,7 @@
- 		mo = pda.Zeiger;
- 	dlerror();
- 	demo = (sdem)dlsym(mo, "Run");
--	if ((error = dlerror()) != NULL)
-+	if ((error = (char *)dlerror()) != NULL)
- 		{
- 		std::cout << "Can't find Symbol" << endl;
- 		dlclose(mo);
-@@ -5531,7 +5531,7 @@
- 		return false;
- 	dlerror();
- 	demo = (sdem0)dlsym(mo, "Name");
--	if ((error = dlerror()) != NULL)
-+	if ((error = (char *)dlerror()) != NULL)
- 		{
- 		dlclose(mo);
- 		return false;
-@@ -5539,7 +5539,7 @@
- 	*PName = (*demo)();
- 	dlerror();
- 	demo1 = (sdem1)dlsym(mo, "Type");
--	if ((error = dlerror()) != NULL)
-+	if ((error = (char *)dlerror()) != NULL)
- 		{
- 		dlclose(mo);
- 		return false;
-@@ -5552,7 +5552,7 @@
- 		{
- 		dlerror();
- 		demo2 = (sdem2)dlsym(mo, "InitPlug");
--		if ((error = dlerror()) != NULL)
-+		if ((error = (char *)dlerror()) != NULL)
- 			{
- 			dlclose(mo);
- 			return false;
++++ scribus-0.9.9/scribus/scribus.cpp	Tue May 13 16:07:27 2003
+@@ -2877,7 +2877,7 @@
+ void ScribusApp::slotHelpAbout()
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	typedef About* (*sdem)(QWidget *d);
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -4433,7 +4433,7 @@
+ void ScribusApp::slotPrefsOrg()
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -4831,7 +4831,7 @@
+ 
+ PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)
+ {
+-	char *error;
++	const char *error;
+ 	typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -4861,7 +4861,7 @@
+ 
+ PDFlib* ScribusApp::getPDFDriver()
+ {
+-	char *error;
++	const char *error;
+ 	typedef PDFlib* (*sdem)();
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -5418,7 +5418,7 @@
+ 
+ void ScribusApp::FinalizePlugs()
+ {
+-	char *error;
++	const char *error;
+ 	QMap<QString, PlugData>::Iterator it;
+ 	struct PlugData pda;
+ 	typedef void (*sdem2)();
+@@ -5483,7 +5483,7 @@
+ void ScribusApp::CallDLL(QString name)
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	struct PlugData pda;
+ 	pda = PluginMap[name];
+ 	typedef void (*sdem)(QWidget *d, ScribusApp *plug);
+@@ -5517,7 +5517,7 @@
+ bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	typedef QString (*sdem0)();
+ 	typedef int (*sdem1)();
+ 	typedef void (*sdem2)(QWidget *d, ScribusApp *plug);

scribus/scribus.spec

@@ -36,7 +36,7 @@ Distribution: OpenPKG [JUNK]
 Group:        Misc
 License:      GPL
 Version:      0.9.9
-Release:      20030513
+Release:      20030514
 
 #   list of sources
 Source0:      http://web2.altmuehlnet.de/fschmid/scribus-%{version}.tar.gz