kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nvu: remove

Browse source 
Does not build in all bulk builds reports I could find.
Last release from 2005.
This commit is contained in:
wiz 2019-03-20 10:02:53 +00:00
parent 3c92a6556c
commit e8546c406f
33 changed files with 3 additions and 3822 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/CHANGES-2019
View file

@ -1,4 +1,4 @@
$NetBSD: CHANGES-2019,v 1.1392 2019/03/20 07:16:17 mef Exp $ $NetBSD: CHANGES-2019,v 1.1393 2019/03/20 10:02:53 wiz Exp $
Changes to the packages collection and infrastructure in 2019: Changes to the packages collection and infrastructure in 2019:
@ -2231,3 +2231,4 @@ Changes to the packages collection and infrastructure in 2019:
Updated security/gnutls to 3.6.6 [adam 2019-03-20] Updated security/gnutls to 3.6.6 [adam 2019-03-20]
Updated security/gnupg2 to 2.2.14 [adam 2019-03-20] Updated security/gnupg2 to 2.2.14 [adam 2019-03-20]
Updated www/php-owncloud to 10.1.0 [mef 2019-03-20] Updated www/php-owncloud to 10.1.0 [mef 2019-03-20]
Removed www/nvu [wiz 2019-03-20]

3
www/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1377 2019/03/19 14:27:18 jaapb Exp $ # $NetBSD: Makefile,v 1.1378 2019/03/20 10:02:53 wiz Exp $
# #
COMMENT= Packages related to the World Wide Web COMMENT= Packages related to the World Wide Web
@ -213,7 +213,6 @@ SUBDIR+= nostromo
SUBDIR+= ns-plugger-common SUBDIR+= ns-plugger-common
SUBDIR+= ns-remote SUBDIR+= ns-remote
SUBDIR+= nspluginwrapper SUBDIR+= nspluginwrapper
SUBDIR+= nvu
SUBDIR+= ocaml-curl SUBDIR+= ocaml-curl
SUBDIR+= ocaml-http SUBDIR+= ocaml-http
SUBDIR+= ocaml-uri SUBDIR+= ocaml-uri

15
www/nvu/DESCR
View file

@ -1,15 +0,0 @@
Nvu is a complete Web Authoring System to rival programs like FrontPage
and Dreamweaver. Nvu (which stands for "new view") makes managing a web
site a snap. Now anyone can create web pages and manage a website with
no technical expertise or knowledge of HTML.
* WYSIWYG editing of pages, making web creation as easy as typing a
letter with your word processor.
* Integrated file management via FTP. Simply login to your web site and
navigate through your files, editing web pages on the fly, directly
from your site.
* Reliable HTML code creation that will work with all of today's most
popular browsers.
* Jump between WYSIWYG Editing Mode and HTML using tabs.
* Tabbed editing to make working on multiple pages a snap.
* Powerful support for forms, tables, and templates.

38
www/nvu/Makefile
View file

