diff options
| author |   Brad Laue <brad@gentoo.org> | 2004-02-19 06:02:30 +0000 |
|---|---|---|
| committer | Brad Laue <brad@gentoo.org> | 2004-02-19 06:02:30 +0000 |
| commit | b61d1edeaf436522c3465cf881e78c28b1b4f979 (patch) | |
| tree | 77fffa755944c1b13ecdbfa38b8631c6d1a49ca4 /net-www | |
| parent | Add dependency on pkgconfig (Manifest recommit) (diff) | |
| download | gentoo-2-b61d1edeaf436522c3465cf881e78c28b1b4f979.tar.gz gentoo-2-b61d1edeaf436522c3465cf881e78c28b1b4f979.tar.bz2 gentoo-2-b61d1edeaf436522c3465cf881e78c28b1b4f979.zip | |
Remove mozilla-firebird
Diffstat (limited to 'net-www')
18 files changed, 0 insertions, 2975 deletions
diff --git a/net-www/mozilla-firebird/ChangeLog b/net-www/mozilla-firebird/ChangeLog deleted file mode 100644 index 605260c1935b..000000000000 --- a/net-www/mozilla-firebird/ChangeLog +++ /dev/null @@ -1,178 +0,0 @@ -# ChangeLog for net-www/mozilla-firebird -# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/ChangeLog,v 1.39 2004/02/15 16:22:01 brad Exp $ - - 15 Feb 2004; Brad Laue <brad@gentoo.org> files/MozillaFirebird: - Set the default launch method of the MozillaFirebird script to window, as this - is more expected behaviour when comparing Firebird on Linux to Firebird on - other platforms. - - 12 Feb 2004; Aron Griffis <agriffis@gentoo.org> files/MozillaFirebird: - Fix bug 41074 by allowing multiple urls and url|url syntax - - 07 Feb 2004; Aron Griffis <agriffis@gentoo.org> files/MozillaFirebird: - Fix bug 39797 by scanning for Firebirds running on attached screens prior to - calling mozilla-xremote-client - -*mozilla-firebird-0.7-r2 (06 Feb 2004) - - 06 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-firebird-0.7-r2.ebuild, - files/10MozillaFirebird, files/MozillaFirebird: - Add LDPATH to /usr/lib/MozillaFirebird, closes numerous bugs. - - 02 Feb 2004; Brad Laue <brad@gentoo.org> files/MozillaFirebird: - Add LDPATH to the launch script to correct library errors. - - 27 Jan 2004; Aron Griffis <agriffis@gentoo.org> files/MozillaFirebird: - Update files/MozillaFirebird to handle the case when Thunderbird is running. - Thanks to Denys Dmytriyenko in bug 38102 - - 27 Jan 2004; Aron Griffis <agriffis@gentoo.org> - mozilla-firebird-0.7-r1.ebuild: - stable on alpha and ia64 - - 21 Jan 2004; Aron Griffis <agriffis@gentoo.org> files/MozillaFirebird: - Use full path to xdpyinfo which can help when executing MozillaFirebird via ssh - - 14 Jan 2004; Aron Griffis <agriffis@gentoo.org> files/MozillaFirebird: - Use more powerful MozillaFirebird startup script from bug 38102. Not doing a - rev-bump since it's not really necessary to make everybody rebuild for this - - 25 Dec 2003; Sven Blumenstein <bazik@gentoo.org> - mozilla-firebird-0.7-r1.ebuild: - Marked stable on sparc (was about time ;) ). - - 14 Dec 2003; Lars Weiler <pylon@gentoo.org> mozilla-firebird-0.7.ebuild: - Make stable on ppc - -*mozilla-firebird-0.7-r1 (09 Dec 2003) - - 09 Dec 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.7-r1.ebuild, - files/xremote-client-cvs.patch: - Introduce patches to xremote-client for compatibility with Mozilla - Thunderbird's URL handler - will be included in a future release of Mozilla - Firebird. - - To set Firebird as Thunderbird's URL handler for http://, make MozillaFirebird - the default browser under GNOME, or add: - - user_pref("network.protocol-handler.app.http", "/usr/bin/MozillaFirebird"); - - 05 Dec 2003; <agriffis@gentoo.org> mozilla-firebird-0.7.ebuild: - Stable on ia64 - - 01 Dec 2003; Aron Griffis <agriffis@gentoo.org> mozilla-firebird-0.7.ebuild: - Stable on alpha - - 21 Nov 2003; Aron Griffis <agriffis@gentoo.org> mozilla-firebird-0.7.ebuild: - Change architecture-specific stuff again, trying to clean it up - - 18 Nov 2003; Luca Barbato <lu_zero@gentoo.org> mozilla-firebird-0.7.ebuild: - Filtered another problematic flag - - 16 Nov 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.7.ebuild: - Moving 0.7 to the x86 keyword. - - 13 Nov 2003; Brad House <brad_mssw@gentoo.org> mozilla-firebird-0.7.ebuild, - files/mozilla-firebird-amd64.patch: - amd64 patch by augustus@linuxhardware.org - - 12 Nov 2003; Sven Blumenstein <bazik@gentoo.org> - mozilla-firebird-0.7.ebuild: - Moved back to ~sparc, closes bug #32381. Thanks - to all testers! - - 31 Oct 2003; Sven Blumenstein <bazik@gentoo.org> - mozilla-firebird-0.7.ebuild: - Masked 0.7 as its not working on sparc - -*mozilla-firebird-0.7 (17 Oct 2003) - - 17 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.7.ebuild: - Introducing Mozilla Firebird 0.7 - warm up your compilers! - - 12 Sep 2003; Luca Barbato <lu_zero@gentoo.org> mozilla-firebird-0.6.1.ebuild: - Added a ppc related fix - - 27 Aug 2003; Aron Griffis <agriffis@gentoo.org> - mozilla-firebird-0.6.1.ebuild: - Mark stable on alpha - - 18 Aug 2003; Jason Wever <weeve@gentoo.org> mozilla-firebird-0.6.1.ebuild: - Marked stable for sparc - - 03 Aug 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6.1.ebuild: - Add fixes for chrome errors on upgrading firebird. - - 01 Aug 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r5.ebuild, - mozilla-firebird-0.6-r6.ebuild, mozilla-firebird-0.6-r7.ebuild, - mozilla-firebird-0.6.1.ebuild: - Properly add gnome to IUSE, fix the GNOME menu icon. - -*mozilla-firebird-0.6.1 (29 Jul 2003) - - 29 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6.1.ebuild: - Version bump - -*mozilla-firebird-0.6-r7 (25 Jul 2003) - - 25 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r7.ebuild: - By popular request, implement the moznoxft USE flag. - - 19 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r6.ebuild: - Mark stable on x86. Bugs fixed: - - - -ffast-math is now filtered out, clears preferences bug - - Builds properly without chatzilla and other such bloat - - Builds on 2.6 kernels (see previous entry) - - 18 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r6.ebuild: - Build fix on 2.6 series kernels. - -*mozilla-firebird-0.6-r6 (03 Jul 2003) - - 03 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r6.ebuild: - Filter out -ffast-math in order to close an upstream bug; refer to bug 23833. - - 26 Jun 2003; Tavis Ormandy <taviso@gentoo.org> - mozilla-firebird-0.6-r5.ebuild: - marking ~alpha, needs minor patch so added a minimal src_unpack() - - 20 Jun 2003; Jason Wever <weeve@gentoo.org> mozilla-firebird-0.6-r5.ebuild: - Changed ~sparc keyword to sparc. - - 08 Jun 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r5.ebuild: - Mark stable on x86 - -*mozilla-firebird-0.6-r5 (08 Jun 2003) - - 08 Jun 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r5.ebuild: - Strip -msse2 out of the build if this is a Pentium4 and we're using GCC 3.2.x. - Otherwise, build will fail with a messy assembly error. - -*mozilla-firebird-0.6-r4 (08 Jun 2003) - - 08 Jun 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r4.ebuild: - This revision adds an item to the GNOME applications menu, per bug 22388. - Thanks to Don Goss for testing. - -*mozilla-firebird 0.6-r3 (04 June 2003) - - 04 June 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r3.ebuild : - Correctly symlink PLUGINS_DIR to /usr/lib/nsbrowser/plugins - -*mozilla-firebird 0.6-r2 (03 June 2003) - - 03 June 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r2.ebuild : - - Remove bad dependency on dev-util/cvs - -*mozilla-firebird 0.6-r1 (03 June 2003) - - 03 June 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r1.ebuild : - - Change not depends from !net-www/MozillaFirebird-bin to !net-www/mozilla-firebird-bin - - Add headers to the ebuilds, ChangeLog file - -*mozilla-firebird 0.6 (02 June 2003) - - 02 June 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6.ebuild : - Initial import, based on ideas taken from phoenix-cvs, bug 21216 and others. diff --git a/net-www/mozilla-firebird/Manifest b/net-www/mozilla-firebird/Manifest deleted file mode 100644 index 2772d4b82b22..000000000000 --- a/net-www/mozilla-firebird/Manifest +++ /dev/null @@ -1,17 +0,0 @@ -MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 -MD5 640e135f0a6f9fe2207fe8adbb951464 mozilla-firebird-0.7.ebuild 7596 -MD5 087fd6c01c43129eb80bf7f0ebe399fa mozilla-firebird-0.7-r1.ebuild 7741 -MD5 4c27694d99a8b1e6cf6bead88c3ad87d mozilla-firebird-0.6-r7.ebuild 6755 -MD5 0f894b8cae6442e50840c8c996a0909a mozilla-firebird-0.6.1.ebuild 6878 -MD5 af3c90cb0c961cd3d8af7501e56bf722 mozilla-firebird-0.7-r2.ebuild 7798 -MD5 f74fc3ca37e24003d81cd98d3de5c7f1 ChangeLog 6949 -MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646 -MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r7 81 -MD5 49802181a2284102bb2ed6daab129bb5 files/digest-mozilla-firebird-0.6.1 83 -MD5 d6389059d144d92d25b21b5cb3727cb0 files/digest-mozilla-firebird-0.7 80 -MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052 -MD5 091c7da0a8cd5585af96a36d65d6c2c7 files/xremote-client-cvs.patch 6759 -MD5 d6389059d144d92d25b21b5cb3727cb0 files/digest-mozilla-firebird-0.7-r1 80 -MD5 f30cb03ddbb712e49425bcaa150dc854 files/10MozillaFirebird 32 -MD5 d6389059d144d92d25b21b5cb3727cb0 files/digest-mozilla-firebird-0.7-r2 80 -MD5 89fc7610941f70423dd7c477aff963a4 files/MozillaFirebird 3572 diff --git a/net-www/mozilla-firebird/files/10MozillaFirebird b/net-www/mozilla-firebird/files/10MozillaFirebird deleted file mode 100644 index bc73e32ef3e2..000000000000 --- a/net-www/mozilla-firebird/files/10MozillaFirebird +++ /dev/null @@ -1 +0,0 @@ -LDPATH=/usr/lib/MozillaFirebird diff --git a/net-www/mozilla-firebird/files/MozillaFirebird b/net-www/mozilla-firebird/files/MozillaFirebird deleted file mode 100644 index 30d9c6c7dabc..000000000000 --- a/net-www/mozilla-firebird/files/MozillaFirebird +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash -# -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/files/MozillaFirebird,v 1.8 2004/02/15 16:22:01 brad Exp $ - -# Set MOZILLA_NEWTYPE to "window" in your environment if you prefer -# new Firebird windows instead of new tabs -newtype=${MOZILLA_NEWTYPE:-"window"} - -# Point this to your Firebird installation if not using the default -export MOZILLA_FIVE_HOME="/usr/lib/MozillaFirebird" -fbpath=${MOZILLA_FIVE_HOME} - -# Sanity check -if [[ -z $DISPLAY ]]; then - echo "DISPLAY is unset!" >&2 - exit 1 -fi - -# Validate the args and extract the urls -args=() -urls=() -while [[ $# -ne 0 ]] ; do - if [[ $1 == -* ]] ; then - case "${1#-}" in - height|width|CreateProfile|P|UILocale|contentLocale|remote|edit|chrome) - args=("${args[@]}" "$1" "$2") - shift 2 ;; - *) - args=("${args[@]}" "$1") - shift 1 ;; - esac - else - urls=("${urls[@]}" $1) - shift - fi -done - -# Try to start in an existing session; check all screens -declare -a screens=( - $(/usr/X11R6/bin/xdpyinfo | awk ' - /^name of display:/ { - disp = substr($NF, 0, index($NF, ".")-1) - } - /^number of screens:/ { - for (i = 0; i < $NF; i++) printf("%s.%d\n", disp, i) - }') - ) - -# Attempt to fix bug 39797 by making sure MozillaFirebird is running -# on the DISPLAY prior to calling mozilla-xremote-client. The -# problem here is that mozilla-xremote-client will return a zero -# exit status if it contacts a Thunderbird-0.3 instance, even though -# Thunderbird can't handle the openURL request. :-( -# -# Note: This seems to be fixed with Thunderbird-0.4, which rejects the -# openURL request appropriately. -declare -a candidates=() -for s in $DISPLAY "${screens[@]}"; do - if DISPLAY=${s} xwininfo -root -tree | grep -q 'MozillaFirebird-bin'; then - candidates=("${candidates[@]}" ${s}) - fi -done - -# Make sure we'll get at least an empty window/tab -[[ ${#urls[@]} == 0 ]] && urls=('') - -# Handle multiple URLs by looping over the xremote call -for u in "${urls[@]}"; do - - # prepend http:// if needed - [[ $u == ? && $u != *:* ]] && u=http://$u - - # try mozila-xremote-client on each candidate screen - if [[ ${#candidates[@]} > 0 ]]; then - for s in "${candidates[@]}"; do - DISPLAY=${s} \ - ${fbpath}/mozilla-xremote-client "openURL($u, new-$newtype)" \ - && break - done - retval=$? - else - # simulate mozilla-xremote-client's response when it can't find an instance - retval=2 - fi - - # 2 = No running windows found, so start a new instance - # 3 = Thunderbird is running, but doesn't handle openURL command - # (or it might be an unresponsive Firebird) - if [[ $retval -eq 2 || $retval -eq 3 ]] ; then - - # Handle case of multiple URLs - if [[ ${#urls[@]} > 1 ]]; then - ${fbpath}/MozillaFirebird "${args[@]}" "$u" & - if [[ -x /usr/bin/xtoolwait ]]; then - xtoolwait sleep 10 - else - sleep 10 # totally arbitrary! :-( - fi - candidates=$DISPLAY - continue - fi - - # Handle case of single URL - ${fbpath}/MozillaFirebird "${args[@]}" "$u" & - break - - elif [[ $retval -eq 1 ]]; then - echo "Unable to connect to X server" >&2 - elif [[ $retval -ne 0 ]]; then - echo "Unknown error $retval from mozilla-xremote-client" >&2 - fi - -done - -# Will only wait here if MozillaFirebird was started by this script -if ! wait; then - retval=$? - echo "MozillaFirebird exited with non-zero status ($?)" >&2 -fi - -exit $retval - -# vim:expandtab sw=2: diff --git a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6-r7 b/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6-r7 deleted file mode 100644 index 7c8e90ff1655..000000000000 --- a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6-r7 +++ /dev/null @@ -1 +0,0 @@ -MD5 de52dd03f8628724f14f517cd6346755 MozillaFirebird-0.6-source.tar.bz2 31992582 diff --git a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6.1 b/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6.1 deleted file mode 100644 index 5484e9f71097..000000000000 --- a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 35191de0d02601f7a190b5065a26de85 MozillaFirebird-source-0.6.1.tar.bz2 29793828 diff --git a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.7 b/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.7 deleted file mode 100644 index 76859698194a..000000000000 --- a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 35112566a3dca5bdf363972056afc462 MozillaFirebird-source-0.7.tar.gz 38758572 diff --git a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.7-r1 b/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.7-r1 deleted file mode 100644 index 76859698194a..000000000000 --- a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.7-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 35112566a3dca5bdf363972056afc462 MozillaFirebird-source-0.7.tar.gz 38758572 diff --git a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.7-r2 b/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.7-r2 deleted file mode 100644 index 76859698194a..000000000000 --- a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.7-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 35112566a3dca5bdf363972056afc462 MozillaFirebird-source-0.7.tar.gz 38758572 diff --git a/net-www/mozilla-firebird/files/mozilla-1.3-alpha-stubs.patch b/net-www/mozilla-firebird/files/mozilla-1.3-alpha-stubs.patch deleted file mode 100644 index 3aa192be9246..000000000000 --- a/net-www/mozilla-firebird/files/mozilla-1.3-alpha-stubs.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -Naur mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2001-09-28 15:12:51.000000000 -0500 -+++ mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2003-03-18 09:50:06.000000000 -0600 -@@ -20,6 +20,7 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Glen Nakamura <glen@imodulo.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -37,8 +38,6 @@ - - /* Platform specific code to invoke XPCOM methods on native objects */ - --/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -- - #include "xptcprivate.h" - - /* Prototype specifies unmangled function name and disables unused warning */ -@@ -163,7 +162,11 @@ - "bis $16,$16,$1\n\t" /* load "this" */ - "ldq $2,16($15)\n\t" /* load "methodIndex" */ - "ldq $1,0($1)\n\t" /* load vtable */ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ "s8addq $2,$31,$2\n\t" /* vtable index = "methodIndex" * 8 */ -+#else /* not G++ V3 ABI */ - "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#endif /* G++ V3 ABI */ - "addq $1,$2,$1\n\t" - "ldq $27,0($1)\n\t" /* load address of function */ - "jsr $26,($27),0\n\t" /* call virtual function */ -@@ -176,4 +179,3 @@ - "ret $31,($26),1\n\t" - ".end XPTC_InvokeByIndex" - ); -- -diff -Naur mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2001-09-28 15:12:52.000000000 -0500 -+++ mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2003-03-18 09:50:06.000000000 -0600 -@@ -20,6 +20,7 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Glen Nakamura <glen@imodulo.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -37,8 +38,6 @@ - - /* Implement shared vtbl methods. */ - --/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -- - #include "xptcprivate.h" - - /* Prototype specifies unmangled function name and disables unused warning */ -@@ -188,23 +187,45 @@ - * nsresult nsXPTCStubBase::Stub##n() - * Sets register $1 to "methodIndex" and jumps to SharedStub. - */ -+#define STUB_MANGLED_ENTRY(n, symbol) \ -+ "#### Stub"#n" ####" "\n\t" \ -+ ".text" "\n\t" \ -+ ".align 5" "\n\t" \ -+ ".globl " symbol "\n\t" \ -+ ".ent " symbol "\n" \ -+symbol ":" "\n\t" \ -+ ".frame $30,0,$26,0" "\n\t" \ -+ "ldgp $29,0($27)" "\n" \ -+"$" symbol "..ng:" "\n\t" \ -+ ".prologue 1" "\n\t" \ -+ "lda $1,"#n "\n\t" \ -+ "br $31,$SharedStub..ng" "\n\t" \ -+ ".end " symbol -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ ".if "#n" < 10" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase5Stub"#n"Ev") "\n\t" \ -+ ".elseif "#n" < 100" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase6Stub"#n"Ev") "\n\t" \ -+ ".elseif "#n" < 1000" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase7Stub"#n"Ev") "\n\t" \ -+ ".else" "\n\t" \ -+ ".err \"Stub"#n" >= 1000 not yet supported.\"" "\n\t" \ -+ ".endif" \ -+ ); -+ -+#else /* not G++ V3 ABI */ -+ - #define STUB_ENTRY(n) \ - __asm__( \ -- "#### Stub"#n" ####\n" \ --".text\n\t" \ -- ".align 5\n\t" \ -- ".globl Stub"#n"__14nsXPTCStubBase\n\t" \ -- ".ent Stub"#n"__14nsXPTCStubBase\n" \ --"Stub"#n"__14nsXPTCStubBase:\n\t" \ -- ".frame $30,0,$26,0\n\t" \ -- "ldgp $29,0($27)\n" \ --"$Stub"#n"__14nsXPTCStubBase..ng:\n\t" \ -- ".prologue 1\n\t" \ -- "lda $1,"#n"\n\t" \ -- "br $31,$SharedStub..ng\n\t" \ -- ".end Stub"#n"__14nsXPTCStubBase" \ -+ STUB_MANGLED_ENTRY(n, "Stub"#n"__14nsXPTCStubBase") \ - ); - -+#endif /* G++ V3 ABI */ -+ - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ - { \ -@@ -213,4 +234,3 @@ - } - - #include "xptcstubsdef.inc" -- diff --git a/net-www/mozilla-firebird/files/mozilla-firebird-amd64.patch b/net-www/mozilla-firebird/files/mozilla-firebird-amd64.patch deleted file mode 100644 index 5dd2cb2503ed..000000000000 --- a/net-www/mozilla-firebird/files/mozilla-firebird-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-firebird/files/xremote-client-cvs.patch b/net-www/mozilla-firebird/files/xremote-client-cvs.patch deleted file mode 100644 index 7924e6c109eb..000000000000 --- a/net-www/mozilla-firebird/files/xremote-client-cvs.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff -ur mozilla/widget/src/xremoteclient/CVS/Entries thunderbird/mozilla/widget/src/xremoteclient/CVS/Entries ---- mozilla/widget/src/xremoteclient/CVS/Entries 2003-10-03 12:00:21.000000000 -0400 -+++ thunderbird/mozilla/widget/src/xremoteclient/CVS/Entries 2003-12-04 18:37:03.000000000 -0500 -@@ -1,8 +1,8 @@ --/.cvsignore/1.2/Fri Mar 1 00:22:07 2002//TFIREBIRD_0_7_RELEASE --/Makefile.in/1.14/Fri Apr 18 20:14:14 2003//TFIREBIRD_0_7_RELEASE --/XRemoteClient.cpp/1.12/Mon Sep 8 00:31:14 2003//TFIREBIRD_0_7_RELEASE --/XRemoteClient.h/1.5/Fri Feb 14 13:17:50 2003//TFIREBIRD_0_7_RELEASE --/XRemoteClientFactory.cpp/1.3/Mon Sep 8 00:31:14 2003//TFIREBIRD_0_7_RELEASE --/mozilla-xremote-client.cpp/1.1/Fri Dec 28 22:17:20 2001//TFIREBIRD_0_7_RELEASE --/nsXRemoteClientCID.h/1.1/Fri Oct 20 05:10:43 2000//TFIREBIRD_0_7_RELEASE -+/.cvsignore/1.2/Fri Mar 1 00:22:07 2002//TTHUNDERBIRD_0_4_BRANCH -+/Makefile.in/1.14/Fri Apr 18 20:14:14 2003//TTHUNDERBIRD_0_4_BRANCH -+/XRemoteClient.cpp/1.13/Fri Nov 21 00:09:45 2003//TTHUNDERBIRD_0_4_BRANCH -+/XRemoteClient.h/1.6/Fri Nov 21 00:09:45 2003//TTHUNDERBIRD_0_4_BRANCH -+/XRemoteClientFactory.cpp/1.3/Mon Sep 8 00:31:14 2003//TTHUNDERBIRD_0_4_BRANCH -+/mozilla-xremote-client.cpp/1.1/Fri Dec 28 22:17:20 2001//TTHUNDERBIRD_0_4_BRANCH -+/nsXRemoteClientCID.h/1.1/Fri Oct 20 05:10:43 2000//TTHUNDERBIRD_0_4_BRANCH - D -diff -ur mozilla/widget/src/xremoteclient/CVS/Tag thunderbird/mozilla/widget/src/xremoteclient/CVS/Tag ---- mozilla/widget/src/xremoteclient/CVS/Tag 2003-10-03 14:56:14.000000000 -0400 -+++ thunderbird/mozilla/widget/src/xremoteclient/CVS/Tag 2003-12-05 02:30:16.000000000 -0500 -@@ -1 +1 @@ --NFIREBIRD_0_7_RELEASE -+TTHUNDERBIRD_0_4_BRANCH -diff -ur mozilla/widget/src/xremoteclient/XRemoteClient.cpp thunderbird/mozilla/widget/src/xremoteclient/XRemoteClient.cpp ---- mozilla/widget/src/xremoteclient/XRemoteClient.cpp 2003-09-07 20:31:14.000000000 -0400 -+++ thunderbird/mozilla/widget/src/xremoteclient/XRemoteClient.cpp 2003-11-20 19:09:45.000000000 -0500 -@@ -1,3 +1,4 @@ -+/* vim:set ts=8 sw=2 et cindent: */ - /* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file -@@ -99,54 +100,6 @@ - } - - NS_IMETHODIMP --XRemoteClient::SendCommand (const char *aCommand, PRBool *aWindowFound) --{ -- PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommand")); -- -- *aWindowFound = PR_TRUE; -- -- // find the remote window -- Window window = FindWindow(); -- -- // no window? let the caller know. -- if (!window) { -- *aWindowFound = PR_FALSE; -- return NS_OK; -- } -- -- // make sure we get the right events on that window -- XSelectInput(mDisplay, window, -- (PropertyChangeMask|StructureNotifyMask)); -- -- nsresult rv; -- PRBool destroyed = PR_FALSE; -- -- // get the lock on the window -- rv = GetLock(window, &destroyed); -- -- if (NS_FAILED(rv)) -- return NS_ERROR_FAILURE; -- -- // send our command -- rv = DoSendCommand(window, aCommand, &destroyed); -- -- // if the window was destroyed, don't bother trying to free the -- // lock. -- if (destroyed) -- return NS_ERROR_FAILURE; -- -- // doesn't really matter what this returns -- FreeLock(window); -- -- // if we failed above we had to free the lock - return the error -- // now. -- if (NS_FAILED(rv)) -- return NS_ERROR_FAILURE; -- -- return NS_OK; --} -- --NS_IMETHODIMP - XRemoteClient::Shutdown (void) - { - PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::Shutdown")); -@@ -164,32 +117,36 @@ - return NS_OK; - } - --Window --XRemoteClient::FindWindow(void) -+NS_IMETHODIMP -+XRemoteClient::SendCommand (const char *aCommand, PRBool *aWindowFound) - { -+ PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommand")); -+ - Window root = RootWindowOfScreen(DefaultScreenOfDisplay(mDisplay)); - Window root2, parent, *kids; - unsigned int nkids; -- Window result = 0; - int i; -+ -+ *aWindowFound = PR_FALSE; - - if (!XQueryTree(mDisplay, root, &root2, &parent, &kids, &nkids)) { - PR_LOG(sRemoteLm, PR_LOG_DEBUG, -- ("XQueryTree failed in XRemoteClient::FindWindow")); -- return 0; -+ ("XQueryTree failed in XRemoteClient::SendCommand")); -+ return NS_OK; - } - - if (!(kids && nkids)) { - PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("root window has no children")); -- return 0; -+ return NS_OK; - } - -+ nsresult rv = NS_OK; - for (i=nkids-1; i >= 0; i--) { - Atom type; - int format; - unsigned long nitems, bytesafter; - unsigned char *data_return = 0; -- Window w; -+ Window w, result = 0; - w = kids[i]; - // find the inner window with WM_STATE on it - w = CheckWindow(w); -@@ -224,11 +181,8 @@ - - // if the IDs are equal then this is the window we want. if - // they aren't fall through to the next loop iteration. -- if (!strcmp(logname, (const char *)data_return)) { -- XFree(data_return); -+ if (!strcmp(logname, (const char *)data_return)) - result = w; -- break; -- } - - XFree(data_return); - } -@@ -238,14 +192,40 @@ - // it. - else { - result = w; -- break; -+ } -+ -+ if (result) { -+ // ok, let the caller know that we at least found a window. -+ *aWindowFound = PR_TRUE; -+ -+ // make sure we get the right events on that window -+ XSelectInput(mDisplay, result, -+ (PropertyChangeMask|StructureNotifyMask)); -+ -+ PRBool destroyed = PR_FALSE; -+ -+ // get the lock on the window -+ rv = GetLock(result, &destroyed); -+ -+ if (NS_SUCCEEDED(rv)) { -+ // send our command -+ rv = DoSendCommand(result, aCommand, &destroyed); -+ -+ // if the window was destroyed, don't bother trying to free the -+ // lock. -+ if (!destroyed) -+ FreeLock(result); // doesn't really matter what this returns -+ -+ // if accepted then we're done... -+ if (NS_SUCCEEDED(rv)) -+ break; -+ } - } - } - } - -- PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("FindWindow returning 0x%lx\n", result)); -- -- return result; -+ PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("SendCommand returning 0x%x\n", rv)); -+ return rv; - } - - Window -diff -ur mozilla/widget/src/xremoteclient/XRemoteClient.h thunderbird/mozilla/widget/src/xremoteclient/XRemoteClient.h ---- mozilla/widget/src/xremoteclient/XRemoteClient.h 2003-02-14 08:17:50.000000000 -0500 -+++ thunderbird/mozilla/widget/src/xremoteclient/XRemoteClient.h 2003-11-20 19:09:45.000000000 -0500 -@@ -42,7 +42,6 @@ - - private: - -- Window FindWindow (void); - Window CheckWindow (Window aWindow); - Window CheckChildren (Window aWindow); - nsresult GetLock (Window aWindow, PRBool *aDestroyed); -@@ -63,5 +62,4 @@ - char *mLockData; - - PRBool mInitialized; -- - }; diff --git a/net-www/mozilla-firebird/metadata.xml b/net-www/mozilla-firebird/metadata.xml deleted file mode 100644 index 74d9257900cf..000000000000 --- a/net-www/mozilla-firebird/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>mozilla</herd> -</pkgmetadata> diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild deleted file mode 100644 index a654ab39bf70..000000000000 --- a/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild,v 1.11 2003/12/08 06:30:37 brad Exp $ - -inherit makeedit flag-o-matic gcc nsplugins eutils - -# Added to get MozillaFirebird to compile on sparc. -replace-sparc64-flags - -S=${WORKDIR}/mozilla - -DESCRIPTION="The Mozilla Firebird Web Browser" -HOMEPAGE="http://www.mozilla.org/projects/firebird/" -SRC_URI="http://komodo.mozilla.org/pub/firebird/releases/${PV}/MozillaFirebird-${PV}-source.tar.bz2" - -KEYWORDS="~x86 ~ppc ~sparc ~alpha" -SLOT="0" -LICENSE="MPL-1.1 | NPL-1.1" -IUSE="java gtk2 ipv6 gnome moznoxft" - -RDEPEND="virtual/x11 - >=dev-libs/libIDL-0.8.0 - >=gnome-base/ORBit-0.5.10-r1 - virtual/xft - >=sys-libs/zlib-1.1.4 - >=media-libs/jpeg-6b - >=media-libs/libmng-1.0.0 - >=media-libs/libpng-1.2.1 - >=sys-apps/portage-2.0.36 - dev-libs/expat - app-arch/zip - app-arch/unzip - ( gtk2? >=x11-libs/gtk+-2.1.1 : - =x11-libs/gtk+-1.2* ) - java? ( virtual/jre ) - !net-www/mozilla-firebird-bin - !net-www/mozilla-firebird-cvs" - -DEPEND="${RDEPEND} - virtual/glibc - dev-lang/perl - java? ( >=dev-java/java-config-0.2.0 )" - -# needed by src_compile() and src_install() -export MOZ_PHOENIX=1 -export MOZ_CALENDAR=0 -export MOZ_ENABLE_XFT=1 - -src_unpack() { - unpack MozillaFirebird-${PV}-source.tar.bz2 - - # alpha stubs patch from lfs project. - # <taviso@gentoo.org> (26 Jun 2003) - use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch - - # Fix build with Linux 2.6 - cp ${S}/security/coreconf/Linux2.5.mk ${S}/security/coreconf/Linux2.6.mk - -} - -src_compile() { - local myconf="--disable-composer \ - --with-x \ - --with-system-jpeg \ - --with-system-zlib \ - --with-system-png \ - --with-system-mng \ - --disable-mailnews \ - --disable-calendar \ - --disable-pedantic \ - --disable-svg \ - --enable-mathml \ - --without-system-nspr \ - --enable-nspr-autoconf \ - --enable-xsl \ - --enable-crypto \ - --enable-xinerama=no \ - --with-java-supplement \ - --with-pthreads \ - --with-default-mozilla-five-home=/usr/lib/MozillaFirebird \ - --with-user-appdir=.phoenix \ - --disable-jsd \ - --disable-accessibility \ - --disable-tests \ - --disable-debug \ - --disable-dtd-debug \ - --disable-logging \ - --enable-reorder \ - --enable-strip \ - --enable-strip-libs \ - --enable-cpp-rtti \ - --enable-xterm-updates \ - --enable-optimize=-O2 \ - --disable-ldap \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help" - - if [ -n "`use gtk2`" ] ; then - myconf="${myconf} --enable-toolkit-gtk2 \ - --enable-default-toolkit=gtk2 \ - --disable-toolkit-gtk" - else - myconf="${myconf} --enable-toolkit-gtk \ - --enable-default-toolkit=gtk \ - --disable-toolkit-gtk2" - fi - - if [ -z "`use moznoxft`" ] - then - if [ -n "`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 [ -n "`use ipv6`" ] ; then - myconf="${myconf} --enable-ipv6" - fi - - # Crashes on start when compiled with -fomit-frame-pointer - filter-flags -fomit-frame-pointer - filter-flags -ffast-math - append-flags -s -fforce-addr - - 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 - - econf ${myconf} || die - - edit_makefiles - emake MOZ_PHOENIX=1 || die -} - -src_install() { - # Plugin path creation - PLUGIN_DIR="/usr/lib/nsbrowser/plugins" - dodir ${PLUGIN_DIR} - - dodir /usr/lib - dodir /usr/lib/MozillaFirebird - cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird - - #fix permissions - chown -R root:root ${D}/usr/lib/MozillaFirebird - - # Plugin path setup (rescuing the existent plugins) - src_mv_plugins /usr/lib/MozillaFirebird/plugins - - dobin ${FILESDIR}/MozillaFirebird - - # Fix icons to look the same everywhere - insinto /usr/lib/MozillaFirebird/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 - cp mozilla.desktop mozillafirebird.desktop - perl -pi -e 's:Name=Mozilla:Name=Mozilla Firebird:' mozillafirebird.desktop - perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Firebird Web Browser:' mozillafirebird.desktop - perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaFirebird:' mozillafirebird.desktop - cd ${S} - insinto /usr/share/gnome/apps/Internet - doins ${S}/build/package/rpm/SOURCES/mozillafirebird.desktop - fi - -} - -pkg_preinst() { - # Remove the old plugins dir - pkg_mv_plugins /usr/lib/MozillaFirebird/plugins -} - -pkg_postinst() { - - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaFirebird" - - # 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..." - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regxpcom - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regchrome - # 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 {} \; || : - -} diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild deleted file mode 100644 index 7e3056e5707d..000000000000 --- a/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild,v 1.15 2003/12/08 06:30:37 brad Exp $ - -inherit makeedit flag-o-matic gcc nsplugins eutils - -# Added to get MozillaFirebird to compile on sparc. -replace-sparc64-flags -if [ "`use ppc`" -a "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ] -then - -append-flags -fno-strict-aliasing - -fi - - -S=${WORKDIR}/mozilla - -DESCRIPTION="The Mozilla Firebird Web Browser" -HOMEPAGE="http://www.mozilla.org/projects/firebird/" -SRC_URI="http://ftp.mozilla.org/pub/firebird/releases/${PV}/MozillaFirebird-source-${PV}.tar.bz2" - -KEYWORDS="x86 ppc sparc alpha" -SLOT="0" -LICENSE="MPL-1.1 | NPL-1.1" -IUSE="java gtk2 ipv6 gnome moznoxft" - -RDEPEND="virtual/x11 - >=dev-libs/libIDL-0.8.0 - >=gnome-base/ORBit-0.5.10-r1 - virtual/xft - >=sys-libs/zlib-1.1.4 - >=media-libs/jpeg-6b - >=media-libs/libmng-1.0.0 - >=media-libs/libpng-1.2.1 - >=sys-apps/portage-2.0.36 - dev-libs/expat - app-arch/zip - app-arch/unzip - ( gtk2? >=x11-libs/gtk+-2.1.1 : - =x11-libs/gtk+-1.2* ) - java? ( virtual/jre ) - !net-www/mozilla-firebird-bin - !net-www/mozilla-firebird-cvs" - -DEPEND="${RDEPEND} - virtual/glibc - dev-lang/perl - java? ( >=dev-java/java-config-0.2.0 )" - -# needed by src_compile() and src_install() -export MOZ_PHOENIX=1 -export MOZ_CALENDAR=0 -export MOZ_ENABLE_XFT=1 - -src_unpack() { - unpack MozillaFirebird-source-${PV}.tar.bz2 - - # alpha stubs patch from lfs project. - # <taviso@gentoo.org> (26 Jun 2003) - use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch - - # Fix build with Linux 2.6 - cp ${S}/security/coreconf/Linux2.5.mk ${S}/security/coreconf/Linux2.6.mk - -} - -src_compile() { - local myconf="--disable-composer \ - --with-x \ - --with-system-jpeg \ - --with-system-zlib \ - --with-system-png \ - --with-system-mng \ - --disable-mailnews \ - --disable-calendar \ - --disable-pedantic \ - --disable-svg \ - --enable-mathml \ - --without-system-nspr \ - --enable-nspr-autoconf \ - --enable-xsl \ - --enable-crypto \ - --enable-xinerama=no \ - --with-java-supplement \ - --with-pthreads \ - --with-default-mozilla-five-home=/usr/lib/MozillaFirebird \ - --with-user-appdir=.phoenix \ - --disable-jsd \ - --disable-accessibility \ - --disable-tests \ - --disable-debug \ - --disable-dtd-debug \ - --disable-logging \ - --enable-reorder \ - --enable-strip \ - --enable-strip-libs \ - --enable-cpp-rtti \ - --enable-xterm-updates \ - --enable-optimize=-O2 \ - --disable-ldap \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help" - - if [ -n "`use gtk2`" ] ; then - myconf="${myconf} --enable-toolkit-gtk2 \ - --enable-default-toolkit=gtk2 \ - --disable-toolkit-gtk" - else - myconf="${myconf} --enable-toolkit-gtk \ - --enable-default-toolkit=gtk \ - --disable-toolkit-gtk2" - fi - - if [ -z "`use moznoxft`" ] - then - if [ -n "`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 [ -n "`use ipv6`" ] ; then - myconf="${myconf} --enable-ipv6" - fi - - # Crashes on start when compiled with -fomit-frame-pointer - filter-flags -fomit-frame-pointer - filter-flags -ffast-math - append-flags -s -fforce-addr - - 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 - - econf ${myconf} || die - - edit_makefiles - emake MOZ_PHOENIX=1 || die -} - -src_install() { - # Plugin path creation - PLUGIN_DIR="/usr/lib/nsbrowser/plugins" - dodir ${PLUGIN_DIR} - - dodir /usr/lib - dodir /usr/lib/MozillaFirebird - cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird - - #fix permissions - chown -R root:root ${D}/usr/lib/MozillaFirebird - - # Plugin path setup (rescuing the existent plugins) - src_mv_plugins /usr/lib/MozillaFirebird/plugins - - dobin ${FILESDIR}/MozillaFirebird - - # Fix icons to look the same everywhere - insinto /usr/lib/MozillaFirebird/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 - cp mozilla.desktop mozillafirebird.desktop - perl -pi -e 's:Name=Mozilla:Name=Mozilla Firebird:' mozillafirebird.desktop - perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Firebird Web Browser:' mozillafirebird.desktop - perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaFirebird:' mozillafirebird.desktop - cd ${S} - insinto /usr/share/gnome/apps/Internet - doins ${S}/build/package/rpm/SOURCES/mozillafirebird.desktop - fi -} - -pkg_preinst() { - # Remove the old plugins dir - pkg_mv_plugins /usr/lib/MozillaFirebird/plugins -} - -pkg_postinst() { - - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaFirebird" - - # 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..." - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regxpcom - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regchrome - # 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 {} \; || : - -} diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.7-r1.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.7-r1.ebuild deleted file mode 100644 index a8909b2a7a08..000000000000 --- a/net-www/mozilla-firebird/mozilla-firebird-0.7-r1.ebuild +++ /dev/null @@ -1,270 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.7-r1.ebuild,v 1.4 2004/01/27 19:42:56 agriffis Exp $ - -inherit makeedit flag-o-matic gcc nsplugins eutils - -S=${WORKDIR}/mozilla - -DESCRIPTION="The Mozilla Firebird Web Browser" -HOMEPAGE="http://www.mozilla.org/projects/firebird/" -SRC_URI="http://ftp.mozilla.org/pub/firebird/releases/${PV}/MozillaFirebird-source-${PV}.tar.gz" - -KEYWORDS="x86 ~ppc sparc alpha ~amd64 ia64" -SLOT="0" -LICENSE="MPL-1.1 | NPL-1.1" -IUSE="java gtk2 ipv6 gnome moznoxft" - -RDEPEND="virtual/x11 - >=dev-libs/libIDL-0.8.0 - >=gnome-base/ORBit-0.5.10-r1 - virtual/xft - >=sys-libs/zlib-1.1.4 - >=media-libs/jpeg-6b - >=media-libs/libmng-1.0.0 - >=media-libs/libpng-1.2.1 - >=sys-apps/portage-2.0.36 - dev-libs/expat - app-arch/zip - app-arch/unzip - ( gtk2? >=x11-libs/gtk+-2.1.1 : - =x11-libs/gtk+-1.2* ) - java? ( virtual/jre ) - !net-www/mozilla-firebird-bin - !net-www/mozilla-firebird-cvs" - -DEPEND="${RDEPEND} - virtual/glibc - dev-lang/perl - java? ( >=dev-java/java-config-0.2.0 )" - -# needed by src_compile() and src_install() -export MOZ_PHOENIX=1 -export MOZ_CALENDAR=0 -export MOZ_ENABLE_XFT=1 - -src_unpack() { - unpack MozillaFirebird-source-${PV}.tar.gz - - # alpha stubs patch from lfs project. - # <taviso@gentoo.org> (26 Jun 2003) - use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch - use amd64 && epatch ${FILESDIR}/mozilla-firebird-amd64.patch - - # Make Firebird cooperate with Thunderbird's URL handling - # <brad@gentoo.org> (09 Dec 2003) - epatch ${FILESDIR}/xremote-client-cvs.patch -} - -src_compile() { - local enable_optimize='' - local myconf="--disable-composer \ - --with-x \ - --with-system-jpeg \ - --with-system-zlib \ - --with-system-png \ - --with-system-mng \ - --disable-mailnews \ - --disable-calendar \ - --disable-pedantic \ - --disable-svg \ - --enable-mathml \ - --without-system-nspr \ - --enable-nspr-autoconf \ - --enable-xsl \ - --enable-crypto \ - --enable-xinerama=no \ - --with-java-supplement \ - --with-pthreads \ - --with-default-mozilla-five-home=/usr/lib/MozillaFirebird \ - --with-user-appdir=.phoenix \ - --disable-jsd \ - --disable-accessibility \ - --disable-tests \ - --disable-debug \ - --disable-dtd-debug \ - --disable-logging \ - --enable-reorder \ - --enable-strip \ - --enable-strip-libs \ - --enable-cpp-rtti \ - --enable-xterm-updates \ - --disable-ldap \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help" - - if [ -n "`use gtk2`" ] ; then - myconf="${myconf} --enable-toolkit-gtk2 \ - --enable-default-toolkit=gtk2 \ - --disable-toolkit-gtk" - else - myconf="${myconf} --enable-toolkit-gtk \ - --enable-default-toolkit=gtk \ - --disable-toolkit-gtk2" - fi - - if [ -z "`use moznoxft`" ] - then - if [ -n "`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 [ -n "`use ipv6`" ] ; then - myconf="${myconf} --enable-ipv6" - fi - - # Per-architecture flags - case "${ARCH}" in - alpha|amd64|ia64) - # 64-bit needs -fPIC - append-flags -fPIC - ;; - sparc) - # Added to get MozillaFirebird to compile on sparc - replace-sparc64-flags - ;; - ppc) - # Fix to avoid gcc-3.3.x miscompilation issues. - if [ "$(gcc-major-version).$(gcc-minor-version)" = "3.3" ]; then - append-flags -fno-strict-aliasing - fi - ;; - esac - - # 32-bit vs. 64-bit optimization - case "${ARCH}" in - alpha|amd64|ia64) - # Allow -O0 or -O1: Anything more than this causes - # segfaults on startup on 64-bit (bug 33767) - enable_optimize=$(echo "$CFLAGS" | sed 's/.*\(-O[01]\?\).*/\1/p') - enable_optimize=${enable_optimize:--O1} - filter-flags -O -O? - ;; - *) - # -O2 and below allowed on 32-bit - enable_optimize=$(echo "$CFLAGS" | sed 's/.*\(-O[012]\?\).*/\1/p') - enable_optimize=${enable_optimize:--O2} - filter-flags -O -O? - ;; - esac - - # Crashes on start when compiled with -fomit-frame-pointer - filter-flags -fomit-frame-pointer -mpowerpc-gfxopt - filter-flags -ffast-math - append-flags -s -fforce-addr - - 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 - - econf --enable-optimize="${enable_optimize}" ${myconf} || die - - edit_makefiles - emake MOZ_PHOENIX=1 || die -} - -src_install() { - # Plugin path creation - PLUGIN_DIR="/usr/lib/nsbrowser/plugins" - dodir ${PLUGIN_DIR} - - dodir /usr/lib - dodir /usr/lib/MozillaFirebird - cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird - - #fix permissions - chown -R root:root ${D}/usr/lib/MozillaFirebird - - # Plugin path setup (rescuing the existent plugins) - src_mv_plugins /usr/lib/MozillaFirebird/plugins - - dobin ${FILESDIR}/MozillaFirebird - - # Fix icons to look the same everywhere - insinto /usr/lib/MozillaFirebird/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 - cp mozilla.desktop mozillafirebird.desktop - perl -pi -e 's:Name=Mozilla:Name=Mozilla Firebird:' mozillafirebird.desktop - perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Firebird Web Browser:' mozillafirebird.desktop - perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaFirebird:' mozillafirebird.desktop - cd ${S} - insinto /usr/share/gnome/apps/Internet - doins ${S}/build/package/rpm/SOURCES/mozillafirebird.desktop - fi -} - -pkg_preinst() { - # Remove the old plugins dir - pkg_mv_plugins /usr/lib/MozillaFirebird/plugins -} - -pkg_postinst() { - - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaFirebird" - - # 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..." - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regxpcom - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regchrome - # 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 {} \; || : - -} diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.7-r2.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.7-r2.ebuild deleted file mode 100644 index 7ce4d22a779f..000000000000 --- a/net-www/mozilla-firebird/mozilla-firebird-0.7-r2.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.7-r2.ebuild,v 1.1 2004/02/06 18:37:46 brad Exp $ - -inherit makeedit flag-o-matic gcc nsplugins eutils - -S=${WORKDIR}/mozilla - -DESCRIPTION="The Mozilla Firebird Web Browser" -HOMEPAGE="http://www.mozilla.org/projects/firebird/" -SRC_URI="http://ftp.mozilla.org/pub/firebird/releases/${PV}/MozillaFirebird-source-${PV}.tar.gz" - -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64" -SLOT="0" -LICENSE="MPL-1.1 | NPL-1.1" -IUSE="java gtk2 ipv6 gnome moznoxft" - -RDEPEND="virtual/x11 - >=dev-libs/libIDL-0.8.0 - >=gnome-base/ORBit-0.5.10-r1 - virtual/xft - >=sys-libs/zlib-1.1.4 - >=media-libs/jpeg-6b - >=media-libs/libmng-1.0.0 - >=media-libs/libpng-1.2.1 - >=sys-apps/portage-2.0.36 - dev-libs/expat - app-arch/zip - app-arch/unzip - ( gtk2? >=x11-libs/gtk+-2.1.1 : - =x11-libs/gtk+-1.2* ) - java? ( virtual/jre ) - !net-www/mozilla-firebird-bin - !net-www/mozilla-firebird-cvs" - -DEPEND="${RDEPEND} - virtual/glibc - dev-lang/perl - java? ( >=dev-java/java-config-0.2.0 )" - -# needed by src_compile() and src_install() -export MOZ_PHOENIX=1 -export MOZ_CALENDAR=0 -export MOZ_ENABLE_XFT=1 - -src_unpack() { - unpack MozillaFirebird-source-${PV}.tar.gz - - # alpha stubs patch from lfs project. - # <taviso@gentoo.org> (26 Jun 2003) - use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch - use amd64 && epatch ${FILESDIR}/mozilla-firebird-amd64.patch - - # Make Firebird cooperate with Thunderbird's URL handling - # <brad@gentoo.org> (09 Dec 2003) - epatch ${FILESDIR}/xremote-client-cvs.patch -} - -src_compile() { - local enable_optimize='' - local myconf="--disable-composer \ - --with-x \ - --with-system-jpeg \ - --with-system-zlib \ - --with-system-png \ - --with-system-mng \ - --disable-mailnews \ - --disable-calendar \ - --disable-pedantic \ - --disable-svg \ - --enable-mathml \ - --without-system-nspr \ - --enable-nspr-autoconf \ - --enable-xsl \ - --enable-crypto \ - --enable-xinerama=no \ - --with-java-supplement \ - --with-pthreads \ - --with-default-mozilla-five-home=/usr/lib/MozillaFirebird \ - --with-user-appdir=.phoenix \ - --disable-jsd \ - --disable-accessibility \ - --disable-tests \ - --disable-debug \ - --disable-dtd-debug \ - --disable-logging \ - --enable-reorder \ - --enable-strip \ - --enable-strip-libs \ - --enable-cpp-rtti \ - --enable-xterm-updates \ - --disable-ldap \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help" - - if [ -n "`use gtk2`" ] ; then - myconf="${myconf} --enable-toolkit-gtk2 \ - --enable-default-toolkit=gtk2 \ - --disable-toolkit-gtk" - else - myconf="${myconf} --enable-toolkit-gtk \ - --enable-default-toolkit=gtk \ - --disable-toolkit-gtk2" - fi - - if [ -z "`use moznoxft`" ] - then - if [ -n "`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 [ -n "`use ipv6`" ] ; then - myconf="${myconf} --enable-ipv6" - fi - - # Per-architecture flags - case "${ARCH}" in - alpha|amd64|ia64) - # 64-bit needs -fPIC - append-flags -fPIC - ;; - sparc) - # Added to get MozillaFirebird to compile on sparc - replace-sparc64-flags - ;; - ppc) - # Fix to avoid gcc-3.3.x miscompilation issues. - if [ "$(gcc-major-version).$(gcc-minor-version)" = "3.3" ]; then - append-flags -fno-strict-aliasing - fi - ;; - esac - - # 32-bit vs. 64-bit optimization - case "${ARCH}" in - alpha|amd64|ia64) - # Allow -O0 or -O1: Anything more than this causes - # segfaults on startup on 64-bit (bug 33767) - enable_optimize=$(echo "$CFLAGS" | sed 's/.*\(-O[01]\?\).*/\1/p') - enable_optimize=${enable_optimize:--O1} - filter-flags -O -O? - ;; - *) - # -O2 and below allowed on 32-bit - enable_optimize=$(echo "$CFLAGS" | sed 's/.*\(-O[012]\?\).*/\1/p') - enable_optimize=${enable_optimize:--O2} - filter-flags -O -O? - ;; - esac - - # Crashes on start when compiled with -fomit-frame-pointer - filter-flags -fomit-frame-pointer -mpowerpc-gfxopt - filter-flags -ffast-math - append-flags -s -fforce-addr - - 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 - - econf --enable-optimize="${enable_optimize}" ${myconf} || die - - edit_makefiles - emake MOZ_PHOENIX=1 || die -} - -src_install() { - # Plugin path creation - PLUGIN_DIR="/usr/lib/nsbrowser/plugins" - dodir ${PLUGIN_DIR} - - dodir /usr/lib - dodir /usr/lib/MozillaFirebird - cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird - - #fix permissions - chown -R root:root ${D}/usr/lib/MozillaFirebird - - # Plugin path setup (rescuing the existent plugins) - src_mv_plugins /usr/lib/MozillaFirebird/plugins - - dobin ${FILESDIR}/MozillaFirebird - insinto /etc/env.d - doins ${FILESDIR}/10MozillaFirebird - - # Fix icons to look the same everywhere - insinto /usr/lib/MozillaFirebird/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 - cp mozilla.desktop mozillafirebird.desktop - perl -pi -e 's:Name=Mozilla:Name=Mozilla Firebird:' mozillafirebird.desktop - perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Firebird Web Browser:' mozillafirebird.desktop - perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaFirebird:' mozillafirebird.desktop - cd ${S} - insinto /usr/share/gnome/apps/Internet - doins ${S}/build/package/rpm/SOURCES/mozillafirebird.desktop - fi -} - -pkg_preinst() { - # Remove the old plugins dir - pkg_mv_plugins /usr/lib/MozillaFirebird/plugins -} - -pkg_postinst() { - - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaFirebird" - - # 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..." - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regxpcom - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regchrome - # 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 {} \; || : - -} diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.7.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.7.ebuild deleted file mode 100644 index 16c45d9da3f6..000000000000 --- a/net-www/mozilla-firebird/mozilla-firebird-0.7.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.7.ebuild,v 1.13 2003/12/14 04:14:53 pylon Exp $ - -inherit makeedit flag-o-matic gcc nsplugins eutils - -S=${WORKDIR}/mozilla - -DESCRIPTION="The Mozilla Firebird Web Browser" -HOMEPAGE="http://www.mozilla.org/projects/firebird/" -SRC_URI="http://ftp.mozilla.org/pub/firebird/releases/${PV}/MozillaFirebird-source-${PV}.tar.gz" - -KEYWORDS="x86 ppc ~sparc alpha ~amd64 ia64" -SLOT="0" -LICENSE="MPL-1.1 | NPL-1.1" -IUSE="java gtk2 ipv6 gnome moznoxft" - -RDEPEND="virtual/x11 - >=dev-libs/libIDL-0.8.0 - >=gnome-base/ORBit-0.5.10-r1 - virtual/xft - >=sys-libs/zlib-1.1.4 - >=media-libs/jpeg-6b - >=media-libs/libmng-1.0.0 - >=media-libs/libpng-1.2.1 - >=sys-apps/portage-2.0.36 - dev-libs/expat - app-arch/zip - app-arch/unzip - ( gtk2? >=x11-libs/gtk+-2.1.1 : - =x11-libs/gtk+-1.2* ) - java? ( virtual/jre ) - !net-www/mozilla-firebird-bin - !net-www/mozilla-firebird-cvs" - -DEPEND="${RDEPEND} - virtual/glibc - dev-lang/perl - java? ( >=dev-java/java-config-0.2.0 )" - -# needed by src_compile() and src_install() -export MOZ_PHOENIX=1 -export MOZ_CALENDAR=0 -export MOZ_ENABLE_XFT=1 - -src_unpack() { - unpack MozillaFirebird-source-${PV}.tar.gz - - # alpha stubs patch from lfs project. - # <taviso@gentoo.org> (26 Jun 2003) - use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch - use amd64 && epatch ${FILESDIR}/mozilla-firebird-amd64.patch -} - -src_compile() { - local enable_optimize='' - local myconf="--disable-composer \ - --with-x \ - --with-system-jpeg \ - --with-system-zlib \ - --with-system-png \ - --with-system-mng \ - --disable-mailnews \ - --disable-calendar \ - --disable-pedantic \ - --disable-svg \ - --enable-mathml \ - --without-system-nspr \ - --enable-nspr-autoconf \ - --enable-xsl \ - --enable-crypto \ - --enable-xinerama=no \ - --with-java-supplement \ - --with-pthreads \ - --with-default-mozilla-five-home=/usr/lib/MozillaFirebird \ - --with-user-appdir=.phoenix \ - --disable-jsd \ - --disable-accessibility \ - --disable-tests \ - --disable-debug \ - --disable-dtd-debug \ - --disable-logging \ - --enable-reorder \ - --enable-strip \ - --enable-strip-libs \ - --enable-cpp-rtti \ - --enable-xterm-updates \ - --disable-ldap \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help" - - if [ -n "`use gtk2`" ] ; then - myconf="${myconf} --enable-toolkit-gtk2 \ - --enable-default-toolkit=gtk2 \ - --disable-toolkit-gtk" - else - myconf="${myconf} --enable-toolkit-gtk \ - --enable-default-toolkit=gtk \ - --disable-toolkit-gtk2" - fi - - if [ -z "`use moznoxft`" ] - then - if [ -n "`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 [ -n "`use ipv6`" ] ; then - myconf="${myconf} --enable-ipv6" - fi - - # Per-architecture flags - case "${ARCH}" in - alpha|amd64|ia64) - # 64-bit needs -fPIC - append-flags -fPIC - ;; - sparc) - # Added to get MozillaFirebird to compile on sparc - replace-sparc64-flags - ;; - ppc) - # Fix to avoid gcc-3.3.x miscompilation issues. - if [ "$(gcc-major-version).$(gcc-minor-version)" = "3.3" ]; then - append-flags -fno-strict-aliasing - fi - ;; - esac - - # 32-bit vs. 64-bit optimization - case "${ARCH}" in - alpha|amd64|ia64) - # Allow -O0 or -O1: Anything more than this causes - # segfaults on startup on 64-bit (bug 33767) - enable_optimize=$(echo "$CFLAGS" | sed 's/.*\(-O[01]\?\).*/\1/p') - enable_optimize=${enable_optimize:--O1} - filter-flags -O -O? - ;; - *) - # -O2 and below allowed on 32-bit - enable_optimize=$(echo "$CFLAGS" | sed 's/.*\(-O[012]\?\).*/\1/p') - enable_optimize=${enable_optimize:--O2} - filter-flags -O -O? - ;; - esac - - # Crashes on start when compiled with -fomit-frame-pointer - filter-flags -fomit-frame-pointer -mpowerpc-gfxopt - filter-flags -ffast-math - append-flags -s -fforce-addr - - 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 - - econf --enable-optimize="${enable_optimize}" ${myconf} || die - - edit_makefiles - emake MOZ_PHOENIX=1 || die -} - -src_install() { - # Plugin path creation - PLUGIN_DIR="/usr/lib/nsbrowser/plugins" - dodir ${PLUGIN_DIR} - - dodir /usr/lib - dodir /usr/lib/MozillaFirebird - cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird - - #fix permissions - chown -R root:root ${D}/usr/lib/MozillaFirebird - - # Plugin path setup (rescuing the existent plugins) - src_mv_plugins /usr/lib/MozillaFirebird/plugins - - dobin ${FILESDIR}/MozillaFirebird - - # Fix icons to look the same everywhere - insinto /usr/lib/MozillaFirebird/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 - cp mozilla.desktop mozillafirebird.desktop - perl -pi -e 's:Name=Mozilla:Name=Mozilla Firebird:' mozillafirebird.desktop - perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Firebird Web Browser:' mozillafirebird.desktop - perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaFirebird:' mozillafirebird.desktop - cd ${S} - insinto /usr/share/gnome/apps/Internet - doins ${S}/build/package/rpm/SOURCES/mozillafirebird.desktop - fi -} - -pkg_preinst() { - # Remove the old plugins dir - pkg_mv_plugins /usr/lib/MozillaFirebird/plugins -} - -pkg_postinst() { - - export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaFirebird" - - # 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..." - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regxpcom - LD_LIBRARY_PATH=/usr/lib/MozillaFirebird ${MOZILLA_FIVE_HOME}/regchrome - # 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 {} \; || : - -} |