Merge branch 'palemoon-custom' into 'master'

Multiple palemoon builds

Split palemoon into official package, and my custom -stackrpms package.
Also split palemoon-ublock-origin in same way.
Update palemoon to 28.4.0.

See merge request bgstack15/stackrpms!39

9 files changed, 425 insertions, 17 deletions

diff --git a/palemoon/bgstack15-prefs.js b/palemoon/bgstack15-prefs.js
new file mode 100644
index 0000000..ec7ab94
--- /dev/null
+++ b/palemoon/bgstack15-prefs.js
@@ -0,0 +1,24 @@
+// file: /usr/lib/palemoon/browser/defaults/preferences/bgstack15-prefs.js
+// reference:
+//    https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig
+pref("browser.backspace_action", 0);
+pref("browser.allTabs.previews", false);
+pref("browser.ctrlTab.previews", false);
+pref("browser.download.useDownloadDir", true);
+pref("browser.newtab.choice", 1);
+pref("browser.newtabpage.storageVersion", 1);
+pref("browser.search.update", false);
+pref("browser.startup.page", 3);
+pref("browser.tabs.closeWindowWithLastTab", false);
+pref("captivedetect.canonicalURL", "http://127.0.0.1:9980");
+pref("extensions.enabledAddons", "%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:28.3.0");
+pref("extensions.shownSelectionUI", true);
+pref("extensions.update.autoUpdateDefault", false);
+pref("general.warnOnAboutConfig", false);
+pref("network.cookie.prefsMigrated", true);
+pref("network.stricttransportsecurity.preloadlist", false);
+pref("privacy.sanitize.migrateFx3Prefs", true);
+pref("security.cert_pinning.enforcement_level", 0);
+pref("services.sync.declinedEngines", "");
+pref("toolkit.telemetry.reportingpolicy.firstRun", false);
+pref("xpinstall.whitelist.add", "");
diff --git a/palemoon/debian/bgstack15-prefs.js b/palemoon/debian/bgstack15-prefs.js
new file mode 100644
index 0000000..ec7ab94
--- /dev/null
+++ b/palemoon/debian/bgstack15-prefs.js
@@ -0,0 +1,24 @@
+// file: /usr/lib/palemoon/browser/defaults/preferences/bgstack15-prefs.js
+// reference:
+//    https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig
+pref("browser.backspace_action", 0);
+pref("browser.allTabs.previews", false);
+pref("browser.ctrlTab.previews", false);
+pref("browser.download.useDownloadDir", true);
+pref("browser.newtab.choice", 1);
+pref("browser.newtabpage.storageVersion", 1);
+pref("browser.search.update", false);
+pref("browser.startup.page", 3);
+pref("browser.tabs.closeWindowWithLastTab", false);
+pref("captivedetect.canonicalURL", "http://127.0.0.1:9980");
+pref("extensions.enabledAddons", "%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:28.3.0");
+pref("extensions.shownSelectionUI", true);
+pref("extensions.update.autoUpdateDefault", false);
+pref("general.warnOnAboutConfig", false);
+pref("network.cookie.prefsMigrated", true);
+pref("network.stricttransportsecurity.preloadlist", false);
+pref("privacy.sanitize.migrateFx3Prefs", true);
+pref("security.cert_pinning.enforcement_level", 0);
+pref("services.sync.declinedEngines", "");
+pref("toolkit.telemetry.reportingpolicy.firstRun", false);
+pref("xpinstall.whitelist.add", "");
diff --git a/palemoon/debian/changelog b/palemoon/debian/changelog
index 6866558..1536ba0 100644
--- a/palemoon/debian/changelog
+++ b/palemoon/debian/changelog
@@ -1,4 +1,4 @@
-palemoon (28.3.0-devuan) obs; urgency=medium
+palemoon (28.3.1-1devuan) manual; urgency=medium
 
   * Initial build for devuan
 
diff --git a/palemoon/debian/install b/palemoon/debian/install
index 9b5aebc..e04cc8f 100644
--- a/palemoon/debian/install
+++ b/palemoon/debian/install
@@ -1 +1,2 @@
 application/palemoon/branding/official/palemoon.desktop usr/share/applications
