Thu Nov 7 15:47:23 2013 UTC ()
Fix PR pkg/48240 and bump PKGREVISION

* Use __fstat50 etc instead of fstat on NetBSD. Based on martin@'s patch
  for firefox 27.0.
  Restore session is recovered on NetBSD/amd64.


(ryoon)
diff -r1.143 -r1.144 pkgsrc/www/firefox/Makefile
diff -r1.122 -r1.123 pkgsrc/www/firefox/distinfo
diff -r0 -r1.1 pkgsrc/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm
diff -r0 -r1.1 pkgsrc/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm

cvs diff -r1.143 -r1.144 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2013/11/05 14:20:41 1.143
+++ pkgsrc/www/firefox/Makefile 2013/11/07 15:47:23 1.144
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.143 2013/11/05 14:20:41 ryoon Exp $ 1# $NetBSD: Makefile,v 1.144 2013/11/07 15:47:23 ryoon Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 25.0 4MOZ_BRANCH= 25.0
5MOZ_BRANCH_MINOR=  5MOZ_BRANCH_MINOR=
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
9PKGREVISION= 1 9PKGREVISION= 2
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12#MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12#MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15WRKSRC= ${WRKDIR}/mozilla-release 15WRKSRC= ${WRKDIR}/mozilla-release
16 16
17MAINTAINER= ryoon@NetBSD.org 17MAINTAINER= ryoon@NetBSD.org
18HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 18HOMEPAGE= http://www.mozilla.com/en-US/firefox/
19COMMENT= Web browser with support for extensions 19COMMENT= Web browser with support for extensions
20LICENSE= mpl-1.1 20LICENSE= mpl-1.1
21 21
22MOZILLA_DIR= # empty 22MOZILLA_DIR= # empty

