From 068d06d02b4d8768ace3d559eb98a13a4140674d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Apr 18 2016 19:24:04 +0000
Subject: fix to apply


---

diff --git a/0001-Resolves-tdf-98726-sneaky-transparent-clearlooks-phe.patch b/0001-Resolves-tdf-98726-sneaky-transparent-clearlooks-phe.patch
index 9db1879..654dde5 100644
--- a/0001-Resolves-tdf-98726-sneaky-transparent-clearlooks-phe.patch
+++ b/0001-Resolves-tdf-98726-sneaky-transparent-clearlooks-phe.patch
@@ -1,4 +1,4 @@
-From b1667570b70cf5f2b4a12fe35e445c5d3de82452 Mon Sep 17 00:00:00 2001
+From 1f40773ad663614deec8133eedb80c90834e9b35 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
 Date: Thu, 17 Mar 2016 20:48:23 +0000
 Subject: [PATCH] Resolves: tdf#98726 sneaky transparent clearlooks-phenix
@@ -11,14 +11,14 @@ Reviewed-on: https://gerrit.libreoffice.org/23346
 Tested-by: Jenkins <ci@libreoffice.org>
 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
 ---
- vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 31 +++++++++++++++++--------------
- 1 file changed, 17 insertions(+), 14 deletions(-)
+ vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 25 ++++++++++++++-----------
+ 1 file changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
-index 20efd8a..38080e8 100644
+index ff76169..c1117fe 100644
 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
 +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
-@@ -277,6 +277,20 @@ Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle aA
+@@ -277,6 +277,17 @@ Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle aA
      return buttonRect;
  }
  
@@ -27,10 +27,7 @@ index 20efd8a..38080e8 100644
 +static GtkWidget* gSpinBox;
 +static GtkWidget* gEntryBox;
 +static GtkWidget* gComboBox;
-+static GtkWidget* gComboBoxButtonWidget;
-+static GtkWidget* gComboBoxEntryWidget;
 +static GtkWidget* gListBox;
-+static GtkWidget* gListBoxButtonWidget;
 +static GtkWidget* gMenuBarWidget;
 +static GtkWidget* gMenuItemMenuBarWidget;
 +static GtkWidget* gCheckMenuItemWidget;
@@ -39,7 +36,7 @@ index 20efd8a..38080e8 100644
  void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
                                      cairo_t *cr,
                                      const Rectangle& rControlRectangle,
-@@ -419,6 +433,9 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
+@@ -419,6 +430,9 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
  
      bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 );
  
@@ -49,7 +46,7 @@ index 20efd8a..38080e8 100644
      // ----------------- TROUGH
      GtkStyleContext* pScrollbarTroughStyle = scrollbarOrientation == GTK_ORIENTATION_VERTICAL ?
                                                mpVScrollbarTroughStyle : mpHScrollbarTroughStyle;
-@@ -1136,20 +1153,6 @@ void GtkSalGraphics::PaintRadio(cairo_t *cr, GtkStyleContext *context,
+@@ -1142,17 +1156,6 @@ void GtkSalGraphics::PaintRadio(cairo_t *cr, GtkStyleContext *context,
      PaintCheckOrRadio(cr, context, rControlRectangle, false, bInMenu);
  }
  
@@ -58,10 +55,7 @@ index 20efd8a..38080e8 100644
 -static GtkWidget* gSpinBox;
 -static GtkWidget* gEntryBox;
 -static GtkWidget* gComboBox;
--static GtkWidget* gComboBoxButtonWidget;
--static GtkWidget* gComboBoxEntryWidget;
 -static GtkWidget* gListBox;
--static GtkWidget* gListBoxButtonWidget;
 -static GtkWidget* gMenuBarWidget;
 -static GtkWidget* gMenuItemMenuBarWidget;
 -static GtkWidget* gCheckMenuItemWidget;
diff --git a/libreoffice.spec b/libreoffice.spec
index e0ba75a..84152d0 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -2288,7 +2288,7 @@ done
 %endif
 
 %changelog
-* Thu Apr 18 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.1.2.1-5
+* Mon Apr 18 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.1.2.1-5
 - gtk3: rhbz#1328101 scroll bar doesn't redraw correctly since gtk3-3.20.3
 
 * Thu Apr 07 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.1.2.1-4