[SM-Commit] GIT changes to master grimoire by George Sherwood (dd5c9e283d89dac029cc2235f481ed26043225ee)

George Sherwood scm at sourcemage.org
Tue Nov 25 22:11:39 EST 2008


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 ChangeLog                                   |    3 
 dev/null                                    |binary
 http/mozilla/BUILD                          |   80 -----
 http/mozilla/CONFIGURE                      |   36 --
 http/mozilla/CONFLICTS                      |    1 
 http/mozilla/DEPENDS                        |   29 --
 http/mozilla/DETAILS                        |   72 -----
 http/mozilla/DOWNLOAD                       |    1 
 http/mozilla/HISTORY                        |    5 
 http/mozilla/INSTALL                        |   35 --
 http/mozilla/PRE_BUILD                      |   33 --
 http/mozilla/PROVIDES                       |    6 
 http/mozilla/TRIGGERS                       |    1 
 http/mozilla/desktop/mozilla.desktop        |    8 
 http/mozilla/enigmail.gpg                   |    0 
 http/mozilla/freetype.patch                 |  400 ----------------------------
 http/mozilla/gcc4.patch                     |   82 -----
 http/mozilla/libreg-standalone.diff         |   11 
 http/mozilla/mimemult.patch                 |   14 
 http/mozilla/mozilla                        |    2 
 http/mozilla/mozilla.sh                     |   12 
 http/mozilla/pkgconfig.patch                |   34 --
 http/mozilla/security_manager_makefile.diff |  142 ---------
 http/mozilla/xpfe-bootstrap.diff            |   12 
 24 files changed, 21 insertions(+), 998 deletions(-)

New commits:
commit dd5c9e283d89dac029cc2235f481ed26043225ee
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    mozilla: deprecated due to increasing security issues and no
    updates by upstream. Follow recommendation of upstream and replace
    with seamonkey.

diff --git a/ChangeLog b/ChangeLog
index 469c54b..1a8c198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-11-25 George Sherwood <gsherwood at sourcemage.org>
+	* http/mozilla: spell deprecated (security issues)
+
 2008-11-25 Ladislav Hagara <hgr at vabo.cz>
 	* gnome2-apps/gedit2: removed deprecated spell
 
