fix building againt new freetype, sync w/update-patches
This commit is contained in:
jolan
parent
609d36e3ed
commit
c31b62b3a6
48
www/mozilla-firefox/patches/patch-gfx_idl_nsIFreeType2_idl
Normal file
48
www/mozilla-firefox/patches/patch-gfx_idl_nsIFreeType2_idl
Normal file
@ -0,0 +1,48 @@
|
||||
$OpenBSD: patch-gfx_idl_nsIFreeType2_idl,v 1.1 2004/11/05 07:37:56 jolan Exp $
|
||||
--- gfx/idl/nsIFreeType2.idl.orig Sat Feb 22 18:06:55 2003
|
||||
+++ gfx/idl/nsIFreeType2.idl Fri Nov 5 00:20:37 2004
|
||||
@@ -72,10 +72,11 @@ native FT_Pointer(FT_Pointer);
|
||||
native FT_Sfnt_Tag(FT_Sfnt_Tag);
|
||||
native FT_Size(FT_Size);
|
||||
|
||||
-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
|
||||
+[ptr] native FTC_ImageType_p(FTC_ImageType);
|
||||
native FTC_Face_Requester(FTC_Face_Requester);
|
||||
native FTC_Font(FTC_Font);
|
||||
-native FTC_Image_Cache(FTC_Image_Cache);
|
||||
+native FTC_FaceID(FTC_FaceID);
|
||||
+native FTC_ImageCache(FTC_ImageCache);
|
||||
native FTC_Manager(FTC_Manager);
|
||||
|
||||
/*
|
||||
@@ -87,7 +88,7 @@ interface nsIFreeType2 : nsISupports
|
||||
|
||||
readonly attribute FT_Library library;
|
||||
readonly attribute FTC_Manager FTCacheManager;
|
||||
- readonly attribute FTC_Image_Cache ImageCache;
|
||||
+ readonly attribute FTC_ImageCache ImageCache;
|
||||
|
||||
void doneFace(in FT_Face face);
|
||||
void doneFreeType(in FT_Library lib);
|
||||
@@ -103,16 +104,16 @@ interface nsIFreeType2 : nsISupports
|
||||
void outlineDecompose(in FT_Outline_p outline,
|
||||
in const_FT_Outline_Funcs_p funcs, in voidPtr p);
|
||||
void setCharmap(in FT_Face face, in FT_CharMap charmap);
|
||||
- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
|
||||
- in FT_UInt gindex, out FT_Glyph glyph);
|
||||
- void managerLookupSize(in FTC_Manager manager, in FTC_Font font,
|
||||
- out FT_Face face, out FT_Size size);
|
||||
+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
|
||||
+ in FT_UInt gindex, out FT_Glyph glyph);
|
||||
+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
|
||||
+ out FT_Face face);
|
||||
void managerDone(in FTC_Manager manager);
|
||||
void managerNew(in FT_Library lib, in FT_UInt max_faces,
|
||||
in FT_UInt max_sizes, in FT_ULong max_bytes,
|
||||
in FTC_Face_Requester requester, in FT_Pointer req_data,
|
||||
out FTC_Manager manager);
|
||||
- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
|
||||
+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
|
||||
|
||||
FT_ULong getFirstChar(in FT_Face face, out FT_UInt gindex);
|
||||
FT_ULong getNextChar(in FT_Face face, in FT_ULong charcode, out FT_UInt gindex);
|
||||
@ -0,0 +1,60 @@
|
||||
$OpenBSD: patch-gfx_src_freetype_nsFreeType_cpp,v 1.1 2004/11/05 07:37:56 jolan Exp $
|
||||
--- gfx/src/freetype/nsFreeType.cpp.orig Sun Sep 7 17:20:37 2003
|
||||
+++ gfx/src/freetype/nsFreeType.cpp Fri Nov 5 00:23:55 2004
|
||||
@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
|
||||
{"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
|
||||
{"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
|
||||
{"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
|
||||
- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
|
||||
- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
|
||||
+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
|
||||
+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
|
||||
{"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
|
||||
{"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
|
||||
- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
|
||||
+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
|
||||
{"FT_Get_First_Char", NS_FT2_OFFSET(nsFT_Get_First_Char), PR_FALSE},
|
||||
{"FT_Get_Next_Char", NS_FT2_OFFSET(nsFT_Get_Next_Char), PR_FALSE},
|
||||
{nsnull, 0, 0},
|
||||
@@ -276,7 +276,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
|
||||
+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
|
||||
FT_UInt glyphID, FT_Glyph *glyph)
|
||||
{
|
||||
// call the FreeType2 function via the function pointer
|
||||
@@ -285,11 +285,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
|
||||
- FT_Face *face, FT_Size *size)
|
||||
+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
|
||||
+ FT_Face *face)
|
||||
{
|
||||
// call the FreeType2 function via the function pointer
|
||||
- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
|
||||
+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
|
||||
return error ? NS_ERROR_FAILURE : NS_OK;
|
||||
}
|
||||
|
||||
@@ -314,7 +314,7 @@ nsFreeType2::ManagerNew(FT_Library libra
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
|
||||
+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
|
||||
{
|
||||
// call the FreeType2 function via the function pointer
|
||||
FT_Error error = nsFTC_Image_Cache_New(manager, cache);
|
||||
@@ -345,7 +345,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
|
||||
+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
|
||||
{
|
||||
*aCache = mImageCache;
|
||||
return NS_OK;
|
||||
@ -0,0 +1,39 @@
|
||||
$OpenBSD: patch-gfx_src_freetype_nsFreeType_h,v 1.1 2004/11/05 07:37:56 jolan Exp $
|
||||
--- gfx/src/freetype/nsFreeType.h.orig Wed Jun 11 13:15:22 2003
|
||||
+++ gfx/src/freetype/nsFreeType.h Fri Nov 5 00:25:48 2004
|
||||
@@ -104,13 +104,15 @@ typedef FT_Error (*FT_Outline_Decompose_
|
||||
typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
|
||||
typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
|
||||
typedef FT_Error (*FTC_Image_Cache_Lookup_t)
|
||||
- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
|
||||
+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
|
||||
+typedef FT_Error (*FTC_Manager_LookupFace_t)
|
||||
+ (FTC_Manager, FTC_FaceID, FT_Face*);
|
||||
typedef FT_Error (*FTC_Manager_Lookup_Size_t)
|
||||
(FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
|
||||
typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
|
||||
typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
|
||||
FTC_Face_Requester, FT_Pointer, FTC_Manager*);
|
||||
-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
|
||||
+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
|
||||
|
||||
typedef FT_ULong (*FT_Get_First_Char_t)(FT_Face, FT_UInt*);
|
||||
typedef FT_ULong (*FT_Get_Next_Char_t)(FT_Face, FT_ULong, FT_UInt*);
|
||||
@@ -157,7 +159,7 @@ protected:
|
||||
FT_Outline_Decompose_t nsFT_Outline_Decompose;
|
||||
FT_Set_Charmap_t nsFT_Set_Charmap;
|
||||
FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
|
||||
- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
|
||||
+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
|
||||
FTC_Manager_Done_t nsFTC_Manager_Done;
|
||||
FTC_Manager_New_t nsFTC_Manager_New;
|
||||
FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
|
||||
@@ -195,7 +197,7 @@ protected:
|
||||
PRLibrary *mSharedLib;
|
||||
FT_Library mFreeTypeLibrary;
|
||||
FTC_Manager mFTCacheManager;
|
||||
- FTC_Image_Cache mImageCache;
|
||||
+ FTC_ImageCache mImageCache;
|
||||
|
||||
static nsHashtable *sFontFamilies;
|
||||
static nsHashtable *sRange1CharSetNames;
|
||||
@ -0,0 +1,61 @@
|
||||
$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.1 2004/11/05 07:37:56 jolan Exp $
|
||||
--- gfx/src/ps/nsFontMetricsPS.cpp.orig Thu Oct 23 17:43:04 2003
|
||||
+++ gfx/src/ps/nsFontMetricsPS.cpp Fri Nov 5 00:12:17 2004
|
||||
@@ -1126,10 +1126,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
|
||||
|
||||
mPixelSize = NSToIntRound(app2dev * mFont->size);
|
||||
|
||||
- mImageDesc.font.face_id = (void*)mEntry;
|
||||
- mImageDesc.font.pix_width = mPixelSize;
|
||||
- mImageDesc.font.pix_height = mPixelSize;
|
||||
- mImageDesc.image_type = 0;
|
||||
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
|
||||
+ mImageDesc->width = mPixelSize;
|
||||
+ mImageDesc->height = mPixelSize;
|
||||
+ mImageDesc->flags = 0;
|
||||
|
||||
nsresult rv;
|
||||
mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
|
||||
@@ -1175,7 +1175,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
|
||||
if (!face)
|
||||
return 0;
|
||||
|
||||
- FTC_Image_Cache iCache;
|
||||
+ FTC_ImageCache iCache;
|
||||
nsresult rv = mFt2->GetImageCache(&iCache);
|
||||
if (NS_FAILED(rv)) {
|
||||
NS_ERROR("Failed to get Image Cache");
|
||||
@@ -1213,8 +1213,8 @@ nsFontPSFreeType::getFTFace()
|
||||
|
||||
FTC_Manager cManager;
|
||||
mFt2->GetFTCacheManager(&cManager);
|
||||
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
|
||||
- &face, nsnull);
|
||||
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
|
||||
+ &face);
|
||||
NS_ASSERTION(rv==0, "failed to get face/size");
|
||||
if (rv)
|
||||
return nsnull;
|
||||
@@ -1609,16 +1609,16 @@ void nsFT2Type8Generator::GeneratePSFont
|
||||
mEntry->GetFamilyName(fontName);
|
||||
mEntry->GetStyleName(styleName);
|
||||
|
||||
- mImageDesc.font.face_id = (void*)mEntry;
|
||||
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
|
||||
// TT glyph has no relation to size
|
||||
- mImageDesc.font.pix_width = 16;
|
||||
- mImageDesc.font.pix_height = 16;
|
||||
- mImageDesc.image_type = 0;
|
||||
+ mImageDesc->width = 16;
|
||||
+ mImageDesc->height = 16;
|
||||
+ mImageDesc->flags = 0;
|
||||
FT_Face face = nsnull;
|
||||
FTC_Manager cManager;
|
||||
mFt2->GetFTCacheManager(&cManager);
|
||||
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
|
||||
- &face, nsnull);
|
||||
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
|
||||
+ &face);
|
||||
if (NS_FAILED(rv))
|
||||
return;
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_h,v 1.1 2004/11/05 07:37:56 jolan Exp $
|
||||
--- gfx/src/ps/nsFontMetricsPS.h.orig Tue Apr 22 11:25:09 2003
|
||||
+++ gfx/src/ps/nsFontMetricsPS.h Fri Nov 5 00:12:17 2004
|
||||
@@ -320,7 +320,7 @@ protected:
|
||||
nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
|
||||
nsCOMPtr<nsIFreeType2> mFt2;
|
||||
PRUint16 mPixelSize;
|
||||
- FTC_Image_Desc mImageDesc;
|
||||
+ FTC_ImageType mImageDesc;
|
||||
|
||||
|
||||
static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
|
||||
@@ -363,7 +363,7 @@ public:
|
||||
protected:
|
||||
nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
|
||||
nsCOMPtr<nsIFreeType2> mFt2;
|
||||
- FTC_Image_Desc mImageDesc;
|
||||
+ FTC_ImageType mImageDesc;
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,74 @@
|
||||
$OpenBSD: patch-gfx_src_x11shared_nsFontFreeType_cpp,v 1.1 2004/11/05 07:37:56 jolan Exp $
|
||||
--- gfx/src/x11shared/nsFontFreeType.cpp.orig Fri May 23 17:18:07 2003
|
||||
+++ gfx/src/x11shared/nsFontFreeType.cpp Fri Nov 5 00:12:17 2004
|
||||
@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
|
||||
FTC_Manager mgr;
|
||||
nsresult rv;
|
||||
mFt2->GetFTCacheManager(&mgr);
|
||||
- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
|
||||
+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
|
||||
if (NS_FAILED(rv))
|
||||
return nsnull;
|
||||
@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
|
||||
PRBool embedded_bimap = PR_FALSE;
|
||||
mFaceID = aFaceID;
|
||||
mPixelSize = aPixelSize;
|
||||
- mImageDesc.font.face_id = (void*)mFaceID;
|
||||
- mImageDesc.font.pix_width = aPixelSize;
|
||||
- mImageDesc.font.pix_height = aPixelSize;
|
||||
- mImageDesc.image_type = 0;
|
||||
+ mImageDesc->face_id = (FTC_FaceID)&mFaceID;
|
||||
+ mImageDesc->width = aPixelSize;
|
||||
+ mImageDesc->height = aPixelSize;
|
||||
+ mImageDesc->flags = 0;
|
||||
|
||||
if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
|
||||
- mImageDesc.image_type |= ftc_image_mono;
|
||||
anti_alias = PR_FALSE;
|
||||
}
|
||||
|
||||
- if (nsFreeType2::gFreeType2Autohinted)
|
||||
- mImageDesc.image_type |= ftc_image_flag_autohinted;
|
||||
-
|
||||
- if (nsFreeType2::gFreeType2Unhinted)
|
||||
- mImageDesc.image_type |= ftc_image_flag_unhinted;
|
||||
-
|
||||
PRUint32 num_embedded_bitmaps, i;
|
||||
PRInt32* embedded_bitmapheights;
|
||||
mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
|
||||
@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
|
||||
if (embedded_bitmapheights[i] == aPixelSize) {
|
||||
embedded_bimap = PR_TRUE;
|
||||
// unhinted must be set for embedded bitmaps to be used
|
||||
- mImageDesc.image_type |= ftc_image_flag_unhinted;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
|
||||
if (!face)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
- FTC_Image_Cache icache;
|
||||
+ FTC_ImageCache icache;
|
||||
mFt2->GetImageCache(&icache);
|
||||
if (!icache)
|
||||
return NS_ERROR_FAILURE;
|
||||
@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
|
||||
if (!face)
|
||||
return 0;
|
||||
|
||||
- FTC_Image_Cache icache;
|
||||
+ FTC_ImageCache icache;
|
||||
mFt2->GetImageCache(&icache);
|
||||
if (!icache)
|
||||
return 0;
|
||||
@@ -725,7 +717,7 @@ nsFreeTypeXImage::DrawString(nsRendering
|
||||
if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
|
||||
#endif
|
||||
|
||||
- FTC_Image_Cache icache;
|
||||
+ FTC_ImageCache icache;
|
||||
mFt2->GetImageCache(&icache);
|
||||
if (!icache)
|
||||
return 0;
|
||||
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-gfx_src_x11shared_nsFontFreeType_h,v 1.1 2004/11/05 07:37:56 jolan Exp $
|
||||
--- gfx/src/x11shared/nsFontFreeType.h.orig Tue Apr 22 11:25:13 2003
|
||||
+++ gfx/src/x11shared/nsFontFreeType.h Fri Nov 5 00:12:17 2004
|
||||
@@ -110,7 +110,7 @@ protected:
|
||||
XImage *GetXImage(PRUint32 width, PRUint32 height);
|
||||
nsITrueTypeFontCatalogEntry *mFaceID;
|
||||
PRUint16 mPixelSize;
|
||||
- FTC_Image_Desc mImageDesc;
|
||||
+ FTC_ImageType mImageDesc;
|
||||
nsCOMPtr<nsIFreeType2> mFt2;
|
||||
};
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-modules-libpr0n_decoders_png_nsPNGDecoder_cpp,v 1.1 2004/08/08 17:19:37 robert Exp $
|
||||
--- modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig Thu Sep 11 04:59:31 2003
|
||||
+++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp Sat Aug 7 18:09:10 2004
|
||||
@@ -74,6 +74,24 @@
|
||||
$OpenBSD: patch-modules-libpr0n_decoders_png_nsPNGDecoder_cpp,v 1.2 2004/11/05 07:37:56 jolan Exp $
|
||||
--- modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig Wed Sep 10 21:59:31 2003
|
||||
+++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp Thu Nov 4 22:55:31 2004
|
||||
@@ -74,6 +74,24 @@ nsPNGDecoder::~nsPNGDecoder()
|
||||
/* void init (in imgILoad aLoad); */
|
||||
NS_IMETHODIMP nsPNGDecoder::Init(imgILoad *aLoad)
|
||||
{
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-modules-libpr0n_decoders_png_nsPNGDecoder_cpp,v 1.1 2004/08/08 1
|
||||
mImageLoad = aLoad;
|
||||
mObserver = do_QueryInterface(aLoad); // we're holding 2 strong refs to the request.
|
||||
|
||||
@@ -94,6 +112,12 @@
|
||||
@@ -94,6 +112,12 @@ NS_IMETHODIMP nsPNGDecoder::Init(imgILoa
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ $OpenBSD: patch-modules-libpr0n_decoders_png_nsPNGDecoder_cpp,v 1.1 2004/08/08 1
|
||||
/* use this as libpng "progressive pointer" (retrieve in callbacks) */
|
||||
png_set_progressive_read_fn(mPNG, NS_STATIC_CAST(png_voidp, this),
|
||||
info_callback, row_callback, end_callback);
|
||||
@@ -183,6 +207,15 @@
|
||||
@@ -183,6 +207,15 @@ info_callback(png_structp png_ptr, png_i
|
||||
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
|
||||
&interlace_type, &compression_type, &filter_type);
|
||||
|
||||
@ -55,7 +55,7 @@ $OpenBSD: patch-modules-libpr0n_decoders_png_nsPNGDecoder_cpp,v 1.1 2004/08/08 1
|
||||
if (color_type == PNG_COLOR_TYPE_PALETTE)
|
||||
png_set_expand(png_ptr);
|
||||
|
||||
@@ -518,5 +551,8 @@
|
||||
@@ -518,5 +551,8 @@ error_callback(png_structp png_ptr, png_
|
||||
void
|
||||
warning_callback(png_structp png_ptr, png_const_charp warning_msg)
|
||||
{
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.4 2004/03/06 07:51:27 pvalchev Exp $
|
||||
--- nsprpub/pr/include/md/_openbsd.h.orig 2004-03-01 16:15:11.000000000 -0500
|
||||
+++ nsprpub/pr/include/md/_openbsd.h 2004-03-01 16:16:17.000000000 -0500
|
||||
$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.5 2004/11/05 07:37:56 jolan Exp $
|
||||
--- nsprpub/pr/include/md/_openbsd.h.orig Tue Jun 20 16:23:18 2000
|
||||
+++ nsprpub/pr/include/md/_openbsd.h Thu Nov 4 22:55:31 2004
|
||||
@@ -43,6 +43,8 @@
|
||||
#define _PR_SI_ARCHITECTURE "x86"
|
||||
#elif defined(__alpha__)
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.4 2004/03/06 07:51:27 pvalc
|
||||
#elif defined(__m68k__)
|
||||
#define _PR_SI_ARCHITECTURE "m68k"
|
||||
#elif defined(__powerpc__)
|
||||
@@ -80,10 +88,14 @@
|
||||
@@ -80,10 +82,14 @@
|
||||
|
||||
#define CONTEXT(_th) ((_th)->md.context)
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.2 2004/03/01 07:14:48 pvalchev Exp $
|
||||
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2003-08-15 06:00:23.000000000 +0200
|
||||
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-02-28 01:12:46.000000000 +0100
|
||||
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2004/11/05 07:37:56 jolan Exp $
|
||||
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 23:00:23 2003
|
||||
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Thu Nov 4 22:55:52 2004
|
||||
@@ -51,6 +51,12 @@ CPPSRCS := xptcinvoke_unixish_x86.cpp x
|
||||
endif
|
||||
endif
|
||||
@ -42,10 +42,11 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.2 2004/03/01 0
|
||||
# Darwin/PPC
|
||||
#
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
@@ -322,6 +342,20 @@ endif
|
||||
@@ -321,6 +341,20 @@ endif
|
||||
endif
|
||||
|
||||
endif
|
||||
endif
|
||||
+endif
|
||||
+#
|
||||
+# OpenBSD/SPARC
|
||||
+#
|
||||
@ -59,7 +60,6 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.2 2004/03/01 0
|
||||
+ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
|
||||
+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
|
||||
+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparcv9_solaris.s
|
||||
+endif
|
||||
endif
|
||||
|
||||
######################################################################
|
||||
# S/390
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user