forked from pool/MozillaFirefox
update to 4.0b7
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=173
This commit is contained in:
Wolfgang Rosenauer
Git OBS Bridge
parent
1568fb0ccf
commit
7806ad0aa0
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 30 14:19:59 UTC 2010 - wr@rosenauer.org
|
||||
|
||||
- major update to version 4.0beta7
|
||||
* based on mozilla-xulrunner20
|
||||
* far too many internal changes to list
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 27 07:12:14 CEST 2010 - wr@rosenauer.org
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package MozillaFirefox (Version 3.6.12)
|
||||
# spec file for package MozillaFirefox (Version 4.0b)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# 2006-2010 Wolfgang Rosenauer
|
||||
@ -20,29 +20,29 @@
|
||||
|
||||
|
||||
Name: MozillaFirefox
|
||||
%define xulrunner mozilla-xulrunner192
|
||||
BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip
|
||||
BuildRequires: %{xulrunner}-devel = 1.9.2.12
|
||||
%if %suse_version > 1020
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
%define use_xulrunner 1
|
||||
%define xulrunner mozilla-xulrunner20
|
||||
BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm
|
||||
%if %suse_version > 1110
|
||||
BuildRequires: libiw-devel
|
||||
%else
|
||||
BuildRequires: wireless-tools
|
||||
%endif
|
||||
%if 0%{?use_xulrunner}
|
||||
BuildRequires: %{xulrunner}-devel = 2.0b
|
||||
%endif
|
||||
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
|
||||
Version: 4.0b
|
||||
Provides: web_browser
|
||||
Provides: firefox
|
||||
Version: 3.6.12
|
||||
Provides: firefox = %{version}
|
||||
Release: 1
|
||||
%define releasedate 2010102600
|
||||
%define releasedate 2010110500
|
||||
Summary: Mozilla Firefox Web Browser
|
||||
Url: http://www.mozilla.org/
|
||||
Group: Productivity/Networking/Web/Browsers
|
||||
Source: firefox-%{version}-source.tar.bz2
|
||||
Source1: MozillaFirefox.desktop
|
||||
Source2: %{name}-rpmlintrc
|
||||
Source2: MozillaFirefox-rpmlintrc
|
||||
Source3: mozilla.sh.in
|
||||
Source4: find-external-requires.sh
|
||||
Source5: firefox.schemas
|
||||
@ -50,43 +50,41 @@ Source6: kde.js
|
||||
Source7: l10n-%{version}.tar.bz2
|
||||
Source8: firefox-mimeinfo.xml
|
||||
Source9: firefox-lockdown.js
|
||||
Source16: firefox.1
|
||||
Source17: firefox-suse-default-prefs.js
|
||||
Patch1: firefox-libxul-sdk.patch
|
||||
Patch2: firefox-credits.patch
|
||||
Patch3: toolkit-download-folder.patch
|
||||
Patch4: firefox-linkorder.patch
|
||||
Patch5: firefox-browser-css.patch
|
||||
Patch6: firefox-cross-desktop.patch
|
||||
Patch7: firefox-no-gnomevfs.patch
|
||||
Patch8: firefox-appname.patch
|
||||
Patch9: firefox-kde.patch
|
||||
Patch10: firefox-ui-lockdown.patch
|
||||
Patch11: firefox-crashreporter.patch
|
||||
Source10: compare-locales.tar.bz2
|
||||
Source11: firefox.1
|
||||
Patch1: toolkit-download-folder.patch
|
||||
Patch2: firefox-linkorder.patch
|
||||
Patch3: firefox-browser-css.patch
|
||||
Patch4: firefox-cross-desktop.patch
|
||||
Patch5: firefox-appname.patch
|
||||
Patch6: firefox-kde.patch
|
||||
Patch7: firefox-ui-lockdown.patch
|
||||
Patch8: firefox-no-sync-l10n.patch
|
||||
Patch9: firefox-libxulsdk-locales.patch
|
||||
Patch10: firefox-no-default-ualocale.patch
|
||||
Patch11: firefox-multilocale-chrome.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires(post): coreutils shared-mime-info desktop-file-utils
|
||||
Requires(postun): shared-mime-info desktop-file-utils
|
||||
%if 0%{?use_xulrunner}
|
||||
Requires: %{xulrunner} >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner})
|
||||
%requires_eq %{xulrunner}
|
||||
%ifarch %ix86
|
||||
Requires: %{xulrunner}-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner})
|
||||
Requires: %{xulrunner}-32bit = %(rpm -q --queryformat '%{VERSION}' %{xulrunner})
|
||||
%endif
|
||||
Requires: %{name}-branding >= 3.5
|
||||
%endif
|
||||
Requires: %{name}-branding >= 4.0
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_requires sh %{SOURCE4}
|
||||
%global provfind sh -c "grep -v '.so' | %__find_provides"
|
||||
%global __find_provides %provfind
|
||||
%define progname firefox
|
||||
%define progdir %{_prefix}/%_lib/%{progname}
|
||||
%if %suse_version > 1020
|
||||
%define gnome_dir %{_prefix}
|
||||
%else
|
||||
%define gnome_dir /opt/gnome
|
||||
%endif
|
||||
### build options
|
||||
%define branding 1
|
||||
%define localize 1
|
||||
%define localize 1
|
||||
%ifarch ppc ppc64 s390 s390x ia64
|
||||
%define crashreporter 0
|
||||
%else
|
||||
@ -101,14 +99,12 @@ plethora of extensions.
|
||||
|
||||
|
||||
%if %localize
|
||||
|
||||
%package translations-common
|
||||
Summary: Common translations for MozillaFirefox
|
||||
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
|
||||
Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
|
||||
Group: System/Localization
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{xulrunner}-translations-common
|
||||
Obsoletes: %{name}-translations < %{version}-%{release}
|
||||
|
||||
%description translations-common
|
||||
@ -121,7 +117,6 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
|
||||
Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
|
||||
Group: System/Localization
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{xulrunner}-translations-other
|
||||
Obsoletes: %{name}-translations < %{version}-%{release}
|
||||
|
||||
%description translations-other
|
||||
@ -134,7 +129,7 @@ of MozillaFirefox.
|
||||
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
|
||||
Summary: Upstream branding for MozillaFirefox
|
||||
Group: Productivity/Networking/Web/Browsers
|
||||
Provides: %{name}-branding = 3.5
|
||||
Provides: %{name}-branding = 4.0
|
||||
Conflicts: otherproviders(%{name}-branding)
|
||||
Supplements: packageand(%{name}:branding-upstream)
|
||||
#BRAND: Provide three files -
|
||||
@ -154,21 +149,21 @@ This package provides upstream look and feel for MozillaFirefox.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n mozilla -b 7
|
||||
%setup -q -n mozilla -b 7 -b 10
|
||||
cd $RPM_BUILD_DIR/mozilla
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%if %suse_version >= 1110
|
||||
%patch9 -p1
|
||||
%patch6 -p1
|
||||
# install kde.js
|
||||
install -m 644 %{SOURCE6} browser/app/profile/kde.js
|
||||
%endif
|
||||
#%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
|
||||
@ -176,20 +171,15 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js
|
||||
export MOZ_BUILD_DATE=%{releasedate}
|
||||
export MOZILLA_OFFICIAL=1
|
||||
export BUILD_OFFICIAL=1
|
||||
export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
|
||||
export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
|
||||
export CXXFLAGS="$CFLAGS"
|
||||
# 10.3-x86_64 build fails probably because gcc bug
|
||||
%if %suse_version == 1030
|
||||
%ifarch x86_64
|
||||
export ac_cv_visibility_hidden="no"
|
||||
%endif
|
||||
%endif
|
||||
export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
|
||||
SDKDIR=$(pkg-config --variable=sdkdir libxul)
|
||||
cat << EOF > $MOZCONFIG
|
||||
mk_add_options MOZILLA_OFFICIAL=1
|
||||
mk_add_options BUILD_OFFICIAL=1
|
||||
mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs}
|
||||
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
|
||||
. \$topsrcdir/browser/config/mozconfig
|
||||
ac_add_options --prefix=%{_prefix}
|
||||
ac_add_options --libdir=%{_libdir}
|
||||
@ -198,8 +188,7 @@ ac_add_options --mandir=%{_mandir}
|
||||
ac_add_options --includedir=%{_includedir}
|
||||
ac_add_options --with-system-nspr
|
||||
ac_add_options --with-system-nss
|
||||
ac_add_options --with-libxul-sdk=$SDKDIR
|
||||
ac_add_options --with-l10n-base=../l10n
|
||||
ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
|
||||
ac_add_options --with-system-jpeg
|
||||
#ac_add_options --with-system-png # doesn't work because of missing APNG support
|
||||
ac_add_options --with-system-zlib
|
||||
@ -207,7 +196,14 @@ ac_add_options --disable-installer
|
||||
ac_add_options --disable-updater
|
||||
ac_add_options --disable-tests
|
||||
ac_add_options --disable-debug
|
||||
ac_add_options --enable-update-channel=beta
|
||||
EOF
|
||||
%if 0%{?use_xulrunner}
|
||||
cat << EOF >> $MOZCONFIG
|
||||
ac_add_options --with-libxul-sdk=$SDKDIR
|
||||
ac_add_options --enable-chrome-format=jar
|
||||
EOF
|
||||
%endif
|
||||
%if %branding
|
||||
cat << EOF >> $MOZCONFIG
|
||||
ac_add_options --enable-official-branding
|
||||
@ -216,31 +212,43 @@ EOF
|
||||
make -f client.mk build
|
||||
|
||||
%install
|
||||
cd $RPM_BUILD_DIR/obj
|
||||
# FIXME (will be needed once lockdown is integrated; needs omni.jar adoption)
|
||||
#cp %{SOURCE9} dist/bin/defaults/preferences/lockdown.js
|
||||
rm dist/bin/defaults/preferences/firefox-l10n.js
|
||||
make -C browser/installer STRIP=/bin/true
|
||||
# copy tree into RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT/%{progdir}
|
||||
cp -rf $RPM_BUILD_DIR/mozilla/dist/firefox/* $RPM_BUILD_ROOT/%{progdir}
|
||||
cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT/%{progdir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins
|
||||
# install additional locales
|
||||
%if %localize
|
||||
rm -f %{_tmppath}/translations.*
|
||||
for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do
|
||||
touch %{_tmppath}/translations.{common,other}
|
||||
for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do
|
||||
case $locale in
|
||||
ja-JP-mac|en-US)
|
||||
;;
|
||||
*)
|
||||
make -C browser/locales libs-$locale
|
||||
cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \
|
||||
$RPM_BUILD_ROOT%{progdir}/chrome
|
||||
cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \
|
||||
$RPM_BUILD_ROOT%{progdir}/chrome
|
||||
pushd $RPM_BUILD_DIR/compare-locales
|
||||
PYTHONPATH=lib \
|
||||
scripts/compare-locales -m ../l10n-merged/$locale \
|
||||
../mozilla/browser/locales/l10n.ini ../l10n $locale
|
||||
popd
|
||||
LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \
|
||||
make -C browser/locales langpack-$locale
|
||||
cp -r dist/xpi-stage/locale-$locale \
|
||||
$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org
|
||||
# remove prefs and profile defaults from langpack
|
||||
rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/defaults
|
||||
# check against the fixed common list and sort into the right filelist
|
||||
_matched=0
|
||||
for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
|
||||
[ "$_match" = "$locale" ] && _matched=1
|
||||
done
|
||||
[ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other
|
||||
echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.$_l10ntarget
|
||||
echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.$_l10ntarget
|
||||
echo %{progdir}/extensions/langpack-$locale@firefox.mozilla.org \
|
||||
>> %{_tmppath}/translations.$_l10ntarget
|
||||
esac
|
||||
done
|
||||
%endif
|
||||
@ -248,7 +256,7 @@ done
|
||||
mkdir --parents $RPM_BUILD_ROOT/usr/bin
|
||||
sed "s:%%PREFIX:%{_prefix}:g
|
||||
s:%%PROGDIR:%{progdir}:g
|
||||
s:%%APPNAME:%{progname}:g
|
||||
s:%%APPNAME:firefox:g
|
||||
s:%%PROFILE:.mozilla/firefox:g" \
|
||||
%{SOURCE3} > $RPM_BUILD_ROOT%{progdir}/%{progname}.sh
|
||||
chmod 755 $RPM_BUILD_ROOT%{progdir}/%{progname}.sh
|
||||
@ -262,17 +270,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
|
||||
cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{progname}.xml
|
||||
# install man-page
|
||||
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
|
||||
cp %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1/%{progname}.1
|
||||
# apply SUSE defaults
|
||||
sed -e 's,RPM_VERSION,%{version}-%{release},g' \
|
||||
%{SOURCE17} > suse-default-prefs
|
||||
cp suse-default-prefs $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-build.js
|
||||
rm suse-default-prefs
|
||||
cp %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/lockdown.js
|
||||
# use correct locale for useragent
|
||||
cat > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-l10n.js << EOF
|
||||
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
|
||||
EOF
|
||||
cp %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/%{progname}.1
|
||||
##########
|
||||
# ADDONS
|
||||
#
|
||||
@ -295,10 +293,8 @@ rm -f $RPM_BUILD_ROOT%{progdir}/old-homepage-default.properties
|
||||
rm -f $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh
|
||||
rm -f $RPM_BUILD_ROOT%{progdir}/LICENSE
|
||||
# fdupes
|
||||
%if %suse_version > 1020
|
||||
%fdupes $RPM_BUILD_ROOT%{progdir}
|
||||
%fdupes $RPM_BUILD_ROOT%{_datadir}
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -349,24 +345,27 @@ fi
|
||||
%dir %{progdir}
|
||||
%dir %{progdir}/chrome/
|
||||
%{progdir}/chrome/browser.*
|
||||
%{progdir}/chrome/classic.*
|
||||
%{progdir}/chrome/localized.manifest
|
||||
%{progdir}/chrome/nonlocalized.manifest
|
||||
%{progdir}/chrome/en-US.*
|
||||
%{progdir}/chrome/reporter.*
|
||||
%{progdir}/chrome/icons
|
||||
%{progdir}/components/
|
||||
%exclude %{progdir}/defaults/profile/bookmarks.html
|
||||
%{progdir}/defaults/
|
||||
%{progdir}/extensions/
|
||||
%dir %{progdir}/extensions/
|
||||
%{progdir}/extensions/testpilot@labs.mozilla.com
|
||||
%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
|
||||
%{progdir}/icons/
|
||||
%{progdir}/searchplugins/
|
||||
%{progdir}/modules/
|
||||
%{progdir}/searchplugins/
|
||||
%attr(755,root,root) %{progdir}/%{progname}.sh
|
||||
%{progdir}/%{progname}
|
||||
%{progdir}/firefox
|
||||
%{progdir}/application.ini
|
||||
%{progdir}/blocklist.xml
|
||||
%if %crashreporter
|
||||
%{progdir}/crashreporter-override.ini
|
||||
%endif
|
||||
%{progdir}/chrome.manifest
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/mime/packages/%{progname}.xml
|
||||
%{_datadir}/pixmaps/firefox*
|
||||
@ -381,19 +380,18 @@ fi
|
||||
%files translations-common -f %{_tmppath}/translations.common
|
||||
%defattr(-,root,root)
|
||||
%dir %{progdir}
|
||||
%dir %{progdir}/chrome/
|
||||
%dir %{progdir}/extensions/
|
||||
|
||||
%files translations-other -f %{_tmppath}/translations.other
|
||||
%defattr(-,root,root)
|
||||
%dir %{progdir}
|
||||
%dir %{progdir}/chrome/
|
||||
%dir %{progdir}/extensions/
|
||||
%endif
|
||||
|
||||
%files branding-upstream
|
||||
%defattr(-,root,root)
|
||||
%files branding-upstream
|
||||
%defattr(-,root,root)
|
||||
%dir %{progdir}
|
||||
%dir %{progdir}/defaults/
|
||||
%{progdir}/browserconfig.properties
|
||||
%{progdir}/defaults/profile/bookmarks.html
|
||||
|
||||
%changelog
|
||||
|
||||
3
compare-locales.tar.bz2
Normal file
3
compare-locales.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:261463e9d13184159c52595238b930fec66c86d3251a29610715d59b4ebe0a6e
|
||||
size 22830
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d9c15505c9f929c97dbcd19425429b5283d2734fafc0b0fe2fb896eaeb03cdbe
|
||||
size 51084949
|
||||
3
firefox-4.0b-source.tar.bz2
Normal file
3
firefox-4.0b-source.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fd14bbe10cd0506d4e72d1ded9bd027b62daf8c7c8701729a903f117960e5444
|
||||
size 63321466
|
||||
@ -4,26 +4,33 @@ Subject: Hardcode app starter for default check
|
||||
diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
|
||||
--- a/browser/components/shell/src/nsGNOMEShellService.cpp
|
||||
+++ b/browser/components/shell/src/nsGNOMEShellService.cpp
|
||||
@@ -127,17 +127,21 @@ nsGNOMEShellService::Init()
|
||||
nsCOMPtr<nsILocalFile> appPath;
|
||||
rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile),
|
||||
getter_AddRefs(appPath));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
- return appPath->GetNativePath(mAppPath);
|
||||
+ /* This path to firefox is hardcoded for the default path setting */
|
||||
+ mAppPath.Assign ("/usr/bin/firefox");
|
||||
+
|
||||
+ //return appPath->GetNativePath(mAppPath);
|
||||
+ return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)
|
||||
|
||||
PRBool
|
||||
nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
|
||||
@@ -105,22 +105,26 @@ nsresult
|
||||
nsGNOMEShellService::Init()
|
||||
{
|
||||
nsresult rv;
|
||||
|
||||
// GConf _must_ be available, or we do not allow
|
||||
// CreateInstance to succeed.
|
||||
|
||||
nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
|
||||
+ if (!gconf)
|
||||
+ return NS_ERROR_NOT_AVAILABLE;
|
||||
+
|
||||
+ /* This path to firefox is hardcoded for the default path setting */
|
||||
+ mAppPath.Assign("/usr/bin/firefox");
|
||||
+ return NS_OK;
|
||||
+
|
||||
nsCOMPtr<nsIGIOService> giovfs =
|
||||
do_GetService(NS_GIOSERVICE_CONTRACTID);
|
||||
|
||||
- if (!gconf)
|
||||
- return NS_ERROR_NOT_AVAILABLE;
|
||||
-
|
||||
// Check G_BROKEN_FILENAMES. If it's set, then filenames in glib use
|
||||
// the locale encoding. If it's not set, they use UTF-8.
|
||||
mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nsnull;
|
||||
|
||||
nsCOMPtr<nsIProperties> dirSvc
|
||||
(do_GetService("@mozilla.org/file/directory_service;1"));
|
||||
NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE);
|
||||
|
||||
|
||||
@ -9,8 +9,8 @@ https://bugzilla.novell.com/show_bug.cgi?id=561027
|
||||
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
|
||||
--- a/browser/themes/gnomestripe/browser/browser.css
|
||||
+++ b/browser/themes/gnomestripe/browser/browser.css
|
||||
@@ -788,16 +788,30 @@ toolbar[iconsize="small"] #fullscreen-bu
|
||||
display: none;
|
||||
@@ -811,16 +811,30 @@ toolbar[iconsize="small"] #fullscreen-bu
|
||||
-moz-margin-end: 3px;
|
||||
}
|
||||
|
||||
#PopupAutoComplete,
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
||||
--- a/browser/app/Makefile.in
|
||||
+++ b/browser/app/Makefile.in
|
||||
@@ -223,22 +223,16 @@ endif
|
||||
ifdef DEBUG
|
||||
RCFLAGS += -DDEBUG
|
||||
endif
|
||||
RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\"
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
-DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
|
||||
-
|
||||
-ifdef MOZILLA_OFFICIAL
|
||||
-DEFINES += -DMOZILLA_OFFICIAL
|
||||
-endif
|
||||
-
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
include $(topsrcdir)/config/static-rules.mk
|
||||
|
||||
DEFINES += -DIMPL_XREAPI
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
|
||||
LIBS += -lphexlib
|
||||
@@ -277,16 +271,22 @@ install:: $(MOZ_APP_NAME)
|
||||
|
||||
GARBAGE += $(MOZ_APP_NAME)
|
||||
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)
|
||||
|
||||
endif
|
||||
|
||||
endif # LIBXUL_SDK
|
||||
|
||||
+ifdef MOZILLA_OFFICIAL
|
||||
+DEFINES += -DMOZILLA_OFFICIAL
|
||||
+endif
|
||||
+
|
||||
+DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
|
||||
+
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
||||
libs::
|
||||
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
|
||||
$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons
|
||||
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
|
||||
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
|
||||
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
|
||||
endif
|
||||
@ -1,23 +0,0 @@
|
||||
diff --git a/browser/base/content/credits.xhtml b/browser/base/content/credits.xhtml
|
||||
--- a/browser/base/content/credits.xhtml
|
||||
+++ b/browser/base/content/credits.xhtml
|
||||
@@ -583,16 +583,19 @@
|
||||
<li>Kohei Yoshino</li>
|
||||
<li>Shigeru Yoshitake</li>
|
||||
<li>Tanner M. Young</li>
|
||||
<li>Boris Zbarsky</li>
|
||||
<li>Marco Zehe</li>
|
||||
<li>Matthew Zeier</li>
|
||||
</ul>
|
||||
|
||||
+ <h3>openSUSE RPM packaging</h3>
|
||||
+ <ul><li>Wolfgang Rosenauer</li></ul>
|
||||
+
|
||||
<div dir="&locale.dir;">
|
||||
&credit.translation;
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- organizational supporters -->
|
||||
<div class="creditsGroup">
|
||||
<h3 dir="&locale.dir;">&credit.thanks;</h3>
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,16 +0,0 @@
|
||||
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
||||
--- a/browser/locales/Makefile.in
|
||||
+++ b/browser/locales/Makefile.in
|
||||
@@ -192,9 +192,11 @@ endif
|
||||
|
||||
libs-%:
|
||||
$(NSINSTALL) -D $(DIST)/install
|
||||
+ifndef LIBXUL_SDK
|
||||
@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
|
||||
+ @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
+endif
|
||||
@$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
- @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
|
||||
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
@$(MAKE) tests AB_CD=$*
|
||||
28
firefox-libxulsdk-locales.patch
Normal file
28
firefox-libxulsdk-locales.patch
Normal file
@ -0,0 +1,28 @@
|
||||
# HG changeset patch
|
||||
# Parent bc45125446bfa168631a01c0b4b9b830c39d109a
|
||||
|
||||
diff --git a/browser/makefiles.sh b/browser/makefiles.sh
|
||||
--- a/browser/makefiles.sh
|
||||
+++ b/browser/makefiles.sh
|
||||
@@ -74,16 +74,21 @@ browser/installer/windows/Makefile
|
||||
browser/locales/Makefile
|
||||
browser/themes/Makefile
|
||||
browser/themes/pinstripe/browser/Makefile
|
||||
browser/themes/pinstripe/communicator/Makefile
|
||||
browser/themes/pinstripe/Makefile
|
||||
browser/themes/winstripe/browser/Makefile
|
||||
browser/themes/winstripe/communicator/Makefile
|
||||
browser/themes/winstripe/Makefile
|
||||
+netwerk/locales/Makefile
|
||||
+dom/locales/Makefile
|
||||
+security/manager/locales/Makefile
|
||||
+extensions/spellcheck/locales/Makefile
|
||||
+toolkit/locales/Makefile
|
||||
$MOZ_BRANDING_DIRECTORY/Makefile
|
||||
$MOZ_BRANDING_DIRECTORY/content/Makefile
|
||||
$MOZ_BRANDING_DIRECTORY/locales/Makefile
|
||||
"
|
||||
|
||||
if [ "$ENABLE_TESTS" ]; then
|
||||
add_makefiles "
|
||||
browser/base/content/test/Makefile
|
||||
@ -5,7 +5,7 @@ References:
|
||||
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
|
||||
--- a/browser/components/build/Makefile.in
|
||||
+++ b/browser/components/build/Makefile.in
|
||||
@@ -78,19 +78,21 @@ LOCAL_INCLUDES += -I$(srcdir)/../migrati
|
||||
@@ -61,19 +61,21 @@ LOCAL_INCLUDES += -I$(srcdir)/../migrati
|
||||
SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)
|
||||
EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
@ -22,7 +22,7 @@ diff --git a/browser/components/build/Makefile.in b/browser/components/build/Mak
|
||||
+
|
||||
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
|
||||
# GTK2: Need to link with glib for GNOME shell service
|
||||
ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
|
||||
ifneq (,$(filter cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
95
firefox-multilocale-chrome.patch
Normal file
95
firefox-multilocale-chrome.patch
Normal file
@ -0,0 +1,95 @@
|
||||
# HG changeset patch
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
# Parent 80550b99f4e1c3bfe561edf396dec27d47bf1696
|
||||
Add searchplugins to chrome packaging for proper localization
|
||||
|
||||
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
||||
--- a/browser/app/profile/firefox.js
|
||||
+++ b/browser/app/profile/firefox.js
|
||||
@@ -319,16 +319,20 @@ pref("browser.download.manager.scanWhenD
|
||||
pref("browser.download.manager.resumeOnWakeDelay", 10000);
|
||||
|
||||
// search engines URL
|
||||
pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search-engines/");
|
||||
|
||||
// pointer to the default engine name
|
||||
pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
|
||||
|
||||
+// Tell the search service to load search plugins from the locale JAR
|
||||
+pref("browser.search.loadFromJars", true);
|
||||
+pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/");
|
||||
+
|
||||
// disable logging for the search service by default
|
||||
pref("browser.search.log", false);
|
||||
|
||||
// Ordering of Search Engines in the Engine list.
|
||||
pref("browser.search.order.1", "chrome://browser-region/locale/region.properties");
|
||||
pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
|
||||
pref("browser.search.order.3", "chrome://browser-region/locale/region.properties");
|
||||
|
||||
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
||||
--- a/browser/locales/Makefile.in
|
||||
+++ b/browser/locales/Makefile.in
|
||||
@@ -169,31 +169,44 @@ libs:: $(addprefix $(LOCALE_SRCDIR)/prof
|
||||
install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
|
||||
|
||||
install:: $(addprefix generic/profile/,$(PROFILE_FILES))
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
|
||||
|
||||
install:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
|
||||
|
||||
-SEARCH_PLUGINS = $(shell cat $(LOCALE_SRCDIR)/searchplugins/list.txt)
|
||||
+SEARCH_PLUGINS = $(shell cat \
|
||||
+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
|
||||
+ @srcdir@/en-US/searchplugins/list.txt ) )
|
||||
|
||||
-libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
|
||||
- $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
|
||||
+tmp-search.jar.mn::
|
||||
+ printf "$(AB_CD).jar:" > $@
|
||||
+ printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@
|
||||
+ @echo >> $@
|
||||
|
||||
-install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
|
||||
- $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
|
||||
+searchplugins: tmp-search.jar.mn
|
||||
+ $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
|
||||
+ $(QUIET) -j $(FINAL_TARGET)/chrome \
|
||||
+ -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \
|
||||
+ -s $(LOCALE_SRCDIR)/searchplugins \
|
||||
+ $(MAKE_JARS_FLAGS) tmp-search.jar.mn
|
||||
+
|
||||
+export:: searchplugins
|
||||
+
|
||||
+GARBAGE += tmp-search.jar.mn
|
||||
|
||||
|
||||
libs-%:
|
||||
$(NSINSTALL) -D $(DIST)/install
|
||||
@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
|
||||
ifdef MOZ_SERVICES_SYNC
|
||||
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
endif
|
||||
+ @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
|
||||
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
|
||||
|
||||
repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
|
||||
repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
|
||||
@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
|
||||
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
|
||||
--- a/browser/locales/jar.mn
|
||||
+++ b/browser/locales/jar.mn
|
||||
@@ -87,8 +87,9 @@
|
||||
% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
|
||||
% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
|
||||
% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
|
||||
#if MOZ_UPDATE_CHANNEL == beta
|
||||
% locale testpilot @AB_CD@ %locale/feedback/
|
||||
locale/feedback/main.dtd (%feedback/main.dtd)
|
||||
locale/feedback/main.properties (%feedback/main.properties)
|
||||
#endif
|
||||
+ locale/browser/searchplugins/list.txt (%searchplugins/list.txt)
|
||||
27
firefox-no-default-ualocale.patch
Normal file
27
firefox-no-default-ualocale.patch
Normal file
@ -0,0 +1,27 @@
|
||||
# HG changeset patch
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
# Parent 9041ab32e51a397a39de4f95c718a5adf5c21f2f
|
||||
Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
|
||||
|
||||
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
||||
--- a/browser/app/profile/firefox.js
|
||||
+++ b/browser/app/profile/firefox.js
|
||||
@@ -215,17 +215,17 @@ pref("xpinstall.whitelist.add.36", "getp
|
||||
|
||||
pref("lightweightThemes.update.enabled", true);
|
||||
|
||||
pref("keyword.enabled", true);
|
||||
// Override the default keyword.URL. Empty value means
|
||||
// "use the search service's default engine"
|
||||
pref("keyword.URL", "");
|
||||
|
||||
-pref("general.useragent.locale", "@AB_CD@");
|
||||
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
|
||||
pref("general.skins.selectedSkin", "classic/1.0");
|
||||
|
||||
pref("general.smoothScroll", false);
|
||||
#ifdef UNIX_BUT_NOT_MAC
|
||||
pref("general.autoScroll", false);
|
||||
#else
|
||||
pref("general.autoScroll", true);
|
||||
#endif
|
||||
@ -1,22 +0,0 @@
|
||||
From: Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
Subject: Do not build nkgnomevfs in xul app builds
|
||||
References:
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=512671
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -5744,6 +5744,13 @@ if test -z "$MOZ_ENABLE_GNOMEVFS" && tes
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
|
||||
fi
|
||||
|
||||
+if test ! -z "$LIBXUL_SDK_DIR" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
|
||||
+ if test -n "$MOZ_X11"; then
|
||||
+ AC_MSG_WARN([nkgnomevfs is already part of xulrunner. Removing gnomevfs from MOZ_EXTENSIONS.])
|
||||
+ fi
|
||||
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
|
||||
+fi
|
||||
+
|
||||
if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
|
||||
AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
|
||||
26
firefox-no-sync-l10n.patch
Normal file
26
firefox-no-sync-l10n.patch
Normal file
@ -0,0 +1,26 @@
|
||||
# HG changeset patch
|
||||
# Parent e386d64898cac5a2e10bc4fbce606ffeefe1f210
|
||||
|
||||
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
||||
--- a/browser/locales/Makefile.in
|
||||
+++ b/browser/locales/Makefile.in
|
||||
@@ -181,17 +181,19 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
|
||||
|
||||
install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
|
||||
|
||||
|
||||
libs-%:
|
||||
$(NSINSTALL) -D $(DIST)/install
|
||||
@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
|
||||
+ifdef MOZ_SERVICES_SYNC
|
||||
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
+endif
|
||||
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
|
||||
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
|
||||
|
||||
|
||||
repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
|
||||
repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
|
||||
@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
|
||||
@ -1,2 +0,0 @@
|
||||
pref("general.useragent.vendor", "SUSE");
|
||||
pref("general.useragent.vendorSub", "RPM_VERSION");
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:75970f6c1af0990fbefaf9c9274cc88692fc8b1f24aa40bbeb46965259cb161e
|
||||
size 37679237
|
||||
3
l10n-4.0b.tar.bz2
Normal file
3
l10n-4.0b.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:350ee36ea52a8489990ec1592baef21edd1ce66521da0468f15adb01f2f2725d
|
||||
size 33149166
|
||||
Loading…
Reference in New Issue
Block a user