Browse Source

fix build failure on 6.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6147 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 12 years ago
parent
commit
eeec5c9c64
1 changed files with 11 additions and 1 deletions
  1. 11 1
      f/firefox/firefox-vl.spec

+ 11 - 1
f/firefox/firefox-vl.spec

@@ -28,7 +28,7 @@
 %define build_vine5 1
 %endif
 
-%define ffrelease 1%{?_dist_release}
+%define ffrelease 2%{?_dist_release}
 
 %define desktop_file_utils_version 0.6
 %define nspr_version 4.8.8
@@ -87,6 +87,10 @@ Source2000:     firefox-searchplugins-4.0-ja.tar.bz2
 Patch0:         firefox-install-dir.patch
 # buildfix
 Patch1:		firefox-12.0-buildfix-with-system-cairo.patch
+# fix build failure with gcc-4.4
+# http://forums.mozillazine.org/viewtopic.php?f=42&t=2462003
+# https://bugzilla.mozilla.org/show_bug.cgi?id=621446
+Patch2: 	firefox-12.0-gcc44.patch
 
 # bugfix
 Patch14:	firefox-5.0-asciidel.patch
@@ -184,6 +188,8 @@ cd %{tarballdir}
 
 %patch1 -p1 -b .fix-system-cairo
 
+%patch2 -p1 -b .gcc44
+
 %patch14 -p1 -b .asciidel
 %patch15 -p2 -b .enable-addons
 
@@ -422,6 +428,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon May 07 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 12.0-2
+- use internal nspr on Vine Linux 6
+- add patch2 to fix build failure with gcc-4.4
+
 * Wed Apr 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 12.0-1
 - update to 12.0
 - add patch1 to fix build failure with system cairo