[pkgsrc/trunk]: pkgsrc/www/firefox - copy amd64 support patch from www/mozilla

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/firefox - copy amd64 support patch from www/mozilla
From: taya <taya%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:09:56 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/52b3d19437f1
branches:  trunk
changeset: 476064:52b3d19437f1
user:      taya <taya%pkgsrc.org@localhost>
date:      Wed Jun 02 15:09:01 2004 +0000

description:
- copy amd64 support patch from www/mozilla
- correct ARM architecture handling
- add g++-3.0 support for xpcom module on alpha
- bump PKGREVISION

diffstat:

 www/firefox/Makefile         |    5 +-
 www/firefox/distinfo         |   13 +-
 www/firefox/patches/patch-ac |   23 +++-
 www/firefox/patches/patch-ba |   66 ++++++++++++-
 www/firefox/patches/patch-bb |   31 +++--
 www/firefox/patches/patch-bs |   14 ++
 www/firefox/patches/patch-bt |   16 +++
 www/firefox/patches/patch-bu |  179 ++++++++++++++++++++++++++++++++++++
 www/firefox/patches/patch-bv |  211 +++++++++++++++++++++++++++++++++++++++++++
 www/firefox/patches/patch-bw |   64 +++++++++++++
 10 files changed, 592 insertions(+), 30 deletions(-)

diffs (truncated from 757 to 300 lines):

diff -r e707bc78de1f -r 52b3d19437f1 www/firefox/Makefile
--- a/www/firefox/Makefile      Wed Jun 02 14:32:22 2004 +0000
+++ b/www/firefox/Makefile      Wed Jun 02 15:09:01 2004 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/04/24 01:21:17 taya Exp $
+# $NetBSD: Makefile,v 1.4 2004/06/02 15:09:01 taya Exp $
 
 MOZILLA=       firefox
 MOZILLA_BIN=   firefox-bin
+MOZCONFDIR=    .mozilla
 MOZ_VER=       0.8
-PKGREVISION=   2
+PKGREVISION=   3
 EXTRACT_SUFX=  .tar.bz2
 DISTNAME=      ${MOZILLA}-source-${MOZ_VER}
 MASTER_SITES=  http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
diff -r e707bc78de1f -r 52b3d19437f1 www/firefox/distinfo
--- a/www/firefox/distinfo      Wed Jun 02 14:32:22 2004 +0000
+++ b/www/firefox/distinfo      Wed Jun 02 15:09:01 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2004/04/29 16:19:36 recht Exp $
+$NetBSD: distinfo,v 1.5 2004/06/02 15:09:01 taya Exp $
 
 SHA1 (firefox-source-0.8.tar.bz2) = 8282f17a8f51265a86923c03362bba629162bf05
 Size (firefox-source-0.8.tar.bz2) = 31102943 bytes
 SHA1 (patch-ab) = ddb1ba102585037100f7dd0c0c04e45caf32732d
-SHA1 (patch-ac) = 3181d6004e513988f5169df3cc13b4ca98c19bec
+SHA1 (patch-ac) = d5e3f5833860cd3404030eff76c993ab48c0d8df
 SHA1 (patch-ad) = 09091d0a2ded2775ca35d1315ae9b95c506b28ef
 SHA1 (patch-ae) = 99935f034e6485e9e0d4eaf20e6ddd2b90b75ad5
 SHA1 (patch-af) = 3b6f5c71146b3a402b164b7f10fb652408712b73
@@ -20,8 +20,8 @@
 SHA1 (patch-aw) = ba1a408cd3b44dcd2123672ec4cbcefb436e5330
 SHA1 (patch-ax) = 070c88dee0446b093ab1c2a9120dc1747642d46f
 SHA1 (patch-ay) = b9bc5ce449c6851781b12cd1e7bc43186b3654fd
-SHA1 (patch-ba) = 35256ee83e446c174adf311d8d8aaf90207f309e
-SHA1 (patch-bb) = 11929b787fcc04306612711bc15b6c53d73afd63
+SHA1 (patch-ba) = d2e195900ed806aaf18e8a56efcf26c0bd4941ce
+SHA1 (patch-bb) = b3cedb7b6ae46749d5222ab9fd6bc087c781d459
 SHA1 (patch-be) = dd85f24f2ebb10d2435055ab4540d27178d8074d
 SHA1 (patch-bm) = 17cf1207bd3f3fffa355a81c8f803704068438a3
 SHA1 (patch-bn) = 78e6b99604049e6033985c230155dfd437c97660
