|
|
@@ -1,6 +1,6 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 31.0
|
|
|
-%global geckomajor 31.0
|
|
|
+%global ffmajor 32.0
|
|
|
+%global geckomajor 32.0
|
|
|
#global ffminor 1
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
@@ -22,13 +22,9 @@
|
|
|
%define build_vine6 1
|
|
|
%endif
|
|
|
|
|
|
-%define ffrelease 1%{?_dist_release}
|
|
|
+%define ffrelease 2%{?_dist_release}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
-%define nspr_version 4.9.6
|
|
|
-%define nss_version 3.14.3
|
|
|
-%define cairo_version 1.10.2-2
|
|
|
-#%define sqlite3_version 3.7.7.1
|
|
|
%define libjpeg_turbo_version 1.1.0
|
|
|
#%define gecko_version %{geckomajor}%{?ffminor:.%{ffminor}}
|
|
|
%define gecko_version %{geckomajor}
|
|
|
@@ -81,12 +77,12 @@ Patch3: firefox-12.0-gcc41-nosse2.patch
|
|
|
Patch4: firefox-26.0-gcc47.patch
|
|
|
|
|
|
# to build on vine6
|
|
|
-Patch5: firefox-31.0-gcc44.patch
|
|
|
+#Patch5: firefox-31.0-gcc44.patch
|
|
|
|
|
|
# bugfix
|
|
|
#Patch14: firefox-5.0-asciidel.patch
|
|
|
#
|
|
|
-Patch15: firefox-30.0-enable-addons.patch
|
|
|
+Patch15: firefox-32.0-enable-addons.patch
|
|
|
|
|
|
# patches from fedora
|
|
|
Patch21: rhbz-911314.patch
|
|
|
@@ -119,16 +115,8 @@ BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: lcms-devel
|
|
|
BuildRequires: libpng-devel
|
|
|
%if %{build_vine7}
|
|
|
-#BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
-#BuildRequires: nss-devel >= %{nss_version}
|
|
|
-#Requires: nss >= %{nss_version}
|
|
|
-#Requires: nspr >= %{nspr_version}
|
|
|
-%endif
|
|
|
-%if %{build_vine6}
|
|
|
-BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
BuildRequires: libjpeg-turbo-devel >= %{libjpeg_turbo_version}
|
|
|
%endif
|
|
|
-#BuildRequires: gecko-devel = %{gecko_version}
|
|
|
BuildRequires: libnotify-devel
|
|
|
BuildRequires: libXt-devel
|
|
|
BuildRequires: libXrender-devel
|
|
|
@@ -193,9 +181,9 @@ cd %{tarballdir}
|
|
|
%patch4 -p1 -b .gcc47
|
|
|
%endif
|
|
|
|
|
|
-%if "%{?_dist_release}" >= "vl6"
|
|
|
-%patch5 -p1 -b .gcc44
|
|
|
-%endif
|
|
|
+#%if "%{?_dist_release}" >= "vl6"
|
|
|
+#%patch5 -p1 -b .gcc44
|
|
|
+#%endif
|
|
|
|
|
|
#%patch14 -p1 -b .asciidel
|
|
|
%patch15 -p1 -b .enable-addons
|
|
|
@@ -217,6 +205,12 @@ cd %{tarballdir}
|
|
|
%{__cp} -f %{SOURCE230} .mozconfig
|
|
|
%endif
|
|
|
|
|
|
+%if %build_vine7
|
|
|
+%ifarch %ix86
|
|
|
+sed -i -e 's/enable-optimize/disable-optimize/g' .mozconfig
|
|
|
+%endif
|
|
|
+%endif
|
|
|
+
|
|
|
#echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
|
|
|
|
|
|
echo "ac_add_options --with-default-mozilla-five-home=%{ffdir}" >> .mozconfig
|
|
|
@@ -225,6 +219,7 @@ echo "ac_add_options --with-default-mozilla-five-home=%{ffdir}" >> .mozconfig
|
|
|
echo "ac_add_options --disable-ipc" >> .mozconfig
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
# update searchplugins
|
|
|
%{__tar} xjvf %{SOURCE2000} -C browser/locales/en-US/
|
|
|
|
|
|
@@ -455,6 +450,15 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Sep 07 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 32.0-2
|
|
|
+- update mozconfig
|
|
|
+ - sync vine6/7 config
|
|
|
+ - build with internal jpeg on vine6
|
|
|
+ - disable optimize on i686
|
|
|
+
|
|
|
+* Thu Sep 04 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 32.0-1
|
|
|
+- update to 32.0
|
|
|
+
|
|
|
* Wed Jul 23 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 31.0-1
|
|
|
- update to 31.0
|
|
|
|
daisuke