[Frugalware-git] voroskoi: firefox-3.0b1-1beta1-i686

voroskoi voroskoi at frugalware.org
Thu Nov 29 20:27:25 CET 2007


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=voroskoi.git;a=commitdiff;h=5145c98da9c0ce0e67a086041ee684a52c6d2f17

commit 5145c98da9c0ce0e67a086041ee684a52c6d2f17
Author: voroskoi <voroskoi at frugalware.org>
Date:   Thu Nov 29 20:27:12 2007 +0100

firefox-3.0b1-1beta1-i686
bump to ff3
well, it's a dirty build, but works

diff --git a/source/xapps/firefox/04-firefox-1.5-freetype-compile.patch0 b/source/xapps/firefox/04-firefox-1.5-freetype-compile.patch0
deleted file mode 100644
index d1b1d7c..0000000
--- a/source/xapps/firefox/04-firefox-1.5-freetype-compile.patch0
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
---- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl    2004-04-16 10:09:33.000000000 +0900
-+++ ./gfx/idl/nsIFreeType2.idl  2004-06-11 00:32:42.000000000 +0900
-@@ -76,10 +76,11 @@
- 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 @@
-
-     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 @@
-     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);
-$NetBSD: patch-ai,v 1.9 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp  2004-02-05 10:57:05.000000000 +0900
-+++ ./gfx/src/ps/nsFontMetricsPS.cpp    2004-06-10 23:00:08.000000000 +0900
-@@ -1141,10 +1141,10 @@
-
-   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 @@
-   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 @@
-
-   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 @@
-   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;
-
-$NetBSD: patch-aj,v 1.10 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h   2004-04-17 06:31:42.000000000 +0900
-+++ ./gfx/src/freetype/nsFreeType.h 2004-06-10 23:03:07.000000000 +0900
-@@ -104,13 +104,13 @@
- 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 @@
-   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 @@
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
-
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
-$NetBSD: patch-ak,v 1.11 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
-+++ ./gfx/src/freetype/nsFreeType.cpp   2004-06-10 23:05:42.000000000 +0900
-@@ -110,11 +110,11 @@
-   {"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 @@
- }
-
- 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 @@
- }
-
- 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 @@
- }
-
- 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 @@
- }
-
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
-$NetBSD: patch-al,v 1.9 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h    2003-04-23 01:25:09.000000000 +0900
-+++ ./gfx/src/ps/nsFontMetricsPS.h  2004-06-10 23:06:23.000000000 +0900
-@@ -320,7 +320,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;
-
-@@ -363,7 +363,7 @@
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif
-
-$NetBSD: patch-an,v 1.7 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h  2003-04-23 01:25:13.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.h    2004-06-10 23:06:35.000000000 +0900
-@@ -110,7 +110,7 @@
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
-
-$NetBSD: patch-ao,v 1.5 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp    2003-12-25 17:24:52.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.cpp  2004-06-10 23:06:38.000000000 +0900
-@@ -177,7 +177,7 @@
-   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 @@
-   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 @@
-         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 @@
-   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 @@
-   if (!face)
-     return 0;
-
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@
-     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;
-
diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild
index 5c10e4a..76f1816 100644
--- a/source/xapps/firefox/FrugalBuild
+++ b/source/xapps/firefox/FrugalBuild
@@ -3,22 +3,20 @@
# Contributor: VMiklos <vmiklos at frugalware.org>

