diff --git a/.gitignore b/.gitignore index 0815969..80269d4 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ /libreoffice-5.1.1.2.tar.xz /libreoffice-help-5.1.1.2.tar.xz /libreoffice-translations-5.1.1.2.tar.xz +/libreoffice-5.1.1.3.tar.xz +/libreoffice-help-5.1.1.3.tar.xz +/libreoffice-translations-5.1.1.3.tar.xz diff --git a/0001-gtk3-adapt-to-3.20-style-changes.patch b/0001-gtk3-adapt-to-3.20-style-changes.patch index 8cd7829..b21c626 100644 --- a/0001-gtk3-adapt-to-3.20-style-changes.patch +++ b/0001-gtk3-adapt-to-3.20-style-changes.patch @@ -532,7 +532,7 @@ index a28938e..a6b235b 100644 gtk_render_background(context, cr, buttonRect.Left(), buttonRect.Top(), -@@ -613,11 +607,9 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context, +@@ -613,8 +607,6 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context, gtk_render_icon(context, cr, pixbuf, arrowRect.Left(), arrowRect.Top()); g_object_unref(pixbuf); gtk_icon_info_free(info); @@ -540,24 +540,7 @@ index a28938e..a6b235b 100644 - gtk_style_context_restore(context); } --void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context, -+Rectangle GtkSalGraphics::PaintSpinButton(GtkStyleContext *context, - cairo_t *cr, - const Rectangle& rControlRectangle, - ControlType nType, -@@ -656,8 +648,10 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context, - areaRect.Union( pSpinVal->maLowerRect ); - } - -- PaintOneSpinButton(context, cr, nType, upBtnPart, areaRect, upBtnState ); -- PaintOneSpinButton(context, cr, nType, downBtnPart, areaRect, downBtnState ); -+ PaintOneSpinButton(mpSpinUpStyle, cr, nType, upBtnPart, areaRect, upBtnState ); -+ PaintOneSpinButton(mpSpinDownStyle, cr, nType, downBtnPart, areaRect, downBtnState ); -+ -+ return areaRect; - } - - #define ARROW_SIZE 11 * 0.85 + void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context, @@ -668,14 +662,12 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType, (void)nType; (void)nPart; diff --git a/libreoffice.spec b/libreoffice.spec index 708d8f8..3624d81 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -56,7 +56,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 +Version: %{libo_version}.3 Release: 1%{?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/ @@ -2195,6 +2195,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Thu Mar 03 2016 David Tardon - 1:5.1.1.3-1 +- update to 5.0.5 rc3 + * Fri Feb 26 2016 David Tardon - 1:5.1.1.2-1 - update to 5.1.1 rc2 diff --git a/sources b/sources index d990fb4..7b982a9 100644 --- a/sources +++ b/sources @@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh 4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -33c0ae2a9d37fc1fab109eb004120c1d libreoffice-5.1.1.2.tar.xz -396643c4f747c22aab3ca8f33f619433 libreoffice-help-5.1.1.2.tar.xz -1ab686ad3e4adbd6b14d745b27f4a877 libreoffice-translations-5.1.1.2.tar.xz +5354a6172015603ba057a2fbbfc9977e libreoffice-5.1.1.3.tar.xz +c4bde6b9f65eea1b0d7e6dc73537cdab libreoffice-help-5.1.1.3.tar.xz +4cfbacd4328863aaf08107e7d3b329a7 libreoffice-translations-5.1.1.3.tar.xz