firefox-48.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10731 ec354946-7b23-47d6-9f5a-488ba84defc7

f/firefox/firefox-vl.spec

@@ -1,7 +1,7 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 47.0
+%global ffmajor 48.0
-%global geckomajor 47.0
+%global geckomajor 48.0
-%global ffminor 1
+#global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
 %global langpackdir %{ffdir}/langpacks
@@ -84,15 +84,31 @@ Patch5:		firefox-46.0.1-vine6.patch
 # bugfix
 #Patch14:	firefox-5.0-asciidel.patch
 # 
-Patch15:	firefox-46.0.1-enable-addons.patch
+#Patch15:	firefox-46.0.1-enable-addons.patch
 
 # patches from fedora
 Patch21:        rhbz-911314.patch
 Patch22:        rhbz-928353.patch
+Patch23:        rhbz-966424.patch
+Patch24:        firefox-enable-addons.patch
+Patch25:        rhbz-1173156.patch
+Patch26:        rhbz-1291190-appchooser-crash.patch
 
 # upstream patch
 #Patch100:        mozilla-837563.patch
 Patch101:        mozilla-938730.patch
+Patch102:        mozilla-1170092.patch
+# to fix --prefix and --libdir
+Patch103:        mozilla-1282843.patch
+Patch104:        mozilla-1253216.patch
+Patch105:        mozilla-1196777.patch
+Patch106:        mozilla-1270046.patch
+# Remove when mozbz#1269319 lands - Firefox 49
+Patch107:        mozilla-1245783.patch
+Patch108:        mozilla-256180.patch
+Patch109:        mozilla-890908-async-nego.patch
+Patch110:        mozilla-1272332.patch
+Patch111:        mozilla-440908.patch
 
 # customization patches
 
@@ -187,11 +203,29 @@ cd %{tarballdir}
 %endif
 
 #%patch14 -p1 -b .asciidel
-%patch15 -p1 -b .enable-addons
+#%patch15 -p1 -b .enable-addons
+
+%patch103 -p1 -b .1282843
+
+%patch23 -p2 -b .rhbz-966424
+%patch24 -p1 -b .enable-addons
+%patch25 -p2 -b .rhbz-1173156
+%patch26 -p1 -b .rhbz-1291190
 
 #%patch100 -p1 -b .837563
 #%patch101 -p1 -b .938730
 
+%patch102 -p1 -b .1170092
+%patch104 -p1 -b .1253216
+%patch105 -p1 -b .1196777
+%patch106 -p1 -b .1270046
+%patch107 -p1 -b .1245783
+%patch108 -p1 -b .256180
+%patch109 -p1 -b .890908
+%patch110 -p1 -b .1272332
+%patch111 -p1 -b .440908
+
+
 #
 #patch1000 -p1 -b .disable-pdfjs
 %patch2000 -p1 -b .vine
@@ -256,6 +290,7 @@ MOZ_SMP_FLAGS=-j1
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
 [ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
+[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
 %endif
 
 sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
@@ -454,6 +489,11 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Aug  3 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 48.0-1
+- new upstream release.
+- updated upstream patches.
+- updated imported patches.
+
 * Thu Jun 30 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 47.0.1-1
 - new upstream release
 - update Patch2000 (firefox-47.0.1-vine.patch)

f/firefox/mozconfig-firefox-vine6

@@ -10,17 +10,17 @@ ac_add_options --without-system-nss
 ac_add_options --without-system-libvpx
 ac_add_options --disable-system-cairo
 ac_add_options --disable-system-sqlite
-ac_add_options --without-mng
+#ac_add_options --without-mng
 ac_add_options --with-pthreads
 ac_add_options --disable-tests
-ac_add_options --disable-mochitest
+#ac_add_options --disable-mochitest
 ac_add_options --disable-debug
-ac_add_options --disable-installer
+#ac_add_options --disable-installer
 #ac_add_options --enable-jsd
 ac_add_options --enable-optimize
 ac_add_options --enable-default-toolkit=cairo-gtk2
 #ac_add_options --enable-xft
-ac_add_options --enable-pango
+#ac_add_options --enable-pango
 ac_add_options --enable-xinerama
 ac_add_options --enable-crypto
 ac_add_options --enable-svg

f/firefox/mozconfig-firefox-vine7

@@ -10,17 +10,17 @@ ac_add_options --without-system-nss
 ac_add_options --without-system-libvpx
 ac_add_options --disable-system-cairo
 ac_add_options --disable-system-sqlite
-ac_add_options --without-mng
+#ac_add_options --without-mng
 ac_add_options --with-pthreads
 ac_add_options --disable-tests
-ac_add_options --disable-mochitest
+#ac_add_options --disable-mochitest
 ac_add_options --disable-debug
-ac_add_options --disable-installer
+#ac_add_options --disable-installer
 #ac_add_options --enable-jsd
 ac_add_options --enable-optimize
 ac_add_options --enable-default-toolkit=cairo-gtk2
 #ac_add_options --enable-xft
-ac_add_options --enable-pango
+#ac_add_options --enable-pango
 ac_add_options --enable-xinerama
 ac_add_options --enable-crypto
 ac_add_options --enable-svg