From d7ff6f0c1dcc0caf3be859546b68acb0e6a174c5 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 25 Jul 2015 21:11:00 +0200 Subject: [PATCH] update to 5.0.0 rc4 --- .gitignore | 3 +++ 0001-gtk3-draw-paint-to-the-fixed-container.patch | 7 ++----- libreoffice.spec | 9 +++++---- sources | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index c679050..7cbe67e 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,6 @@ /libreoffice-5.0.0.3.tar.xz /libreoffice-help-5.0.0.3.tar.xz /libreoffice-translations-5.0.0.3.tar.xz +/libreoffice-5.0.0.4.tar.xz +/libreoffice-help-5.0.0.4.tar.xz +/libreoffice-translations-5.0.0.4.tar.xz diff --git a/0001-gtk3-draw-paint-to-the-fixed-container.patch b/0001-gtk3-draw-paint-to-the-fixed-container.patch index 837f2fb..dd80705 100644 --- a/0001-gtk3-draw-paint-to-the-fixed-container.patch +++ b/0001-gtk3-draw-paint-to-the-fixed-container.patch @@ -85,15 +85,12 @@ index ba2f79b..b99d48d 100644 #endif g_signal_connect( G_OBJECT(m_pWindow), "focus-in-event", G_CALLBACK(signalFocus), this ); g_signal_connect( G_OBJECT(m_pWindow), "focus-out-event", G_CALLBACK(signalFocus), this ); -@@ -1097,24 +1110,12 @@ void GtkSalFrame::InitCommon() +@@ -1097,21 +1110,12 @@ void GtkSalFrame::InitCommon() m_nAppActionGroupExportId = 0; m_nHudAwarenessId = 0; - gtk_widget_set_app_paintable( m_pWindow, TRUE ); -- /*non-X11 displays won't show anything at all without double-buffering -- enabled*/ -- if (GDK_IS_X11_DISPLAY(getGdkDisplay())) -- gtk_widget_set_double_buffered( m_pWindow, FALSE ); +- gtk_widget_set_double_buffered( m_pWindow, FALSE ); - gtk_widget_set_redraw_on_allocate( m_pWindow, FALSE ); - gtk_widget_add_events( m_pWindow, diff --git a/libreoffice.spec b/libreoffice.spec index a33c66e..4d056c5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -52,8 +52,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.3 -Release: 3%{?libo_prerelease}%{?dist} +Version: %{libo_version}.4 +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 Group: Applications/Productivity URL: http://www.libreoffice.org/ @@ -329,8 +329,6 @@ Patch19: 0001-rhbz-1233420-handle-inexistent-cond.-format.patch Patch20: 0001-allow-slide-design-to-affect-multiple-standard-pages.patch Patch21: 0001-implement-equalize-width-and-height-for-impress-draw.patch Patch22: 0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch -Patch23: 0001-ppc64-simplify-this-a-little.patch -Patch24: 0002-ppc64-using-a-fp-register-also-consumes-a-gp-registe.patch Patch25: 0001-gtk3-draw-paint-to-the-fixed-container.patch %define instdir %{_libdir} @@ -2445,6 +2443,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Sat Jul 25 2015 David Tardon - 1:5.0.0.4-1 +- update to 5.0.0 rc4 + * Fri Jul 24 2015 Adam Williamson - 1:5.0.0.3-3 - rebuild for Boost 1.58 (for real this time) diff --git a/sources b/sources index 38368a6..f5c5651 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 -1f7fc147d284ac2b5829cc41b03834e8 libreoffice-5.0.0.3.tar.xz -3a7f814bd6876c070b01df2eb79f685e libreoffice-help-5.0.0.3.tar.xz -200fbad7c78a609786fd4c8587558ee5 libreoffice-translations-5.0.0.3.tar.xz +13a2827976a35d1002103dcd596acacc libreoffice-5.0.0.4.tar.xz +311856ae3af010b55f697dd2d5deadd9 libreoffice-help-5.0.0.4.tar.xz +79ee435cc04cad458d8b5270231d65f4 libreoffice-translations-5.0.0.4.tar.xz