Update to 13.0

* Update enigmail to 1.4.2 * Update Lightning to 1.5 Changelog: * Filelink: Upload your files to an online storage service and send links to your friends, avoiding bounce back due to large attachments. We have partnered with YouSendIt to bring this feature, but additional partners will be added in the near future. * In partnership with Gandi and Hover, you can now sign up for a personalized email address from within Thunderbird. Along with your new email address, Thunderbird will be automatically set up and ready to send and receive messages. We are working with additional suppliers to cover more areas of the world and to provide more options in the future. * Various security fixes MFSA 2012-40 Buffer overflow and use-after-free issues found using Address Sanitizer MFSA 2012-39 NSS parsing errors with zero length items MFSA 2012-38 Use-after-free while replacing/inserting a node in a document MFSA 2012-37 Information disclosure though Windows file shares and shortcut files MFSA 2012-36 Content Security Policy inline-script bypass MFSA 2012-35 Privilege escalation through Mozilla Updater and Windows Updater Service MFSA 2012-34 Miscellaneous memory safety hazards * The minimum system requirements for Windows are now Windows XP Service Pack 2 or later.
author: ryoon <ryoon@pkgsrc.org> 2012-06-12 19:37:48 +0000
committer: ryoon <ryoon@pkgsrc.org> 2012-06-12 19:37:48 +0000
commit: d8882cbd26575da5dfd55ef9392076921fd53177 (patch)
tree: ea57d7da39d291e21b37f9efcbb9375ade7d3f2f /mail/thunderbird/patches
parent: d84ef308ae4ac543807658f457079afd67c8a33e (diff)
download: pkgsrc-d8882cbd26575da5dfd55ef9392076921fd53177.tar.gz
13 files changed, 219 insertions, 44 deletions
diff --git a/mail/thunderbird/patches/patch-aa-toplevel b/mail/thunderbird/patches/patch-aa-toplevel
index 733cc322de9..966ab4ac8b8 100644
--- a/mail/thunderbird/patches/patch-aa-toplevel
+++ b/mail/thunderbird/patches/patch-aa-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa-toplevel,v 1.6 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-aa-toplevel,v 1.7 2012/06/12 19:37:49 ryoon Exp $
 
---- configure.in.orig	2012-04-20 22:32:37.000000000 +0000
+--- configure.in.orig	2012-06-01 17:11:49.000000000 +0000
 +++ configure.in
-@@ -1950,7 +1950,7 @@ ld.])
+@@ -1925,7 +1925,7 @@ ld.])
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa-toplevel,v 1.6 2012/04/28 16:56:58 ryoon Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1958,6 +1958,9 @@ ld.])
+@@ -1933,6 +1933,9 @@ ld.])
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa-toplevel,v 1.6 2012/04/28 16:56:58 ryoon Exp $
      ;; 
  
  ia64*-hpux*)
-@@ -3231,6 +3234,9 @@ dnl ====================================
+@@ -3168,6 +3171,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
diff --git a/mail/thunderbird/patches/patch-ay b/mail/thunderbird/patches/patch-ay
index 4f089eb3138..3ffcb5cde3b 100644
--- a/mail/thunderbird/patches/patch-ay
+++ b/mail/thunderbird/patches/patch-ay
@@ -1,11 +1,11 @@
-$NetBSD: patch-ay,v 1.6 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ay,v 1.7 2012/06/12 19:37:49 ryoon Exp $
 
---- mozilla/browser/app/nsBrowserApp.cpp.orig	2012-04-20 22:39:54.000000000 +0000
+--- mozilla/browser/app/nsBrowserApp.cpp.orig	2012-06-01 17:19:10.000000000 +0000
 +++ mozilla/browser/app/nsBrowserApp.cpp
-@@ -53,6 +53,30 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <string.h>
+@@ -47,6 +47,31 @@
+ #include <sys/resource.h>
+ #endif
+ 
 +#include <sys/resource.h>
 +
 +#ifdef __NetBSD__
@@ -30,10 +30,11 @@ $NetBSD: patch-ay,v 1.6 2012/04/28 16:56:58 ryoon Exp $
 +		fprintf(stderr, "warning: setrlimit failed\n");
 +}
 +#endif
- 
- #include "plstr.h"
- #include "prprf.h"
-@@ -215,6 +239,9 @@ int main(int argc, char* argv[])
++
+ #ifdef XP_MACOSX
+ #include "MacQuirks.h"
+ #endif
+@@ -197,6 +222,9 @@ int main(int argc, char* argv[])
  #ifdef XP_MACOSX
    TriggerQuirks();
  #endif
