diff --git a/.gitignore b/.gitignore index 793b6aa..aa122e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -/0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz /35c94d2df8893241173de1d16b6034c0-swingExSrc.zip /798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz /a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip /17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip /185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -17,3 +17,6 @@ /libreoffice-5.3.0.0.alpha1.tar.xz /libreoffice-help-5.3.0.0.alpha1.tar.xz /libreoffice-translations-5.3.0.0.alpha1.tar.xz +/libreoffice-5.3.0.0.beta1.tar.xz +/libreoffice-help-5.3.0.0.beta1.tar.xz +/libreoffice-translations-5.3.0.0.beta1.tar.xz diff --git a/0001-avoid-loss-of-text-in-edited-placeholder.patch b/0001-avoid-loss-of-text-in-edited-placeholder.patch deleted file mode 100644 index ab46a44..0000000 --- a/0001-avoid-loss-of-text-in-edited-placeholder.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 100b3b7972c2a0cf341aa97971f5d7c9d1a0b68b Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Tue, 22 Nov 2016 09:07:54 +0100 -Subject: [PATCH] avoid loss of text in edited placeholder - -How to reproduce: -1. Create an empty presentation. -2. Save it. -3. Click at one of the text placeholders and write something. -4. Save again. -5. Reload. The placeholder is missing. (Actually, it's still there, but - empty and 0-size.) - -This only happens if a11y is enabled. - -Change-Id: I7ae3d3c6ab0ce91aef01c0e9d62f7963dce965fc ---- - svx/source/unodraw/unoshtxt.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx -index cda12f7..3a5705f 100644 ---- a/svx/source/unodraw/unoshtxt.cxx -+++ b/svx/source/unodraw/unoshtxt.cxx -@@ -589,6 +589,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() - bCreated = true; - - mbForwarderIsEditMode = false; -+ mbDataValid = false; - } - - if( mpObject && mpText && !mbDataValid && mpObject->IsInserted() && mpObject->GetPage() ) --- -2.9.3 - diff --git a/0001-catch-and-rethrow-later-uno-exceptions-within-glib-s.patch b/0001-catch-and-rethrow-later-uno-exceptions-within-glib-s.patch deleted file mode 100644 index 767b2aa..0000000 --- a/0001-catch-and-rethrow-later-uno-exceptions-within-glib-s.patch +++ /dev/null @@ -1,370 +0,0 @@ -From 28fe78604ca46319ae596d04ddca206e6b2672a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 21 Oct 2016 14:14:10 +0100 -Subject: [PATCH] catch and rethrow later uno exceptions within glib signals - -after g_main_context_iteration when its safe to do so again - -otherwise if something happens inside the glib signal -callback and the exception skips the code waiting -for the callback to return, subsequent attempts to -show the native gtk3 error dialog will fail - -Change-Id: I271c09f8f1f00c0eca76191fcb63ddf56c10060f ---- - vcl/inc/unx/gtk/gtkdata.hxx | 2 ++ - vcl/inc/unx/gtk/gtkframe.hxx | 7 ++++ - vcl/unx/gtk3/gtk3gtkdata.cxx | 4 +++ - vcl/unx/gtk3/gtk3gtkframe.cxx | 75 ++++++++++++++++++++++++++----------------- - 4 files changed, 58 insertions(+), 30 deletions(-) - -diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx -index f5e1e03..ffb0fb7 100644 ---- a/vcl/inc/unx/gtk/gtkdata.hxx -+++ b/vcl/inc/unx/gtk/gtkdata.hxx -@@ -97,6 +97,7 @@ class GtkData : public SalGenericData - GSource* m_pUserEvent; - osl::Mutex m_aDispatchMutex; - oslCondition m_aDispatchCondition; -+ css::uno::Any m_aException; - bool blockIdleTimeout; - - public: -@@ -120,6 +121,7 @@ public: - - inline GtkSalDisplay *GetGtkDisplay() const; - bool BlockIdleTimeout() const { return blockIdleTimeout; } -+ void setException(const css::uno::Any& rException) { m_aException = rException; } - }; - - class GtkSalFrame; -diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx -index 0cdff6c..40ae9e2 100644 ---- a/vcl/inc/unx/gtk/gtkframe.hxx -+++ b/vcl/inc/unx/gtk/gtkframe.hxx -@@ -539,6 +539,13 @@ public: - sal_uIntPtr GetNativeWindowHandle(GtkWidget *pWidget); - virtual sal_uIntPtr GetNativeWindowHandle() override; - -+ //Call the usual SalFrame Callback, but catch uno exceptionss and delegate -+ //to GtkData to rethrow them after the gsignal is processed when its safe -+ //to do so again in our own code after the g_main_context_iteration call -+ //which triggers the gsignals. -+ long CallCallbackExc(SalEvent nEvent, const void* pEvent) const; -+ -+ - static void KeyCodeToGdkKey(const vcl::KeyCode& rKeyCode, - guint* pGdkKeyCode, GdkModifierType *pGdkModifiers); - -diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx -index 17cad89f..70f9249 100644 ---- a/vcl/unx/gtk3/gtk3gtkdata.cxx -+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx -@@ -51,6 +51,8 @@ - # include - #endif - -+#include -+ - using namespace vcl_sal; - - /*************************************************************** -@@ -478,6 +480,8 @@ SalYieldResult GtkData::Yield( bool bWait, bool bHandleAllCurrentEvents ) - if( wasOneEvent ) - bWasEvent = true; - } -+ if (m_aException.hasValue()) -+ ::cppu::throwException(m_aException); - } - else if( bWait ) - { -diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx -index 9fc972da..e5ddb07 100644 ---- a/vcl/unx/gtk3/gtk3gtkframe.cxx -+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include - -@@ -453,7 +454,7 @@ void GtkSalFrame::doKeyCallback( guint state, - - if( bDown ) - { -- bool bHandled = CallCallback( SalEvent::KeyInput, &aEvent ); -+ bool bHandled = CallCallbackExc( SalEvent::KeyInput, &aEvent ); - // #i46889# copy AlternateKeyCode handling from generic plugin - if( ! bHandled ) - { -@@ -463,16 +464,16 @@ void GtkSalFrame::doKeyCallback( guint state, - aEvent.mnCode = aAlternate.nKeyCode; - if( aAlternate.nCharCode ) - aEvent.mnCharCode = aAlternate.nCharCode; -- CallCallback( SalEvent::KeyInput, &aEvent ); -+ CallCallbackExc( SalEvent::KeyInput, &aEvent ); - } - } - if( bSendRelease && ! aDel.isDeleted() ) - { -- CallCallback( SalEvent::KeyUp, &aEvent ); -+ CallCallbackExc( SalEvent::KeyUp, &aEvent ); - } - } - else -- CallCallback( SalEvent::KeyUp, &aEvent ); -+ CallCallbackExc( SalEvent::KeyUp, &aEvent ); - } - - GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) -@@ -2611,7 +2612,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer - - if (!aDel.isDeleted()) - { -- pThis->CallCallback( nEventType, &aEvent ); -+ pThis->CallCallbackExc( nEventType, &aEvent ); - } - - return true; -@@ -2651,7 +2652,7 @@ gboolean GtkSalFrame::signalScroll(GtkWidget*, GdkEventScroll* pEvent, gpointer - if (aEvent.mnScrollLines == 0) - aEvent.mnScrollLines = 1; - -- pThis->CallCallback(SalEvent::WheelMouse, &aEvent); -+ pThis->CallCallbackExc(SalEvent::WheelMouse, &aEvent); - } - - if (pEvent->delta_y != 0.0) -@@ -2665,7 +2666,7 @@ gboolean GtkSalFrame::signalScroll(GtkWidget*, GdkEventScroll* pEvent, gpointer - if (aEvent.mnScrollLines == 0) - aEvent.mnScrollLines = 1; - -- pThis->CallCallback(SalEvent::WheelMouse, &aEvent); -+ pThis->CallCallbackExc(SalEvent::WheelMouse, &aEvent); - } - - break; -@@ -2675,7 +2676,7 @@ gboolean GtkSalFrame::signalScroll(GtkWidget*, GdkEventScroll* pEvent, gpointer - aEvent.mnNotchDelta = 1; - aEvent.mnScrollLines = 3; - aEvent.mbHorz = false; -- pThis->CallCallback(SalEvent::WheelMouse, &aEvent); -+ pThis->CallCallbackExc(SalEvent::WheelMouse, &aEvent); - break; - - case GDK_SCROLL_DOWN: -@@ -2683,7 +2684,7 @@ gboolean GtkSalFrame::signalScroll(GtkWidget*, GdkEventScroll* pEvent, gpointer - aEvent.mnNotchDelta = -1; - aEvent.mnScrollLines = 3; - aEvent.mbHorz = false; -- pThis->CallCallback(SalEvent::WheelMouse, &aEvent); -+ pThis->CallCallbackExc(SalEvent::WheelMouse, &aEvent); - break; - - case GDK_SCROLL_LEFT: -@@ -2691,7 +2692,7 @@ gboolean GtkSalFrame::signalScroll(GtkWidget*, GdkEventScroll* pEvent, gpointer - aEvent.mnNotchDelta = 1; - aEvent.mnScrollLines = 3; - aEvent.mbHorz = true; -- pThis->CallCallback(SalEvent::WheelMouse, &aEvent); -+ pThis->CallCallbackExc(SalEvent::WheelMouse, &aEvent); - break; - - case GDK_SCROLL_RIGHT: -@@ -2699,7 +2700,7 @@ gboolean GtkSalFrame::signalScroll(GtkWidget*, GdkEventScroll* pEvent, gpointer - aEvent.mnNotchDelta = -1; - aEvent.mnScrollLines = 3; - aEvent.mbHorz = true; -- pThis->CallCallback(SalEvent::WheelMouse, &aEvent); -+ pThis->CallCallbackExc(SalEvent::WheelMouse, &aEvent); - break; - } - -@@ -2724,7 +2725,7 @@ void GtkSalFrame::gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdo - aEvent.mnX = x; - aEvent.mnY = y; - -- pThis->CallCallback(SalEvent::Swipe, &aEvent); -+ pThis->CallCallbackExc(SalEvent::Swipe, &aEvent); - } - } - -@@ -2742,7 +2743,7 @@ void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gpointer frame) - aEvent.mnX = x; - aEvent.mnY = y; - -- pThis->CallCallback(SalEvent::LongPress, &aEvent); -+ pThis->CallCallbackExc(SalEvent::LongPress, &aEvent); - } - } - -@@ -2774,7 +2775,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer - - vcl::DeletionListener aDel( pThis ); - -- pThis->CallCallback( SalEvent::MouseMove, &aEvent ); -+ pThis->CallCallbackExc( SalEvent::MouseMove, &aEvent ); - - if( ! aDel.isDeleted() ) - { -@@ -2784,7 +2785,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer - { - pThis->maGeometry.nX = frame_x; - pThis->maGeometry.nY = frame_y; -- pThis->CallCallback( SalEvent::Move, nullptr ); -+ pThis->CallCallbackExc( SalEvent::Move, nullptr ); - } - - if( ! aDel.isDeleted() ) -@@ -2811,7 +2812,7 @@ gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpoi - aEvent.mnCode = GetMouseModCode( pEvent->state ); - aEvent.mnButton = 0; - -- pThis->CallCallback( (pEvent->type == GDK_ENTER_NOTIFY) ? SalEvent::MouseMove : SalEvent::MouseLeave, &aEvent ); -+ pThis->CallCallbackExc( (pEvent->type == GDK_ENTER_NOTIFY) ? SalEvent::MouseMove : SalEvent::MouseLeave, &aEvent ); - - return true; - } -@@ -2858,7 +2859,7 @@ void GtkSalFrame::sizeAllocated(GtkWidget*, GdkRectangle *pAllocation, gpointer - pThis->maGeometry.nWidth = pAllocation->width; - pThis->maGeometry.nHeight = pAllocation->height; - pThis->AllocateFrame(); -- pThis->CallCallback( SalEvent::Resize, nullptr ); -+ pThis->CallCallbackExc( SalEvent::Resize, nullptr ); - pThis->TriggerPaintEvent(); - } - -@@ -2891,7 +2892,7 @@ gboolean GtkSalFrame::signalConfigure(GtkWidget*, GdkEventConfigure* pEvent, gpo - pThis->updateScreenNumber(); - - if (bMoved) -- pThis->CallCallback(SalEvent::Move, nullptr); -+ pThis->CallCallbackExc(SalEvent::Move, nullptr); - - return false; - } -@@ -2912,7 +2913,7 @@ void GtkSalFrame::TriggerPaintEvent() - //that duplicates the amount of drawing and is hideously slow - SAL_INFO("vcl.gtk3", "force painting" << 0 << "," << 0 << " " << maGeometry.nWidth << "x" << maGeometry.nHeight); - SalPaintEvent aPaintEvt(0, 0, maGeometry.nWidth, maGeometry.nHeight, true); -- CallCallback(SalEvent::Paint, &aPaintEvt); -+ CallCallbackExc(SalEvent::Paint, &aPaintEvt); - gtk_widget_queue_draw(GTK_WIDGET(m_pFixedContainer)); - } - -@@ -2946,7 +2947,7 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f - - // in the meantime do not propagate focus get/lose if floats are open - if( m_nFloats == 0 ) -- pThis->CallCallback( pEvent->in ? SalEvent::GetFocus : SalEvent::LoseFocus, nullptr ); -+ pThis->CallCallbackExc( pEvent->in ? SalEvent::GetFocus : SalEvent::LoseFocus, nullptr ); - - return false; - } -@@ -2955,7 +2956,7 @@ gboolean GtkSalFrame::signalMap(GtkWidget *, GdkEvent*, gpointer frame) - { - GtkSalFrame* pThis = static_cast(frame); - -- pThis->CallCallback( SalEvent::Resize, nullptr ); -+ pThis->CallCallbackExc( SalEvent::Resize, nullptr ); - pThis->TriggerPaintEvent(); - - return false; -@@ -2965,7 +2966,7 @@ gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame ) - { - GtkSalFrame* pThis = static_cast(frame); - -- pThis->CallCallback( SalEvent::Resize, nullptr ); -+ pThis->CallCallbackExc( SalEvent::Resize, nullptr ); - - return false; - } -@@ -3068,7 +3069,7 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget, GdkEventKey* pEvent, gpointe - aModEvt.mnTime = pEvent->time; - aModEvt.mnModKeyCode = pThis->m_nKeyModifiers; - -- pThis->CallCallback( SalEvent::KeyModChange, &aModEvt ); -+ pThis->CallCallbackExc( SalEvent::KeyModChange, &aModEvt ); - - } - else -@@ -3101,7 +3102,7 @@ gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame ) - if (bBackDrop) - pThis->GetWindow()->Enable(); - -- pThis->CallCallback( SalEvent::Close, nullptr ); -+ pThis->CallCallbackExc( SalEvent::Close, nullptr ); - - return true; - } -@@ -3545,13 +3546,13 @@ void GtkSalFrame::IMHandler::deleteIMContext() - void GtkSalFrame::IMHandler::doCallEndExtTextInput() - { - m_aInputEvent.mpTextAttr = nullptr; -- m_pFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); -+ m_pFrame->CallCallbackExc( SalEvent::EndExtTextInput, nullptr ); - } - - void GtkSalFrame::IMHandler::updateIMSpotLocation() - { - SalExtTextInputPosEvent aPosEvent; -- m_pFrame->CallCallback( SalEvent::ExtTextInputPos, static_cast(&aPosEvent) ); -+ m_pFrame->CallCallbackExc( SalEvent::ExtTextInputPos, static_cast(&aPosEvent) ); - GdkRectangle aArea; - aArea.x = aPosEvent.mnX; - aArea.y = aPosEvent.mnY; -@@ -3571,9 +3572,9 @@ void GtkSalFrame::IMHandler::sendEmptyCommit() - aEmptyEv.maText.clear(); - aEmptyEv.mnCursorPos = 0; - aEmptyEv.mnCursorFlags = 0; -- m_pFrame->CallCallback( SalEvent::ExtTextInput, static_cast(&aEmptyEv) ); -+ m_pFrame->CallCallbackExc( SalEvent::ExtTextInput, static_cast(&aEmptyEv) ); - if( ! aDel.isDeleted() ) -- m_pFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); -+ m_pFrame->CallCallbackExc( SalEvent::EndExtTextInput, nullptr ); - } - - void GtkSalFrame::IMHandler::endExtTextInput( EndExtTextInputFlags /*nFlags*/ ) -@@ -3788,7 +3789,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* /*pContext*/, gchar* - } - if( ! bSingleCommit ) - { -- pThis->m_pFrame->CallCallback( SalEvent::ExtTextInput, static_cast(&pThis->m_aInputEvent)); -+ pThis->m_pFrame->CallCallbackExc( SalEvent::ExtTextInput, static_cast(&pThis->m_aInputEvent)); - if( ! aDel.isDeleted() ) - pThis->doCallEndExtTextInput(); - } -@@ -3902,7 +3903,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ - SolarMutexGuard aGuard; - vcl::DeletionListener aDel( pThis->m_pFrame ); - -- pThis->m_pFrame->CallCallback( SalEvent::ExtTextInput, static_cast(&pThis->m_aInputEvent)); -+ pThis->m_pFrame->CallCallbackExc( SalEvent::ExtTextInput, static_cast(&pThis->m_aInputEvent)); - if( bEndPreedit && ! aDel.isDeleted() ) - pThis->doCallEndExtTextInput(); - if( ! aDel.isDeleted() ) -@@ -4210,5 +4211,19 @@ void GtkSalFrame::signalDragDataGet(GtkWidget* /*widget*/, GdkDragContext* /*con - pThis->m_pDragSource->dragDataGet(data, info); - } - -+long GtkSalFrame::CallCallbackExc(SalEvent nEvent, const void* pEvent) const -+{ -+ long nRet = 0; -+ try -+ { -+ nRet = CallCallback(nEvent, pEvent); -+ } -+ catch (const css::uno::Exception&) -+ { -+ GtkData *pSalData = static_cast(GetSalData()); -+ pSalData->setException(::cppu::getCaughtException()); -+ } -+ return nRet; -+} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ --- -2.9.3 - diff --git a/0001-convert-angle-from-degrees-to-radians-for-glm.patch b/0001-convert-angle-from-degrees-to-radians-for-glm.patch deleted file mode 100644 index eedf622..0000000 --- a/0001-convert-angle-from-degrees-to-radians-for-glm.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ce2ad7ebd6c0fa15316c642105a84b1f7a687757 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 31 Oct 2016 19:51:56 +0100 -Subject: [PATCH] convert angle from degrees to radians for glm - -This makes simple (i.e., not implemented as a shader) OpenGL transitions -work correctly again. - -(cherry picked from commit 7445399af829c48e8c71eed66f132d96fa195c37) - -Change-Id: I773f686089bce3611940743b1a7f5046093886e8 ---- - slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx -index c61209f..97d8902 100644 ---- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx -+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx -@@ -31,6 +31,8 @@ - #include - #include - -+#include -+ - #include "OGLTrans_Operation.hxx" - - SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin, -@@ -38,7 +40,7 @@ SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin, - Operation(bInter, T0, T1), - axis(Axis), - origin(Origin), -- angle(Angle) -+ angle(basegfx::deg2rad(Angle)) - { - } - -@@ -55,7 +57,7 @@ RotateAndScaleDepthByWidth::RotateAndScaleDepthByWidth(const glm::vec3& Axis, - Operation(bInter, T0, T1), - axis(Axis), - origin(Origin), -- angle(Angle), -+ angle(basegfx::deg2rad(Angle)), - scale(bScale) - { - } -@@ -65,7 +67,7 @@ RotateAndScaleDepthByHeight::RotateAndScaleDepthByHeight(const glm::vec3& Axis, - Operation(bInter, T0, T1), - axis(Axis), - origin(Origin), -- angle(Angle), -+ angle(basegfx::deg2rad(Angle)), - scale(bScale) - { - } --- -2.9.3 - diff --git a/0001-remove-OpenGL-transitions-config.-file-from-scheme.patch b/0001-remove-OpenGL-transitions-config.-file-from-scheme.patch deleted file mode 100644 index e9e10e8..0000000 --- a/0001-remove-OpenGL-transitions-config.-file-from-scheme.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f316f413f589989013bf161170087e77a82db2d3 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 5 Nov 2016 16:38:14 +0100 -Subject: [PATCH] remove OpenGL transitions config. file from scheme - -The OpenGL transitions are optional, so the respective config. file -should only be listed in the ogltrans module. - -This reverts commit dafcb2844bda4af2bc290548548392bda3262307. - -Change-Id: Ie785db07d04a0baf3dc9fd385f1d8a34837dc38b ---- - officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs -index e8b170d..323e7ef 100644 ---- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs -+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs -@@ -452,7 +452,7 @@ - - - -- vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions-ogl.xml -+ vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions.xml - - - --- -2.9.3 - diff --git a/libreoffice.spec b/libreoffice.spec index 4d3f633..40aab7c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -3,7 +3,7 @@ # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. -%define libo_prerelease .alpha1 +%define libo_prerelease .beta1 # Should contain any suffix of release tarball name, e.g., -buildfix1. %define libo_buildfix %{nil} # rhbz#715152 state vendor @@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.0 -Release: 2%{?libo_prerelease}%{?dist} +Release: 3%{?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/ @@ -65,7 +65,7 @@ Source2: %{source_url}/libreoffice-translations-%{version}%{?libo_prerele Source3: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll Source4: libreoffice-multiliblauncher.sh Source5: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -Source6: %{external_url}/0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz +Source6: %{external_url}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz Source7: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source8: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose @@ -231,13 +231,9 @@ Patch3: 0001-never-run-autogen.sh.patch # not upstreamed Patch4: 0001-add-X-TryExec-entries-to-desktop-files.patch Patch5: 0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch -Patch6: 0001-convert-angle-from-degrees-to-radians-for-glm.patch -Patch7: 0001-remove-OpenGL-transitions-config.-file-from-scheme.patch # not upstreamed: upstream wants an automatic restart after a crash; we # want a nice abrt report Patch8: 0001-don-t-suppress-crashes.patch -Patch9: 0001-catch-and-rethrow-later-uno-exceptions-within-glib-s.patch -Patch10: 0001-avoid-loss-of-text-in-edited-placeholder.patch %if 0%{?rhel} # not upstreamed @@ -2293,6 +2289,9 @@ done %endif %changelog +* Wed Nov 23 2016 David Tardon - 1:5.3.0.0-3.beta1 +- update to 5.3.0 beta1 + * Tue Nov 08 2016 David Tardon - 1:5.3.0.0-2.alpha1 - allow abrt to work again diff --git a/sources b/sources index 42ef4d7..6afbcad 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -0fb1bb06d60d7708abc4797008209bcc 0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz +86b1daaa438f5a7bea9a52d7b9799ac0 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 798b2ffdc8bcfe7bca2cf92b62caf685 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip @@ -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 -10053ab054c79e1cd3a79371b2b7a148 libreoffice-5.3.0.0.alpha1.tar.xz -5a6c7b93705b72dfc4146544179a0e95 libreoffice-help-5.3.0.0.alpha1.tar.xz -ff8c262b8aa9b63c97973e16b4ec7acb libreoffice-translations-5.3.0.0.alpha1.tar.xz +6adab0f370826e7c7dbd957d0ff57802 libreoffice-5.3.0.0.beta1.tar.xz +ca30b97aafb18f3d1d726246314852c1 libreoffice-help-5.3.0.0.beta1.tar.xz +22e1d19861d542fc062efc014450c4d5 libreoffice-translations-5.3.0.0.beta1.tar.xz