pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 400953 from LibreOffice:Factory

Browse Source 
- Version update to 5.2.0.0.beta2:
  * More bugfixes on road to 5.2 series
  * missing-include.patch

- Add patch to fix build missing-include.patch

- Version update to 5.2.0.0.beta1:
  * Disable support for sle11, not needed anymore
  * Cleanup the specfile from all the compat conditionals per above
  * Disable bundled help and point to upstream wiki always (speeds
    up build quite a bit)
  * Use pkgconfig style dependencies instead of the develpkgs
  * Remove all the bundled tarballs that were aedded for sle11
  * Adjust the constraints a bit to reflect reality
  * Remove merged patches:
    * scp2-user-config-suse.diff
    * 0001-Make-HAVE_JAVA6-be-always-false.patch
    * 0001-mdds-1.0.patch
    * 0001-liborcus-0.11.patch
    * 0002-boost-filesystem1.patch
    * 0003-boost-filesystem2.patch
    * bnc856729.patch
    * bnc939998.patch
    * bnc945443.patch
    * bnc945445.patch
  * Refresh patches:
    * libreoffice-hotfix-disablebrokenshapetest.patch
    * system-pyuno.diff

- fix bnc#939998 -  LO-L3: PPT file shows wrong titles

OBS-URL: https://build.opensuse.org/request/show/400953
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=111
This commit is contained in:
Dominique Leuenberger 2016-06-14 21:06:00 +00:00 committed by Git OBS Bridge
commit 6486998242
78 changed files with 291 additions and 3152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-Make-HAVE_JAVA6-be-always-false.patch
View File

@ -1,41 +0,0 @@
From 901eeaacd7219f61816b28873e45264c7d7de1ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Thu, 23 Apr 2015 17:41:10 +0200
Subject: [PATCH] Make HAVE_JAVA6 be always false
Even if we have newer java for bundling we still test for 1.5 java
to be able to execute our bitecode.
Change-Id: I7bf5d86c4558b8ed583e3741c10e10daaaa825a7
NOTE: Do NOT upstream this.
---
configure.ac | 6 ------
1 file changed, 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0d492ad..ba02fd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6725,9 +6725,6 @@ if test "$ENABLE_JAVA" != ""; then
if test "$_jdk_ver" -lt 10500; then
AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])
fi
- if test "$_jdk_ver" -ge 10600; then
- HAVE_JAVA6=TRUE
- fi
AC_MSG_RESULT([checked (IBM JDK $_jdk)])
@@ -6750,9 +6747,6 @@ you must use the "--with-jdk-home" configure option explicitly])
if test "$_jdk_ver" -gt 10600; then
JAVA_CLASSPATH_NOT_SET="1"
fi
- if test "$_jdk_ver" -ge 10600; then
- HAVE_JAVA6=TRUE
- fi
if test "$_jdk_ver" -ge 10900; then
HAVE_JAVA9=TRUE
fi
--
2.3.5

1974
0001-liborcus-0.11.patch
View File

File diff suppressed because it is too large Load Diff

25
0001-mdds-1.0.patch
View File

@ -1,25 +0,0 @@
From a7c3a2a9be83686657c06f37d521f9f6d2004ddd Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Fri, 9 Oct 2015 01:03:29 +0200
Subject: update to mdds 1.0
Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972
Reviewed-on: https://gerrit.libreoffice.org/20251
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
diff --git a/configure.ac b/configure.ac
index 57a41f7..e00df959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8759,7 +8759,7 @@ AC_SUBST(SYSTEM_BOOST)
dnl ===================================================================
dnl Check for system mdds
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
dnl ===================================================================
dnl Check for system glm

158
0002-boost-filesystem1.patch
View File

