summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2003-08-26 17:18:53 +0000
committerHanno Boeck <hanno@gentoo.org>2003-08-26 17:18:53 +0000
commit74fc015fe50456a7a8486ba9d71f61999d481a7a (patch)
tree9c7513b25531d0ca223d18fd4234452da88133c2 /app-office/scribus/files
parentremove scribus-svg (diff)
downloadhistorical-74fc015fe50456a7a8486ba9d71f61999d481a7a.tar.gz
historical-74fc015fe50456a7a8486ba9d71f61999d481a7a.tar.bz2
historical-74fc015fe50456a7a8486ba9d71f61999d481a7a.zip
cleanup scribus
Diffstat (limited to 'app-office/scribus/files')
-rw-r--r--app-office/scribus/files/Fonts.diff28
-rw-r--r--app-office/scribus/files/Palette.diff65
-rw-r--r--app-office/scribus/files/digest-scribus-0.81
-rw-r--r--app-office/scribus/files/digest-scribus-1.0_rc11
4 files changed, 0 insertions, 95 deletions
diff --git a/app-office/scribus/files/Fonts.diff b/app-office/scribus/files/Fonts.diff
deleted file mode 100644
index 273378a53aba..000000000000
--- a/app-office/scribus/files/Fonts.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur scribus-0.8/scribus/fmitem.cpp scribus-0.8n/scribus/fmitem.cpp
---- scribus-0.8/scribus/fmitem.cpp Fri Nov 30 21:50:57 2001
-+++ scribus-0.8n/scribus/fmitem.cpp Fri Oct 11 11:16:59 2002
-@@ -17,11 +17,13 @@
-
- #include "fmitem.h"
- #include <qfontmetrics.h>
-+#include <qapplication.h>
-
- FmItem::FmItem(const QString& s, const QFont& f)
- {
- string = s;
- font = f;
-+ font.setPointSize(qApp->font().pointSize());
- }
- FmItem::~FmItem()
- {
-diff -ur scribus-0.8/scribus/scfonts.cpp scribus-0.8n/scribus/scfonts.cpp
---- scribus-0.8/scribus/scfonts.cpp Sun Sep 22 10:54:38 2002
-+++ scribus-0.8n/scribus/scfonts.cpp Sat Oct 12 19:41:57 2002
-@@ -443,6 +443,7 @@
- {
- t->Font.setPointSize(12);
- t->Font.setRawName(tmp);
-+ t->Font.setPointSize(12);
- t->FontEnc = FoEnc;
- insert(SCName,t);
- if(t->HasMetrics)
diff --git a/app-office/scribus/files/Palette.diff b/app-office/scribus/files/Palette.diff
deleted file mode 100644
index d74e1fac393a..000000000000
--- a/app-office/scribus/files/Palette.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur scribus-0.8/scribus/mpalette.cpp scribus-0.8.02/scribus/mpalette.cpp
---- scribus-0.8/scribus/mpalette.cpp Sat Sep 14 12:26:16 2002
-+++ scribus-0.8.02/scribus/mpalette.cpp Sun Oct 27 08:15:56 2002
-@@ -430,8 +430,8 @@
- connect(FrameScale, SIGNAL(clicked()), this, SLOT(ChangeScaling()));
- connect(Aspect, SIGNAL(clicked()), this, SLOT(ChangeScaling()));
- connect(this, SIGNAL(placeChanged(QDockWindow::Place)), this, SLOT(Docken(QDockWindow::Place)));
-- setCloseMode(Always);
-- undock();
-+ pa->moveDockWindow(this, DockTornOff);
-+ setCloseMode(Always);
- resize(sizeHint());
- setResizeEnabled(true);
- Fram->raiseWidget(4);
-diff -ur scribus-0.8/scribus/scribus.cpp scribus-0.8.02/scribus/scribus.cpp
---- scribus-0.8/scribus/scribus.cpp Tue Sep 24 22:09:45 2002
-+++ scribus-0.8.02/scribus/scribus.cpp Sat Oct 26 16:37:53 2002
-@@ -4686,7 +4686,7 @@
- pda.Zeiger = 0;
- pda.Datei = "";
- pda.Typ = 0;
-- if (DLLName(d[dc], &nam, &ty, pda.Zeiger))
-+ if (DLLName(d[dc], &nam, &ty, &pda.Zeiger))
- {
- if (ty == 1)
- extraMenu->insertItem(tr(nam));
-@@ -4698,7 +4698,7 @@
- helpMenu->insertItem(tr(nam));
- pda.Datei = d[dc];
- pda.Typ = ty;
-- PluginMap[tr(nam)] = pda;
-+ PluginMap.insert(tr(nam), pda);
- }
- }
- connect(extraMenu, SIGNAL(activated(int)), this, SLOT(RunPlug(int)));
-@@ -4742,7 +4742,7 @@
- dlclose(mo);
- }
-
--bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void *Zeig)
-+bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
- {
- void *mo;
- char *error;
-@@ -4773,7 +4773,7 @@
- return false;
- }
- *typ = (*demo1)();
-- Zeig = mo;
-+ *Zeig = mo;
- if (*typ != 4)
- dlclose(mo);
- else
-diff -ur scribus-0.8/scribus/scribus.h scribus-0.8.02/scribus/scribus.h
---- scribus-0.8/scribus/scribus.h Tue Sep 24 22:09:58 2002
-+++ scribus-0.8.02/scribus/scribus.h Sat Oct 26 16:34:00 2002
-@@ -98,7 +98,7 @@
- void UpdateRecent(QString fn);
- void InitPlugs();
- void FinalizePlugs();
-- bool DLLName(QString name, QString *PName, int *typ, void *Zeig);
-+ bool DLLName(QString name, QString *PName, int *typ, void **Zeig);
- void CallDLL(QString name);
- PSLib* getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
- void closePSDriver();
diff --git a/app-office/scribus/files/digest-scribus-0.8 b/app-office/scribus/files/digest-scribus-0.8
deleted file mode 100644
index 5447dbb4c89e..000000000000
--- a/app-office/scribus/files/digest-scribus-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a5ee8056b27d54ddba64f4c7deecce1 scribus-0.8.tar.gz 3014043
diff --git a/app-office/scribus/files/digest-scribus-1.0_rc1 b/app-office/scribus/files/digest-scribus-1.0_rc1
deleted file mode 100644
index 06b25acdb99a..000000000000
--- a/app-office/scribus/files/digest-scribus-1.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ccac9ad8820b368887786fa1b1326f0 scribus-1.0RC1.tar.gz 1689020