pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/seamonkey Fix PR pkg/48240 and bump PKGREVISION
details: https://anonhg.NetBSD.org/pkgsrc/rev/8c17e8ce988c
branches: trunk
changeset: 626484:8c17e8ce988c
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Wed Nov 13 14:23:02 2013 +0000
description:
Fix PR pkg/48240 and bump PKGREVISION
* Use *30 instead of *50. Restore session is recovered on NetBSD/amd64 5.2.
Based on martin@'s patch on pkgsrc-users@.
diffstat:
www/seamonkey/Makefile | 3 +-
www/seamonkey/distinfo | 4 +-
www/seamonkey/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm | 13 +++++----
3 files changed, 11 insertions(+), 9 deletions(-)
diffs (73 lines):
diff -r 35b0d0679381 -r 8c17e8ce988c www/seamonkey/Makefile
--- a/www/seamonkey/Makefile Wed Nov 13 14:17:50 2013 +0000
+++ b/www/seamonkey/Makefile Wed Nov 13 14:23:02 2013 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.109 2013/11/04 06:01:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.110 2013/11/13 14:23:02 ryoon Exp $
DISTNAME= # empty
PKGNAME= seamonkey-${SM_VER:S/b/beta/}
+PKGREVISION= 1
SM_VER= 2.22
#LIGHTNINGVER= 1.9
CATEGORIES= www
diff -r 35b0d0679381 -r 8c17e8ce988c www/seamonkey/distinfo
--- a/www/seamonkey/distinfo Wed Nov 13 14:17:50 2013 +0000
+++ b/www/seamonkey/distinfo Wed Nov 13 14:23:02 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.105 2013/11/08 12:55:51 ryoon Exp $
+$NetBSD: distinfo,v 1.106 2013/11/13 14:23:02 ryoon Exp $
SHA1 (enigmail-1.6.tar.gz) = 51a7eb7d86ce24d8199f741a0079f0d56ecd6368
RMD160 (enigmail-1.6.tar.gz) = a854bb37a6a7f298f6cc268110dcb21d00909fa4
@@ -118,7 +118,7 @@
SHA1 (patch-mozilla_netwerk_wifi_nsWifiScannerFreeBSD.cpp) = 780dabd37ea0eab07932489181de4cdfe0a5b4a3
SHA1 (patch-mozilla_security_manager_ssl_src_JARSignatureVerification.cpp) = 9f265784d23be668dbb1fcb4e09185670a298293
SHA1 (patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp) = 56531146315f3eac703a02ed23ef90f7ac4917b9
-SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm) = ffe3a1c0915cab3d0f14b47a57925e79c13bd3d5
+SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm) = bef62d06b0a840be9d41f7c96acb39ca5bd107d7
SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm) = 84c7aeeab671115c99f9b9afa7b0958830167e49
SHA1 (patch-mozilla_toolkit_library_Makefile.in) = e7915dacee2a0bd3983cafd421ffe55ed54a5874
SHA1 (patch-mozilla_toolkit_mozapps_update_updater_updater.cpp) = 2d4769262671a41950d872f46806374efbbccb37
diff -r 35b0d0679381 -r 8c17e8ce988c www/seamonkey/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm
--- a/www/seamonkey/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm Wed Nov 13 14:17:50 2013 +0000
+++ b/www/seamonkey/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm Wed Nov 13 14:23:02 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.1 2013/11/08 12:55:52 ryoon Exp $
+$NetBSD: patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.2 2013/11/13 14:23:02 ryoon Exp $
--- mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2013-10-29 01:21:11.000000000 +0000
+++ mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm
@@ -41,26 +41,27 @@
} else {
UnixFile.readdir =
declareFFI("readdir", ctypes.default_abi,
-@@ -553,6 +565,26 @@
+@@ -553,6 +565,27 @@
UnixFile.fstat = function stat(fd, buf) {
return fxstat(ver, fd, buf);
};
+ } else if (OS.Constants.Sys.Name == "NetBSD") {
-+ // NetBSD 5.0 and newer
++ // NetBSD 5.0 uses *30, and netbsd-6 uses *50
++ let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50";
+ UnixFile.stat =
-+ declareFFI("__stat50", ctypes.default_abi,
++ declareFFI("__stat"+v, ctypes.default_abi,
+ /*return*/ Types.negativeone_or_nothing,
+ /*path*/ Types.path,
+ /*buf*/ Types.stat.out_ptr
+ );
+ UnixFile.lstat =
-+ declareFFI("__lstat50", ctypes.default_abi,
++ declareFFI("__lstat"+v, ctypes.default_abi,
+ /*return*/ Types.negativeone_or_nothing,
+ /*path*/ Types.path,
+ /*buf*/ Types.stat.out_ptr
+ );
+ UnixFile.fstat =
-+ declareFFI("__fstat50", ctypes.default_abi,
++ declareFFI("__fstat"+v, ctypes.default_abi,
+ /*return*/ Types.negativeone_or_nothing,
+ /*fd*/ Types.fd,
+ /*buf*/ Types.stat.out_ptr
Home |
Main Index |
Thread Index |
Old Index