@ -1,158 +0,0 @@
From ed41a33ca22f46b123df4132d376247682af07af Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 8 Mar 2016 06:23:24 +0100
Subject: detect Boost.Filesystem
Change-Id: I86c268f49f44bd1e208a9de781a16bf19450c64c
diff --git a/config_host.mk.in b/config_host.mk.in
index 89081ca..0a2ec0b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -37,6 +37,7 @@ export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@
export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
+export BOOST_FILESYSTEM_LIB=@BOOST_FILESYSTEM_LIB@
export BOOST_IOSTREAMS_LIB=@BOOST_IOSTREAMS_LIB@
export BOOST_LDFLAGS=@BOOST_LDFLAGS@
export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
diff --git a/configure.ac b/configure.ac
index dab1919..7b5cedd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8836,6 +8836,7 @@ if test "$with_system_boost" = "yes"; then
SYSTEM_BOOST=TRUE
AX_BOOST_BASE(1.47)
AX_BOOST_DATE_TIME
+ AX_BOOST_FILESYSTEM
AX_BOOST_IOSTREAMS
mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'`
libo_MINGW_TRY_DLL([$mingw_boost_date_time_dll])
diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
new file mode 100644
index 0000000..f162163
--- /dev/null
+++ b/m4/ax_boost_filesystem.m4
@@ -0,0 +1,118 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_boost_filesystem.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_BOOST_FILESYSTEM
+#
+# DESCRIPTION
+#
+# Test for Filesystem library from the Boost C++ libraries. The macro
+# requires a preceding call to AX_BOOST_BASE. Further documentation is
+# available at <http://randspringer.de/boost/index.html>.
+#
+# This macro calls:
+#
+# AC_SUBST(BOOST_FILESYSTEM_LIB)
+#
+# And sets:
+#
+# HAVE_BOOST_FILESYSTEM
+#
+# LICENSE
+#
+# Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
+# Copyright (c) 2009 Michael Tindal
+# Copyright (c) 2009 Roman Rybalko <libtorrent@romanr.info>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 26
+
+AC_DEFUN([AX_BOOST_FILESYSTEM],
+[
+ AC_ARG_WITH([boost-filesystem],
+ AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],
+ [use the Filesystem library from boost - it is possible to specify a certain library for the linker
+ e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]),
+ [
+ if test "$withval" = "no"; then
+ want_boost="no"
+ elif test "$withval" = "yes"; then
+ want_boost="yes"
+ ax_boost_user_filesystem_lib=""
+ else
+ want_boost="yes"
+ ax_boost_user_filesystem_lib="$withval"
+ fi
+ ],
+ [want_boost="yes"]
+ )
+
+ if test "x$want_boost" = "xyes"; then
+ AC_REQUIRE([AC_PROG_CC])
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
+
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
+
+ LIBS_SAVED=$LIBS
+ LIBS="$LIBS $BOOST_SYSTEM_LIB"
+ export LIBS
+
+ AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
+ ax_cv_boost_filesystem,
+ [AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
+ [[using namespace boost::filesystem;
+ path my_path( "foo/bar/data.txt" );
+ return 0;]])],
+ ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
+ AC_LANG_POP([C++])
+ ])
+ if test "x$ax_cv_boost_filesystem" = "xyes"; then
+ AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
+ BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+ if test "x$ax_boost_user_filesystem_lib" = "x"; then
+ for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
+ ax_lib=${libextension}
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+ [link_filesystem="no"])
+ done
+ if test "x$link_filesystem" != "xyes"; then
+ for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
+ ax_lib=${libextension}
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+ [link_filesystem="no"])
+ done
+ fi
+ else
+ for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+ [link_filesystem="no"])
+ done
+
+ fi
+ if test "x$ax_lib" = "x"; then
+ AC_MSG_ERROR(Could not find a version of the library!)
+ fi
+ if test "x$link_filesystem" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
+
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ LIBS="$LIBS_SAVED"
+ fi
+])
--
cgit v0.10.2

25
0003-boost-filesystem2.patch
View File

@ -1,25 +0,0 @@
From b4339fa7eee12f173b2273aed5dc6b8abae528f4 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 8 Mar 2016 06:08:36 +0100
Subject: define boost_filestystem external for system boost too
Change-Id: Ie9bfc6a5f3e1862acbd1bb08c6f2bb0b63f2587e
Index: libreoffice-5.1.1.3/RepositoryExternal.mk
===================================================================
--- libreoffice-5.1.1.3.orig/RepositoryExternal.mk
+++ libreoffice-5.1.1.3/RepositoryExternal.mk
@@ -676,6 +676,13 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
+define gb_LinkTarget__use_boost_filesystem
+$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_FILESYSTEM_LIB))
+
+endef
+
+gb_ExternalProject__use_boost_filesystem :=
+
define gb_LinkTarget__use_boost_iostreams
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \

3
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
size 96939

3
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163
size 1129140

3
17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db27e1a6092b8ea00b5f8eec2a3ea500756fbb769c1023a1afc3386c5918d1b8
size 154437

3
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
size 1652670

3
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
size 769268

BIN
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

3
2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b
size 262206

3
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd
size 1624112

3
3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
size 1180582

3
3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4
size 925313

