# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1295776833 -3600
# Node ID 488440b896fec9e3a5f0a658c8b30ed6fd628c52
# Parent  2538fd6a51bebb815e369a9ef88e2f474756b8bf
fixed testpilot packaging
updated locale list
synced browser.xul for KDE

diff -r 2538fd6a51be -r 488440b896fe MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sat Jan 22 11:10:25 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Sun Jan 23 11:00:33 2011 +0100
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Tue Jan 11 06:13:40 UTC 2011 - wr@rosenauer.org
 
diff -r 2538fd6a51be -r 488440b896fe MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sat Jan 22 11:10:25 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Jan 23 11:00:33 2011 +0100
@@ -119,7 +119,7 @@
 %package translations-other
 Summary:        Extra translations for MozillaFirefox
 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
 Requires:       %{name} = %{version}
 Obsoletes:      %{name}-translations < %{version}-%{release}
@@ -201,7 +201,7 @@
 ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --disable-debug
-#ac_add_options --enable-update-channel=beta
+ac_add_options --enable-update-channel=beta
 EOF
 %if 0%{?use_xulrunner}
 cat << EOF >> $MOZCONFIG
@@ -240,7 +240,7 @@
 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)
+   ja-JP-mac|en-US|bn-IN)
 	;;
    *)
    	pushd $RPM_BUILD_DIR/compare-locales
@@ -350,6 +350,7 @@
 %defattr(-,root,root)
 %dir %{progdir}
 %dir %{progdir}/chrome/
+%dir %{progdir}/distribution/
 %{progdir}/chrome/browser.*
 %{progdir}/chrome/localized.manifest
 %{progdir}/chrome/nonlocalized.manifest
@@ -359,7 +360,7 @@
 %exclude %{progdir}/defaults/profile/bookmarks.html
 %{progdir}/defaults/
 %dir %{progdir}/extensions/
-%{progdir}/extensions/testpilot@labs.mozilla.com
+%{progdir}/distribution/extensions/
 %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 %{progdir}/icons/
 %{progdir}/modules/
@@ -382,7 +383,6 @@
 %doc %{_mandir}/man1/%{progname}.1.gz
 
 %if %localize
-
 %files translations-common -f %{_tmppath}/translations.common
 %defattr(-,root,root)
 %dir %{progdir}
diff -r 2538fd6a51be -r 488440b896fe firefox-kde.patch
--- a/firefox-kde.patch	Sat Jan 22 11:10:25 2011 +0100
+++ b/firefox-kde.patch	Sun Jan 23 11:00:33 2011 +0100
@@ -23,7 +23,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1058 @@
+@@ -0,0 +1,1062 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -569,6 +569,7 @@
 +                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
 +                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
 +          <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="addons-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -821,9 +822,9 @@
 +             aria-label="&tabsToolbar.label;"
 +             context="toolbar-context-menu"
 +#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
-+             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton"
++             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
 +#endif
 +             collapsed="true">
 +
@@ -868,13 +869,6 @@
 +                   position="after_end"/>
 +      </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"
 +                     class="close-button tabs-closebutton"
 +                     command="cmd_close"
@@ -982,6 +976,12 @@
 +                   oncommand="return FeedHandler.subscribeToFeed(null, event);"
 +                   onclick="checkForMiddleClick(this, event);"/>
 +      </toolbarbutton>
++
++      <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&tabGroupsButton.label;"
++                     command="Browser:ToggleTabView"
++                     tooltiptext="&tabGroupsButton.tooltip;"
++                     observes="tabviewGroupsNumber"/>
 +    </toolbarpalette>
 +  </toolbox>
 +
@@ -1040,6 +1040,10 @@
 +#endif
 +#ifdef XP_MACOSX
 +  <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:circle cx="9" cy="3" r="3" fill="white"/>
 +      <svg:rect x="9" y="0" width="3" height="3" fill="white"/>
diff -r 2538fd6a51be -r 488440b896fe mozilla-xulrunner20/mozilla-xulrunner20.changes
--- a/mozilla-xulrunner20/mozilla-xulrunner20.changes	Sat Jan 22 11:10:25 2011 +0100
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.changes	Sun Jan 23 11:00:33 2011 +0100
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jan 22 21:56:16 UTC 2011 - wr@rosenauer.org
+
+- update to 2.0b10
+- disabled mozilla-cpuid.patch
+
 -------------------------------------------------------------------
 Tue Jan 11 06:11:33 UTC 2011 - wr@rosenauer.org