pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/seamonkey Remove two patches to avoid conflict wit...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/91071d71ad9a
branches:  trunk
changeset: 627986:91071d71ad9a
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Dec 27 06:39:25 2013 +0000

description:
Remove two patches to avoid conflict with files/.
These patches are stored in files/.

diffstat:

 www/seamonkey/distinfo                                                              |   4 +--
 www/seamonkey/patches/patch-mailnews_extensions_enigmail_ipc_modules_subprocess.jsm |  14 ---------
 www/seamonkey/patches/patch-mailnews_extensions_enigmail_ipc_src_Makefile.enig      |  15 ----------
 3 files changed, 1 insertions(+), 32 deletions(-)

diffs (55 lines):

diff -r 079b709b6fd7 -r 91071d71ad9a www/seamonkey/distinfo
--- a/www/seamonkey/distinfo    Fri Dec 27 05:56:49 2013 +0000
+++ b/www/seamonkey/distinfo    Fri Dec 27 06:39:25 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.108 2013/12/26 13:17:37 ryoon Exp $
+$NetBSD: distinfo,v 1.109 2013/12/27 06:39:25 ryoon Exp $
 
 SHA1 (enigmail-1.6.tar.gz) = 51a7eb7d86ce24d8199f741a0079f0d56ecd6368
 RMD160 (enigmail-1.6.tar.gz) = a854bb37a6a7f298f6cc268110dcb21d00909fa4
@@ -20,8 +20,6 @@
 SHA1 (patch-ldap_sdks_c-sdk_ldap_include_portable.h) = 4ce9e1a0e8f0d05367243e8d2b5118606a35da94
 SHA1 (patch-mail_app_Makefile.in) = 3d85f5b9ba0af52732f05c30a77cf03593ec0f8e
 SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = 0cbabcf5b188e86404e3ded8452c73a7f498efe3
-SHA1 (patch-mailnews_extensions_enigmail_ipc_modules_subprocess.jsm) = 18e3cc5ff4ba287b669e1720767bad1750701d37
-SHA1 (patch-mailnews_extensions_enigmail_ipc_src_Makefile.enig) = d91e90a8fd1b7f2505bd18ffa9d1aae66d9c1614
 SHA1 (patch-mb) = f153b28aeb71a0ace4a4c1d55c3e31648d242bd5
 SHA1 (patch-mozilla_browser_app_profile_firefox.js) = 2e8d8470d239b6be2c6c64a8a752f8229d421dc6
 SHA1 (patch-mozilla_browser_installer_package-manifest.in) = a61eec2dc12b341bfd84bdda0d70842a627e9c9a
diff -r 079b709b6fd7 -r 91071d71ad9a www/seamonkey/patches/patch-mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
--- a/www/seamonkey/patches/patch-mailnews_extensions_enigmail_ipc_modules_subprocess.jsm       Fri Dec 27 05:56:49 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-mailnews_extensions_enigmail_ipc_modules_subprocess.jsm,v 1.1 2013/12/26 13:17:37 ryoon Exp $
-
---- mailnews/extensions/enigmail/ipc/modules/subprocess.jsm.orig       2013-10-06 16:31:34.000000000 +0000
-+++ mailnews/extensions/enigmail/ipc/modules/subprocess.jsm
-@@ -324,7 +324,9 @@ function getPlatformValue(valueType) {
-         //            library name   O_NONBLOCK RLIM_T                RLIMIT_NOFILE
-         'darwin':  [ 'libc.dylib',   0x04     , ctypes.uint64_t     , 8 ],
-         'linux':   [ 'libc.so.6',    2024     , ctypes.unsigned_long, 7 ],
-+        'dragonfly': [ 'libc.so',    0x04     , ctypes.int64_t      , 8 ],
-         'freebsd': [ 'libc.so.7',    0x04     , ctypes.int64_t      , 8 ],
-+        'netbsd': [ 'libc.so', 0x04     , ctypes.int64_t      , 8 ],
-         'openbsd': [ 'libc.so.61.0', 0x04     , ctypes.int64_t      , 8 ],
-         'sunos':   [ 'libc.so',      0x80     , ctypes.unsigned_long, 5 ]
-     };
diff -r 079b709b6fd7 -r 91071d71ad9a www/seamonkey/patches/patch-mailnews_extensions_enigmail_ipc_src_Makefile.enig
--- a/www/seamonkey/patches/patch-mailnews_extensions_enigmail_ipc_src_Makefile.enig    Fri Dec 27 05:56:49 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-mailnews_extensions_enigmail_ipc_src_Makefile.enig,v 1.1 2013/12/26 13:17:37 ryoon Exp $
-
---- mailnews/extensions/enigmail/ipc/src/Makefile.enig.orig    2013-10-06 16:31:34.000000000 +0000
-+++ mailnews/extensions/enigmail/ipc/src/Makefile.enig
-@@ -18,8 +18,8 @@ LDFLAGS      += -dynamiclib -install_name @ex
- endif
- 
- ifeq ($(OS_ARCH),NetBSD)
--ifeq ($(DLL_SUFFIX),.so.1.0)
--LDFLAGS += -Wl,-Bsymbolic
-+ifeq ($(DLL_SUFFIX),.so)
-+LDFLAGS += -shared -Wl,-Bsymbolic
- CFLAGS += -fPIC
- endif
- endif



Home | Main Index | Thread Index | Old Index