rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 5.4.0 alpha1

Browse Source
f41
David Tardon 8 years ago
parent a7ba29fe9d
commit 1f6713e951
11 changed files with 60 additions and 2799 deletions
Show Stats Download Patch File Download Diff File

3
.gitignore vendored
Unescape View File

@ -49,3 +49,6 @@
/libreoffice-5.3.3.1.tar.xz /libreoffice-5.3.3.1.tar.xz
/libreoffice-help-5.3.3.1.tar.xz /libreoffice-help-5.3.3.1.tar.xz
/libreoffice-translations-5.3.3.1.tar.xz /libreoffice-translations-5.3.3.1.tar.xz
/libreoffice-5.4.0.0.alpha1.tar.xz
/libreoffice-help-5.4.0.0.alpha1.tar.xz
/libreoffice-translations-5.4.0.0.alpha1.tar.xz

50
0001-Related-rhbz-1334915-tdf-100158-hack-using-startcent.patch
Unescape View File

@ -1,50 +0,0 @@
From e60e1d83dca62060585cf4054cda9e897176590c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 23 Mar 2017 14:13:27 +0000
Subject: [PATCH] Related: rhbz#1334915 tdf#100158 hack using startcenter icon
under wayland
cause I can get no traction with gnome#779143 to allow changing wayland
app_ids for windows, so might as well bodge something to make us look
less pathetic than the broken app icon
Change-Id: I9810ba4908dd06a2fdbb2e58e7ad6ff4978ddd43
---
vcl/unx/gtk3/gtk3gtkframe.cxx | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 1a4823e..745d297 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1446,7 +1446,27 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ )
m_pParent->addGrabLevel();
}
+#if defined(GDK_WINDOWING_WAYLAND)
+ //rhbz#1334915, gnome#779143, tdf#100158
+ //gtk under wayland lacks a way to change the app_id
+ //of a window, so brute force everything as a
+ //startcenter when initially shown to at least get
+ //the default LibreOffice icon and not the broken
+ //app icon
+ if (GDK_IS_WAYLAND_DISPLAY(getGdkDisplay()))
+ {
+ OString sOrigName(g_get_prgname());
+ g_set_prgname("libreoffice-startcenter");
+ gtk_widget_show(m_pWindow);
+ g_set_prgname(sOrigName.getStr());
+ }
+ else
+ {
+ gtk_widget_show(m_pWindow);
+ }
+#else
gtk_widget_show(m_pWindow);
+#endif
if( isFloatGrabWindow() )
{
--
2.9.3

83
0001-Related-rhbz-1422353-make-writer-behave-like-calc-an.patch
Unescape View File

@ -1,83 +0,0 @@
From c910d1dae1a9fcf0591098244debc863dd59618a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 17 Feb 2017 16:23:28 +0000
Subject: [PATCH] Related: rhbz#1422353 make writer behave like calc and
impress
and start off by default maximized
Change-Id: I8d464c28b61991d27cdb732da50ebfa61802d001
---
officecfg/registry/data/org/openoffice/Setup.xcu | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 0a936bb..9ab5243 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -199,7 +199,7 @@
<value>private:factory/smath</value>
</prop>
<prop oor:name="ooSetupFactoryWindowAttributes">
- <value/>
+ <value>,,,;4;</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value>13</value>
@@ -243,7 +243,7 @@
<value>private:factory/swriter/GlobalDocument</value>
</prop>
<prop oor:name="ooSetupFactoryWindowAttributes">
- <value/>
+ <value>,,,;4;</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value>10</value>
@@ -287,7 +287,7 @@
<value>private:factory/swriter</value>
</prop>
<prop oor:name="ooSetupFactoryWindowAttributes">
- <value/>
+ <value>,,,;4;</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value>2</value>
@@ -401,7 +401,7 @@
<value>WriterCommands</value>
</prop>
<prop oor:name="ooSetupFactoryWindowAttributes">
- <value/>
+ <value>,,,;4;</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value>2</value>
@@ -437,7 +437,7 @@
<value>private:factory/swriter/web</value>
</prop>
<prop oor:name="ooSetupFactoryWindowAttributes">
- <value/>
+ <value>,,,;4;</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value>11</value>
@@ -692,7 +692,7 @@
<value>private:factory/schart</value>
</prop>
<prop oor:name="ooSetupFactoryWindowAttributes">
- <value/>
+ <value>,,,;4;</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value>1</value>
@@ -734,7 +734,7 @@
<value>private:factory/sdatabase</value>
</prop>
<prop oor:name="ooSetupFactoryWindowAttributes">
- <value/>
+ <value>,,,;4;</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value>12</value>
--
2.9.3

50
0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch
Unescape View File

@ -1,50 +0,0 @@
From 2e5d1e032d353884a1f391d9e55ca1be3f7a0b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 14 Feb 2017 08:57:50 +0000
Subject: [PATCH] Resolves: tdf#105998 distort hairline borders to fall inside
the canvas
if we are a hairline along the very right/bottom edge
of the canvas then distory the polygon inwards one pixel right/bottom so that
the hairline falls inside the paintable area and becomes visible
Change-Id: Ie5713f6916cf5b47fdf14f86f034e38cda9900fd
---
.../source/processor2d/vclpixelprocessor2d.cxx | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index b8e9795..216be6b 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -165,6 +165,27 @@ namespace drawinglayer
return true;
}
+ //Resolves: tdf#105998 if we are a hairline along the very right/bottom edge
+ //of the canvas then distory the polygon inwards one pixel right/bottom so that
+ //the hairline falls inside the paintable area and becomes visible
+ Size aSize = mpOutputDevice->GetOutputSize();
+ basegfx::B2DRange aRange = aLocalPolygon.getB2DRange();
+ basegfx::B2DRange aOutputRange = aRange;
+ aOutputRange.transform(maCurrentTransformation);
+ if (std::round(aOutputRange.getMaxX()) == aSize.Width() || std::round(aOutputRange.getMaxY()) == aSize.Height())
+ {
+ basegfx::B2DRange aOnePixel(0, 0, 1, 1);
+ aOnePixel.transform(maCurrentTransformation);
+ double fXOnePixel = 1.0 / aOnePixel.getMaxX();
+ double fYOnePixel = 1.0 / aOnePixel.getMaxY();
+
+ basegfx::B2DPoint aTopLeft(aRange.getMinX(), aRange.getMinY());
+ basegfx::B2DPoint aTopRight(aRange.getMaxX() - fXOnePixel, aRange.getMinY());
+ basegfx::B2DPoint aBottomLeft(aRange.getMinX(), aRange.getMaxY() - fYOnePixel);
+ basegfx::B2DPoint aBottomRight(aRange.getMaxX() - fXOnePixel, aRange.getMaxY() - fYOnePixel);
+ aLocalPolygon = basegfx::tools::distort(aLocalPolygon, aRange, aTopLeft, aTopRight, aBottomLeft, aBottomRight);
+ }
+
const basegfx::BColor aLineColor(maBColorModifierStack.getModifiedColor(rSource.getBColor()));
mpOutputDevice->SetFillColor();
--
2.9.3