diff --git a/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk b/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk
new file mode 100644
index 00000000000..dc3bbe41c15
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk
@@ -0,0 +1,39 @@
+$NetBSD: patch-ldap_sdks_c-sdk_build.mk,v 1.1 2012/06/12 19:37:49 ryoon Exp $
+
+--- ldap/sdks/c-sdk/build.mk.orig	2012-06-01 17:20:02.000000000 +0000
++++ ldap/sdks/c-sdk/build.mk
+@@ -488,21 +488,21 @@ LINK_LIB        = $(RM) $@; $(AR) $(AR_F
+ LINK_LIB2       = $(RM) $@; $(AR) $@ $(OBJS2); $(RANLIB) $@
+ ifneq ($(LD),$(CC))
+ ifdef SONAMEFLAG_PREFIX
+-LINK_DLL        = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \
++LINK_DLL        = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS) \
+                         $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
+                         -o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS)
+ else # SONAMEFLAG_PREFIX
+-LINK_DLL        = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \
++LINK_DLL        = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS) \
+                         $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
+                         -o $@ $(OBJS)
+ endif # SONAMEFLAG_PREFIX
+ else  # $(CC) is used to link libs
+ ifdef SONAMEFLAG_PREFIX
+-LINK_DLL        = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \
++LINK_DLL        = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS) \
+                         $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
+                         -o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS)
+ else # SONAMEFLAG_PREFIX
+-LINK_DLL        = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \
++LINK_DLL        = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS) \
+                         $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
+                         -o $@ $(OBJS)
+ endif # SONAMEFLAG_PREFIX
+@@ -517,7 +517,7 @@ SO_FILES_TO_REMOVE=so_locations
+ endif
+ 
+ ifneq (,$(filter BeOS Darwin NetBSD,$(OS_ARCH)))
+-LINK_DLL	= $(MKSHLIB) $(OBJS)
++LINK_DLL	= $(MKSHLIB) $(OBJS) $(OS_LDFLAGS)
+ endif
+ 
+ ifeq ($(OS_ARCH), HP-UX)
diff --git a/mail/thunderbird/patches/patch-mk b/mail/thunderbird/patches/patch-mk
index 3ddf907c7d3..3d47de6ab59 100644
--- a/mail/thunderbird/patches/patch-mk
+++ b/mail/thunderbird/patches/patch-mk
@@ -1,10 +1,10 @@
-$NetBSD: patch-mk,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mk,v 1.5 2012/06/12 19:37:49 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/config/rules.mk.orig	2012-04-20 22:39:56.000000000 +0000
+--- mozilla/config/rules.mk.orig	2012-06-01 17:19:12.000000000 +0000
 +++ mozilla/config/rules.mk
-@@ -601,6 +601,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+@@ -588,6 +588,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
  endif
  endif
  
@@ -17,14 +17,32 @@ Treat DragonFly like FreeBSD.
  ifeq ($(OS_ARCH),NetBSD)
  ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
  ifeq ($(MODULE),layout)
-@@ -610,6 +616,10 @@ endif
+@@ -597,6 +603,10 @@ endif
  endif
  endif
  
 +ifeq ($(OS_ARCH),NetBSD)
-+EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner
++EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/thunderbird
 +endif
 +
  #
  # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
  # which uses internal symbols first
+@@ -1479,7 +1489,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
+ 	$(PYTHON_PATH) \
+ 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
++	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+ 	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
+ 	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
+ 
+@@ -1492,7 +1502,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
+ 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+ 	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
+-	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
++	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+ 
+ # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
+ ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/mail/thunderbird/patches/patch-mm b/mail/thunderbird/patches/patch-mm
index d4f58611f4b..65d0762db4f 100644
--- a/mail/thunderbird/patches/patch-mm
+++ b/mail/thunderbird/patches/patch-mm
@@ -1,8 +1,16 @@
-$NetBSD: patch-mm,v 1.8 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mm,v 1.9 2012/06/12 19:37:49 ryoon Exp $
 
---- mozilla/toolkit/library/Makefile.in.orig	2012-04-20 22:40:25.000000000 +0000
+--- mozilla/toolkit/library/Makefile.in.orig	2012-06-01 17:19:46.000000000 +0000
 +++ mozilla/toolkit/library/Makefile.in