diff --git a/http/mozilla/BUILD b/http/mozilla/BUILD
index d7eac55..27ba77d 100755
--- a/http/mozilla/BUILD
+++ b/http/mozilla/BUILD
@@ -1,79 +1 @@
-cd  $SOURCE_DIRECTORY/mozilla               &&
-MOZILLA_HOME=$INSTALL_ROOT/usr/lib/mozilla  &&
-
-if  [[  "$MOZILLA_ENIGMAIL"  ==  'y'  ]];  then
-  MOZILLA_EXT="$MOZILLA_EXT,ipc,enigmail"
-fi  &&
-
-if  [[  "$MOZILLA_RENDER"  ==  'libart_svg'  ]];  then
-  export MOZ_INTERNAL_LIBART_LGPL=1   &&
-  OPTS="--enable-svg-renderer-libart  \
-        $OPTS"
-elif [[  "$MOZILLA_RENDER"  ==  'cairo'  ]];  then
-  OPTS="--enable-svg-renderer-cairo  \
-        $OPTS"
-fi  &&
-
-#
-# Only strip if the user wants us to
-#
-if  echo  $LDFLAGS  |  grep  -q  --  '-s';  then
-  OPTS="$OPTS  --enable-strip"
-fi  &&
-
-#
-# No fast optimization for Mozilla, bit us so many times...
-#
-CFLAGS="${CFLAGS//-O3/-O2}"      &&
-CXXFLAGS="${CXXFLAGS//-O3/-O2}"  &&
-
-# these two are simply bugs in the Makefile-s
-sedit 's#-lgfxshared_s#-L../shared -lgfxshared_s#g' gfx/src/gtk/Makefile.in &&
-sedit 's#-lxprintutil#-L../xprintutil -lxprintutil#g' gfx/src/gtk/Makefile.in &&
-
-mozilla_remove_nspr_nss &&
-
-# fixup the pkgconfig files to use the system nspr/nss ones too
-patch  -p0  <  $SCRIPT_DIRECTORY/pkgconfig.patch  &&
-
-./configure               --prefix=$INSTALL_ROOT/usr            \
-                          --mandir=$INSTALL_ROOT/usr/share/man  \
-  --with-default-mozilla-five-home=$MOZILLA_HOME                \
-               --enable-extensions=all${MOZILLA_EXT}            \
-                 --enable-optimize="$CFLAGS"                    \
-                            --with-pthreads                     \
-                          --enable-xft                          \
-                          --enable-reorder                      \
-                          --enable-cpp-rtti                     \
-                         --disable-debug                        \
-                         --disable-tests                        \
-                         --disable-installer                    \
-                         --disable-ldap                         \
-                         --disable-pedantic                     \
-                                   $MOZILLA_MAILNEWS            \
-                                   $MOZILLA_CHAT                \
-                                   $MOZILLA_CALENDAR            \
-                                   $MOZILLA_COMPOSER            \
-                                   $MOZILLA_MATHML              \
-                                   $MOZILLA_JS                  \
-                                   $MOZILLA_XINERAMA            \
-                                   $OPTS                        &&
-
-make_single  &&
-
-if  [[  "$MOZILLA_ENIGMAIL"  ==  'y'  ]];  then
-  #
-  # fix a problem of enigmail not compiling
-  # because S/MIME IDL files are not exported in advance
-  #
-  if  !  make export;  then
-    pushd  mailnews/extensions/smime/public  &&
-    make  export                             &&
-    popd                                     &&
-    make  export
-  fi
-fi  &&
-
-# the NSPR_CONFIG=... is needed so mozilla-config gets generated correctly,
-# probably a bug in configure, but that's the easiest fix I found
-make  NSPR_CONFIG=$INSTALL_ROOT/usr/bin/nspr-config
+true
diff --git a/http/mozilla/CONFIGURE b/http/mozilla/CONFIGURE
deleted file mode 100755
index 20e9fc7..0000000
--- a/http/mozilla/CONFIGURE
+++ /dev/null
@@ -1,36 +0,0 @@
-config_query_option  MOZILLA_MAILNEWS  'Build Mail/News client?'     y  \
-                     '--enable-mailnews'  '--disable-mailnews'          && 
-
-if  [  "$MOZILLA_MAILNEWS"  ==  '--enable-mailnews'  ];  then
-  config_query  MOZILLA_ENIGMAIL  'Enable Enigmail encryption extension (must select crypto support below)?'  y
-else
-  persistent_add  MOZILLA_ENIGMAIL  &&
-  MOZILLA_ENIGMAIL="n"
-fi  &&
-              
-config_query_option  MOZILLA_CHAT      'Build Chat component?'       y  \
-                     '--enable-chat'  '--disable-chat'                  && 
-
-config_query_option  MOZILLA_CALENDAR  'Build Calendar component?'   y  \
-                     '--enable-calendar'  '--disable-calendar'          &&
-
-config_query_option  MOZILLA_COMPOSER  'Build Composer component?'   y  \
-                     '--enable-composer'  '--disable-composer'          &&
-
-config_query_option  MOZILLA_MATHML    'Enable MathML?'              y  \
-                     '--enable-mathml'  '--disable-mathml'              &&
-
-config_query_list    MOZILLA_RENDER    'Possible SVG renderers:'        \
-                     'none'  'cairo'  'libart_svg'                      &&
-
-config_query_option  MOZILLA_JS    'Build JavaScript profile tool?'  n  \
-                     '--enable-xpctools'  '--disable-xpctools'          &&
-
-config_query_option  MOZILLA_XINERAMA  'Enable Xinerama support?'    n  \
-                     '--enable-xinerama'  '--disable-xinerama'
-
-#if query 'Enable Spellcheck extension?' y; then
-#  echo 'MOZILLA_EXT=$MOZILLA_EXT,spellcheck' >> $SPELL_CONFIG
-#  message "${MESSAGE_COLOR}Type in the word 'guest' below...${DEFAULT_COLOR}"
-#  cvs -d :pserver:guest at mozdev.org:/cvs login
-#fi
diff --git a/http/mozilla/CONFLICTS b/http/mozilla/CONFLICTS
deleted file mode 100755
index 8b38df3..0000000
--- a/http/mozilla/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts  mozilla-nightly
diff --git a/http/mozilla/DEPENDS b/http/mozilla/DEPENDS
index 8e0f384..4f1a7ad 100755
--- a/http/mozilla/DEPENDS
+++ b/http/mozilla/DEPENDS
@@ -1,28 +1 @@
-depends zip &&
-depends perl &&
-
-depends zlib   '--with-system-zlib' &&
-depends jpeg   '--with-system-jpeg' &&
-depends libpng '--with-system-png'  &&
-depends nspr   '--with-system-nspr' &&
-depends gtk+2  '--enable-default-toolkit=gtk2' &&
-depends libidl '--with-libIDL' &&
-
-optional_depends nss \
-                 '--enable-crypto' \
-                 '--disable-crypto' \
-                 'for encrypted communications support (e.g. https://), recommended' &&
-
-optional_depends libmng                           \
-                 '--with-system-mng'              \
-                 '--without-system-mng'           \
-                 'for MNG picture format support' &&
-optional_depends  gnome-vfs2 "" "--disable-gnomevfs" "for smb:// url support (if enabled in gnome-vfs)"  &&
-
-if  [  "$MOZILLA_RENDER"  == "cairo"  ];  then
-  depends cairo
-fi &&
-
-if  [  "$MOZILLA_ENIGMAIL"  ==  "y"  ];  then
-  depends gnupg
-fi
+depends seamonkey
diff --git a/http/mozilla/DETAILS b/http/mozilla/DETAILS
index 595d7f2..9079813 100755
--- a/http/mozilla/DETAILS
+++ b/http/mozilla/DETAILS
@@ -1,65 +1,7 @@
-           SPELL=mozilla
-         VERSION=1.7.13
-ENIGMAIL_VERSION=0.93.2
-     IPC_VERSION=1.1.3
-      PATCHLEVEL=1
-  SECURITY_PATCH=1
-          SOURCE=$SPELL-$VERSION-source.tar.bz2
-         SOURCE2=${SOURCE}.asc
-         SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz
-         SOURCE4=${SOURCE3}.asc
-         SOURCE5=ipc-$IPC_VERSION.tar.gz
-         SOURCE6=${SOURCE5}.asc
-  SOURCE2_IGNORE=signature
-  SOURCE4_IGNORE=signature
-  SOURCE6_IGNORE=signature
-      SOURCE_GPG="mozilla.gpg:${SOURCE2}:UPSTREAM_KEY"
-     SOURCE3_GPG="enigmail.gpg:${SOURCE4}:UPSTREAM_KEY"
-     SOURCE5_GPG="enigmail.gpg:${SOURCE6}:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-      SOURCE_URI=mozilla/releases/$SPELL$VERSION/source/$SOURCE
-   SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
-   SOURCE_URL[1]=ftp://archive.progeny.com/$SOURCE_URI
-   SOURCE_URL[2]=http://ftp.oleane.net/pub/$SOURCE_URI
-   SOURCE_URL[3]=ftp://ftp.chg.ru/pub/WWW/mozilla/$SOURCE_URI
-   SOURCE_URL[4]=ftp://ftp.sunsite.kth.se/mirrors/ftp.mozilla.org/$SOURCE_URI
-   SOURCE_URL[5]=http://ftp.cvut.cz/$SOURCE_URI
-   SOURCE_URL[6]=ftp://ftp.mirror.ac.uk/sites/ftp.mozilla.org/pub/$SOURCE_URI
-   SOURCE_URL[7]=http://mirrors.xmission.com/$SOURCE_URI
-   SOURCE_URL[8]=ftp://gd.tuwien.ac.at/infosys/browsers/$SOURCE_URI
-   SOURCE_URL[9]=ftp://ftp.planetmirror.com.au/pub/$SOURCE_URI
-  SOURCE_URL[10]=http://ftp.uni-erlangen.de/pub/mirrors/$SOURCE_URI
-  SOURCE_URL[11]=ftp://ftp.free.fr/pub/Networking/www/Mozilla/$SOURCE_URI
-  SOURCE_URL[12]=ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/pub/$SOURCE_URI
-  SOURCE2_URL[0]=${SOURCE_URL}.asc
-  SOURCE3_URL[0]=http://downloads.mozdev.org/enigmail/src/$SOURCE3
-  SOURCE3_URL[1]=http://www.mozdev.org.uk/rsync/enigmail/src/$SOURCE3
-  SOURCE3_URL[2]=ftp://mozdev.secsup.org/pub/software/mozdev/enigmail/src/$SOURCE3
-  SOURCE4_URL[0]=${SOURCE3_URL}.asc
-  SOURCE5_URL[0]=http://downloads.mozdev.org/enigmail/src/$SOURCE5
-  SOURCE5_URL[1]=http://www.mozdev.org.uk/rsync/enigmail/src/$SOURCE5
-  SOURCE5_URL[2]=ftp://mozdev.secsup.org/pub/software/mozdev/enigmail/src/$SOURCE5
-  SOURCE6_URL[0]=${SOURCE5_URL}.asc
-        WEB_SITE=http://www.mozilla.org/
-         ENTERED=20010922
-         UPDATED=20050919
-      LICENSE[0]=MPL
-      LICENSE[1]=MPL
-      LICENSE[2]=MPL
-            DOCS="LICENSE README.txt"
-        KEYWORDS="web http"
-           SHORT="Web browser and a rich cient application platform"
-cat << EOF
-Mozilla is a Web browser that is being developed by the Free Software
-Community with the cooperation and support of Netscape. Initially,
-its development was based on an early version of Netscape Communicator 5.0.
-But most of it was disposed of halfway, and the current Mozilla is
-a completely new software based on the "NGLayout" layout engine
-developed for Netscape Communicator 6. "Netscape 6" (the Web browser
-from Netscape) and "Beonex Communicator" are based on Mozilla. Many
-other projects use/embed Mozilla's rendering engine.
-
-Enigmail is a "plugin" for Mozilla/Netscape7 Mail which allows users to
-access the authentication and encryption features provided by the popular
-GPG and PGP software.
-EOF
+          SPELL=mozilla
+        VERSION=0
+     PATCHLEVEL=9999
+          SHORT="deprecated"
+  cat << EOF
+    deprecated spell [replaced by seamonkey]
+  EOF
diff --git a/http/mozilla/DOWNLOAD b/http/mozilla/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/http/mozilla/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/http/mozilla/HISTORY b/http/mozilla/HISTORY
index 5dd5e7d..1804490 100644
--- a/http/mozilla/HISTORY
+++ b/http/mozilla/HISTORY
@@ -1,3 +1,8 @@
+2008-11-25 George Sherwood <gsherwood at sourcemage.org>
+	* spell deprecated [security issues]
+	* PATCHLEVEL=9999
+	* DETAILS: version 0
+
 2008-03-22 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_BUILD: Apply mimemult.patch for gcc4*
 	* mimemult.patch: Fix compilation (found with gcc 4.3.0)
