OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 16-Jun-2003 08:32:17
Branch: HEAD Handle: 2003061607321502
Modified files:
openpkg-re/vcheck vc.scribus
openpkg-src/scribus scribus.patch scribus.spec
openpkg-web news.txt
Log:
upgrading package: scribus 0.9.10 -> 0.9.11
Summary:
Revision Changes Path
1.4 +1 -1 openpkg-re/vcheck/vc.scribus
1.5 +13 -14 openpkg-src/scribus/scribus.patch
1.7 +2 -2 openpkg-src/scribus/scribus.spec
1.4888 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.scribus
============================================================================
$ cvs diff -u -r1.3 -r1.4 vc.scribus
--- openpkg-re/vcheck/vc.scribus 17 May 2003 11:14:55 -0000 1.3
+++ openpkg-re/vcheck/vc.scribus 16 Jun 2003 06:32:15 -0000 1.4
@@ -2,7 +2,7 @@
}
prog scribus = {
- version = 0.9.10
+ version = 0.9.11
url = http://web2.altmuehlnet.de/fschmid/download.html
regex = scribus-(__VER__).tar.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 scribus.patch
--- openpkg-src/scribus/scribus.patch 22 May 2003 11:02:05 -0000 1.4
+++ openpkg-src/scribus/scribus.patch 16 Jun 2003 06:32:17 -0000 1.5
@@ -1,7 +1,6 @@
-diff -Naur scribus-0.9.10.orig/scribus/scribus.cpp
scribus-0.9.10/scribus/scribus.cpp
---- scribus-0.9.10.orig/scribus/scribus.cpp Sat Apr 19 12:09:44 2003
-+++ scribus-0.9.10/scribus/scribus.cpp Tue May 13 16:07:27 2003
-@@ -2877,7 +2877,7 @@
+--- scribus-0.9.10.orig/scribus/scribus.cpp 2003-06-16 07:26:32.000000000 +0200
++++ scribus-0.9.10/scribus/scribus.cpp 2003-06-16 07:27:19.000000000 +0200
+@@ -3040,7 +3040,7 @@
void ScribusApp::slotHelpAbout()
{
void *mo;
@@ -10,7 +9,7 @@
typedef About* (*sdem)(QWidget *d);
sdem demo;
QString pfad = PREL;
-@@ -4433,7 +4433,7 @@
+@@ -4694,7 +4694,7 @@
void ScribusApp::slotPrefsOrg()
{
void *mo;
@@ -19,7 +18,7 @@
typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
sdem demo;
QString pfad = PREL;
-@@ -4831,7 +4831,7 @@
+@@ -5153,7 +5153,7 @@
PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont>
DocFonts, CListe DocColors, bool pdf)
{
@@ -28,16 +27,16 @@
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()
+@@ -5188,7 +5188,7 @@
+ bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa,
int toPa, QMap<int,QPixmap> thumbs)
{
+ bool ret = false;
- char *error;
+ const char *error;
- typedef PDFlib* (*sdem)();
+ void *PDFDriver;
+ typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int
Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
sdem demo;
- QString pfad = PREL;
-@@ -5418,7 +5418,7 @@
+@@ -5734,7 +5734,7 @@
void ScribusApp::FinalizePlugs()
{
@@ -46,7 +45,7 @@
QMap<QString, PlugData>::Iterator it;
struct PlugData pda;
typedef void (*sdem2)();
-@@ -5483,7 +5483,7 @@
+@@ -5804,7 +5804,7 @@
void ScribusApp::CallDLL(QString name)
{
void *mo;
@@ -55,7 +54,7 @@
struct PlugData pda;
pda = PluginMap[name];
typedef void (*sdem)(QWidget *d, ScribusApp *plug);
-@@ -5517,7 +5517,7 @@
+@@ -5838,7 +5838,7 @@
bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
{
void *mo;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 scribus.spec
--- openpkg-src/scribus/scribus.spec 26 May 2003 10:09:09 -0000 1.6
+++ openpkg-src/scribus/scribus.spec 16 Jun 2003 06:32:17 -0000 1.7
@@ -34,8 +34,8 @@
Distribution: OpenPKG [JUNK]
Group: Misc
License: GPL
-Version: 0.9.10
-Release: 20030526
+Version: 0.9.11
+Release: 20030616
# list of sources
Source0: http://web2.altmuehlnet.de/fschmid/scribus-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4887 -r1.4888 news.txt
--- openpkg-web/news.txt 16 Jun 2003 06:13:45 -0000 1.4887
+++ openpkg-web/news.txt 16 Jun 2003 06:32:16 -0000 1.4888
@@ -1,3 +1,4 @@
+16-Jun-2003: Upgraded package: P<scribus-0.9.11-20030616>
16-Jun-2003: Upgraded package: P<netpbm-10.11.10-20030616>
16-Jun-2003: Upgraded package: P<doxygen-1.3.2-20030616>
16-Jun-2003: Upgraded package: P<perl-db-20030616-20030616>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