cvs diff -r1.122 -r1.123 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2013/11/05 14:40:49 1.122
+++ pkgsrc/www/firefox/distinfo 2013/11/07 15:47:23 1.123
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.122 2013/11/05 14:40:49 ryoon Exp $ 1$NetBSD: distinfo,v 1.123 2013/11/07 15:47:23 ryoon Exp $
2 2
3SHA1 (firefox-25.0.source.tar.bz2) = 854722e283659d2b6b2eacd38f757b3c5b63a448 3SHA1 (firefox-25.0.source.tar.bz2) = 854722e283659d2b6b2eacd38f757b3c5b63a448
4RMD160 (firefox-25.0.source.tar.bz2) = f320994b6b2f2030b5a68bc28cdd6904d9ef8ce3 4RMD160 (firefox-25.0.source.tar.bz2) = f320994b6b2f2030b5a68bc28cdd6904d9ef8ce3
5Size (firefox-25.0.source.tar.bz2) = 127524815 bytes 5Size (firefox-25.0.source.tar.bz2) = 127524815 bytes
6SHA1 (patch-aa) = c52746ff141b6de211380b848b174c22ba7909c4 6SHA1 (patch-aa) = c52746ff141b6de211380b848b174c22ba7909c4
7SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be 7SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
8SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2 8SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2
9SHA1 (patch-ao) = 3c777c8caf7f951a711c79612c08cee2cd338a57 9SHA1 (patch-ao) = 3c777c8caf7f951a711c79612c08cee2cd338a57
10SHA1 (patch-as) = 783257cf77fced036afb14c5132c1f051d951a22 10SHA1 (patch-as) = 783257cf77fced036afb14c5132c1f051d951a22
11SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 11SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
12SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 12SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
13SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85 13SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
14SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3 14SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3
@@ -103,26 +103,28 @@ SHA1 (patch-modules_libpref_src_init_all @@ -103,26 +103,28 @@ SHA1 (patch-modules_libpref_src_init_all
103SHA1 (patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c) = 31d49db31b1e130f1b455f883e5b7c606d438771 103SHA1 (patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c) = 31d49db31b1e130f1b455f883e5b7c606d438771
104SHA1 (patch-netwerk_sctp_src_netinet_sctp__os__userspace.h) = b3f94ac0f2bd652371fef22c642b14bf30162998 104SHA1 (patch-netwerk_sctp_src_netinet_sctp__os__userspace.h) = b3f94ac0f2bd652371fef22c642b14bf30162998
105SHA1 (patch-netwerk_sctp_src_netinet_sctp__usrreq.c) = 421b6e071a9934567ccba337033a42208e6e4bd5 105SHA1 (patch-netwerk_sctp_src_netinet_sctp__usrreq.c) = 421b6e071a9934567ccba337033a42208e6e4bd5
106SHA1 (patch-netwerk_sctp_src_user__recv__thread.c) = cf26945441f74c581aeb5a8d7435780f4a48a607 106SHA1 (patch-netwerk_sctp_src_user__recv__thread.c) = cf26945441f74c581aeb5a8d7435780f4a48a607
107SHA1 (patch-netwerk_sctp_src_user__socket.c) = c0b32ed2888b5845ce2b7646b85af8f0728bc7c3 107SHA1 (patch-netwerk_sctp_src_user__socket.c) = c0b32ed2888b5845ce2b7646b85af8f0728bc7c3
108SHA1 (patch-netwerk_sctp_src_user__socketvar.h) = 1b6e2864916ced693b1ab6c1bbdd80a4ffc4f7e4 108SHA1 (patch-netwerk_sctp_src_user__socketvar.h) = 1b6e2864916ced693b1ab6c1bbdd80a4ffc4f7e4
109SHA1 (patch-netwerk_wifi_moz.build) = 05da9f5e4abd990c5c5af7b1db08b8682917e1bc 109SHA1 (patch-netwerk_wifi_moz.build) = 05da9f5e4abd990c5c5af7b1db08b8682917e1bc
110SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = 9c343bef282192e1ac4b0742f160137d394c21b6 110SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = 9c343bef282192e1ac4b0742f160137d394c21b6
111SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4 111SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
112SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a 112SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
113SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121 113SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
114SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = e9749dfeb0d3fcb4637935322ffd1e0cad4f8ec3 114SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = e9749dfeb0d3fcb4637935322ffd1e0cad4f8ec3
115SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452 115SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452
 116SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 8d741f5a00c679a0e3859870a19a16bd58f9ba5d
 117SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = b05a21e1ecad8de6cd8057d2a3ee76167293cde2
116SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932 118SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932
117SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = 6936e5408fc7f0110768f3fc8f27506c0e7879fa 119SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = 6936e5408fc7f0110768f3fc8f27506c0e7879fa
118SHA1 (patch-toolkit_toolkit.mozbuild) = 07e87d977cee59c0f5a5d14a8d41dc2a4230c01e 120SHA1 (patch-toolkit_toolkit.mozbuild) = 07e87d977cee59c0f5a5d14a8d41dc2a4230c01e
119SHA1 (patch-toolkit_xre_Makefile.in) = 6ad65fa2fd026888cc8345e184daf2a070ea4885 121SHA1 (patch-toolkit_xre_Makefile.in) = 6ad65fa2fd026888cc8345e184daf2a070ea4885
120SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8 122SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8
121SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa 123SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa
122SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9 124SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9
123SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f 125SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f
124SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf 126SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf
125SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488 127SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488
126SHA1 (patch-xj) = c373bb0135ef042d07c98e648dce1612a0b47efe 128SHA1 (patch-xj) = c373bb0135ef042d07c98e648dce1612a0b47efe
127SHA1 (patch-xk) = 3accd4080f4576391f06a0a16a8fb477b2d7b3e3 129SHA1 (patch-xk) = 3accd4080f4576391f06a0a16a8fb477b2d7b3e3
128SHA1 (patch-xl) = e7dbe631e8d1fcee48054c0cb8ff01169cfcb744 130SHA1 (patch-xl) = e7dbe631e8d1fcee48054c0cb8ff01169cfcb744

File Added: pkgsrc/www/firefox/patches/Attic/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm
$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.1 2013/11/07 15:47:23 ryoon Exp $

Based on martin@'s patch for firefox 27.0

* Use off_t for st_size
* Use function name for NetBSD

--- toolkit/components/osfile/modules/osfile_unix_back.jsm.orig	2013-10-25 22:27:41.000000000 +0000
+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
@@ -170,7 +170,7 @@
          }
 
          stat.add_field_at(OS.Constants.libc.OSFILE_OFFSETOF_STAT_ST_SIZE,
-                        "st_size", Types.size_t.implementation);
+                        "st_size", Types.off_t.implementation);
          Types.stat = stat.getType();
        }
 
