rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

Accepting request 59072 from mozilla:Factory

Browse Source 
Accepted submit request 59072 from user wrosenauer

OBS-URL: https://build.opensuse.org/request/show/59072
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=101
This commit is contained in:
Lars Vogdt 2011-01-25 08:00:23 +00:00 committed by Git OBS Bridge
commit 031a9a5e46
10 changed files with 64 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MozillaFirefox.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Jan 22 22:21:52 UTC 2011 - wr@rosenauer.org
- update to version 4.0b10
- removed obsolete firefox-shell-bmo624267.patch
- testpilot moved to distribution/extensions
- updated locale provides and removed bn-IN from locales
- use new macros for desktop file and icon registration
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 11 06:13:40 UTC 2011 - wr@rosenauer.org Tue Jan 11 06:13:40 UTC 2011 - wr@rosenauer.org

38
MozillaFirefox.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package MozillaFirefox # spec file for package MozillaFirefox (Version 4.0b10)
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2011 Wolfgang Rosenauer # 2006-2011 Wolfgang Rosenauer
@ -22,21 +22,21 @@
Name: MozillaFirefox Name: MozillaFirefox
%define use_xulrunner 1 %define use_xulrunner 1
%define xulrunner mozilla-xulrunner20 %define xulrunner mozilla-xulrunner20
BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip 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 %if %suse_version > 1110
BuildRequires: libiw-devel BuildRequires: libiw-devel
%else %else
BuildRequires: wireless-tools BuildRequires: wireless-tools
%endif %endif
%if 0%{?use_xulrunner} %if 0%{?use_xulrunner}
BuildRequires: %{xulrunner}-devel = 2.0b9 BuildRequires: %{xulrunner}-devel = 2.0b10
%endif %endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Version: 4.0b9 Version: 4.0b10
Release: 1
Provides: web_browser Provides: web_browser
Provides: firefox = %{version} Provides: firefox = %{version}
%define releasedate 2011011000 Release: 1
%define releasedate 2011012100
Summary: Mozilla Firefox Web Browser Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/ Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers Group: Productivity/Networking/Web/Browsers
@ -62,8 +62,7 @@ Patch7: firefox-no-sync-l10n.patch
Patch8: firefox-libxulsdk-locales.patch Patch8: firefox-libxulsdk-locales.patch
Patch9: firefox-no-default-ualocale.patch Patch9: firefox-no-default-ualocale.patch
Patch10: firefox-multilocale-chrome.patch Patch10: firefox-multilocale-chrome.patch
Patch11: firefox-shell-bmo624267.patch Patch11: firefox-shellservice.patch
Patch12: firefox-shellservice.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils Requires(post): coreutils shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils
@ -105,7 +104,6 @@ plethora of extensions.
%if %localize %if %localize
%package translations-common %package translations-common
Summary: Common translations for MozillaFirefox Summary: Common translations for MozillaFirefox
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
@ -121,7 +119,7 @@ of MozillaFirefox.
%package translations-other %package translations-other
Summary: Extra translations for MozillaFirefox Summary: Extra translations for MozillaFirefox
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ 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) Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;cy;el;en_ZA;eo;et;eu;fy_NL;ga_IE;gd;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk)
Group: System/Localization Group: System/Localization
Requires: %{name} = %{version} Requires: %{name} = %{version}
Obsoletes: %{name}-translations < %{version}-%{release} Obsoletes: %{name}-translations < %{version}-%{release}
@ -173,7 +171,6 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1
%build %build
export MOZ_BUILD_DATE=%{releasedate} export MOZ_BUILD_DATE=%{releasedate}
@ -243,7 +240,7 @@ rm -f %{_tmppath}/translations.*
touch %{_tmppath}/translations.{common,other} touch %{_tmppath}/translations.{common,other}
for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do
case $locale in case $locale in
ja-JP-mac|en-US) ja-JP-mac|en-US|bn-IN)
;; ;;
*) *)
pushd $RPM_BUILD_DIR/compare-locales pushd $RPM_BUILD_DIR/compare-locales
@ -320,26 +317,40 @@ rm -rf %{_tmppath}/translations.*
%post %post
# update mime and desktop database # update mime and desktop database
%if %suse_version > 1130
%mime_database_post
%desktop_database_post
%icon_theme_cache_post
%else
if [ -f usr/bin/update-mime-database ] ; then if [ -f usr/bin/update-mime-database ] ; then
usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : usr/bin/update-mime-database %{_datadir}/mime > /dev/null || :
fi fi
if [ -f usr/bin/update-desktop-database ] ; then if [ -f usr/bin/update-desktop-database ] ; then
usr/bin/update-desktop-database > /dev/null || : usr/bin/update-desktop-database > /dev/null || :
fi fi
%endif
exit 0 exit 0
%postun %postun
%if %suse_version > 1130
%icon_theme_cache_postun
%desktop_database_postun
%mime_database_postun
%else
if [ -f usr/bin/update-mime-database ] ; then if [ -f usr/bin/update-mime-database ] ; then
usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : usr/bin/update-mime-database %{_datadir}/mime > /dev/null || :
fi fi
if [ -f usr/bin/update-desktop-database ] ; then if [ -f usr/bin/update-desktop-database ] ; then
usr/bin/update-desktop-database > /dev/null || : usr/bin/update-desktop-database > /dev/null || :
fi fi
%endif
exit 0
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%dir %{progdir} %dir %{progdir}
%dir %{progdir}/chrome/ %dir %{progdir}/chrome/
%dir %{progdir}/distribution/
%{progdir}/chrome/browser.* %{progdir}/chrome/browser.*
%{progdir}/chrome/localized.manifest %{progdir}/chrome/localized.manifest
%{progdir}/chrome/nonlocalized.manifest %{progdir}/chrome/nonlocalized.manifest
@ -349,7 +360,7 @@ fi
%exclude %{progdir}/defaults/profile/bookmarks.html %exclude %{progdir}/defaults/profile/bookmarks.html
%{progdir}/defaults/ %{progdir}/defaults/
%dir %{progdir}/extensions/ %dir %{progdir}/extensions/
%{progdir}/extensions/testpilot@labs.mozilla.com %{progdir}/distribution/extensions/
%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
%{progdir}/icons/ %{progdir}/icons/
%{progdir}/modules/ %{progdir}/modules/
@ -372,7 +383,6 @@ fi
%doc %{_mandir}/man1/%{progname}.1.gz %doc %{_mandir}/man1/%{progname}.1.gz
%if %localize %if %localize
%files translations-common -f %{_tmppath}/translations.common %files translations-common -f %{_tmppath}/translations.common
%defattr(-,root,root) %defattr(-,root,root)
%dir %{progdir} %dir %{progdir}