3
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
size 153157

3
3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
size 5750610

3
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
size 2241498

3
4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef
size 1788163

3
5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6
size 738119

BIN
5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

3
625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2445238cd0eb167e99a1147394f61325490559f3df7e7e8f628043fb70cbf2f4
size 522654

3
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
size 506106

3
8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
size 762419

3
97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
size 2938721

3
Firebird-2.5.4.26856-0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3
size 13744859

6
_constraints
View File

@ -9,7 +9,7 @@
<size unit="M">2000</size> <size unit="M">2000</size>
</physicalmemory> </physicalmemory>
<disk> <disk>
<size unit="G">40</size> <size unit="G">30</size>
</disk> </disk>
</hardware> </hardware>
</overwrite> </overwrite>
@ -22,10 +22,10 @@
</conditions> </conditions>
<hardware> <hardware>
<physicalmemory> <physicalmemory>
<size unit="M">4000</size> <size unit="M">6000</size>
</physicalmemory> </physicalmemory>
<disk> <disk>
<size unit="G">40</size> <size unit="G">30</size>
</disk> </disk>
</hardware> </hardware>
</overwrite> </overwrite>

3
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
size 1923436

3
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa
size 672452

3
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
size 2929311

3
b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd
size 1469921

3
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
size 743031

3
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
size 5290295

155
bnc856729.patch
View File