@@ -29,3 +29,8 @@
 SHA1 (patch-bp) = b542833425591539a6b859be4eea55c88b7d69e8
 SHA1 (patch-bq) = 0c520287d97027da06a5aa65cbd038bf19a49dde
 SHA1 (patch-br) = 4fd94d2748a39a21791aaef27c9c8a8d2a1eadd8
+SHA1 (patch-bs) = e9434aadc52b0120dcfc80e57002152d2bd47605
+SHA1 (patch-bt) = a033b83ee633391ffc138442697fbe754ec92902
+SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
+SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
+SHA1 (patch-bw) = 789f63b68eaffac878866b5d111de60939d1f844
diff -r e707bc78de1f -r 52b3d19437f1 www/firefox/patches/patch-ac
--- a/www/firefox/patches/patch-ac      Wed Jun 02 14:32:22 2004 +0000
+++ b/www/firefox/patches/patch-ac      Wed Jun 02 15:09:01 2004 +0000
@@ -1,9 +1,18 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/02/29 17:44:58 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2004/06/02 15:09:01 taya Exp $
 
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in      2003-08-15 13:00:23.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in    2003-10-20 10:17:16.000000000 +0900
-@@ -135,7 +135,7 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2003-08-15 13:00:23.000000000 +0900
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in      2004-05-30 21:36:44.000000000 +0900
+@@ -49,6 +49,9 @@
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPPSRCS               := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+ endif
++ifeq (amd64,$(OS_TEST))
++CPPSRCS                := xptcinvoke_unixish_amd64.cpp xptcstubs_unixish_amd64.cpp
++endif
+ endif
+ #
+ # New code for Linux, et. al., with gcc
+@@ -135,7 +138,7 @@
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -12,7 +21,7 @@
  CPPSRCS               := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -169,7 +169,7 @@
+@@ -169,7 +172,7 @@
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -21,7 +30,7 @@
  CPPSRCS               := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -295,6 +295,13 @@
+@@ -295,6 +298,13 @@
  CPPSRCS               := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
  ASFILES               := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif
diff -r e707bc78de1f -r 52b3d19437f1 www/firefox/patches/patch-ba
--- a/www/firefox/patches/patch-ba      Wed Jun 02 14:32:22 2004 +0000
+++ b/www/firefox/patches/patch-ba      Wed Jun 02 15:09:01 2004 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-ba,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-ba,v 1.2 2004/06/02 15:09:01 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
 --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg  2000-12-02 06:29:17.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.cfg        2003-10-20 10:18:58.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.cfg        2004-05-30 23:39:50.000000000 +0900
 @@ -45,7 +45,8 @@
  
  #define PR_AF_INET6 24  /* same as AF_INET6 */
  
 -#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__arm__) || \
-+      defined(__armel__) || defined(__MIPSEL__)
++#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
++      defined(__MIPSEL__)
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
@@ -64,7 +64,63 @@
 +#define PR_ALIGN_OF_DOUBLE  8 
 +#define PR_ALIGN_OF_POINTER 8 
 +
-+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__armeb__)
++#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__)
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
+@@ -184,6 +231,55 @@
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
++#elif defined(__amd64__)
++#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
++
++#define HAVE_LONG_LONG
++#define HAVE_ALIGNED_DOUBLES
++#define HAVE_ALIGNED_LONGLONGS
++
+ #elif defined(__powerpc__) || defined(__m68k__)
+ 
+ #undef  IS_LITTLE_ENDIAN
diff -r e707bc78de1f -r 52b3d19437f1 www/firefox/patches/patch-bb
--- a/www/firefox/patches/patch-bb      Wed Jun 02 14:32:22 2004 +0000
+++ b/www/firefox/patches/patch-bb      Wed Jun 02 15:09:01 2004 +0000
@@ -1,8 +1,15 @@
-$NetBSD: patch-bb,v 1.1.1.1 2004/02/29 17:45:02 xtraeme Exp $
+$NetBSD: patch-bb,v 1.2 2004/06/02 15:09:01 taya Exp $
 
