[thunderbird] Added mozilla-file patch for f17 and f18 compilation

Jan Horak xhorak at fedoraproject.org
Wed Apr 25 07:50:57 UTC 2012


commit e079acbb3c6110bf3f6d8fa79e50ab0357b9905a
Author: Jan Horak <jhorak at redhat.com>
Date:   Wed Apr 25 09:50:51 2012 +0200

    Added mozilla-file patch for f17 and f18 compilation

 mozilla-file.patch |   26 ++++++++++++++++++++++++++
 thunderbird.spec   |    4 +++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-file.patch b/mozilla-file.patch
new file mode 100644
index 0000000..14b0182
--- /dev/null
+++ b/mozilla-file.patch
@@ -0,0 +1,26 @@
+diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
+--- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file	2012-01-24 09:00:00.000000000 +0100
++++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc	2012-01-25 15:30:43.707796295 +0100
+@@ -5,6 +5,9 @@
+ #include "base/file_util.h"
+ 
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include <string>
+ #include <vector>
+diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
+--- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file	2012-01-24 09:00:00.000000000 +0100
++++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc	2012-01-25 15:13:11.947771212 +0100
+@@ -6,6 +6,9 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
diff --git a/thunderbird.spec b/thunderbird.spec
index 1be198d..df71203 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -1,7 +1,7 @@
 # Build as a debug package?
 %define debug_build       0
 
-%if 0%{?fedora} <= 16
+%if 0%{?fedora} <= 17
 %define system_sqlite 0
 %else
 %define system_sqlite 1
@@ -62,6 +62,7 @@ Patch8:         xulrunner-10.0-secondary-ipc.patch
 
 # Build patches
 Patch102:       mozilla-733867-x.patch
+Patch103:       mozilla-file.patch
 
 # Linux specific
 Patch200:       thunderbird-8.0-enable-addons.patch
@@ -150,6 +151,7 @@ cd %{tarballdir}
 cd mozilla
 %patch7 -p2 -b .static
 %patch8 -p3 -b .secondary-ipc
+%patch103 -p1 -b .mozilla-file
 cd ..
 %patch102 -p1 -b .733867
 


More information about the scm-commits mailing list