@ -1,155 +0,0 @@
From a5928a57a53df84cacd2975e227f9e03d50456a6 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 15 Apr 2016 15:46:06 +0200
Subject: [PATCH] tdf#99315 VclPixelProcessor2D: fix double border line width
Regression from commit 2c91cb08d65cd35fa8ef6eaca3677aa82fb58cbe (better
drawing support for borders of different width, fdo#33634, 2012-04-04),
the problem is that previously the width of inner/outer double border
lines got rounded to integer values quite early, but after the commit
they are kept at a double precision for much longer, which needs pixel
correction in VclPixelProcessor2D.
Example: if the border with is 1.47, and the line gets moved by 0.2
pixels, then the inner and outer edge of the line will be 0.2 and 1.67,
which gets rounded to 0 -> 2 in the pixel processor. Previously the
input was rounded to 1, so moving by 0.2 resulted in 0.2 -> 1.2, which
got rounded to 0 -> 1. The result is that sometimes the line width is 1
pixel wider than expected.
Fix the problem by allowing VclPixelProcessor2D to request pixel
correction from BorderLinePrimitive2D. It wouldn't be possible to do
pixel correction only in VclPixelProcessor2D, as it has no idea what to
correct: it only gets polygons, so it has no idea if e.g. the top of a
polygon is the outer edge of a top border line or an inner edge of a
bottom border line.
Conflicts:
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
(cherry picked from commits 1ee570a4e625719f8bf270d372926c0d829ae6f0,
555c9add26e06030402c73f885de98f4b96826f0,
304f50684d3ac08e973fd27e6acf3e821394d164,
422f10c5d7ebe6f4b778636c9c1eb6dbdf708a27,
ce12a5021a080cc1781e0e0256af5e0085e11ef2 and
cac70559013e575009657aa3c5168b88b1f14691)
Change-Id: I1971f3a952fbcdc598ab46c659e12d976c13cbe6
Reviewed-on: https://gerrit.libreoffice.org/24238
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
drawinglayer/CppunitTest_drawinglayer_border.mk | 52 +++++++
drawinglayer/Module_drawinglayer.mk | 4 +
drawinglayer/qa/unit/border.cxx | 150 +++++++++++++++++++++
.../source/primitive2d/borderlineprimitive2d.cxx | 28 +++-
.../source/processor2d/vclpixelprocessor2d.cxx | 7 +-
.../primitive2d/borderlineprimitive2d.hxx | 2 +
6 files changed, 239 insertions(+), 4 deletions(-)
create mode 100644 drawinglayer/CppunitTest_drawinglayer_border.mk
create mode 100644 drawinglayer/qa/unit/border.cxx
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 30e656d..30e7dcb 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -28,6 +28,17 @@
#include <numeric>
#include <algorithm>
+#if defined(ANDROID)
+namespace std
+{
+template<typename T>
+T round(T x)
+{
+ return ::round(x);
+}
+}
+#endif
+
namespace drawinglayer {
namespace {
@@ -63,7 +74,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
const basegfx::B2DVector& rVector, const basegfx::BColor& rColor, double fLineWidth, double fGap)
{
const basegfx::B2DVector aPerpendicular = basegfx::getPerpendicular(rVector);
- const basegfx::B2DVector aLineWidthOffset = ((fLineWidth + 1.0) * 0.5) * aPerpendicular;
+ const basegfx::B2DVector aLineWidthOffset = (fLineWidth * 0.5) * aPerpendicular;
basegfx::B2DPolygon aPolygon;
aPolygon.append(rStart + aLineWidthOffset);
@@ -163,6 +174,11 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
+ return createDecomposition(rViewInformation, false);
+ }
+
+ Primitive2DSequence BorderLinePrimitive2D::createDecomposition(const geometry::ViewInformation2D& rViewInformation, bool bPixelCorrection) const
+ {
Primitive2DSequence xRetval;
if(!getStart().equal(getEnd()) && ( isInsideUsed() || isOutsideUsed() ) )
@@ -199,8 +215,11 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
xRetval[0] = makeHairLinePrimitive(
getStart(), getEnd(), aVector, getRGBColorLeft(), 0.0);
else
+ {
+ double fWidth = bPixelCorrection ? std::round(fLeftWidth) : fLeftWidth;
xRetval[0] = makeSolidLinePrimitive(
- aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorLeft(), fLeftWidth, -fLeftWidth/2.0);
+ aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorLeft(), fWidth, -fLeftWidth/2.0);
+ }
// "outside" line
@@ -208,8 +227,11 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
xRetval[1] = makeHairLinePrimitive(
getStart(), getEnd(), aVector, getRGBColorRight(), fLeftWidth+mfDistance);
else
+ {
+ double fWidth = bPixelCorrection ? std::round(fRightWidth) : fRightWidth;
xRetval[1] = makeSolidLinePrimitive(
- aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorRight(), fRightWidth, mfDistance+fRightWidth/2.0);
+ aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorRight(), fWidth, mfDistance+fRightWidth/2.0);
+ }
}
else
{
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 8dcd74e..8398573 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -1232,7 +1232,12 @@ namespace drawinglayer
static_cast<const drawinglayer::primitive2d::BorderLinePrimitive2D&>(rCandidate);
if (!tryDrawBorderLinePrimitive2DDirect(rBorder))
- process(rCandidate.get2DDecomposition(getViewInformation2D()));
+ {
+ if (rBorder.getStyle() == table::BorderLineStyle::DOUBLE)
+ process(rBorder.createDecomposition(getViewInformation2D(), true));
+ else
+ process(rCandidate.get2DDecomposition(getViewInformation2D()));
+ }
mpOutputDevice->SetAntialiasing(nAntiAliasing);
break;
diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 72e04d5..f152f2d 100644
--- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -132,6 +132,8 @@ namespace drawinglayer
bool hasGapColor( ) const { return mbHasGapColor; }
short getStyle () const { return mnStyle; }
double getPatternScale() const { return mfPatternScale; }
+ /// Same as create2DDecomposition(), but can do pixel correction if requested.
+ Primitive2DSequence createDecomposition(const geometry::ViewInformation2D& rViewInformation, bool bPixelCorrection) const;
/// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
--
2.6.6

3
boost_1_59_0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
size 70389425

3
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
size 16113737

3
c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816
size 25721871

3
ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305
size 1769329

BIN
commons-logging-1.2-src.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

3
d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
size 16525605

3
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
size 207563

3
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772
size 1396007

3
ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513
size 1982036

3
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
size 427800

3
f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
size 211919

3
harfbuzz-0.9.40.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f
size 1182989

3
language-subtag-registry-2016-02-10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e3a74b39e999bc9ff9fb0dd6fa6a64a0ed6bf7f0775ff3756e7c9e8db45a353
size 73266

3
lcms2-2.6.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1
size 4583389

3
libabw-0.1.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199
size 369311

3
libcdr-0.1.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e
size 696296

3
libe-book-0.1.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850
size 465922

3
libetonyek-0.1.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78
size 1696455

3
libfreehand-0.1.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877
size 597212

3
libmspub-0.1.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a
size 429360

3
libmwaw-0.3.7.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427
size 1390872

3
libodfgen-0.1.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
size 446705

3
liborcus-0.11.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7af7b9993801dd0b1ccdf734f51c1617975f92bcb9396c4de49ed88444e5b357
size 2032540

3
libpagemaker-0.0.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43be46721affcb5a967406c09acfc36c79d2d968917fe36a21cc004230a01e0f
size 358918

3
libreoffice-5.1.3.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:079898348a8a3402d973d2ac990086530b8bbf8b0c5fa0573c8f377563fd6e16
size 176074904

3
libreoffice-5.2.0.0.beta2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f79cb34c346bf38f4d02e2a97279f78acc2207ca9f1e04de8462c0ad251351f3
size 183373624

3
libreoffice-desktop-icons-256x256.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e9c32ff72b71b953f971d3f1b518ab2560dfa57aa93388d420dae0c9b381ace
size 283612

3
libreoffice-help-5.1.3.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:568cb8371bf0f76186c3f7910f431d84605306e074ad58cadff1200f8c0f4ac7
size 1904828

3
libreoffice-help-5.2.0.0.beta2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0e189fbe9a8742c26701dbd9358d08616b6b043a0bf578dadbb606ab5d32338
size 1934864

8
libreoffice-hotfix-disablebrokenshapetest.patch
View File

@ -1,7 +1,7 @@
Index: libreoffice-5.1.2.2/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx Index: libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
=================================================================== ===================================================================
--- libreoffice-5.1.2.2.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx --- libreoffice-5.2.0.0.alpha1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ libreoffice-5.1.2.2/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -1103,29 +1103,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " @@ -1103,29 +1103,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "
assertXPath(pXmlDoc, "//w:ind", "start", "1418"); assertXPath(pXmlDoc, "//w:ind", "start", "1418");
} }
@ -17,7 +17,7 @@ Index: libreoffice-5.1.2.2/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
- // check rotation angle - // check rotation angle
- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); - assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
- // check the first few coordinates of the polygon - // check the first few coordinates of the polygon
-#ifndef MACOSX /* Retina-reatled rounding rountrip error -#ifndef MACOSX /* Retina-related rounding rountrip error
- * hard to smooth out due to the use of string compare - * hard to smooth out due to the use of string compare
- * instead of number */ - * instead of number */
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); - assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");

