haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibreOffice: bump version

Browse Source
This commit is contained in:
Sergei Reznikov
2018-05-16 18:22:32 +03:00
parent 01a0388a96
commit 397f01cd85
2 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
app-office/libreoffice/libreoffice-5.3.1.2.recipe → app-office/libreoffice/libreoffice-6.0.4.2~git.recipe
View File

@@ -1,19 +1,21 @@
SUMMARY="A full office productivity suite"
DESCRIPTION="LibreOffice is a powerful office suite – its clean interface and \
feature-rich tools help you unleash your creativity and enhance your \
productivity.
productivity.
LibreOffice includes several applications that make it the most powerful Free \
and Open Source office suite on the market."
HOMEPAGE="http://www.libreoffice.org/"
COPYRIGHT="??? ???"
LICENSE="GNU LGPL v3"
REVISION="1"
SOURCE_URI="https://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-$portVersion.tar.xz"
CHECKSUM_SHA256="5746cd7ccaf64e51eb0fc07128e75cf145a32b318d572aba18855f14c10754ff"
#PATCHES="libreoffice-$portVersion.patchset"
COMMIT="f93a07b5215f68f7c54a7012c2c4c2e2de0c2012"
SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz"
CHECKSUM_SHA256="3988d3595ff8e19314a1fb8545bcadcda0cf62e8ccf78f08f35d016328f9b26e"
SOURCE_DIR="core-$COMMIT"
PATCHES="libreoffice-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
SECONDARY_ARCHITECTURES="!x86"
ARCHITECTURES="!x86_gcc2 ?x86_64"
SECONDARY_ARCHITECTURES="?x86"
PROVIDES="
libreoffice$secondaryArchSuffix = $portVersion
@@ -31,16 +33,15 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
glm${secondaryArchSuffix}_devel
#devel:libboost_date_time$secondaryArchSuffix
#devel:libboost_filesystem$secondaryArchSuffix
#devel:libboost_iostreams$secondaryArchSuffix
#devel:libboost_system$secondaryArchSuffix
devel:libabw_0.1$secondaryArchSuffix
devel:libcdr_0.1$secondaryArchSuffix
devel:libcmis_0.5$secondaryArchSuffix
devel:libcppunit$secondaryArchSuffix
devel:libcurl$secondaryArchSuffix
devel:libclucene_contribs_lib$secondaryArchSuffix
devel:libclucene_core$secondaryArchSuffix
devel:libepubgen_0.0$secondaryArchSuffix
devel:libepoxy$secondaryArchSuffix
devel:libetonyek_0.1$secondaryArchSuffix
devel:libexpat$secondaryArchSuffix
devel:libe_book_0.1$secondaryArchSuffix
@@ -56,15 +57,17 @@ BUILD_REQUIRES="
devel:liblcms2$secondaryArchSuffix
devel:libldap$secondaryArchSuffix
devel:liblpsolve55$secondaryArchSuffix
devel:mdds$secondaryArchSuffix >= 1.2
devel:libmspub_0.1$secondaryArchSuffix
devel:libmwaw_0.3$secondaryArchSuffix
devel:libneon$secondaryArchSuffix
devel:libnss3$secondaryArchSuffix
devel:libodfgen_0.1$secondaryArchSuffix
devel:liborcus_0.12$secondaryArchSuffix
devel:liborcus_0.13$secondaryArchSuffix
devel:libpagemaker_0.0$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix
devel:libqxp_0.0$secondaryArchSuffix
devel:libraptor2$secondaryArchSuffix
devel:librdf$secondaryArchSuffix
devel:librevenge_0.0$secondaryArchSuffix
devel:libsane$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
@@ -76,6 +79,7 @@ BUILD_REQUIRES="
devel:libxslt$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libzmf_0.0$secondaryArchSuffix
devel:mdds$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
@@ -100,55 +104,8 @@ BUILD_PREREQUIRES="
"
BUILD()
{
./autogen.sh \
--with-vendor="HaikuPorts" \
--enable-release-build \
--prefix=$prefix --exec-prefix=$prefix \
--libdir=$libDir \
--with-java=no \
--enable-openssl \
--enable-orcus \
--enable-python=system \
--disable-avahi \
--disable-dbus \
--disable-gstreamer-0-10 \
--disable-telepathy \
--disable-dconf \
--with-system-libcdr \
--with-system-mdds \
--with-system-libvisio \
--without-system-libcmis \
--with-system-libmspub \
--without-system-libexttextcat \
--with-system-orcus \
--with-system-liblangtag \
--with-system-libodfgen \
--with-system-libmwaw \
--with-system-libetonyek \
--without-system-firebird \
--without-system-postgresql \
--without-system-odbc \
--with-system-libfreehand \
--with-system-libebook \
--with-system-libabw \
--without-system-coinmp \
--without-system-libgltf \
--with-system-libwpg \
--with-system-libwps \
--without-system-redland \
--with-system-libstaroffice \
--with-system-serf \
--without-system-boost\
--with-system-icu \
--with-system-cairo \
--with-system-libs \
--without-system-mythes \
--with-system-headers \
--with-alloc=system \
--with-system-clucene \
--disable-dependency-tracking \
--enable-fetch-external
make $jobArgs build
./autogen.sh --with-distro=LibreOfficeHaiku --enable-qt5
make $jobArgs build -k
}
INSTALL()

