diff --git a/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe b/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe index 4599ccb2e..005c6546a 100644 --- a/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe +++ b/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe @@ -17,7 +17,7 @@ and Open Source office suite on the market: HOMEPAGE="https://www.libreoffice.org/" COPYRIGHT="2000-2018 LibreOffice contributors" LICENSE="MPL v2.0" -REVISION="12" +REVISION="13" COMMIT="1c56d5fec2ddd9f68aaaf21e9dbe287db893c092" SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz" CHECKSUM_SHA256="8ead56edb57384bf6f18331566a6d52a04d97bfd9e52e139925b8f6224d84b20" @@ -58,6 +58,7 @@ REQUIRES=" lib:libetonyek_0.1$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libexslt$secondaryArchSuffix + lib:libexttextcat_2.0$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreehand_0.1$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -78,10 +79,12 @@ REQUIRES=" lib:liblpsolve55$secondaryArchSuffix lib:libmspub_0.1$secondaryArchSuffix lib:libmwaw_0.3$secondaryArchSuffix + lib:libmythes_1.2$secondaryArchSuffix lib:libneon$secondaryArchSuffix lib:libnspr4$secondaryArchSuffix lib:libnss3$secondaryArchSuffix lib:libnssutil3$secondaryArchSuffix + lib:libnumbertext_1.0$secondaryArchSuffix lib:libodfgen_0.1$secondaryArchSuffix lib:liborcus_0.13$secondaryArchSuffix lib:libpagemaker_0.0$secondaryArchSuffix @@ -113,14 +116,11 @@ REQUIRES=" lib:libwpd_0.10$secondaryArchSuffix lib:libwpg_0.3$secondaryArchSuffix lib:libwps_0.4$secondaryArchSuffix - lib:libxau$secondaryArchSuffix - lib:libxcb$secondaryArchSuffix - lib:libxdmcp$secondaryArchSuffix + lib:libxmlsec1_nss$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libxslt$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libzmf_0.0$secondaryArchSuffix - xorgproto " BUILD_REQUIRES=" @@ -143,9 +143,9 @@ BUILD_REQUIRES=" devel:libepubgen_0.1$secondaryArchSuffix devel:libetonyek_0.1$secondaryArchSuffix devel:libexpat$secondaryArchSuffix + devel:libexttextcat_2.0$secondaryArchSuffix devel:libfreehand_0.1$secondaryArchSuffix # devel:libgcrypt$secondaryArchSuffix - devel:libglew$secondaryArchSuffix devel:libgraphite2$secondaryArchSuffix devel:libharfbuzz_icu$secondaryArchSuffix devel:libhunspell_1.6$secondaryArchSuffix @@ -165,13 +165,14 @@ BUILD_REQUIRES=" devel:liblpsolve55$secondaryArchSuffix devel:libmspub_0.1$secondaryArchSuffix devel:libmwaw_0.3$secondaryArchSuffix + devel:libmythes_1.2$secondaryArchSuffix devel:libneon$secondaryArchSuffix devel:libnss3$secondaryArchSuffix + devel:libnumbertext_1.0$secondaryArchSuffix devel:libodfgen_0.1$secondaryArchSuffix devel:liborcus_0.13$secondaryArchSuffix devel:libpagemaker_0.0$secondaryArchSuffix devel:libpoppler$secondaryArchSuffix - devel:libpthread_stubs devel:libqxp_0.0$secondaryArchSuffix devel:libraptor2$secondaryArchSuffix devel:librdf$secondaryArchSuffix @@ -183,14 +184,11 @@ BUILD_REQUIRES=" devel:libwpd_0.10$secondaryArchSuffix devel:libwpg_0.3$secondaryArchSuffix devel:libwps_0.4$secondaryArchSuffix - devel:libxau$secondaryArchSuffix - devel:libxcb$secondaryArchSuffix - devel:libxdmcp$secondaryArchSuffix + devel:libxmlsec1_nss$secondaryArchSuffix devel:libxslt$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libzmf_0.0$secondaryArchSuffix devel:mdds - xorgproto " BUILD_PREREQUIRES=" cmd:aclocal @@ -214,6 +212,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config cmd:python2.7 cmd:python3.6 + cmd:ucpp cmd:which cmd:xz$commandSuffix cmd:zip @@ -243,12 +242,11 @@ BUILD() --disable-firebird-sdbc \ --disable-gio \ --disable-gstreamer-0-10 \ - --disable-lotuswordpro \ --disable-postgresql-sdbc \ --disable-randr \ --disable-sdremote \ + --disable-fetch-external \ \ - --with-galleries=no \ --with-vendor="HaikuPorts" \ --with-system-boost \ --with-boost-libdir=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir \ @@ -273,10 +271,12 @@ BUILD() --with-system-libebook \ --with-system-libepubgen \ --with-system-libetonyek \ + --with-system-libexttextcat \ --with-system-libfreehand \ --with-system-liblangtag \ --with-system-libmspub \ --with-system-libmwaw \ + --with-system-libnumbertext \ --with-system-libodfgen \ --with-system-libpagemaker \ --with-system-libpng \ @@ -291,6 +291,7 @@ BUILD() --with-system-libzmf \ --with-system-lpsolve \ --with-system-mdds \ + --with-system-mythes \ --with-system-neon \ --with-system-nss \ --with-system-openldap \ @@ -298,6 +299,8 @@ BUILD() --with-system-orcus \ --with-system-poppler \ --with-system-redland \ + --with-system-ucpp \ + --with-system-xmlsec \ --with-system-zlib \ \ --without-doxygen \ @@ -318,14 +321,6 @@ INSTALL() # make sure we do not copy default profile rm -rf ../user - # zip failback icon theme and a few more - cd $sourceDir/../core/icon-themes/colibre - zip -r $appsDir/LibreOffice/share/config/images_colibre.zip * - cd ../tango - zip -r $appsDir/LibreOffice/share/config/images_tango.zip * - cd ../elementary - zip -r $appsDir/LibreOffice/share/config/images_elementary.zip * - local APP_SIGNATURE="application/x-vnd.LibreOffice" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" diff --git a/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset b/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset index 6adafe301..4262ca29a 100644 --- a/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset +++ b/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset @@ -119,3 +119,74 @@ index 6e22ad1..7fe7bb5 100644 -- 2.16.4 + +From 8c4920ad1cec5f082a2cf63fe5c437d96643045d Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Thu, 2 Aug 2018 18:00:21 +0200 +Subject: Remove Xorg dependency + + +diff --git a/configure.ac b/configure.ac +index e19cd6c..59020c1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11226,7 +11226,9 @@ then + AC_MSG_ERROR([KF5 libraries not found. Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".]) + fi + +- PKG_CHECK_MODULES(KF5_XCB,[xcb],,[AC_MSG_ERROR([XCB not installed])]) ++ if test "$OS" != "HAIKU"; then ++ PKG_CHECK_MODULES(KF5_XCB,[xcb],,[AC_MSG_ERROR([XCB not installed])]) ++ fi + + KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT $KF5_XCB_CFLAGS" + KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network $KF5_XCB_LIBS" +diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h +index 738ae98..8c283f2 100644 +--- a/vcl/inc/svsys.h ++++ b/vcl/inc/svsys.h +@@ -28,6 +28,7 @@ + #include "ios/svsys.h" + #elif defined ANDROID + #include "android/svsys.h" ++#elif defined HAIKU + #elif defined LIBO_HEADLESS + #else + #include "unx/svsys.h" +-- +2.16.4 + + +From 7ecbe9143bdbb3fafefb7dae64d83d120f7f7994 Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Fri, 3 Aug 2018 18:34:37 +0200 +Subject: Adjust distro-pack + + +diff --git a/distro-configs/LibreOfficeHaiku.conf b/distro-configs/LibreOfficeHaiku.conf +index 426d19a..ebe103c 100644 +--- a/distro-configs/LibreOfficeHaiku.conf ++++ b/distro-configs/LibreOfficeHaiku.conf +@@ -48,19 +48,9 @@ + --with-system-libcmis + --with-system-cairo + --with-system-poppler +---with-theme=breeze sifr +---with-galleries=no +---without-helppack-integration + --without-java + --without-system-jars +---without-doxygen + --disable-sdremote + --disable-gio + --disable-randr +---disable-gstreamer-0-10 + --disable-cups +---disable-ccache +---disable-postgresql-sdbc +---disable-lotuswordpro +---disable-firebird-sdbc +---enable-python=no +-- +2.16.4 +