Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libreoffice:v.bump to 5.3.0.3

Browse Source
This commit is contained in:
ayhanyalcinsoy
2017-02-22 17:17:08 +03:00
parent 906111fa95
commit 86cf22451f
9 changed files with 954 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/libreoffice/libreoffice/actions.py
+14 -6
View File
@@ -15,21 +15,26 @@ pixmaps = "/usr/share/pixmaps/"
LoVersion = "%s" % get.srcVERSION()
OurWorkDir = "%s/libreoffice-%s" % (get.workDIR(), LoVersion)
# temporarily disable failing tests, don't run broken tests on i686
if get.buildTYPE() == "i686":
shelltools.system('sed -i "/CppunitTest_sw_ooxmlexport7/d" sw/Module_sw.mk')
shelltools.system('sed -i -e /CppunitTest_sd_import_tests/d sd/Module_sd.mk')
def setup():
shelltools.system('sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac')
shelltools.chmod("%s/bin/unpack-sources" % OurWorkDir)
shelltools.export("LO_PREFIX", "/usr")
shelltools.export("PYTHON", "python3.4")
shelltools.cd(OurWorkDir)
shelltools.export("PYTHON", "python3.6")
shelltools.cd(OurWorkDir)
shelltools.touch("autogen.lastrun")
shelltools.system('sed -e "/distro-install-file-lists/d" -i Makefile.in')
shelltools.system('sed -e "/ustrbuf/a #include <algorithm>" \
-i svl/source/misc/gridprinter.cxx')
#shelltools.system('sed -e "/ustrbuf/a #include <algorithm>" \
###-i svl/source/misc/gridprinter.cxx')
shelltools.system('./autogen.sh \
--prefix=/usr \
--sysconfdir=/etc \
--with-vendor=PisiLinux \
--with-vendor="Pisi Linux" \
--with-lang="ALL" \
--enable-gtk3 \
--with-help \
@@ -59,7 +64,10 @@ def setup():
--disable-odk \
--enable-ext-wiki-publisher \
--enable-ext-nlpsolver \
--disable-firebird-sdbc \
--with-jdk-home=/usr/lib/jvm/java-7-openjdk \
--with-gdrive-client-id=413772536636.apps.googleusercontent.com \
--with-gdrive-client-secret=0ZChLK6AxeA3Isu96MkwqDR4 \
--with-parallelism=%s' % (get.makeJOBS().replace("-j","")))
def build():
office/libreoffice/libreoffice/files/0001-Related-rhbz-1422353-make-writer-behave-like-calc-an.patch
+83
View File
@@ -0,0 +1,83 @@
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
+++ 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
office/libreoffice/libreoffice/files/0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch
+67
View File
@@ -0,0 +1,67 @@
From a74837a0e7c7259e4396aa5f05cf1384e256db35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 20 Feb 2017 16:04:58 +0000
Subject: [PATCH] Related: tdf#106100 recover mangled svg in presentations
Change-Id: I77b452aa69a8341aa30e1e93d0d5ee8160533095
---
svgio/Module_svgio.mk | 4 ----
svgio/source/svgreader/svgsvgnode.cxx | 27 +++------------------------
2 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/svgio/Module_svgio.mk b/svgio/Module_svgio.mk
index 29ef97d..8b827fc 100644
--- a/svgio/Module_svgio.mk
+++ svgio/Module_svgio.mk
@@ -22,8 +22,4 @@ $(eval $(call gb_Module_add_targets,svgio,\
Library_svgio \
))
-$(eval $(call gb_Module_add_check_targets,svgio,\
- CppunitTest_svgio \
-))
-
# vim: set noet ts=4 sw=4:
diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx
index 7800666..087c621 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ svgio/source/svgreader/svgsvgnode.cxx
@@ -522,32 +522,11 @@ namespace svgio
}
else
{
- // There exists no parent to resolve relative width or height.
- // Use child size as fallback and expand to aspect ratio given
- // by the viewBox. No mapping.
- // We get viewport >= content, therefore no clipping.
- bNeedsMapping = false;
- const basegfx::B2DRange aChildRange(
- aSequence.getB2DRange(
- drawinglayer::geometry::ViewInformation2D()));
- const double fChildWidth(aChildRange.getWidth());
- const double fChildHeight(aChildRange.getHeight());
- const double fLeft(aChildRange.getMinX());
- const double fTop(aChildRange.getMinY());
- if ( fChildWidth / fViewBoxWidth > fChildHeight / fViewBoxHeight )
- { // expand y
- fW = fChildWidth;
- fH = fChildWidth / fViewBoxRatio;
- }
- else
- { // expand x
- fH = fChildHeight;
- fW = fChildHeight * fViewBoxRatio;
- }
- aSvgCanvasRange = basegfx::B2DRange(fLeft, fTop, fLeft + fW, fTop + fH);
+ fW = fViewBoxWidth;
+ fH = fViewBoxHeight;
+ aSvgCanvasRange = basegfx::B2DRange(0.0, 0.0, fW, fH);
}
-
if (bNeedsMapping)
{
// create mapping
--
2.9.3
office/libreoffice/libreoffice/files/0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch
+50
View File
@@ -0,0 +1,50 @@
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
+++ 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
office/libreoffice/libreoffice/files/0001-gtk3-implement-opengl-support-for-slideshow.patch
+568
View File
@@ -0,0 +1,568 @@
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
+++ 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
+++ 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
+++ 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
--- slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ 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
--- vcl/inc/unx/gtk/gtkinst.hxx
+++ 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
--- vcl/source/opengl/OpenGLContext.cxx
+++ 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
--- 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
office/libreoffice/libreoffice/files/0001-installation-fix.patch
+71
View File
@@ -0,0 +1,71 @@
From 3d36f9efa2e2f7a39a926e2d1acea2255b990b03 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 3 Feb 2014 21:41:00 +0100
Subject: [PATCH] installation fix
---
solenv/bin/modules/installer/scriptitems.pm | 15 ++++++---------
solenv/bin/modules/installer/worker.pm | 1 -
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 5f8dfd6..dff0f13 100644
--- solenv/bin/modules/installer/scriptitems.pm
+++ solenv/bin/modules/installer/scriptitems.pm
@@ -1131,11 +1131,10 @@ sub remove_Files_Without_Sourcedirectory
if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
{
- $infoline = "ERROR: Removing file $filename from file list.\n";
+ $infoline = "WARNING: Removing file $filename from file list.\n";
push( @installer::globals::logfileinfo, $infoline);
- push(@missingfiles, "ERROR: File not found: $filename\n");
- $error_occurred = 1;
+ push(@missingfiles, "WARNING: File not found: $filename\n");
next; # removing this file from list, if sourcepath is empty
}
@@ -1143,11 +1142,10 @@ sub remove_Files_Without_Sourcedirectory
{
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
{
- $infoline = "ERROR: Removing file $filename from file list.\n";
+ $infoline = "WARNING: Removing file $filename from file list.\n";
push( @installer::globals::logfileinfo, $infoline);
- push(@missingfiles, "ERROR: File not found: $filename\n");
- $error_occurred = 1;
+ push(@missingfiles, "WARNING: File not found: $filename\n");
next; # removing this file from list, if sourcepath is empty
}
@@ -1165,11 +1163,10 @@ sub remove_Files_Without_Sourcedirectory
{
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
{
- $infoline = "ERROR: Removing file $filename from file list.\n";
+ $infoline = "WARNING: Removing file $filename from file list.\n";
push( @installer::globals::logfileinfo, $infoline);
- push(@missingfiles, "ERROR: File not found: $filename\n");
- $error_occurred = 1;
+ push(@missingfiles, "WARNING: File not found: $filename\n");
next; # removing this file from list, if sourcepath is empty
}
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index aab676f..0e6f67d 100644
--- solenv/bin/modules/installer/worker.pm
+++ solenv/bin/modules/installer/worker.pm
@@ -96,7 +96,6 @@ sub create_installation_directory
$installdir = installer::systemactions::create_directories("install", $languageref);
installer::logger::print_message( "... creating installation set in $installdir ...\n" );
- remove_old_installation_sets($installdir);
my $inprogressinstalldir = $installdir . "_inprogress";
installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
$installdir = $inprogressinstalldir;
--
2.9.3
office/libreoffice/libreoffice/files/0001-right-click-to-insert-image.patch
+53
View File
@@ -0,0 +1,53 @@
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
+++ 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
office/libreoffice/libreoffice/files/You_make_ME_sandwich.patch
+16
View File
@@ -0,0 +1,16 @@
--- Makefile_old.in 2017-02-22 17:01:05.007444328 +0300
+++ Makefile.in 2017-02-22 17:01:29.942443835 +0300
@@ -54,13 +54,6 @@
all: build
-check-if-root:
- @if test `id -u` = 0; then \
- echo; \
- echo 'No. You make ME a sandwich.'; \
- echo; \
- exit 1; \
- fi
gb_Side ?= host
office/libreoffice/libreoffice/pspec.xml
+32 -14
View File
@@ -13,13 +13,19 @@
<IsA>app:gui</IsA>
<Summary>LibreOffice office suite</Summary>
<Description>LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office.</Description>
<Archive sha1sum="651eded1d62816d3dddad42a54573c7812d0c764" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.2.3/libreoffice-5.2.3.3.tar.xz</Archive>
<Archive sha1sum="267db133ad57c737dd3ba0148c714c12238edcb0" type="binary" target="libreoffice-5.2.3.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.2.3/libreoffice-help-5.2.3.3.tar.xz</Archive>
<Archive sha1sum="34eb126e79d0518e70acc1fb1933046a966cf648" type="binary" target="libreoffice-5.2.3.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.2.3/libreoffice-dictionaries-5.2.3.3.tar.xz</Archive>
<Archive sha1sum="4dc7184bddda89a5915e6802ef7101bcd8d4dee1" type="binary" target="libreoffice-5.2.3.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.2.3/libreoffice-translations-5.2.3.3.tar.xz</Archive>
<Archive sha1sum="d3bfb63477a9fee6d98b31264d5cbce2d20450c4" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-5.3.0.3.tar.xz</Archive>
<Archive sha1sum="fb5019676834ccc1a5dea93b7b04895c159de06d" type="binary" target="libreoffice-5.3.0.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-help-5.3.0.3.tar.xz</Archive>
<Archive sha1sum="dea91493d6abe60e302f89150b3c184daf9e26f0" type="binary" target="libreoffice-5.3.0.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-dictionaries-5.3.0.3.tar.xz</Archive>
<Archive sha1sum="1eaa20f207ec236e4d6ba83bae170b45f150ee1e" type="binary" target="libreoffice-5.3.0.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-translations-5.3.0.3.tar.xz</Archive>
<Patches>
<!-- <Patch>make-pyuno-work-with-system-wide-module-install.diff</Patch> -->
<!-- <Patch>remove_unnecessary_orcus_external_usage_from_makefiles.diff</Patch> -->
<Patch>You_make_ME_sandwich.patch</Patch>
<!--Fedora Patches-->
<Patch>0001-right-click-to-insert-image.patch</Patch>
<Patch>0001-gtk3-implement-opengl-support-for-slideshow.patch</Patch>
<Patch>0001-installation-fix.patch</Patch>
<Patch>0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch</Patch>
<Patch>0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch</Patch>
<Patch>0001-Related-rhbz-1422353-make-writer-behave-like-calc-an.patch</Patch>
</Patches>
<BuildDependencies>
<Dependency>ant</Dependency>
@@ -39,7 +45,7 @@
<Dependency>libXext-devel</Dependency>
<Dependency>poppler-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency versionFrom="3.6.0">python3-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency>
<Dependency>dbus-glib-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
@@ -51,8 +57,8 @@
<Dependency>libXcomposite-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>gst-plugins-base-next-devel</Dependency>
<Dependency versionFrom="3.18.6">gtk3-devel</Dependency>
<Dependency versionFrom="2.24.28">gtk2-devel</Dependency>
<Dependency versionFrom="3.22.8">gtk3-devel</Dependency>
<Dependency versionFrom="2.24.31">gtk2-devel</Dependency>
<Dependency>libatomic_ops-devel</Dependency>
<Dependency>librsvg-devel</Dependency>
<Dependency>unixODBC-devel</Dependency>
@@ -60,7 +66,7 @@
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>graphite2-devel</Dependency>
<Dependency>librevenge-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
</BuildDependencies>
</Source>
@@ -73,8 +79,8 @@
<Dependency>cups</Dependency>
<Dependency>curl</Dependency>
<Dependency>dbus</Dependency>
<Dependency>gtk2</Dependency>
<Dependency>mesa</Dependency>
<Dependency versionFrom="2.24.31">gtk2</Dependency>
<Dependency versionFrom="13.0.4">mesa</Dependency>
<Dependency>nspr</Dependency>
<Dependency>zlib</Dependency>
<Dependency>bzip2</Dependency>
@@ -88,7 +94,7 @@
<Dependency>libXt</Dependency>
<Dependency>pango</Dependency>
<Dependency>libICE</Dependency>
<Dependency>python3</Dependency>
<Dependency versionFrom="3.6.0">python3</Dependency>
<Dependency>libXext</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>libxslt</Dependency>
@@ -104,7 +110,12 @@
<Dependency>libXinerama</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>gstreamer-next</Dependency>
<Dependency>jre7-openjdk-headless</Dependency>S
<Dependency>jre7-openjdk-headless</Dependency>
<Dependency versionFrom="3.22.8">gtk3</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
<Dependency>gst-plugins-base-next</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
@@ -3110,6 +3121,13 @@
</Package>
<History>
<Update release="5">
<Date>2017-02-22</Date>
<Version>5.3.0.3</Version>
<Comment>Release Bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2016-11-10</Date>
<Version>5.2.3.3</Version>