32
0001-apparently-the-executable-does-not-need-pdfium-direc.patch
Unescape View File

@ -0,0 +1,32 @@
From 6f53cf281eb3c13fc516ff79decb70b2a87a96d0 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Sat, 29 Apr 2017 05:11:40 +0200
Subject: [PATCH] apparently the executable does not need pdfium directly
anymore
Change-Id: If7ec9a18603005791ff948c7ecfddc5010ac88fe
Reviewed-on: https://gerrit.libreoffice.org/37091
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
---
xmlsecurity/Executable_pdfverify.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/xmlsecurity/Executable_pdfverify.mk b/xmlsecurity/Executable_pdfverify.mk
index 9a67a785983a..11c22d1d7ea6 100644
--- a/xmlsecurity/Executable_pdfverify.mk
+++ b/xmlsecurity/Executable_pdfverify.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,pdfverify))
$(eval $(call gb_Executable_use_sdk_api,pdfverify))
-$(eval $(call gb_Executable_use_externals,pdfverify,\
- pdfium \
-))
-
$(eval $(call gb_Executable_set_include,pdfverify,\
$$(INCLUDE) \
-I$(SRCDIR)/xmlsecurity/inc \
--
2.12.2

1945
0001-change-from-glew-to-epoxy.patch
View File

File diff suppressed because it is too large Load Diff

568
0001-gtk3-implement-opengl-support-for-slideshow.patch
Unescape View File

@ -1,568 +0,0 @@
From ac19024c141448dbc5d89ad943a28875b4504f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 25 Nov 2016 14:11:13 +0000
Subject: [PATCH] gtk3: implement opengl support for slideshow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
all of them work, except "Fall" doesn't look right, but it has
the exact same problem under gtk2/gen to.
Change-Id: I73cb9c0fb8211f727198be78d90d4f80a4f8c7c8
Reviewed-on: https://gerrit.libreoffice.org/31214
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 8bd9db90383ee008777903c35c7a5eb2c5352e71)
---
include/vcl/opengl/OpenGLContext.hxx | 2 +
slideshow/source/engine/opengl/TransitionImpl.cxx | 73 ++++++------
slideshow/source/engine/opengl/TransitionImpl.hxx | 9 +-
.../source/engine/opengl/TransitionerImpl.cxx | 7 +-
vcl/inc/unx/gtk/gtkinst.hxx | 1 +
vcl/source/opengl/OpenGLContext.cxx | 5 +
vcl/unx/gtk3/gtk3gtkinst.cxx | 127 +++++++++++++++++++++
7 files changed, 181 insertions(+), 43 deletions(-)
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index ffcd816..5796f7e 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -129,6 +129,8 @@ public:
void registerAsCurrent();
/// reset the GL context so this context is not implicit in subsequent GL calls.
virtual void resetCurrent();
+ /// unbind the GL_FRAMEBUFFER to its default state, needed for gtk3
+ virtual void restoreDefaultFramebuffer();
virtual void swapBuffers();
virtual void sync();
void show();
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 115aaf2..7b9b894 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -29,6 +29,7 @@
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <vcl/opengl/OpenGLHelper.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
#include <algorithm>
#include <array>
@@ -132,7 +133,7 @@ static std::vector<int> uploadPrimitives(const Primitives_t& primitives)
return indices;
}
-bool OGLTransitionImpl::prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex )
+bool OGLTransitionImpl::prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext )
{
m_nProgramObject = makeShader();
if (!m_nProgramObject)
@@ -200,7 +201,7 @@ bool OGLTransitionImpl::prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteri
glBindBuffer(GL_ARRAY_BUFFER, 0);
CHECK_GL_ERROR();
- prepareTransition( glLeavingSlideTex, glEnteringSlideTex );
+ prepareTransition( glLeavingSlideTex, glEnteringSlideTex, pContext );
return true;
}
@@ -233,7 +234,7 @@ void OGLTransitionImpl::finish( double, double, double, double, double )
{
}
-void OGLTransitionImpl::prepareTransition( sal_Int32, sal_Int32 )
+void OGLTransitionImpl::prepareTransition( sal_Int32, sal_Int32, OpenGLContext* )
{
}
@@ -241,7 +242,7 @@ void OGLTransitionImpl::finishTransition()
{
}
-void OGLTransitionImpl::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale )
+void OGLTransitionImpl::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext * )
{
CHECK_GL_ERROR();
applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
@@ -257,7 +258,7 @@ void OGLTransitionImpl::displaySlides_( double nTime, sal_Int32 glLeavingSlideTe
}
void OGLTransitionImpl::display( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex,
- double SlideWidth, double SlideHeight, double DispWidth, double DispHeight )
+ double SlideWidth, double SlideHeight, double DispWidth, double DispHeight, OpenGLContext *pContext )
{
const double SlideWidthScale = SlideWidth/DispWidth;
const double SlideHeightScale = SlideHeight/DispHeight;
@@ -267,7 +268,7 @@ void OGLTransitionImpl::display( double nTime, sal_Int32 glLeavingSlideTex, sal_
prepare( nTime, SlideWidth, SlideHeight, DispWidth, DispHeight );
CHECK_GL_ERROR();
- displaySlides_( nTime, glLeavingSlideTex, glEnteringSlideTex, SlideWidthScale, SlideHeightScale );
+ displaySlides_( nTime, glLeavingSlideTex, glEnteringSlideTex, SlideWidthScale, SlideHeightScale, pContext );
CHECK_GL_ERROR();
displayScene( nTime, SlideWidth, SlideHeight, DispWidth, DispHeight );
CHECK_GL_ERROR();
@@ -534,9 +535,9 @@ public:
private:
virtual GLuint makeShader() const override;
- virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override;
+ virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext *pContext ) override;
- virtual void prepareTransition( sal_Int32, sal_Int32 ) override {
+ virtual void prepareTransition( sal_Int32, sal_Int32, OpenGLContext* ) override {
glDisable(GL_CULL_FACE);
}
@@ -551,7 +552,7 @@ GLuint ReflectionTransition::makeShader() const
}
void ReflectionTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex,
- double SlideWidthScale, double SlideHeightScale )
+ double SlideWidthScale, double SlideHeightScale, OpenGLContext * )
{
CHECK_GL_ERROR();
applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
@@ -598,7 +599,7 @@ public:
private:
virtual GLuint makeShader() const override;
- virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override;
+ virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext *pContext ) override;
};
GLuint SimpleTransition::makeShader() const
@@ -607,7 +608,7 @@ GLuint SimpleTransition::makeShader() const
}
void SimpleTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex,
- double SlideWidthScale, double SlideHeightScale )
+ double SlideWidthScale, double SlideHeightScale, OpenGLContext * )
{
CHECK_GL_ERROR();
applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
@@ -857,10 +858,10 @@ public:
{}
private:
- virtual void displaySlides_(double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale) override;
+ virtual void displaySlides_(double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext *pContext) override;
};
-void RochadeTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale )
+void RochadeTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext * )
{
applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
@@ -1195,7 +1196,7 @@ public:
{}
private:
- virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override;
+ virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext *pContext ) override;
};
Primitives_t makeLeavingSlide(double nTime)
@@ -1229,7 +1230,7 @@ Primitives_t makeLeavingSlide(double nTime)
}
void DiamondTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex,
- double SlideWidthScale, double SlideHeightScale )
+ double SlideWidthScale, double SlideHeightScale, OpenGLContext * )
{
CHECK_GL_ERROR();
applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
@@ -1411,7 +1412,7 @@ protected:
{}
virtual void finishTransition() override;
- virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override;
+ virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ) override;
private:
/** various data */
@@ -1488,7 +1489,7 @@ void initPermTexture(GLuint *texID)
CHECK_GL_ERROR();
}
-void PermTextureTransition::prepareTransition( sal_Int32, sal_Int32 )
+void PermTextureTransition::prepareTransition( sal_Int32, sal_Int32, OpenGLContext* )
{
CHECK_GL_ERROR();
GLint location = glGetUniformLocation( m_nProgramObject, "permTexture" );
@@ -1629,8 +1630,8 @@ public:
private:
virtual void finishTransition() override;
virtual GLuint makeShader() const override;
- virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override;
- virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override;
+ virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ) override;
+ virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext *pContext ) override;
GLint mnSlideLocation = -1;
GLint mnTileInfoLocation = -1;
@@ -1679,10 +1680,10 @@ glm::mat4 lookAt(const glm::vec3& eye, const glm::vec3& center, const glm::vec3&
-glm::dot(s, eye), -glm::dot(u, eye), glm::dot(f, eye), 1);
}
-void VortexTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex )
+void VortexTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext )
{
CHECK_GL_ERROR();
- PermTextureTransition::prepareTransition( glLeavingSlideTex, glEnteringSlideTex );
+ PermTextureTransition::prepareTransition( glLeavingSlideTex, glEnteringSlideTex, pContext );
CHECK_GL_ERROR();
mnSlideLocation = glGetUniformLocation(m_nProgramObject, "slide");
@@ -1783,7 +1784,7 @@ void VortexTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32
}
}
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ pContext->restoreDefaultFramebuffer();
glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture( GL_TEXTURE2 );
@@ -1793,7 +1794,7 @@ void VortexTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32
glActiveTexture( GL_TEXTURE0 );
}
-void VortexTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale )
+void VortexTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext * pContext )
{
CHECK_GL_ERROR();
applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
@@ -1815,7 +1816,7 @@ void VortexTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex
displaySlide( nTime, glEnteringSlideTex, getScene().getEnteringSlide(), SlideWidthScale, SlideHeightScale );
glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ pContext->restoreDefaultFramebuffer();
glUniform1f( mnShadowLocation, 0.0 );
glUniform1f( mnSlideLocation, 0.0 );
displaySlide( nTime, glLeavingSlideTex, getScene().getLeavingSlide(), SlideWidthScale, SlideHeightScale );
@@ -1877,7 +1878,7 @@ public:
private:
virtual GLuint makeShader() const override;
- virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override;
+ virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ) override;
virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) override;
glm::vec2 maCenter;
@@ -1889,7 +1890,7 @@ GLuint RippleTransition::makeShader() const
return OpenGLHelper::LoadShaders( "basicVertexShader", "rippleFragmentShader" );
}
-void RippleTransition::prepareTransition( sal_Int32, sal_Int32 )
+void RippleTransition::prepareTransition( sal_Int32, sal_Int32, OpenGLContext* )
{
GLint nCenterLocation = glGetUniformLocation(m_nProgramObject, "center");
CHECK_GL_ERROR();
@@ -1974,7 +1975,7 @@ public:
private:
virtual GLuint makeShader() const override;
- virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override;
+ virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ) override;
virtual void finish( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) override;
GLuint maBuffer = 0;
@@ -1990,10 +1991,10 @@ struct ThreeFloats
GLfloat x, y, z;
};
-void GlitterTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex )
+void GlitterTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext )
{
CHECK_GL_ERROR();
- PermTextureTransition::prepareTransition( glLeavingSlideTex, glEnteringSlideTex );
+ PermTextureTransition::prepareTransition( glLeavingSlideTex, glEnteringSlideTex, pContext );
CHECK_GL_ERROR();
GLint nNumTilesLocation = glGetUniformLocation(m_nProgramObject, "numTiles");
@@ -2078,8 +2079,8 @@ public:
private:
virtual void finishTransition() override;
virtual GLuint makeShader() const override;
- virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override;
- virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override;
+ virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ) override;
+ virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext *pContext ) override;
GLint maHexagonSizeLocation = -1;
GLint maSelectedTextureLocation = -1;
@@ -2112,10 +2113,10 @@ GLuint HoneycombTransition::makeShader() const
return OpenGLHelper::LoadShaders( "honeycombVertexShader", "honeycombFragmentShader", "honeycombGeometryShader" );
}
-void HoneycombTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex )
+void HoneycombTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext )
{
CHECK_GL_ERROR();
- PermTextureTransition::prepareTransition( glLeavingSlideTex, glEnteringSlideTex );
+ PermTextureTransition::prepareTransition( glLeavingSlideTex, glEnteringSlideTex, pContext );
CHECK_GL_ERROR();
maHexagonSizeLocation = glGetUniformLocation(m_nProgramObject, "hexagonSize");
@@ -2189,11 +2190,11 @@ void HoneycombTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_In
return;
}
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ pContext->restoreDefaultFramebuffer();
}
void HoneycombTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex,
- double SlideWidthScale, double SlideHeightScale )
+ double SlideWidthScale, double SlideHeightScale, OpenGLContext *pContext )
{
CHECK_GL_ERROR();
applyOverallOperations(nTime, SlideWidthScale, SlideHeightScale);
@@ -2217,7 +2218,7 @@ void HoneycombTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlide
// The back (entering) slide needs to be drawn before the front (leaving) one in order for blending to work.
glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ pContext->restoreDefaultFramebuffer();
glUniform1f(mnShadowLocation, 0.0);
glUniform1f(maSelectedTextureLocation, 0.0);
glUniform1f(maHexagonSizeLocation, 1.0f - borderSize);
diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx b/slideshow/source/engine/opengl/TransitionImpl.hxx
index b739c0c..54b7ba0 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.hxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.hxx
@@ -36,6 +36,7 @@
#include <vector>
class Primitive;
+class OpenGLContext;
class Operation;
class SceneObject;
class TransitionData;
@@ -136,10 +137,10 @@ public:
/** Prepare transition.
*/
- bool prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex );
+ bool prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext );
/** Display a step of the transition.
*/
- void display( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
+ void display( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight, OpenGLContext *pContext );
/** Clean up after transition.
*/
void finish();
@@ -182,7 +183,7 @@ private:
*
* Default implementation does nothing.
*/
- virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex );
+ virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext );
/** This function is called when the transition needs to clear after itself, like delete own textures etc.
*
@@ -195,7 +196,7 @@ private:
* Default implementation applies overall operations and then
* displays both slides.
*/
- virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
+ virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext *pContext );
/** This function is called in prepare method to create the GL program.
*
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 01cd3e5..f2f0b3f 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -407,7 +407,7 @@ void OGLTransitionerImpl::impl_prepareSlides()
bool OGLTransitionerImpl::impl_prepareTransition()
{
if( mpTransition && mpTransition->getSettings().mnRequiredGLVersion <= mnGLVersion )
- return mpTransition->prepare( maLeavingSlideGL, maEnteringSlideGL );
+ return mpTransition->prepare( maLeavingSlideGL, maEnteringSlideGL, mpContext.get() );
return false;
}
@@ -1046,10 +1046,11 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
CHECK_GL_ERROR();
const GLWindow& rGLWindow(mpContext->getOpenGLWindow());
- mpTransition->display( nTime, maLeavingSlideGL, maEnteringSlideGL,
+ mpTransition->display(nTime, maLeavingSlideGL, maEnteringSlideGL,
maSlideSize.Width, maSlideSize.Height,
static_cast<double>(rGLWindow.Width),
- static_cast<double>(rGLWindow.Height) );
+ static_cast<double>(rGLWindow.Height),
+ mpContext.get());
mpContext->swapBuffers();
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 514b13f..e20ca9d 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -239,6 +239,7 @@ public:
virtual css::uno::Reference< css::uno::XInterface > CreateClipboard( const css::uno::Sequence< css::uno::Any >& i_rArguments ) override;
virtual css::uno::Reference< css::uno::XInterface > CreateDragSource() override;
virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() override;
+ virtual OpenGLContext* CreateOpenGLContext() override;
#endif
virtual const cairo_font_options_t* GetCairoFontOptions() override;
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 1b2893b..d7d7841 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -330,6 +330,11 @@ void OpenGLContext::InitGLDebugging()
#endif
}
+void OpenGLContext::restoreDefaultFramebuffer()
+{
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+}
+
void OpenGLContext::setWinPosAndSize(const Point &rPos, const Size& rSize)
{
if(m_xWindow)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7148882..947bcc9 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -916,4 +916,131 @@ Reference< XInterface > GtkInstance::CreateDragSource()
return Reference< XInterface >( static_cast<cppu::OWeakObject *>(new GtkDragSource()) );
}
+class GtkOpenGLContext : public OpenGLContext
+{
+ GLWindow m_aGLWin;
+ GtkWidget *m_pGLArea;
+
+public:
+ GtkOpenGLContext()
+ : OpenGLContext()
+ , m_pGLArea(nullptr)
+ {
+ }
+
+ virtual bool initWindow() override
+ {
+ if( !m_pChildWindow )
+ {
+ SystemWindowData winData = generateWinData(mpWindow, mbRequestLegacyContext);
+ m_pChildWindow = VclPtr<SystemChildWindow>::Create(mpWindow, 0, &winData, false);
+ }
+
+ if (m_pChildWindow)
+ {
+ InitChildWindow(m_pChildWindow.get());
+ }
+
+ return true;
+ }
+
+private:
+ virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; }
+ virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; }
+
+ static void signalDestroy(GtkWidget*, gpointer context)
+ {
+ GtkOpenGLContext* pThis = static_cast<GtkOpenGLContext*>(context);
+ pThis->m_pGLArea = nullptr;
+ }
+
+ virtual bool ImplInit() override
+ {
+#if GTK_CHECK_VERSION(3,16,0)
+ const SystemEnvData* pEnvData = m_pChildWindow->GetSystemData();
+ GtkWidget *pParent = static_cast<GtkWidget*>(pEnvData->pWidget);
+ m_pGLArea = gtk_gl_area_new();
+ g_signal_connect(G_OBJECT(m_pGLArea), "destroy", G_CALLBACK(signalDestroy), this);
+ gtk_gl_area_set_has_depth_buffer(GTK_GL_AREA(m_pGLArea), true);
+ gtk_gl_area_set_auto_render(GTK_GL_AREA(m_pGLArea), false);
+ gtk_widget_set_hexpand(m_pGLArea, true);
+ gtk_widget_set_vexpand(m_pGLArea, true);
+ gtk_container_add(GTK_CONTAINER(pParent), m_pGLArea);
+ gtk_widget_show_all(pParent);
+ gtk_gl_area_make_current(GTK_GL_AREA(m_pGLArea));
+ gtk_gl_area_attach_buffers(GTK_GL_AREA(m_pGLArea));
+#endif
+ bool bRet = InitGL();
+ InitGLDebugging();
+ return bRet;
+ }
+
+ virtual void restoreDefaultFramebuffer() override
+ {
+ OpenGLContext::restoreDefaultFramebuffer();
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_gl_area_attach_buffers(GTK_GL_AREA(m_pGLArea));
+#endif
+ }
+
+ virtual void makeCurrent() override
+ {
+ if (isCurrent())
+ return;
+
+ clearCurrent();
+
+#if GTK_CHECK_VERSION(3,16,0)
+ if (m_pGLArea)
+ gtk_gl_area_make_current(GTK_GL_AREA(m_pGLArea));
+#endif
+
+ registerAsCurrent();
+ }
+
+ virtual void destroyCurrentContext() override
+ {
+#if GTK_CHECK_VERSION(3,16,0)
+ gdk_gl_context_clear_current();
+#endif
+ }
+
+ virtual bool isCurrent() override
+ {
+#if GTK_CHECK_VERSION(3,16,0)
+ return m_pGLArea && gdk_gl_context_get_current() == gtk_gl_area_get_context(GTK_GL_AREA(m_pGLArea));
+#else
+ return false;
+#endif
+ }
+
+ virtual void sync() override
+ {
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_gl_area_queue_render(GTK_GL_AREA(m_pGLArea));
+#endif
+ }
+
+ virtual void resetCurrent() override
+ {
+ clearCurrent();
+#if GTK_CHECK_VERSION(3,16,0)
+ gdk_gl_context_clear_current();
+#endif
+ }
+
+ virtual void swapBuffers() override
+ {
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_gl_area_queue_render(GTK_GL_AREA(m_pGLArea));
+#endif
+ BuffersSwapped();
+ }
+};
+
+OpenGLContext* GtkInstance::CreateOpenGLContext()
+{
+ return new GtkOpenGLContext;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
2.9.3

28
0001-lower-the-system-epoxy-requirement.patch
Unescape View File

@ -1,28 +0,0 @@
From e673349ad31a5ea469ef90e3fb03f7f0af5bb559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 20 Dec 2016 11:11:32 +0000
Subject: [PATCH] lower the system epoxy requirement
(cherry picked from commit d0c3dba866ba0900dcaf2c3a25200edb516bd608)
Change-Id: I2fff46985502dafa3b860aaebe862853ebaccabb
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 0f8e58d..c4f64d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11727,7 +11727,7 @@ AC_SUBST(CAIRO_LIBS)
dnl ===================================================================
dnl Check for system epoxy
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.3.1], ["-I${WORKDIR}/UnpackedTarball/epoxy/include"])
+libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.2], ["-I${WORKDIR}/UnpackedTarball/epoxy/include"])
dnl ===================================================================
dnl Test whether to use avahi
--
2.9.3

53
0001-right-click-to-insert-image.patch
Unescape View File

@ -1,53 +0,0 @@
From d44ed98fecf6749ce64f1020097477291bb9fdb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 20 Feb 2017 11:14:33 +0000
Subject: [PATCH] right click to insert image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
this was originally added by...
commit 67c3e2abf353c4893a4680f7a5b2d8c457ef18d1
Author: Caolán McNamara <caolanm@redhat.com>
Date: Mon May 25 15:00:47 2015 +0100
impress: right click to insert image
Change-Id: I521f074bbd500b81d74be7e0e771bd49efc29c9c
then removed with...
commit 7edfee8e4f81c17ec95a03843c509b95b8e404b2
Author: Yousuf Philips <philipz85@hotmail.com>
Date: Fri Dec 11 18:53:15 2015 +0400
Rearrangement of various context menus in Impress
Change-Id: I6674254898dc6d7351ec4450e2aa5ac3f177bdbf
Reviewed-on: https://gerrit.libreoffice.org/20640
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
but no particular indication as to why
Change-Id: I8b0ec6c22732d347fc7d354dc5ee5e05b5a3ec79
---
sd/uiconfig/simpress/popupmenu/page.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/sd/uiconfig/simpress/popupmenu/page.xml b/sd/uiconfig/simpress/popupmenu/page.xml
index 307b2b9..0da2948 100644
--- a/sd/uiconfig/simpress/popupmenu/page.xml
+++ b/sd/uiconfig/simpress/popupmenu/page.xml
@@ -13,6 +13,7 @@
<menu:menuitem menu:id=".uno:Paste"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SlideSetup"/>
+ <menu:menuitem menu:id=".uno:InsertGraphic"/>
<menu:menuitem menu:id=".uno:SelectBackground"/>
<menu:menuitem menu:id=".uno:SaveBackground"/>
<menu:menu menu:id=".uno:SlideFeaturesMenu">
--
2.9.3

41
libreoffice.spec
Unescape View File

@ -1,9 +1,9 @@
# download path contains version without the last (fourth) digit # download path contains version without the last (fourth) digit
%define libo_version 5.3.3 %define libo_version 5.4.0
# Should contain .alphaX / .betaX, if this is pre-release (actually # Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names, # 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. # so we need a way to define it easily at one place.
%define libo_prerelease %{nil} %define libo_prerelease .alpha1
# Should contain any suffix of release tarball name, e.g., -buildfix1. # Should contain any suffix of release tarball name, e.g., -buildfix1.
%define libo_buildfix %{nil} %define libo_buildfix %{nil}
# rhbz#715152 state vendor # rhbz#715152 state vendor
@ -57,7 +57,7 @@
Summary: Free Software Productivity Suite Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.1 Version: %{libo_version}.0
Release: 1%{?libo_prerelease}%{?dist} 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 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/ URL: http://www.libreoffice.org/
@ -94,14 +94,18 @@ Source100: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.
Source101: %{external_url}/liborcus-0.12.1.tar.gz Source101: %{external_url}/liborcus-0.12.1.tar.gz
Source102: %{external_url}/mdds-1.2.2.tar.bz2 Source102: %{external_url}/mdds-1.2.2.tar.bz2
Source103: %{external_url}/libcmis-0.5.1.tar.gz Source103: %{external_url}/libcmis-0.5.1.tar.gz
Source104: %{external_url}/libwps-0.4.4.tar.bz2 Source104: %{external_url}/libwps-0.4.6.tar.bz2
Source105: %{external_url}/libpagemaker-0.0.3.tar.bz2 Source105: %{external_url}/libpagemaker-0.0.3.tar.bz2
Source106: %{external_url}/libzmf-0.0.1.tar.bz2 Source106: %{external_url}/libzmf-0.0.1.tar.bz2
Source107: %{external_url}/libstaroffice-0.0.2.tar.bz2 Source107: %{external_url}/libstaroffice-0.0.3.tar.bz2
# TODO: maybe it's still possible to build with harfbuzz 0.9.36 with some amount of patching? # TODO: maybe it's still possible to build with harfbuzz 0.9.36 with some amount of patching?
Source108: %{external_url}/harfbuzz-1.3.2.tar.bz2 Source108: %{external_url}/harfbuzz-1.3.2.tar.bz2
Source109: %{external_url}/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz Source109: %{external_url}/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz
%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice --without-system-harfbuzz --without-system-graphite Source110: %{external_url}/gpgme-1.8.2.tar.bz2
Source111: %{external_url}/libgpg-error-1.26.tar.bz2
Source112: %{external_url}/libassuan-1.4.3.tar.bz2
Source113: %{external_url}/cppunit-1.14.0.tar.gz
%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice --without-system-harfbuzz --without-system-graphite --without-system-gpgmepp --without-system-cppunit
%endif %endif
# build tools # build tools
@ -141,7 +145,6 @@ BuildRequires: lpsolve-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(cppunit)
BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(dconf)
BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(epoxy)
@ -191,8 +194,10 @@ BuildRequires: unixODBC-devel
# libs / headers - conditional # libs / headers - conditional
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: gpgmepp-devel
BuildRequires: kdelibs4-devel BuildRequires: kdelibs4-devel
BuildRequires: openCOLLADA-devel BuildRequires: openCOLLADA-devel
BuildRequires: pkgconfig(cppunit) >= 1.14.0
BuildRequires: pkgconfig(graphite2) BuildRequires: pkgconfig(graphite2)
BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(libcmis-0.5) BuildRequires: pkgconfig(libcmis-0.5)
@ -236,15 +241,11 @@ Patch2: 0001-add-X-TryExec-entries-to-desktop-files.patch
# not upstreamed: upstream wants an automatic restart after a crash; we # not upstreamed: upstream wants an automatic restart after a crash; we
# want a nice abrt report # want a nice abrt report
Patch3: 0001-don-t-suppress-crashes.patch Patch3: 0001-don-t-suppress-crashes.patch
Patch4: 0001-change-from-glew-to-epoxy.patch # not upstreamed
Patch5: 0001-gtk3-implement-opengl-support-for-slideshow.patch Patch4: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch
Patch6: 0001-lower-the-system-epoxy-requirement.patch # not upstreamed
Patch7: 0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch Patch5: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
Patch8: 0001-Related-rhbz-1422353-make-writer-behave-like-calc-an.patch Patch6: 0001-apparently-the-executable-does-not-need-pdfium-direc.patch
Patch9: 0001-right-click-to-insert-image.patch
Patch10: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch
Patch11: 0001-Related-rhbz-1334915-tdf-100158-hack-using-startcent.patch
Patch12: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
%if 0%{?rhel} %if 0%{?rhel}
# not upstreamed # not upstreamed
@ -1097,6 +1098,7 @@ touch autogen.lastrun
--disable-fetch-external \ --disable-fetch-external \
--disable-firebird-sdbc \ --disable-firebird-sdbc \
--disable-openssl \ --disable-openssl \
--disable-pdfium \
--disable-systray \ --disable-systray \
--enable-dconf \ --enable-dconf \
--enable-evolution2 \ --enable-evolution2 \
@ -1621,6 +1623,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libxmlfdlo.so %{baseinstdir}/program/libxmlfdlo.so
%{baseinstdir}/program/libxoflo.so %{baseinstdir}/program/libxoflo.so
%{baseinstdir}/program/libxsec_fw.so %{baseinstdir}/program/libxsec_fw.so
%{baseinstdir}/program/libxsec_gpg.so
%{baseinstdir}/program/libxsec_xmlsec.so %{baseinstdir}/program/libxsec_xmlsec.so
%{baseinstdir}/program/libxsltdlglo.so %{baseinstdir}/program/libxsltdlglo.so
%{baseinstdir}/program/libxsltfilterlo.so %{baseinstdir}/program/libxsltfilterlo.so
@ -1733,7 +1736,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/resource/upden-US.res %{baseinstdir}/program/resource/upden-US.res
%{baseinstdir}/program/resource/vclen-US.res %{baseinstdir}/program/resource/vclen-US.res
%{baseinstdir}/program/resource/writerperfecten-US.res %{baseinstdir}/program/resource/writerperfecten-US.res
%{baseinstdir}/program/resource/wzien-US.res
%{baseinstdir}/program/resource/xmlsecen-US.res %{baseinstdir}/program/resource/xmlsecen-US.res
%{baseinstdir}/program/resource/xsltdlgen-US.res %{baseinstdir}/program/resource/xsltdlgen-US.res
%{baseinstdir}/program/senddoc %{baseinstdir}/program/senddoc
@ -1916,7 +1918,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{baseinstdir}/program/resource/dbpen-US.res %{baseinstdir}/program/resource/dbpen-US.res
%{baseinstdir}/program/resource/rpten-US.res %{baseinstdir}/program/resource/rpten-US.res
%{baseinstdir}/program/resource/rptuien-US.res %{baseinstdir}/program/resource/rptuien-US.res
%{baseinstdir}/program/resource/sdbclen-US.res
%{baseinstdir}/program/resource/sdberren-US.res %{baseinstdir}/program/resource/sdberren-US.res
%{baseinstdir}/share/registry/base.xcd %{baseinstdir}/share/registry/base.xcd
%{baseinstdir}/share/registry/reportbuilder.xcd %{baseinstdir}/share/registry/reportbuilder.xcd
@ -2095,7 +2096,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{baseinstdir}/help/en-US/simpress.* %{baseinstdir}/help/en-US/simpress.*
%endif %endif
%{baseinstdir}/program/libanimcorelo.so %{baseinstdir}/program/libanimcorelo.so
%{baseinstdir}/program/libplacewarelo.so
%{baseinstdir}/program/libPresentationMinimizerlo.so %{baseinstdir}/program/libPresentationMinimizerlo.so
%{baseinstdir}/program/libPresenterScreenlo.so %{baseinstdir}/program/libPresenterScreenlo.so
%{baseinstdir}/program/libwpftimpresslo.so %{baseinstdir}/program/libwpftimpresslo.so
@ -2331,6 +2331,9 @@ done
%{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit
%changelog %changelog
* Tue May 02 2017 David Tardon <dtardon@redhat.com> - 1:5.4.0.0-1.alpha1
- update to 5.4.0 alpha1
* Wed Apr 19 2017 David Tardon <dtardon@redhat.com> - 1:5.3.3.1-1 * Wed Apr 19 2017 David Tardon <dtardon@redhat.com> - 1:5.3.3.1-1
- update to 5.3.3 rc1 - update to 5.3.3 rc1

6
sources
Unescape View File

@ -7,6 +7,6 @@ SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025
SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 SHA512 (4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8
SHA512 (libreoffice-5.3.3.1.tar.xz) = b6dfd6188391094a18ac00e721f41eae8a7ac267b376b6517404a45e542cf95b654dd768305454ac3aade1e30d298bc502f5d3480b1fed91f13e9894f6f2d0de SHA512 (libreoffice-5.4.0.0.alpha1.tar.xz) = b19358fe40f9c047b06f301732926dad250bf890bda4f1f52f0b456369edb72311faf660952db40885f122548bf6005b645d8e675aa6799547696e0c6edb8157
SHA512 (libreoffice-help-5.3.3.1.tar.xz) = c5787b1be40fdb455bf1f2a254bf2e030e8062ab827d2b7b92e344a110308777eb719931f17b846b53e29fdcc9465d8de0f43355ac014b8722c16e9923d468ec SHA512 (libreoffice-help-5.4.0.0.alpha1.tar.xz) = 3117fe84b46d2ce711f420f9b248047101679826b29897a80369b4bb3e36b946843cc7c48e358ec336e8fea749d8504abf4e6fd30c90a21372a4ca67f1fa61b1
SHA512 (libreoffice-translations-5.3.3.1.tar.xz) = d06820fc4ce9c6c617533db228f6e80f260edaf7bd0b3ca0c9ebc16deacf3bb43f734cec35c8a888fd1aa5e8fb7bc7b616412cc0e13efa28f8bb54fcf4ad4bb1 SHA512 (libreoffice-translations-5.4.0.0.alpha1.tar.xz) = 2edda598f6e86e62c4328e53e7c27a66770d95d199c062d90c25b36db7bb5c9bb12f9d54260f4dc5557c8258617f3705902422500ec1390f6abba9c15c91f95d

Write Preview
Loading…
Cancel
Save