+debian/bgstack15-prefs.js /usr/lib/palemoon/browser/defaults/preferences/
diff --git a/palemoon/debian/patches/series b/palemoon/debian/patches/series
new file mode 100644
index 0000000..0ed32c3
--- /dev/null
+++ b/palemoon/debian/patches/series
@@ -0,0 +1 @@
+small-icons.patch
diff --git a/palemoon/debian/patches/small-icons.patch b/palemoon/debian/patches/small-icons.patch
new file mode 100644
index 0000000..fa6017f
--- /dev/null
+++ b/palemoon/debian/patches/small-icons.patch
@@ -0,0 +1,22 @@
+--- UXP-PM28.3.0_Release.orig/application/palemoon/base/content/browser.xul	2019-01-08 11:42:01.000000000 -0500
++++ UXP-PM28.3.0_Release/application/palemoon/base/content/browser.xul	2019-02-04 06:57:38.943983285 -0500
+@@ -355,7 +355,7 @@
+ 
+   <toolbox id="navigator-toolbox"
+            defaultmode="icons" mode="icons"
+-           iconsize="large">
++           iconsize="small">
+     <!-- Menu -->
+     <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
+              defaultset="menubar-items"
+@@ -381,8 +381,8 @@
+     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
+              toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
+              fullscreentoolbar="true" mode="icons" customizable="true"
+-             iconsize="large"
+-             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,bookmarks-menu-button,history-menu-button,downloads-button,window-controls"
++             iconsize="small"
++             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,bookmarks-menu-button,history-menu-button,downloads-button,window-controls"
+              context="toolbar-context-menu">
+ 
+       <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
diff --git a/palemoon/palemoon-stackrpms.spec b/palemoon/palemoon-stackrpms.spec
new file mode 100644
index 0000000..33058ba
--- /dev/null
+++ b/palemoon/palemoon-stackrpms.spec
@@ -0,0 +1,284 @@
+%global tarballdir UXP-PM%{version}_Release
+%global dummy_package   0
+%global appname palemoon
+%global prettyname Pale Moon Web Browser
+%global stackrpms_custom 1
+
+# additional repos to get python27 and devtoolset-7
+# for el6 and el7: Software Collection;, for x86_64 only
+# http://mirror.centos.org/centos/6/sclo/x86_64/rh/
+# http://mirror.centos.org/centos/6/sclo/x86_64/sclo/
+# for el6.i386:
+# https://copr-be.cloud.fedoraproject.org/results/ewdurbin/pythons-el6/epel-6-$basearch/
+# https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-$basearch/
+%define scl_env %{nil}
+%define scl_buildreq coreutils
+%if 0%{?el6}
+   %define scl_buildreq python27, devtoolset-7-toolchain
+   %ifarch x86_64
+      %define scl_env python27 devtoolset-7
+   %endif
+   %ifarch i386 || i686 || i586
+      %define scl_env devtoolset-7
+   %endif
+%endif
+%if 0%{?el7}
+   %define scl_env devtoolset-7
+   %define scl_buildreq devtoolset-7-toolchain
+%endif
+
+%if 0%{stackrpms_custom}
+Name:		palemoon-stackrpms
+Summary:	Pale Moon web browser with stackrpms prefs
+%global prettyname Pale Moon with stackrpms prefs
+%else
+Name:    palemoon
+Summary:	Pale Moon web browser
+%endif
+Version:	28.4.0
+Release:	1
+
+Group:	Networking/Web
+License:	MPLv2.0
+URL:		http://linux.palemoon.org/
+Source0:	https://github.com/MoonchildProductions/UXP/archive/PM%{version}_Release.tar.gz
+Source1: palemoon-mozconfig
+Source2: palemoon.desktop
+Source3: palemoon-mimeinfo.xml
+%if 0%{stackrpms_custom}
+Source4: bgstack15-prefs.js
+Patch0: small-icons.patch
+%endif
+Packager:	Bgstack15 <bgstack15@gmail.com>
+
+%if "%{?scl_env}" != ""
+BuildRequires: %{scl_buildreq}
+%endif
+BuildRequires:	alsa-lib-devel
+BuildRequires:	autoconf213
+BuildRequires:	bzip2-devel
+BuildRequires:	dbus-glib-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gcc
+BuildRequires:	gcc-c++
+BuildRequires:	GConf2-devel
+BuildRequires:	glib2-devel
+BuildRequires:	gtk2-devel
+BuildRequires:	libXt-devel
+BuildRequires:	mesa-libGL-devel
+BuildRequires:	notification-daemon
+BuildRequires:	openssl-devel
+BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig(gtk+-2.0)
+BuildRequires:	pulseaudio-libs-devel
+BuildRequires:	sqlite-devel
+BuildRequires:	unzip
+BuildRequires:	yasm
+BuildRequires:	zip
+BuildRequires:	zlib-devel
+BuildRoot:     %{_tmppath}/%{name}-%{version}
+Provides:      mimehandler(application/x-xpinstall)
+Provides:      palemoon
+Provides:      webclient
+%if 0%{stackrpms_custom}
+Conflicts:     palemoon
+%else
+Conflicts:     palemoon-stackrpms
+%endif
+
+%description
+Pale Moon offers you a browsing experience in a browser completely built
+from its own, independently developed source that has been forked off from
+Firefox/Mozilla code, with carefully selected features and optimizations to
+improve the browser's speed*, resource use, stability and user experience,
+while offering full customization and a growing collection of extensions
+and themes to make the browser truly your own.
+
+%global debug_package %{nil}
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+
+%prep
+%setup -q -n %{tarballdir}
+%{__cp} %{SOURCE1} ./.mozconfig
+
+%if 0%{stackrpms_custom}
+%patch0 -p1
+%endif
+
+%build
+%if "%{?scl_env}" != ""
+   thispwd=$( pwd )
+   scl enable %{scl_env} /bin/bash << EOF
+   pushd $thispwd
+%endif
+%if !%{dummy_package}
+   ./mach build
+%endif
+%if "%{?scl_env}" != ""
+   popd || :
+EOF
+%endif
+
+%install
+rm -rf %{buildroot}
+
+%if "%{?scl_env}" != ""
+   thispwd=$( pwd )
+   scl enable %{scl_env} /bin/bash << EOF
+   pushd $thispwd
+%endif
+%if !%{dummy_package}
+   make -f client.mk \
+      DESTDIR=%{buildroot} \
+      idldir=%{_datadir}/idl/%{name} \
+      includedir=%{_includedir}/%{name} \
+      installdir=%{_libdir}/%{name} \
+      sdkdir=%{_libdir}/%{name}-devel \
+      install
+%endif
+%if "%{?scl_env}" != ""
+   popd || :
+EOF
+%endif
+
+# cleanup
+%{__rm} -rf  %{buildroot}%{_datadir}/idl/%{appname} \
+   %{buildroot}%{_includedir}/%{appname} \
+   %{buildroot}%{_libdir}/%{appname}-devel
+
+# desktop files
+%{__mkdir_p} %{buildroot}%{_datadir}/applications
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
+
+%{__sed} -i -r -e "s/@NAME@/%{prettyname}/;" \
+   -e "s/@EXEC@/%{appname}/;" \
+   -e "s/@ICON@/%{appname}/;" \
+   %{buildroot}%{_datadir}/applications/%{appname}.desktop
+
+# application start script
+# none
+
+# man pages
+# none
+
+# mimetypes
+%{__install} -Dm0644 %{SOURCE3} \
+   %{buildroot}%{_datadir}/mime/packages/%{name}.xml
+
+# icons
+%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
+for s in 16 22 24 32 48 256 ;
+do
+   %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps
+   %{__cp} -p application/%{appname}/branding/official/default${s}.png \
+   %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{appname}.png
+done
+
+# Register as an application to be visible in the software center
+# EXPERIMENTAL
+mkdir -p %{buildroot}%{_datadir}/appdata
+cat > %{buildroot}%{_datadir}/appdata/%{appname}.appdata.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Adapted from content by Richard Hughes <richard-at-hughsie-dot-com> -->
+<application>
+  <id type="desktop">%{appname}.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <description>
+    <p>
+       Pale Moon offers you a browsing experience in a browser completely built from its own, independently developed source that has been forked off from Firefox/Mozilla code a number of years ago, with carefully selected features and optimizations to improve the browser stability and user experience, while offering full customization and a growing collection of extensions and themes to make the browser truly your own.
+    </p>
+  </description>
+  <url type="homepage">http://www.palemoon.org/</url>
+  <screenshots>
+    <screenshot type="default">http://www.palemoon.org/images/screenshots/Win10-start-portal.png</screenshot>
+  </screenshots>
+  <!-- FIXME: change this to an upstream email address for spec updates
+  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
+   -->
+</application>
+EOF
+
+# Add distribution.ini
+# skipped
+
+# filelist lifted straight from https://build.opensuse.org/package/view_file/network/palemoon/palemoon.spec?expand=1
+# get a list of files
+# $2 - dirlist
+# $3 - dir of fileslist
+# $4 - excludelist
+filelist() {
+  filelist=$PWD/$1
+  pushd %{buildroot}
+    find ./ | while read list; do
+      if [ -n "$4" ]; then
+        ! echo $list | grep "$4" || continue
+      fi
+      _file=$(echo $list | sed 's/[^/]//')
+      _dir=$(dirname $_file)
+      if echo $_dir | grep "$2"; then
+        grep -xqs "\%dir\ $_dir" $filelist || echo "%dir $_dir" >> $filelist
+      fi
+      if echo $_file | grep "$3"; then
+        [ -d "$list" ] || echo $_file >> $filelist
+      fi
+    done
+  popd
+}
+
+%if 0%{stackrpms_custom}
+%{__install} -d %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
+%{__install} -Dm0644 %{SOURCE4} \
+   %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
+%endif
+
+filelist file.lst %{appname} usr langpack
+
+%clean
+%{__rm} -rf %{buildroot} || :
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
+
+%preun
+# is it a final removal?
+#if test "$1" = "0" ;
+#then
+#fi   
+
+%postun
+update-desktop-database &> /dev/null || :
+if test "$1" = "0" ;
+then
+   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files -f file.lst
+%defattr(-,root,root)
+%doc AUTHORS LICENSE
+
+%changelog
+* Tue Feb 19 2019 B Stack <bgstack15@gmail.com> 28.4.0-1
+- update version
+
+* Wed Jan 23 2019 B Stack <bgstack15@gmail.com> 28.3.1-1
+- update version
+
+* Tue Jan 15 2019 B Stack <bgstack15@gmail.com> 28.3.0-1
+- update version
+
+* Mon Dec 10 2018 B Stack <bgstack15@gmail.com> 28.2.2-1
+- update version
+
+* Thu Sep 20 2018 B Stack <bgstack15@gmail.com> 28.1.0-1
+- update version
+
+* Thu Sep 13 2018 B Stack <bgstack15@gmail.com> 28.0.1-1
+- update version
+
+* Wed Sep 05 2018 B Stack <bgstack15@gmail.com> 28.0.0-1
+- rpm spec updated
diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index 59a0c69..a0b97f5 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -1,7 +1,8 @@
 %global tarballdir UXP-PM%{version}_Release
 %global dummy_package   0
