openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
6627 Commits
1 Branch
2 Tags
597 MiB
 
 
 
 
 
 
Tree: b5863cf7ca
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'b5863cf7ca'
${ noResults }
openpkg-packages/scribus/scribus.patch

436 lines
9.5 KiB
Raw Blame History

--- 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;
- char *error;
+ const char *error;
typedef About* (*sdem)(QWidget *d);
sdem demo;
QString pfad = PREL;
@@ -4694,7 +4694,7 @@
void ScribusApp::slotPrefsOrg()
{
void *mo;
- char *error;
+ const char *error;
typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
sdem demo;
QString pfad = PREL;
@@ -5153,7 +5153,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;
@@ -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;
void *PDFDriver;
typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
sdem demo;
@@ -5734,7 +5734,7 @@
void ScribusApp::FinalizePlugs()
{
- char *error;
+ const char *error;
QMap<QString, PlugData>::Iterator it;
struct PlugData pda;
typedef void (*sdem2)();
@@ -5804,7 +5804,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);
@@ -5838,7 +5838,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-0.9.10.orig/scribus/icc34.h scribus-0.9.10/scribus/icc34.h
--- scribus-0.9.10.orig/scribus/icc34.h Sun Mar 2 13:41:48 2003
+++ scribus-0.9.10/scribus/icc34.h Wed May 14 10:26:21 2003
@@ -180,10 +180,10 @@
typedef int32_t icSignature;
/* Unsigned integer numbers */
-typedef u_int8_t icUInt8Number;
-typedef u_int16_t icUInt16Number;
-typedef u_int32_t icUInt32Number;
-typedef u_int32_t icUInt64Number[2];
+typedef uint8_t icUInt8Number;
+typedef uint16_t icUInt16Number;
+typedef uint32_t icUInt32Number;
+typedef uint32_t icUInt64Number[2];
/* Signed numbers */
typedef int8_t icInt8Number;
@@ -193,7 +193,7 @@
/* Fixed numbers */
typedef int32_t icS15Fixed16Number;
-typedef u_int32_t icU16Fixed16Number;
+typedef uint32_t icU16Fixed16Number;
#else /* default definitions */
diff -Naur scribus-0.9.10.orig/scribus/scfonts_ttf.cpp scribus-0.9.10/scribus/scfonts_ttf.cpp
--- scribus-0.9.10.orig/scribus/scfonts_ttf.cpp Fri Apr 11 23:11:08 2003
+++ scribus-0.9.10/scribus/scfonts_ttf.cpp Wed May 14 10:25:46 2003
@@ -22,7 +22,7 @@
#endif
// #define doPost
-QString showTag(u_int32_t tag)
+QString showTag(uint32_t tag)
{
char tmp[5];
tmp[0]=(tag>>24) & 255;
@@ -80,8 +80,8 @@
SCFonts_Encoding OwnEncoding;
SCFonts_Encoding PostEncoding;
sc_TTFontError error;
- u_int16_t readBEUInt16();
- u_int32_t readBEUInt32();
+ uint16_t readBEUInt16();
+ uint32_t readBEUInt32();
bool readHeaders();
bool readOffsetTable();
@@ -120,7 +120,7 @@
bool GlyphNamesRead;
#endif
- QArray<u_int32_t> Loca;
+ QArray<uint32_t> Loca;
bool LocaRead;
QArray<tt_longHorMetric> Hmtx;
@@ -254,9 +254,9 @@
}
-u_int16_t sc_TTFont::readBEUInt16()
+uint16_t sc_TTFont::readBEUInt16()
{
- u_int16_t result=0;
+ uint16_t result=0;
unsigned char tmp[2];
char *t=reinterpret_cast<char *>(tmp);
if(file.readBlock(t,2)==2)
@@ -267,9 +267,9 @@
}
-u_int32_t sc_TTFont::readBEUInt32()
+uint32_t sc_TTFont::readBEUInt32()
{
- u_int32_t result=0;
+ uint32_t result=0;
unsigned char tmp[4];
char *t=reinterpret_cast<char *>(tmp);
if(file.readBlock(t,4)==4)
@@ -456,7 +456,7 @@
return(true);
struct {
fxp16_16_t version;
- u_int16_t nglyphs;
+ uint16_t nglyphs;
} data;
file.at(entries[o_maxp].offset);
@@ -561,7 +561,7 @@
error=sc_TTFBadFile;
return(false);
}
- u_int16_t nglyphsps = readBEUInt16();
+ uint16_t nglyphsps = readBEUInt16();
if(nglyphsps!=nGlyphs)
std::cout << "Warning: nGlyphs should be consistent between head and post" << endl;
@@ -765,9 +765,9 @@
#if 0 // Need to implement Mac encoding sometime...
struct CmapFormat0
{
- u_int16_t format;
- u_int16_t length;
- u_int16_t language;
+ uint16_t format;
+ uint16_t length;
+ uint16_t language;
char glyphIdArray[256];
};
#endif
@@ -794,7 +794,7 @@
}
int segCount=tcm.segCountX2/2;
- u_int16_t *data=new u_int16_t[segCount*4];
+ uint16_t *data=new uint16_t[segCount*4];
if(!(data))
{
@@ -831,7 +831,7 @@
int idarraylength=(tcm.length-(16+8*segCount))/2;
- u_int16_t *idarray = new u_int16_t[idarraylength];
+ uint16_t *idarray = new uint16_t[idarraylength];
for(int i=0;i<idarraylength;++i)
idarray[i]=readBEUInt16();
if(error)
diff -Naur scribus-0.9.10.orig/scribus/scfonts_ttftypes.h scribus-0.9.10/scribus/scfonts_ttftypes.h
--- scribus-0.9.10.orig/scribus/scfonts_ttftypes.h Sun Mar 2 13:40:52 2003
+++ scribus-0.9.10/scribus/scfonts_ttftypes.h Wed May 14 10:26:41 2003
@@ -10,7 +10,7 @@
struct fxp16_16_t
{
int16_t mantissa;
- u_int16_t fraction;
+ uint16_t fraction;
};
struct tt_datetime_t
@@ -18,25 +18,25 @@
char data[8];
};
-typedef u_int16_t fxp14_2_t;
+typedef uint16_t fxp14_2_t;
struct OffsetTable
{
fxp16_16_t version;
- u_int16_t numTables;
- u_int16_t searchRange;
- u_int16_t entrySelector;
- u_int16_t rangeShift;
+ uint16_t numTables;
+ uint16_t searchRange;
+ uint16_t entrySelector;
+ uint16_t rangeShift;
}; // 12 bytes
struct TableDirEntry
{
- u_int32_t tag;
- u_int32_t checkSum;
- u_int32_t offset;
- u_int32_t length;
+ uint32_t tag;
+ uint32_t checkSum;
+ uint32_t offset;
+ uint32_t length;
}; // 16 bytes
@@ -44,19 +44,19 @@
{
fxp16_16_t version;
fxp16_16_t fontRevision;
- u_int32_t checkSumAdjustment;
- u_int32_t magicNumber;
- u_int16_t flags;
- u_int16_t unitsPerEm;
+ uint32_t checkSumAdjustment;
+ uint32_t magicNumber;
+ uint16_t flags;
+ uint16_t unitsPerEm;
tt_datetime_t created;
tt_datetime_t modified;
int16_t xMin;
int16_t yMin;
int16_t xMax;
int16_t yMax;
- u_int16_t macStyle;
- u_int16_t lowestRecPPEM;
- u_int16_t fontDirectionHint;
+ uint16_t macStyle;
+ uint16_t lowestRecPPEM;
+ uint16_t fontDirectionHint;
int16_t indexToLocFormat;
int16_t glyphDataFormat;
};
@@ -65,12 +65,12 @@
struct NameRecord
{
- u_int16_t platformID;
- u_int16_t encodingID;
- u_int16_t languageID;
- u_int16_t nameID;
- u_int16_t length;
- u_int16_t offset;
+ uint16_t platformID;
+ uint16_t encodingID;
+ uint16_t languageID;
+ uint16_t nameID;
+ uint16_t length;
+ uint16_t offset;
};
/*------------------------------------------------------------*/
@@ -83,9 +83,9 @@
int16_t underlineThickness;
int32_t isFixedPitch;
int32_t minMemType42;
- u_int32_t maxMemType42;
- u_int32_t minMemType1;
- u_int32_t maxMemType1;
+ uint32_t maxMemType42;
+ uint32_t minMemType1;
+ uint32_t maxMemType1;
};
struct Post_GlyphName
@@ -101,40 +101,40 @@
struct CmapTable
{
- u_int16_t version;
- u_int16_t numTables;
+ uint16_t version;
+ uint16_t numTables;
};
struct CmapHeader
{
- u_int16_t platformID;
- u_int16_t encodingID;
- u_int32_t offset;
+ uint16_t platformID;
+ uint16_t encodingID;
+ uint32_t offset;
};
struct CmapFormat0
{
- u_int16_t format;
- u_int16_t length;
- u_int16_t language;
+ uint16_t format;
+ uint16_t length;
+ uint16_t language;
char glyphIdArray[256];
};
struct CmapFormat4
{
- u_int16_t format;
- u_int16_t length;
- u_int16_t language;
- u_int16_t segCountX2;
- u_int16_t searchRange;
- u_int16_t entrySelector;
- u_int16_t rangeShift;
- u_int16_t *endCount;
- u_int16_t reservedPad;
- u_int16_t *startCount;
- u_int16_t *idDelta;
- u_int16_t *idRangeOffset;
- u_int16_t *glyphIdArray;
+ uint16_t format;
+ uint16_t length;
+ uint16_t language;
+ uint16_t segCountX2;
+ uint16_t searchRange;
+ uint16_t entrySelector;
+ uint16_t rangeShift;
+ uint16_t *endCount;
+ uint16_t reservedPad;
+ uint16_t *startCount;
+ uint16_t *idDelta;
+ uint16_t *idRangeOffset;
+ uint16_t *glyphIdArray;
};
/*-----------------------------------------------------------------*/
@@ -145,7 +145,7 @@
int16_t Ascender;
int16_t Descender;
int16_t LineGap;
- u_int16_t advanceWidthMax;
+ uint16_t advanceWidthMax;
int16_t minLeftSideBearing;
int16_t minRightSideBearing;
int16_t xMaxExtent;
@@ -153,7 +153,7 @@
int16_t caretSlopeRun;
int16_t reserved[5];
int16_t metricDataFormat;
- u_int16_t numberOfHMetrics;
+ uint16_t numberOfHMetrics;
};
struct tt_Box
@@ -166,7 +166,7 @@
struct tt_longHorMetric
{
- u_int16_t advanceWidth;
+ uint16_t advanceWidth;
int16_t lsb;
};
@@ -174,15 +174,15 @@
struct KernTable
{
- u_int16_t version;
- u_int16_t nTables;
+ uint16_t version;
+ uint16_t nTables;
};
struct KernSubTableHeader
{
- u_int16_t version;
- u_int16_t length;
- u_int16_t coverage;
+ uint16_t version;
+ uint16_t length;
+ uint16_t coverage;
};
#define kernHorizontal 0x0001
@@ -193,16 +193,16 @@
struct KernSubTable
{
- u_int16_t nPairs;
- u_int16_t searchRange;
- u_int16_t entrySelector;
- u_int16_t rangeShift;
+ uint16_t nPairs;
+ uint16_t searchRange;
+ uint16_t entrySelector;
+ uint16_t rangeShift;
};
struct KernEntry
{
- u_int16_t left;
- u_int16_t right;
+ uint16_t left;
+ uint16_t right;
int16_t value;
};