-@@ -549,6 +549,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -119,6 +119,7 @@ STATIC_LIBS += ipdlunittest_s
+ endif
+ 
+ ifeq (Linux,$(OS_ARCH))
++EXTRA_DSO_LDOPTS += -lnssutil3
+ ifneq (Android,$(OS_TARGET))
+ OS_LIBS += -lrt
+ endif
+@@ -520,6 +521,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
  endif
  endif
  
@@ -25,5 +33,5 @@ $NetBSD: patch-mm,v 1.8 2012/04/28 16:56:58 ryoon Exp $
 +endif
 +
  ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg)
- ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi t2embed secur32)
+ ifdef MOZ_CRASHREPORTER
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
index 8d40237d7ae..385c0bef921 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
@@ -1,16 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.3 2012/06/12 19:37:49 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/process_util.h.orig	2012-04-20 22:40:05.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util.h.orig	2012-06-01 17:19:23.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/process_util.h
-@@ -14,7 +14,6 @@
- #include <windows.h>
- #include <tlhelp32.h>
- #elif defined(OS_LINUX)
--#include <dirent.h>
- #include <limits.h>
- #include <sys/types.h>
- #elif defined(OS_MACOSX)
-@@ -280,6 +279,7 @@ class NamedProcessIterator {
+@@ -280,6 +280,7 @@ class NamedProcessIterator {
    const ProcessEntry* NextProcessEntry();
  
   private:
@@ -18,7 +10,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.2 2012/04/28 16
    // Determines whether there's another process (regardless of executable)
    // left in the list of all processes.  Returns true and sets entry_ to
    // that process's info if there is one, false otherwise.
-@@ -292,18 +292,24 @@ class NamedProcessIterator {
+@@ -292,18 +293,24 @@ class NamedProcessIterator {
    void InitProcessEntry(ProcessEntry* entry);
  
    std::wstring executable_name_;
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk b/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk
new file mode 100644
index 00000000000..6f734f4d0a5
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-mozilla_js_src_config_rules.mk,v 1.1 2012/06/12 19:37:49 ryoon Exp $
+
+--- mozilla/js/src/config/rules.mk.orig	2012-06-01 17:19:23.000000000 +0000
++++ mozilla/js/src/config/rules.mk
+@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
+ 	$(PYTHON_PATH) \
+ 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
++	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+ 	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
+ 	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
+ 
+@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
+ 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+ 	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
+-	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
++	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+ 
+ # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
+ ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_Makefile.in b/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_Makefile.in
new file mode 100644
index 00000000000..3575a424429
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_Makefile.in
@@ -0,0 +1,49 @@
+$NetBSD: patch-mozilla_js_xpconnect_src_Makefile.in,v 1.1 2012/06/12 19:37:49 ryoon Exp $
+
+--- mozilla/js/xpconnect/src/Makefile.in.orig	2012-06-01 17:19:26.000000000 +0000
++++ mozilla/js/xpconnect/src/Makefile.in
+@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quicks
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+ 	  $(srcdir)/qsgen.py \
+ 	  --idlpath=$(DEPTH)/dist/idl \
+-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
++	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
+ 	  --header-output dom_quickstubs.h \
+ 	  --stub-output dom_quickstubs.cpp \
+ 	  --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
+@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+ 	  $(srcdir)/dombindingsgen.py \
+ 	  --idlpath=$(DEPTH)/dist/idl \
+-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
++	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
+ 	  --header-output dombindings_gen.h \
+ 	  $(srcdir)/dombindings.conf
+ 
+@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindin
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+ 	  $(srcdir)/dombindingsgen.py \
+ 	  --idlpath=$(DEPTH)/dist/idl \
+-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
++	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
+ 	  --stub-output dombindings_gen.cpp \
+ 	  --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \
+ 	  $(srcdir)/dombindings.conf
+@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionar
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+ 	  $(srcdir)/dictionary_helper_gen.py \
+ 	  -I $(DEPTH)/dist/idl \
+-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
++	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
+ 	  --header-output DictionaryHelpers.h \
+ 	  $(srcdir)/dictionary_helper_gen.conf
+ 
+@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/diction
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+ 	  $(srcdir)/dictionary_helper_gen.py \
+ 	  -I $(DEPTH)/dist/idl \
+-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
++	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
+ 	  --header-output DictionaryHelpers.h \
+ 	  --stub-output DictionaryHelpers.cpp \
+ 	  --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
index a09fbe7fdc5..428efe20d73 100644
--- a/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.3 2012/06/12 19:37:49 ryoon Exp $
 
 --- mozilla/xpcom/Makefile.in.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.2 2012/04/28 16:56:59 ryoon Exp $
  endif
  
 +ifeq ($(OS_ARCH),NetBSD)
-+EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner-sdk/sdk/lib
++EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/thunderbird
 +endif
 +
  ifdef ENABLE_TESTS
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
new file mode 100644
index 00000000000..830591f2295
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_xpcom_idl-parser_Makefile.in,v 1.1 2012/06/12 19:37:49 ryoon Exp $
+
+--- mozilla/xpcom/idl-parser/Makefile.in.orig	2012-06-01 17:19:53.000000000 +0000
++++ mozilla/xpcom/idl-parser/Makefile.in
+@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS)
+ 	$(PYTHON_PATH) \
+ 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  -I$(topsrcdir)/xpcom/idl-parser \
+-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
++	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen
+ 
+ check::
+ 	$(PYTHON_PATH) \
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py
new file mode 100644
index 00000000000..edb91e508de
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py
@@ -0,0 +1,18 @@
+$NetBSD: patch-mozilla_xpcom_idl-parser_header.py,v 1.4 2012/06/12 19:37:49 ryoon Exp $
+
+--- mozilla/xpcom/idl-parser/header.py.orig	2012-06-01 17:19:53.000000000 +0000
++++ mozilla/xpcom/idl-parser/header.py
+@@ -505,10 +505,9 @@ if __name__ == '__main__':
+             print >>sys.stderr, "--regen useless without --cachedir"
+         # Delete the lex/yacc files.  Ply is too stupid to regenerate them
+         # properly
+-        deadfiles = os.path.join(options.cachedir, "*.py*")
+-        for filename in glob.glob(deadfiles):
+-            print filename
+-            os.remove(filename)
++	for fileglobs in [os.path.join(options.cachedir, f) for f in ["xpidllex.py*", "xpidlyacc.py*"]]:
++	    for filename in glob.glob(fileglobs):
++		os.remove(filename)
+ 
+     # Instantiate the parser.
+     p = xpidl.IDLParser(outputdir=options.cachedir)
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in
new file mode 100644
index 00000000000..9890c0787cf
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-mozilla_xpcom_typelib_xpidl_Makefile.in,v 1.1 2012/06/12 19:37:49 ryoon Exp $
+
+--- mozilla/xpcom/typelib/xpidl/Makefile.in.orig	2012-06-01 17:19:53.000000000 +0000
++++ mozilla/xpcom/typelib/xpidl/Makefile.in
+@@ -48,8 +48,8 @@ SDK_BINARY = \
+   $(topsrcdir)/xpcom/idl-parser/xpidl.py \
+   $(topsrcdir)/xpcom/idl-parser/header.py \
+   $(topsrcdir)/xpcom/idl-parser/typelib.py \
+-  $(DEPTH)/xpcom/idl-parser/xpidllex.py \
+-  $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \
++  $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \
++  $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \
+   $(NULL)
+ 
+ ifndef MOZ_SYSTEM_PLY
diff --git a/mail/thunderbird/patches/patch-zb b/mail/thunderbird/patches/patch-zb
index 9076cd0f526..5dad8a93707 100644
--- a/mail/thunderbird/patches/patch-zb
+++ b/mail/thunderbird/patches/patch-zb
@@ -1,10 +1,10 @@
-$NetBSD: patch-zb,v 1.5 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-zb,v 1.6 2012/06/12 19:37:49 ryoon Exp $
 
---- mail/app/Makefile.in.orig	2012-04-20 22:32:37.000000000 +0000
+--- mail/app/Makefile.in.orig	2012-06-01 17:11:49.000000000 +0000
 +++ mail/app/Makefile.in
-@@ -103,6 +103,10 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
- TK_LIBS := -framework Cocoa $(TK_LIBS)
- endif
+@@ -96,6 +96,10 @@ LOCAL_INCLUDES += \
+ DEFINES += -DXPCOM_GLUE
+ STL_FLAGS=
  
 +ifeq ($(OS_ARCH),NetBSD)
 +LIBS += -lossaudio
author	ryoon <ryoon@pkgsrc.org>	2012-06-12 19:37:48 +0000
committer	ryoon <ryoon@pkgsrc.org>	2012-06-12 19:37:48 +0000
commit	d8882cbd26575da5dfd55ef9392076921fd53177 (patch)
tree	ea57d7da39d291e21b37f9efcbb9375ade7d3f2f /mail/thunderbird/patches
parent	d84ef308ae4ac543807658f457079afd67c8a33e (diff)
download	pkgsrc-d8882cbd26575da5dfd55ef9392076921fd53177.tar.gz