-%global pkgname palemoon
+%global appname palemoon
 %global prettyname Pale Moon Web Browser
+%global stackrpms_custom 0
 
 # additional repos to get python27 and devtoolset-7
 # for el6 and el7: Software Collection;, for x86_64 only
@@ -26,10 +27,16 @@
    %define scl_buildreq devtoolset-7-toolchain
 %endif
 
-Name:		palemoon
-Version:	28.3.1
-Release:	1
+%if 0%{stackrpms_custom}
+Name:		palemoon-stackrpms
+Summary:	Pale Moon web browser with stackrpms prefs
+%global prettyname Pale Moon with stackrpms prefs
+%else
+Name:    palemoon
 Summary:	Pale Moon web browser
+%endif
+Version:	28.4.0
+Release:	1
 
 Group:	Networking/Web
 License:	MPLv2.0
@@ -38,6 +45,10 @@ Source0:	https://github.com/MoonchildProductions/UXP/archive/PM%{version}_Releas
 Source1: palemoon-mozconfig
 Source2: palemoon.desktop
 Source3: palemoon-mimeinfo.xml
+%if 0%{stackrpms_custom}
+Source4: bgstack15-prefs.js
+Patch0: small-icons.patch
+%endif
 Packager:	Bgstack15 <bgstack15@gmail.com>
 
 %if "%{?scl_env}" != ""