diff --git a/http/mozilla/INSTALL b/http/mozilla/INSTALL
index 63dc64b..27ba77d 100755
--- a/http/mozilla/INSTALL
+++ b/http/mozilla/INSTALL
@@ -1,34 +1 @@
-make_normal  &&
-
-MOZILLA_HOME=$INSTALL_ROOT/usr/lib/mozilla &&
-
-#
-# everything coming into /usr/lib/mozilla-${VERSION/rc*}/
-# must actually go to /usr/lib/mozilla/
-#
-mkdir -p $MOZILLA_HOME &&
-ln -fns $MOZILLA_HOME $MOZILLA_HOME-${VERSION/rc*} &&
-mkdir -p $INSTALL_ROOT/usr/share/idl/mozilla &&
-ln -fns $TRACK_ROOT/usr/share/idl/mozilla $INSTALL_ROOT/usr/share/idl/mozilla-${VERSION/rc*} &&
-
-make install &&
-
-#
-# Script to set MOZILLA_FIVE_HOME
-#
-cp  ${SCRIPT_DIRECTORY}/${SPELL}.sh  $INSTALL_ROOT/etc/profile.d &&
-
-#
-# Create symlink from NSS Root CA store, if it exists.  NSS requires this
-# to be in the same directory as the current application binary.  See:
-# http://www.mozilla.org/projects/security/pki/nss/loadable_certs.html
-# https://bugzilla.mozilla.org/show_bug.cgi?id=128290
-# Only create if $MOZILLA_HOME/libnssckbi.so does not exist or is already a
-# symlink.
-#
-if  test  -f   $INSTALL_ROOT/usr/lib/libnssckbi.so;  then
-  if  !  test  -f   $MOZILLA_HOME/libnssckbi.so  ||
-         test  -h   $MOZILLA_HOME/libnssckbi.so; then
-    ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so  $MOZILLA_HOME/libnssckbi.so
-  fi                                                                  
-fi
+true
diff --git a/http/mozilla/PRE_BUILD b/http/mozilla/PRE_BUILD
index 0988fdd..27ba77d 100755
--- a/http/mozilla/PRE_BUILD
+++ b/http/mozilla/PRE_BUILD
@@ -1,32 +1 @@
-mk_source_dir  $SOURCE_DIRECTORY  &&
-cd             $SOURCE_DIRECTORY  &&
-unpack_file    ''                 &&
-cd  mozilla                       &&
-
-# fixes the "nsBuildID.h: No such file or directory" problem
-patch  -p1  < $SCRIPT_DIRECTORY/xpfe-bootstrap.diff     &&
-patch  -p0  < $SCRIPT_DIRECTORY/libreg-standalone.diff  &&
-
-patch  -p1  <  $SCRIPT_DIRECTORY/freetype.patch &&
-
-if use_gcc ^4; then
-  patch  -p0  <  $SCRIPT_DIRECTORY/gcc4.patch      &&
-  patch  -p0  <  $SCRIPT_DIRECTORY/mimemult.patch
-fi  &&
-
-# fixes a broken upstream Makefile.in
-sedit  's/\\$/ \\/'  extensions/p3p/Makefile.in  &&
-
-#
-# Enigmail extensions
-#
-if  [[  "$MOZILLA_ENIGMAIL"  ==  'y'  ]];  then
-  cd  extensions  &&
-  unpack_file  3  &&
-  unpack_file  5
-fi  &&
-
-# remove /root/.mozconfig, it causes too much trouble
-if  [  -f  /root/.mozconfig  ];  then
-  rm  -f  /root/.mozconfig
-fi
+true
diff --git a/http/mozilla/PROVIDES b/http/mozilla/PROVIDES
deleted file mode 100755
index 0ccc3ef..0000000
--- a/http/mozilla/PROVIDES
+++ /dev/null
@@ -1,6 +0,0 @@
-MOZILLA-BROWSER
-EMAIL-CLIENT
-WEB-BROWSER
-GRAPHICAL-WEB-BROWSER
-GECKO
-NS-PLUGIN-COMPATIBLE
diff --git a/http/mozilla/TRIGGERS b/http/mozilla/TRIGGERS
new file mode 100755
index 0000000..53a712e
--- /dev/null
+++ b/http/mozilla/TRIGGERS
@@ -0,0 +1 @@
+on_cast mozilla dispel_self
diff --git a/http/mozilla/desktop/mozilla.desktop b/http/mozilla/desktop/mozilla.desktop
deleted file mode 100644
index 021820f..0000000
--- a/http/mozilla/desktop/mozilla.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Mozilla
-Exec=mozilla
-Icon=
-Terminal=false
-Type=Application
-Categories=Application;Network;Browsers;
diff --git a/http/mozilla/enigmail.gpg b/http/mozilla/enigmail.gpg
deleted file mode 100644
index 5d436a4..0000000
Binary files a/http/mozilla/enigmail.gpg and /dev/null differ
diff --git a/http/mozilla/freetype.patch b/http/mozilla/freetype.patch
deleted file mode 100644
index 4e4bee8..0000000
--- a/http/mozilla/freetype.patch
+++ /dev/null
@@ -1,400 +0,0 @@
-diff -Nur mozilla/gfx/idl/nsIFreeType2.idl mozilla-ftfix/gfx/idl/nsIFreeType2.idl
---- mozilla/gfx/idl/nsIFreeType2.idl	2004-04-16 03:09:33.000000000 +0200
-+++ mozilla-ftfix/gfx/idl/nsIFreeType2.idl	2004-06-12 12:19:40.000000000 +0200
-@@ -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);
-diff -Nur mozilla/gfx/src/freetype/nsFreeType.cpp mozilla-ftfix/gfx/src/freetype/nsFreeType.cpp
---- mozilla/gfx/src/freetype/nsFreeType.cpp	2004-02-07 16:22:30.000000000 +0100
-+++ mozilla-ftfix/gfx/src/freetype/nsFreeType.cpp	2004-06-12 13:49:47.000000000 +0200
-@@ -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;
-diff -Nur mozilla/gfx/src/freetype/nsFreeType.h mozilla-ftfix/gfx/src/freetype/nsFreeType.h
---- mozilla/gfx/src/freetype/nsFreeType.h	2004-04-16 23:31:42.000000000 +0200
-+++ mozilla-ftfix/gfx/src/freetype/nsFreeType.h	2004-06-12 12:27:16.000000000 +0200
-@@ -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;
-diff -Nur mozilla/gfx/src/ps/nsFontMetricsPS.cpp mozilla-ftfix/gfx/src/ps/nsFontMetricsPS.cpp
---- mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2004-02-05 02:57:05.000000000 +0100
-+++ mozilla-ftfix/gfx/src/ps/nsFontMetricsPS.cpp	2004-06-12 12:24:15.000000000 +0200
-@@ -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;
-  
-diff -Nur mozilla/gfx/src/ps/nsFontMetricsPS.h mozilla-ftfix/gfx/src/ps/nsFontMetricsPS.h
---- mozilla/gfx/src/ps/nsFontMetricsPS.h	2003-04-22 18:25:09.000000000 +0200
-+++ mozilla-ftfix/gfx/src/ps/nsFontMetricsPS.h	2004-06-12 12:31:46.000000000 +0200
-@@ -320,7 +320,7 @@
-   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 @@
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif
- 
-diff -Nur mozilla/gfx/src/x11shared/nsFontFreeType.cpp mozilla-ftfix/gfx/src/x11shared/nsFontFreeType.cpp
---- mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2003-12-25 09:24:52.000000000 +0100
-+++ mozilla-ftfix/gfx/src/x11shared/nsFontFreeType.cpp	2004-06-12 12:35:21.000000000 +0200
-@@ -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 -Nur mozilla/gfx/src/x11shared/nsFontFreeType.h mozilla-ftfix/gfx/src/x11shared/nsFontFreeType.h
---- mozilla/gfx/src/x11shared/nsFontFreeType.h	2003-04-22 18:25:13.000000000 +0200
-+++ mozilla-ftfix/gfx/src/x11shared/nsFontFreeType.h	2004-06-12 12:32:15.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;
- };
- 
-diff -Nur mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp mozilla-ftfix/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
---- mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-03-19 02:36:16.000000000 +0100
-+++ mozilla-ftfix/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-06-12 15:52:59.000000000 +0200
-@@ -440,19 +440,18 @@
-     return;
-   }
- 
--  FTC_Image_Desc imageDesc;
--  imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
-+  FTC_ImageType imageDesc;
-+  imageDesc->face_id=(FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
-   float twipstopixel = GetTwipsToPixels();
-   float scale = GetPixelScale();
--  imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
--  imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
--  imageDesc.image_type |= ftc_image_grays;
-+  imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+  imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
- 
-   // get the face
-   nsresult rv;
-   FTC_Manager mgr;
-   nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
--  rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
-+  rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
-   NS_ASSERTION(mFace, "failed to get face/size");
- }
- 
---- mozilla/gfx/src/ps/orig	2007-09-29 19:23:55.000000000 +0200
-+++ mozilla/gfx/src/ps/nsType1.cpp	2007-09-29 19:27:56.000000000 +0200
-@@ -81,8 +81,8 @@
-   int            wmode;
- } FT2PT1_info;
- 
--static int cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, 
--                   FT_Vector *aEndPt, void *aClosure);
-+static int cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2, 
-+                   const FT_Vector *aEndPt, void *aClosure);
- static int Type1CharStringCommand(unsigned char **aBufPtrPtr, int aCmd);
- static int Type1EncodeCharStringInt(unsigned char **aBufPtrPtr, int aValue);
- 
-@@ -173,7 +173,7 @@
- }
- 
- static PRBool
--sideWidthAndBearing(FT_Vector *aEndPt, FT2PT1_info *aFti)
-+sideWidthAndBearing(const FT_Vector *aEndPt, FT2PT1_info *aFti)
- {
-   int aw = 0;
-   int ah = 0;
-@@ -216,7 +216,7 @@
- }
- 
- static int
--moveto(FT_Vector *aEndPt, void *aClosure)
-+moveto(const FT_Vector *aEndPt, void *aClosure)
- {
-   FT2PT1_info *fti = (FT2PT1_info *)aClosure;
-   FT_UShort upm = fti->face->units_per_EM;
-@@ -253,7 +253,7 @@
- }
- 
- static int
--lineto(FT_Vector *aEndPt, void *aClosure)
-+lineto(const FT_Vector *aEndPt, void *aClosure)
- {
-   FT2PT1_info *fti = (FT2PT1_info *)aClosure;
-   FT_UShort upm = fti->face->units_per_EM;
-@@ -279,7 +279,7 @@
- }
- 
- static int
--conicto(FT_Vector *aControlPt, FT_Vector *aEndPt, void *aClosure)
-+conicto(const FT_Vector *aControlPt, const FT_Vector *aEndPt, void *aClosure)
- {
-   FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;
-   FT_UShort upm = ftinfo->face->units_per_EM;
-@@ -311,7 +311,7 @@
- }
- 
- static int
--cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, FT_Vector *aEndPt,
-+cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2, const FT_Vector *aEndPt,
-         void *aClosure)
- {
-   FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;
diff --git a/http/mozilla/gcc4.patch b/http/mozilla/gcc4.patch
deleted file mode 100644
index 8837d55..0000000
--- a/http/mozilla/gcc4.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- gfx/src/freetype/nsFreeType.cpp	7 Feb 2004 15:22:30 -0000	1.24
-+++ mozilla/gfx/src/freetype/nsFreeType.cpp	4 Mar 2005 19:59:53 -0000
-@@ -96,7 +96,7 @@
- // Define the FreeType2 functions we resolve at run time.
- // see the comment near nsFreeType2::DoneFace() for more info
- //
--#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
-+#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
- FtFuncList nsFreeType2::FtFuncs [] = {
-   {"FT_Done_Face",            NS_FT2_OFFSET(nsFT_Done_Face),            PR_TRUE},
-   {"FT_Done_FreeType",        NS_FT2_OFFSET(nsFT_Done_FreeType),        PR_TRUE},
---- netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	1 Sep 2004 23:31:03 -0000	1.7.20.1
-+++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	4 Mar 2005 19:59:57 -0000
-@@ -834,8 +834,8 @@
- void
- nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
- {
--    PRUint16 name  = (PRUint32(param) & 0xFFFF0000) >> 16;
--    PRUint16 value =  PRUint32(param) & 0x0000FFFF;
-+    PRUint16 name  = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16;
-+    PRUint16 value =  NS_PTR_TO_INT32(param) & 0x0000FFFF;
- 
-     switch (name) {
-     case MAX_CONNECTIONS:
---- security/nss/lib/pki1/pki1.h	19 Jul 2001 20:40:42 -0000	1.2
-+++ mozilla/security/nss/lib/pki1/pki1.h	4 Mar 2005 19:59:59 -0000
-@@ -58,6 +58,8 @@
- /* fgmr 19990505 moved these here from oiddata.h */
- extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
- extern const PRUint32 nss_attribute_type_alias_count;
-+extern const NSSOID nss_builtin_oids[];
-+extern const PRUint32 nss_builtin_oid_count;
- 
- /*
-  * NSSOID
---- widget/src/gtk2/nsDragService.cpp	30 Oct 2003 01:48:41 -0000	1.5
-+++ mozilla/widget/src/gtk2/nsDragService.cpp	4 Mar 2005 20:00:01 -0000
-@@ -838,7 +838,7 @@
-             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-         listTarget->target = g_strdup(gMimeListType);
-         listTarget->flags = 0;
--        listTarget->info = (guint)listAtom;
-+        listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
-         PR_LOG(sDragLm, PR_LOG_DEBUG,
-                ("automatically adding target %s with id %ld\n",
-                listTarget->target, listAtom));
-@@ -877,7 +877,7 @@
-                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                             listTarget->target = g_strdup(gTextUriListType);
-                             listTarget->flags = 0;
--                            listTarget->info = (guint)listAtom;
-+                            listTarget->info = (guint)NS_PTR_TO_INT32(listAtom);
-                             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                    ("automatically adding target %s with \
-                                    id %ld\n", listTarget->target, listAtom));
-@@ -914,7 +914,7 @@
-                           (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                         target->target = g_strdup(flavorStr);
-                         target->flags = 0;
--                        target->info = (guint)atom;
-+                        target->info = (guint)NS_PTR_TO_INT32(atom);
-                         PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                ("adding target %s with id %ld\n",
-                                target->target, atom));
-@@ -931,7 +931,7 @@
-                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                             plainTarget->target = g_strdup(kTextMime);
-                             plainTarget->flags = 0;
--                            plainTarget->info = (guint)plainAtom;
-+                            plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom);
-                             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                    ("automatically adding target %s with \
-                                    id %ld\n", plainTarget->target, plainAtom));
-@@ -948,7 +948,7 @@
-                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                             urlTarget->target = g_strdup(gMozUrlType);
-                             urlTarget->flags = 0;
--                            urlTarget->info = (guint)urlAtom;
-+                            urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom);
-                             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                    ("automatically adding target %s with \
-                                    id %ld\n", urlTarget->target, urlAtom));
diff --git a/http/mozilla/libreg-standalone.diff b/http/mozilla/libreg-standalone.diff
deleted file mode 100644
index 3009117..0000000
--- a/http/mozilla/libreg-standalone.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/libreg/standalone/Makefile.in	2003-09-03 16:19:49.000000000 -0400
-+++ modules/libreg/standalone/Makefile.in	2003-09-03 16:20:20.000000000 -0400
-@@ -56,7 +56,7 @@ include $(topsrcdir)/config/rules.mk
- 
- DEFINES += -DSTANDALONE_REGISTRY
- 
--LOCAL_INCLUDES = -I$(srcdir)/../src
-+LOCAL_INCLUDES = -I$(srcdir)/../src -I$(DIST)/sdk/include
- 
- export:: $(MODULES_LIBREG_SRC_CSRCS)
- 	$(INSTALL) $^ .
diff --git a/http/mozilla/mimemult.patch b/http/mozilla/mimemult.patch
deleted file mode 100644
index 46c6434..0000000
--- a/http/mozilla/mimemult.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# From http://mail-index.netbsd.org/pkgsrc-bugs/2006/07/19/0000.html
-#
---- mailnews/mime/src/mimeeobj.h.~1.3.~	2001-09-29 05:07:42.000000000 +0900
-+++ mailnews/mime/src/mimeeobj.h	2006-07-19 08:38:25.000000000 +0900
-@@ -54,7 +54,7 @@
-   MimeLeafClass leaf;
- };
- 
--extern MimeExternalObjectClass mimeExternalObjectClass;
-+extern "C" MimeExternalObjectClass mimeExternalObjectClass;
- 
- struct MimeExternalObject {
-   MimeLeaf leaf;
diff --git a/http/mozilla/mozilla b/http/mozilla/mozilla
deleted file mode 100755
index 7399122..0000000
--- a/http/mozilla/mozilla
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/lib/mozilla/mozilla $@
diff --git a/http/mozilla/mozilla.sh b/http/mozilla/mozilla.sh
deleted file mode 100644
index dc5a7e0..0000000
--- a/http/mozilla/mozilla.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash 
-# First check if this variable is already set 
-# then if not set, check it (maybe), then set it 
-#
-# Set MOZILLA_FIVE_HOME for packages which need
-# the mozilla libs (e.g. monodevelop)
-#
-
-if  [ -z "$MOZILLA_FIVE_HOME" ] ; then 
-	MOZILLA_FIVE_HOME=/usr/lib/mozilla
-fi 
-export  MOZILLA_FIVE_HOME
diff --git a/http/mozilla/pkgconfig.patch b/http/mozilla/pkgconfig.patch
deleted file mode 100644
index 69d56e2..0000000
--- a/http/mozilla/pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- build/unix/Makefile.in~	2005-02-24 02:22:46.000000000 +0100
-+++ build/unix/Makefile.in	2005-05-24 18:09:41.000000000 +0200
-@@ -47,9 +47,9 @@
- 
- _DEFS = $(subst \,\\\\\,$(ACDEFINES))
- 
--pkg_config_files=$(MOZ_APP_NAME)-nspr.pc $(MOZ_APP_NAME)-xpcom.pc \
-+pkg_config_files=$(MOZ_APP_NAME)-xpcom.pc \
- 	$(MOZ_APP_NAME)-js.pc $(MOZ_APP_NAME)-gtkmozembed.pc \
--	$(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc
-+	$(MOZ_APP_NAME)-plugin.pc
- 
- GARBAGE	= $(pkg_config_files) mozilla-config
- 
---- build/unix/mozilla-js.pc.in~	2002-10-25 04:30:37.000000000 +0200
-+++ build/unix/mozilla-js.pc.in	2005-05-24 18:08:29.000000000 +0200
-@@ -6,6 +6,6 @@
- Name: JavaScript
- Description: The Mozilla JavaScript Library
- Version: %MOZILLA_VERSION%
--Requires: mozilla-nspr = %MOZILLA_VERSION%
-+Requires: mozilla-nspr
- Libs: -L${libdir} -lmozjs
- Cflags: -I${includedir}/js -DXP_UNIX
---- build/unix/mozilla-xpcom.pc.in~	2005-02-24 02:22:46.000000000 +0100
-+++ build/unix/mozilla-xpcom.pc.in	2005-05-24 18:08:47.000000000 +0200
-@@ -7,6 +7,6 @@
- Name: XPCOM
- Description: The Mozilla Cross Platform Component Library
- Version: %MOZILLA_VERSION%
--Requires: mozilla-nspr = %MOZILLA_VERSION%
-+Requires: mozilla-nspr
- Libs: -L${libdir} -lxpcom
- Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
diff --git a/http/mozilla/security_manager_makefile.diff b/http/mozilla/security_manager_makefile.diff
deleted file mode 100644
index ba06ebb..0000000
--- a/http/mozilla/security_manager_makefile.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -purN firefox-1.0.4/security/manager/Makefile.in firefox/security/manager/Makefile.in
---- firefox-1.0.4/security/manager/Makefile.in	2005-03-28 19:56:36.000000000 -0500
-+++ firefox/security/manager/Makefile.in	2005-05-16 16:43:42.000000000 -0400
-@@ -30,35 +30,6 @@ include $(DEPTH)/config/autoconf.mk
- MODULE = psm
- 
- PACKAGE_FILE = psm.pkg
--PACKAGE_VARS += \
--	NSS3_LIB \
--	SMIME3_LIB \
--	SSL3_LIB \
--	SOFTOKEN3_LIB \
--	SOFTOKEN3_CHK \
--	LOADABLE_ROOT_MODULE \
--	HAVE_FREEBL_MODULES \
--	$(NULL)
--
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
--
--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
--
--ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
--ifeq (,$(filter i86pc ia64,$(OS_TEST)))
--ifndef HAVE_64BIT_OS
--HAVE_FREEBL_MODULES = 1
--FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
--FREEBL_PURE32_CHK = libfreebl_pure32_3.chk
--FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
--FREEBL_HYBRID_CHK = libfreebl_hybrid_3.chk
--endif
--endif
--endif
- 
- # NSS makefiles are not safe for parallel execution.
- DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
-@@ -127,19 +98,7 @@ SUBMAKEFILES = boot/Makefile ssl/Makefil
- include $(topsrcdir)/config/rules.mk
- 
- # Attempt to properly handle NSS' refusal to implement a dependency system
--export:: .nss.cleaned
--
--.nss.cleaned: .nss.checkout
--	$(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 $@
--
--.nss.checkout:
--	touch $(srcdir)/$@
-+export::
- 
- dependclean export packages chrome::
- 	$(MAKE) -C boot $@
-@@ -150,48 +109,6 @@ endif
- 
- libs::
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
--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
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef DISABLE_DIST_GRE
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
--	$(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_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
--endif
--endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
- ifdef MOZ_XUL
-@@ -199,20 +116,6 @@ ifdef MOZ_XUL
- endif
- 
- install::
--	$(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_MODULES
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
--endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
- ifdef MOZ_XUL
-@@ -226,11 +129,6 @@ ifdef MOZ_XUL
- 	$(MAKE) -C pki $@
- endif
- 	$(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
- 
- echo-requires-recursive::
- 	$(MAKE) -C boot $@
diff --git a/http/mozilla/xpfe-bootstrap.diff b/http/mozilla/xpfe-bootstrap.diff
deleted file mode 100644
index a556375..0000000
--- a/http/mozilla/xpfe-bootstrap.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mozilla.orig/xpfe/bootstrap/Makefile.in mozilla/xpfe/bootstrap/Makefile.in
---- mozilla.orig/xpfe/bootstrap/Makefile.in	2005-01-05 10:13:48.000000000 -0800
-+++ mozilla/xpfe/bootstrap/Makefile.in	2005-01-05 10:30:19.657789128 -0800
-@@ -357,7 +357,7 @@
- 
- CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
- 
--LOCAL_INCLUDES	= -I$(srcdir) -I.
-+LOCAL_INCLUDES	= -I$(srcdir) -I. -I$(DIST)/sdk/include
- 
- ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
- $(MOZ_APP_NAME).1: mozilla.man.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk



More information about the SM-Commit mailing list