3
libreoffice-translations-5.1.3.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:669ac36799ffdc8332588bd44f00059d0f31de1ade4632ceb1209330f581ddf6
size 131716304

3
libreoffice-translations-5.2.0.0.beta2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0839d7df2c786f791eba7fcd7cb9ef18139de1e8d5a7aeb820705e7ce66b6dc7
size 131364908

62
libreoffice.changes
View File

@ -1,3 +1,65 @@
-------------------------------------------------------------------
Fri Jun 10 12:00:58 UTC 2016 - tchvatal@suse.com
- Version update to 5.2.0.0.beta2:
* More bugfixes on road to 5.2 series
* missing-include.patch
-------------------------------------------------------------------
Thu Jun 2 12:07:43 UTC 2016 - tchvatal@suse.com
- Add patch to fix build missing-include.patch
-------------------------------------------------------------------
Thu Jun 2 08:53:49 UTC 2016 - tchvatal@suse.com
- Version update to 5.2.0.0.beta1:
* Disable support for sle11, not needed anymore
* Cleanup the specfile from all the compat conditionals per above
* Disable bundled help and point to upstream wiki always (speeds
up build quite a bit)
* Use pkgconfig style dependencies instead of the develpkgs
* Remove all the bundled tarballs that were aedded for sle11
* Adjust the constraints a bit to reflect reality
* Remove merged patches:
* scp2-user-config-suse.diff
* 0001-Make-HAVE_JAVA6-be-always-false.patch
* 0001-mdds-1.0.patch
* 0001-liborcus-0.11.patch
* 0002-boost-filesystem1.patch
* 0003-boost-filesystem2.patch
* bnc856729.patch
* bnc939998.patch
* bnc945443.patch
* bnc945445.patch
* Refresh patches:
* libreoffice-hotfix-disablebrokenshapetest.patch
* system-pyuno.diff
-------------------------------------------------------------------
Mon May 9 20:39:22 UTC 2016 - andras.timar@collabora.com
- fix bnc#939998 - LO-L3: PPT file shows wrong titles
* bnc939998.patch
- fix bnc#945443 - LO-L3: Undo ignores vertical alignment
* bnc945443.patch
- fix bnc#945445 - LO-L3: Undo does not revert changes of table separation lines
* bnc945445.patch
-------------------------------------------------------------------
Fri May 6 13:36:10 UTC 2016 - tchvatal@suse.com
- Version update to 5.1.3.2: few small tweaks for the .3.1 release
* fate#320521
- Refresh patches:
* 0001-liborcus-0.11.patch
-------------------------------------------------------------------
Wed May 4 12:07:44 UTC 2016 - tchvatal@suse.com
- Split out gtk3 again but this time install it on openSUSE and
avoid it on SLE12
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 26 09:46:38 UTC 2016 - andras.timar@collabora.com Tue Apr 26 09:46:38 UTC 2016 - andras.timar@collabora.com