@@ -67,7 +78,13 @@ BuildRequires:	zip
 BuildRequires:	zlib-devel
 BuildRoot:     %{_tmppath}/%{name}-%{version}
 Provides:      mimehandler(application/x-xpinstall)
+Provides:      palemoon
 Provides:      webclient
+%if 0%{stackrpms_custom}
+Conflicts:     palemoon
+%else
+Conflicts:     palemoon-stackrpms
+%endif
 
 %description
 Pale Moon offers you a browsing experience in a browser completely built
@@ -84,6 +101,10 @@ and themes to make the browser truly your own.
 %setup -q -n %{tarballdir}
 %{__cp} %{SOURCE1} ./.mozconfig
 
+%if 0%{stackrpms_custom}
+%patch0 -p1
+%endif
+
 %build
 %if "%{?scl_env}" != ""
    thispwd=$( pwd )
@@ -121,18 +142,18 @@ EOF
 %endif
 
 # cleanup
-%{__rm} -rf  %{buildroot}%{_datadir}/idl/%{pkgname} \
-   %{buildroot}%{_includedir}/%{pkgname} \
-   %{buildroot}%{_libdir}/%{pkgname}-devel
+%{__rm} -rf  %{buildroot}%{_datadir}/idl/%{appname} \
+   %{buildroot}%{_includedir}/%{appname} \
+   %{buildroot}%{_libdir}/%{appname}-devel
 
 # desktop files
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 
 %{__sed} -i -r -e "s/@NAME@/%{prettyname}/;" \
