mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
extra/libreoffice-fresh to 5.2.0-1
This commit is contained in:
Kevin Mihelich
parent
acf5de3a97
commit
23f05ffd71
4 changed files with 49 additions and 180 deletions
|
|
@ -17,8 +17,8 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
|
|||
|
||||
pkgbase=libreoffice-fresh
|
||||
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
|
||||
_LOver=5.1.4.2
|
||||
pkgver=5.1.4
|
||||
_LOver=5.2.0.4
|
||||
pkgver=5.2.0
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
license=('LGPL3')
|
||||
|
|
@ -30,8 +30,8 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' 'lib
|
|||
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
|
||||
'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
|
||||
'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
|
||||
'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
|
||||
'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs'
|
||||
'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell2' 'clucene' #'vigra'
|
||||
'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl'
|
||||
'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew'
|
||||
'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
|
||||
'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liborcus' 'liblangtag'
|
||||
|
|
@ -42,15 +42,12 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
|
|||
_additional_source_url="http://dev-www.libreoffice.org/src"
|
||||
_additional_source_url2="http://dev-www.libreoffice.org/extern"
|
||||
source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
|
||||
${_additional_source_url}/boost_1_59_0.tar.bz2
|
||||
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
||||
${_additional_source_url}/boost_1_60_0.tar.bz2
|
||||
${_additional_source_url}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
|
||||
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
${_additional_source_url}/commons-logging-1.2-src.tar.gz
|
||||
${_additional_source_url}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
|
||||
${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
|
||||
${_additional_source_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
|
||||
${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
|
||||
${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
|
||||
${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
|
||||
|
|
@ -74,17 +71,13 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
|
|||
libreoffice-fresh.sh libreoffice-fresh.csh
|
||||
update_liborcus_to_0.11.0.diff
|
||||
remove_unnecessary_orcus_external_usage_from_makefiles.diff
|
||||
liborcus-0.11.2.diff
|
||||
gcc6_buildfix.diff)
|
||||
noextract=(boost_1_59_0.tar.bz2
|
||||
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
||||
buildfix.diff)
|
||||
noextract=(boost_1_60_0.tar.bz2
|
||||
ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
|
||||
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
commons-logging-1.2-src.tar.gz
|
||||
8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
|
||||
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
|
||||
048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
|
||||
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
|
||||
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
|
||||
3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
|
||||
|
|
@ -105,21 +98,18 @@ noextract=(boost_1_59_0.tar.bz2
|
|||
libfreehand-0.1.1.tar.bz2
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll)
|
||||
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
|
||||
md5sums=('cbeb42aecb280824045b4b43a2666923'
|
||||
md5sums=('40ee24812d171238981599843ca9f5b6'
|
||||
'SKIP'
|
||||
'bdc0d7339445abee73af326d9409b4b9'
|
||||
'c3f98b287d1464b4b7b410833a2d79a9'
|
||||
'SKIP'
|
||||
'c71242e41debd8d57c5ae8b74a26d005'
|
||||
'584877f514a723403c0344cc84a0bc59'
|
||||
'SKIP'
|
||||
'6aa9a5c6a4ca1016edd0ed1178e3cb87'
|
||||
'1f24ab1d39f4a51faf22244c94a6203f'
|
||||
'65a840e1a0b13a558ff19eeb2c4f0cbe'
|
||||
'ce12af00283eb90d9281956524250d6e'
|
||||
'35c94d2df8893241173de1d16b6034c0'
|
||||
'798b2ffdc8bcfe7bca2cf92b62caf685'
|
||||
'a7983f859eafb2677d7ff386a023bc40'
|
||||
'ce977548f1cbf46918e93cd38ac35163'
|
||||
'8ab049135b2d15313da5d9f0656894a1'
|
||||
'2c9b0f83ed5890af02c0df1c1776f39b'
|
||||
'048751f3271906db5126ab76870444c4'
|
||||
'eeb2c7ddf0d302fba4bfc6e97eac9624'
|
||||
'39bb3fcea1514f1369fcfc87542390fd'
|
||||
'3404ab6b1792ae5f16bbd603bd1e1d03'
|
||||
|
|
@ -144,8 +134,7 @@ md5sums=('cbeb42aecb280824045b4b43a2666923'
|
|||
'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
|
||||
'3f526b966a672d1237cfcbadae0e3f95'
|
||||
'ac71e21ecc0976b2ea6e233854963d4b'
|
||||
'58616b84405f0a610a713bbd060d3214'
|
||||
'6752d22fc5bcbdbef0640c6aca163e50')
|
||||
'd386f3a0b484cd3929329a294159f5bc')
|
||||
|
||||
prepare() {
|
||||
|
||||
|
|
@ -157,6 +146,9 @@ prepare() {
|
|||
ln -s ${srcdir}/$source .
|
||||
done
|
||||
popd
|
||||
|
||||
# https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-5-2&id=e13db0f16c4ac5a243587e881d7b18979d07f478
|
||||
patch -Np1 -i ../buildfix.diff
|
||||
|
||||
# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
|
||||
# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
|
|
@ -176,23 +168,10 @@ prepare() {
|
|||
|
||||
|
||||
# i686 build broken
|
||||
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlimport/d' sw/Module_sw.mk
|
||||
# [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlimport/d' sw/Module_sw.mk
|
||||
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlexport7/d' sw/Module_sw.mk
|
||||
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_basic_scanner/d' basic/Module_basic.mk
|
||||
# [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_basic_scanner/d' basic/Module_basic.mk
|
||||
|
||||
# qt4 fix
|
||||
sed -i "s:qmake:qmake-qt4:g" configure.ac
|
||||
|
||||
# https://cgit.freedesktop.org/libreoffice/core/commit/?id=b325b4c286b56a63316063a3ac4648bf7b7efcbe
|
||||
patch -Np1 -i ${srcdir}/update_liborcus_to_0.11.0.diff
|
||||
# https://cgit.freedesktop.org/libreoffice/core/commit/?id=07d4c443e21cd22545d4516515c50b1c8dd39a9b
|
||||
patch -Np1 -i ${srcdir}/remove_unnecessary_orcus_external_usage_from_makefiles.diff
|
||||
# https://cgit.freedesktop.org/libreoffice/core/commit/?id=db729f3b685fd832a3ec7387b339cf2bbeb4bd4d
|
||||
patch -Np1 -i ${srcdir}/liborcus-0.11.2.diff
|
||||
|
||||
# fix checking whether KDE is >= 4.2... configure: error: KDE version too old
|
||||
# http://bugs.debian.org/823145
|
||||
patch -Np1 -i ${srcdir}/gcc6_buildfix.diff
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -201,7 +180,8 @@ build() {
|
|||
# strip -s from Makeflags in case you use it to shorten build logs
|
||||
_MAKEFLAGS=${MAKEFLAGS/-s/}
|
||||
|
||||
./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
|
||||
./autogen.sh --with-build-version="${pkgver}-${pkgrel}" \
|
||||
--with-vendor="Arch Linux" \
|
||||
--enable-split-app-modules \
|
||||
--with-parallelism=${_MAKEFLAGS/-j/} \
|
||||
--with-external-tar="${srcdir}/ext_sources" \
|
||||
|
|
@ -264,7 +244,6 @@ build() {
|
|||
--with-system-libwps \
|
||||
--with-system-redland\
|
||||
--with-system-serf \
|
||||
--without-system-npapi-headers \
|
||||
--with-jdk-home="/usr/lib/jvm/default" \
|
||||
--with-ant-home="/usr/share/apache-ant"\
|
||||
--without-system-boost\
|
||||
|
|
@ -336,7 +315,6 @@ package_libreoffice-fresh() {
|
|||
'pstoedit: translates PostScript and PDF graphics into other vector formats'
|
||||
'libmythes: for use in thesaurus'
|
||||
'beanshell2: interactive java -- good for prototyping/macros'
|
||||
'vigra: C++ computer vision library, usable in Basebmp'
|
||||
'libmspack: library for Microsoft compression formats for use in FontOOo'
|
||||
'libwpg: library for importing and converting WordPerfect Graphics format'
|
||||
'sane: for scanner access'
|
||||
|
|
@ -374,12 +352,6 @@ package_libreoffice-fresh() {
|
|||
install -dm755 ${pkgdir}/etc/profile.d
|
||||
install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/
|
||||
|
||||
# move bash-completion files to its new place
|
||||
install -dm755 ${pkgdir}/usr/share/bash-completion/completions
|
||||
mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh \
|
||||
${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh # fails
|
||||
rm -rf ${pkgdir}/etc/bash_completion.d
|
||||
|
||||
# make pyuno find its modules
|
||||
install -dm755 ${pkgdir}/usr/lib/python3.5/site-packages
|
||||
ln -svf /usr/lib/libreoffice/program/uno.py \
|
||||
|
|
|
|||
27
extra/libreoffice-fresh/buildfix.diff
Normal file
27
extra/libreoffice-fresh/buildfix.diff
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
From e13db0f16c4ac5a243587e881d7b18979d07f478 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Mon, 25 Jul 2016 12:08:35 +0100
|
||||
Subject: curl 7.50.0 has CURL as typedef struct Curl_easy
|
||||
|
||||
Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
|
||||
(cherry picked from commit 0b8e589875ffd84150470832de18ebd79989efc0)
|
||||
Reviewed-on: https://gerrit.libreoffice.org/27513
|
||||
Reviewed-by: David Tardon <dtardon@redhat.com>
|
||||
Tested-by: Jenkins <ci@libreoffice.org>
|
||||
|
||||
diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
|
||||
index 25bc26d..5d1cfb5 100644
|
||||
--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
|
||||
+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
|
||||
@@ -77,7 +77,7 @@ FTPLoaderThread::~FTPLoaderThread() {
|
||||
|
||||
|
||||
CURL* FTPLoaderThread::handle() {
|
||||
- CURL* ret = osl_getThreadKeyData(m_threadKey);
|
||||
+ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
|
||||
if(!ret) {
|
||||
ret = curl_easy_init();
|
||||
if (ret != nullptr) {
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- libreoffice-5.1.3.2/configure.ac 2016-05-12 21:26:13.099948527 +0200
|
||||
+++ libreoffice-5.1.3.2/configure.ac.new 2016-05-12 21:46:50.613664941 +0200
|
||||
@@ -11169,6 +11169,9 @@
|
||||
if test "x$kde_incdir" = "xno"; then
|
||||
AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
|
||||
fi
|
||||
+ # see http://bugs.debian.org/823145. -isystem /usr/include fails with
|
||||
+ # gcc6
|
||||
+ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
|
||||
|
||||
dnl Check for KDE4 libraries
|
||||
AC_MSG_CHECKING([for KDE4 libraries])
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
From db729f3b685fd832a3ec7387b339cf2bbeb4bd4d Mon Sep 17 00:00:00 2001
|
||||
From: Kohei Yoshida <kohei.yoshida@gmail.com>
|
||||
Date: Wed, 11 May 2016 21:45:56 -0400
|
||||
Subject: Update mdds to 1.2.0. Note that the API version is also up.
|
||||
|
||||
liborcus-0.11.2 is out only to make it buildable with mdds-1.2.
|
||||
|
||||
Change-Id: I9648d827b008da252c57be0ebfd2efccb008ac70
|
||||
Reviewed-on: https://gerrit.libreoffice.org/24944
|
||||
Tested-by: Jenkins <ci@libreoffice.org>
|
||||
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3f1b7f0..6dea282 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -8832,7 +8832,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.2 >= 1.2.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Check for system glm
|
||||
@@ -9148,7 +9148,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
|
||||
ENABLE_ORCUS="TRUE"
|
||||
AC_DEFINE(ENABLE_ORCUS)
|
||||
|
||||
- libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.0])
|
||||
+ libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.2])
|
||||
if test "$with_system_orcus" != "yes"; then
|
||||
if test "$SYSTEM_BOOST" = "TRUE"; then
|
||||
# ===========================================================
|
||||
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
|
||||
index 0bc5162..18edafc 100644
|
||||
--- a/sc/inc/mtvelements.hxx
|
||||
+++ b/sc/inc/mtvelements.hxx
|
||||
@@ -53,6 +53,7 @@ const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_
|
||||
/// Mapped standard element types (for convenience).
|
||||
const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric;
|
||||
const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty;
|
||||
+const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort;
|
||||
|
||||
/// Custom element blocks.
|
||||
|
||||
@@ -65,6 +66,7 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFor
|
||||
|
||||
/// Mapped standard element blocks (for convenience).
|
||||
typedef mdds::mtv::numeric_element_block numeric_block;
|
||||
+typedef mdds::mtv::ushort_element_block uint16_block;
|
||||
|
||||
/// This needs to be in the same namespace as CellTextAttr.
|
||||
MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block)
|
||||
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
|
||||
index f1ce9a5..1689809 100644
|
||||
--- a/sc/source/core/tool/scmatrix.cxx
|
||||
+++ b/sc/source/core/tool/scmatrix.cxx
|
||||
@@ -57,17 +57,15 @@ using ::std::unary_function;
|
||||
* Custom string trait struct to tell mdds::multi_type_matrix about the
|
||||
* custom string type and how to handle blocks storing them.
|
||||
*/
|
||||
-struct custom_string_trait
|
||||
+struct matrix_trait
|
||||
{
|
||||
- typedef svl::SharedString string_type;
|
||||
typedef sc::string_block string_element_block;
|
||||
-
|
||||
- static const mdds::mtv::element_t string_type_identifier = sc::element_type_string;
|
||||
+ typedef sc::uint16_block integer_element_block;
|
||||
|
||||
typedef mdds::mtv::custom_block_func1<sc::string_block> element_block_func;
|
||||
};
|
||||
|
||||
-typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType;
|
||||
+typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType;
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -2304,6 +2302,7 @@ public:
|
||||
}
|
||||
}
|
||||
break;
|
||||
+ case mdds::mtm::element_integer:
|
||||
case mdds::mtm::element_empty:
|
||||
break;
|
||||
}
|
||||
diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
|
||||
index 4044b3e..70e7439 100644
|
||||
--- a/svl/source/misc/gridprinter.cxx
|
||||
+++ b/svl/source/misc/gridprinter.cxx
|
||||
@@ -26,12 +26,10 @@ const mdds::mtv::element_t element_type_string = mdds::mtv::element_type_user_st
|
||||
// String block
|
||||
typedef mdds::mtv::default_element_block<element_type_string, OUString> string_block;
|
||||
|
||||
-struct custom_string_trait
|
||||
+struct matrix_trait
|
||||
{
|
||||
- typedef OUString string_type;
|
||||
typedef string_block string_element_block;
|
||||
-
|
||||
- static const mdds::mtv::element_t string_type_identifier = element_type_string;
|
||||
+ typedef mdds::mtv::ushort_element_block integer_element_block;
|
||||
|
||||
typedef mdds::mtv::custom_block_func1<string_block> element_block_func;
|
||||
};
|
||||
@@ -48,7 +46,7 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, svl::element_type_string, OUString()
|
||||
|
||||
namespace svl {
|
||||
|
||||
-typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType;
|
||||
+typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType;
|
||||
|
||||
struct GridPrinter::Impl
|
||||
{
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
Loading…
Reference in a new issue