OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 16-Sep-2003 11:19:07
Branch: HEAD Handle: 2003091610190402
Modified files:
openpkg-re/vcheck vc.scribus
openpkg-src/scribus scribus.patch scribus.spec
openpkg-web news.txt
Log:
upgrading package: scribus 1.0.1 -> 1.1.0
Summary:
Revision Changes Path
1.11 +1 -1 openpkg-re/vcheck/vc.scribus
1.9 +1 -61 openpkg-src/scribus/scribus.patch
1.21 +2 -2 openpkg-src/scribus/scribus.spec
1.6578 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.scribus
============================================================================
$ cvs diff -u -r1.10 -r1.11 vc.scribus
--- openpkg-re/vcheck/vc.scribus 20 Aug 2003 07:01:38 -0000 1.10
+++ openpkg-re/vcheck/vc.scribus 16 Sep 2003 09:19:04 -0000 1.11
@@ -2,7 +2,7 @@
}
prog scribus = {
- version = 1.0.1
+ version = 1.1.0
url = http://web2.altmuehlnet.de/fschmid/download.html
regex = scribus-(\d+\.\d+\.\d+).tar.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 scribus.patch
--- openpkg-src/scribus/scribus.patch 20 Aug 2003 16:55:51 -0000 1.8
+++ openpkg-src/scribus/scribus.patch 16 Sep 2003 09:19:06 -0000 1.9
@@ -1,16 +1,7 @@
diff -Naur scribus-1.0.1.orig/scribus/scribus.cpp scribus-1.0.1/scribus/scribus.cpp
--- scribus-1.0.1.orig/scribus/scribus.cpp Wed Aug 6 12:51:44 2003
+++ scribus-1.0.1/scribus/scribus.cpp Wed Aug 20 13:29:39 2003
-@@ -3052,7 +3052,7 @@
- void ScribusApp::slotHelpAbout()
- {
- void *mo;
-- char *error;
-+ const char *error;
- typedef About* (*sdem)(QWidget *d);
- sdem demo;
- QString pfad = PREL;
-@@ -4696,7 +4696,7 @@
+@@ -4700,7 +4700,7 @@
void ScribusApp::slotPrefsOrg()
{
void *mo;
@@ -19,15 +10,6 @@
bool zChange = false;
typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
sdem demo;
-@@ -5158,7 +5158,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;
@@ -5193,7 +5193,7 @@
bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa,
int toPa, QMap<int,QPixmap> thumbs)
{
@@ -37,45 +19,3 @@
void *PDFDriver;
typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int
Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
sdem demo;
-@@ -5740,7 +5740,7 @@
-
- void ScribusApp::FinalizePlugs()
- {
-- char *error;
-+ const char *error;
- QMap<QString, PlugData>::Iterator it;
- struct PlugData pda;
- typedef void (*sdem2)();
-@@ -5810,7 +5810,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);
-@@ -5844,7 +5844,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);
-diff -Naur scribus-1.0.1.orig/scribus/scfonts_ttftypes.h
scribus-1.0.1/scribus/scfonts_ttftypes.h
---- scribus-1.0.1.orig/scribus/scfonts_ttftypes.h Mon May 19 20:26:31 2003
-+++ scribus-1.0.1/scribus/scfonts_ttftypes.h Wed Aug 20 13:39:40 2003
-@@ -7,6 +7,11 @@
- typedef unsigned int u_int32_t;
- #endif
-
-+#include "config.h"
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-+
- #include <sys/types.h>
-
- #ifndef MAKE_ID
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 scribus.spec
--- openpkg-src/scribus/scribus.spec 20 Aug 2003 17:20:13 -0000 1.20
+++ openpkg-src/scribus/scribus.spec 16 Sep 2003 09:19:06 -0000 1.21
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Editor
License: GPL
-Version: 1.0.1
-Release: 20030820
+Version: 1.1.0
+Release: 20030916
# list of sources
Source0: http://scribus.planetmirror.com/scribus-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6577 -r1.6578 news.txt
--- openpkg-web/news.txt 16 Sep 2003 09:14:42 -0000 1.6577
+++ openpkg-web/news.txt 16 Sep 2003 09:19:05 -0000 1.6578
@@ -1,3 +1,4 @@
+16-Sep-2003: Upgraded package: P<scribus-1.1.0-20030916>
16-Sep-2003: Upgraded package: P<apt-0.5.5cnc6-20030916>
16-Sep-2003: Upgraded package: P<pgadmin-0.9.3.20030916-20030916>
16-Sep-2003: Upgraded package: P<perl-xml-20030916-20030916>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
