rpms/thunderbird/F-10 thunderbird-elif.patch, NONE, 1.1 thunderbird.spec, 1.126, 1.127

Jan Horak xhorak at fedoraproject.org
Tue Aug 25 09:46:00 UTC 2009


Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv432

Modified Files:
	thunderbird.spec 
Added Files:
	thunderbird-elif.patch 
Log Message:
Fix build

thunderbird-elif.patch:
 nsAppRunner.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE thunderbird-elif.patch ---
diff -up mozilla/toolkit/xre/nsAppRunner.cpp.elif mozilla/toolkit/xre/nsAppRunner.cpp
--- mozilla/toolkit/xre/nsAppRunner.cpp.elif	2009-08-25 10:57:48.000000000 +0200
+++ mozilla/toolkit/xre/nsAppRunner.cpp	2009-08-25 10:57:50.000000000 +0200
@@ -1370,7 +1370,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
   if (NS_FAILED(rv))
     return rv;
 
-#elif
+#else
 #error Oops, you need platform-specific code here
 #endif
 


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-10/thunderbird.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- thunderbird.spec	24 Aug 2009 21:04:12 -0000	1.126
+++ thunderbird.spec	25 Aug 2009 09:46:00 -0000	1.127
@@ -32,6 +32,7 @@ Source100:      find-external-requires
 Patch1:         firefox-2.0-link-layout.patch
 Patch2:         firefox-1.0-prdtoa.patch
 Patch3:         thunderbird-2.0-visibility.patch
+Patch4:         thunderbird-elif.patch
 
 Patch10:        thunderbird-0.7.3-psfonts.patch
 Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
@@ -107,11 +108,9 @@ cd mozilla
 %patch2 -p0
 
 # Pragma visibility is broken on most platforms for some reason.
-# It works on i386 so leave it alone there.  Disable elsewhere.
 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
-%ifnarch i386
 %patch3  -p1
-%endif
+%patch4  -p1 -b .elif
 
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader




More information about the scm-commits mailing list