pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail/thunderbird Fix PR pkg/48240, bump PKGREVISION, a...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c4324fd0ff8
branches:  trunk
changeset: 626486:1c4324fd0ff8
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Nov 13 14:36:58 2013 +0000

description:
Fix PR pkg/48240, bump PKGREVISION, and remove obsolete patches

* Use *30 instead of *50. Restore session is recovered on NetBSD/amd64 5.2.
  Based on martin@'s patch on pkgsrc-users@.

diffstat:

 mail/thunderbird/Makefile                                                                            |    3 +-
 mail/thunderbird/distinfo                                                                            |    4 +-
 mail/thunderbird/patches/patch-aa-toplevel                                                           |   58 -
 mail/thunderbird/patches/patch-ab                                                                    |   22 -
 mail/thunderbird/patches/patch-ac                                                                    |   82 --
 mail/thunderbird/patches/patch-ad                                                                    |   13 -
 mail/thunderbird/patches/patch-ae                                                                    |   58 -
 mail/thunderbird/patches/patch-af                                                                    |   32 -
 mail/thunderbird/patches/patch-ag                                                                    |   31 -
 mail/thunderbird/patches/patch-aj                                                                    |   20 -
 mail/thunderbird/patches/patch-am                                                                    |   17 -
 mail/thunderbird/patches/patch-an                                                                    |   48 -
 mail/thunderbird/patches/patch-at                                                                    |   13 -
 mail/thunderbird/patches/patch-au                                                                    |   30 -
 mail/thunderbird/patches/patch-av                                                                    |   40 -
 mail/thunderbird/patches/patch-aw                                                                    |   34 -
 mail/thunderbird/patches/patch-ay                                                                    |   46 -
 mail/thunderbird/patches/patch-az                                                                    |   19 -
 mail/thunderbird/patches/patch-ba                                                                    |   24 -
 mail/thunderbird/patches/patch-bd                                                                    |   28 -
 mail/thunderbird/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h                  |   13 -
 mail/thunderbird/patches/patch-js_src_jscpucfg.h                                                     |   27 -
 mail/thunderbird/patches/patch-md                                                                    |   17 -
 mail/thunderbird/patches/patch-me                                                                    |   15 -
 mail/thunderbird/patches/patch-mf                                                                    |   18 -
 mail/thunderbird/patches/patch-mg                                                                    |   90 --
 mail/thunderbird/patches/patch-mh                                                                    |   13 -
 mail/thunderbird/patches/patch-mi                                                                    |   15 -
 mail/thunderbird/patches/patch-mj                                                                    |   15 -
 mail/thunderbird/patches/patch-mk                                                                    |   30 -
 mail/thunderbird/patches/patch-mn                                                                    |   15 -
 mail/thunderbird/patches/patch-mozilla_content_media_nsAudioStream.cpp                               |   16 -
 mail/thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp                                    |   36 -
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h                      |  117 ---
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h                    |   27 -
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util.cc                           |   13 -
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc                        |   22 -
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_pickle.cc                               |   13 -
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc                   |  372 ----------
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_ref__counted.h                          |   13 -
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_thread__collision__warner.h             |   13 -
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h |   13 -
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc         |   12 -
 mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h          |   22 -
 mail/thunderbird/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h                                   |   13 -
 mail/thunderbird/patches/patch-mozilla_js_src_jsgc.cpp                                               |   17 -
 mail/thunderbird/patches/patch-mozilla_js_src_jsinterp.cpp                                           |   23 -
 mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp                                |   13 -
 mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_Makefile.in                                |   28 -
 mail/thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c          |   14 -
 mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp                   |   18 -
 mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in                                       |   27 -
 mail/thunderbird/patches/patch-mozilla_toolkit_components_osfile_osfile__unix__back.jsm              |   12 +-
 mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in                                             |   15 -
 mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in                                  |   13 -
 mail/thunderbird/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in                               |   15 -
 mail/thunderbird/patches/patch-mp                                                                    |   17 -
 mail/thunderbird/patches/patch-pa                                                                    |   11 -
 mail/thunderbird/patches/patch-pd                                                                    |   11 -
 mail/thunderbird/patches/patch-pg                                                                    |   14 -
 mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk                                              |   13 -
 mail/thunderbird/patches/patch-xa                                                                    |  119 ---
 mail/thunderbird/patches/patch-xd                                                                    |  126 ---
 63 files changed, 11 insertions(+), 2087 deletions(-)

