Fri Nov 8 12:51:25 2013 UTC ()
Fix PR pkg/48240 and bump PKGREVISION

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


(ryoon)
diff -r1.1 -r1.2 pkgsrc/www/firefox24/Makefile
diff -r1.1 -r1.2 pkgsrc/www/firefox24/distinfo
diff -r0 -r1.1 pkgsrc/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm
diff -r0 -r1.1 pkgsrc/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__front.jsm

cvs diff -r1.1 -r1.2 pkgsrc/www/firefox24/Attic/Makefile (expand / switch to unified diff)

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

cvs diff -r1.1 -r1.2 pkgsrc/www/firefox24/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox24/Attic/distinfo 2013/11/03 04:51:59 1.1
+++ pkgsrc/www/firefox24/Attic/distinfo 2013/11/08 12:51:25 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.1 2013/11/03 04:51:59 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2013/11/08 12:51:25 ryoon Exp $
2 2
3SHA1 (firefox-24.1.0esr.source.tar.bz2) = faeed7eb315e9e0a380ab5081b96800590eb6154 3SHA1 (firefox-24.1.0esr.source.tar.bz2) = faeed7eb315e9e0a380ab5081b96800590eb6154
4RMD160 (firefox-24.1.0esr.source.tar.bz2) = 5cb36d654ecbd89f9b77e1a96c2eff7d54c45b93 4RMD160 (firefox-24.1.0esr.source.tar.bz2) = 5cb36d654ecbd89f9b77e1a96c2eff7d54c45b93
5Size (firefox-24.1.0esr.source.tar.bz2) = 119816789 bytes 5Size (firefox-24.1.0esr.source.tar.bz2) = 119816789 bytes
6SHA1 (patch-aa) = e8a10637cefb668f1db518464ba75b5469090f8f 6SHA1 (patch-aa) = e8a10637cefb668f1db518464ba75b5469090f8f
7SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be 7SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
8SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2 8SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2
9SHA1 (patch-ao) = ebf95a9abf76439cdd890ea34f75f0d8d1114fe0 9SHA1 (patch-ao) = ebf95a9abf76439cdd890ea34f75f0d8d1114fe0
10SHA1 (patch-as) = 678d50cccaa29e32bb703a8c66ecf31a10fe8078 10SHA1 (patch-as) = 678d50cccaa29e32bb703a8c66ecf31a10fe8078
11SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 11SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
12SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d 12SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d
13SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85 13SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
14SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3 14SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3
@@ -107,26 +107,28 @@ SHA1 (patch-netwerk_sctp_src_netinet_sct @@ -107,26 +107,28 @@ SHA1 (patch-netwerk_sctp_src_netinet_sct
107SHA1 (patch-netwerk_sctp_src_netinet_sctp__usrreq.c) = 421b6e071a9934567ccba337033a42208e6e4bd5 107SHA1 (patch-netwerk_sctp_src_netinet_sctp__usrreq.c) = 421b6e071a9934567ccba337033a42208e6e4bd5
108SHA1 (patch-netwerk_sctp_src_user__recv__thread.c) = cf26945441f74c581aeb5a8d7435780f4a48a607 108SHA1 (patch-netwerk_sctp_src_user__recv__thread.c) = cf26945441f74c581aeb5a8d7435780f4a48a607
109SHA1 (patch-netwerk_sctp_src_user__socket.c) = c0b32ed2888b5845ce2b7646b85af8f0728bc7c3 109SHA1 (patch-netwerk_sctp_src_user__socket.c) = c0b32ed2888b5845ce2b7646b85af8f0728bc7c3
110SHA1 (patch-netwerk_sctp_src_user__socketvar.h) = 1b6e2864916ced693b1ab6c1bbdd80a4ffc4f7e4 110SHA1 (patch-netwerk_sctp_src_user__socketvar.h) = 1b6e2864916ced693b1ab6c1bbdd80a4ffc4f7e4
111SHA1 (patch-netwerk_wifi_Makefile.in) = 9eef62b579a7000448aa898a560d3b46676af4ee 111SHA1 (patch-netwerk_wifi_Makefile.in) = 9eef62b579a7000448aa898a560d3b46676af4ee
112SHA1 (patch-netwerk_wifi_moz.build) = c3300b73cb1cb63ce05665064cbdffde3a020d11 112SHA1 (patch-netwerk_wifi_moz.build) = c3300b73cb1cb63ce05665064cbdffde3a020d11
113SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = 9c343bef282192e1ac4b0742f160137d394c21b6 113SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = 9c343bef282192e1ac4b0742f160137d394c21b6
114SHA1 (patch-pb) = 6d2eb7e55121ed6304cc1a5bdb9f9b663c0f7a42 114SHA1 (patch-pb) = 6d2eb7e55121ed6304cc1a5bdb9f9b663c0f7a42
115SHA1 (patch-pc) = 9faf1070c648c2697afb61ad3860e144224a0d42 115SHA1 (patch-pc) = 9faf1070c648c2697afb61ad3860e144224a0d42
116SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121 116SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
117SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = e9749dfeb0d3fcb4637935322ffd1e0cad4f8ec3 117SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = e9749dfeb0d3fcb4637935322ffd1e0cad4f8ec3
118SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452 118SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452
119SHA1 (patch-toolkit_components_osfile_osfile__unix__allthreads.jsm) = 0bb66da3445da1cab81b9ddf46e74b03070243af 119SHA1 (patch-toolkit_components_osfile_osfile__unix__allthreads.jsm) = 0bb66da3445da1cab81b9ddf46e74b03070243af
 120SHA1 (patch-toolkit_components_osfile_osfile__unix__back.jsm) = 73136e54fbc18d6b932dd5f2358a062220d0f8ef
 121SHA1 (patch-toolkit_components_osfile_osfile__unix__front.jsm) = 0d8200b8c43dc4c56f5e3d53fd13f48d7ff6dc38
120SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932 122SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932
121SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = 6936e5408fc7f0110768f3fc8f27506c0e7879fa 123SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = 6936e5408fc7f0110768f3fc8f27506c0e7879fa
122SHA1 (patch-toolkit_toolkit.mozbuild) = 07e87d977cee59c0f5a5d14a8d41dc2a4230c01e 124SHA1 (patch-toolkit_toolkit.mozbuild) = 07e87d977cee59c0f5a5d14a8d41dc2a4230c01e
123SHA1 (patch-toolkit_xre_Makefile.in) = 6ad65fa2fd026888cc8345e184daf2a070ea4885 125SHA1 (patch-toolkit_xre_Makefile.in) = 6ad65fa2fd026888cc8345e184daf2a070ea4885
124SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8 126SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8
125SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa 127SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa
126SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9 128SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9
127SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f 129SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f
128SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf 130SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf
129SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488 131SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488
130SHA1 (patch-xj) = c373bb0135ef042d07c98e648dce1612a0b47efe 132SHA1 (patch-xj) = c373bb0135ef042d07c98e648dce1612a0b47efe
131SHA1 (patch-xk) = 3accd4080f4576391f06a0a16a8fb477b2d7b3e3 133SHA1 (patch-xk) = 3accd4080f4576391f06a0a16a8fb477b2d7b3e3
132SHA1 (patch-xl) = e7dbe631e8d1fcee48054c0cb8ff01169cfcb744 134SHA1 (patch-xl) = e7dbe631e8d1fcee48054c0cb8ff01169cfcb744

File Added: pkgsrc/www/firefox24/patches/Attic/patch-toolkit_components_osfile_osfile__unix__back.jsm
$NetBSD: patch-toolkit_components_osfile_osfile__unix__back.jsm,v 1.1 2013/11/08 12:51:25 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/osfile_unix_back.jsm.orig	2013-10-22 06:19:20.000000000 +0000
+++ toolkit/components/osfile/osfile_unix_back.jsm
@@ -173,7 +173,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();
        }
 
@@ -400,10 +400,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,
@@ -437,6 +444,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); // Other Unices
        } else {
          UnixFile.readdir =
            declareFFI("readdir", ctypes.default_abi,
@@ -556,6 +568,25 @@
          UnixFile.fstat = function stat(fd, buf) {
            return fxstat(ver, fd, buf);
          };
+       } else if (OS.Constants.Sys.Name == "NetBSD") {
+         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/firefox24/patches/Attic/patch-toolkit_components_osfile_osfile__unix__front.jsm
$NetBSD: patch-toolkit_components_osfile_osfile__unix__front.jsm,v 1.1 2013/11/08 12:51:25 ryoon Exp $

* Use off_t for st_size

--- toolkit/components/osfile/osfile_unix_front.jsm.orig	2013-10-22 06:19:20.000000000 +0000
+++ toolkit/components/osfile/osfile_unix_front.jsm
@@ -721,7 +721,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);