96
app-office/libreoffice/patches/libreoffice-6.0.4.2~git.patchset Normal file
View File

@@ -0,0 +1,96 @@
From 99614e0a782a15749bdc3781d5319309c8d48b46 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sat, 5 May 2018 15:31:52 +0200
Subject: [PATCH] Allow building Qt5 backend on Haiku
Change-Id: I7e928e9e29076bdfaaeffb83791bdc35f1952055
Reviewed-on: https://gerrit.libreoffice.org/53892
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
---
Repository.mk | 6 ++++++
configure.ac | 1 +
vcl/Library_vcl.mk | 6 ++++++
vcl/Library_vclplug_qt5.mk | 2 +-
vcl/Module_vcl.mk | 9 +++++++++
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/Repository.mk b/Repository.mk
index fa62def2fc91..4cd3f1036637 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -311,6 +311,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,kde, \
))
endif
+ifeq ($(OS),HAIKU)
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,haiku, \
+ $(if $(ENABLE_QT5),vclplug_qt5) \
+))
+endif
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
sm \
smd \
diff --git a/configure.ac b/configure.ac
index 98b316858245..cb9ac08c1c47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4626,6 +4626,7 @@ fi
if test "$OS" = "HAIKU"; then
enable_cairo_canvas=yes
+ test_qt5=yes
fi
dnl ===================================================================
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 2669db6003eb..b69fbfdd96f9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -670,6 +670,12 @@ $(eval $(call gb_Library_add_libs,vcl,\
-lbe \
))
+ifeq ($(ENABLE_QT5),TRUE)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/unx/generic/plugadapt/salplug \
+))
+endif
+
$(eval $(call gb_Library_use_externals,vcl,\
cairo \
fontconfig \
diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 68758028d662..2a12414401dc 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_add_defs,vclplug_qt5,\
$(eval $(call gb_Library_use_sdk_api,vclplug_qt5))
$(eval $(call gb_Library_use_libraries,vclplug_qt5,\
- vclplug_gen \
+ $(if $(USING_X11),vclplug_gen) \
vcl \
tl \
utl \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 1082754f607b..3005538a966c 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -115,6 +115,15 @@ $(eval $(call gb_Module_add_targets,vcl,\
))
endif
+ifeq ($(OS),HAIKU)
+ifneq ($(ENABLE_QT5),)
+$(eval $(call gb_Module_add_targets,vcl,\
+ CustomTarget_qt5_moc \
+ Library_vclplug_qt5 \
+))
+endif
+endif
+
ifneq ($(ENABLE_FUZZERS),)
$(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_nativecore \