4
compare-locales.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ac0cc69db526ffba2445d7d75927641e3be89667d1d8f5cd7d6966406d1fb6e1 oid sha256:ce16a17951d11c7e2f71295d2157bb2c629be8bacdcf5647009882853c1278ca
size 23421 size 23437

3
firefox-4.0b10-source.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2755ab185e80436ba03a3a225d86f0bc8f0293de583b665635c8b7294732f2b1
size 64278065

3
firefox-4.0b9-source.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5aeed5bfa6bcb4743d69d1ffc7efa511840df819b8106df39b914c8e7ba961f8
size 63999667

24
firefox-kde.patch
View File

@ -23,7 +23,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/base/content/browser-kde.xul +++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,1058 @@ @@ -0,0 +1,1062 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -569,6 +569,7 @@ new file mode 100644
+ onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
+ onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);"> + onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
+ <box id="notification-popup-box" hidden="true" align="center"> + <box id="notification-popup-box" hidden="true" align="center">
+ <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
@ -821,9 +822,9 @@ new file mode 100644
+ aria-label="&tabsToolbar.label;" + aria-label="&tabsToolbar.label;"
+ context="toolbar-context-menu" + context="toolbar-context-menu"
+#ifdef APPMENU_ON_TABBAR +#ifdef APPMENU_ON_TABBAR
+ defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton" + defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
+#else +#else
+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton" + defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
+#endif +#endif
+ collapsed="true"> + collapsed="true">
+ +
@ -868,13 +869,6 @@ new file mode 100644
+ position="after_end"/> + position="after_end"/>
+ </toolbarbutton> + </toolbarbutton>
+ +
+ <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&tabGroupsButton.label;"
+ command="Browser:ToggleTabView"
+ tooltiptext="&tabGroupsButton.tooltip;"
+ removable="true"
+ observes="tabviewGroupsNumber"/>
+
+ <toolbarbutton id="tabs-closebutton" + <toolbarbutton id="tabs-closebutton"
+ class="close-button tabs-closebutton" + class="close-button tabs-closebutton"
+ command="cmd_close" + command="cmd_close"
@ -982,6 +976,12 @@ new file mode 100644
+ oncommand="return FeedHandler.subscribeToFeed(null, event);" + oncommand="return FeedHandler.subscribeToFeed(null, event);"
+ onclick="checkForMiddleClick(this, event);"/> + onclick="checkForMiddleClick(this, event);"/>
+ </toolbarbutton> + </toolbarbutton>
+
+ <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&tabGroupsButton.label;"
+ command="Browser:ToggleTabView"
+ tooltiptext="&tabGroupsButton.tooltip;"
+ observes="tabviewGroupsNumber"/>
+ </toolbarpalette> + </toolbarpalette>
+ </toolbox> + </toolbox>
+ +
@ -1040,6 +1040,10 @@ new file mode 100644
+#endif +#endif
+#ifdef XP_MACOSX +#ifdef XP_MACOSX
+ <svg:svg height="0"> + <svg:svg height="0">
+ <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
+ <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
+ <svg:circle cx="-0.46" cy="0.48" r="0.65"/>
+ </svg:mask>
+ <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> + <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse">
+ <svg:circle cx="9" cy="3" r="3" fill="white"/> + <svg:circle cx="9" cy="3" r="3" fill="white"/>
+ <svg:rect x="9" y="0" width="3" height="3" fill="white"/> + <svg:rect x="9" y="0" width="3" height="3" fill="white"/>

