[thunderbird-lightning] Add patch to fixup gcc 4.7 build issues
Orion Poplawski
orion at fedoraproject.org
Fri Jan 6 03:14:40 UTC 2012
commit f12ce2c3fd534e0d8e32772e960f89571c087251
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Jan 5 20:14:37 2012 -0700
Add patch to fixup gcc 4.7 build issues
thunderbird-lightning-gcc47.patch | 13 +++++++++++++
thunderbird-lightning.spec | 8 +++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/thunderbird-lightning-gcc47.patch b/thunderbird-lightning-gcc47.patch
new file mode 100644
index 0000000..69e74e7
--- /dev/null
+++ b/thunderbird-lightning-gcc47.patch
@@ -0,0 +1,13 @@
+diff -up thunderbird-lightning-1.1/comm-beta/mozilla/ipc/chromium/src/base/file_util.cc.gcc47 thunderbird-lightning-1.1/comm-beta/mozilla/ipc/chromium/src/base/file_util.cc
+--- thunderbird-lightning-1.1/comm-beta/mozilla/ipc/chromium/src/base/file_util.cc.gcc47 2011-12-15 15:11:22.000000000 -0700
++++ thunderbird-lightning-1.1/comm-beta/mozilla/ipc/chromium/src/base/file_util.cc 2012-01-05 20:11:42.242303191 -0700
+@@ -8,9 +8,7 @@
+ #include <io.h>
+ #endif
+ #include <stdio.h>
+-#if defined(ANDROID)
+ #include <unistd.h>
+-#endif
+
+ #include <fstream>
+
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 92b0b62..3922e5b 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -28,7 +28,7 @@
Name: thunderbird-lightning
Summary: The calendar extension to Thunderbird
Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.mozilla.org/projects/calendar/lightning/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Productivity
@@ -44,6 +44,8 @@ Source100: find-external-requires
# Mozilla (XULRunner) patches
Patch0: thunderbird-version.patch
+# Fixup gcc 4.7 build issues
+Patch1: thunderbird-lightning-gcc47.patch
# Fix build on secondary arches (patches copied from xulrunner)
Patch2: xulrunner-9.0-secondary-ipc.patch
# cherry-picked from 13afcd4c097c
@@ -106,6 +108,7 @@ cd %{tarballdir}
sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
+%patch1 -p2 -b .gcc47
cd mozilla
%patch2 -p2 -b .secondary-ipc
@@ -202,6 +205,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
#===============================================================================
%changelog
+* Thu Jan 5 2012 Orion Poplawski <orion at cora.nwra.com> - 1.1-4
+- Add patch to fixup gcc 4.7 build issues
+
* Thu Jan 5 2012 Orion Poplawski <orion at cora.nwra.com> - 1.1-3
- Update l10n source hopefully to 1.1 release (bug #771860)
More information about the scm-commits
mailing list