pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/firefox3 Add and update patches to enable building...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6682d47fd62d
branches: trunk
changeset: 557733:6682d47fd62d
user: tnn <tnn%pkgsrc.org@localhost>
date: Tue Apr 21 12:58:22 2009 +0000
description:
Add and update patches to enable building on NetBSD/*ppc.
Most of this work was done by "Kernigh" in PR pkg/39358.
diffstat:
www/firefox3/TODO | 5 +-
www/firefox3/distinfo | 11 +-
www/firefox3/patches/patch-ac | 22 ++-
www/firefox3/patches/patch-bx | 58 ++++++++++-
www/firefox3/patches/patch-bz | 154 ++++++++++++++++++++++++++++++++
www/firefox3/patches/patch-ca | 198 ++++++++++++++++++++++++++++++++++++++++++
www/firefox3/patches/patch-cb | 32 +++++-
www/firefox3/patches/patch-eo | 18 +++
8 files changed, 467 insertions(+), 31 deletions(-)
diffs (truncated from 631 to 300 lines):
diff -r 2ecfc8a63925 -r 6682d47fd62d www/firefox3/TODO
--- a/www/firefox3/TODO Tue Apr 21 10:03:31 2009 +0000
+++ b/www/firefox3/TODO Tue Apr 21 12:58:22 2009 +0000
@@ -7,11 +7,8 @@
da dt af ag ah ai aj ak al an ao aq aw by cd cq
ch ci cj ck cl cm cn db dc dd dw ec
-Patches from firefox 2.x that someone with clue needs to look at:
-bz ca
-
Patches that had to be updated to apply cleanly:
-aa ab ac ba bb ap ed de
+aa ab ac ap ba bb bz ca ed de
Patches that are "work in progress" and need to be reviewed/revisited:
wc wd we wf
diff -r 2ecfc8a63925 -r 6682d47fd62d www/firefox3/distinfo
--- a/www/firefox3/distinfo Tue Apr 21 10:03:31 2009 +0000
+++ b/www/firefox3/distinfo Tue Apr 21 12:58:22 2009 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.20 2009/04/20 12:13:03 hasso Exp $
+$NetBSD: distinfo,v 1.21 2009/04/21 12:58:22 tnn Exp $
SHA1 (firefox-3.0.8-source.tar.bz2) = 93f82c64ae9c805964fb6459223a1061e2d328fd
RMD160 (firefox-3.0.8-source.tar.bz2) = 2b56dbb881e169ad0a3acad30b8aa0677c03a5e5
Size (firefox-3.0.8-source.tar.bz2) = 37048920 bytes
SHA1 (patch-aa) = f995b5e53fa11ecb659ab2dd10551db1c71cc5f3
SHA1 (patch-ab) = 4a1704e96b74c76adca615fdf2c9069ca17e9d70
-SHA1 (patch-ac) = c814530c1a8574739b7557d007563232b6070c51
+SHA1 (patch-ac) = af80f061bdd918a61197c9c499e7d1f5b7d10ebd
SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
SHA1 (patch-ap) = 552694ac2d6ca713aec98ec394f1215c048c2392
@@ -19,8 +19,10 @@
SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
SHA1 (patch-bu) = 0714f658001c363f4abbfb248ac77c4862e3ccf9
SHA1 (patch-bv) = ef06a6a774c9d4da7b3fbf6f4e274ab042926e49
-SHA1 (patch-bx) = 7d524d6d46593ba54f12a75c57822518feee84d0
-SHA1 (patch-cb) = 0929baadba9271ee8960a01997c2ded445fe39a2
+SHA1 (patch-bx) = 498f1c06acc670ba6dc9095ba2ce0d14ccad600c
+SHA1 (patch-bz) = f2f6cf120133b23d1d3f182bce90b1b2fbf81142
+SHA1 (patch-ca) = 7ff10fca5e11433b3016612417c6852db8607eb1
+SHA1 (patch-cb) = d046b6eb23a96f75d339e7b7afbf0316f121d4d5
SHA1 (patch-de) = 18e481c3e69fe95b1af87bc800d93f47388fb60a
SHA1 (patch-df) = 17912d183f754ab6661d2be8092e6a07d142632b
SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
@@ -43,6 +45,7 @@
SHA1 (patch-el) = 8a1586e4ebb76f584dc7b1cbc19f0c389ea206f7
SHA1 (patch-em) = 6b8b470fc78a4a56400e77af1057b9266634dcc9
SHA1 (patch-en) = 39926ce5669119c358e8600e2d70d08236e67443
+SHA1 (patch-eo) = 281ec932efe607eee4c020aad3851c2aa44dddd2
SHA1 (patch-wc) = 2de8665ed6c23c26566ca6d50165c0cf413a753d
SHA1 (patch-wd) = fc5c3103ae6f2a2eccc01911a8207f3ca614008b
SHA1 (patch-we) = f7fecce05454e9794ff7a4e7789031a5ef49c42d
diff -r 2ecfc8a63925 -r 6682d47fd62d www/firefox3/patches/patch-ac
--- a/www/firefox3/patches/patch-ac Tue Apr 21 10:03:31 2009 +0000
+++ b/www/firefox3/patches/patch-ac Tue Apr 21 12:58:22 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
+$NetBSD: patch-ac,v 1.2 2009/04/21 12:58:22 tnn Exp $
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2008-02-28 02:21:16.000000000 -0600
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2008-03-14 14:27:45.000000000 -0500
-@@ -64,14 +64,21 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2008-04-09 08:34:20.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -64,14 +64,21 @@ include $(topsrcdir)/config/config.mk
#
# Lots of Unixish x86 flavors
#
@@ -26,7 +26,7 @@
#
# New code for Linux, et. al., with gcc
# Migrate other platforms here after testing
-@@ -185,7 +192,7 @@
+@@ -185,7 +192,7 @@ endif
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -35,7 +35,7 @@
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -240,7 +247,7 @@
+@@ -240,7 +247,7 @@ endif
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -44,15 +44,19 @@
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -332,6 +339,7 @@
- ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))
+@@ -329,9 +336,10 @@ endif
+ #
+ # NetBSD/PPC
+ #
+-ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))
++ifeq ($(OS_ARCH)$(OS_TEST),NetBSDpowerpc)
CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
+AS := $(CC) -c -x assembler-with-cpp
endif
#
-@@ -403,6 +411,13 @@
+@@ -403,6 +411,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c
ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
endif
#
diff -r 2ecfc8a63925 -r 6682d47fd62d www/firefox3/patches/patch-bx
--- a/www/firefox3/patches/patch-bx Tue Apr 21 10:03:31 2009 +0000
+++ b/www/firefox3/patches/patch-bx Tue Apr 21 12:58:22 2009 +0000
@@ -1,9 +1,38 @@
-$NetBSD: patch-bx,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
+$NetBSD: patch-bx,v 1.2 2009/04/21 12:58:22 tnn Exp $
-diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2004-04-18 23:18:18.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2005-12-04 19:34:41.000000000 +0900
-@@ -119,8 +119,10 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2004-04-18 16:18:18.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
+@@ -41,6 +41,7 @@
+ // Implement shared vtbl methods.
+
+ #include "xptcprivate.h"
++#include "xptiprivate.h"
+
+ // The Linux/PPC ABI (aka PPC/SYSV ABI) passes the first 8 integral
+ // parameters and the first 8 floating point parameters in registers
+@@ -71,7 +72,6 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+ {
+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+ nsXPTCMiniVariant* dispatchParams = NULL;
+- nsIInterfaceInfo* iface_info = NULL;
+ const nsXPTMethodInfo* info;
+ PRUint32 paramCount;
+ PRUint32 i;
+@@ -79,12 +79,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+
+ 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);
++ self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+ NS_ASSERTION(info,"no method info");
+ if (! info)
+ return NS_ERROR_UNEXPECTED;
+@@ -119,8 +114,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
dp->val.d = *(double*) ap;
ap += 2;
@@ -14,7 +43,7 @@
}
continue;
}
-@@ -130,8 +132,10 @@
+@@ -130,8 +127,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
else {
dp->val.f = *(float*) ap;
ap += 1;
@@ -25,7 +54,20 @@
}
continue;
}
-@@ -195,7 +199,9 @@
+@@ -179,9 +178,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+ }
+ }
+
+- result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
+-
+- NS_RELEASE(iface_info);
++ result = self->mOuter->CallMethod((PRUint16) methodIndex,
++ info,
++ dispatchParams);
+
+ if (dispatchParams != paramBuffer)
+ delete [] dispatchParams;
+@@ -195,7 +194,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
// however, it's quick, dirty, and'll break when the ABI changes on
// us, which is what we want ;-).
@@ -36,7 +78,7 @@
__asm__ ( \
".section \".text\" \n\t" \
".align 2 \n\t" \
-@@ -206,6 +212,46 @@
+@@ -206,6 +207,46 @@ __asm__ (
"li 11,"#n" \n\t" \
"b SharedStub@local \n" \
);
diff -r 2ecfc8a63925 -r 6682d47fd62d www/firefox3/patches/patch-bz
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox3/patches/patch-bz Tue Apr 21 12:58:22 2009 +0000
@@ -0,0 +1,154 @@
+$NetBSD: patch-bz,v 1.1 2009/04/21 12:58:22 tnn Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2006-12-11 10:45:40.000000000 +0100
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
+@@ -1,43 +1,43 @@
+-# -*- Mode: Asm -*-
+-#
+-# ***** BEGIN LICENSE BLOCK *****
+-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+-#
+-# 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 mozilla.org code.
+-#
+-# The Initial Developer of the Original Code is
+-# Netscape Communications Corporation.
+-# Portions created by the Initial Developer are Copyright (C) 1999
+-# the Initial Developer. All Rights Reserved.
+-#
+-# Contributor(s):
+-# Franz.Sirl-kernel%lauterbach.com@localhost (Franz Sirl)
+-# beard%netscape.com@localhost (Patrick Beard)
+-# waterson%netscape.com@localhost (Chris Waterson)
+-#
+-# 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
+-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+-# in which case the provisions of the GPL or the LGPL are applicable instead
+-# of those above. If you wish to allow use of your version of this file only
+-# under the terms of either the GPL or the LGPL, and not to allow others to
+-# use your version of this file under the terms of the MPL, indicate your
+-# decision by deleting the provisions above and replace them with the notice
+-# and other provisions required by the GPL or the LGPL. If you do not delete
+-# the provisions above, a recipient may use your version of this file under
+-# the terms of any one of the MPL, the GPL or the LGPL.
+-#
+-# ***** END LICENSE BLOCK *****
++// -*- Mode: Asm -*-
++//
++// ***** BEGIN LICENSE BLOCK *****
++// Version: MPL 1.1/GPL 2.0/LGPL 2.1
++//
++// 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 mozilla.org code.
++//
++// The Initial Developer of the Original Code is
++// Netscape Communications Corporation.
++// Portions created by the Initial Developer are Copyright (C) 1999
++// the Initial Developer. All Rights Reserved.
++//
++// Contributor(s):
++// Franz.Sirl-kernel%lauterbach.com@localhost (Franz Sirl)
++// beard%netscape.com@localhost (Patrick Beard)
++// waterson%netscape.com@localhost (Chris Waterson)
++//
++// 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
++// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++// in which case the provisions of the GPL or the LGPL are applicable instead
++// of those above. If you wish to allow use of your version of this file only
++// under the terms of either the GPL or the LGPL, and not to allow others to
++// use your version of this file under the terms of the MPL, indicate your
++// decision by deleting the provisions above and replace them with the notice
++// and other provisions required by the GPL or the LGPL. If you do not delete
++// the provisions above, a recipient may use your version of this file under
++// the terms of any one of the MPL, the GPL or the LGPL.
++//
++// ***** END LICENSE BLOCK *****
+
+ .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
+ .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+@@ -60,23 +60,23 @@
+ .type SharedStub,@function
+
+ SharedStub:
+- stwu sp,-112(sp) # room for
+- # linkage (8),
+- # gprData (32),
+- # fprData (64),
+- # stack alignment(8)
++ stwu sp,-112(sp) // room for
Home |
Main Index |
Thread Index |
Old Index