Djam/firefox-esr68
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr68.git synced 2025-02-24 18:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13 from import/firefox:rosa2016.1

Browse source 
Updated to 51.0.1
This commit is contained in:
alzim 2017-01-28 15:50:43 +03:00
commit f64e1974f6
3 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources: sources:
firefox-51.0.source.tar.xz: e7219a81b16d34d92872b4604051ce5ddb818126 firefox-51.0.1.source.tar.xz: b73255fd4f90fd0c1b107b566679da2df3f31cf1

12
firefox-50.1.0-fix-configure-script.patch
View file

@ -1,12 +0,0 @@
--- firefox-50.1.0.old/build/autoconf/icu.m4 2016-11-01 04:15:27.000000000 +0800
+++ firefox-50.1.0/build/autoconf/icu.m4 2017-01-13 16:09:33.690488542 +0800
@@ -69,7 +69,7 @@
fi
fi
- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
if test x"$version" = x; then
AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
fi

34
firefox.spec
View file

@ -7,7 +7,7 @@
# This also means only STABLE upstream releases, NO betas. # This also means only STABLE upstream releases, NO betas.
# This is a discussed topic. Please, do not flame it again. # This is a discussed topic. Please, do not flame it again.
%define major 51.0 %define major 51.0.1
%define ff_epoch 0 %define ff_epoch 0
# (tpg) set version HERE !!! # (tpg) set version HERE !!!
%define realver %{major} %define realver %{major}
@ -78,7 +78,7 @@ BuildRequires: pkgconfig(libIDL-2.0)
BuildRequires: makedepend BuildRequires: makedepend
BuildRequires: nss-devel >= 2:3.24 BuildRequires: nss-devel >= 2:3.24
BuildRequires: nss-static-devel BuildRequires: nss-static-devel
BuildRequires: nspr-devel >= 2:4.12 BuildRequires: pkgconfig(nspr)
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
BuildRequires: dbus-glib-devel BuildRequires: dbus-glib-devel
#BuildRequires: pkgconfig(sqlite3) >= 3.8.10.1 #BuildRequires: pkgconfig(sqlite3) >= 3.8.10.1
@ -341,7 +341,7 @@ EOF
mkdir -p %{buildroot}%{mozillalibdir}/defaults/profile/chrome mkdir -p %{buildroot}%{mozillalibdir}/defaults/profile/chrome
cat << EOF > %{buildroot}%{mozillalibdir}/defaults/profile/chrome/userChrome.css cat << EOF > %{buildroot}%{mozillalibdir}/defaults/profile/chrome/userChrome.css
#appmenu-toolbar-button { #appmenu-toolbar-button {
list-style-image: url("chrome://branding/content/icon16.png"); list-style-image: url("chrome://branding/content/icon16.png");
} }
EOF EOF
@ -356,28 +356,28 @@ touch %{buildroot}%{mozillalibdir}/defaults/profile/bookmarks.html
mkdir -p %{buildroot}%{_sys_macros_dir} mkdir -p %{buildroot}%{_sys_macros_dir}
cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros
# Macros from %{name} package # Macros from %{name} package
%%firefox_major %{major} %%firefox_major %{major}
%%firefox_epoch %{ff_epoch} %%firefox_epoch %{ff_epoch}
%%firefox_version %{major}%{?prel:-0.%prel} %%firefox_version %{major}%{?prel:-0.%prel}
%%firefox_mozillapath %{mozillalibdir} %%firefox_mozillapath %{mozillalibdir}
%%firefox_pluginsdir %{pluginsdir} %%firefox_pluginsdir %{pluginsdir}
%%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi) %%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi)
FIN FIN
mkdir -p %{buildroot}%{_docdir}/%{name} mkdir -p %{buildroot}%{_docdir}/%{name}
%pre %pre
if [ -d %{mozillalibdir}/browser/dictionaries ]; then if [ -d %{mozillalibdir}/browser/dictionaries ]; then
rm -fr %{mozillalibdir}/browser/dictionaries rm -fr %{mozillalibdir}/browser/dictionaries
fi fi
%post %post
if [ ! -r /etc/sysconfig/oem ]; then if [ ! -r /etc/sysconfig/oem ]; then
case `grep META_CLASS /etc/sysconfig/system` in case `grep META_CLASS /etc/sysconfig/system` in
*powerpack) bookmark="mozilla-powerpack.html" ;; *powerpack) bookmark="mozilla-powerpack.html" ;;
*desktop) bookmark="mozilla-one.html";; *desktop) bookmark="mozilla-one.html";;
*) bookmark="mozilla-download.html";; *) bookmark="mozilla-download.html";;
esac esac
ln -s -f ../../../../share/mdk/bookmarks/mozilla/$bookmark %{mozillalibdir}/defaults/profile/bookmarks.html ln -s -f ../../../../share/mdk/bookmarks/mozilla/$bookmark %{mozillalibdir}/defaults/profile/bookmarks.html
fi fi