15
firefox-multilocale-chrome.patch
View File

@ -1,12 +1,12 @@
# HG changeset patch # HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 80550b99f4e1c3bfe561edf396dec27d47bf1696 # Parent e3da64303bf904a8da2410754026b7a00480a589
Add searchplugins to chrome packaging for proper localization Add searchplugins to chrome packaging for proper localization
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js
@@ -319,16 +319,20 @@ pref("browser.download.manager.scanWhenD @@ -321,16 +321,20 @@ pref("browser.download.manager.scanWhenD
pref("browser.download.manager.resumeOnWakeDelay", 10000); pref("browser.download.manager.resumeOnWakeDelay", 10000);
// search engines URL // search engines URL
@ -83,13 +83,16 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
--- a/browser/locales/jar.mn --- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn +++ b/browser/locales/jar.mn
@@ -87,8 +87,9 @@ @@ -81,11 +81,12 @@
locale/browser-region/region.properties (%chrome/browser-region/region.properties)
# the following files are browser-specific overrides
* locale/browser/netError.dtd (%chrome/overrides/netError.dtd)
* locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties)
* locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd)
% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
#if MOZ_UPDATE_CHANNEL == beta + locale/browser/searchplugins/list.txt (%searchplugins/list.txt)
% locale testpilot @AB_CD@ %locale/feedback/ % locale testpilot @AB_CD@ %locale/feedback/
locale/feedback/main.dtd (%feedback/main.dtd) locale/feedback/main.dtd (%feedback/main.dtd)
locale/feedback/main.properties (%feedback/main.properties) locale/feedback/main.properties (%feedback/main.properties)
#endif
+ locale/browser/searchplugins/list.txt (%searchplugins/list.txt)