---- nsprpub/pr/include/md/_netbsd.h.orig       2004-02-27 14:55:33.000000000 +0900
-+++ nsprpub/pr/include/md/_netbsd.h    2004-02-27 15:29:42.000000000 +0900
-@@ -48,12 +48,20 @@
+diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
+--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h    2003-09-12 02:24:53.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.h  2004-05-30 23:41:41.000000000 +0900
+@@ -44,16 +44,26 @@
+ #define _PR_SI_ARCHITECTURE "x86"
+ #elif defined(__alpha__)
+ #define _PR_SI_ARCHITECTURE "alpha"
++#elif defined(__amd64__)
++#define _PR_SI_ARCHITECTURE "amd64"
+ #elif defined(__m68k__)
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
  #define _PR_SI_ARCHITECTURE "powerpc"
@@ -14,16 +21,16 @@
  #define _PR_SI_ARCHITECTURE "mips"
  #elif defined(__arm32__)
  #define _PR_SI_ARCHITECTURE "arm32"
++#elif defined(__ARMEL__)
++#define _PR_SI_ARCHITECTURE "armel"
++#elif defined(__ARMEL__)
++#define _PR_SI_ARCHITECTURE "armeb"
 +#elif defined(__arm__)
 +#define _PR_SI_ARCHITECTURE "arm"
-+#elif defined(__armel__)
-+#define _PR_SI_ARCHITECTURE "armel"
-+#elif defined(__armeb__)
-+#define _PR_SI_ARCHITECTURE "armeb"
  #endif
  
  #if defined(__ELF__)
-@@ -86,6 +94,12 @@
+@@ -86,6 +96,12 @@
  #define _PR_INET6_PROBE
  #endif
  
@@ -36,7 +43,7 @@
  #define USE_SETJMP
  
  #ifndef _PR_PTHREADS
-@@ -108,7 +122,17 @@
+@@ -108,7 +124,17 @@
  }
  #define       _MD_GET_SP(_thread)     CONTEXT(_thread)[2]
  #endif
@@ -55,12 +62,12 @@
  #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)                 \
  {                                                                     \
      sigsetjmp(CONTEXT(_thread), 1);                                   \
-@@ -150,7 +174,7 @@
+@@ -150,7 +176,7 @@
  }
  #define       _MD_GET_SP(_thread)     CONTEXT(_thread)[32]
  #endif
 -#ifdef __arm32__
-+#if defined(__arm32__) || defined(__arm__) || defined(__armel__) || defined(__armeb__)
++#ifdef __arm__
  #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)                 \
  {                                                                     \
      sigsetjmp(CONTEXT(_thread), 1);                                   \
diff -r e707bc78de1f -r 52b3d19437f1 www/firefox/patches/patch-bs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-bs      Wed Jun 02 15:09:01 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-bs,v 1.1 2004/06/02 15:09:01 taya Exp $
+
+--- config/mkdepend/imakemdep.h.orig   2004-05-30 11:16:09.000000000 +0900
++++ config/mkdepend/imakemdep.h        2004-05-30 11:17:01.000000000 +0900
+@@ -277,6 +277,9 @@
+ # ifdef __i386__
+       "-D__i386__",
+ # endif
++#if defined(__amd64__) || defined(__x86_64__)
++      "-D__amd64__ -D__x86_64__",
++# endif
+ # ifdef __GNUC__
+       "-traditional",
+ # endif
diff -r e707bc78de1f -r 52b3d19437f1 www/firefox/patches/patch-bt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-bt      Wed Jun 02 15:09:01 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-bt,v 1.1 2004/06/02 15:09:01 taya Exp $
+
+--- nsprpub/pr/src/io/prprf.c.orig     2003-02-27 08:53:42.000000000 +0900
++++ nsprpub/pr/src/io/prprf.c  2004-05-30 14:47:15.000000000 +0900
+@@ -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(__amd64__)
++#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 -r e707bc78de1f -r 52b3d19437f1 www/firefox/patches/patch-bu
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-bu      Wed Jun 02 15:09:01 2004 +0000
@@ -0,0 +1,179 @@
+$NetBSD: patch-bu,v 1.1 2004/06/02 15:09:01 taya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig        2004-05-30 21:38:13.000000000 +0900
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp     2004-05-30 21:37:22.000000000 +0900
+@@ -0,0 +1,174 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/www regxpcom creates same user config directory ".mozi...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of pkg_install to 20040601.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www regxpcom creates same user config directory ".mozi...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of pkg_install to 20040601.
Indexes:
Home | Main Index | Thread Index | Old Index