diffs (truncated from 2391 to 300 lines):

diff -r b61a49731490 -r 1c4324fd0ff8 mail/thunderbird/Makefile
--- a/mail/thunderbird/Makefile Wed Nov 13 14:23:31 2013 +0000
+++ b/mail/thunderbird/Makefile Wed Nov 13 14:36:58 2013 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.126 2013/11/12 20:50:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.127 2013/11/13 14:36:58 ryoon Exp $
 
 DISTNAME=      # empty
 PKGNAME=       thunderbird-${TB_VER}
+PKGREVISION=   1
 TB_VER=                24.1.0
 #LIGHTNINGVER= 1.9
 CATEGORIES=    mail
diff -r b61a49731490 -r 1c4324fd0ff8 mail/thunderbird/distinfo
--- a/mail/thunderbird/distinfo Wed Nov 13 14:23:31 2013 +0000
+++ b/mail/thunderbird/distinfo Wed Nov 13 14:36:58 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.129 2013/11/12 20:50:51 ryoon Exp $
+$NetBSD: distinfo,v 1.130 2013/11/13 14:36:58 ryoon Exp $
 
 SHA1 (enigmail-1.6.tar.gz) = 51a7eb7d86ce24d8199f741a0079f0d56ecd6368
 RMD160 (enigmail-1.6.tar.gz) = a854bb37a6a7f298f6cc268110dcb21d00909fa4
@@ -127,7 +127,7 @@
 SHA1 (patch-mozilla_security_manager_ssl_src_JARSignatureVerification.cpp) = d28dc63c1c5bcf3994c7ee91562d04c7dd8daa40
 SHA1 (patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp) = a881012bf1b40685fbc5f48bf5eaed50cef89f72
 SHA1 (patch-mozilla_toolkit_components_osfile_osfile__unix__allthreads.jsm) = ab1c8931147d80ba26f9a763a93b3ae2784af3f0
-SHA1 (patch-mozilla_toolkit_components_osfile_osfile__unix__back.jsm) = f24de6e36aa4b650d7e8dd997eb014d6dddc9a64
+SHA1 (patch-mozilla_toolkit_components_osfile_osfile__unix__back.jsm) = 9cba10eb870334dcc2d070f827fb96adcd4506d3
 SHA1 (patch-mozilla_toolkit_components_osfile_osfile__unix__front.jsm) = 3c49715e3f142210af928423fc9edae17cd03ec6
 SHA1 (patch-mozilla_toolkit_mozapps_update_updater_updater.cpp) = 8af52f3746c697ab82f6d7d71bdbeb6a14183172
 SHA1 (patch-mozilla_toolkit_toolkit.mozbuild) = e59924f8a7f1728ed80b71eb67276680fb31b611