722
libreoffice.spec
View File

File diff suppressed because it is too large Load Diff

3
librevenge-0.0.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf
size 529833

3
libvisio-0.1.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e
size 602628

3
libwpd-0.10.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d
size 656856

3
libwpg-0.3.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59
size 397128

3
libwps-0.4.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587
size 708847

3
make-4.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5
size 1327342

3
mdds_0.12.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d
size 153265

34
scp2-user-config-suse.diff
View File

@ -1,34 +0,0 @@
---
officecfg/registry/data/org/openoffice/Setup.xcu | 2 +-
scp2/source/ooo/common_brand.scp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git officecfg/registry/data/org/openoffice/Setup.xcu officecfg/registry/data/org/openoffice/Setup.xcu
index 8e18ca5..7c0b95d 100644
--- officecfg/registry/data/org/openoffice/Setup.xcu
+++ officecfg/registry/data/org/openoffice/Setup.xcu
@@ -788,7 +788,7 @@
<value>10</value>
</prop>
<prop oor:name="VersionIdentifiers">
- <value oor:separator=",">Libreoffice 3=libreoffice/3,Openofice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
+ <value oor:separator=",">Libreoffice 3=libreoffice/3-suse,Openofice.org 3=ooo3,OpenOffice.org 2=ooo-2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
</prop>
<node oor:name="MigrationSteps">
<node oor:name="Datasources" oor:op="replace">
diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
index 7bbf873..0b235a0 100644
--- scp2/source/ooo/common_brand.scp
+++ scp2/source/ooo/common_brand.scp
@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
#elif defined MACOSX
Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
#else
- Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+ Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION-suse";
#endif
End
--
1.7.0.1

11
sofficerc-upstream
View File

@ -1,11 +0,0 @@
[Bootstrap]
HideEula=1
Logo=1
NativeProgress=false
ProgressBarColor=0,0,0
ProgressFrameColor=102,102,102
ProgressPosition=35,153
ProgressSize=444,8
ProgressTextBaseline=145
ProgressTextColor=255,255,255
URE_BOOTSTRAP=${ORIGIN}/fundamentalrc

27
system-pyuno.diff
View File

@ -1,7 +1,8 @@
diff -urN libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh Index: libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh
--- libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh 2012-12-19 19:09:46.518989541 +0100 ===================================================================
+++ libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh 2012-12-19 19:10:21.810986269 +0100 --- libreoffice-5.2.0.0.alpha1.orig/desktop/scripts/soffice.sh
@@ -120,6 +120,9 @@ +++ libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh
@@ -137,6 +137,9 @@ if echo "$checks" | grep -q "cc" ; then
exit 1; exit 1;
fi fi
@ -9,11 +10,12 @@ diff -urN libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh libreoffice-4
+export PYTHONPATH +export PYTHONPATH
+ +
case "`uname -s`" in case "`uname -s`" in
NetBSD|OpenBSD|FreeBSD|DragonFly) NetBSD|OpenBSD|DragonFly)
# this is a temporary hack until we can live with the default search paths # this is a temporary hack until we can live with the default search paths
diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py Index: libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py
--- libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py 2012-12-19 19:09:49.483989266 +0100 ===================================================================
+++ libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py 2012-12-19 19:10:21.810986269 +0100 --- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/module/uno.py
+++ libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py
@@ -16,8 +16,12 @@ @@ -16,8 +16,12 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
@ -27,10 +29,11 @@ diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py libreoffice-4
import pyuno import pyuno
try: try:
diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py Index: libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py
--- libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py 2012-12-19 19:09:46.868989508 +0100 ===================================================================
+++ libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py 2012-12-19 19:10:21.810986269 +0100 --- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/officehelper.py
@@ -44,7 +44,7 @@ +++ libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py
@@ -44,7 +44,7 @@ def bootstrap():
if "UNO_PATH" in os.environ: if "UNO_PATH" in os.environ:
sOffice = os.environ["UNO_PATH"] sOffice = os.environ["UNO_PATH"]
else: else: