kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2013-03-20 www/kompozer: Dead upstream

Browse source
This commit is contained in:
Rene Ladan 2013-03-22 09:23:02 +00:00
parent 0f5ccc3079
commit 250f019390
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=314899
19 changed files with 1 additions and 916 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MOVED
View file

@ -4179,3 +4179,4 @@ french/eficas_doc||2013-03-19|Removed: eficas is now able to open the documentat
editors/openoffice.org-vcltesttool||2013-03-21|Removed: no longer used for openoffice qa.
editors/openoffice-3-devel|editors/openoffice-devel|2013-03-21|Renamed to match current version number
devel/geany-plugin-gdb||2013-03-21|Removed from geany plugins distribution
www/kompozer||2013-03-22|Has expired: Dead upstream

1
www/Makefile
View file

@ -382,7 +382,6 @@
SUBDIR += kdewebdev
SUBDIR += kdewebdev4
SUBDIR += khtml2png
SUBDIR += kompozer
SUBDIR += kpartsplugin
SUBDIR += kplaylist
SUBDIR += kwebkitpart

64
www/kompozer/Makefile
View file

@ -1,64 +0,0 @@
# New ports collection makefile for: nvu
# Date created: August 21, 2004
# Whom: Thierry Thomas <thierry@pompo.net>
#
# $FreeBSD$
# $MCom: ports/www/nvu/Makefile,v 1.5 2006/07/18 15:07:36 ahze Exp $
#
PORTNAME= kompozer
DISTVERSION= 0.8b3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/current/${DISTVERSION}
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= gecko@FreeBSD.org
COMMENT= Complete Web Authoring Suite
DEPRECATED= Dead upstream
EXPIRATION_DATE= 2013-03-20
BUILD_DEPENDS= nss>=3.13.6_1:${PORTSDIR}/security/nss
WANT_GNOME= yes
WANT_PERL= yes
USE_BZIP2= yes
USE_GECKO= gecko
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/mozilla
MAKEFILE= client.mk
ALL_TARGET= build_all
USE_MOZILLA= -event -ffi -hunspell -sqlite -vpx
MOZ_CHROME= jar
MOZ_TOOLKIT= gtk2
MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
MOZ_OPTIONS= ${CONFIGURE_TARGET} \
--enable-xinerama \
--disable-xprint \
--enable-application=composer
DESKTOP_ENTRIES="Kompozer" "${COMMENT}" \
"${PREFIX}/lib/kompozer/icons/mozicon50.xpm" "${PORTNAME}" \
"Network;Development;WebDevelopment;" true
NOT_FOR_ARCHS= ia64
NOT_FOR_ARCHS_REASON_ia64= does not build
.include "${.CURDIR}/../../www/firefox/Makefile.options"
OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY}
OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO:NTOOLKIT}
.include <bsd.port.pre.mk>
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
.endif
post-patch:
@${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/gnome/Makefile.in
.include <bsd.port.post.mk>

2
www/kompozer/distinfo
View file

@ -1,2 +0,0 @@
SHA256 (kompozer-0.8b3-src.tar.bz2) = 9dfef34e5941ce1e68e2f952c9783b281a74be226dad3ab1a2b1b8c99df5c5e3
SIZE (kompozer-0.8b3-src.tar.bz2) = 41747177

342
www/kompozer/files/patch-bugzilla149334
View file

@ -1,342 +0,0 @@
Index: gfx/idl/nsIFreeType2.idl
===================================================================
RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v
retrieving revision 1.10
diff -u -3 -p -r1.10 nsIFreeType2.idl
--- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10
+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000
@@ -76,10 +76,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);
// #ifdef MOZ_SVG
@@ -99,7 +100,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);
@@ -115,16 +116,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,
+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_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 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);
/* #ifdef MOZ_SVG */
void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
in FT_Vector_p delta);
Index: gfx/src/freetype/nsFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
retrieving revision 1.25
diff -u -3 -p -r1.25 nsFreeType.cpp
--- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25
+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000
@@ -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},
// #ifdef MOZ_SVG
{"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
{"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
@@ -282,7 +282,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
@@ -291,11 +291,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;
}
@@ -320,7 +320,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);
@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
}
NS_IMETHODIMP
-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
{
*aCache = mImageCache;
return NS_OK;
Index: gfx/src/freetype/nsFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
retrieving revision 1.17
diff -u -3 -p -r1.17 nsFreeType.h
--- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17
+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000
@@ -120,13 +120,13 @@ 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*);
-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
+ (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_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*);
// #ifdef MOZ_SVG
typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
typedef FT_Error (*FT_Get_Kerning_t)
@@ -181,7 +181,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;
@@ -229,7 +229,7 @@ protected:
PRLibrary *mSharedLib;
FT_Library mFreeTypeLibrary;
FTC_Manager mFTCacheManager;
- FTC_Image_Cache mImageCache;
+ FTC_ImageCache mImageCache;
static nsHashtable *sFontFamilies;
static nsHashtable *sRange1CharSetNames;
Index: gfx/src/ps/nsFontMetricsPS.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v
retrieving revision 1.43
diff -u -3 -p -r1.43 nsFontMetricsPS.cpp
--- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43
+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000
@@ -1140,10 +1140,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);
@@ -1189,7 +1189,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");
@@ -1227,8 +1227,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;
@@ -1621,16 +1621,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;
Index: gfx/src/ps/nsFontMetricsPS.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v
retrieving revision 1.25
diff -u -3 -p -r1.25 nsFontMetricsPS.h
--- gfx/src/ps/nsFontMetricsPS.h.orig 2009-05-02 18:42:46.000000000 +0200
+++ gfx/src/ps/nsFontMetricsPS.h 2009-08-31 14:44:11.000000000 +0200
@@ -424,7 +424,7 @@
nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
nsCOMPtr<nsIFreeType2> mFt2;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
nsCString mFontNameBase; // the base name of type 1 (sub) fonts
nscoord mHeight;
@@ -493,7 +493,7 @@
protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
nsCOMPtr<nsIFreeType2> mFt2;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
};
#endif // MOZ_ENABLE_FREETYPE2
#endif // MOZ_ENABLE_XFT
Index: gfx/src/x11shared/nsFontFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
retrieving revision 1.14
diff -u -3 -p -r1.14 nsFontFreeType.cpp
--- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14
+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000
@@ -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;
@@ -723,7 +715,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;
Index: gfx/src/x11shared/nsFontFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
retrieving revision 1.10
diff -u -3 -p -r1.10 nsFontFreeType.h
--- gfx/src/x11shared/nsFontFreeType.h.orig 2009-05-02 18:42:44.000000000 +0200
+++ gfx/src/x11shared/nsFontFreeType.h 2009-08-31 14:38:12.000000000 +0200
@@ -110,7 +110,7 @@
XImage *GetXImage(PRUint32 width, PRUint32 height);
nsITrueTypeFontCatalogEntry *mFaceID;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
nsCOMPtr<nsIFreeType2> mFt2;
};

9
www/kompozer/files/patch-build_unix_mozilla-xpcom.pc.in
View file

@ -1,9 +0,0 @@
--- build/unix/mozilla-xpcom.pc.in.orig 2009-05-02 12:41:00.000000000 -0400
+++ build/unix/mozilla-xpcom.pc.in 2010-10-10 21:56:08.718545662 -0400
@@ -8,5 +8,4 @@
Description: The Mozilla Cross Platform Component Library
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Libs: -L${libdir} -lxpcom
-Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
+Cflags: -I${includedir}/xpcom -I${includedir}/string -I${includedir}

19
www/kompozer/files/patch-config_autoconf.mk.in
View file

@ -1,19 +0,0 @@
--- config/autoconf.mk.in.orig 2009-09-02 15:38:49.000000000 +0200
+++ config/autoconf.mk.in 2009-09-02 15:39:44.000000000 +0200
@@ -57,13 +57,13 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-includedir = @includedir@/$(MOZ_APP_NAME)
+includedir = @includedir@/%%MOZILLA%%
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
-idldir = @datadir@/idl/$(MOZ_APP_NAME)
+idldir = @datadir@/idl/%%MOZILLA%%
-mozappdir = $(libdir)/$(MOZ_APP_NAME)
+mozappdir = $(libdir)/%%MOZILLA%%
mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
mrelibdir = $(mredir)/lib

15
www/kompozer/files/patch-content-html-document-src-nsHTMLContentSink.cpp
View file

@ -1,15 +0,0 @@
--- content/html/document/src/nsHTMLContentSink.cpp.orig 2010-02-23 09:57:05.000000000 +0000
+++ content/html/document/src/nsHTMLContentSink.cpp 2010-02-23 09:57:43.000000000 +0000
@@ -1630,12 +1630,6 @@
DidAddContent(node, PR_FALSE);
-#ifdef DEBUG
- if (mPreAppend &&
- SINK_LOG_TEST(gSinkLogModuleInfo, SINK_ALWAYS_REFLOW)) {
- mSink->ForceReflow();
- }
-#endif /* DEBUG */
return rv;
}
}

23
www/kompozer/files/patch-extensions_transformiix_source_base_Double.cpp
View file

@ -1,23 +0,0 @@
--- extensions/transformiix/source/base/Double.cpp.orig Mon Feb 6 15:40:52 2006
+++ extensions/transformiix/source/base/Double.cpp Mon Feb 6 15:51:01 2006
@@ -52,11 +52,16 @@
//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
#ifdef __FreeBSD__
#include <ieeefp.h>
-#ifdef __alpha__
-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-#else
-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
+#if !defined(FP_X_DNML)
+#define FP_X_DNML 0
#endif
+#if !defined(FP_X_STK)
+#define FP_X_STK 0
+#endif
+#if !defined(FP_X_IOV)
+#define FP_X_IOV 0
+#endif
+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV;
fp_except_t oldmask = fpsetmask(~allmask);
#endif

9
www/kompozer/files/patch-libm
View file

@ -1,9 +0,0 @@
--- js/Makefile.in Sun Mar 23 14:36:00 2003
+++ js/Makefile.in Thu Aug 4 23:08:06 2005
@@ -46,5 +46,5 @@
#
-DIRS = src/fdlibm src
+DIRS = src
include $(topsrcdir)/config/rules.mk

65
www/kompozer/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
View file

@ -1,65 +0,0 @@
--- modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig 2009-05-02 18:39:49.000000000 +0200
+++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp 2012-05-09 13:14:57.000000000 +0200
@@ -171,7 +171,7 @@
}
// we need to do the setjmp here otherwise bad things will happen
- if (setjmp(decoder->mPNG->jmpbuf)) {
+ if (setjmp(png_jmpbuf(decoder->mPNG))) {
png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
decoder->mError = PR_TRUE;
@@ -227,7 +227,7 @@
if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION) {
nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*,
png_get_progressive_ptr(png_ptr));
- longjmp(decoder->mPNG->jmpbuf, 1);
+ longjmp(png_jmpbuf(decoder->mPNG), 1);
}
#undef MOZ_PNG_MAX_DIMENSION
@@ -307,7 +307,7 @@
decoder->mImage = do_CreateInstance("@mozilla.org/image/container;1");
if (!decoder->mImage)
- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
+ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
decoder->mImageLoad->SetImage(decoder->mImage);
@@ -319,7 +319,7 @@
decoder->mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
if (!decoder->mFrame)
- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
+ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
gfx_format format;
@@ -341,7 +341,7 @@
// then initalize the frame and append it to the container
nsresult rv = decoder->mFrame->Init(0, 0, width, height, format, 24);
if (NS_FAILED(rv))
- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
+ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
decoder->mImage->AppendFrame(decoder->mFrame);
@@ -362,7 +362,7 @@
decoder->ibpr = bpr;
decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(decoder->ibpr*height);
if (!decoder->interlacebuf) {
- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
+ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
}
}
@@ -555,7 +555,7 @@
error_callback(png_structp png_ptr, png_const_charp error_msg)
{
PR_LOG(gPNGLog, PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
- longjmp(png_ptr->jmpbuf, 1);
+ longjmp(png_jmpbuf(png_ptr), 1);
}

15
www/kompozer/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
View file

@ -1,15 +0,0 @@
--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-03-28 13:48:53.000000000 +0200
+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-03-28 13:46:50.000000000 +0200
@@ -111,9 +111,9 @@
// initialize
png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
- png_voidp_NULL,
- png_error_ptr_NULL,
- png_error_ptr_NULL);
+ NULL,
+ NULL,
+ NULL);
if (! png_ptr)
return NS_ERROR_OUT_OF_MEMORY;
png_info* info_ptr = png_create_info_struct(png_ptr);

214
www/kompozer/files/patch-sysnss
View file

@ -1,214 +0,0 @@
--- Makefile.in Tue Sep 14 16:59:40 2004
+++ Makefile.in Tue Aug 2 08:26:55 2005
@@ -102,6 +102,4 @@
# tier 1 - 3rd party individual libraries
#
-tier_1_dirs += dbm
-
ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg
--- security/manager/Makefile.in.orig 2009-05-02 18:42:16.000000000 +0200
+++ security/manager/Makefile.in 2009-08-31 14:54:01.000000000 +0200
@@ -54,22 +54,14 @@
SSL3_LIB \
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
HAVE_FREEBL_LIBS \
HAVE_FREEBL_LIBS_32 \
HAVE_FREEBL_LIBS_32INT64 \
HAVE_FREEBL_LIBS_64 \
$(NULL)
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
endif
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
# Default
HAVE_FREEBL_LIBS = 1
@@ -218,11 +210,6 @@
.nss.cleaned: .nss.checkout
ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
endif
@@ -245,8 +232,6 @@
endif
ifeq ($(OS_ARCH),WINNT)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-else
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
endif
ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean
@@ -256,48 +241,6 @@
$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs
$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean
# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
-ifdef HAVE_FREEBL_LIBS
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
-endif
-ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
-endif
-ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
-endif
-ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
-endif
endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
@@ -308,42 +251,6 @@
install::
ifndef MOZ_NATIVE_NSS
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
-endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
-ifdef HAVE_FREEBL_LIBS
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
-endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
-endif
-ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
-endif
-ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
-endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
-endif
-ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
-endif
endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
@@ -361,11 +268,6 @@
endif
ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
endif
echo-requires-recursive::
--- security/manager/ssl/src/Makefile.in.orig 2009-05-02 18:42:14.000000000 +0200
+++ security/manager/ssl/src/Makefile.in 2009-08-31 14:56:30.000000000 +0200
@@ -131,7 +131,8 @@
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += $(NSS_CFLAGS)
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
+ $(NULL)
EXTRA_DSO_LDOPTS += \
$(MOZ_UNICHARUTIL_LIBS) \
--- security/manager/ssl/src/nsNSSComponent.cpp.orig 2009-08-31 14:58:10.000000000 +0200
+++ security/manager/ssl/src/nsNSSComponent.cpp 2009-08-31 15:00:26.000000000 +0200
@@ -124,6 +124,10 @@
#include "p12plcy.h"
}
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
#ifdef PR_LOGGING
PRLogModuleInfo* gPIPNSSLog = nsnull;
#endif
@@ -703,6 +707,7 @@
const char *possible_ckbi_locations[] = {
NS_GRE_DIR,
+ NS_UNIX_LIB_DIR,
NS_XPCOM_CURRENT_PROCESS_DIR,
0 // This special value means:
// search for ckbi in the directories on the shared
@@ -711,12 +716,20 @@
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
nsCOMPtr<nsILocalFile> mozFile;
- char *fullModuleName = nsnull;
+ char *fullModuleName;
if (!possible_ckbi_locations[il])
{
fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
}
+ if (fullModuleName == nsnull)
+ continue;
+ struct stat sb;
+ if (stat(fullModuleName, &sb)) {
+ if (errno != ENOENT)
+ perror(fullModuleName);
+ continue;
+ }
else
{
directoryService->Get( possible_ckbi_locations[il],

29
www/kompozer/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
View file

@ -1,29 +0,0 @@
--- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004
+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004
@@ -143,7 +143,7 @@
PR_END_MACRO
// Attempt to open libgconf
- gconfLib = LoadVersionedLibrary("gconf-2", ".4");
+ gconfLib = PR_LoadLibrary("libgconf-2.so");
ENSURE_LIB(gconfLib);
GET_LIB_FUNCTION(gconf, gconf_client_get_default);
@@ -151,7 +151,7 @@
GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
// Attempt to open libgnome
- gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
+ gnomeLib = PR_LoadLibrary("libgnome-2.so");
ENSURE_LIB(gnomeLib);
GET_LIB_FUNCTION(gnome, gnome_url_show);
@@ -160,7 +160,7 @@
GET_LIB_FUNCTION(gnome, gnome_program_get);
// Attempt to open libgnomevfs
- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
ENSURE_LIB(vfsLib);
GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);

30
www/kompozer/files/patch-venkman
View file

@ -1,30 +0,0 @@
--- configure.orig Thu Dec 29 00:16:56 2005
+++ configure Thu Dec 29 00:17:37 2005
@@ -12674,10 +12674,8 @@
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
fi
-if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
- echo "configure: warning: Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS." 1>&2
- MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
-fi
+echo "configure: warning: Removing venkman from MOZ_EXTENSIONS." 1>&2
+MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then
echo "configure: warning: tridentprofile extension works only on Windows at this time. Removing tridentprofile from MOZ_EXTENSIONS." 1>&2
--- configure.in.orig Thu Dec 29 00:17:05 2005
+++ configure.in Thu Dec 29 00:18:39 2005
@@ -3841,10 +3841,8 @@
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
fi
-if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
- AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
- MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
-fi
+AC_MSG_WARN([Removing venkman from MOZ_EXTENSIONS.])
+MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
dnl This might be temporary: build tridentprofile only on Windows
if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then

38
www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
View file

@ -1,38 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-05-02 18:43:37.000000000 +0200
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-09-28 22:05:47.000000000 +0200
@@ -77,7 +77,7 @@ endif
# New code for Linux, et. al., with gcc
# Migrate other platforms here after testing
#
-ifneq (,$(filter Linux,$(OS_ARCH)))
+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
# Linux/x86-64
ifeq (x86_64,$(OS_TEST))
CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
@@ -88,7 +91,7 @@
endif
endif
# IA64 Linux
-ifneq (,$(filter Linux,$(OS_ARCH)))
+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
ifneq (,$(findstring ia64,$(OS_TEST)))
CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
@@ -295,7 +295,7 @@ endif
#
# Linux/PPC
#
-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
+ifneq (,$(filter Linuxppc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
AS := $(CC) -c -x assembler-with-cpp
@@ -400,7 +400,7 @@ endif
#
# OpenBSD/SPARC64
#
-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparcv9_solaris.s
endif

11
www/kompozer/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc
View file

@ -1,11 +0,0 @@
--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004
@@ -8,7 +8,7 @@
* 1 is AddRef
* 2 is Release
*/
-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
+#if !defined(__ia64)
NS_IMETHOD Stub3();
NS_IMETHOD Stub4();
NS_IMETHOD Stub5();

12
www/kompozer/files/patch-xpfe-components-Makefile.in
View file

@ -1,12 +0,0 @@
--- xpfe/components/Makefile.in.orig 2009-09-01 17:52:59.000000000 +0200
+++ xpfe/components/Makefile.in 2009-09-01 17:53:27.000000000 +0200
@@ -126,9 +126,6 @@
DIRS += winhooks
endif
-# build2 should be last
-DIRS += build2
-
endif
ifndef MOZ_XUL_APP

18
www/kompozer/pkg-descr
View file

@ -1,18 +0,0 @@
Complete Web Authoring System that combines web file management and easy-to-use
WYSIWYG web page editing. Kompozer (formally Nvu) is based on the Firefox
codebase and is designed to be extremely easy to use, making it ideal for
non-technical computer users who want to create an attractive, professional
looking web site without needing to know HTML or web coding.
Features:
- FTP site manager
- A new color picker
- Tabs!
- CSS editor
- A dash of style(s)
- Customizable toolbars
- Forms
- Cleaner markup
- Visible marks
WWW: http://www.kompozer.net/