pkgname=firefox
-pkgver=2.0.0.9
-pkgrel=2
+pkgver=3.0b1
+pkgrel=1beta1
pkgdesc="Mozilla Firefox web browser"
url="http://www.mozilla.org/products/firefox/"
depends=('gtk+2' 'libidl' 'desktop-file-utils' 'nss>=3.11.3-2' 'glibc>=2.6')
-makedepends=('zip')
+makedepends=('zip' 'curl')
groups=('xapps')
archs=('i686' 'x86_64')
up2date="lynx -dump ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/latest/source | sed 's/-source//g' | Flasttarbz2"
-source=(http://ftp.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver-source.tar.bz2 \
+source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0b1/source/firefox-3.0b1-source.tar.bz2 \
# Disable the default application checks.
01-$pkgname-1.5-default_applications.patch0 \
# Set the default homepage
03-$pkgname-2.0-homepage.patch \
-	# Support newer FreeType2.
-	04-$pkgname-1.5-freetype-compile.patch0 \
# Autodetect language.
05-$pkgname-1.5-lang-detection.patch \
# Some versions of the mime stuff will add whitespace to the end or
@@ -27,18 +25,18 @@ source=(http://ftp.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/
config \
ffremote \
$pkgname.desktop)
-signatures=("${source[0]}.asc" '' '' '' '' '' '' '' '')
+signatures=("${source[0]}.asc" '' '' '' '' '' '' '')

build() {
unset MAKEFLAGS
Fcd mozilla
sed "s/-march=i686 -O2 -pipe/$CFLAGS/" $startdir/src/config > .mozconfig
# fix buggy dpi default value
-	sed -i '/layout.css.dpi/s/-1/72/' modules/libpref/src/init/all.js || return 1
+	#sed -i '/layout.css.dpi/s/-1/72/' modules/libpref/src/init/all.js || return 1
export MOZ_PHOENIX=1
Fpatchall

-	Fsed "ac_cv_visibility_pragma=yes" "ac_cv_visibility_pragma=no" configure
+	#Fsed "ac_cv_visibility_pragma=yes" "ac_cv_visibility_pragma=no" configure
make -f client.mk build || Fdie
make || Fdie

@@ -48,9 +46,11 @@ build() {
# Get rid of versions in path names.
Fmv /usr/include/$pkgname-$pkgver /usr/include/$pkgname
Fmv /usr/lib/$pkgname-$pkgver /usr/lib/$pkgname
+	Fmv /usr/lib/$pkgname-devel-$pkgver /usr/lib/$pkgname-devel
Fmv /usr/share/idl/$pkgname-$pkgver /usr/share/idl/$pkgname
Fln $pkgname /usr/include/$pkgname-$pkgver
Fln $pkgname /usr/lib/$pkgname-$pkgver
+	Fln $pkgname-devel /usr/lib/$pkgname-devel-$pkgver
Fln $pkgname /usr/share/idl/$pkgname-$pkgver

# Plugins.
@@ -58,22 +58,30 @@ build() {
Fln ../mozilla/plugins/ /usr/lib/$pkgname/plugins

# /usr/share/aclocal/nspr.m4 conflicts with mozilla.
-	Frm /usr/share/aclocal
+	#Frm /usr/share/aclocal

# Install ffremote.
-	Fexe /usr/bin/ffremote
+	#Fexe /usr/bin/ffremote

# Install icon for the menu file.
-	Fmkdir /usr/share/pixmaps/
-	Fcp /usr/lib/$pkgname/icons/default.xpm /usr/share/pixmaps/$pkgname.xpm
+	#Fmkdir /usr/share/pixmaps/
+	#Fcp /usr/lib/$pkgname/icons/default.xpm /usr/share/pixmaps/$pkgname.xpm

# Install menu file.
-	Ffile /usr/share/applications/$pkgname.desktop
+	#Ffile /usr/share/applications/$pkgname.desktop

# Change the default icons
-	Fmkdir /usr/lib/$pkgname/chrome/icons/default
-	Fcp /usr/lib/$pkgname/icons/* /usr/lib/$pkgname/chrome/icons/default/
-	Fmv /usr/lib/$pkgname/chrome/chromelist.txt /usr/lib/$pkgname/chrome/installed-chrome.txt
+	#Fmkdir /usr/lib/$pkgname/chrome/icons/default
+	#Fcp /usr/lib/$pkgname/icons/* /usr/lib/$pkgname/chrome/icons/default/
+	#Fmv /usr/lib/$pkgname/chrome/chromelist.txt /usr/lib/$pkgname/chrome/installed-chrome.txt
+
+	Fln /usr/lib/firefox-devel-$pkgver/sdk/lib /usr/lib/firefox-devel-$pkgver/lib
+	Fln /usr/lib/firefox-$pkgver /usr/lib/firefox-devel-$pkgver/bin
+	Fln /usr/include/firefox-$pkgver/stable /usr/lib/firefox-devel-$pkgver/sdk/include
+	Fln /usr/include/firefox-$pkgver/unstable /usr/lib/firefox-devel-$pkgver/include
+	Fln /usr/share/idl/firefox-$pkgver/stable /usr/lib/firefox-devel-$pkgver/sdk/idl
+	Fln /usr/share/idl/firefox-$pkgver/unstable /usr/lib/firefox-devel-$pkgver/idl
+	Fln /usr/lib/firefox-$pkgver/firefox /usr/bin/firefox
}

# optimization OK
diff --git a/source/xapps/firefox/config b/source/xapps/firefox/config
index 83b6abf..161e7be 100644
--- a/source/xapps/firefox/config
+++ b/source/xapps/firefox/config
@@ -14,18 +14,18 @@ ac_add_options --disable-activex
ac_add_options --disable-activex-scripting
ac_add_options --enable-strip
ac_add_options --enable-xft
-ac_add_options --enable-toolkit-gtk2
-ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-toolkit-cairo-gtk2
+ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-toolkit-xlib
ac_add_options --disable-toolkit-qt
ac_add_options --disable-toolkit-gtk
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
+#ac_add_options --with-system-nspr
+#ac_add_options --with-system-nss
ac_add_options --enable-nspr-autoconf
ac_add_options --disable-pedantic
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
-ac_add_options --with-system-png
+#ac_add_options --with-system-png
ac_add_options --with-system-mng
ac_add_options --with-pthreads
ac_add_options --disable-mailnews
@@ -36,4 +36,4 @@ ac_add_options --enable-single-profile
ac_add_options --enable-application=browser
ac_add_options --enable-image-decoders=all
ac_add_options --with-distribution-id=Frugalware
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo


More information about the Frugalware-git mailing list