Resolves: rhbz#1313559 gtk2 menus not kept up to date

0001-tdf-97665-Let-s-hope-that-over-activation-isn-t-real.patch

@@ -1,8 +1,7 @@
-From 9e64526a0671b52cdb6b6ad567153402a85d21bf Mon Sep 17 00:00:00 2001
+From b92e4c300c54b62309734d91dc128bfa2107448c Mon Sep 17 00:00:00 2001
 From: Maxim Monastirsky <momonasmon@gmail.com>
 Date: Sun, 7 Feb 2016 17:53:40 +0200
-Subject: [PATCH 1/8] tdf#97665 Let's hope that over activation isn't really
- needed
+Subject: [PATCH] tdf#97665 Let's hope that over activation isn't really needed
 
 - MenuBarManager::Activate has a check for duplicate activation,
   which makes the second activation attempt fail. Removing this
@@ -36,7 +35,7 @@ Change-Id: I96affa72412f3f38160fdca4b6efd20ca68d059f
  8 files changed, 31 insertions(+), 122 deletions(-)
 
 diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
-index 6a368a9..8ce02c6 100644
+index 6bb58db..fc80c3e 100644
 --- a/framework/source/uielement/menubarmanager.cxx
 +++ b/framework/source/uielement/menubarmanager.cxx
 @@ -386,10 +386,6 @@ throw ( RuntimeException, std::exception )
@@ -59,7 +58,7 @@ index 6a368a9..8ce02c6 100644
      }
  }
  
-@@ -895,9 +893,8 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
+@@ -893,9 +891,8 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
                                  if ( !bPopupMenu )
                                  {
                                      xMenuItemDispatch->addStatusListener( static_cast< XStatusListener* >( this ), aTargetURL );
@@ -231,7 +230,7 @@ index b5c64e0..9ea6dc9 100644
 -
  /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
-index a0cc977..fd29a25 100644
+index 6b977fe..660efa8 100644
 --- a/vcl/unx/gtk/gtksalmenu.cxx
 +++ b/vcl/unx/gtk/gtksalmenu.cxx
 @@ -372,54 +372,9 @@ void GtkSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsig
@@ -289,7 +288,7 @@ index a0cc977..fd29a25 100644
      assert(mbMenuBar);
      SAL_INFO("vcl.unity", "GtkSalMenu set to frame");
      mpFrame = static_cast< const GtkSalFrame* >( pFrame );
-@@ -674,6 +629,7 @@ void GtkSalMenu::DispatchCommand( gint itemId, const gchar *aCommand )
+@@ -680,6 +635,7 @@ void GtkSalMenu::DispatchCommand( gint itemId, const gchar *aCommand )
  void GtkSalMenu::ActivateAllSubmenus(MenuBar* pMenuBar)
  {
      pMenuBar->HandleMenuActivateEvent(mpVCLMenu);
@@ -297,7 +296,7 @@ index a0cc977..fd29a25 100644
      for ( size_t nPos = 0; nPos < maItems.size(); nPos++ )
      {
          GtkSalMenuItem *pSalItem = maItems[ nPos ];
-@@ -685,11 +641,23 @@ void GtkSalMenu::ActivateAllSubmenus(MenuBar* pMenuBar)
+@@ -691,11 +647,23 @@ void GtkSalMenu::ActivateAllSubmenus(MenuBar* pMenuBar)
      }
  }
  

libreoffice.spec

@@ -57,7 +57,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.3
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        2%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -263,6 +263,7 @@ Patch28: 0005-gtk3-handle-items-without-commands.patch
 Patch29: 0006-mark-checkable-toolbox-menu-entries-as-checkable.patch
 Patch30: 0007-set-gtk-layout-direction-to-match-ours.patch
 Patch31: 0008-gtk3-implement-native-context-menus.patch
+Patch32: 0001-tdf-97665-Let-s-hope-that-over-activation-isn-t-real.patch
 
 %if 0%{?rhel}
 # not upstreamed
@@ -2195,8 +2196,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Mar 04 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.1.1.3-2.UNBUILT
+- Resolves: rhbz#1313559 gtk2 menus not kept up to date
+
 * Thu Mar 03 2016 David Tardon <dtardon@redhat.com> - 1:5.1.1.3-1
-- update to 5.0.5 rc3
+- update to 5.1.1 rc3
 
 * Fri Feb 26 2016 David Tardon <dtardon@redhat.com> - 1:5.1.1.2-1
 - update to 5.1.1 rc2