@@ -397,10 +397,17 @@
                     /*oflags*/Types.int,
                     /*mode*/  Types.int);
 
+       if (OS.Constants.Sys.Name == "NetBSD") {
+       UnixFile.opendir =
+         declareFFI("__opendir30", ctypes.default_abi,
+                    /*return*/ Types.null_or_DIR_ptr,
+                    /*path*/   Types.path);
+       } else {
        UnixFile.opendir =
          declareFFI("opendir", ctypes.default_abi,
                     /*return*/ Types.null_or_DIR_ptr,
                     /*path*/   Types.path);
+      }
 
        UnixFile.pread =
          declareFFI("pread", ctypes.default_abi,
@@ -434,6 +441,11 @@
            declareFFI("readdir$INODE64", ctypes.default_abi,
                      /*return*/Types.null_or_dirent_ptr,
                       /*dir*/   Types.DIR.in_ptr); // For MacOS X
+       } else if (OS.Constants.Sys.Name == "NetBSD") {
+         UnixFile.readdir =
+           declareFFI("__readdir30", ctypes.default_abi,
+                      /*return*/Types.null_or_dirent_ptr,
+                      /*dir*/   Types.DIR.in_ptr);
        } else {
          UnixFile.readdir =
            declareFFI("readdir", ctypes.default_abi,
@@ -553,6 +565,26 @@
          UnixFile.fstat = function stat(fd, buf) {
            return fxstat(ver, fd, buf);
          };
+       } else if (OS.Constants.Sys.Name == "NetBSD") {
+         // NetBSD 5.0 and newer
+         UnixFile.stat =
+           declareFFI("__stat50", ctypes.default_abi,
+                      /*return*/ Types.negativeone_or_nothing,
+                      /*path*/   Types.path,
+                      /*buf*/    Types.stat.out_ptr
+                     );
+         UnixFile.lstat =
+           declareFFI("__lstat50", ctypes.default_abi,
+                      /*return*/ Types.negativeone_or_nothing,
+                      /*path*/   Types.path,
+                      /*buf*/    Types.stat.out_ptr
+                     );
+         UnixFile.fstat =
+           declareFFI("__fstat50", ctypes.default_abi,
+                      /*return*/ Types.negativeone_or_nothing,
+                      /*fd*/     Types.fd,
+                      /*buf*/    Types.stat.out_ptr
+                     );
        } else {
          // Mac OS X 32-bits, other Unix
          UnixFile.stat =

File Added: pkgsrc/www/firefox/patches/Attic/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm
$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__front.jsm,v 1.1 2013/11/07 15:47:23 ryoon Exp $

* Use off_t for st_size

--- toolkit/components/osfile/modules/osfile_unix_front.jsm.orig	2013-10-25 22:27:41.000000000 +0000
+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
@@ -734,7 +734,7 @@
      File.Info = function Info(stat) {
        let isDir = (stat.st_mode & OS.Constants.libc.S_IFMT) == OS.Constants.libc.S_IFDIR;
        let isSymLink = (stat.st_mode & OS.Constants.libc.S_IFMT) == OS.Constants.libc.S_IFLNK;
-       let size = exports.OS.Shared.Type.size_t.importFromC(stat.st_size);
+       let size = exports.OS.Shared.Type.off_t.importFromC(stat.st_size);
 
        let lastAccessDate = new Date(stat.st_atime * 1000);
        let lastModificationDate = new Date(stat.st_mtime * 1000);