diff -r b61a49731490 -r 1c4324fd0ff8 mail/thunderbird/patches/patch-aa-toplevel
--- a/mail/thunderbird/patches/patch-aa-toplevel        Wed Nov 13 14:23:31 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa-toplevel,v 1.11 2013/05/08 09:14:30 sbd Exp $
-
---- configure.in.orig  2013-03-28 18:07:18.000000000 +0000
-+++ configure.in
-@@ -1797,7 +1797,7 @@ ld.])
-     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
-     ;;
- 
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
-     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-       DLL_SUFFIX=".so.1.0"
-       DSO_LDOPTS="-shared"
-@@ -1805,6 +1805,9 @@ ld.])
-     if test ! "$GNU_CC"; then
-       DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
-     fi
-+    if test "$LIBRUNPATH"; then
-+       DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
-+    fi
-     ;; 
- 
- ia64*-hpux*)
-@@ -3019,6 +3022,9 @@ dnl ====================================
- case $target in
- *-hpux11.*)
-       ;;
-+*-dragonfly*)
-+      AC_CHECK_LIB(c, gethostbyname_r)
-+      ;;
- *)
-       AC_CHECK_LIB(c_r, gethostbyname_r)
-       ;;
-@@ -3339,6 +3345,9 @@ AC_CACHE_CHECK(
-         #ifdef linux
-         #define _BSD_SOURCE 1
-         #endif
-+      #ifdef __NetBSD__
-+      #error use of global _res variable in threaded programs is not portable
-+      #endif
-         #include <resolv.h>
-         ],
-         [int foo = res_ninit(&_res);],
-@@ -4990,12 +4999,13 @@ dnl If using sydneyaudio with Linux, ens
- if test -n "$MOZ_SYDNEYAUDIO"; then
-    case "$target_os" in
- linux*)
--      PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
-+      PKG_CHECK_MODULES(MOZ_ALSA, alsa, MOZ_ALSA=1,
-          [echo "$MOZ_ALSA_PKG_ERRORS"
-           AC_MSG_ERROR([Need alsa for Ogg or Wave decoding on Linux.  Disable with --disable-ogg --disable-wave.])])
-       ;;
-    esac
- fi
-+AC_SUBST(MOZ_ALSA)
- AC_SUBST(MOZ_ALSA_LIBS)
- 
- dnl ========================================================
diff -r b61a49731490 -r 1c4324fd0ff8 mail/thunderbird/patches/patch-ab
--- a/mail/thunderbird/patches/patch-ab Wed Nov 13 14:23:31 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.18 2012/09/02 06:43:39 ryoon Exp $
-
---- mozilla/nsprpub/pr/include/md/_netbsd.h.orig       2012-08-25 00:31:27.000000000 +0000
-+++ mozilla/nsprpub/pr/include/md/_netbsd.h
-@@ -47,7 +47,7 @@
- #define HAVE_DLL
- #define USE_DLFCN
- #define _PR_HAVE_SOCKADDR_LEN
--#define _PR_NO_LARGE_FILES
-+#define _PR_HAVE_LARGE_OFF_T
- #define _PR_STAT_HAS_ST_ATIMESPEC
- #define _PR_POLL_AVAILABLE
- #define _PR_USE_POLL
-@@ -75,6 +75,8 @@
- #define JB_SP_INDEX 2
- #elif defined(__mips__)
- #define JB_SP_INDEX 4
-+#elif defined(__amd64__)
-+#define JB_SP_INDEX 6
- #elif defined(__alpha__)
- #define JB_SP_INDEX 34
- #elif defined(__arm32__)
diff -r b61a49731490 -r 1c4324fd0ff8 mail/thunderbird/patches/patch-ac
--- a/mail/thunderbird/patches/patch-ac Wed Nov 13 14:23:31 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-$NetBSD: patch-ac,v 1.15 2012/09/02 06:43:39 ryoon Exp $
-
---- mozilla/nsprpub/configure.in.orig  2012-08-25 00:31:27.000000000 +0000
-+++ mozilla/nsprpub/configure.in
-@@ -36,7 +36,7 @@ OBJDIR_NAME=.
- OBJDIR_SUFFIX=OBJ
- NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
- NOSUCHFILE=/no-such-file
--LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
-+LIBNSPR='-Wl,-R${prefix}/lib/${MOZILLA_PKG_NAME} -L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
- LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
- CYGWIN_WRAPPER=
- MACOS_SDK_DIR=
-@@ -1519,6 +1519,33 @@ tools are selected during the Xcode/Deve
-     DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-     MDCPUCFG_H=_freebsd.cfg
-     PR_MD_CSRCS=freebsd.c
-+    if test "$LIBRUNPATH"; then
-+        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-+    fi
-+    ;;
-+
-+*-dragonfly*)
-+    if test -z "$USE_NSPR_THREADS"; then
-+        USE_PTHREADS=1
-+    fi
-+    AC_DEFINE(XP_UNIX)
-+    AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
-+    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    if test "$MOZ_OBJFORMAT" = "elf"; then
-+        DLL_SUFFIX=so
-+    else
-+        DLL_SUFFIX=so.1.0
-+    fi
-+    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-+    DSO_CFLAGS=-fPIC
-+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    MDCPUCFG_H=_dragonfly.cfg
-+    PR_MD_CSRCS=freebsd.c
-+    if test "$LIBRUNPATH"; then
-+        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-+    fi
-     ;;
- 
- *-hpux*)
-@@ -2110,6 +2137,7 @@ mips-nec-sysv*)
-     AC_DEFINE(XP_UNIX)
-     AC_DEFINE(NETBSD)
-     AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
-     if test -z "$USE_NSPR_THREADS"; then
-         USE_PTHREADS=1
-     fi
-@@ -2918,7 +2946,7 @@ if test -n "$USE_PTHREADS"; then
-       if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
-           ac_cv_have_dash_pthread=yes
-               case "$target_os" in
--          freebsd*)
-+          freebsd* | dragonfly*)
- # Freebsd doesn't use -pthread for compiles, it uses them for linking
-             ;;
-           *)
-@@ -2956,7 +2984,7 @@ if test -n "$USE_PTHREADS"; then
-             _PTHREAD_LDFLAGS=
-         fi
-           ;;
--    *-freebsd*)
-+    *-freebsd* | *-dragonfly*)
-           AC_DEFINE(_REENTRANT)
-           AC_DEFINE(_THREAD_SAFE)
-           dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -3037,7 +3065,7 @@ case "$target" in
-         AC_DEFINE(_PR_NEED_PTHREAD_INIT)
-     fi
-     ;;
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
-     if test -n "$USE_NSPR_THREADS"; then
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-     fi
diff -r b61a49731490 -r 1c4324fd0ff8 mail/thunderbird/patches/patch-ad
--- a/mail/thunderbird/patches/patch-ad Wed Nov 13 14:23:31 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2012/09/02 06:43:39 ryoon Exp $
-
---- mozilla/xpcom/io/nsLocalFileUnix.h.orig    2012-08-25 00:31:35.000000000 +0000
-+++ mozilla/xpcom/io/nsLocalFileUnix.h
-@@ -52,7 +52,7 @@
- #endif
- 
- // so we can statfs on freebsd
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || ((defined(__DragonFly__) || defined(__NetBSD__)) && !defined(HAVE_STATVFS))
-     #define HAVE_SYS_STATFS_H
-     #define STATFS statfs
-     #include <sys/param.h>
diff -r b61a49731490 -r 1c4324fd0ff8 mail/thunderbird/patches/patch-ae
--- a/mail/thunderbird/patches/patch-ae Wed Nov 13 14:23:31 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2012/09/02 06:43:39 ryoon Exp $
-
---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig 2012-08-25 00:31:27.000000000 +0000
-+++ mozilla/nsprpub/pr/src/misc/prnetdb.c
-@@ -73,7 +73,7 @@ PRLock *_pr_dnsLock = NULL;
-         || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
-       || (defined(HPUX10_10) && defined(_REENTRANT)) \
-         || (defined(HPUX10_20) && defined(_REENTRANT)) \
--        || defined(OPENBSD)
-+        || defined(OPENBSD) || defined(NETBSD)
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_GETPROTO_R_INT
- #endif
-@@ -83,6 +83,11 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_5_ARG_GETPROTO_R
- #endif
- 
-+#if __DragonFly_version >= 200202
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_5_ARG_GETPROTO_R
-+#endif
-+
- /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
- #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
- #define _PR_HAVE_GETPROTO_R
-@@ -300,7 +305,7 @@ _pr_QueryNetIfs(void)
- }
- 
- #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
--    || defined(NETBSD) || defined(OPENBSD)
-+    || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
- 
- /*
-  * Use the BSD getifaddrs function.
-@@ -2044,6 +2049,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
-          */
-         hints.ai_socktype = SOCK_STREAM;
- 
-+/* NetBSD >= 2.99.9 has a thread-safe resolver */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+        LOCK_DNS();
-+#endif
-+
-         rv = GETADDRINFO(hostname, NULL, &hints, &res);
- #ifdef AI_ADDRCONFIG
-         if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) {
-@@ -2051,6 +2061,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
-             rv = GETADDRINFO(hostname, NULL, &hints, &res);
-         }
- #endif
-+
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+        UNLOCK_DNS();
-+#endif
-+
-         if (rv == 0)
-             return (PRAddrInfo *) res;
- 
diff -r b61a49731490 -r 1c4324fd0ff8 mail/thunderbird/patches/patch-af
--- a/mail/thunderbird/patches/patch-af Wed Nov 13 14:23:31 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-af,v 1.11 2012/09/02 06:43:39 ryoon Exp $
-
---- mozilla/config/mkdepend/imakemdep.h.orig   2012-08-25 00:30:58.000000000 +0000
-+++ mozilla/config/mkdepend/imakemdep.h
-@@ -235,7 +235,7 @@ in this Software without prior written a
- #ifdef _CRAY
- #define DEFAULT_CPP "/lib/pcpp"
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define DEFAULT_CPP "/usr/libexec/cpp"
- #endif



Home | Main Index | Thread Index | Old Index