diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2005-01-24 19:41:36 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2005-01-24 19:41:36 +0000 |
| commit | 9f4a54caf5384d61ca60581eef9f3106ec42c979 (patch) | |
| tree | 6aeb9af16b289e0a6e14cb282fb6f791e9a0830c /net-www/mozilla | |
| parent | Stable on hppa. (diff) | |
| download | historical-9f4a54caf5384d61ca60581eef9f3106ec42c979.tar.gz historical-9f4a54caf5384d61ca60581eef9f3106ec42c979.tar.bz2 historical-9f4a54caf5384d61ca60581eef9f3106ec42c979.zip | |
Mark 1.7.5 stable on ia64. Trim older ebuilds and cruft in FILESDIR
Package-Manager: portage-2.0.51-r14
Diffstat (limited to 'net-www/mozilla')
41 files changed, 28 insertions, 6264 deletions
diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog index cbfa363a63d4..35e78e2a200e 100644 --- a/net-www/mozilla/ChangeLog +++ b/net-www/mozilla/ChangeLog @@ -1,6 +1,28 @@ # ChangeLog for net-www/mozilla # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.220 2005/01/02 11:54:13 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.221 2005/01/24 19:41:35 agriffis Exp $ + + 24 Jan 2005; Aron Griffis <agriffis@gentoo.org> -files/enigmail-Makefile, + -files/gtk2mozilla_head_patch2, -files/ipc-1.0.6-nsPipeChannel.patch, + -files/ipc-1.0.7-nsPipeChannel.patch, -files/mozilla, + -files/mozilla-1.4-amd64.patch, -files/mozilla-1.6-gcc-3.4.patch, + -files/mozilla-1.7-amd64.patch, -files/mozilla-ft-bytecode.patch, + -files/mozilla-new-freetype2.patch, -files/mozilla-xft-unix-prefs.patch, + -files/mozilla.sh, -files/1.2/mozilla-1.2-branch-update.patch.bz2, + -files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2, + -files/1.2/mozilla-1.2-image-reload-memleak.patch, + -files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2, + -files/1.2/mozilla-1.2b-Xft-includes.patch.bz2, + -files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2, + -files/1.2/mozilla-1.2b-freetype.patch.bz2, + -files/1.2/mozilla-1.2b-gtk2.patch.bz2, + -files/1.2/mozilla-1.2b-over-the-spot.patch.bz2, + -files/1.2/mozilla-1.2b-wallet.patch.bz2, -files/enigmail/Makefile-enigmail, + -files/enigmail/Makefile-ipc, -mozilla-1.6-r1.ebuild, + -mozilla-1.7-r1.ebuild, -mozilla-1.7.2-r1.ebuild, -mozilla-1.7.3-r2.ebuild, + -mozilla-1.7.3-r3.ebuild, -mozilla-1.7.3.ebuild, mozilla-1.7.5.ebuild, + -mozilla-1.7.ebuild: + Mark 1.7.5 stable on ia64. Trim older ebuilds and cruft in FILESDIR 02 Jan 2005; Guy Martin <gmsoft@gentoo.org> mozilla-1.7.5.ebuild: Stable on hppa. YAY ! diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest index bff9160ba8ed..b395987a197c 100644 --- a/net-www/mozilla/Manifest +++ b/net-www/mozilla/Manifest @@ -1,56 +1,18 @@ -MD5 ceb3b718acf3d5c60f8c09a9dd84e084 ChangeLog 37196 +MD5 f70ab38cfea73c39cc97ad746d77fe5e ChangeLog 38482 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 -MD5 7c90e1ccb807e874f4bfa5796d3c513d mozilla-1.6-r1.ebuild 16979 -MD5 21fbce86f739b098e11b5225b58f452d mozilla-1.7-r1.ebuild 16620 -MD5 aa7166da0319e88d9ad909403631ab70 mozilla-1.7.2-r1.ebuild 8874 -MD5 f4b18993ea4e902777640a7afe26b4de mozilla-1.7.3.ebuild 8822 -MD5 9320e2015bdfdecec9c9bcd3a6f65cfb mozilla-1.7.ebuild 16477 -MD5 1b86c01a90c75d55fc70099410d8cd0d mozilla-1.7.3-r2.ebuild 9947 -MD5 4370477202723c1b000f026f1edabe7f mozilla-1.7.3-r3.ebuild 9977 -MD5 ab59eb6d071439b5d27c33ddf369577d mozilla-1.7.5.ebuild 10181 +MD5 37d850804fd95f9eb515a16255e72382 mozilla-1.7.5.ebuild 10183 MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105 -MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201 -MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7 204 -MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7-r1 204 -MD5 01b356d7ff1afde7e091ed10b251b940 files/digest-mozilla-1.7.2-r1 204 -MD5 a56a4dca744d428bef57871c21c54be7 files/digest-mozilla-1.7.3 281 -MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706 -MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148 -MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614 -MD5 a5fb876c8ca4e8dbd0208db31897f39d files/ipc-1.0.7-nsPipeChannel.patch 445 -MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134 -MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052 -MD5 3ad7410bd680964096c84eee3fa21abf files/mozilla-1.6-gcc-3.4.patch 460 -MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953 -MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629 -MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720 MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310 -MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320 -MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135 -MD5 a56a4dca744d428bef57871c21c54be7 files/digest-mozilla-1.7.3-r2 281 -MD5 678261bd3948e6db546338bbc90f721f files/digest-mozilla-1.7.3-r3 203 MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360 MD5 b19c38da8865b9ee5555aeb826d1d360 files/digest-mozilla-1.7.5 203 MD5 5496222980a6faf8261066f43cd4c6a5 files/mozilla-hppa.patch 7785 MD5 278524216669b594ea5b6468a180ed73 files/mozilla-1.7.5-stackgrowth.patch 931 -MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240 -MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838 -MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489 -MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605 -MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387 -MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030 -MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854 -MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091 -MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320 -MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921 MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387 MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754 -MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560 -MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153 diff --git a/net-www/mozilla/files/1.2/mozilla-1.2-branch-update.patch.bz2 b/net-www/mozilla/files/1.2/mozilla-1.2-branch-update.patch.bz2 Binary files differdeleted file mode 100644 index b5c2056d0393..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2-branch-update.patch.bz2 +++ /dev/null diff --git a/net-www/mozilla/files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 b/net-www/mozilla/files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 Binary files differdeleted file mode 100644 index 9f9d585e6776..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 +++ /dev/null diff --git a/net-www/mozilla/files/1.2/mozilla-1.2-image-reload-memleak.patch b/net-www/mozilla/files/1.2/mozilla-1.2-image-reload-memleak.patch deleted file mode 100644 index 209de2bb0464..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2-image-reload-memleak.patch +++ /dev/null @@ -1,45 +0,0 @@ -? hpradhan@hedwig -Index: nsImageDocument.cpp -=================================================================== -RCS file: /cvsroot/mozilla/content/html/document/src/nsImageDocument.cpp,v -retrieving revision 1.87 -diff -u -u -r1.87 nsImageDocument.cpp ---- content/html/document/src/nsImageDocument.cpp 28 Sep 2002 10:50:50 -0000 1.87 -+++ content/html/document/src/nsImageDocument.cpp 11 Dec 2002 11:52:11 -0000 -@@ -97,6 +97,8 @@ - PRBool aReset = PR_TRUE, - nsIContentSink* aSink = nsnull); - -+ NS_IMETHOD SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject); -+ - nsresult CreateSyntheticDocument(); - - nsresult EndLayout(nsISupports *ctxt, -@@ -144,8 +146,6 @@ - NS_IMETHODIMP - ImageListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt) - { -- nsresult rv; -- - nsCOMPtr<nsIChannel> channel = do_QueryInterface(request); - if (!channel) return NS_ERROR_NULL_POINTER; - -@@ -276,6 +276,18 @@ - return NS_OK; - } - -+NS_IMETHODIMP -+nsImageDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject) -+{ -+ if (!aScriptGlobalObject) { -+ // If the global object is being set to null, then it means we are -+ // going away soon. Drop our ref to imgRequest so that we dont end -+ // up leaking due to cycles through imgLib -+ mImageRequest = nsnull; -+ } -+ -+ return nsHTMLDocument::SetScriptGlobalObject(aScriptGlobalObject); -+} - - nsresult - nsImageDocument::CreateSyntheticDocument() diff --git a/net-www/mozilla/files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 b/net-www/mozilla/files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 Binary files differdeleted file mode 100644 index 41edbfa1ff26..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 +++ /dev/null diff --git a/net-www/mozilla/files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 b/net-www/mozilla/files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 Binary files differdeleted file mode 100644 index 88c4228e1601..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 +++ /dev/null diff --git a/net-www/mozilla/files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 b/net-www/mozilla/files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 Binary files differdeleted file mode 100644 index 5ced88422a95..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 +++ /dev/null diff --git a/net-www/mozilla/files/1.2/mozilla-1.2b-freetype.patch.bz2 b/net-www/mozilla/files/1.2/mozilla-1.2b-freetype.patch.bz2 Binary files differdeleted file mode 100644 index a9e53b643364..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2b-freetype.patch.bz2 +++ /dev/null diff --git a/net-www/mozilla/files/1.2/mozilla-1.2b-gtk2.patch.bz2 b/net-www/mozilla/files/1.2/mozilla-1.2b-gtk2.patch.bz2 Binary files differdeleted file mode 100644 index d58237e3202f..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2b-gtk2.patch.bz2 +++ /dev/null diff --git a/net-www/mozilla/files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 b/net-www/mozilla/files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 Binary files differdeleted file mode 100644 index 14c8ae0659f6..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 +++ /dev/null diff --git a/net-www/mozilla/files/1.2/mozilla-1.2b-wallet.patch.bz2 b/net-www/mozilla/files/1.2/mozilla-1.2b-wallet.patch.bz2 Binary files differdeleted file mode 100644 index b8208dbfe4f9..000000000000 --- a/net-www/mozilla/files/1.2/mozilla-1.2b-wallet.patch.bz2 +++ /dev/null diff --git a/net-www/mozilla/files/digest-mozilla-1.6-r1 b/net-www/mozilla/files/digest-mozilla-1.6-r1 deleted file mode 100644 index 57588c8c94e1..000000000000 --- a/net-www/mozilla/files/digest-mozilla-1.6-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 da612f8768320dbafd0bfb3c254c2788 mozilla-source-1.6.tar.bz2 31037452 -MD5 70d1b085d8b2ed7c82b6666fa1d537af enigmail-0.83.3.tar.gz 325747 -MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083 diff --git a/net-www/mozilla/files/digest-mozilla-1.7 b/net-www/mozilla/files/digest-mozilla-1.7 deleted file mode 100644 index 813569f1bcaa..000000000000 --- a/net-www/mozilla/files/digest-mozilla-1.7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5b4494934c4ffaee83bc79a8b181a8c3 mozilla-source-1.7.tar.bz2 35174502 -MD5 e4c79a7bb5ac7428dfef767e835fc770 ipc-1.0.6.tar.gz 116519 -MD5 b8bc2517de376a99b6ad7a9ad96747d2 enigmail-0.84.1-r1.tar.gz 309440 diff --git a/net-www/mozilla/files/digest-mozilla-1.7-r1 b/net-www/mozilla/files/digest-mozilla-1.7-r1 deleted file mode 100644 index 813569f1bcaa..000000000000 --- a/net-www/mozilla/files/digest-mozilla-1.7-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5b4494934c4ffaee83bc79a8b181a8c3 mozilla-source-1.7.tar.bz2 35174502 -MD5 e4c79a7bb5ac7428dfef767e835fc770 ipc-1.0.6.tar.gz 116519 -MD5 b8bc2517de376a99b6ad7a9ad96747d2 enigmail-0.84.1-r1.tar.gz 309440 diff --git a/net-www/mozilla/files/digest-mozilla-1.7.2-r1 b/net-www/mozilla/files/digest-mozilla-1.7.2-r1 deleted file mode 100644 index adc8e1f10d9f..000000000000 --- a/net-www/mozilla/files/digest-mozilla-1.7.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 262987cfcb793bab9fb1aebb21c527ce mozilla-source3-1.7.2.tar.bz2 34438800 -MD5 f605ba029ff4c71dcc10c29635c1c79e ipc-1.0.7.tar.gz 104193 -MD5 7ad587bba6bdb002be2670ac94b09139 enigmail-0.85.0.tar.gz 326337 diff --git a/net-www/mozilla/files/digest-mozilla-1.7.3 b/net-www/mozilla/files/digest-mozilla-1.7.3 deleted file mode 100644 index ee9991bbd682..000000000000 --- a/net-www/mozilla/files/digest-mozilla-1.7.3 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 15cb68da1d58f055f871b77ff655df77 mozilla-source-1.7.3.tar.bz2 29716200 -MD5 47ed5962d3d18f5792f805eff706cfbd mozilla-1.7.2-libart_lgpl.tar.bz2 102117 -MD5 0109af0c56b20f8dfd7f3bb080b4a148 ipc-1.0.8.tar.gz 102374 -MD5 52bf78d1976478fb7bb485b7754d13ff enigmail-0.86.0.tar.gz 327816 diff --git a/net-www/mozilla/files/digest-mozilla-1.7.3-r2 b/net-www/mozilla/files/digest-mozilla-1.7.3-r2 deleted file mode 100644 index ee9991bbd682..000000000000 --- a/net-www/mozilla/files/digest-mozilla-1.7.3-r2 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 15cb68da1d58f055f871b77ff655df77 mozilla-source-1.7.3.tar.bz2 29716200 -MD5 47ed5962d3d18f5792f805eff706cfbd mozilla-1.7.2-libart_lgpl.tar.bz2 102117 -MD5 0109af0c56b20f8dfd7f3bb080b4a148 ipc-1.0.8.tar.gz 102374 -MD5 52bf78d1976478fb7bb485b7754d13ff enigmail-0.86.0.tar.gz 327816 diff --git a/net-www/mozilla/files/digest-mozilla-1.7.3-r3 b/net-www/mozilla/files/digest-mozilla-1.7.3-r3 deleted file mode 100644 index 2e19cc36ba04..000000000000 --- a/net-www/mozilla/files/digest-mozilla-1.7.3-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 15cb68da1d58f055f871b77ff655df77 mozilla-source-1.7.3.tar.bz2 29716200 -MD5 5e8ced79811ce4986fc840de8d9fc938 ipc-1.1.1.tar.gz 102900 -MD5 a377f8296aa5013350a05085faa336b1 enigmail-0.89.0.tar.gz 332923 diff --git a/net-www/mozilla/files/enigmail-Makefile b/net-www/mozilla/files/enigmail-Makefile deleted file mode 100644 index c6a95caba45d..000000000000 --- a/net-www/mozilla/files/enigmail-Makefile +++ /dev/null @@ -1,45 +0,0 @@ -#!gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "MPL"); you may not use this file -# except in compliance with the MPL. You may obtain a copy of -# the MPL at http://www.mozilla.org/MPL/ -# -# Software distributed under the MPL is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the MPL for the specific language governing -# rights and limitations under the MPL. -# -# The Original Code is Enigmail. -# -# The Initial Developer of the Original Code is Ramalingam Saravanan. -# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are -# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License (the "GPL"), in which case -# the provisions of the GPL are applicable instead of -# those above. If you wish to allow use of your version of this -# file only under the terms of the GPL and not to allow -# others to use your version of this file under the MPL, indicate -# your decision by deleting the provisions above and replace them -# with the notice and other provisions required by the GPL. -# If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -DEPTH = ../.. -topsrcdir = ../.. -srcdir = . -VPATH = . - -include $(DEPTH)/config/autoconf.mk - -DIRS = public src build ui package - -include $(topsrcdir)/config/config.mk - -include $(topsrcdir)/config/rules.mk diff --git a/net-www/mozilla/files/enigmail/Makefile-enigmail b/net-www/mozilla/files/enigmail/Makefile-enigmail deleted file mode 100644 index c6a95caba45d..000000000000 --- a/net-www/mozilla/files/enigmail/Makefile-enigmail +++ /dev/null @@ -1,45 +0,0 @@ -#!gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "MPL"); you may not use this file -# except in compliance with the MPL. You may obtain a copy of -# the MPL at http://www.mozilla.org/MPL/ -# -# Software distributed under the MPL is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the MPL for the specific language governing -# rights and limitations under the MPL. -# -# The Original Code is Enigmail. -# -# The Initial Developer of the Original Code is Ramalingam Saravanan. -# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are -# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License (the "GPL"), in which case -# the provisions of the GPL are applicable instead of -# those above. If you wish to allow use of your version of this -# file only under the terms of the GPL and not to allow -# others to use your version of this file under the MPL, indicate -# your decision by deleting the provisions above and replace them -# with the notice and other provisions required by the GPL. -# If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -DEPTH = ../.. -topsrcdir = ../.. -srcdir = . -VPATH = . - -include $(DEPTH)/config/autoconf.mk - -DIRS = public src build ui package - -include $(topsrcdir)/config/config.mk - -include $(topsrcdir)/config/rules.mk diff --git a/net-www/mozilla/files/enigmail/Makefile-ipc b/net-www/mozilla/files/enigmail/Makefile-ipc deleted file mode 100644 index 99c2231f3d0c..000000000000 --- a/net-www/mozilla/files/enigmail/Makefile-ipc +++ /dev/null @@ -1,51 +0,0 @@ -#!gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "MPL"); you may not use this file -# except in compliance with the MPL. You may obtain a copy of -# the MPL at http://www.mozilla.org/MPL/ -# -# Software distributed under the MPL is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the MPL for the specific language governing -# rights and limitations under the MPL. -# -# The Original Code is protoZilla. -# -# The Initial Developer of the Original Code is Ramalingam Saravanan. -# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are -# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License (the "GPL"), in which case -# the provisions of the GPL are applicable instead of -# those above. If you wish to allow use of your version of this -# file only under the terms of the GPL and not to allow -# others to use your version of this file under the MPL, indicate -# your decision by deleting the provisions above and replace them -# with the notice and other provisions required by the GPL. -# If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -DEPTH = ../.. -topsrcdir = ../.. -srcdir = . -VPATH = . - -include $(DEPTH)/config/autoconf.mk - -DIRS = public src - -ifdef BUILD_IPC -DIRS += build -endif - -ifdef ENABLE_TESTS -DIRS += tests -endif - -include $(topsrcdir)/config/rules.mk diff --git a/net-www/mozilla/files/gtk2mozilla_head_patch2 b/net-www/mozilla/files/gtk2mozilla_head_patch2 deleted file mode 100644 index 6b4e3da4e8eb..000000000000 --- a/net-www/mozilla/files/gtk2mozilla_head_patch2 +++ /dev/null @@ -1,773 +0,0 @@ -Index: build//unix/mozilla-gtkmozembed.pc.in -=================================================================== -RCS file: /cvsroot/mozilla/build/unix/mozilla-gtkmozembed.pc.in,v -retrieving revision 1.1 -diff -u -r1.1 mozilla-gtkmozembed.pc.in ---- build//unix/mozilla-gtkmozembed.pc.in 28 May 2002 20:20:40 -0000 1.1 -+++ build//unix/mozilla-gtkmozembed.pc.in 28 Jun 2002 16:08:30 -0000 -@@ -7,5 +7,5 @@ - Description: Mozilla Embedding Widget for Gtk+ - Version: %MOZILLA_VERSION% - Requires: mozilla-xpcom = %MOZILLA_VERSION% --Libs: -L${libdir} -lgtkembedmoz -lgtksuperwin -+Libs: -L${libdir} -lgtkembedmoz - Cflags: -I${includedir}/gtkembedmoz -Index: embedding/browser/gtk//src/EmbedWindow.cpp -=================================================================== -RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp,v -retrieving revision 1.25 -diff -u -r1.25 EmbedWindow.cpp ---- embedding/browser/gtk//src/EmbedWindow.cpp 29 Jan 2002 21:39:31 -0000 1.25 -+++ embedding/browser/gtk//src/EmbedWindow.cpp 28 Jun 2002 16:09:15 -0000 -@@ -226,9 +226,11 @@ - { - GtkWidget* parent = GTK_WIDGET(mOwner->mOwningWidget)->parent; - -+#ifdef MOZ_WIDGET_GTK - if (GTK_IS_CONTAINER(parent)) - gtk_container_focus(GTK_CONTAINER(parent), - GTK_DIR_TAB_FORWARD); -+#endif - return NS_OK; - } - -@@ -237,9 +239,11 @@ - { - GtkWidget* parent = GTK_WIDGET(mOwner->mOwningWidget)->parent; - -+#ifdef MOZ_WIDGET_GTK - if (GTK_IS_CONTAINER(parent)) - gtk_container_focus(GTK_CONTAINER(parent), - GTK_DIR_TAB_BACKWARD); -+#endif - return NS_OK; - } - -@@ -405,7 +409,9 @@ - 0, 0, - sTipWindow->allocation.width, sTipWindow->allocation.height); - -+#ifdef MOZ_WIDGET_GTK - gtk_widget_popup(sTipWindow, aXCoords + root_x, aYCoords + root_y); -+#endif /* MOZ_WIDGET_GTK */ - - nsMemory::Free( (void*)tipString ); - -Index: embedding/browser/gtk//src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/Makefile.in,v -retrieving revision 1.31 -diff -u -r1.31 Makefile.in ---- embedding/browser/gtk//src/Makefile.in 11 Apr 2002 14:30:28 -0000 1.31 -+++ embedding/browser/gtk//src/Makefile.in 28 Jun 2002 16:09:16 -0000 -@@ -56,6 +56,11 @@ - EmbedWindowCreator.cpp \ - EmbedStream.cpp - -+ifdef MOZ_ENABLE_GTK2 -+CSRCS = \ -+ gtkmozembedmarshal.c -+endif -+ - ifdef BUILD_STATIC_LIBS - # Static build stuff - DEFINES += -D_BUILD_STATIC_BIN=1 -@@ -88,12 +93,20 @@ - gtkmozembed.h \ - gtkmozembed_internal.h - -+ifdef MOZ_ENABLE_GTK - EXTRA_DSO_LDOPTS = \ - $(MOZ_COMPONENT_LIBS) \ - -lgtksuperwin \ - $(NULL) -+endif -+ -+ifdef MOZ_ENABLE_GTK2 -+EXTRA_DSO_LDOPTS = \ -+ $(MOZ_COMPONENT_LIBS) \ -+ $(NULL) -+endif - --EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) -+EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) $(MOZ_GTK2_LIBS) - - include $(topsrcdir)/config/rules.mk - -@@ -108,7 +121,8 @@ - endif - endif - --CXXFLAGS += $(MOZ_GTK_CFLAGS) -+CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) -+CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) - - ifdef BUILD_STATIC_LIBS - -Index: embedding/browser/gtk//src/gtkmozembed2.cpp -=================================================================== -RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp,v -retrieving revision 1.23 -diff -u -r1.23 gtkmozembed2.cpp ---- embedding/browser/gtk//src/gtkmozembed2.cpp 12 Jan 2002 05:04:57 -0000 1.23 -+++ embedding/browser/gtk//src/gtkmozembed2.cpp 28 Jun 2002 16:09:21 -0000 -@@ -36,11 +36,32 @@ - #include <nsXPIDLString.h> - #include <nsReadableUtils.h> - -+#ifdef MOZ_WIDGET_GTK -+ - // so we can get callbacks from the mozarea - #include <gtkmozarea.h> - -+// so we get the right marshaler for gtk 1.2 -+#define gtkmozembed_VOID__INT_UINT \ -+ gtk_marshal_NONE__INT_INT -+#define gtkmozembed_VOID__POINTER_INT_INT \ -+ gtk_marshal_NONE__POINTER_INT_INT -+#define gtkmozembed_VOID__POINTER_INT_UINT \ -+ gtk_marshal_NONE__POINTER_INT_INT -+#define gtkmozembed_VOID__POINTER_INT_POINTER \ -+ gtk_marshal_NONE__POINTER_INT_POINTER -+ -+#endif /* MOZ_WIDGET_GTK */ -+ -+#ifdef MOZ_WIDGET_GTK2 -+ -+#include "gtkmozembedmarshal.h" -+ -+#endif /* MOZ_WIDGET_GTK2 */ -+ - class nsIDirectoryServiceProvider; - -+#ifdef MOZ_WIDGET_GTK - // Some "massaged" enum information for the GTK Type System - static GtkFlagValue gtk_moz_embed_progress_flags_values[] = { - { GTK_MOZ_EMBED_FLAG_START, -@@ -138,6 +159,7 @@ - { 0, - NULL, NULL } - }; -+#endif /* MOZ_WIDGET_GTK */ - - - // class and instance initialization -@@ -180,6 +202,7 @@ - GdkEventFocus *aGdkFocusEvent, - GtkMozEmbed *aEmbed); - -+#ifdef MOZ_WIDGET_GTK - // signal handlers for tracking the focus and and focus out events on - // the toplevel window. - -@@ -189,6 +212,7 @@ - static void - handle_toplevel_focus_out(GtkMozArea *aArea, - GtkMozEmbed *aEmbed); -+#endif /* MOZ_WIDGET_GTK */ - - // globals for this type of widget - -@@ -249,191 +273,193 @@ - moz_embed_signals[LINK_MESSAGE] = - gtk_signal_new ("link_message", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, link_message), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - moz_embed_signals[JS_STATUS] = - gtk_signal_new ("js_status", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, js_status), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - moz_embed_signals[LOCATION] = - gtk_signal_new ("location", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, location), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - moz_embed_signals[TITLE] = - gtk_signal_new("title", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, title), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - moz_embed_signals[PROGRESS] = - gtk_signal_new("progress", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, progress), - gtk_marshal_NONE__INT_INT, - GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT); - moz_embed_signals[PROGRESS_ALL] = - gtk_signal_new("progress_all", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, progress_all), -- gtk_marshal_NONE__POINTER_INT_INT, -+ gtkmozembed_VOID__POINTER_INT_INT, - GTK_TYPE_NONE, 3, GTK_TYPE_STRING, - GTK_TYPE_INT, GTK_TYPE_INT); - moz_embed_signals[NET_STATE] = - gtk_signal_new("net_state", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, net_state), -- gtk_marshal_NONE__INT_INT, -+ gtkmozembed_VOID__INT_UINT, - GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_UINT); - moz_embed_signals[NET_STATE_ALL] = - gtk_signal_new("net_state_all", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, net_state_all), -- gtk_marshal_NONE__POINTER_INT_INT, -+ gtkmozembed_VOID__POINTER_INT_UINT, - GTK_TYPE_NONE, 3, GTK_TYPE_STRING, - GTK_TYPE_INT, GTK_TYPE_UINT); - moz_embed_signals[NET_START] = - gtk_signal_new("net_start", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, net_start), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - moz_embed_signals[NET_STOP] = - gtk_signal_new("net_stop", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, net_stop), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - moz_embed_signals[NEW_WINDOW] = - gtk_signal_new("new_window", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, new_window), - gtk_marshal_NONE__POINTER_UINT, - GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_UINT); - moz_embed_signals[VISIBILITY] = - gtk_signal_new("visibility", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, visibility), - gtk_marshal_NONE__BOOL, - GTK_TYPE_NONE, 1, GTK_TYPE_BOOL); - moz_embed_signals[DESTROY_BROWSER] = - gtk_signal_new("destroy_browser", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, destroy_brsr), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - moz_embed_signals[OPEN_URI] = - gtk_signal_new("open_uri", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, open_uri), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_STRING); - moz_embed_signals[SIZE_TO] = - gtk_signal_new("size_to", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, size_to), - gtk_marshal_NONE__INT_INT, - GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT); - moz_embed_signals[DOM_KEY_DOWN] = - gtk_signal_new("dom_key_down", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_key_down), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - moz_embed_signals[DOM_KEY_PRESS] = - gtk_signal_new("dom_key_press", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_key_press), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - moz_embed_signals[DOM_KEY_UP] = - gtk_signal_new("dom_key_up", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_key_up), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - moz_embed_signals[DOM_MOUSE_DOWN] = - gtk_signal_new("dom_mouse_down", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_mouse_down), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - moz_embed_signals[DOM_MOUSE_UP] = - gtk_signal_new("dom_mouse_up", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_mouse_up), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - moz_embed_signals[DOM_MOUSE_CLICK] = - gtk_signal_new("dom_mouse_click", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_mouse_click), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - moz_embed_signals[DOM_MOUSE_DBL_CLICK] = - gtk_signal_new("dom_mouse_dbl_click", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_mouse_dbl_click), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - moz_embed_signals[DOM_MOUSE_OVER] = - gtk_signal_new("dom_mouse_over", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_mouse_over), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - moz_embed_signals[DOM_MOUSE_OUT] = - gtk_signal_new("dom_mouse_out", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_mouse_out), - gtk_marshal_BOOL__POINTER, - GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); - moz_embed_signals[SECURITY_CHANGE] = - gtk_signal_new("security_change", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, security_change), - gtk_marshal_NONE__POINTER_UINT, - GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_UINT); - moz_embed_signals[STATUS_CHANGE] = - gtk_signal_new("status_change", - GTK_RUN_LAST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedClass, status_change), -- gtk_marshal_NONE__POINTER_INT_POINTER, -+ gtkmozembed_VOID__POINTER_INT_POINTER, - GTK_TYPE_NONE, 3, - GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_POINTER); - -+#ifdef MOZ_WIDGET_GTK - gtk_object_class_add_signals(object_class, moz_embed_signals, - EMBED_LAST_SIGNAL); -+#endif /* MOZ_WIDGET_GTK */ - - } - -@@ -443,6 +469,8 @@ - EmbedPrivate *priv = new EmbedPrivate(); - embed->data = priv; - gtk_widget_set_name(GTK_WIDGET(embed), "gtkmozembed"); -+ -+ GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET(embed), GTK_NO_WINDOW); - } - - GtkWidget * -@@ -538,6 +566,7 @@ - embed, - GTK_OBJECT(child_widget)); - -+#ifdef MOZ_WIDGET_GTK - // connect to the toplevel focus out events for the child - GtkMozArea *mozarea = GTK_MOZAREA(child_widget); - gtk_signal_connect_while_alive(GTK_OBJECT(mozarea), -@@ -551,6 +580,7 @@ - GTK_SIGNAL_FUNC(handle_toplevel_focus_out), - embed, - GTK_OBJECT(mozarea)); -+#endif /* MOZ_WIDGET_GTK */ - } - - static void -@@ -663,6 +693,8 @@ - return FALSE; - } - -+#ifdef MOZ_WIDGET_GTK -+ - static void - handle_toplevel_focus_in (GtkMozArea *aArea, - GtkMozEmbed *aEmbed) -@@ -683,6 +715,8 @@ - embedPrivate->TopLevelFocusOut(); - } - -+#endif /* MOZ_WIDGET_GTK */ -+ - // Widget methods - - void -@@ -1011,6 +1045,8 @@ - return embedPrivate->mChromeMask; - } - -+#ifdef MOZ_WIDGET_GTK -+ - GtkType - gtk_moz_embed_progress_flags_get_type(void) - { -@@ -1059,6 +1095,8 @@ - return chrome_flags_type; - } - -+#endif /* MOZ_WIDGET_GTK */ -+ - void - gtk_moz_embed_get_nsIWebBrowser (GtkMozEmbed *embed, nsIWebBrowser **retval) - { -@@ -1183,14 +1221,16 @@ - moz_embed_single_signals[NEW_WINDOW_ORPHAN] = - gtk_signal_new("new_window_orphan", - GTK_RUN_FIRST, -- object_class->type, -+ GTK_CLASS_TYPE(klass), - GTK_SIGNAL_OFFSET(GtkMozEmbedSingleClass, - new_window_orphan), - gtk_marshal_NONE__POINTER_UINT, - GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_UINT); - -+#ifdef MOZ_WIDGET_GTK - gtk_object_class_add_signals(object_class, moz_embed_single_signals, - SINGLE_LAST_SIGNAL); -+#endif /* MOZ_WIDGET_GTK */ - } - - static void -Index: widget/src/gtk2/nsWindow.cpp -=================================================================== -RCS file: /cvsroot/mozilla/widget/src/gtk2/nsWindow.cpp,v -retrieving revision 1.33 -diff -u -r1.33 nsWindow.cpp ---- widget/src/gtk2/nsWindow.cpp 25 Jun 2002 07:07:18 -0000 1.33 -+++ widget/src/gtk2/nsWindow.cpp 28 Jun 2002 16:09:54 -0000 -@@ -261,7 +261,8 @@ - gtk_widget_destroy(GTK_WIDGET(mContainer)); - mContainer = nsnull; - } -- else if (mDrawingarea) { -+ -+ if (mDrawingarea) { - g_object_unref(mDrawingarea); - mDrawingarea = nsnull; - } - ---- /dev/null Thu Apr 11 16:25:15 2002 -+++ embedding/browser/gtk/src/gtkmozembedmarshal.txt Sat Jun 29 01:44:04 2002 -@@ -0,0 +1,4 @@ -+NONE:INT,UINT -+NONE:POINTER,INT,INT -+NONE:POINTER,INT,UINT -+NONE:POINTER,INT,POINTER ---- /dev/null Thu Apr 11 16:25:15 2002 -+++ embedding/browser/gtk/src/gtkmozembedmarshal.c Sat Jun 29 01:44:02 2002 -@@ -0,0 +1,203 @@ -+ -+#include <glib-object.h> -+ -+ -+#ifdef G_ENABLE_DEBUG -+#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -+#define g_marshal_value_peek_char(v) g_value_get_char (v) -+#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -+#define g_marshal_value_peek_int(v) g_value_get_int (v) -+#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -+#define g_marshal_value_peek_long(v) g_value_get_long (v) -+#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -+#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -+#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -+#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -+#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -+#define g_marshal_value_peek_float(v) g_value_get_float (v) -+#define g_marshal_value_peek_double(v) g_value_get_double (v) -+#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -+#define g_marshal_value_peek_param(v) g_value_get_param (v) -+#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -+#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -+#define g_marshal_value_peek_object(v) g_value_get_object (v) -+#else /* !G_ENABLE_DEBUG */ -+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. -+ * Do not access GValues directly in your code. Instead, use the -+ * g_value_get_*() functions -+ */ -+#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -+#define g_marshal_value_peek_char(v) (v)->data[0].v_int -+#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -+#define g_marshal_value_peek_int(v) (v)->data[0].v_int -+#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -+#define g_marshal_value_peek_long(v) (v)->data[0].v_long -+#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -+#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -+#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -+#define g_marshal_value_peek_enum(v) (v)->data[0].v_int -+#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint -+#define g_marshal_value_peek_float(v) (v)->data[0].v_float -+#define g_marshal_value_peek_double(v) (v)->data[0].v_double -+#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -+#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -+#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -+#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -+#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -+#endif /* !G_ENABLE_DEBUG */ -+ -+ -+/* NONE:INT,UINT (/dev/stdin:1) */ -+void -+gtkmozembed_VOID__INT_UINT (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data) -+{ -+ typedef void (*GMarshalFunc_VOID__INT_UINT) (gpointer data1, -+ gint arg_1, -+ guint arg_2, -+ gpointer data2); -+ register GMarshalFunc_VOID__INT_UINT callback; -+ register GCClosure *cc = (GCClosure*) closure; -+ register gpointer data1, data2; -+ -+ g_return_if_fail (n_param_values == 3); -+ -+ if (G_CCLOSURE_SWAP_DATA (closure)) -+ { -+ data1 = closure->data; -+ data2 = g_value_peek_pointer (param_values + 0); -+ } -+ else -+ { -+ data1 = g_value_peek_pointer (param_values + 0); -+ data2 = closure->data; -+ } -+ callback = (GMarshalFunc_VOID__INT_UINT) (marshal_data ? marshal_data : cc->callback); -+ -+ callback (data1, -+ g_marshal_value_peek_int (param_values + 1), -+ g_marshal_value_peek_uint (param_values + 2), -+ data2); -+} -+ -+/* NONE:POINTER,INT,INT (/dev/stdin:2) */ -+void -+gtkmozembed_VOID__POINTER_INT_INT (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data) -+{ -+ typedef void (*GMarshalFunc_VOID__POINTER_INT_INT) (gpointer data1, -+ gpointer arg_1, -+ gint arg_2, -+ gint arg_3, -+ gpointer data2); -+ register GMarshalFunc_VOID__POINTER_INT_INT callback; -+ register GCClosure *cc = (GCClosure*) closure; -+ register gpointer data1, data2; -+ -+ g_return_if_fail (n_param_values == 4); -+ -+ if (G_CCLOSURE_SWAP_DATA (closure)) -+ { -+ data1 = closure->data; -+ data2 = g_value_peek_pointer (param_values + 0); -+ } -+ else -+ { -+ data1 = g_value_peek_pointer (param_values + 0); -+ data2 = closure->data; -+ } -+ callback = (GMarshalFunc_VOID__POINTER_INT_INT) (marshal_data ? marshal_data : cc->callback); -+ -+ callback (data1, -+ g_marshal_value_peek_pointer (param_values + 1), -+ g_marshal_value_peek_int (param_values + 2), -+ g_marshal_value_peek_int (param_values + 3), -+ data2); -+} -+ -+/* NONE:POINTER,INT,UINT (/dev/stdin:3) */ -+void -+gtkmozembed_VOID__POINTER_INT_UINT (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data) -+{ -+ typedef void (*GMarshalFunc_VOID__POINTER_INT_UINT) (gpointer data1, -+ gpointer arg_1, -+ gint arg_2, -+ guint arg_3, -+ gpointer data2); -+ register GMarshalFunc_VOID__POINTER_INT_UINT callback; -+ register GCClosure *cc = (GCClosure*) closure; -+ register gpointer data1, data2; -+ -+ g_return_if_fail (n_param_values == 4); -+ -+ if (G_CCLOSURE_SWAP_DATA (closure)) -+ { -+ data1 = closure->data; -+ data2 = g_value_peek_pointer (param_values + 0); -+ } -+ else -+ { -+ data1 = g_value_peek_pointer (param_values + 0); -+ data2 = closure->data; -+ } -+ callback = (GMarshalFunc_VOID__POINTER_INT_UINT) (marshal_data ? marshal_data : cc->callback); -+ -+ callback (data1, -+ g_marshal_value_peek_pointer (param_values + 1), -+ g_marshal_value_peek_int (param_values + 2), -+ g_marshal_value_peek_uint (param_values + 3), -+ data2); -+} -+ -+/* NONE:POINTER,INT,POINTER (/dev/stdin:4) */ -+void -+gtkmozembed_VOID__POINTER_INT_POINTER (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data) -+{ -+ typedef void (*GMarshalFunc_VOID__POINTER_INT_POINTER) (gpointer data1, -+ gpointer arg_1, -+ gint arg_2, -+ gpointer arg_3, -+ gpointer data2); -+ register GMarshalFunc_VOID__POINTER_INT_POINTER callback; -+ register GCClosure *cc = (GCClosure*) closure; -+ register gpointer data1, data2; -+ -+ g_return_if_fail (n_param_values == 4); -+ -+ if (G_CCLOSURE_SWAP_DATA (closure)) -+ { -+ data1 = closure->data; -+ data2 = g_value_peek_pointer (param_values + 0); -+ } -+ else -+ { -+ data1 = g_value_peek_pointer (param_values + 0); -+ data2 = closure->data; -+ } -+ callback = (GMarshalFunc_VOID__POINTER_INT_POINTER) (marshal_data ? marshal_data : cc->callback); -+ -+ callback (data1, -+ g_marshal_value_peek_pointer (param_values + 1), -+ g_marshal_value_peek_int (param_values + 2), -+ g_marshal_value_peek_pointer (param_values + 3), -+ data2); -+} -+ ---- /dev/null Thu Apr 11 16:25:15 2002 -+++ embedding/browser/gtk/src/gtkmozembedmarshal.h Wed Jun 26 21:06:15 2002 -@@ -0,0 +1,48 @@ -+ -+#ifndef __gtkmozembed_MARSHAL_H__ -+#define __gtkmozembed_MARSHAL_H__ -+ -+#include <glib-object.h> -+ -+G_BEGIN_DECLS -+ -+/* NONE:INT,UINT (/dev/stdin:1) */ -+extern void gtkmozembed_VOID__INT_UINT (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data); -+#define gtkmozembed_NONE__INT_UINT gtkmozembed_VOID__INT_UINT -+ -+/* NONE:POINTER,INT,INT (/dev/stdin:2) */ -+extern void gtkmozembed_VOID__POINTER_INT_INT (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data); -+#define gtkmozembed_NONE__POINTER_INT_INT gtkmozembed_VOID__POINTER_INT_INT -+ -+/* NONE:POINTER,INT,UINT (/dev/stdin:3) */ -+extern void gtkmozembed_VOID__POINTER_INT_UINT (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data); -+#define gtkmozembed_NONE__POINTER_INT_UINT gtkmozembed_VOID__POINTER_INT_UINT -+ -+/* NONE:POINTER,INT,POINTER (/dev/stdin:4) */ -+extern void gtkmozembed_VOID__POINTER_INT_POINTER (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data); -+#define gtkmozembed_NONE__POINTER_INT_POINTER gtkmozembed_VOID__POINTER_INT_POINTER -+ -+G_END_DECLS -+ -+#endif /* __gtkmozembed_MARSHAL_H__ */ -+ -Index: embedding/browser/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/embedding/browser/Makefile.in,v -retrieving revision 1.10 -diff -u -r1.10 Makefile.in ---- embedding/browser/Makefile.in 18 Dec 2001 09:10:33 -0000 1.10 -+++ embedding/browser/Makefile.in 29 Jun 2002 15:44:54 -0000 -@@ -27,6 +27,10 @@ - - DIRS=webBrowser build chrome - -+ifdef MOZ_ENABLE_GTK2 -+DIRS += gtk -+endif -+ - ifdef MOZ_ENABLE_GTK - DIRS += gtk - endif diff --git a/net-www/mozilla/files/ipc-1.0.6-nsPipeChannel.patch b/net-www/mozilla/files/ipc-1.0.6-nsPipeChannel.patch deleted file mode 100644 index 989ad6dae422..000000000000 --- a/net-www/mozilla/files/ipc-1.0.6-nsPipeChannel.patch +++ /dev/null @@ -1,16 +0,0 @@ -This patch brings a critical line up to date from cvs so that -ipc-1.0.6 will compile (09 Jun 2004 agriffis) - -http://www.mozdev.org/source/browse/protozilla/ipc/ - ---- ipc/src/nsPipeChannel.cpp.agriffis 2004-05-17 02:44:43.000000000 -0400 -+++ ipc/src/nsPipeChannel.cpp 2004-06-09 13:48:51.146277360 -0400 -@@ -210,7 +210,7 @@ - if (NS_FAILED(rv)) return rv; - - nsXPIDLCString contentType; -- rv = MIMEService->GetTypeFromURI(url, contentType); -+ rv = MIMEService->GetTypeFromURI(url, getter_Copies(contentType)); - if (NS_SUCCEEDED(rv) && contentType) { - mContentType.Assign(contentType); - } diff --git a/net-www/mozilla/files/ipc-1.0.7-nsPipeChannel.patch b/net-www/mozilla/files/ipc-1.0.7-nsPipeChannel.patch deleted file mode 100644 index c6981bebcb8f..000000000000 --- a/net-www/mozilla/files/ipc-1.0.7-nsPipeChannel.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- extensions/ipc/src/nsPipeChannel.cpp.agriffis 2004-05-23 10:10:47.000000000 -0400 -+++ extensions/ipc/src/nsPipeChannel.cpp 2004-08-07 09:51:54.069217895 -0400 -@@ -209,7 +209,7 @@ - nsCOMPtr<nsIMIMEService> MIMEService (do_GetService("@mozilla.org/mime;1", &rv)); - if (NS_FAILED(rv)) return rv; - --#ifdef MOZ_THUNDERBIRD -+#if 1 - char *contentType = nsnull; - rv = MIMEService->GetTypeFromURI(url, (char **)&contentType); - #else diff --git a/net-www/mozilla/files/mozilla b/net-www/mozilla/files/mozilla deleted file mode 100644 index 72abfac83872..000000000000 --- a/net-www/mozilla/files/mozilla +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -export MOZILLA_FIVE_HOME=/usr/lib/mozilla - -if [ -f $MOZILLA_FIVE_HOME/mozilla ] -then - $MOZILLA_FIVE_HOME/mozilla "$@" -fi diff --git a/net-www/mozilla/files/mozilla-1.4-amd64.patch b/net-www/mozilla/files/mozilla-1.4-amd64.patch deleted file mode 100644 index 5dd2cb2503ed..000000000000 --- a/net-www/mozilla/files/mozilla-1.4-amd64.patch +++ /dev/null @@ -1,1026 +0,0 @@ -diff -ruN mozilla.old/config/mkdepend/imakemdep.h mozilla/config/mkdepend/imakemdep.h ---- mozilla.old/config/mkdepend/imakemdep.h 1998-09-05 00:22:25.000000000 -0400 -+++ mozilla/config/mkdepend/imakemdep.h 2003-09-27 16:20:55.105322104 -0400 -@@ -277,6 +277,9 @@ - # ifdef __i386__ - "-D__i386__", - # endif -+# ifdef __x86_64__ -+ "-D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", - # endif -diff -ruN mozilla.old/directory/c-sdk/ldap/libraries/liblber/lber-int.h mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h ---- mozilla.old/directory/c-sdk/ldap/libraries/liblber/lber-int.h 2002-03-26 16:53:23.000000000 -0500 -+++ mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h 2003-09-27 16:20:55.104322256 -0400 -@@ -236,23 +236,22 @@ - (((_l)&0xff0000)>>8) + (((_l)&0xff000000)>>24)) - #define LBER_NTOHL(_l) LBER_HTONL(_l) - --#elif !defined(__alpha) || defined(VMS) -+#elif !defined(__x86_64__) && (!defined(__alpha) || defined(VMS)) - - #define LBER_HTONL( l ) htonl( l ) - #define LBER_NTOHL( l ) ntohl( l ) - - #else /* __alpha */ - /* -- * htonl and ntohl on the DEC Alpha under OSF 1 seem to only swap the -- * lower-order 32-bits of a (64-bit) long, so we define correct versions -- * here. -+ * htonl and ntohl on the 64-bit UNIX platforms only swap the lower-order -+ * 32-bits of a (64-bit) long, so we define correct versions here. - */ - #define LBER_HTONL( l ) (((long)htonl( (l) & 0x00000000FFFFFFFF )) << 32 \ - | htonl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 )) - - #define LBER_NTOHL( l ) (((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \ - | ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 )) --#endif /* __alpha */ -+#endif /* __alpha || __x86_64__ */ - - - /* function prototypes */ -diff -ruN mozilla.old/nsprpub/configure mozilla/nsprpub/configure ---- mozilla.old/nsprpub/configure 2003-05-19 15:05:42.000000000 -0400 -+++ mozilla/nsprpub/configure 2003-09-27 16:20:55.085325144 -0400 -@@ -3729,6 +3729,9 @@ - ia64) - PR_MD_ASFILES=os_Linux_ia64.s - ;; -+ x86_64) -+ PR_MD_ASFILES=os_Linux_x86_64.s -+ ;; - m68k) - CFLAGS="$CFLAGS -m68020-60" - CXXFLAGS="$CXXFLAGS -m68020-60" -diff -ruN mozilla.old/nsprpub/configure.in mozilla/nsprpub/configure.in ---- mozilla.old/nsprpub/configure.in 2003-05-19 15:05:48.000000000 -0400 -+++ mozilla/nsprpub/configure.in 2003-09-27 16:20:55.077326360 -0400 -@@ -1218,6 +1218,9 @@ - ia64) - PR_MD_ASFILES=os_Linux_ia64.s - ;; -+ x86_64) -+ PR_MD_ASFILES=os_Linux_x86_64.s -+ ;; - m68k) - CFLAGS="$CFLAGS -m68020-60" - CXXFLAGS="$CXXFLAGS -m68020-60" -diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg ---- mozilla.old/nsprpub/pr/include/md/_linux.cfg 2003-02-26 18:53:38.000000000 -0500 -+++ mozilla/nsprpub/pr/include/md/_linux.cfg 2003-09-27 16:20:55.053330008 -0400 -@@ -182,6 +182,52 @@ - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__x86_64__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__mc68000__) - - #undef IS_LITTLE_ENDIAN -diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.h mozilla/nsprpub/pr/include/md/_linux.h ---- mozilla.old/nsprpub/pr/include/md/_linux.h 2003-02-26 18:53:39.000000000 -0500 -+++ mozilla/nsprpub/pr/include/md/_linux.h 2003-09-27 16:20:55.053330008 -0400 -@@ -49,6 +49,8 @@ - #define _PR_SI_ARCHITECTURE "alpha" - #elif defined(__ia64__) - #define _PR_SI_ARCHITECTURE "ia64" -+#elif defined(__x86_64__) -+#define _PR_SI_ARCHITECTURE "x86-64" - #elif defined(__mc68000__) - #define _PR_SI_ARCHITECTURE "m68k" - #elif defined(__sparc__) -@@ -107,6 +109,19 @@ - #define _MD_ATOMIC_SET _PR_ia64_AtomicSet - #endif - -+#if defined(__x86_64__) -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val); -+#define _MD_ATOMIC_INCREMENT _PR_x86_64_AtomicIncrement -+extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val); -+#define _MD_ATOMIC_DECREMENT _PR_x86_64_AtomicDecrement -+extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val); -+#define _MD_ATOMIC_ADD _PR_x86_64_AtomicAdd -+extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); -+#define _MD_ATOMIC_SET _PR_x86_64_AtomicSet -+#endif -+ - #define USE_SETJMP - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _PR_POLL_AVAILABLE -diff -ruN mozilla.old/nsprpub/pr/src/io/prprf.c mozilla/nsprpub/pr/src/io/prprf.c ---- mozilla.old/nsprpub/pr/src/io/prprf.c 2003-02-26 18:53:42.000000000 -0500 -+++ mozilla/nsprpub/pr/src/io/prprf.c 2003-09-27 16:20:55.068327728 -0400 -@@ -51,7 +51,10 @@ - ** Note: on some platforms va_list is defined as an array, - ** and requires array notation. - */ --#if (defined(LINUX) && defined(__powerpc__)) || \ -+#if (defined(LINUX) && defined(__x86_64__)) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) -+#elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ - (defined(LINUX) && defined(__s390x__)) || \ - defined(WIN16) || defined(QNX) || \ -diff -ruN mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s ---- mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 1969-12-31 19:00:00.000000000 -0500 -+++ mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2003-09-27 16:20:55.068327728 -0400 -@@ -0,0 +1,91 @@ -+/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+/ -+/ The contents of this file are subject to the Mozilla Public -+/ License Version 1.1 (the "License"); you may not use this file -+/ except in compliance with the License. You may obtain a copy of -+/ the License at http://www.mozilla.org/MPL/ -+/ -+/ Software distributed under the License is distributed on an "AS -+/ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+/ implied. See the License for the specific language governing -+/ rights and limitations under the License. -+/ -+/ The Original Code is the Netscape Portable Runtime (NSPR). -+/ -+/ The Initial Developer of the Original Code is Netscape -+/ Communications Corporation. Portions created by Netscape are -+/ Copyright (C) 2000 Netscape Communications Corporation. All -+/ Rights Reserved. -+/ -+/ Contributor(s): -+/ -+/ Alternatively, the contents of this file may be used under the -+/ terms of the GNU General Public License Version 2 or later (the -+/ "GPL"), in which case the provisions of the GPL are applicable -+/ instead of those above. If you wish to allow use of your -+/ version of this file only under the terms of the GPL and not to -+/ allow others to use your version of this file under the MPL, -+/ indicate your decision by deleting the provisions above and -+/ replace them with the notice and other provisions required by -+/ the GPL. If you do not delete the provisions above, a recipient -+/ may use your version of this file under either the MPL or the -+/ GPL. -+/ -+ -+/ PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val) -+/ -+/ Atomically increment the integer pointed to by 'val' and return -+/ the result of the increment. -+/ -+ .text -+ .globl _PR_x86_64_AtomicIncrement -+ .align 4 -+_PR_x86_64_AtomicIncrement: -+ movl $1, %eax -+ lock -+ xaddl %eax, (%rdi) -+ incl %eax -+ ret -+ -+/ PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val) -+/ -+/ Atomically decrement the integer pointed to by 'val' and return -+/ the result of the decrement. -+/ -+ .text -+ .globl _PR_x86_64_AtomicDecrement -+ .align 4 -+_PR_x86_64_AtomicDecrement: -+ movl $-1, %eax -+ lock -+ xaddl %eax, (%rdi) -+ decl %eax -+ ret -+ -+/ PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval) -+/ -+/ Atomically set the integer pointed to by 'val' to the new -+/ value 'newval' and return the old value. -+ .text -+ .globl _PR_x86_64_AtomicSet -+ .align 4 -+_PR_x86_64_AtomicSet: -+ movl %esi, %eax -+ lock -+ xchgl %eax, (%rdi) -+ ret -+ -+/ PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val) -+/ -+/ Atomically add 'val' to the integer pointed to by 'ptr' -+/ and return the result of the addition. -+/ -+ .text -+ .globl _PR_x86_64_AtomicAdd -+ .align 4 -+_PR_x86_64_AtomicAdd: -+ movl %esi, %eax -+ lock -+ xaddl %eax, (%rdi) -+ addl %esi, %eax -+ ret -diff -ruN mozilla.old/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk ---- mozilla.old/security/coreconf/Linux.mk 2003-04-30 20:31:20.000000000 -0400 -+++ mozilla/security/coreconf/Linux.mk 2003-09-27 16:20:55.093323928 -0400 -@@ -66,6 +66,10 @@ - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = ia64 - else -+ifeq ($(OS_TEST),x86_64) -+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+ CPU_ARCH = x86_64 -+else - ifeq ($(OS_TEST),sparc) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = sparc -@@ -107,6 +111,7 @@ - endif - endif - endif -+endif - - - LIBC_TAG = _glibc -diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2003-06-18 23:02:34.000000000 -0400 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2003-09-27 16:20:55.105322104 -0400 -@@ -55,6 +55,10 @@ - # Migrate other platforms here after testing - # - ifneq (,$(filter Linux,$(OS_ARCH))) -+# Linux/x86-64 -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+else - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif -@@ -66,6 +70,7 @@ - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s - endif - endif -+endif - # - # BeOS/Intel (uses the same unixish_x86 code) - # -diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp ---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp 1969-12-31 19:00:00.000000000 -0500 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp 2003-09-27 16:20:55.105322104 -0400 -@@ -0,0 +1,174 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} -diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp ---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp 1969-12-31 19:00:00.000000000 -0500 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp 2003-09-27 16:20:55.106321952 -0400 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch@plt\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ -diff -ruN mozilla.old/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp ---- mozilla.old/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp 2003-02-22 23:41:18.000000000 -0500 -+++ mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp 2003-09-27 16:21:05.754703152 -0400 -@@ -87,6 +87,19 @@ - float p17, float p18, float p19, float p20, - float *retval) = 0; - -+ NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval) = 0; -+ -+ NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval) = 0; -+ -+ NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4, -+ float p5, float p6, double p7, double p8, -+ float p9, double p10, float p11, -+ double *retval) = 0; -+ - NS_IMETHOD PassTwoStrings(const char* s1, const char* s2, char** retval) = 0; - - }; -@@ -114,6 +127,19 @@ - float p5, float p6, float p7, float p8, - float p9, float p10, float* retval); - -+ NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval); -+ -+ NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval); -+ -+ NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4, -+ float p5, float p6, double p7, double p8, -+ float p9, double p10, float p11, -+ double *retval); -+ - NS_IMETHOD AddManyManyFloats(float p1, float p2, float p3, float p4, - float p5, float p6, float p7, float p8, - float p9, float p10, float p11, float p12, -@@ -211,6 +237,20 @@ - } - - NS_IMETHODIMP -+InvokeTestTarget::AddMixedFloats(float p1, float p2, double p3, double p4, -+ float p5, float p6, double p7, double p8, -+ float p9, double p10, float p11, -+ double *retval) -+{ -+#ifdef DEBUG_TESTINVOKE -+ printf("%f, %f, %lf, %lf, %f, %f, %lf, %lf, %f, %lf, %f\n", -+ p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); -+#endif -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10 + p11; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP - InvokeTestTarget::AddManyManyFloats(float p1, float p2, float p3, float p4, - float p5, float p6, float p7, float p8, - float p9, float p10, float p11, float p12, -@@ -230,6 +270,24 @@ - } - - NS_IMETHODIMP -+InvokeTestTarget::AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval) -+{ -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+InvokeTestTarget::AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval) -+{ -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP - InvokeTestTarget::PassTwoStrings(const char* s1, const char* s2, char** retval) - { - const char milk[] = "milk"; -@@ -309,14 +367,33 @@ - else - printf("\tFAILED"); - -- if(NS_SUCCEEDED(test->PassTwoStrings("moo","cow",&outS))) { -- printf(" = %s\n", outS); -+ if(NS_SUCCEEDED(test->AddMixedInts(1,2,3,4,5,6,7,8,9,10,&out64))) -+ { -+ LL_L2I(tmp32, out64); -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32); -+ } -+ else -+ printf("\tFAILED"); -+ -+ if(NS_SUCCEEDED(test->AddMixedInts2(1,2,3,4,5,6,7,8,9,10,&out64))) -+ { -+ LL_L2I(tmp32, out64); -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32); -+ } -+ else -+ printf("\tFAILED"); -+ -+ if(NS_SUCCEEDED(test->AddMixedFloats(1,2,3,4,5,6,7,8,9,10,11,&outD))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 = %f\n", (double)outD); -+ else -+ printf("\tFAILED"); -+ -+ if (NS_SUCCEEDED(test->PassTwoStrings("moo","cow",&outS))) { -+ printf(" = %s\n", outS); - nsMemory::Free(outS); -- } else -+ } else - printf("\tFAILED"); - -- -- - printf("calling via invoke:\n"); - - nsXPTCVariant var[21]; -@@ -388,8 +465,8 @@ - var[2].flags = nsXPTCVariant::PTR_IS_DATA; - var[2].ptr = &var[2].val.i64; - -- if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var))) -- printf("\t2L * 2L = %d\n", (int)var[2].val.i64); -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var))) -+ printf("\t2L * 2L = %d\n", (int)var[2].val.i64); - else - printf("\tFAILED"); - -@@ -559,6 +636,8 @@ - if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 10, 11, var))) - printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %ff\n", - (double) var[10].val.f); -+ else -+ printf("\tFAILED"); - - var[0].val.f = 1.0f; - var[0].type = nsXPTType::T_FLOAT; -@@ -649,6 +728,163 @@ - printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 = %ff\n", - (double) var[20].val.f); - -+ var[0].val.i64 = 1; -+ var[0].type = nsXPTType::T_I64; -+ var[0].flags = 0; -+ -+ var[1].val.i32 = 2; -+ var[1].type = nsXPTType::T_I32; -+ var[1].flags = 0; -+ -+ var[2].val.i64 = 3; -+ var[2].type = nsXPTType::T_I64; -+ var[2].flags = 0; -+ -+ var[3].val.i32 = 4; -+ var[3].type = nsXPTType::T_I32; -+ var[3].flags = 0; -+ -+ var[4].val.i32 = 5; -+ var[4].type = nsXPTType::T_I32; -+ var[4].flags = 0; -+ -+ var[5].val.i64 = 6; -+ var[5].type = nsXPTType::T_I64; -+ var[5].flags = 0; -+ -+ var[6].val.i32 = 7; -+ var[6].type = nsXPTType::T_I32; -+ var[6].flags = 0; -+ -+ var[7].val.i32 = 8; -+ var[7].type = nsXPTType::T_I32; -+ var[7].flags = 0; -+ -+ var[8].val.i64 = 9; -+ var[8].type = nsXPTType::T_I64; -+ var[8].flags = 0; -+ -+ var[9].val.i32 = 10; -+ var[9].type = nsXPTType::T_I32; -+ var[9].flags = 0; -+ -+ var[10].val.i64 = 0; -+ var[10].type = nsXPTType::T_I64; -+ var[10].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[10].ptr = &var[10].val.i64; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 11, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", -+ (int)var[10].val.i64); -+ else -+ printf("\tFAILED"); -+ -+ var[0].val.i32 = 1; -+ var[0].type = nsXPTType::T_I32; -+ var[0].flags = 0; -+ -+ var[1].val.i64 = 2; -+ var[1].type = nsXPTType::T_I64; -+ var[1].flags = 0; -+ -+ var[2].val.i32 = 3; -+ var[2].type = nsXPTType::T_I32; -+ var[2].flags = 0; -+ -+ var[3].val.i64 = 4; -+ var[3].type = nsXPTType::T_I64; -+ var[3].flags = 0; -+ -+ var[4].val.i64 = 5; -+ var[4].type = nsXPTType::T_I64; -+ var[4].flags = 0; -+ -+ var[5].val.i32 = 6; -+ var[5].type = nsXPTType::T_I32; -+ var[5].flags = 0; -+ -+ var[6].val.i64 = 7; -+ var[6].type = nsXPTType::T_I64; -+ var[6].flags = 0; -+ -+ var[7].val.i64 = 8; -+ var[7].type = nsXPTType::T_I64; -+ var[7].flags = 0; -+ -+ var[8].val.i32 = 9; -+ var[8].type = nsXPTType::T_I32; -+ var[8].flags = 0; -+ -+ var[9].val.i64 = 10; -+ var[9].type = nsXPTType::T_I64; -+ var[9].flags = 0; -+ -+ var[10].val.i64 = 0; -+ var[10].type = nsXPTType::T_I64; -+ var[10].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[10].ptr = &var[10].val.i64; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 13, 11, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", -+ (int)var[10].val.i64); -+ else -+ printf("\tFAILED"); -+ -+ var[0].val.f = 1.0f; -+ var[0].type = nsXPTType::T_FLOAT; -+ var[0].flags = 0; -+ -+ var[1].val.f = 2.0f; -+ var[1].type = nsXPTType::T_FLOAT; -+ var[1].flags = 0; -+ -+ var[2].val.d = 3.0; -+ var[2].type = nsXPTType::T_DOUBLE; -+ var[2].flags = 0; -+ -+ var[3].val.d = 4.0; -+ var[3].type = nsXPTType::T_DOUBLE; -+ var[3].flags = 0; -+ -+ var[4].val.f = 5.0f; -+ var[4].type = nsXPTType::T_FLOAT; -+ var[4].flags = 0; -+ -+ var[5].val.f = 6.0f; -+ var[5].type = nsXPTType::T_FLOAT; -+ var[5].flags = 0; -+ -+ var[6].val.d = 7.0; -+ var[6].type = nsXPTType::T_DOUBLE; -+ var[6].flags = 0; -+ -+ var[7].val.d = 8.0; -+ var[7].type = nsXPTType::T_DOUBLE; -+ var[7].flags = 0; -+ -+ var[8].val.f = 9.0f; -+ var[8].type = nsXPTType::T_FLOAT; -+ var[8].flags = 0; -+ -+ var[9].val.d = 10.0; -+ var[9].type = nsXPTType::T_DOUBLE; -+ var[9].flags = 0; -+ -+ var[10].val.f = 11.0f; -+ var[10].type = nsXPTType::T_FLOAT; -+ var[10].flags = 0; -+ -+ var[11].val.d = 0.0; -+ var[11].type = nsXPTType::T_DOUBLE; -+ var[11].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[11].ptr = &var[11].val.d; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 14, 12, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 = %f\n", -+ var[11].val.d); -+ else -+ printf("\tFAILED"); -+ - var[0].val.p = (void*)"moo"; - var[0].type = nsXPTType::T_CHAR_STR; - var[0].flags = 0; -@@ -662,12 +898,11 @@ - var[2].flags = nsXPTCVariant::PTR_IS_DATA; - var[2].ptr = &var[2].val.p; - -- if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 3, var))) -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 15, 3, var))) - printf(" = %s\n", var[2].val.p); - else - printf("\tFAILED"); - -- - DoMultipleInheritenceTest(); - DoMultipleInheritenceTest2(); - // Disabled by default - takes too much time on slow machines diff --git a/net-www/mozilla/files/mozilla-1.6-gcc-3.4.patch b/net-www/mozilla/files/mozilla-1.6-gcc-3.4.patch deleted file mode 100644 index 9de10a1fae8c..000000000000 --- a/net-www/mozilla/files/mozilla-1.6-gcc-3.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gfx/public/nsRegion.h.old 2003-03-25 02:57:42.000000000 +0000 -+++ gfx/public/nsRegion.h 2004-04-23 02:25:09.606368256 +0100 -@@ -234,7 +234,7 @@ - void MoveInto (nsRegion& aDestRegion) - { MoveInto (aDestRegion, mRectListHead.next); } - -- nsRegion (const nsRegion& aRegion); // Prevent copying of regions -+ public:nsRegion (const nsRegion& aRegion); // Prevent copying of regions - nsRegion& operator = (const nsRegion& aRegion); - }; - diff --git a/net-www/mozilla/files/mozilla-1.7-amd64.patch b/net-www/mozilla/files/mozilla-1.7-amd64.patch deleted file mode 100644 index 2007573551fd..000000000000 --- a/net-www/mozilla/files/mozilla-1.7-amd64.patch +++ /dev/null @@ -1,749 +0,0 @@ -diff -ruN mozilla.old/config/mkdepend/imakemdep.h mozilla/config/mkdepend/imakemdep.h ---- mozilla.old/config/mkdepend/imakemdep.h 1998-09-05 00:22:25.000000000 -0400 -+++ mozilla/config/mkdepend/imakemdep.h 2003-09-27 16:20:55.105322104 -0400 -@@ -277,6 +277,9 @@ - # ifdef __i386__ - "-D__i386__", - # endif -+# ifdef __x86_64__ -+ "-D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", - # endif -diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2003-06-18 23:02:34.000000000 -0400 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2003-09-27 16:20:55.105322104 -0400 -@@ -55,6 +55,10 @@ - # Migrate other platforms here after testing - # - ifneq (,$(filter Linux,$(OS_ARCH))) -+# Linux/x86-64 -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+else - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif -@@ -66,6 +70,7 @@ - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s - endif - endif -+endif - # - # BeOS/Intel (uses the same unixish_x86 code) - # -diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp ---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp 1969-12-31 19:00:00.000000000 -0500 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp 2003-09-27 16:20:55.105322104 -0400 -@@ -0,0 +1,174 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} -diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp ---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp 1969-12-31 19:00:00.000000000 -0500 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp 2003-09-27 16:20:55.106321952 -0400 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch@plt\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ -diff -ruN mozilla.old/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp ---- mozilla.old/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp 2003-02-22 23:41:18.000000000 -0500 -+++ mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp 2003-09-27 16:21:05.754703152 -0400 -@@ -87,6 +87,19 @@ - float p17, float p18, float p19, float p20, - float *retval) = 0; - -+ NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval) = 0; -+ -+ NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval) = 0; -+ -+ NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4, -+ float p5, float p6, double p7, double p8, -+ float p9, double p10, float p11, -+ double *retval) = 0; -+ - NS_IMETHOD PassTwoStrings(const char* s1, const char* s2, char** retval) = 0; - - }; -@@ -114,6 +127,19 @@ - float p5, float p6, float p7, float p8, - float p9, float p10, float* retval); - -+ NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval); -+ -+ NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval); -+ -+ NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4, -+ float p5, float p6, double p7, double p8, -+ float p9, double p10, float p11, -+ double *retval); -+ - NS_IMETHOD AddManyManyFloats(float p1, float p2, float p3, float p4, - float p5, float p6, float p7, float p8, - float p9, float p10, float p11, float p12, -@@ -211,6 +237,20 @@ - } - - NS_IMETHODIMP -+InvokeTestTarget::AddMixedFloats(float p1, float p2, double p3, double p4, -+ float p5, float p6, double p7, double p8, -+ float p9, double p10, float p11, -+ double *retval) -+{ -+#ifdef DEBUG_TESTINVOKE -+ printf("%f, %f, %lf, %lf, %f, %f, %lf, %lf, %f, %lf, %f\n", -+ p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); -+#endif -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10 + p11; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP - InvokeTestTarget::AddManyManyFloats(float p1, float p2, float p3, float p4, - float p5, float p6, float p7, float p8, - float p9, float p10, float p11, float p12, -@@ -230,6 +270,24 @@ - } - - NS_IMETHODIMP -+InvokeTestTarget::AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval) -+{ -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+InvokeTestTarget::AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval) -+{ -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP - InvokeTestTarget::PassTwoStrings(const char* s1, const char* s2, char** retval) - { - const char milk[] = "milk"; -@@ -309,14 +367,33 @@ - else - printf("\tFAILED"); - -- if(NS_SUCCEEDED(test->PassTwoStrings("moo","cow",&outS))) { -- printf(" = %s\n", outS); -+ if(NS_SUCCEEDED(test->AddMixedInts(1,2,3,4,5,6,7,8,9,10,&out64))) -+ { -+ LL_L2I(tmp32, out64); -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32); -+ } -+ else -+ printf("\tFAILED"); -+ -+ if(NS_SUCCEEDED(test->AddMixedInts2(1,2,3,4,5,6,7,8,9,10,&out64))) -+ { -+ LL_L2I(tmp32, out64); -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32); -+ } -+ else -+ printf("\tFAILED"); -+ -+ if(NS_SUCCEEDED(test->AddMixedFloats(1,2,3,4,5,6,7,8,9,10,11,&outD))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 = %f\n", (double)outD); -+ else -+ printf("\tFAILED"); -+ -+ if (NS_SUCCEEDED(test->PassTwoStrings("moo","cow",&outS))) { -+ printf(" = %s\n", outS); - nsMemory::Free(outS); -- } else -+ } else - printf("\tFAILED"); - -- -- - printf("calling via invoke:\n"); - - nsXPTCVariant var[21]; -@@ -388,8 +465,8 @@ - var[2].flags = nsXPTCVariant::PTR_IS_DATA; - var[2].ptr = &var[2].val.i64; - -- if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var))) -- printf("\t2L * 2L = %d\n", (int)var[2].val.i64); -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var))) -+ printf("\t2L * 2L = %d\n", (int)var[2].val.i64); - else - printf("\tFAILED"); - -@@ -559,6 +636,8 @@ - if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 10, 11, var))) - printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %ff\n", - (double) var[10].val.f); -+ else -+ printf("\tFAILED"); - - var[0].val.f = 1.0f; - var[0].type = nsXPTType::T_FLOAT; -@@ -649,6 +728,163 @@ - printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 = %ff\n", - (double) var[20].val.f); - -+ var[0].val.i64 = 1; -+ var[0].type = nsXPTType::T_I64; -+ var[0].flags = 0; -+ -+ var[1].val.i32 = 2; -+ var[1].type = nsXPTType::T_I32; -+ var[1].flags = 0; -+ -+ var[2].val.i64 = 3; -+ var[2].type = nsXPTType::T_I64; -+ var[2].flags = 0; -+ -+ var[3].val.i32 = 4; -+ var[3].type = nsXPTType::T_I32; -+ var[3].flags = 0; -+ -+ var[4].val.i32 = 5; -+ var[4].type = nsXPTType::T_I32; -+ var[4].flags = 0; -+ -+ var[5].val.i64 = 6; -+ var[5].type = nsXPTType::T_I64; -+ var[5].flags = 0; -+ -+ var[6].val.i32 = 7; -+ var[6].type = nsXPTType::T_I32; -+ var[6].flags = 0; -+ -+ var[7].val.i32 = 8; -+ var[7].type = nsXPTType::T_I32; -+ var[7].flags = 0; -+ -+ var[8].val.i64 = 9; -+ var[8].type = nsXPTType::T_I64; -+ var[8].flags = 0; -+ -+ var[9].val.i32 = 10; -+ var[9].type = nsXPTType::T_I32; -+ var[9].flags = 0; -+ -+ var[10].val.i64 = 0; -+ var[10].type = nsXPTType::T_I64; -+ var[10].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[10].ptr = &var[10].val.i64; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 11, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", -+ (int)var[10].val.i64); -+ else -+ printf("\tFAILED"); -+ -+ var[0].val.i32 = 1; -+ var[0].type = nsXPTType::T_I32; -+ var[0].flags = 0; -+ -+ var[1].val.i64 = 2; -+ var[1].type = nsXPTType::T_I64; -+ var[1].flags = 0; -+ -+ var[2].val.i32 = 3; -+ var[2].type = nsXPTType::T_I32; -+ var[2].flags = 0; -+ -+ var[3].val.i64 = 4; -+ var[3].type = nsXPTType::T_I64; -+ var[3].flags = 0; -+ -+ var[4].val.i64 = 5; -+ var[4].type = nsXPTType::T_I64; -+ var[4].flags = 0; -+ -+ var[5].val.i32 = 6; -+ var[5].type = nsXPTType::T_I32; -+ var[5].flags = 0; -+ -+ var[6].val.i64 = 7; -+ var[6].type = nsXPTType::T_I64; -+ var[6].flags = 0; -+ -+ var[7].val.i64 = 8; -+ var[7].type = nsXPTType::T_I64; -+ var[7].flags = 0; -+ -+ var[8].val.i32 = 9; -+ var[8].type = nsXPTType::T_I32; -+ var[8].flags = 0; -+ -+ var[9].val.i64 = 10; -+ var[9].type = nsXPTType::T_I64; -+ var[9].flags = 0; -+ -+ var[10].val.i64 = 0; -+ var[10].type = nsXPTType::T_I64; -+ var[10].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[10].ptr = &var[10].val.i64; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 13, 11, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", -+ (int)var[10].val.i64); -+ else -+ printf("\tFAILED"); -+ -+ var[0].val.f = 1.0f; -+ var[0].type = nsXPTType::T_FLOAT; -+ var[0].flags = 0; -+ -+ var[1].val.f = 2.0f; -+ var[1].type = nsXPTType::T_FLOAT; -+ var[1].flags = 0; -+ -+ var[2].val.d = 3.0; -+ var[2].type = nsXPTType::T_DOUBLE; -+ var[2].flags = 0; -+ -+ var[3].val.d = 4.0; -+ var[3].type = nsXPTType::T_DOUBLE; -+ var[3].flags = 0; -+ -+ var[4].val.f = 5.0f; -+ var[4].type = nsXPTType::T_FLOAT; -+ var[4].flags = 0; -+ -+ var[5].val.f = 6.0f; -+ var[5].type = nsXPTType::T_FLOAT; -+ var[5].flags = 0; -+ -+ var[6].val.d = 7.0; -+ var[6].type = nsXPTType::T_DOUBLE; -+ var[6].flags = 0; -+ -+ var[7].val.d = 8.0; -+ var[7].type = nsXPTType::T_DOUBLE; -+ var[7].flags = 0; -+ -+ var[8].val.f = 9.0f; -+ var[8].type = nsXPTType::T_FLOAT; -+ var[8].flags = 0; -+ -+ var[9].val.d = 10.0; -+ var[9].type = nsXPTType::T_DOUBLE; -+ var[9].flags = 0; -+ -+ var[10].val.f = 11.0f; -+ var[10].type = nsXPTType::T_FLOAT; -+ var[10].flags = 0; -+ -+ var[11].val.d = 0.0; -+ var[11].type = nsXPTType::T_DOUBLE; -+ var[11].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[11].ptr = &var[11].val.d; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 14, 12, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 = %f\n", -+ var[11].val.d); -+ else -+ printf("\tFAILED"); -+ - var[0].val.p = (void*)"moo"; - var[0].type = nsXPTType::T_CHAR_STR; - var[0].flags = 0; -@@ -662,12 +898,11 @@ - var[2].flags = nsXPTCVariant::PTR_IS_DATA; - var[2].ptr = &var[2].val.p; - -- if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 3, var))) -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 15, 3, var))) - printf(" = %s\n", var[2].val.p); - else - printf("\tFAILED"); - -- - DoMultipleInheritenceTest(); - DoMultipleInheritenceTest2(); - // Disabled by default - takes too much time on slow machines diff --git a/net-www/mozilla/files/mozilla-ft-bytecode.patch b/net-www/mozilla/files/mozilla-ft-bytecode.patch deleted file mode 100644 index 35246f7c15b3..000000000000 --- a/net-www/mozilla/files/mozilla-ft-bytecode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/other-licenses/freetype/include/freetype/config/ftoption.h.foo Thu Apr 25 21:37:15 2002 -+++ mozilla/other-licenses/freetype/include/freetype/config/ftoption.h Thu Apr 25 21:37:32 2002 -@@ -375,7 +375,7 @@ - /* By undefining this, you will only compile the code necessary to load */ - /* TrueType glyphs without hinting. */ - /* */ --#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER - - - /*************************************************************************/ diff --git a/net-www/mozilla/files/mozilla-new-freetype2.patch b/net-www/mozilla/files/mozilla-new-freetype2.patch deleted file mode 100644 index ce703ddf83d7..000000000000 --- a/net-www/mozilla/files/mozilla-new-freetype2.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- mozilla/other-licenses/Xft/fontconfig/src/fccharset.c Tue May 28 23:06:14 2002 -+++ mozilla.azarah/other-licenses/Xft/fontconfig/src/fccharset.c Tue May 28 23:49:49 2002 -@@ -998,6 +998,7 @@ - const FcCharMap *map; - int o; - int i; -+ int *mytmpvalue; - FT_UInt glyph; - - fcs = FcCharSetCreate (); -@@ -1043,7 +1044,7 @@ - if (FT_Get_Char_Index (face, 0)) - ucs4 = 0; - else -- ucs4 = FT_Get_Next_Char (face, 0); -+ ucs4 = FT_Get_Next_Char (face, 0, mytmpvalue); - - for (;;) - { -@@ -1070,7 +1071,7 @@ - } - ucs4++; - } -- ucs4 = FT_Get_Next_Char (face, ucs4 - 1); -+ ucs4 = FT_Get_Next_Char (face, ucs4 - 1, mytmpvalue); - if (!ucs4) - break; - } diff --git a/net-www/mozilla/files/mozilla-xft-unix-prefs.patch b/net-www/mozilla/files/mozilla-xft-unix-prefs.patch deleted file mode 100644 index 9e8ba6751a25..000000000000 --- a/net-www/mozilla/files/mozilla-xft-unix-prefs.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- unix.js.orig Wed May 1 18:50:25 2002 -+++ unix.js Wed May 1 19:30:44 2002 -@@ -225,21 +225,21 @@ - pref("font.scale.outline.min", 6); - - // TrueType --pref("font.FreeType2.enable", false); -+pref("font.FreeType2.enable", true); - pref("font.freetype2.shared-library", "libfreetype.so.6"); - // if libfreetype was built without hinting compiled in - // it is best to leave hinting off --pref("font.FreeType2.autohinted", false); --pref("font.FreeType2.unhinted", true); -+pref("font.FreeType2.autohinted", false); -+pref("font.FreeType2.unhinted", false); - // below a certian pixel size anti-aliased fonts produce poor results - pref("font.antialias.min", 10); - pref("font.embedded_bitmaps.max", 1000000); - pref("font.scale.tt_bitmap.dark_text.min", 64); - pref("font.scale.tt_bitmap.dark_text.gain", "0.8"); - // sample prefs for TrueType font dirs --//pref("font.directory.truetype.1", "/u/sam/tt_font"); --//pref("font.directory.truetype.2", "/u/sam/tt_font2"); --//pref("font.directory.truetype.3", "/u/sam/tt_font3"); -+pref("font.directory.truetype.1", "/usr/share/fonts/truetype"); -+pref("font.directory.truetype.2", "/usr/X11R6/lib/X11/fonts/TTF"); -+pref("font.directory.truetype.3", "/usr/X11R6/lib/X11/fonts/truetype"); - - // below a certian pixel size anti-aliased bitmat scaled fonts - // produce poor results diff --git a/net-www/mozilla/files/mozilla.sh b/net-www/mozilla/files/mozilla.sh deleted file mode 100644 index 55a5b5f848f0..000000000000 --- a/net-www/mozilla/files/mozilla.sh +++ /dev/null @@ -1,266 +0,0 @@ -#!/bin/bash -# -# The contents of this file are subject to the Netscape Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# - -## -## Usage: -## -## $ mozilla -## -## This script is meant to run a mozilla program from the mozilla -## rpm installation. -## -## The script will setup all the environment voodoo needed to make -## mozilla work. - -## Faster startup -#export XPCOM_CHECK_THREADSAFE=0 - -cmdname=`basename $0` - -## don't leave any core files around -ulimit -c 0 - -## -## Variables -## -MOZ_DIST_BIN="/usr/lib/mozilla" -MOZ_PROGRAM="/usr/lib/mozilla/mozilla-bin" -MOZ_CLIENT_PROGRAM="/usr/lib/mozilla/mozilla-xremote-client" - -## -## Set MOZILLA_FIVE_HOME -## -MOZILLA_FIVE_HOME="/usr/lib/mozilla" - -export MOZILLA_FIVE_HOME - -## -## Set LD_PRELOAD for old plugins -## -if [ -f /usr/lib/mozilla/libc++mem.so ] -then - if [ "$LD_PRELOAD" ] - then - LD_PRELOAD="/usr/lib/mozilla/libc++mem.so $LD_PRELOAD" - else - LD_PRELOAD=/usr/lib/mozilla/libc++mem.so - fi - export LD_PRELOAD -fi - -## -## Set LD_LIBRARY_PATH -## -if [ "$LD_LIBRARY_PATH" ] -then - LD_LIBRARY_PATH="/usr/lib/mozilla:/usr/lib/mozilla/plugins:$LD_LIBRARY_PATH" -else - LD_LIBRARY_PATH="/usr/lib/mozilla:/usr/lib/mozilla/plugins" -fi - -export LD_LIBRARY_PATH - -## -## Make sure that we set the plugin path for backwards compatibility -## Set MOZ_PLUGIN_PATH to $HOME/.mozilla/plugins if not set -## -export MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins - -if [ "$HOME" ]; then - export MOZ_PLUGIN_PATH="$MOZ_PLUGIN_PATH:$HOME/.mozilla/plugins" -fi - -## -## Set FONTCONFIG_PATH for Xft/fontconfig -## -FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft" -export FONTCONFIG_PATH - -## -## Autodetect language -## -grep -q $HOME/.mozilla $HOME/.mozilla/appreg > /dev/null 2>/dev/null -SET_LANG=$? -if [ "$HOME" -a "$LANG" -a "$SET_LANG" != "0" ]; then - MOZ_LANG=`grep -E "^$LANG[[:space:]]" $MOZILLA_FIVE_HOME/chrome/locale.alias | tr -s [:blank:] | cut -f 2` - for i in "$@";do - [ "$i" = "-UILocale" ] && MOZ_LANG="" - done - if [ "$MOZ_LANG" -a -r "$MOZILLA_FIVE_HOME/chrome/$MOZ_LANG.jar" ]; then - MOZ_LANG="-UILocale $MOZ_LANG" - else - unset MOZ_LANG - fi -fi - -# Figure out if we need to ser LD_ASSUME_KERNEL for older versions of the JVM. - -function set_jvm_vars() { - - # see if the jvm exists in either of the locations - if [ -L /usr/lib/mozilla/plugins/javaplugin_oji.so ]; then - JVM_ORIG_LINK=/usr/lib/mozilla/plugins/javaplugin_oji.so - fi - - if [ -L /usr/lib/mozilla/plugins/libjavaplugin_oji.so ]; then - JVM_ORIG_LINK=/usr/lib/mozilla/plugins/libjavaplugin_oji.so - fi - - if [ -z "$JVM_ORIG_LINK" ]; then - return; - fi - - JVM_LINK=`perl -e "print readlink('$JVM_ORIG_LINK')"` - - # is it relative? if so append the full path - - echo "${JVM_LINK}" | grep -e "^/" 2>&1 > /dev/null - - if [ "$?" -ne "0" ]; then - JVM_LINK=/usr/lib/mozilla/plugins/${JVM_LINK} - fi - - JVM_BASE=`basename $JVM_LINK` - JVM_DIR=`echo $JVM_LINK | sed -e s/$JVM_BASE//g` - JVM_COMMAND=$JVM_DIR/java - if [ ! -r $JVM_COMMAND ]; then - JVM_DIR=${JVM_DIR}../../../bin/ - JVM_COMMAND=$JVM_DIR/java - # does the command exist? - if [ ! -r "$JVM_COMMAND" ]; then - return - fi - fi - - # export this temporarily - it seems to work with old and new - # versions of the JVM. - export LD_ASSUME_KERNEL=2.2.5 - - # get the version - JVM_VERSION=`$JVM_COMMAND -version 2>&1` - - unset LD_ASSUME_KERNEL - - JVM_VERSION=`echo $JVM_VERSION | grep version | cut -f 3 -d " " | sed -e 's/\"//g'` - - case "$JVM_VERSION" in - (1.3.0*) - # bad JVM - export LD_ASSUME_KERNEL=2.2.5 - ;; - esac -} - -function check_running() { - if [ -x $MOZ_CLIENT_PROGRAM ]; then - $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null - RETURN_VAL=$? - if [ "$RETURN_VAL" -eq "2" ]; then - echo 0 - return 0 - else - echo 1 - return 1 - fi - else - echo 0 - return 0 - fi -} - -function open_mail() { - if [ "${ALREADY_RUNNING}" -eq "1" ]; then - exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(openInbox)' \ - 2>/dev/null >/dev/null - else - exec $MOZ_PROGRAM $MOZ_LANG "$@" - fi -} - -function open_compose() { - if [ "${ALREADY_RUNNING}" -eq "1" ]; then - exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(composeMessage)' \ - 2>/dev/null >/dev/null - else - exec $MOZ_PROGRAM $MOZ_LANG "$@" - fi -} - -# OK, here's where all the real work gets done - -# set our JVM vars -set_jvm_vars - -# check to see if there's an already running instance or not -ALREADY_RUNNING=`check_running` - -# If there is no command line argument at all then try to open a new -# window in an already running instance. -if [ "${ALREADY_RUNNING}" -eq "1" ] && [ -z "$1" ]; then - exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openBrowser)" 2>/dev/null >/dev/null -fi - -# if there's no command line argument and there's not a running -# instance then just fire up a new copy of the browser -if [ -z "$1" ]; then - exec $MOZ_PROGRAM $MOZ_LANG 2>/dev/null >/dev/null -fi - -unset RETURN_VAL - -# If there's a command line argument but it doesn't begin with a - -# it's probably a url. Try to send it to a running instance. -USE_EXIST=0 -NEW_WINDOW= -opt="$1" -case "$opt" in - -mail) - open_mail ${1+"$@"} - ;; - -compose) - open_compose ${1+"$@"} - ;; - -*) ;; - *) USE_EXIST=1 ;; -esac - - othersopt= - optlast= - for i in "$@";do optlast=$i;done #last arg - for i in "$@";do [[ $i == $optlast ]] && break; othersopt="$othersopt $i";done #others arg - #???: needs check if othersopt begin with -* ? - - if [[ $optlast != *:/* && -e $optlast ]];then - [[ $optlast != /* ]] && optlast=file://$PWD/$optlast - elif [[ $optlast == *:/* || -n $othersopt ]];then #???? like before... - NEW_WINDOW=1 - fi - -if [ "${USE_EXIST}" -eq "1" ] && [ "${ALREADY_RUNNING}" -eq "1" ]; then - if [[ -z $NEW_WINDOW ]];then - exec $MOZ_CLIENT_PROGRAM $othersopt "openurl($optlast)" 2>/dev/null >/dev/null - else - exec $MOZ_CLIENT_PROGRAM $othersopt "openurl($optlast,new-window)" 2>/dev/null >/dev/null - fi -fi - -exec $MOZ_PROGRAM $MOZ_LANG $othersopt "$optlast" diff --git a/net-www/mozilla/mozilla-1.6-r1.ebuild b/net-www/mozilla/mozilla-1.6-r1.ebuild deleted file mode 100644 index 36eaae13f8e2..000000000000 --- a/net-www/mozilla/mozilla-1.6-r1.ebuild +++ /dev/null @@ -1,627 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.18 2004/09/09 17:31:32 brad Exp $ - -IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama" -# Internal USE flags that I do not really want to advertise ... -IUSE="${IUSE} mozcalendar mozaccess mozxmlterm" -IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft" - -inherit flag-o-matic gcc eutils nsplugins - -# Strip over-aggressive CFLAGS - Mozilla supplies its own fine-tuned CFLAGS and shouldn't be interfered with -strip-flags - -# Strip flags which create more documented instability -filter-flags -fstack-protector # see bug 45671 -filter-flags "-fomit-frame-pointer" -filter-flags -ffast-math -append-flags -s -fforce-addr - -# Merged ARCH stuff into a single case statement. But shouldn't this -# stuff go in src_compile? (18 Nov 2003 agriffis) -case "${ARCH}" in - alpha|ia64) - # Anything more than this causes segfaults on startup on 64-bit - # (bug 33767) - export CFLAGS="${CFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe" - export CXXFLAGS="${CXXFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe" - ;; - amd64) - # Anything more than this causes segfaults on startup on amd64 - # [Note: I think amd64 could use the same as above in the - # alpha/ia64 section, but I'll let the amd64 devs choose. -agriffis] - export CFLAGS="-O -Wall -fPIC -pipe" - export CXXFLAGS="${CFLAGS}" - ;; - ppc) - # Fix to avoid gcc-3.3.x micompilation issues. - if [ "$(gcc-major-version).$(gcc-minor-version)" = "3.3" ]; then - append-flags -fno-strict-aliasing - fi - ;; - sparc) - # Sparc support ... - replace-sparc64-flags - ;; - *) - # We set -O in ./configure to -O1, as -O2 cause crashes on - # startup (bug 13287) - export CFLAGS="${CFLAGS//-O?}" - export CXXFLAGS="${CFLAGS//-O?}" - ;; -esac - -EMVER="0.83.3" -IPCVER="1.0.5" - -PATCH_VER="1.0" - -# handle _rc versions -MY_PV1="${PV/_}" -MY_PV2="${MY_PV1/eta}" -S="${WORKDIR}/mozilla" -DESCRIPTION="The Mozilla Application Suite - web browser, email, HTML editor, IRC" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV2}/src/${PN}-source-${MY_PV2}.tar.bz2 - crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz - http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )" -# mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" -HOMEPAGE="http://www.mozilla.org" - -KEYWORDS="x86 ppc sparc alpha amd64 ia64" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -RDEPEND="virtual/x11 - >=sys-libs/zlib-1.1.4 - >=media-libs/fontconfig-2.1 - !moznoxft? ( virtual/xft ) - >=media-libs/jpeg-6b - >=media-libs/libpng-1.2.1 - >=sys-apps/portage-2.0.14 - dev-libs/expat - app-arch/zip - app-arch/unzip - gtk2? ( - >=x11-libs/gtk+-2.2.0 - >=dev-libs/glib-2.2.0 - >=x11-libs/pango-1.2.1 - >=dev-libs/libIDL-0.8.0 ) - !gtk2? ( - =x11-libs/gtk+-1.2* - =dev-libs/glib-1.2* - =gnome-base/orbit-0* ) - java? ( virtual/jre ) - crypt? ( >=app-crypt/gnupg-1.2.1 )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-lang/perl - java? ( >=dev-java/java-config-0.2.0 ) - >=sys-devel/autoconf-2.58" - - -moz_setup() { - - # Set MAKEOPTS to have proper -j? option .. - get_number_of_jobs - # This should enable parallel builds, I hope - export MAKE="emake" - - # needed by src_compile() and src_install() - export MOZILLA_OFFICIAL=1 - export BUILD_OFFICIAL=1 - - # make sure the nss module gets build (for NSS support) - if use ssl - then - export MOZ_PSM="1" - fi - -} - -src_unpack() { - - moz_setup - - unpack ${A} - - cd ${S} - - if [ "$(gcc-major-version)" -eq "3" ] - then - # ABI Patch for alpha/xpcom for gcc-3.x - if [ "${ARCH}" = "alpha" ] - then - cd ${S}; epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch - fi - if [ "${ARCH}" = "amd64" ] - then - cd ${S}; epatch ${FILESDIR}/${PN}-1.4-amd64.patch - fi - fi - - epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2 - epatch ${FILESDIR}/1.2/${PN}-1.2b-over-the-spot.patch.bz2 - - # Fix logic error when using RAW target - # <azarah@gentoo.org> (23 Feb 2003) - epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch - - # Fix compilation with gcc-3.4, bug 47870 - # (26 Apr 2004 agriffis) - epatch ${FILESDIR}/mozilla-1.6-gcc-3.4.patch - - export WANT_AUTOCONF=2.1 - autoconf &> /dev/null - unset WANT_AUTOCONF - - # Unpack the enigmail plugin - if use crypt && ! use moznomail - then - mv -f ${WORKDIR}/ipc ${S}/extensions/ - mv -f ${WORKDIR}/enigmail ${S}/extensions/ - cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile - cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile - fi - -} - -src_compile() { - - moz_setup - - local myconf= - # NOTE: QT and XLIB toolkit seems very unstable, leave disabled until - # tested ok -- azarah - if use gtk2 - then - myconf="${myconf} --enable-toolkit-gtk2 \ - --enable-default-toolkit=gtk2 \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --disable-toolkit-gtk" - else - myconf="${myconf} --enable-toolkit-gtk \ - --enable-default-toolkit=gtk \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --disable-toolkit-gtk2" - fi - - if ! use ldap - then - myconf="${myconf} --disable-ldap" - fi - - if ! use debug - then - myconf="${myconf} --enable-strip-libs \ - --disable-debug \ - --disable-tests \ - --enable-reorder \ - --enable-strip" -# --enable-cpp-rtti" - - # Currently --enable-elf-dynstr-gc only works for x86 and ppc, - # thanks to Jason Wever <weeve@gentoo.org> for the fix. - if use x86 || use ppc - then - myconf="${myconf} --enable-elf-dynstr-gc" - fi - fi - - # Check if we should enable Xft support ... - if ! use moznoxft - then - if use gtk2 - then - local pango_version="" - - # We need Xft2.0 localy installed - if (test -x /usr/bin/pkg-config) && (pkg-config xft) - then - pango_version="`pkg-config --modversion pango | cut -d. -f1,2`" - pango_version="`echo ${pango_version} | sed -e 's:\.::g'`" - - # We also need pango-1.1, else Mozilla links to both - # Xft1.1 *and* Xft2.0, and segfault... - if [ "${pango_version}" -gt "10" ] - then - einfo "Building with Xft2.0 (Gtk+-2.0) support!" - myconf="${myconf} --enable-xft --disable-freetype2" - touch ${WORKDIR}/.xft - else - ewarn "Building without Xft2.0 support!" - myconf="${myconf} --disable-xft `use_enable truetype freetype2`" - fi - else - ewarn "Building without Xft2.0 support!" - myconf="${myconf} --disable-xft `use_enable truetype freetype2`" - fi - else - einfo "Building with Xft2.0 (Gtk+-1.0) support!" - myconf="${myconf} --enable-xft --disable-freetype2" - touch ${WORKDIR}/.xft - fi - else - myconf="${myconf} --disable-xft `use_enable truetype freetype2`" - fi - - if use ipv6 - then - myconf="${myconf} --enable-ipv6" - fi - - - # NB!!: Due to the fact that the non default extensions do not always - # compile properly, using them is considered unsupported, and - # is just here for completeness. Please do not use if you - # do not know what you are doing! - # - # The defaults are: - # cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix - # venkman inspector irc universalchardet typeaheadfind webservices - # spellcheck - # Non-defaults are: - # xmlterm access-builtin datetime finger cview - use mozxmlterm || use mozaccess && \ - ewarn "" && \ - ewarn "The use of the non-default extensions is considered unsupported, and these" && \ - ewarn "may not always compile properly." && \ - ewarn "Please do not use if you do not know what you're doing!" && \ - ewarn "" && \ - epause 3 - - local myext="default" - if use mozxmlterm - then - myext="${myext},xmlterm" - fi - if use mozaccess - then - myext="${myext},access-builtin" - fi - if use moznoirc - then - myext="${myext},-irc" - fi - -# Disable SVG until it's properly implemented -# if use mozsvg -# then -# export MOZ_INTERNAL_LIBART_LGPL="1" -# myconf="${myconf} --enable-svg" -# else -# myconf="${myconf} --disable-svg" -# fi - if use mozcalendar - then - myconf="${myconf} --enable-calendar" - fi - - if use moznomail - then - myconf="${myconf} --disable-mailnews" - fi - if use moznocompose && use moznomail - then - myconf="${myconf} --disable-composer" - fi - - if [ "$(gcc-major-version)" -eq "3" ] - then - # Currently gcc-3.2 or older do not work well if we specify "-march" - # and other optimizations for pentium4. - if [ "$(gcc-minor-version)" -lt "3" ]; then - replace-flags -march=pentium4 -march=pentium3 - filter-flags -msse2 - fi - - # Enable us to use flash, etc plugins compiled with gcc-2.95.3 - if [ "${ARCH}" = "x86" ] - then - myconf="${myconf} --enable-old-abi-compat-wrappers" - fi - fi - - if use alpha - then - # mozilla wont link with X11 on alpha, for some crazy reason. - # set it to link explicitly here. - sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \ - ${S}/gfx/src/gtk/Makefile.in - fi - - # Check for xinerama - closes #19369 - if use xinerama ; then - myconf="${myconf} --enable-xinerama=yes" - else - myconf="${myconf} --enable-xinerama=no" - fi - - # ********************************************************************* - # - # Configure and build Mozilla - # - # ********************************************************************* - - export BUILD_MODULES=all - export BUILD_OPT=1 - - # Get it to work without warnings on gcc3 - export CXXFLAGS="${CXXFLAGS} -Wno-deprecated" - - # On 64-bit we statically set 'safe' CFLAGS. Use those only. - # using the standard -O2 will cause segfaults on startup - case "${ARCH}" in - alpha|amd64|ia64) - ENABLE_OPTIMIZE="${CFLAGS}" - ;; - *) - ENABLE_OPTIMIZE="-O2" - ;; - esac - - cd ${S} - einfo "Configuring Mozilla..." - ./configure --prefix=/usr/lib/mozilla \ - --disable-pedantic \ - --disable-short-wchar \ - --disable-xprint \ - --enable-mathml \ - --without-system-nspr \ - --enable-nspr-autoconf \ - --with-system-zlib \ - --enable-xsl \ - --enable-crypto \ - --enable-extensions="${myext}" \ - --enable-optimize="${ENABLE_OPTIMIZE}" \ - --with-default-mozilla-five-home=/usr/lib/mozilla \ - ${myconf} || die - - einfo "Building Mozilla..." - make WORKDIR="${WORKDIR}" || die - - # ********************************************************************* - # - # Build Mozilla NSS - # - # ********************************************************************* - - # Build the NSS/SSL support - if use ssl - then - einfo "Building Mozilla NSS..." - cd ${S}/security/coreconf - - # Fix #include problem - cp headers.mk headers.mk.orig - echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ - >>headers.mk - - # Disable jobserver here ... - make MAKE="make" || die - - cd ${S}/security/nss - - # Disable jobserver here ... - make MAKE="make" moz_import || die - make MAKE="make" || die - cd ${S} - fi - - # ********************************************************************* - # - # Build Enigmail plugin - # - # ********************************************************************* - - # Build the enigmail plugin - if use crypt && ! use moznomail - then - einfo "Building Enigmail plugin..." - cd ${S}/extensions/ipc - make || die - - cd ${S}/extensions/enigmail - make || die - fi -} - -src_install() { - - moz_setup - - # Install, don't create tarball - dodir /usr/lib - cd ${S}/xpinstall/packager - einfo "Installing mozilla into build root..." - make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die - mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla - - einfo "Installing includes and idl files..." - # Copy the include and idl files - dodir /usr/lib/mozilla/include/idl /usr/include - cd ${S}/dist - cp -LfR include/* ${D}/usr/lib/mozilla/include - cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl - dosym /usr/lib/mozilla/include /usr/include/mozilla - - # Install the development tools in /usr - dodir /usr/bin - mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin - - # Install the NSS/SSL libs, headers and tools - if use ssl - then - einfo "Installing Mozilla NSS..." - # Install the headers ('make install' do not work for headers ...) - insinto /usr/lib/mozilla/include/nss - [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h - [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h - [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h - # These come with zlib ... - rm -f ${D}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h} - - cd ${S}/security/nss - - mkdir -p ${WORKDIR}/nss/{bin,lib} - export BUILD_OPT=1 - export SOURCE_BIN_DIR=${WORKDIR}/nss/bin - export SOURCE_LIB_DIR=${WORKDIR}/nss/lib - - make install || die - # Gets installed as symbolic links ... - cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin - cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla - - # Need to unset these incase we want to rebuild, else the build - # gets newked. - unset SOURCE_LIB_DIR - unset SOURCE_BIN_DIR - fi - - cd ${S}/build/unix - # Fix mozilla-config and install it - perl -pi -e "s:/lib/mozilla-${MY_PV2}::g" mozilla-config - perl -pi -e "s:/mozilla-${MY_PV2}::g" mozilla-config - exeinto /usr/lib/mozilla - doexe mozilla-config - # Fix pkgconfig files and install them - insinto /usr/lib/pkgconfig - for x in *.pc - do - if [ -f ${x} ] - then - perl -pi -e "s:/lib/mozilla-${MY_PV2}::g" ${x} - perl -pi -e "s:/mozilla-${MY_PV2}::g" ${x} - doins ${x} - fi - done - - cd ${S} - exeinto /usr/bin - newexe ${FILESDIR}/mozilla.sh mozilla - insinto /etc/env.d - doins ${FILESDIR}/10mozilla - dodoc LEGAL LICENSE README/mozilla/README* - - # Install rebuild script - exeinto /usr/lib/mozilla/ - newexe ${S}/build/package/rpm/SOURCES/mozilla-rebuild-databases.pl.in \ - mozilla-rebuild-databases.pl - dosed 's|LIBDIR|/usr/lib|g' /usr/lib/mozilla/mozilla-rebuild-databases.pl - dosed 's|-MOZILLA_VERSION||g' /usr/lib/mozilla/mozilla-rebuild-databases.pl - - # Move plugins dir - src_mv_plugins /usr/lib/mozilla/plugins - - # Update Google search plugin to use UTF8 charset ... - insinto /usr/lib/mozilla/searchplugins - doins ${FILESDIR}/google.src - - if [ -f "${WORKDIR}/.xft" ] - then - # We are using Xft, so change the default font - insinto /usr/lib/mozilla/defaults/pref - doins ${FILESDIR}/xft.js - fi - - # Fix icons to look the same everywhere - insinto /usr/lib/mozilla/icons - doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm - doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm - - # Install icon and .desktop for menu entry - if use gnome - then - insinto /usr/share/pixmaps - doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png - - # Fix comment of menu entry - cd ${S}/build/package/rpm/SOURCES - perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Web Browser:' mozilla.desktop - cd ${S} - insinto /usr/share/gnome/apps/Internet - doins ${S}/build/package/rpm/SOURCES/mozilla.desktop - fi - - # Take care of non root execution - # (seems the problem is that not all files are readible by the user) - einfo "Fixing Permissions..." - chmod -R g+r,o+r ${D}/usr/lib/mozilla - find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || : -} - -pkg_preinst() { - # Stale components and chrome files break when unmerging old - if [ -d ${ROOT}/usr/lib/mozilla/components ] - then - rm -rf ${ROOT}/usr/lib/mozilla/components - fi - if [ -d ${ROOT}/usr/lib/mozilla/chrome ] - then - rm -rf ${ROOT}/usr/lib/mozilla/chrome - fi - - # Remove stale component registry. - if [ -e ${ROOT}/usr/lib/mozilla/component.reg ] - then - rm -f ${ROOT}/usr/lib/mozilla/component.reg - fi - if [ -e ${ROOT}/usr/lib/mozilla/components/compreg.dat ] - then - rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat - fi - - # Make sure these are removed. - rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so* - - # Move old plugins dir - pkg_mv_plugins /usr/lib/mozilla/plugins -} - -pkg_postinst() { - - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - # Needed to update the run time bindings for REGXPCOM - # (do not remove next line!) - env-update - # Register Components and Chrome - einfo "Registering Components and Chrome..." - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - # Fix permissions of component registry - chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || : - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || : - - - echo - ewarn "Please unmerge old versions of mozilla, as the header" - ewarn "layout in /usr/lib/mozilla/include have changed and will" - ewarn "result in compile errors when compiling programs that need" - ewarn "mozilla headers and libs (galeon, nautilus, ...)" -} - -pkg_postrm() { - - # Regenerate component.reg in case some things changed - if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ] - then - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - if [ -x "${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl" ] - then - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; || : - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || : - fi - fi -} - diff --git a/net-www/mozilla/mozilla-1.7-r1.ebuild b/net-www/mozilla/mozilla-1.7-r1.ebuild deleted file mode 100644 index fceb9c94c8e1..000000000000 --- a/net-www/mozilla/mozilla-1.7-r1.ebuild +++ /dev/null @@ -1,582 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7-r1.ebuild,v 1.7 2004/11/01 01:17:29 vapier Exp $ - -IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint" -# Internal USE flags that I do not really want to advertise ... -IUSE="${IUSE} mozcalendar mozsvg" -IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft" - -unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 -inherit flag-o-matic gcc eutils nsplugins mozilla-launcher - -EMVER="0.84.1" -IPCVER="1.0.6" - -# handle _rc versions -MY_PV=${PV/_alpha/a} # handle alpha -MY_PV=${MY_PV/_beta/b} # handle beta -MY_PV=${MY_PV/_rc/rc} # handle rc - -DESCRIPTION="The Mozilla Application Suite - web browser, email, HTML editor, IRC" -HOMEPAGE="http://www.mozilla.org" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2 - crypt? ( !moznomail? ( - http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz - mirror://gentoo/enigmail-${EMVER}-r1.tar.gz - ) )" -# Normally the following would be used instead of the mirror://gentoo/ -# reference above, but the upstream source tarball changed without -# changing the filename. (17 Jun 2004 agriffis) -# http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz - -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -common_depends="virtual/x11 - >=sys-libs/zlib-1.1.4 - >=media-libs/fontconfig-2.1 - !moznoxft? ( virtual/xft ) - >=media-libs/jpeg-6b - >=media-libs/libpng-1.2.1 - >=sys-apps/portage-2.0.14 - dev-libs/expat - app-arch/zip - app-arch/unzip - gtk2? ( - >=x11-libs/gtk+-2.2.0 - >=dev-libs/glib-2.2.0 - >=x11-libs/pango-1.2.1 - >=dev-libs/libIDL-0.8.0 ) - !gtk2? ( - =x11-libs/gtk+-1.2* - =dev-libs/glib-1.2* - =gnome-base/orbit-0* ) - java? ( virtual/jre ) - crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) ) - gnome? ( >=gnome-base/gnome-vfs-2.3.5 )" - -DEPEND="${common_depends} - dev-util/pkgconfig - dev-lang/perl - java? ( >=dev-java/java-config-0.2.0 )" - -RDEPEND="${common_depends} - >=net-www/mozilla-launcher-1.7-r1" - -S="${WORKDIR}/mozilla" - -pkg_setup() { - # needed by src_compile() and src_install() - export MOZILLA_OFFICIAL=1 - export BUILD_OFFICIAL=1 - - # make sure the nss module gets build (for NSS support) - if use ssl; then - export MOZ_PSM="1" - fi -} - -# Simulate the silly csh makemake script -makemake() { - typeset m topdir - - for m in $(find . -name Makefile.in); do - topdir=$(echo "$m" | sed -r 's:[^/]+:..:g') - sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \ - < ${m} > ${m%.in} || die "sed ${m} failed" - done -} - -src_unpack() { - typeset x - - unpack ${A} || die "unpack failed" - cd ${S} || die - - if [[ $(gcc-major-version) -eq 3 ]]; then - # ABI Patch for alpha/xpcom for gcc-3.x - if [[ ${ARCH} == alpha ]]; then - epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch - fi - # unecessary now, already in the source - # Danny van Dyk <kugelfang@gentoo.org> 2004/06/20 - #if [[ ${ARCH} == amd64 ]]; then - # epatch ${FILESDIR}/${PN}-1.7-amd64.patch - #fi - fi - - epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2 - - # Fix logic error when using RAW target - # <azarah@gentoo.org> (23 Feb 2003) - epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch - - # Fix incorrect version in milestone.txt (1.7rc1 claims 1.7b) - # If 1.7rc2 is anything to go by, then milestone.txt should report - # the upcoming version number, e.g. 1.7 - local old_milestone=$(grep '^[0-9]' config/milestone.txt) - if [[ ${old_milestone} != ${PV%_*} ]]; then - einfo "Updating milestone.txt from ${old_milestone} to ${PV%_*}" - sed -i -ne '/^#/p' config/milestone.txt # maintain comments - echo "${PV%_*}" >> config/milestone.txt # add version line - fi - - WANT_AUTOCONF=2.1 autoconf &> /dev/null - - # Unpack the enigmail plugin - if use crypt && ! use moznomail; then - for x in ipc enigmail; do - mv ${WORKDIR}/${x} ${S}/extensions || die - cd ${S}/extensions/${x} || die - makemake # see function above - done - - # Fix ipc-1.0.6 compilation problem by updating line from cvs - # (09 Jun 2004 agriffis) - cd ${S}/extensions/ipc - epatch ${FILESDIR}/ipc-1.0.6-nsPipeChannel.patch - fi -} - -src_compile() { - #################################### - # - # myconf setup - # - #################################### - - local myconf - - # NOTE: QT and XLIB toolkit seems very unstable, leave disabled until - # tested ok -- azarah - if use gtk2; then - myconf="${myconf} - --enable-toolkit-gtk2 \ - --enable-default-toolkit=gtk2 \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --disable-toolkit-gtk" - else - myconf="${myconf} - --enable-toolkit-gtk \ - --enable-default-toolkit=gtk \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --disable-toolkit-gtk2" - fi - - if ! use debug; then - myconf="${myconf} \ - --disable-debug \ - --disable-tests \ - --enable-reorder \ - --enable-strip \ - --enable-strip-libs" -# --enable-cpp-rtti" - - # Currently --enable-elf-dynstr-gc only works for x86 and ppc, - # thanks to Jason Wever <weeve@gentoo.org> for the fix. - if use x86 || use ppc; then - myconf="${myconf} --enable-elf-dynstr-gc" - fi - fi - - # Check if we should enable Xft support ... - if ! use moznoxft; then - if use gtk2; then - local pango_version="" - - # We need Xft2.0 localy installed - if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then - pango_version=$(pkg-config --modversion pango | cut -d. -f1,2) - - # We also need pango-1.1, else Mozilla links to both - # Xft1.1 *and* Xft2.0, and segfault... - if [[ ${pango_version//.} -gt 10 ]]; then - einfo "Building with Xft2.0 (Gtk+-2.0) support" - myconf="${myconf} --enable-xft --disable-freetype2" - touch ${WORKDIR}/.xft - else - ewarn "Building without Xft2.0 support (bad pango)" - myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" - fi - else - ewarn "Building without Xft2.0 support (no pkg-config xft)" - myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" - fi - else - einfo "Building with Xft2.0 (Gtk+-1.0) support" - myconf="${myconf} --enable-xft --disable-freetype2" - touch ${WORKDIR}/.xft - fi - else - einfo "Building without Xft2.0 support (moznoxft)" - myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" - fi - - # Re-enabled per bug 24522 (28 Apr 2004 agriffis) - if use mozsvg; then - export MOZ_INTERNAL_LIBART_LGPL=1 - myconf="${myconf} --enable-svg --enable-svg-renderer-libart" - else - myconf="${myconf} --disable-svg" - fi - - if use moznomail && ! use mozcalendar; then - myconf="${myconf} --disable-mailnews" - fi - if use moznocompose && use moznomail; then - myconf="${myconf} --disable-composer" - fi - - #################################### - # - # myext setup - # - #################################### - - # The defaults are: - # cookie wallet content-packs xml-rpc xmlextras help p3p pref - # transformiix venkman inspector irc universalchardet - # typeaheadfind webservices spellcheck - # Non-defaults are: - # xmlterm access-builtin datetime finger cview - - # Remove access and xmlterm as options since they're preventing the build - # more than they work. (04 Jul 2004 brad) - #if use mozxmlterm || use mozaccess; then - # ewarn "" - # ewarn "NB!!: The use of the non-default extensions is considered" - # ewarn "unsupported, and these may not always compile properly." - # ewarn "Please do not use if you do not know what you're doing!" - # ewarn "" - # sleep 3 - #fi - - local myext="default" - #use mozxmlterm && myext="${myext},xmlterm" - #use mozaccess && myext="${myext},access-builtin" - use moznoirc && myext="${myext},-irc" - - #################################### - # - # CFLAGS setup and ARCH support - # - #################################### - - # Set optimization level based on CFLAGS - if is-flag -O0; then - enable_optimize=-O0 - elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then - # Anything more than this causes segfaults on startup on 64-bit - # (bug 33767) - enable_optimize=-O1 - append-flags -fPIC - elif is-flag -O1; then - enable_optimize=-O1 - else - enable_optimize=-O2 - fi - - # Now strip optimization from CFLAGS so it doesn't end up in the - # compile string - filter-flags '-O*' - - # Strip over-aggressive CFLAGS - Mozilla supplies its own - # fine-tuned CFLAGS and shouldn't be interfered with.. Do this - # AFTER setting optimization above since strip-flags only allows - # -O -O1 and -O2 - strip-flags - - # Who added the following line and why? It doesn't really hurt - # anything, but is it necessary?? (28 Apr 2004 agriffis) - append-flags -fforce-addr - - # Additional ARCH support - case "${ARCH}" in - alpha) - # Mozilla won't link with X11 on alpha, for some crazy reason. - # set it to link explicitly here. - sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \ - ${S}/gfx/src/gtk/Makefile.in - ;; - - ppc) - # Fix to avoid gcc-3.3.x micompilation issues. - if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then - append-flags -fno-strict-aliasing - fi - ;; - - sparc) - # Sparc support ... - replace-sparc64-flags - ;; - - x86) - if [[ $(gcc-major-version) -eq 3 ]]; then - # gcc-3 prior to 3.2.3 doesn't work well for pentium4 - # see bug 25332 - if [[ $(gcc-minor-version) -lt 2 || - ( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]] - then - replace-flags -march=pentium4 -march=pentium3 - filter-flags -msse2 - fi - # Enable us to use flash, etc plugins compiled with gcc-2.95.3 - myconf="${myconf} --enable-old-abi-compat-wrappers" - fi - ;; - esac - - # Needed to build without warnings on gcc-3 - CXXFLAGS="${CXXFLAGS} -Wno-deprecated" - - #################################### - # - # Configure and build Mozilla - # - #################################### - - export BUILD_MODULES=all - export BUILD_OPT=1 - - cd ${S} - einfo "Configuring Mozilla..." - ./configure --prefix=/usr/lib/mozilla \ - --with-system-jpeg \ - --with-system-mng \ - --with-system-png \ - --with-system-zlib \ - $(use_enable gnome gnomevfs) \ - $(use_enable ipv6) \ - $(use_enable ldap) \ - $(use_enable mozcalendar calendar) \ - $(use_enable xprint) \ - $(use_enable xinerama) \ - --disable-pedantic \ - --disable-short-wchar \ - --enable-mathml \ - --without-system-nspr \ - --enable-nspr-autoconf \ - --enable-xsl \ - --enable-crypto \ - --enable-extensions="${myext}" \ - --enable-optimize="${enable_optimize}" \ - --with-default-mozilla-five-home=/usr/lib/mozilla \ - ${myconf} || die - - einfo "Building Mozilla..." - emake WORKDIR="${WORKDIR}" || die - - #################################### - # - # Build Mozilla NSS - # - #################################### - - # Build the NSS/SSL support - if use ssl; then - einfo "Building Mozilla NSS..." - - # Fix #include problem - cd ${S}/security/coreconf || die "cd coreconf failed" - echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ - >>headers.mk - emake -j1 || die "make security headers failed" - - cd ${S}/security/nss || die "cd nss failed" - emake -j1 moz_import || die "make moz_import failed" - emake -j1 || die "make nss failed" - fi - - #################################### - # - # Build Enigmail plugin - # - #################################### - - # Build the enigmail plugin - if use crypt && ! use moznomail; then - einfo "Building Enigmail plugin..." - cd ${S}/extensions/ipc || die "cd ipc failed" - emake || die "make ipc failed" - - cd ${S}/extensions/enigmail || die "cd enigmail failed" - emake || die "make enigmail failed" - fi -} - -src_install() { - # Install, don't create tarball - dodir /usr/lib - cd ${S}/xpinstall/packager - einfo "Installing mozilla into build root..." - make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die - mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla - - einfo "Installing includes and idl files..." - # Copy the include and idl files - dodir /usr/lib/mozilla/include/idl /usr/include - cd ${S}/dist - cp -LfR include/* ${D}/usr/lib/mozilla/include - cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl - dosym /usr/lib/mozilla/include /usr/include/mozilla - - # Install the development tools in /usr - dodir /usr/bin - mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin - - # Install the NSS/SSL libs, headers and tools - if use ssl; then - einfo "Installing Mozilla NSS..." - # Install the headers ('make install' do not work for headers ...) - insinto /usr/lib/mozilla/include/nss - [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h - [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h - [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h - # These come with zlib ... - rm -f ${D}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h} - - cd ${S}/security/nss - - mkdir -p ${WORKDIR}/nss/{bin,lib} - export BUILD_OPT=1 - export SOURCE_BIN_DIR=${WORKDIR}/nss/bin - export SOURCE_LIB_DIR=${WORKDIR}/nss/lib - - make install || die - # Gets installed as symbolic links ... - cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin - cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla - - # Need to unset these incase we want to rebuild, else the build - # gets newked. - unset SOURCE_LIB_DIR - unset SOURCE_BIN_DIR - fi - - cd ${S}/build/unix - # Fix mozilla-config and install it - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config - perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config - exeinto /usr/lib/mozilla - doexe mozilla-config - # Fix pkgconfig files and install them - insinto /usr/lib/pkgconfig - for x in *.pc; do - if [[ -f ${x} ]]; then - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x} - perl -pi -e "s:/mozilla-${MY_PV}::g" ${x} - doins ${x} - fi - done - cd ${S} - - dodir /usr/bin - dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla - insinto /etc/env.d - doins ${FILESDIR}/10mozilla - dodoc LEGAL LICENSE README/mozilla/README* - - # Install rebuild script - exeinto /usr/lib/mozilla/ - doexe ${FILESDIR}/mozilla-rebuild-databases.pl - - # Move plugins dir - src_mv_plugins /usr/lib/mozilla/plugins - - # Update Google search plugin to use UTF8 charset ... - insinto /usr/lib/mozilla/searchplugins - doins ${FILESDIR}/google.src - - if [[ -f "${WORKDIR}/.xft" ]]; then - # We are using Xft, so change the default font - insinto /usr/lib/mozilla/defaults/pref - doins ${FILESDIR}/xft.js - fi - - # Fix icons to look the same everywhere - insinto /usr/lib/mozilla/icons - doins ${S}/widget/src/gtk/mozicon16.xpm - doins ${S}/widget/src/gtk/mozicon50.xpm - - # Install icon and .desktop for menu entry - if use gnome; then - insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/mozilla-icon.png - - insinto /usr/share/applications - doins ${FILESDIR}/icon/mozilla.desktop - fi - - # Take care of non root execution - # (seems the problem is that not all files are readible by the user) - einfo "Fixing Permissions..." - chmod -R g+r,o+r ${D}/usr/lib/mozilla - find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || : -} - -pkg_preinst() { - # Move old plugins dir - pkg_mv_plugins /usr/lib/mozilla/plugins - - if true; then - # Remove entire installed instance to solve various problems, - # for example see bug 27719 - rm -rf ${ROOT}/usr/lib/mozilla - else - # Stale components and chrome files break when unmerging old - rm -rf ${ROOT}/usr/lib/mozilla/components - rm -rf ${ROOT}/usr/lib/mozilla/chrome - - # Remove stale component registry. - rm -f ${ROOT}/usr/lib/mozilla/component.reg - rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat - - # Make sure these are removed. - rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so* - fi -} - -pkg_postinst() { - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - # Needed to update the run time bindings for REGXPCOM - # (do not remove next line!) - env-update - - # Register Components and Chrome - einfo "Registering Components and Chrome..." - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - - # Fix permissions of component registry - chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat - - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; - - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - # Regenerate component.reg in case some things changed - if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - fi - fi - - update_mozilla_launcher_symlinks -} diff --git a/net-www/mozilla/mozilla-1.7.2-r1.ebuild b/net-www/mozilla/mozilla-1.7.2-r1.ebuild deleted file mode 100644 index 5d3c2612c83e..000000000000 --- a/net-www/mozilla/mozilla-1.7.2-r1.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.2-r1.ebuild,v 1.4 2004/11/01 01:17:29 vapier Exp $ - -unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 -inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozilla makeedit - -IUSE="java crypt gtk2 ssl" -# Internal USE flags that I do not really want to advertise ... -IUSE="${IUSE} mozcalendar moznoirc moznomail moznocompose moznoxft" - -EMVER="0.85.0" -IPCVER="1.0.7" - -# handle _rc versions -MY_PV=${PV/_alpha/a} # handle alpha -MY_PV=${MY_PV/_beta/b} # handle beta -MY_PV=${MY_PV/_rc/rc} # handle rc - -DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" -HOMEPAGE="http://www.mozilla.org" -SRC_URI="mirror://gentoo/${PN}-source3-${MY_PV}.tar.bz2 - crypt? ( !moznomail? ( - http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz - http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz - ) )" -# mozilla.org screwed up the source tarball for 1.7.2 -# http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2 - -KEYWORDS="x86 ppc sparc alpha amd64 ia64" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -RDEPEND="java? ( virtual/jre ) - crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )" - -DEPEND="${RDEPEND} - java? ( >=dev-java/java-config-0.2.0 ) - dev-lang/perl" - -S="${WORKDIR}/mozilla" - -src_unpack() { - typeset x - - unpack ${A} || die "unpack failed" - cd ${S} || die - - if [[ $(gcc-major-version) -eq 3 ]]; then - # ABI Patch for alpha/xpcom for gcc-3.x - if [[ ${ARCH} == alpha ]]; then - epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch - fi - fi - - # Fix logic error when using RAW target - # <azarah@gentoo.org> (23 Feb 2003) - epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch - - WANT_AUTOCONF=2.1 autoconf || die - - # Unpack the enigmail plugin - if use crypt && ! use moznomail; then - for x in ipc enigmail; do - mv ${WORKDIR}/${x} ${S}/extensions || die - cd ${S}/extensions/${x} || die - makemake # from mozilla.eclass - done - - # Fix mozilla-specific ipc-1.0.7 compilation problem - # (07 Aug 2004 agriffis) - cd ${S} - epatch ${FILESDIR}/ipc-1.0.7-nsPipeChannel.patch || die - fi -} - -src_compile() { - local myconf - - #################################### - # - # myconf, CFLAGS and CXXFLAGS setup - # - #################################### - - # mozilla_conf comes from mozilla.eclass - mozilla_conf - - myconf="${myconf} \ - --prefix=/usr/lib/mozilla \ - --with-default-mozilla-five-home=/usr/lib/mozilla" - - #################################### - # - # Configure and build Mozilla - # - #################################### - - ./configure ${myconf} || die - - # This removes extraneous CFLAGS from the Makefiles to reduce RAM - # requirements while compiling - edit_makefiles - - emake || die - - #################################### - # - # Build Mozilla NSS - # - #################################### - - # Build the NSS/SSL support - if use ssl; then - einfo "Building Mozilla NSS..." - - # Fix #include problem - cd ${S}/security/coreconf || die "cd coreconf failed" - echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ - >>headers.mk - emake -j1 || die "make security headers failed" - - cd ${S}/security/nss || die "cd nss failed" - emake -j1 moz_import || die "make moz_import failed" - emake -j1 || die "make nss failed" - fi - - #################################### - # - # Build Enigmail plugin - # - #################################### - - # Build the enigmail plugin - if use crypt && ! use moznomail; then - einfo "Building Enigmail plugin..." - cd ${S}/extensions/ipc || die "cd ipc failed" - emake || die "make ipc failed" - - cd ${S}/extensions/enigmail || die "cd enigmail failed" - emake || die "make enigmail failed" - fi -} - -src_install() { - # Install, don't create tarball - dodir /usr/lib - cd ${S}/xpinstall/packager - einfo "Installing mozilla into build root..." - make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die - mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla - - einfo "Installing includes and idl files..." - # Copy the include and idl files - dodir /usr/lib/mozilla/include/idl /usr/include - cd ${S}/dist - cp -LfR include/* ${D}/usr/lib/mozilla/include - cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl - dosym /usr/lib/mozilla/include /usr/include/mozilla - - # Install the development tools in /usr - dodir /usr/bin - mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin - - # Install the NSS/SSL libs, headers and tools - if use ssl; then - einfo "Installing Mozilla NSS..." - # Install the headers ('make install' do not work for headers ...) - insinto /usr/lib/mozilla/include/nss - [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h - [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h - [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h - # These come with zlib ... - rm -f ${D}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h} - - cd ${S}/security/nss - - mkdir -p ${WORKDIR}/nss/{bin,lib} - export SOURCE_BIN_DIR=${WORKDIR}/nss/bin - export SOURCE_LIB_DIR=${WORKDIR}/nss/lib - - make install || die - # Gets installed as symbolic links ... - cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin - cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla - - # Need to unset these incase we want to rebuild, else the build - # gets newked. - unset SOURCE_LIB_DIR - unset SOURCE_BIN_DIR - fi - - cd ${S}/build/unix - # Fix mozilla-config and install it - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config - perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config - exeinto /usr/lib/mozilla - doexe mozilla-config - # Fix pkgconfig files and install them - insinto /usr/lib/pkgconfig - for x in *.pc; do - if [[ -f ${x} ]]; then - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x} - perl -pi -e "s:/mozilla-${MY_PV}::g" ${x} - doins ${x} - fi - done - cd ${S} - - dodir /usr/bin - dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla - insinto /etc/env.d - doins ${FILESDIR}/10mozilla - dodoc LEGAL LICENSE README/mozilla/README* - - # Install rebuild script - exeinto /usr/lib/mozilla/ - doexe ${FILESDIR}/mozilla-rebuild-databases.pl - - # Move plugins dir - src_mv_plugins /usr/lib/mozilla/plugins - - # Update Google search plugin to use UTF8 charset ... - insinto /usr/lib/mozilla/searchplugins - doins ${FILESDIR}/google.src - - if [[ -f "${WORKDIR}/.xft" ]]; then - # We are using Xft, so change the default font - insinto /usr/lib/mozilla/defaults/pref - doins ${FILESDIR}/xft.js - fi - - # Fix icons to look the same everywhere - insinto /usr/lib/mozilla/icons - doins ${S}/widget/src/gtk/mozicon16.xpm - doins ${S}/widget/src/gtk/mozicon50.xpm - - # Install icon and .desktop for menu entry - insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/mozilla-icon.png - insinto /usr/share/applications - doins ${FILESDIR}/icon/mozilla.desktop - - # Take care of non root execution - # (seems the problem is that not all files are readible by the user) - einfo "Fixing Permissions..." - chmod -R g+r,o+r ${D}/usr/lib/mozilla - find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || : -} - -pkg_preinst() { - # Move old plugins dir - pkg_mv_plugins /usr/lib/mozilla/plugins - - if true; then - # Remove entire installed instance to solve various problems, - # for example see bug 27719 - rm -rf ${ROOT}/usr/lib/mozilla - else - # Stale components and chrome files break when unmerging old - rm -rf ${ROOT}/usr/lib/mozilla/components - rm -rf ${ROOT}/usr/lib/mozilla/chrome - - # Remove stale component registry. - rm -f ${ROOT}/usr/lib/mozilla/component.reg - rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat - - # Make sure these are removed. - rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so* - fi -} - -pkg_postinst() { - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - # Needed to update the run time bindings for REGXPCOM - # (do not remove next line!) - env-update - - # Register Components and Chrome - einfo "Registering Components and Chrome..." - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - - # Fix permissions of component registry - chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat - - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; - - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - # Regenerate component.reg in case some things changed - if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - fi - fi - - update_mozilla_launcher_symlinks -} diff --git a/net-www/mozilla/mozilla-1.7.3-r2.ebuild b/net-www/mozilla/mozilla-1.7.3-r2.ebuild deleted file mode 100644 index e1d39c35a47e..000000000000 --- a/net-www/mozilla/mozilla-1.7.3-r2.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.3-r2.ebuild,v 1.3 2004/11/18 01:56:19 agriffis Exp $ - -unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 -inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit - -IUSE="java crypt ssl moznomail" - -EMVER="0.86.0" -IPCVER="1.0.8" - -# handle _rc versions -MY_PV=${PV/_alpha/a} # handle alpha -MY_PV=${MY_PV/_beta/b} # handle beta -MY_PV=${MY_PV/_rc/rc} # handle rc - -DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" -HOMEPAGE="http://www.mozilla.org" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2 - mirror://gentoo/mozilla-1.7.2-libart_lgpl.tar.bz2 - crypt? ( !moznomail? ( - http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz - http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz - ) )" - -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -RDEPEND="java? ( virtual/jre ) - crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )" - -DEPEND="${RDEPEND} - java? ( >=dev-java/java-config-0.2.0 ) - dev-lang/perl" - -S="${WORKDIR}/mozilla" - -src_unpack() { - typeset x - - unpack ${A} || die "unpack failed" - cd ${S} || die "cd failed" - - if [[ $(gcc-major-version) -eq 3 ]]; then - # ABI Patch for alpha/xpcom for gcc-3.x - if [[ ${ARCH} == alpha ]]; then - epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch - fi - fi - - # Fix logic error when using RAW target - # <azarah@gentoo.org> (23 Feb 2003) - epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch - - WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed" - - # Unpack the enigmail plugin - if use crypt && ! use moznomail; then - for x in ipc enigmail; do - mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed" - cd ${S}/extensions/${x} || die "cd failed" - makemake # from mozilla.eclass - done - - # Fix mozilla-specific ipc-1.0.7 compilation problem - # (07 Aug 2004 agriffis) - cd ${S} - epatch ${FILESDIR}/ipc-1.0.7-nsPipeChannel.patch || die "epatch failed" - fi -} - -src_compile() { - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - - # Bug 60668: Galeon doesn't build without oji enabled, so enable it - # regardless of java setting. - mozconfig_annotate '' --enable-oji --enable-mathml - - # Other moz-specific settings - mozconfig_use_enable mozdevelop jsd - mozconfig_use_enable mozdevelop xpctools - mozconfig_use_extension mozdevelop venkman - mozconfig_use_enable gnome gnomevfs - mozconfig_use_extension gnome gnomevfs - mozconfig_use_extension !moznoirc irc - mozconfig_use_extension mozxmlterm xmlterm - mozconfig_use_enable mozcalendar calendar - mozconfig_use_enable ldap - mozconfig_use_enable ldap ldap-experimental - mozconfig_annotate '' --prefix=/usr/lib/mozilla - mozconfig_annotate '' --with-default-mozilla-five-home=/usr/lib/mozilla - - if use moznomail && ! use mozcalendar; then - mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews - fi - if use moznocompose && use moznomail; then - mozconfig_annotate "+moznocompose +moznomail" --disable-composer - fi - - # Re-enabled per bug 24522 (28 Apr 2004 agriffis) - if use mozsvg; then - export MOZ_INTERNAL_LIBART_LGPL=1 - mozconfig_annotate "+mozsvg" \ - --enable-svg --enable-svg-renderer-libart - else - mozconfig_annotate "-mozsvg" --disable-svg - fi - - # Finalize and report settings - mozconfig_final - - #################################### - # - # Configure and build Mozilla - # - #################################### - - # ./configure picks up the mozconfig stuff - ./configure || die "configure failed" - - # This removes extraneous CFLAGS from the Makefiles to reduce RAM - # requirements while compiling - edit_makefiles - - emake || die "emake failed" - - #################################### - # - # Build Mozilla NSS - # - #################################### - - # Build the NSS/SSL support - if use ssl; then - einfo "Building Mozilla NSS..." - - # Fix #include problem - cd ${S}/security/coreconf || die "cd coreconf failed" - echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ - >>headers.mk - emake -j1 || die "make security headers failed" - - cd ${S}/security/nss || die "cd nss failed" - emake -j1 moz_import || die "make moz_import failed" - emake -j1 || die "make nss failed" - fi - - #################################### - # - # Build Enigmail plugin - # - #################################### - - # Build the enigmail plugin - if use crypt && ! use moznomail; then - einfo "Building Enigmail plugin..." - cd ${S}/extensions/ipc || die "cd ipc failed" - emake || die "make ipc failed" - - cd ${S}/extensions/enigmail || die "cd enigmail failed" - emake || die "make enigmail failed" - fi -} - -src_install() { - # Install, don't create tarball - dodir /usr/lib - cd ${S}/xpinstall/packager - einfo "Installing mozilla into build root..." - make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed" - mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla - - einfo "Installing includes and idl files..." - # Copy the include and idl files - dodir /usr/lib/mozilla/include/idl /usr/include - cd ${S}/dist - cp -LfR include/* ${D}/usr/lib/mozilla/include - cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl - dosym /usr/lib/mozilla/include /usr/include/mozilla - - # Install the development tools in /usr - dodir /usr/bin - mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin - - # Install the NSS/SSL libs, headers and tools - if use ssl; then - einfo "Installing Mozilla NSS..." - # Install the headers ('make install' do not work for headers ...) - insinto /usr/lib/mozilla/include/nss - [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h - [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h - [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h - # These come with zlib ... - rm -f ${D}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h} - - cd ${S}/security/nss - - mkdir -p ${WORKDIR}/nss/{bin,lib} - export SOURCE_BIN_DIR=${WORKDIR}/nss/bin - export SOURCE_LIB_DIR=${WORKDIR}/nss/lib - - make install || die "make failed" - # Gets installed as symbolic links ... - cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin - cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla - - # Need to unset these incase we want to rebuild, else the build - # gets newked. - unset SOURCE_LIB_DIR - unset SOURCE_BIN_DIR - fi - - cd ${S}/build/unix - # Fix mozilla-config and install it - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config - perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config - exeinto /usr/lib/mozilla - doexe mozilla-config - # Fix pkgconfig files and install them - insinto /usr/lib/pkgconfig - for x in *.pc; do - if [[ -f ${x} ]]; then - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x} - perl -pi -e "s:/mozilla-${MY_PV}::g" ${x} - doins ${x} - fi - done - cd ${S} - - dodir /usr/bin - dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla - insinto /etc/env.d - doins ${FILESDIR}/10mozilla - dodoc LEGAL LICENSE README/mozilla/README* - - # Install rebuild script - exeinto /usr/lib/mozilla/ - doexe ${FILESDIR}/mozilla-rebuild-databases.pl - - # Move plugins dir - src_mv_plugins /usr/lib/mozilla/plugins - - # Update Google search plugin to use UTF8 charset ... - insinto /usr/lib/mozilla/searchplugins - doins ${FILESDIR}/google.src - - if [[ -f "${WORKDIR}/.xft" ]]; then - # We are using Xft, so change the default font - insinto /usr/lib/mozilla/defaults/pref - doins ${FILESDIR}/xft.js - fi - - # Fix icons to look the same everywhere - insinto /usr/lib/mozilla/icons - doins ${S}/widget/src/gtk/mozicon16.xpm - doins ${S}/widget/src/gtk/mozicon50.xpm - - # Install icon and .desktop for menu entry - insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/mozilla-icon.png - insinto /usr/share/applications - doins ${FILESDIR}/icon/mozilla.desktop - - # Take care of non root execution - # (seems the problem is that not all files are readible by the user) - einfo "Fixing Permissions..." - chmod -R g+r,o+r ${D}/usr/lib/mozilla - find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || : -} - -pkg_preinst() { - # Move old plugins dir - pkg_mv_plugins /usr/lib/mozilla/plugins - - if true; then - # Remove entire installed instance to solve various problems, - # for example see bug 27719 - rm -rf ${ROOT}/usr/lib/mozilla - else - # Stale components and chrome files break when unmerging old - rm -rf ${ROOT}/usr/lib/mozilla/components - rm -rf ${ROOT}/usr/lib/mozilla/chrome - - # Remove stale component registry. - rm -f ${ROOT}/usr/lib/mozilla/component.reg - rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat - - # Make sure these are removed. - rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so* - fi -} - -pkg_postinst() { - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - # Needed to update the run time bindings for REGXPCOM - # (do not remove next line!) - env-update - - # Register Components and Chrome - einfo "Registering Components and Chrome..." - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - - # Fix permissions of component registry - chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat - - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; - - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - # Regenerate component.reg in case some things changed - if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - fi - fi - - update_mozilla_launcher_symlinks -} diff --git a/net-www/mozilla/mozilla-1.7.3-r3.ebuild b/net-www/mozilla/mozilla-1.7.3-r3.ebuild deleted file mode 100644 index 29a007ea4aad..000000000000 --- a/net-www/mozilla/mozilla-1.7.3-r3.ebuild +++ /dev/null @@ -1,337 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.3-r3.ebuild,v 1.3 2004/11/19 02:57:01 agriffis Exp $ - -unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 -inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit - -IUSE="java crypt ssl moznomail" - -EMVER="0.89.0" -IPCVER="1.1.1" - -# handle _rc versions -MY_PV=${PV/_alpha/a} # handle alpha -MY_PV=${MY_PV/_beta/b} # handle beta -MY_PV=${MY_PV/_rc/rc} # handle rc - -DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" -HOMEPAGE="http://www.mozilla.org" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2 - crypt? ( !moznomail? ( - http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz - http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz - ) )" - -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2 -# and is required to build with support for cairo. #71504 -RDEPEND="java? ( virtual/jre ) - mozsvg? ( - >=x11-base/xorg-x11-6.7.0-r2 - x11-libs/cairo - ) - crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )" - -DEPEND="${RDEPEND} - java? ( >=dev-java/java-config-0.2.0 ) - dev-lang/perl" - -S="${WORKDIR}/mozilla" - -src_unpack() { - typeset x - - unpack ${A} || die "unpack failed" - cd ${S} || die "cd failed" - - if [[ $(gcc-major-version) -eq 3 ]]; then - # ABI Patch for alpha/xpcom for gcc-3.x - if [[ ${ARCH} == alpha ]]; then - epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch - fi - fi - - # Fix logic error when using RAW target - # <azarah@gentoo.org> (23 Feb 2003) - epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch - - # patch out ft caching code since the API changed between releases of - # freetype; this enables freetype-2.1.8+ compat. - # https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65 - epatch ${FILESDIR}/mozilla-1.7.3-4ft2.patch - - WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed" - - # Unpack the enigmail plugin - if use crypt && ! use moznomail; then - for x in ipc enigmail; do - mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed" - cd ${S}/extensions/${x} || die "cd failed" - makemake # from mozilla.eclass - done - fi -} - -src_compile() { - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - - # Bug 60668: Galeon doesn't build without oji enabled, so enable it - # regardless of java setting. - mozconfig_annotate '' --enable-oji --enable-mathml - - # Other moz-specific settings - mozconfig_use_enable mozdevelop jsd - mozconfig_use_enable mozdevelop xpctools - mozconfig_use_extension mozdevelop venkman - mozconfig_use_enable gnome gnomevfs - mozconfig_use_extension gnome gnomevfs - mozconfig_use_extension !moznoirc irc - mozconfig_use_extension mozxmlterm xmlterm - mozconfig_use_enable mozcalendar calendar - mozconfig_use_enable ldap - mozconfig_use_enable ldap ldap-experimental - mozconfig_use_enable mozsvg svg - mozconfig_use_enable mozsvg svg-renderer-cairo - mozconfig_annotate '' --prefix=/usr/lib/mozilla - mozconfig_annotate '' --with-default-mozilla-five-home=/usr/lib/mozilla - - if use moznomail && ! use mozcalendar; then - mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews - fi - if use moznocompose && use moznomail; then - mozconfig_annotate "+moznocompose +moznomail" --disable-composer - fi - - # Finalize and report settings - mozconfig_final - - #################################### - # - # Configure and build Mozilla - # - #################################### - - # ./configure picks up the mozconfig stuff - ./configure || die "configure failed" - - # This removes extraneous CFLAGS from the Makefiles to reduce RAM - # requirements while compiling - edit_makefiles - - emake || die "emake failed" - - #################################### - # - # Build Mozilla NSS - # - #################################### - - # Build the NSS/SSL support - if use ssl; then - einfo "Building Mozilla NSS..." - - # Fix #include problem - cd ${S}/security/coreconf || die "cd coreconf failed" - echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ - >>headers.mk - emake -j1 || die "make security headers failed" - - cd ${S}/security/nss || die "cd nss failed" - emake -j1 moz_import || die "make moz_import failed" - emake -j1 || die "make nss failed" - fi - - #################################### - # - # Build Enigmail plugin - # - #################################### - - # Build the enigmail plugin - if use crypt && ! use moznomail; then - einfo "Building Enigmail plugin..." - cd ${S}/extensions/ipc || die "cd ipc failed" - emake || die "make ipc failed" - - cd ${S}/extensions/enigmail || die "cd enigmail failed" - emake || die "make enigmail failed" - fi -} - -src_install() { - # Install, don't create tarball - dodir /usr/lib - cd ${S}/xpinstall/packager - einfo "Installing mozilla into build root..." - make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed" - mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla - - einfo "Installing includes and idl files..." - # Copy the include and idl files - dodir /usr/lib/mozilla/include/idl /usr/include - cd ${S}/dist - cp -LfR include/* ${D}/usr/lib/mozilla/include - cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl - dosym /usr/lib/mozilla/include /usr/include/mozilla - - # Install the development tools in /usr - dodir /usr/bin - mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin - - # Install the NSS/SSL libs, headers and tools - if use ssl; then - einfo "Installing Mozilla NSS..." - # Install the headers ('make install' do not work for headers ...) - insinto /usr/lib/mozilla/include/nss - [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h - [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h - [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h - # These come with zlib ... - rm -f ${D}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h} - - cd ${S}/security/nss - - mkdir -p ${WORKDIR}/nss/{bin,lib} - export SOURCE_BIN_DIR=${WORKDIR}/nss/bin - export SOURCE_LIB_DIR=${WORKDIR}/nss/lib - - make install || die "make failed" - # Gets installed as symbolic links ... - cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin - cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla - - # Need to unset these incase we want to rebuild, else the build - # gets newked. - unset SOURCE_LIB_DIR - unset SOURCE_BIN_DIR - fi - - cd ${S}/build/unix - # Fix mozilla-config and install it - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config - perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config - exeinto /usr/lib/mozilla - doexe mozilla-config - # Fix pkgconfig files and install them - insinto /usr/lib/pkgconfig - for x in *.pc; do - if [[ -f ${x} ]]; then - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x} - perl -pi -e "s:/mozilla-${MY_PV}::g" ${x} - doins ${x} - fi - done - cd ${S} - - dodir /usr/bin - dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla - insinto /etc/env.d - doins ${FILESDIR}/10mozilla - dodoc LEGAL LICENSE README/mozilla/README* - - # Install rebuild script - exeinto /usr/lib/mozilla/ - doexe ${FILESDIR}/mozilla-rebuild-databases.pl - - # Move plugins dir - src_mv_plugins /usr/lib/mozilla/plugins - - # Update Google search plugin to use UTF8 charset ... - insinto /usr/lib/mozilla/searchplugins - doins ${FILESDIR}/google.src - - if [[ -f "${WORKDIR}/.xft" ]]; then - # We are using Xft, so change the default font - insinto /usr/lib/mozilla/defaults/pref - doins ${FILESDIR}/xft.js - fi - - # Fix icons to look the same everywhere - insinto /usr/lib/mozilla/icons - doins ${S}/widget/src/gtk/mozicon16.xpm - doins ${S}/widget/src/gtk/mozicon50.xpm - - # Install icon and .desktop for menu entry - insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/mozilla-icon.png - insinto /usr/share/applications - doins ${FILESDIR}/icon/mozilla.desktop - - # Take care of non root execution - # (seems the problem is that not all files are readible by the user) - einfo "Fixing Permissions..." - chmod -R g+r,o+r ${D}/usr/lib/mozilla - find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || : -} - -pkg_preinst() { - # Move old plugins dir - pkg_mv_plugins /usr/lib/mozilla/plugins - - if true; then - # Remove entire installed instance to solve various problems, - # for example see bug 27719 - rm -rf ${ROOT}/usr/lib/mozilla - else - # Stale components and chrome files break when unmerging old - rm -rf ${ROOT}/usr/lib/mozilla/components - rm -rf ${ROOT}/usr/lib/mozilla/chrome - - # Remove stale component registry. - rm -f ${ROOT}/usr/lib/mozilla/component.reg - rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat - - # Make sure these are removed. - rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so* - fi -} - -pkg_postinst() { - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - # Needed to update the run time bindings for REGXPCOM - # (do not remove next line!) - env-update - - # Register Components and Chrome - einfo "Registering Components and Chrome..." - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - - # Fix permissions of component registry - chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat - - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; - - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - # Regenerate component.reg in case some things changed - if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - fi - fi - - update_mozilla_launcher_symlinks -} diff --git a/net-www/mozilla/mozilla-1.7.3.ebuild b/net-www/mozilla/mozilla-1.7.3.ebuild deleted file mode 100644 index 56d1c79dc4a7..000000000000 --- a/net-www/mozilla/mozilla-1.7.3.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.3.ebuild,v 1.8 2004/11/13 17:14:24 plasmaroo Exp $ - -unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 -inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozilla makeedit - -IUSE="java crypt gtk2 ssl" -# Internal USE flags that I do not really want to advertise ... -IUSE="${IUSE} mozcalendar moznoirc moznomail moznocompose moznoxft" - -EMVER="0.86.0" -IPCVER="1.0.8" - -# handle _rc versions -MY_PV=${PV/_alpha/a} # handle alpha -MY_PV=${MY_PV/_beta/b} # handle beta -MY_PV=${MY_PV/_rc/rc} # handle rc - -DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" -HOMEPAGE="http://www.mozilla.org" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2 - mirror://gentoo/mozilla-1.7.2-libart_lgpl.tar.bz2 - crypt? ( !moznomail? ( - http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz - http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz - ) )" - -KEYWORDS="x86 ppc sparc alpha amd64 ia64" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -RDEPEND="java? ( virtual/jre ) - crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )" - -DEPEND="${RDEPEND} - java? ( >=dev-java/java-config-0.2.0 ) - dev-lang/perl" - -S="${WORKDIR}/mozilla" - -src_unpack() { - typeset x - - unpack ${A} || die "unpack failed" - cd ${S} || die - - if [[ $(gcc-major-version) -eq 3 ]]; then - # ABI Patch for alpha/xpcom for gcc-3.x - if [[ ${ARCH} == alpha ]]; then - epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch - fi - fi - - # Fix logic error when using RAW target - # <azarah@gentoo.org> (23 Feb 2003) - epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch - - WANT_AUTOCONF=2.1 autoconf || die - - # Unpack the enigmail plugin - if use crypt && ! use moznomail; then - for x in ipc enigmail; do - mv ${WORKDIR}/${x} ${S}/extensions || die - cd ${S}/extensions/${x} || die - makemake # from mozilla.eclass - done - - # Fix mozilla-specific ipc-1.0.7 compilation problem - # (07 Aug 2004 agriffis) - cd ${S} - epatch ${FILESDIR}/ipc-1.0.7-nsPipeChannel.patch || die - fi -} - -src_compile() { - local myconf - - #################################### - # - # myconf, CFLAGS and CXXFLAGS setup - # - #################################### - - # mozilla_conf comes from mozilla.eclass - mozilla_conf - - myconf="${myconf} \ - --prefix=/usr/lib/mozilla \ - --with-default-mozilla-five-home=/usr/lib/mozilla" - - #################################### - # - # Configure and build Mozilla - # - #################################### - - ./configure ${myconf} || die - - # This removes extraneous CFLAGS from the Makefiles to reduce RAM - # requirements while compiling - edit_makefiles - - emake || die - - #################################### - # - # Build Mozilla NSS - # - #################################### - - # Build the NSS/SSL support - if use ssl; then - einfo "Building Mozilla NSS..." - - # Fix #include problem - cd ${S}/security/coreconf || die "cd coreconf failed" - echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ - >>headers.mk - emake -j1 || die "make security headers failed" - - cd ${S}/security/nss || die "cd nss failed" - emake -j1 moz_import || die "make moz_import failed" - emake -j1 || die "make nss failed" - fi - - #################################### - # - # Build Enigmail plugin - # - #################################### - - # Build the enigmail plugin - if use crypt && ! use moznomail; then - einfo "Building Enigmail plugin..." - cd ${S}/extensions/ipc || die "cd ipc failed" - emake || die "make ipc failed" - - cd ${S}/extensions/enigmail || die "cd enigmail failed" - emake || die "make enigmail failed" - fi -} - -src_install() { - # Install, don't create tarball - dodir /usr/lib - cd ${S}/xpinstall/packager - einfo "Installing mozilla into build root..." - make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die - mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla - - einfo "Installing includes and idl files..." - # Copy the include and idl files - dodir /usr/lib/mozilla/include/idl /usr/include - cd ${S}/dist - cp -LfR include/* ${D}/usr/lib/mozilla/include - cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl - dosym /usr/lib/mozilla/include /usr/include/mozilla - - # Install the development tools in /usr - dodir /usr/bin - mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin - - # Install the NSS/SSL libs, headers and tools - if use ssl; then - einfo "Installing Mozilla NSS..." - # Install the headers ('make install' do not work for headers ...) - insinto /usr/lib/mozilla/include/nss - [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h - [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h - [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h - # These come with zlib ... - rm -f ${D}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h} - - cd ${S}/security/nss - - mkdir -p ${WORKDIR}/nss/{bin,lib} - export SOURCE_BIN_DIR=${WORKDIR}/nss/bin - export SOURCE_LIB_DIR=${WORKDIR}/nss/lib - - make install || die - # Gets installed as symbolic links ... - cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin - cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla - - # Need to unset these incase we want to rebuild, else the build - # gets newked. - unset SOURCE_LIB_DIR - unset SOURCE_BIN_DIR - fi - - cd ${S}/build/unix - # Fix mozilla-config and install it - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config - perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config - exeinto /usr/lib/mozilla - doexe mozilla-config - # Fix pkgconfig files and install them - insinto /usr/lib/pkgconfig - for x in *.pc; do - if [[ -f ${x} ]]; then - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x} - perl -pi -e "s:/mozilla-${MY_PV}::g" ${x} - doins ${x} - fi - done - cd ${S} - - dodir /usr/bin - dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla - insinto /etc/env.d - doins ${FILESDIR}/10mozilla - dodoc LEGAL LICENSE README/mozilla/README* - - # Install rebuild script - exeinto /usr/lib/mozilla/ - doexe ${FILESDIR}/mozilla-rebuild-databases.pl - - # Move plugins dir - src_mv_plugins /usr/lib/mozilla/plugins - - # Update Google search plugin to use UTF8 charset ... - insinto /usr/lib/mozilla/searchplugins - doins ${FILESDIR}/google.src - - if [[ -f "${WORKDIR}/.xft" ]]; then - # We are using Xft, so change the default font - insinto /usr/lib/mozilla/defaults/pref - doins ${FILESDIR}/xft.js - fi - - # Fix icons to look the same everywhere - insinto /usr/lib/mozilla/icons - doins ${S}/widget/src/gtk/mozicon16.xpm - doins ${S}/widget/src/gtk/mozicon50.xpm - - # Install icon and .desktop for menu entry - insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/mozilla-icon.png - insinto /usr/share/applications - doins ${FILESDIR}/icon/mozilla.desktop - - # Take care of non root execution - # (seems the problem is that not all files are readible by the user) - einfo "Fixing Permissions..." - chmod -R g+r,o+r ${D}/usr/lib/mozilla - find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || : -} - -pkg_preinst() { - # Move old plugins dir - pkg_mv_plugins /usr/lib/mozilla/plugins - - if true; then - # Remove entire installed instance to solve various problems, - # for example see bug 27719 - rm -rf ${ROOT}/usr/lib/mozilla - else - # Stale components and chrome files break when unmerging old - rm -rf ${ROOT}/usr/lib/mozilla/components - rm -rf ${ROOT}/usr/lib/mozilla/chrome - - # Remove stale component registry. - rm -f ${ROOT}/usr/lib/mozilla/component.reg - rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat - - # Make sure these are removed. - rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so* - fi -} - -pkg_postinst() { - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - # Needed to update the run time bindings for REGXPCOM - # (do not remove next line!) - env-update - - # Register Components and Chrome - einfo "Registering Components and Chrome..." - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - - # Fix permissions of component registry - chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat - - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; - - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - # Regenerate component.reg in case some things changed - if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - fi - fi - - update_mozilla_launcher_symlinks -} diff --git a/net-www/mozilla/mozilla-1.7.5.ebuild b/net-www/mozilla/mozilla-1.7.5.ebuild index 617cb7e311dd..dfe7f83d454d 100644 --- a/net-www/mozilla/mozilla-1.7.5.ebuild +++ b/net-www/mozilla/mozilla-1.7.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.5.ebuild,v 1.9 2005/01/02 11:54:13 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.5.ebuild,v 1.10 2005/01/24 19:41:35 agriffis Exp $ unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit @@ -23,7 +23,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/s http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz ) )" -KEYWORDS="x86 ppc sparc alpha amd64 ~ia64 hppa" +KEYWORDS="x86 ppc sparc alpha amd64 ia64 hppa" SLOT="0" LICENSE="MPL-1.1 NPL-1.1" diff --git a/net-www/mozilla/mozilla-1.7.ebuild b/net-www/mozilla/mozilla-1.7.ebuild deleted file mode 100644 index e89aed7f7c40..000000000000 --- a/net-www/mozilla/mozilla-1.7.ebuild +++ /dev/null @@ -1,576 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.ebuild,v 1.15 2004/11/01 01:17:29 vapier Exp $ - -IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint" -# Internal USE flags that I do not really want to advertise ... -IUSE="${IUSE} mozcalendar mozsvg" -IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft" - -unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 -inherit flag-o-matic gcc eutils nsplugins - -EMVER="0.84.1" -IPCVER="1.0.6" - -# handle _rc versions -MY_PV=${PV/_alpha/a} # handle alpha -MY_PV=${MY_PV/_beta/b} # handle beta -MY_PV=${MY_PV/_rc/rc} # handle rc - -DESCRIPTION="The Mozilla Application Suite - web browser, email, HTML editor, IRC" -HOMEPAGE="http://www.mozilla.org" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2 - crypt? ( !moznomail? ( - http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz - mirror://gentoo/enigmail-${EMVER}-r1.tar.gz - ) )" -# Normally the following would be used instead of the mirror://gentoo/ -# reference above, but the upstream source tarball changed without -# changing the filename. (17 Jun 2004 agriffis) -# http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz - -KEYWORDS="x86 ~ppc sparc ~alpha amd64 ~ia64" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -RDEPEND="virtual/x11 - >=sys-libs/zlib-1.1.4 - >=media-libs/fontconfig-2.1 - !moznoxft? ( virtual/xft ) - >=media-libs/jpeg-6b - >=media-libs/libpng-1.2.1 - >=sys-apps/portage-2.0.14 - dev-libs/expat - app-arch/zip - app-arch/unzip - gtk2? ( - >=x11-libs/gtk+-2.2.0 - >=dev-libs/glib-2.2.0 - >=x11-libs/pango-1.2.1 - >=dev-libs/libIDL-0.8.0 ) - !gtk2? ( - =x11-libs/gtk+-1.2* - =dev-libs/glib-1.2* - =gnome-base/orbit-0* ) - java? ( virtual/jre ) - crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) ) - gnome? ( >=gnome-base/gnome-vfs-2.3.5 ) - >=net-www/mozilla-launcher-1.7-r1" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-lang/perl - java? ( >=dev-java/java-config-0.2.0 )" - -S="${WORKDIR}/mozilla" - -pkg_setup() { - # needed by src_compile() and src_install() - export MOZILLA_OFFICIAL=1 - export BUILD_OFFICIAL=1 - - # make sure the nss module gets build (for NSS support) - if use ssl; then - export MOZ_PSM="1" - fi -} - -# Simulate the silly csh makemake script -makemake() { - typeset m topdir - - for m in $(find . -name Makefile.in); do - topdir=$(echo "$m" | sed -r 's:[^/]+:..:g') - sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \ - < ${m} > ${m%.in} || die "sed ${m} failed" - done -} - -src_unpack() { - typeset x - - unpack ${A} || die "unpack failed" - cd ${S} || die - - if [[ $(gcc-major-version) -eq 3 ]]; then - # ABI Patch for alpha/xpcom for gcc-3.x - if [[ ${ARCH} == alpha ]]; then - epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch - fi - # unecessary now, already in the source - # Danny van Dyk <kugelfang@gentoo.org> 2004/06/20 - #if [[ ${ARCH} == amd64 ]]; then - # epatch ${FILESDIR}/${PN}-1.7-amd64.patch - #fi - fi - - epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2 - - # Fix logic error when using RAW target - # <azarah@gentoo.org> (23 Feb 2003) - epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch - - # Fix incorrect version in milestone.txt (1.7rc1 claims 1.7b) - # If 1.7rc2 is anything to go by, then milestone.txt should report - # the upcoming version number, e.g. 1.7 - local old_milestone=$(grep '^[0-9]' config/milestone.txt) - if [[ ${old_milestone} != ${PV%_*} ]]; then - einfo "Updating milestone.txt from ${old_milestone} to ${PV%_*}" - sed -i -ne '/^#/p' config/milestone.txt # maintain comments - echo "${PV%_*}" >> config/milestone.txt # add version line - fi - - WANT_AUTOCONF=2.1 autoconf &> /dev/null - - # Unpack the enigmail plugin - if use crypt && ! use moznomail; then - for x in ipc enigmail; do - mv ${WORKDIR}/${x} ${S}/extensions || die - cd ${S}/extensions/${x} || die - makemake # see function above - done - - # Fix ipc-1.0.6 compilation problem by updating line from cvs - # (09 Jun 2004 agriffis) - cd ${S}/extensions/ipc - epatch ${FILESDIR}/ipc-1.0.6-nsPipeChannel.patch - fi -} - -src_compile() { - #################################### - # - # myconf setup - # - #################################### - - local myconf - - # NOTE: QT and XLIB toolkit seems very unstable, leave disabled until - # tested ok -- azarah - if use gtk2; then - myconf="${myconf} - --enable-toolkit-gtk2 \ - --enable-default-toolkit=gtk2 \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --disable-toolkit-gtk" - else - myconf="${myconf} - --enable-toolkit-gtk \ - --enable-default-toolkit=gtk \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --disable-toolkit-gtk2" - fi - - if ! use debug; then - myconf="${myconf} \ - --disable-debug \ - --disable-tests \ - --enable-reorder \ - --enable-strip \ - --enable-strip-libs" -# --enable-cpp-rtti" - - # Currently --enable-elf-dynstr-gc only works for x86 and ppc, - # thanks to Jason Wever <weeve@gentoo.org> for the fix. - if use x86 || use ppc; then - myconf="${myconf} --enable-elf-dynstr-gc" - fi - fi - - # Check if we should enable Xft support ... - if ! use moznoxft; then - if use gtk2; then - local pango_version="" - - # We need Xft2.0 localy installed - if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then - pango_version=$(pkg-config --modversion pango | cut -d. -f1,2) - - # We also need pango-1.1, else Mozilla links to both - # Xft1.1 *and* Xft2.0, and segfault... - if [[ ${pango_version//.} -gt 10 ]]; then - einfo "Building with Xft2.0 (Gtk+-2.0) support" - myconf="${myconf} --enable-xft --disable-freetype2" - touch ${WORKDIR}/.xft - else - ewarn "Building without Xft2.0 support (bad pango)" - myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" - fi - else - ewarn "Building without Xft2.0 support (no pkg-config xft)" - myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" - fi - else - einfo "Building with Xft2.0 (Gtk+-1.0) support" - myconf="${myconf} --enable-xft --disable-freetype2" - touch ${WORKDIR}/.xft - fi - else - einfo "Building without Xft2.0 support (moznoxft)" - myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" - fi - - # Re-enabled per bug 24522 (28 Apr 2004 agriffis) - if use mozsvg; then - export MOZ_INTERNAL_LIBART_LGPL=1 - myconf="${myconf} --enable-svg --enable-svg-renderer-libart" - else - myconf="${myconf} --disable-svg" - fi - - if use moznomail && ! use mozcalendar; then - myconf="${myconf} --disable-mailnews" - fi - if use moznocompose && use moznomail; then - myconf="${myconf} --disable-composer" - fi - - #################################### - # - # myext setup - # - #################################### - - # The defaults are: - # cookie wallet content-packs xml-rpc xmlextras help p3p pref - # transformiix venkman inspector irc universalchardet - # typeaheadfind webservices spellcheck - # Non-defaults are: - # xmlterm access-builtin datetime finger cview - - # Remove access and xmlterm as options since they're preventing the build - # more than they work. (04 Jul 2004 brad) - #if use mozxmlterm || use mozaccess; then - # ewarn "" - # ewarn "NB!!: The use of the non-default extensions is considered" - # ewarn "unsupported, and these may not always compile properly." - # ewarn "Please do not use if you do not know what you're doing!" - # ewarn "" - # sleep 3 - #fi - - local myext="default" - #use mozxmlterm && myext="${myext},xmlterm" - #use mozaccess && myext="${myext},access-builtin" - use moznoirc && myext="${myext},-irc" - - #################################### - # - # CFLAGS setup and ARCH support - # - #################################### - - # Set optimization level based on CFLAGS - if is-flag -O0; then - enable_optimize=-O0 - elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then - # Anything more than this causes segfaults on startup on 64-bit - # (bug 33767) - enable_optimize=-O1 - append-flags -fPIC - elif is-flag -O1; then - enable_optimize=-O1 - else - enable_optimize=-O2 - fi - - # Now strip optimization from CFLAGS so it doesn't end up in the - # compile string - filter-flags '-O*' - - # Strip over-aggressive CFLAGS - Mozilla supplies its own - # fine-tuned CFLAGS and shouldn't be interfered with.. Do this - # AFTER setting optimization above since strip-flags only allows - # -O -O1 and -O2 - strip-flags - - # Who added the following line and why? It doesn't really hurt - # anything, but is it necessary?? (28 Apr 2004 agriffis) - append-flags -fforce-addr - - # Additional ARCH support - case "${ARCH}" in - alpha) - # Mozilla won't link with X11 on alpha, for some crazy reason. - # set it to link explicitly here. - sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \ - ${S}/gfx/src/gtk/Makefile.in - ;; - - ppc) - # Fix to avoid gcc-3.3.x micompilation issues. - if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then - append-flags -fno-strict-aliasing - fi - ;; - - sparc) - # Sparc support ... - replace-sparc64-flags - ;; - - x86) - if [[ $(gcc-major-version) -eq 3 ]]; then - # gcc-3 prior to 3.2.3 doesn't work well for pentium4 - # see bug 25332 - if [[ $(gcc-minor-version) -lt 2 || - ( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]] - then - replace-flags -march=pentium4 -march=pentium3 - filter-flags -msse2 - fi - # Enable us to use flash, etc plugins compiled with gcc-2.95.3 - myconf="${myconf} --enable-old-abi-compat-wrappers" - fi - ;; - esac - - # Needed to build without warnings on gcc-3 - CXXFLAGS="${CXXFLAGS} -Wno-deprecated" - - #################################### - # - # Configure and build Mozilla - # - #################################### - - export BUILD_MODULES=all - export BUILD_OPT=1 - - cd ${S} - einfo "Configuring Mozilla..." - ./configure --prefix=/usr/lib/mozilla \ - --with-system-jpeg \ - --with-system-mng \ - --with-system-png \ - --with-system-zlib \ - $(use_enable gnome gnomevfs) \ - $(use_enable ipv6) \ - $(use_enable ldap) \ - $(use_enable mozcalendar calendar) \ - $(use_enable xprint) \ - $(use_enable xinerama) \ - --disable-pedantic \ - --disable-short-wchar \ - --enable-mathml \ - --without-system-nspr \ - --enable-nspr-autoconf \ - --enable-xsl \ - --enable-crypto \ - --enable-extensions="${myext}" \ - --enable-optimize="${enable_optimize}" \ - --with-default-mozilla-five-home=/usr/lib/mozilla \ - ${myconf} || die - - einfo "Building Mozilla..." - make WORKDIR="${WORKDIR}" || die - - #################################### - # - # Build Mozilla NSS - # - #################################### - - # Build the NSS/SSL support - if use ssl; then - einfo "Building Mozilla NSS..." - - # Fix #include problem - cd ${S}/security/coreconf || die "cd coreconf failed" - echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ - >>headers.mk - make || die "make security headers failed" - - cd ${S}/security/nss || die "cd nss failed" - make moz_import || die "make moz_import failed" - make || die "make nss failed" - fi - - #################################### - # - # Build Enigmail plugin - # - #################################### - - # Build the enigmail plugin - if use crypt && ! use moznomail; then - einfo "Building Enigmail plugin..." - cd ${S}/extensions/ipc || die "cd ipc failed" - make || die "make ipc failed" - - cd ${S}/extensions/enigmail || die "cd enigmail failed" - make || die "make enigmail failed" - fi -} - -src_install() { - # Install, don't create tarball - dodir /usr/lib - cd ${S}/xpinstall/packager - einfo "Installing mozilla into build root..." - make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die - mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla - - einfo "Installing includes and idl files..." - # Copy the include and idl files - dodir /usr/lib/mozilla/include/idl /usr/include - cd ${S}/dist - cp -LfR include/* ${D}/usr/lib/mozilla/include - cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl - dosym /usr/lib/mozilla/include /usr/include/mozilla - - # Install the development tools in /usr - dodir /usr/bin - mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin - - # Install the NSS/SSL libs, headers and tools - if use ssl; then - einfo "Installing Mozilla NSS..." - # Install the headers ('make install' do not work for headers ...) - insinto /usr/lib/mozilla/include/nss - [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h - [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h - [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h - # These come with zlib ... - rm -f ${D}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h} - - cd ${S}/security/nss - - mkdir -p ${WORKDIR}/nss/{bin,lib} - export BUILD_OPT=1 - export SOURCE_BIN_DIR=${WORKDIR}/nss/bin - export SOURCE_LIB_DIR=${WORKDIR}/nss/lib - - make install || die - # Gets installed as symbolic links ... - cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin - cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla - - # Need to unset these incase we want to rebuild, else the build - # gets newked. - unset SOURCE_LIB_DIR - unset SOURCE_BIN_DIR - fi - - cd ${S}/build/unix - # Fix mozilla-config and install it - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config - perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config - exeinto /usr/lib/mozilla - doexe mozilla-config - # Fix pkgconfig files and install them - insinto /usr/lib/pkgconfig - for x in *.pc; do - if [[ -f ${x} ]]; then - perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x} - perl -pi -e "s:/mozilla-${MY_PV}::g" ${x} - doins ${x} - fi - done - cd ${S} - - dodir /usr/bin - dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla - insinto /etc/env.d - doins ${FILESDIR}/10mozilla - dodoc LEGAL LICENSE README/mozilla/README* - - # Install rebuild script - exeinto /usr/lib/mozilla/ - doexe ${FILESDIR}/mozilla-rebuild-databases.pl - - # Move plugins dir - src_mv_plugins /usr/lib/mozilla/plugins - - # Update Google search plugin to use UTF8 charset ... - insinto /usr/lib/mozilla/searchplugins - doins ${FILESDIR}/google.src - - if [[ -f "${WORKDIR}/.xft" ]]; then - # We are using Xft, so change the default font - insinto /usr/lib/mozilla/defaults/pref - doins ${FILESDIR}/xft.js - fi - - # Fix icons to look the same everywhere - insinto /usr/lib/mozilla/icons - doins ${S}/widget/src/gtk/mozicon16.xpm - doins ${S}/widget/src/gtk/mozicon50.xpm - - # Install icon and .desktop for menu entry - if use gnome; then - insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/mozilla-icon.png - - insinto /usr/share/applications - doins ${FILESDIR}/icon/mozilla.desktop - fi - - # Take care of non root execution - # (seems the problem is that not all files are readible by the user) - einfo "Fixing Permissions..." - chmod -R g+r,o+r ${D}/usr/lib/mozilla - find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || : -} - -pkg_preinst() { - # Move old plugins dir - pkg_mv_plugins /usr/lib/mozilla/plugins - - if true; then - # Remove entire installed instance to solve various problems, - # for example see bug 27719 - rm -rf ${ROOT}/usr/lib/mozilla - else - # Stale components and chrome files break when unmerging old - rm -rf ${ROOT}/usr/lib/mozilla/components - rm -rf ${ROOT}/usr/lib/mozilla/chrome - - # Remove stale component registry. - rm -f ${ROOT}/usr/lib/mozilla/component.reg - rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat - - # Make sure these are removed. - rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so* - fi -} - -pkg_postinst() { - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - # Needed to update the run time bindings for REGXPCOM - # (do not remove next line!) - env-update - - # Register Components and Chrome - einfo "Registering Components and Chrome..." - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - - # Fix permissions of component registry - chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat - - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || : - - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || : -} - -pkg_postrm() { - # Regenerate component.reg in case some things changed - if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla" - - if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then - ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl - # Fix directory permissions - find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; - # Fix permissions on chrome files - find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; - fi - fi -} |