[seamonkey/el6] add patch for collapsed sidebar issues, the upstream bug #802166
Dmitry Butskoy
buc at fedoraproject.org
Tue Oct 16 15:28:03 UTC 2012
commit da7092b8dfbedd154d2a51eb4b6b0849a931eb31
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Tue Oct 16 19:27:11 2012 +0400
add patch for collapsed sidebar issues, the upstream bug #802166
seamonkey-2.13.1-collapsed_sidebar.patch | 28 ++++++++++++++++++++++++++++
seamonkey.spec | 9 ++++++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/seamonkey-2.13.1-collapsed_sidebar.patch b/seamonkey-2.13.1-collapsed_sidebar.patch
new file mode 100644
index 0000000..cc8df47
--- /dev/null
+++ b/seamonkey-2.13.1-collapsed_sidebar.patch
@@ -0,0 +1,28 @@
+diff -Nrbu seamonkey-2.13.1/comm-release/suite/common/sidebar/sidebarOverlay.js seamonkey-2.13.1-OK/comm-release/suite/common/sidebar/sidebarOverlay.js
+--- seamonkey-2.13.1/comm-release/suite/common/sidebar/sidebarOverlay.js 2012-10-11 19:24:13.000000000 +0400
++++ seamonkey-2.13.1-OK/comm-release/suite/common/sidebar/sidebarOverlay.js 2012-10-16 18:05:35.133601815 +0400
+@@ -27,7 +27,6 @@
+ var gCurFrame;
+ var gTimeoutID = null;
+ var gMustInit = true;
+-var gAboutToUncollapse = false;
+ var gCheckMissingPanels = true;
+
+ function setBlank()
+@@ -701,8 +700,6 @@
+ // Sidebar Init
+ //////////////////////////////////////////////////////////////
+ function sidebar_overlay_init() {
+- if (sidebar_is_collapsed() && !gAboutToUncollapse)
+- return;
+ gMustInit = false;
+ sidebarObj.panels = new sbPanelList('sidebar-panels');
+ sidebarObj.datasource_uri = get_sidebar_datasource_uri();
+@@ -1454,7 +1451,6 @@
+ // XXX Mini hack. Persist isn't working too well. Force the persist,
+ // but wait until the change has commited.
+ if (gMustInit) {
+- gAboutToUncollapse = true;
+ sidebar_overlay_init();
+ }
+
diff --git a/seamonkey.spec b/seamonkey.spec
index cc5597a..79a4a09 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -21,7 +21,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
Version: 2.13.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
Group: Applications/Internet
@@ -51,6 +51,7 @@ Patch20: seamonkey-2.13-jemalloc.patch
Patch21: seamonkey-2.12.1-nodecommit.patch
Patch22: seamonkey-2.13-installdir.patch
Patch23: seamonkey-2.13-nspr_4_9_1.patch
+Patch24: seamonkey-2.13.1-collapsed_sidebar.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{minimum_build_nspr_version}
@@ -137,6 +138,8 @@ popd
%patch23 -p2 -b .nspr491
+%patch24 -p2 -b .col-sdbar
+
# fix obsoleted modifier in inspector
sed -i -e 's/ *xpcnativewrappers=no//' mozilla/extensions/inspector/jar.mn
@@ -470,6 +473,10 @@ fi
%changelog
+* Tue Oct 16 2012 Dmitry Butskoy <Dmitry at Butskoy.name> 2.13.1-2
+- add patch for broken context menus when started with collapsed sidebar
+ (upstream bug 802166)
+
* Mon Oct 15 2012 Dmitry Butskoy <Dmitry at Butskoy.name> 2.13.1-1
- update to 2.13.1
- build with separate objdir
More information about the scm-commits
mailing list