-   -e "s/@EXEC@/%{pkgname}/;" \
-   -e "s/@ICON@/%{pkgname}/;" \
-   %{buildroot}%{_datadir}/applications/%{pkgname}.desktop
+   -e "s/@EXEC@/%{appname}/;" \
+   -e "s/@ICON@/%{appname}/;" \
+   %{buildroot}%{_datadir}/applications/%{appname}.desktop
 
 # application start script
 # none
@@ -142,25 +163,25 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 
 # mimetypes
 %{__install} -Dm0644 %{SOURCE3} \
-   %{buildroot}%{_datadir}/mime/packages/%{pkgname}.xml
+   %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
 # icons
 %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
 for s in 16 22 24 32 48 256 ;
 do
    %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps
-   %{__cp} -p application/%{pkgname}/branding/official/default${s}.png \
-   %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{pkgname}.png
+   %{__cp} -p application/%{appname}/branding/official/default${s}.png \
+   %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{appname}.png
 done
 
 # Register as an application to be visible in the software center
 # EXPERIMENTAL
 mkdir -p %{buildroot}%{_datadir}/appdata
-cat > %{buildroot}%{_datadir}/appdata/%{pkgname}.appdata.xml <<EOF
+cat > %{buildroot}%{_datadir}/appdata/%{appname}.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Adapted from content by Richard Hughes <richard-at-hughsie-dot-com> -->
 <application>
-  <id type="desktop">%{pkgname}.desktop</id>
+  <id type="desktop">%{appname}.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <description>
     <p>
@@ -204,7 +225,13 @@ filelist() {
   popd
 }
 
-filelist file.lst %{pkgname} usr langpack
+%if 0%{stackrpms_custom}
+%{__install} -d %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
+%{__install} -Dm0644 %{SOURCE4} \
+   %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
+%endif
+
+filelist file.lst %{appname} usr langpack
 
 %clean
 %{__rm} -rf %{buildroot} || :
@@ -235,6 +262,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc AUTHORS LICENSE
 
 %changelog
+* Tue Feb 19 2019 B Stack <bgstack15@gmail.com> 28.4.0-1
+- update version
+
 * Wed Jan 23 2019 B Stack <bgstack15@gmail.com> 28.3.1-1
 - update version
 
diff --git a/palemoon/small-icons.patch b/palemoon/small-icons.patch
new file mode 100644
index 0000000..fa6017f
--- /dev/null
+++ b/palemoon/small-icons.patch
@@ -0,0 +1,22 @@
+--- UXP-PM28.3.0_Release.orig/application/palemoon/base/content/browser.xul	2019-01-08 11:42:01.000000000 -0500
++++ UXP-PM28.3.0_Release/application/palemoon/base/content/browser.xul	2019-02-04 06:57:38.943983285 -0500
+@@ -355,7 +355,7 @@
+ 
+   <toolbox id="navigator-toolbox"
+            defaultmode="icons" mode="icons"
+-           iconsize="large">
++           iconsize="small">
+     <!-- Menu -->
+     <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
+              defaultset="menubar-items"
+@@ -381,8 +381,8 @@
+     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
+              toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
+              fullscreentoolbar="true" mode="icons" customizable="true"
+-             iconsize="large"
+-             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,bookmarks-menu-button,history-menu-button,downloads-button,window-controls"
++             iconsize="small"
++             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,bookmarks-menu-button,history-menu-button,downloads-button,window-controls"
+              context="toolbar-context-menu">
+ 
+       <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"