1 files changed, 8 insertions, 44 deletions
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
index 6148ca11917..cce531d227d 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
@@ -1,49 +1,13 @@
-$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.5 2013/11/12 20:50:51 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.6 2014/07/27 20:04:59 ryoon Exp $
 
---- mozilla/ipc/chromium/Makefile.in.orig	2013-10-23 22:09:00.000000000 +0000
+--- mozilla/ipc/chromium/Makefile.in.orig	2014-07-18 00:05:24.000000000 +0000
 +++ mozilla/ipc/chromium/Makefile.in
-@@ -23,9 +23,7 @@ vpath %.c \
-   $(srcdir)/src/third_party/libevent \
-   $(NULL)
- else # } else {
--# message_pump_libevent.cc includes third_party/libevent/event.h,
--# which we put in $(DIST), see export rule below
--LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
- endif # }
- 
- vpath %.cc \
-@@ -68,6 +66,33 @@ CMMSRCS += \
+@@ -28,6 +28,8 @@ include $(topsrcdir)/config/rules.mk
  
- endif # } OS_MACOSX
+ ifdef MOZ_NATIVE_LIBEVENT # {
  
-+ifdef OS_SOLARIS # {
-+
-+CPPSRCS += \
-+  atomicops_internals_x86_gcc.cc \
-+  process_util_linux.cc \
-+  time_posix.cc \
-+  $(NULL)
-+
-+ifdef MOZ_ENABLE_GTK2
-+CPPSRCS += \
-+  message_pump_glib.cc \
-+  $(NULL)
-+endif
-+
-+ifdef MOZ_ENABLE_QT
-+MOCSRCS = \
-+  moc_message_pump_qt.cc \
-+  $(NULL)
++OS_CPPFLAGS += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
 +
-+CPPSRCS += \
-+  $(MOCSRCS) \
-+  message_pump_qt.cc \
-+  $(NULL)
-+endif
-+
-+endif # } OS_SOLARIS
-+
- # libevent
- 
- ifndef MOZ_NATIVE_LIBEVENT # {
+ export-preqs = \
+   $(call mkdir_deps,$(CURDIR)/third_party/libevent) \
+   $(NULL)