diff options
-rw-r--r-- | mail/thunderbird10/distinfo | 8 | ||||
-rw-r--r-- | mail/thunderbird10/patches/patch-aa | 26 | ||||
-rw-r--r-- | mail/thunderbird10/patches/patch-ac | 24 | ||||
-rw-r--r-- | mail/thunderbird10/patches/patch-as | 16 |
4 files changed, 52 insertions, 22 deletions
diff --git a/mail/thunderbird10/distinfo b/mail/thunderbird10/distinfo index 79d2856d927..0ea342939ae 100644 --- a/mail/thunderbird10/distinfo +++ b/mail/thunderbird10/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2012/11/22 08:14:15 is Exp $ +$NetBSD: distinfo,v 1.11 2012/12/24 21:14:19 joerg Exp $ SHA1 (enigmail-1.4.tar.gz) = 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4 RMD160 (enigmail-1.4.tar.gz) = b3c717e150c826faae1daa09806e07dd16619c51 @@ -6,10 +6,10 @@ Size (enigmail-1.4.tar.gz) = 1323467 bytes SHA1 (thunderbird-10.0.11esr.source.tar.bz2) = c7b2dd2fbead11d61da9508926e4c3e82bc2d099 RMD160 (thunderbird-10.0.11esr.source.tar.bz2) = 29a600de7cf87adfcad58b1d097583b28a38a746 Size (thunderbird-10.0.11esr.source.tar.bz2) = 97793584 bytes -SHA1 (patch-aa) = a6787e51004112a2056fd695c44c8610ffcc0d60 +SHA1 (patch-aa) = e526125da549e9924135379cffae4754db94154f SHA1 (patch-aa-toplevel) = dfff316c77e468a3720f3d18e9edfc67059fc0e1 SHA1 (patch-ab) = 6e243fcf826226330d6b62548838393bb1cbafb5 -SHA1 (patch-ac) = ade505e90d9e7dd90dedb711011be22a2a5c67f4 +SHA1 (patch-ac) = 805455591b4a9fc8e51ba65ac8ff41016b4edc7f SHA1 (patch-ad) = d6bad741c4bdfdd0ee0ca8062c2121ce82eb7fb0 SHA1 (patch-ae) = 2627a9f9dfcbb03474c5e003cab9c8c6cc5dafa1 SHA1 (patch-af) = 5a7112ce46f9a3843a78ae0a234527080c04f529 @@ -21,7 +21,7 @@ SHA1 (patch-al) = f12eb736f87a779becdd10631314ee5f8f88f080 SHA1 (patch-am) = 108252ed517d9388f2a6c70ffa15782045ae23d5 SHA1 (patch-an) = 7fe9f52b2825bb2db6835a431dc4a140d4984fc7 SHA1 (patch-ao) = 644c4fcb52b3552fab5d7c5960205bf7a78a90c2 -SHA1 (patch-as) = a3dae1a6687d0e23193807783948b7aa146e1587 +SHA1 (patch-as) = d200d5b59f8a0d406f4fd8bde0fe150d0c2fbcd3 SHA1 (patch-at) = 519a2d835e0cc9183bf7a899aee382fae72c3d5e SHA1 (patch-au) = 23a04bb48df4e54c058f09ab9036d4766d1f9e3e SHA1 (patch-av) = 1ef659c3fe6ecdaabc247b04d8f002f2d860602d diff --git a/mail/thunderbird10/patches/patch-aa b/mail/thunderbird10/patches/patch-aa index d7dee1422ff..1355f25aa4d 100644 --- a/mail/thunderbird10/patches/patch-aa +++ b/mail/thunderbird10/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ +$NetBSD: patch-aa,v 1.2 2012/12/24 21:14:19 joerg Exp $ ---- mozilla/configure.in.orig 2012-02-16 10:24:47.000000000 +0000 +--- mozilla/configure.in.orig 2012-11-15 21:59:12.000000000 +0000 +++ mozilla/configure.in @@ -2328,7 +2328,7 @@ case "$target" in MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' @@ -21,7 +21,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ ;; ia64*-hpux*) -@@ -3377,6 +3380,9 @@ dnl ==================================== +@@ -3178,6 +3181,9 @@ if test "$GNU_CC"; then + AC_CACHE_CHECK(for visibility(hidden) attribute, + ac_cv_visibility_hidden, + [cat > conftest.c <<EOF ++#ifdef __clang__ ++#error Not supported by old Mozilla ++#endif + int foo __attribute__ ((visibility ("hidden"))) = 1; + EOF + ac_cv_visibility_hidden=no +@@ -3377,6 +3383,9 @@ dnl ==================================== case $target in *-hpux11.*) ;; @@ -31,7 +41,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ *) AC_CHECK_LIB(c_r, gethostbyname_r) ;; -@@ -4330,6 +4336,14 @@ if test -n "$YASM"; then +@@ -4330,6 +4339,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -46,7 +56,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -5616,20 +5630,20 @@ if test -n "$MOZ_WEBM"; then +@@ -5616,20 +5633,20 @@ if test -n "$MOZ_WEBM"; then [MOZ_NATIVE_LIBVPX_DEC_TEST=1], ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then @@ -73,7 +83,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ #error "test failed." #endif ], -@@ -5639,7 +5653,7 @@ if test -n "$MOZ_WEBM"; then +@@ -5639,7 +5656,7 @@ if test -n "$MOZ_WEBM"; then MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], [AC_MSG_RESULT([no]) @@ -82,7 +92,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS -@@ -5673,11 +5687,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV +@@ -5673,11 +5690,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV dnl See if we have assembly on this platform. case "$OS_ARCH:$CPU_ARCH" in @@ -96,7 +106,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 ;; -@@ -8915,6 +8929,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then +@@ -8930,6 +8947,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output]) if test "$OS_ARCH" != "WINNT"; then NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs` diff --git a/mail/thunderbird10/patches/patch-ac b/mail/thunderbird10/patches/patch-ac index 5c2581652b9..0b35e44aa32 100644 --- a/mail/thunderbird10/patches/patch-ac +++ b/mail/thunderbird10/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ +$NetBSD: patch-ac,v 1.2 2012/12/24 21:14:19 joerg Exp $ ---- mozilla/nsprpub/configure.in.orig 2012-02-16 10:25:22.000000000 +0000 +--- mozilla/nsprpub/configure.in.orig 2012-11-15 21:59:50.000000000 +0000 +++ mozilla/nsprpub/configure.in @@ -71,7 +71,7 @@ OBJDIR_NAME=. OBJDIR_SUFFIX=OBJ @@ -11,7 +11,17 @@ $NetBSD: patch-ac,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)' CYGWIN_WRAPPER= MACOS_SDK_DIR= -@@ -1527,6 +1527,33 @@ tools are selected during the Xcode/Deve +@@ -769,6 +769,9 @@ if test "$GNU_CC"; then + AC_CACHE_CHECK(for visibility(hidden) attribute, + ac_cv_visibility_hidden, + [cat > conftest.c <<EOF ++#ifdef __clang__ ++#error Not supported by old Mozilla ++#endif + int foo __attribute__ ((visibility ("hidden"))) = 1; + EOF + ac_cv_visibility_hidden=no +@@ -1567,6 +1570,33 @@ tools are selected during the Xcode/Deve DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c @@ -45,7 +55,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ ;; *-hpux*) -@@ -2114,6 +2141,7 @@ mips-nec-sysv*) +@@ -2154,6 +2184,7 @@ mips-nec-sysv*) AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -53,7 +63,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi -@@ -2919,7 +2947,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2962,7 +2993,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 @@ -62,7 +72,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ # Freebsd doesn't use -pthread for compiles, it uses them for linking ;; *) -@@ -2957,7 +2985,7 @@ if test -n "$USE_PTHREADS"; then +@@ -3000,7 +3031,7 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS= fi ;; @@ -71,7 +81,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -3038,7 +3066,7 @@ case "$target" in +@@ -3081,7 +3112,7 @@ case "$target" in AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; diff --git a/mail/thunderbird10/patches/patch-as b/mail/thunderbird10/patches/patch-as index ebe5cae3e0a..6e7bcb197a9 100644 --- a/mail/thunderbird10/patches/patch-as +++ b/mail/thunderbird10/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ +$NetBSD: patch-as,v 1.2 2012/12/24 21:14:19 joerg Exp $ Treat DragonFly like FreeBSD. ---- mozilla/js/src/configure.in.orig 2012-02-16 10:25:02.000000000 +0000 +--- mozilla/js/src/configure.in.orig 2012-11-15 21:59:30.000000000 +0000 +++ mozilla/js/src/configure.in @@ -799,7 +799,7 @@ EOF AC_LANG_RESTORE @@ -31,7 +31,17 @@ Treat DragonFly like FreeBSD. AC_DEFINE(AVMPLUS_UNIX) ;; *-openbsd*) -@@ -4344,7 +4344,7 @@ if test "$MOZ_MEMORY"; then +@@ -3077,6 +3077,9 @@ if test "$GNU_CC"; then + AC_CACHE_CHECK(for visibility(hidden) attribute, + ac_cv_visibility_hidden, + [cat > conftest.c <<EOF ++#ifdef __clang__ ++#error Not supported by old Mozilla ++#endif + int foo __attribute__ ((visibility ("hidden"))) = 1; + EOF + ac_cv_visibility_hidden=no +@@ -4344,7 +4347,7 @@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; |