@ -1,38 +0,0 @@
# $NetBSD: Makefile,v 1.19 2018/08/22 09:47:27 wiz Exp $
#
DISTNAME= nvu-1.0-sources
PKGNAME= ${DISTNAME:S/-sources//}
PKGREVISION= 11
CATEGORIES= www
MASTER_SITES= http://cvs.nvu.com/download/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nvu.com/
COMMENT= Web Authoring System
WRKSRC= ${WRKDIR}/mozilla
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ORBIT_CONFIG=orbit2-config
USE_TOOLS+= gmake perl pkg-config unzip zip
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= build/unix/mozilla-gtkmozembed.pc.in
PKGCONFIG_OVERRIDE+= build/unix/mozilla-js.pc.in
PKGCONFIG_OVERRIDE+= build/unix/mozilla-nspr.pc.in
PKGCONFIG_OVERRIDE+= build/unix/mozilla-nss.pc.in
PKGCONFIG_OVERRIDE+= build/unix/mozilla-plugin.pc.in
PKGCONFIG_OVERRIDE+= build/unix/mozilla-xpcom.pc.in
CPPFLAGS+= -I${BUILDLINK_PREFIX.libIDL}/include/libIDL-2.0
BUILDLINK_TRANSFORM+= l:IDL:IDL-2
LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/nvu-1.0
.include "../../net/libIDL/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../x11/libXp/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

3068
www/nvu/PLIST
View file

File diff suppressed because it is too large Load diff

33
www/nvu/distinfo
View file

@ -1,33 +0,0 @@
$NetBSD: distinfo,v 1.10 2015/11/04 02:46:59 agc Exp $
SHA1 (nvu-1.0-sources.tar.bz2) = 438b1633cb820bbede503ef2da90f46d4e96bee8
RMD160 (nvu-1.0-sources.tar.bz2) = 6d6fdb747d79e8602a4757e8eff8bbb21db6df8c
SHA512 (nvu-1.0-sources.tar.bz2) = 2e0076d73b029142a550b5d7be91524517d1141d84e6339c95f7772fc6c8e9d3a1399aa62c94b1dc5e2a218e89a2dbd16a973d99aca50e547f533a26a8915473
Size (nvu-1.0-sources.tar.bz2) = 29687976 bytes
SHA1 (patch-ah) = 6d4805a719d2ba5347d283b85ddf0b65e8c536af
SHA1 (patch-ai) = 74e87e7bfb098cd598ec30d21e9dc28fb4b99b7e
SHA1 (patch-aj) = ebb3b4f8700dc179dfae31740e35984f58a5b638
SHA1 (patch-ak) = 6f86b60fbe29db5d984fda06de0eff3ebf4de307
SHA1 (patch-al) = 5fe0093d2fa0691e9db035ce224265b438eedd3a
SHA1 (patch-an) = 090e62c11b8d1f4d6779f5b1e1221efb43f9460e
SHA1 (patch-ao) = eb220c4c30838216e709179cf953b9cbb9696421
SHA1 (patch-ap) = 35a193158e43d57a1c31270214140afbb3cebb56
SHA1 (patch-config_milestone.pl) = eecf61e6f2e40a7156d910d956a2d9611de1dc31
SHA1 (patch-configure) = e3192e486d2b85827485a4211953ca3229db7d11
SHA1 (patch-layout_xul_base_src_nsStackFrame.h) = 56eda32dd08e90661b5244f64bd078ba55bee61c
SHA1 (patch-netwerk_protocol_http_src_nshttpconnectionmgr_cpp) = 5b14d68932a3dd2be9e57f130e825150de8cc8dd
SHA1 (patch-nsprpub_config_Makefile.in) = daf6423b53385c32e658fa5d93e33a0c5f31ca91
SHA1 (patch-nsprpub_lib_ds_Makefile.in) = 3620eee6be375bfa3afc2008fbe714bbbb670a27
SHA1 (patch-nsprpub_lib_libc_src_Makefile.in) = c2d2a951b475c44a6ed5bf3bba6a53fc0b1a77d5
SHA1 (patch-nsprpub_pr_include_md__netbsd_cfg) = 5a310a520f1168c4b5fe72c0603268d6b0b82c61
SHA1 (patch-nsprpub_pr_include_md__netbsd_h) = 5eaddf0bb6e4daf3308d5167fdfd97bae10dd894
SHA1 (patch-nsprpub_pr_src_io_prprf_c) = a18f1b0fbd699858628474cafd676f702c1a574e
SHA1 (patch-security_nss_lib_nss_config.mk) = 870321ea256dbb3d5bf187460f7b6b4329cde2a7
SHA1 (patch-security_nss_lib_smime_config.mk) = e7b89c537574af70e3e14f334d46a77e1dbc4bc0
SHA1 (patch-security_nss_lib_softoken_config.mk) = c1110bad9779d241582d14c62a14b564664ecaa3
SHA1 (patch-security_nss_lib_ssl_config.mk) = 9c428af47fcdd3d879dab41297d2714e40587bb7
SHA1 (patch-xpcom_base_nsTraceRefcntImpl.cpp) = 5478e0791796dc7639f5cb33f543e565859e3245
SHA1 (patch-xpcom_ds_nsBaseHashtable.h) = 72af3045b04104fcf9cb8b5e0c278ccbec9680ca
SHA1 (patch-xpcom_ds_nsClassHashtable.h) = 6ebed99e3ee8709cee2cfd9ed61a2a6197fe8595
SHA1 (patch-xpcom_ds_nsInterfaceHashtable.h) = a1922d87d364e2b8f592ac49098b23ab744e8930
SHA1 (patch-xpcom_ds_nsRefPtrHashtable.h) = ccfd991c49243fc73957a49ed043c6f1e4ad96d4

49
www/nvu/patches/patch-ah
View file

@ -1,49 +0,0 @@
$NetBSD: patch-ah,v 1.2 2013/03/24 16:45:55 joerg Exp $
diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
--- gfx/idl/nsIFreeType2.idl.orig 2004-04-16 01:09:33.000000000 +0000
+++ gfx/idl/nsIFreeType2.idl
@@ -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);

62
www/nvu/patches/patch-ai
View file

@ -1,62 +0,0 @@
$NetBSD: patch-ai,v 1.2 2013/03/24 16:45:55 joerg Exp $
--- gfx/src/ps/nsFontMetricsPS.cpp.orig 2004-02-05 01:57:05.000000000 +0000
+++ gfx/src/ps/nsFontMetricsPS.cpp
@@ -1141,10 +1141,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);
@@ -1190,7 +1190,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");
@@ -1228,8 +1228,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;
@@ -1622,16 +1622,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;

40
www/nvu/patches/patch-aj
View file

@ -1,40 +0,0 @@
$NetBSD: patch-aj,v 1.2 2013/03/24 16:45:55 joerg Exp $
--- gfx/src/freetype/nsFreeType.h.orig 2004-04-16 21:31:42.000000000 +0000
+++ gfx/src/freetype/nsFreeType.h
@@ -104,13 +104,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)
@@ -165,7 +165,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;
@@ -213,7 +213,7 @@ protected:
PRLibrary *mSharedLib;
FT_Library mFreeTypeLibrary;
FTC_Manager mFTCacheManager;
- FTC_Image_Cache mImageCache;
+ FTC_ImageCache mImageCache;
static nsHashtable *sFontFamilies;
static nsHashtable *sRange1CharSetNames;

61
www/nvu/patches/patch-ak
View file

@ -1,61 +0,0 @@
$NetBSD: patch-ak,v 1.2 2013/03/24 16:45:55 joerg Exp $
--- gfx/src/freetype/nsFreeType.cpp.orig 2004-02-07 15:22:30.000000000 +0000
+++ gfx/src/freetype/nsFreeType.cpp
@@ -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;

22
www/nvu/patches/patch-al
View file

@ -1,22 +0,0 @@
$NetBSD: patch-al,v 1.2 2013/03/24 16:45:55 joerg Exp $
--- gfx/src/ps/nsFontMetricsPS.h.orig 2003-04-22 16:25:09.000000000 +0000
+++ gfx/src/ps/nsFontMetricsPS.h
@@ -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

14
www/nvu/patches/patch-an
View file

@ -1,14 +0,0 @@
$NetBSD: patch-an,v 1.2 2013/03/24 16:45:55 joerg Exp $
diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
--- gfx/src/x11shared/nsFontFreeType.h.orig 2003-04-22 16:25:13.000000000 +0000
+++ gfx/src/x11shared/nsFontFreeType.h
@@ -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;
};

76
www/nvu/patches/patch-ao
View file

@ -1,76 +0,0 @@
$NetBSD: patch-ao,v 1.2 2013/03/24 16:45:55 joerg Exp $
diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
--- gfx/src/x11shared/nsFontFreeType.cpp.orig 2003-12-25 08:24:52.000000000 +0000
+++ gfx/src/x11shared/nsFontFreeType.cpp
@@ -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;

12
www/nvu/patches/patch-ap
View file

@ -1,12 +0,0 @@
$NetBSD: patch-ap,v 1.2 2013/03/24 16:45:55 joerg Exp $
--- security/nss/lib/pki1/oiddata.h.orig 2002-01-04 05:22:07.000000000 +0000
+++ security/nss/lib/pki1/oiddata.h
@@ -43,7 +43,6 @@ static const char OIDDATA_CVS_ID[] = "@(
#include "nsspki1t.h"
#endif /* NSSPKI1T_H */
-extern const NSSOID nss_builtin_oids[];
extern const PRUint32 nss_builtin_oid_count;
/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/

13
www/nvu/patches/patch-config_milestone.pl
View file

@ -1,13 +0,0 @@
$NetBSD: patch-config_milestone.pl,v 1.1 2015/06/25 07:39:26 joerg Exp $
--- config/milestone.pl.orig 2015-06-24 20:47:42.000000000 +0000
+++ config/milestone.pl
@@ -85,7 +85,7 @@ $MILESTONE_FILE = "$TOPSRCDIR/config/mi
#
my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
-if (defined(@TEMPLATE_FILE)) {
+if (@TEMPLATE_FILE) {
my $TFILE;
foreach $TFILE (@TEMPLATE_FILE) {

32
www/nvu/patches/patch-configure
View file

@ -1,32 +0,0 @@
$NetBSD: patch-configure,v 1.1 2013/10/20 17:47:49 joerg Exp $
--- configure.orig 2013-10-18 12:43:25.000000000 +0000
+++ configure
@@ -4825,7 +4825,7 @@ if test "$GNU_CC"; then
_MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti
_MOZ_RTTI_FLAGS_OFF=${_COMPILER_PREFIX}-fno-rtti
_MOZ_EXCEPTIONS_FLAGS_ON='-fhandle-exceptions'
- _MOZ_EXCEPTIONS_FLAGS_OFF='-fno-handle-exceptions'
+ _MOZ_EXCEPTIONS_FLAGS_OFF='-fno-exceptions'
# Turn on GNU specific features
# -Wall - turn on all warnings
@@ -9813,17 +9813,7 @@ echo "configure:9812: checking for C++ e
if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- echo "int main() { return 0; }" | cat > conftest.C
-
- ${CXX-g++} ${CXXFLAGS} -c -fno-handle-exceptions conftest.C > conftest.out 2>&1
-
- if egrep "warning.*renamed" conftest.out >/dev/null; then
- ac_cv_cxx_exceptions_flags=${_COMPILER_PREFIX}-fno-exceptions
- else
- ac_cv_cxx_exceptions_flags=${_COMPILER_PREFIX}-fno-handle-exceptions
- fi
-
- rm -f conftest*
+ ac_cv_cxx_exceptions_flags=${_COMPILER_PREFIX}-fno-exceptions
fi

13
www/nvu/patches/patch-layout_xul_base_src_nsStackFrame.h
View file

@ -1,13 +0,0 @@
$NetBSD: patch-layout_xul_base_src_nsStackFrame.h,v 1.1 2013/10/15 14:49:35 joerg Exp $
--- layout/xul/base/src/nsStackFrame.h.orig 2013-10-14 22:38:42.000000000 +0000
+++ layout/xul/base/src/nsStackFrame.h
@@ -52,7 +52,7 @@ class nsStackFrame : public nsBoxFrame
{
public:
- friend nsresult NS_NewStackFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayout = nsnull);
+ friend nsresult NS_NewStackFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayout);
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const

25
www/nvu/patches/patch-netwerk_protocol_http_src_nshttpconnectionmgr_cpp
View file

@ -1,25 +0,0 @@
$NetBSD: patch-netwerk_protocol_http_src_nshttpconnectionmgr_cpp,v 1.2 2011/08/16 01:31:00 dholland Exp $
Build on amd64.
--- netwerk/protocol/http/src/nsHttpConnectionMgr.cpp.orig 2004-09-01 23:31:03.000000000 +0000
+++ netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
@@ -36,6 +36,7 @@
*
* ***** END LICENSE BLOCK ***** */
+#include <stdint.h>
#include "nsHttpConnectionMgr.h"
#include "nsHttpConnection.h"
#include "nsHttpPipeline.h"
@@ -834,8 +835,8 @@ nsHttpConnectionMgr::OnMsgReclaimConnect
void
nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
{
- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16;
- PRUint16 value = PRUint32(param) & 0x0000FFFF;
+ PRUint16 name = (PRUint32((uintptr_t)param) & 0xFFFF0000) >> 16;
+ PRUint16 value = PRUint32((uintptr_t)param) & 0x0000FFFF;
switch (name) {
case MAX_CONNECTIONS:

12
www/nvu/patches/patch-nsprpub_config_Makefile.in
View file

@ -1,12 +0,0 @@
$NetBSD: patch-nsprpub_config_Makefile.in,v 1.1 2011/03/17 13:24:07 obache Exp $
--- nsprpub/config/Makefile.in.orig 2004-04-16 22:28:03.000000000 +0000
+++ nsprpub/config/Makefile.in
@@ -139,7 +139,3 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
else
$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
endif
-
-real_install:: nspr.m4
- $(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
- $(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal

13
www/nvu/patches/patch-nsprpub_lib_ds_Makefile.in
View file

@ -1,13 +0,0 @@
$NetBSD: patch-nsprpub_lib_ds_Makefile.in,v 1.1 2013/03/24 16:45:55 joerg Exp $
--- nsprpub/lib/ds/Makefile.in.orig 2013-03-24 14:48:57.000000000 +0000
+++ nsprpub/lib/ds/Makefile.in
@@ -95,6 +95,8 @@ MKSHLIB += -M $(MAPFILE)
endif
endif
+MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
+
ifeq ($(OS_ARCH),OS2)
MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
GARBAGE += $(MAPFILE)

13
www/nvu/patches/patch-nsprpub_lib_libc_src_Makefile.in
View file

@ -1,13 +0,0 @@
$NetBSD: patch-nsprpub_lib_libc_src_Makefile.in,v 1.1 2013/03/24 16:45:55 joerg Exp $
--- nsprpub/lib/libc/src/Makefile.in.orig 2013-03-24 14:43:01.000000000 +0000
+++ nsprpub/lib/libc/src/Makefile.in
@@ -146,6 +146,8 @@ else
SUF = LL
endif
+MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
+
GARBAGE += $(TINC)
$(TINC):

15
www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_cfg
View file

@ -1,15 +0,0 @@
$NetBSD: patch-nsprpub_pr_include_md__netbsd_cfg,v 1.2 2013/03/24 16:45:55 joerg Exp $
Build on amd64.
--- nsprpub/pr/include/md/_netbsd.cfg.orig 2000-12-01 21:29:17.000000000 +0000
+++ nsprpub/pr/include/md/_netbsd.cfg
@@ -137,7 +137,7 @@
#define PR_ALIGN_OF_DOUBLE 8
#define PR_ALIGN_OF_POINTER 4
-#elif defined(__alpha__)
+#elif defined(__alpha__) || defined(__x86_64__)
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
#define HAVE_LONG_LONG

32
www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_h
View file

@ -1,32 +0,0 @@
$NetBSD: patch-nsprpub_pr_include_md__netbsd_h,v 1.2 2013/03/24 16:45:55 joerg Exp $
Build on amd64.
--- nsprpub/pr/include/md/_netbsd.h.orig 2003-09-11 17:24:53.000000000 +0000
+++ nsprpub/pr/include/md/_netbsd.h
@@ -42,6 +42,8 @@
#define _PR_SI_SYSNAME "NetBSD"
#if defined(__i386__)
#define _PR_SI_ARCHITECTURE "x86"
+#elif defined(__x86_64__)
+#define _PR_SI_ARCHITECTURE "x86-64"
#elif defined(__alpha__)
#define _PR_SI_ARCHITECTURE "alpha"
#elif defined(__m68k__)
@@ -108,6 +110,16 @@
}
#define _MD_GET_SP(_thread) CONTEXT(_thread)[2]
#endif
+#ifdef __x86_64__
+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
+{ \
+ sigsetjmp(CONTEXT(_thread), 1); \
+ CONTEXT(_thread)[_JB_RSP] = (unsigned char*) ((_sp) - 128); \
+ CONTEXT(_thread)[_JB_PC] = (int) _main; \
+ *status = PR_TRUE; \
+}
+#define _MD_GET_SP(_thread) CONTEXT(_thread)[_JB_RSP]
+#endif
#ifdef __sparc__
#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
{ \

18
www/nvu/patches/patch-nsprpub_pr_src_io_prprf_c
View file

@ -1,18 +0,0 @@
$NetBSD: patch-nsprpub_pr_src_io_prprf_c,v 1.2 2013/03/24 16:45:55 joerg Exp $
Use valid va_list handling.
--- nsprpub/pr/src/io/prprf.c.orig 2004-03-09 03:18:19.000000000 +0000
+++ nsprpub/pr/src/io/prprf.c
@@ -51,7 +51,10 @@
** Note: on some platforms va_list is defined as an array,
** and requires array notation.
*/
-#if (defined(LINUX) && defined(__x86_64__))
+#if __STDC__ >= 19990101 || defined(__NetBSD__) || defined(__FreeBSD__) || \
+ defined(__OpenBSD__) || defined(__DragonFly__)
+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
+#elif (defined(LINUX) && defined(__x86_64__))
#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
#elif (defined(LINUX) && defined(__powerpc__)) || \
(defined(LINUX) && defined(__s390__)) || \

12
www/nvu/patches/patch-security_nss_lib_nss_config.mk
View file

@ -1,12 +0,0 @@
$NetBSD: patch-security_nss_lib_nss_config.mk,v 1.1 2013/03/24 16:45:55 joerg Exp $
--- security/nss/lib/nss/config.mk.orig 2013-03-24 14:32:56.000000000 +0000
+++ security/nss/lib/nss/config.mk
@@ -116,6 +116,7 @@ MKSHLIB += -R '$$ORIGIN'
endif
endif
+MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
ifndef NS_USE_GCC

9
www/nvu/patches/patch-security_nss_lib_smime_config.mk
View file

@ -1,9 +0,0 @@
$NetBSD: patch-security_nss_lib_smime_config.mk,v 1.1 2013/03/24 16:45:55 joerg Exp $
--- security/nss/lib/smime/config.mk.orig 2013-03-24 14:47:55.000000000 +0000
+++ security/nss/lib/smime/config.mk
@@ -92,3 +92,4 @@ ifeq ($(OS_TARGET),SunOS)
MKSHLIB += -R '$$ORIGIN'
endif
+MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0

10
www/nvu/patches/patch-security_nss_lib_softoken_config.mk
View file

@ -1,10 +0,0 @@
$NetBSD: patch-security_nss_lib_softoken_config.mk,v 1.1 2013/03/24 16:45:55 joerg Exp $
--- security/nss/lib/softoken/config.mk.orig 2013-03-24 14:50:22.000000000 +0000
+++ security/nss/lib/softoken/config.mk
@@ -92,3 +92,5 @@ endif
ifeq ($(OS_TARGET),WINCE)
DEFINES += -DDBM_USING_NSPR
endif
+
+MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0

11
www/nvu/patches/patch-security_nss_lib_ssl_config.mk
View file

@ -1,11 +0,0 @@
$NetBSD: patch-security_nss_lib_ssl_config.mk,v 1.1 2013/03/24 16:45:55 joerg Exp $
--- security/nss/lib/ssl/config.mk.orig 2013-03-24 14:50:44.000000000 +0000
+++ security/nss/lib/ssl/config.mk
@@ -84,4 +84,6 @@ ifeq ($(OS_TARGET),SunOS)
MKSHLIB += -R '$$ORIGIN'
endif
+MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
+
endif

22
www/nvu/patches/patch-xpcom_base_nsTraceRefcntImpl.cpp
View file

@ -1,22 +0,0 @@
$NetBSD: patch-xpcom_base_nsTraceRefcntImpl.cpp,v 1.1 2013/10/15 14:49:35 joerg Exp $
--- xpcom/base/nsTraceRefcntImpl.cpp.orig 2004-02-11 07:16:10.000000000 +0000
+++ xpcom/base/nsTraceRefcntImpl.cpp
@@ -1304,7 +1304,7 @@ nsTraceRefcntImpl::LogAddCOMPtr(void* aC
{
#if defined(NS_BUILD_REFCNT_LOGGING) && defined(HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR)
// Get the most-derived object.
- void *object = dynamic_cast<void *>(aObject);
+ void *object = reinterpret_cast<void *>(aObject);
// This is a very indirect way of finding out what the class is
// of the object being logged. If we're logging a specific type,
@@ -1347,7 +1347,7 @@ nsTraceRefcntImpl::LogReleaseCOMPtr(void
{
#if defined(NS_BUILD_REFCNT_LOGGING) && defined(HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR)
// Get the most-derived object.
- void *object = dynamic_cast<void *>(aObject);
+ void *object = reinterpret_cast<void *>(aObject);
// This is a very indirect way of finding out what the class is
// of the object being logged. If we're logging a specific type,

31
www/nvu/patches/patch-xpcom_ds_nsBaseHashtable.h
View file

@ -1,31 +0,0 @@
$NetBSD: patch-xpcom_ds_nsBaseHashtable.h,v 1.1 2013/03/24 16:45:55 joerg Exp $
--- xpcom/ds/nsBaseHashtable.h.orig 2003-08-09 19:24:24.000000000 +0000
+++ xpcom/ds/nsBaseHashtable.h
@@ -124,7 +124,7 @@ public:
*/
PRBool Get(KeyType aKey, UserDataType* pData) const
{
- EntryType* ent = GetEntry(aKey);
+ EntryType* ent = this->GetEntry(aKey);
if (!ent)
return PR_FALSE;
@@ -143,7 +143,7 @@ public:
*/
PRBool Put(KeyType aKey, UserDataType aData)
{
- EntryType* ent = PutEntry(aKey);
+ EntryType* ent = this->PutEntry(aKey);
if (!ent)
return PR_FALSE;
@@ -157,7 +157,7 @@ public:
* remove the data for the associated key
* @param aKey the key to remove from the hashtable
*/
- void Remove(KeyType aKey) { RemoveEntry(aKey); }
+ void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
/**
* function type provided by the application for enumeration.

13
www/nvu/patches/patch-xpcom_ds_nsClassHashtable.h
View file

@ -1,13 +0,0 @@
$NetBSD: patch-xpcom_ds_nsClassHashtable.h,v 1.1 2013/03/24 16:45:55 joerg Exp $
--- xpcom/ds/nsClassHashtable.h.orig 2003-06-19 18:42:23.000000000 +0000
+++ xpcom/ds/nsClassHashtable.h
@@ -98,7 +98,7 @@ PRBool
nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
{
typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
- GetEntry(aKey);
+ this->GetEntry(aKey);
if (ent)
{

22
www/nvu/patches/patch-xpcom_ds_nsInterfaceHashtable.h
View file

@ -1,22 +0,0 @@
$NetBSD: patch-xpcom_ds_nsInterfaceHashtable.h,v 1.1 2013/03/24 16:45:55 joerg Exp $
--- xpcom/ds/nsInterfaceHashtable.h.orig 2003-12-29 13:22:49.000000000 +0000
+++ xpcom/ds/nsInterfaceHashtable.h
@@ -111,7 +111,7 @@ nsInterfaceHashtable<KeyClass,Interface>
(KeyType aKey, UserDataType* pInterface) const
{
typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
- GetEntry(aKey);
+ this->GetEntry(aKey);
if (ent)
{
@@ -139,7 +139,7 @@ nsInterfaceHashtable<KeyClass,Interface>
(KeyType aKey, PRBool* aFound) const
{
typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
- GetEntry(aKey);
+ this->GetEntry(aKey);
if (ent)
{

13
www/nvu/patches/patch-xpcom_ds_nsRefPtrHashtable.h
View file

@ -1,13 +0,0 @@
$NetBSD: patch-xpcom_ds_nsRefPtrHashtable.h,v 1.1 2013/03/24 16:45:56 joerg Exp $
--- xpcom/ds/nsRefPtrHashtable.h.orig 2004-01-31 12:37:36.000000000 +0000
+++ xpcom/ds/nsRefPtrHashtable.h
@@ -140,7 +140,7 @@ nsRefPtrHashtable<KeyClass,RefPtr>::GetW
(KeyType aKey, PRBool* aFound) const
{
typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
- GetEntry(aKey);
+ this->GetEntry(aKey);
if (ent)
{