82
firefox-shell-bmo624267.patch
View File

@ -1,82 +0,0 @@
# HG changeset patch
# Parent 6c4a0e0acb3a071dbfde60e975f68f18c85bbff8
# User timeless@mozdev.org
Bug 624267 Crash on Ubuntu [@ nsGNOMEShellService::SetDefaultBrowser ]
r=roc
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
@@ -214,30 +214,31 @@ nsGNOMEShellService::SetDefaultBrowser(P
#endif
nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-
- nsCAutoString appKeyValue(mAppPath);
- appKeyValue.Append(" \"%s\"");
- unsigned int i;
-
- for (i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
- if (appProtocols[i].essential || aClaimAllTypes) {
- gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name),
- appKeyValue);
+ if (gconf) {
+ nsCAutoString appKeyValue(mAppPath);
+ appKeyValue.Append(" \"%s\"");
+ for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
+ if (appProtocols[i].essential || aClaimAllTypes) {
+ gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name),
+ appKeyValue);
+ }
}
}
// set handler for .html and xhtml files and MIME types:
if (aClaimAllTypes) {
+ nsresult rv;
nsCOMPtr<nsIGIOService> giovfs =
- do_GetService(NS_GIOSERVICE_CONTRACTID);
+ do_GetService(NS_GIOSERVICE_CONTRACTID, &rv);
+ NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundleService> bundleService =
- do_GetService(NS_STRINGBUNDLE_CONTRACTID);
- NS_ENSURE_TRUE(bundleService, NS_ERROR_OUT_OF_MEMORY);
+ do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
+ NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> brandBundle;
- bundleService->CreateBundle(BRAND_PROPERTIES, getter_AddRefs(brandBundle));
- NS_ENSURE_TRUE(brandBundle, NS_ERROR_FAILURE);
+ rv = bundleService->CreateBundle(BRAND_PROPERTIES, getter_AddRefs(brandBundle));
+ NS_ENSURE_SUCCESS(rv, rv);
nsString brandShortName, brandFullName;
brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(),
@@ -247,17 +248,16 @@ nsGNOMEShellService::SetDefaultBrowser(P
// use brandShortName as the application id.
NS_ConvertUTF16toUTF8 id(brandShortName);
- if (giovfs) {
- nsCOMPtr<nsIGIOMimeApp> appInfo;
- giovfs->CreateAppFromCommand(mAppPath,
- id,
- getter_AddRefs(appInfo));
+ nsCOMPtr<nsIGIOMimeApp> appInfo;
+ rv = giovfs->CreateAppFromCommand(mAppPath,
+ id,
+ getter_AddRefs(appInfo));
+ NS_ENSURE_SUCCESS(rv, rv);
- // Add mime types for html, xhtml extension and set app to just created appinfo.
- for (i = 0; i < NS_ARRAY_LENGTH(appTypes); ++i) {
- appInfo->SetAsDefaultForMimeType(nsDependentCString(appTypes[i].mimeType));
- appInfo->SetAsDefaultForFileExtensions(nsDependentCString(appTypes[i].extensions));
- }
+ // Add mime types for html, xhtml extension and set app to just created appinfo.
+ for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appTypes); ++i) {
+ appInfo->SetAsDefaultForMimeType(nsDependentCString(appTypes[i].mimeType));
+ appInfo->SetAsDefaultForFileExtensions(nsDependentCString(appTypes[i].extensions));
}
}

3
l10n-4.0b10.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:50830c01fa3cec2e14d832abc311cd4499b97f617c62431b54552c9a7a7ea557
size 39774011

3
l10n-4.0b9.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bec7fa71fa6b7458407bc7c78b98518e3b5d432baa4dc2754ce95682b45c2215
size 39499839