/[packages]/cauldron/firefox/current/SPECS/firefox.spec
ViewVC logotype

Diff of /cauldron/firefox/current/SPECS/firefox.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 379672 by dmorgan, Sun Jan 13 21:31:50 2013 UTC revision 385395 by rtp, Mon Jan 14 08:25:42 2013 UTC
# Line 30  Line 30 
30    
31  %define _use_syshunspell 1  %define _use_syshunspell 1
32    
33  %define release %mkrel 3  %define release %mkrel 4
34    
35  %define update_channel esr17  %define update_channel esr17
36    
# Line 63  Patch11:        firefox-kde.patch Line 63  Patch11:        firefox-kde.patch
63  Patch12:        mozilla-kde.patch  Patch12:        mozilla-kde.patch
64  Patch13:        firefox-13-fix-nspr-include.patch  Patch13:        firefox-13-fix-nspr-include.patch
65  Patch14:        firefox-13-fix-cairo-build.patch  Patch14:        firefox-13-fix-cairo-build.patch
66  Patch34:        xulrunner_nojit.patch  Patch34:        Bug-814693-Allow-webrtc-to-build-on-more-architectur.patch
67  # (cjw) use system virtualenv  # (cjw) use system virtualenv
68  Patch36:        iceape-2.12-system-virtualenv.patch  Patch36:        iceape-2.12-system-virtualenv.patch
69  Patch37:        firefox-17.0-nss-version.patch  Patch37:        firefox-17.0-nss-version.patch
# Line 171  Files and macros mainly for building Fir Line 171  Files and macros mainly for building Fir
171  %patch11 -p1 -b .kde  %patch11 -p1 -b .kde
172  %patch12 -p1 -b .kdemoz  %patch12 -p1 -b .kdemoz
173    
174  %ifarch %arm  
175  %if "%{_target_cpu}" != "armv7l"  %patch34 -p1 -b .webrtc
 %patch34 -p1  
 %endif  
 %endif  
176  %patch36 -p2 -b .system-virtualenv  %patch36 -p2 -b .system-virtualenv
177  %patch37 -p0  %patch37 -p0
178    
# Line 232  ac_add_options --enable-gstreamer Line 229  ac_add_options --enable-gstreamer
229  %ifarch %arm  %ifarch %arm
230  %if "%{_target_cpu}" != "armv7l"  %if "%{_target_cpu}" != "armv7l"
231  ac_add_options --disable-methodjit  ac_add_options --disable-methodjit
 ac_add_options --disable-tracejit  
232  %endif  %endif
233  ac_add_options --enable-system-ffi  ac_add_options --enable-system-ffi
234  %endif  %endif
# Line 240  ac_add_options --enable-system-ffi Line 236  ac_add_options --enable-system-ffi
236  ac_add_options --with-valgrind  ac_add_options --with-valgrind
237  ac_add_options --with-java-include-path=%{java_home}/include  ac_add_options --with-java-include-path=%{java_home}/include
238  ac_add_options --with-java-bin-path=%{java_home}/bin  ac_add_options --with-java-bin-path=%{java_home}/bin
 ac_add_options --enable-opus  
239  %endif  %endif
240    ac_add_options --enable-opus
241    
242  EOF  EOF
243    
244  %__perl -p -i -e 's|\-0|\-9|g' config/make-jars.pl  %__perl -p -i -e 's|\-0|\-9|g' config/make-jars.pl
245    %ifarch %arm
246    export CFLAGS="-D__ARM_PCS $(echo %{optflags})"
247    export CXXFLAGS="$CFLAGS"
248    %endif
249  export LDFLAGS="%ldflags"  export LDFLAGS="%ldflags"
250  make -f client.mk build  make -f client.mk build
251    
Legend:
Removed from v.379672  
changed lines
  Added in v.385395
  ViewVC Help
Powered by ViewVC 1.1.30