mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
libreoffice: bump commit
* Removed dependency on KDE libraries.
This commit is contained in:
Kacper Kasper
@@ -17,10 +17,10 @@ and Open Source office suite on the market:
|
||||
HOMEPAGE="https://www.libreoffice.org/"
|
||||
COPYRIGHT="2000-2018 LibreOffice contributors"
|
||||
LICENSE="MPL v2.0"
|
||||
REVISION="14"
|
||||
srcGitRev="1c56d5fec2ddd9f68aaaf21e9dbe287db893c092"
|
||||
REVISION="15"
|
||||
srcGitRev="c0c293089af962661cf3809d5b207149ed4619ed"
|
||||
SOURCE_URI="https://github.com/LibreOffice/core/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="8ead56edb57384bf6f18331566a6d52a04d97bfd9e52e139925b8f6224d84b20"
|
||||
CHECKSUM_SHA256="77b11f73599714c869d80e274368bc134f2df9490c21bd1d3e5bb112cafa4293"
|
||||
SOURCE_DIR="core-$srcGitRev"
|
||||
#srcGitRev_2="54cc0de67b3c948411cef3a0405c8992d80f34f3"
|
||||
#SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/$srcGitRev_2.tar.gz"
|
||||
@@ -84,25 +84,19 @@ REQUIRES="
|
||||
lib:libmspub_0.1$secondaryArchSuffix
|
||||
lib:libmwaw_0.3$secondaryArchSuffix
|
||||
lib:libmythes_1.2$secondaryArchSuffix
|
||||
lib:libmysqlclient$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:liborcus_0.14$secondaryArchSuffix
|
||||
lib:libpagemaker_0.0$secondaryArchSuffix
|
||||
lib:libplc4$secondaryArchSuffix
|
||||
lib:libplds4$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libpoppler$secondaryArchSuffix
|
||||
lib:libKF5ConfigCore$secondaryArchSuffix
|
||||
lib:libKF5CoreAddons$secondaryArchSuffix
|
||||
lib:libKF5I18n$secondaryArchSuffix
|
||||
lib:libKF5KIOCore$secondaryArchSuffix
|
||||
lib:libKF5KIOFileWidgets$secondaryArchSuffix
|
||||
lib:libKF5KIOWidgets$secondaryArchSuffix
|
||||
lib:libKF5WindowSystem$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQt5Network$secondaryArchSuffix
|
||||
@@ -144,6 +138,7 @@ REQUIRES="
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
glm${secondaryArchSuffix}_devel
|
||||
unixodbc${secondaryArchSuffix}_devel
|
||||
devel:libabw_0.1$secondaryArchSuffix
|
||||
devel:libboost_date_time$secondaryArchSuffix >= $boostMinimumVersion
|
||||
devel:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion
|
||||
@@ -170,25 +165,19 @@ BUILD_REQUIRES="
|
||||
devel:libhyphen$secondaryArchSuffix
|
||||
devel:libicuuc$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libKF5ConfigCore$secondaryArchSuffix
|
||||
devel:libKF5CoreAddons$secondaryArchSuffix
|
||||
devel:libKF5I18n$secondaryArchSuffix
|
||||
devel:libKF5KIOCore$secondaryArchSuffix
|
||||
devel:libKF5KIOFileWidgets$secondaryArchSuffix
|
||||
devel:libKF5KIOWidgets$secondaryArchSuffix
|
||||
devel:libKF5WindowSystem$secondaryArchSuffix
|
||||
devel:liblangtag$secondaryArchSuffix
|
||||
devel:liblcms2$secondaryArchSuffix
|
||||
devel:libldap$secondaryArchSuffix
|
||||
devel:liblpsolve55$secondaryArchSuffix
|
||||
devel:libmspub_0.1$secondaryArchSuffix
|
||||
devel:libmwaw_0.3$secondaryArchSuffix
|
||||
devel:libmysqlclient$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:liborcus_0.14$secondaryArchSuffix
|
||||
devel:libpagemaker_0.0$secondaryArchSuffix
|
||||
devel:libpoppler$secondaryArchSuffix
|
||||
devel:libqxp_0.0$secondaryArchSuffix
|
||||
@@ -222,7 +211,6 @@ BUILD_PREREQUIRES="
|
||||
cmd:git
|
||||
cmd:gperf
|
||||
cmd:grep
|
||||
cmd:kf5_config$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtool$secondaryArchSuffix
|
||||
cmd:make
|
||||
@@ -258,7 +246,6 @@ BUILD()
|
||||
#--with-lang=ALL
|
||||
runConfigure ./autogen.sh \
|
||||
--with-distro=LibreOfficeHaiku \
|
||||
--enable-kde5 \
|
||||
--enable-qt5 \
|
||||
--enable-release-build \
|
||||
--enable-readonly-installset \
|
||||
@@ -267,73 +254,17 @@ BUILD()
|
||||
--enable-sal-log \
|
||||
\
|
||||
--disable-ccache \
|
||||
--disable-cups \
|
||||
--disable-firebird-sdbc \
|
||||
--disable-gio \
|
||||
--disable-gstreamer-0-10 \
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-randr \
|
||||
--disable-sdremote \
|
||||
--disable-fetch-external \
|
||||
--disable-dependency-tracking \
|
||||
\
|
||||
--with-galleries=no \
|
||||
--with-fonts=no \
|
||||
--with-vendor="HaikuPorts" \
|
||||
--with-system-boost \
|
||||
--with-system-libs \
|
||||
--with-boost-libdir=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir \
|
||||
--with-system-altlinuxhyph \
|
||||
--with-system-bzip2 \
|
||||
--with-system-cairo \
|
||||
--with-system-clucene \
|
||||
--with-system-cppunit \
|
||||
--with-system-curl \
|
||||
--with-system-epoxy \
|
||||
--with-system-expat \
|
||||
--with-system-glm \
|
||||
--with-system-graphite \
|
||||
--with-system-harfbuzz \
|
||||
--with-system-hunspell \
|
||||
--with-system-icu \
|
||||
--with-system-jpeg \
|
||||
--with-system-lcms2 \
|
||||
--with-system-libabw \
|
||||
--with-system-libcdr \
|
||||
--with-system-libcmis \
|
||||
--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 \
|
||||
--with-system-libqxp \
|
||||
--with-system-librevenge \
|
||||
--with-system-libstaroffice \
|
||||
--with-system-libvisio \
|
||||
--with-system-libwpd \
|
||||
--with-system-libwpg \
|
||||
--with-system-libwps \
|
||||
--with-system-libxml \
|
||||
--with-system-libzmf \
|
||||
--with-system-lpsolve \
|
||||
--with-system-mdds \
|
||||
--with-system-mythes \
|
||||
--with-system-neon \
|
||||
--with-system-nss \
|
||||
--with-system-openldap \
|
||||
--with-system-openssl \
|
||||
--with-system-orcus \
|
||||
--with-system-poppler \
|
||||
--with-system-redland \
|
||||
--with-system-ucpp \
|
||||
--with-system-xmlsec \
|
||||
--with-system-zlib \
|
||||
\
|
||||
--without-doxygen \
|
||||
--without-helppack-integration \
|
||||
@@ -349,6 +280,7 @@ INSTALL()
|
||||
mkdir -p $appDir
|
||||
cp -r ../core/instdir/* $appDir
|
||||
mv $appDir/program/soffice.bin $appDir/program/LibreOffice
|
||||
mv $appDir/program/libvclplug_qt5lo.so $appDir/program/libvclplug_kde5lo.so
|
||||
|
||||
# make sure we do not copy default profile
|
||||
rm -rf $appDir/user
|
||||
|
||||
@@ -1,285 +1,22 @@
|
||||
From 1908e29a8baed25845534a42123a7eb5b8a2c8d4 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Fri, 1 Jun 2018 15:23:47 +0300
|
||||
Subject: Fix make distro-pack-install on Haiku
|
||||
|
||||
|
||||
diff --git a/Repository.mk b/Repository.mk
|
||||
index 9936b0e..4193e55 100644
|
||||
--- a/Repository.mk
|
||||
+++ b/Repository.mk
|
||||
@@ -142,7 +142,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
|
||||
$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
|
||||
$(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
|
||||
$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
|
||||
- $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
|
||||
+ $(if $(filter-out ANDROID HAIKU IOS MACOSX WNT,$(OS)),oosplash) \
|
||||
soffice_bin \
|
||||
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
|
||||
$(if $(filter WNT,$(OS)), \
|
||||
@@ -236,7 +236,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
|
||||
- $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
|
||||
+ $(if $(and $(ENABLE_JAVA),$(filter-out HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
|
||||
$(if $(ENABLE_MACOSX_SANDBOX),, \
|
||||
regmerge \
|
||||
regview \
|
||||
@@ -1017,7 +1017,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\
|
||||
desktop_branding \
|
||||
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
|
||||
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
|
||||
- $(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
|
||||
+ $(if $(and $(filter-out MACOSX HAIKU WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
|
||||
$(if $(ENABLE_HEADLESS),, \
|
||||
desktop_soffice_sh \
|
||||
) \
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From c81878788cd5d92c927c0be692e33cf0729d67f5 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Mon, 4 Jun 2018 11:55:30 +0300
|
||||
Subject: Fix profile dir location on Haiku
|
||||
|
||||
|
||||
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
|
||||
index ebeb00d..da4f697 100644
|
||||
--- a/instsetoo_native/CustomTarget_setup.mk
|
||||
+++ b/instsetoo_native/CustomTarget_setup.mk
|
||||
@@ -40,7 +40,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
|
||||
&& echo 'InstallMode=<installmode>' \
|
||||
&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
|
||||
$(if $(ENABLE_RELEASE_BUILD),\
|
||||
- && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
|
||||
+ && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
|
||||
&& echo 'UserInstallation=$$ORIGIN/..') \
|
||||
) > $@
|
||||
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From a6d90e87853dfafc06336b02599af92e8a3d1021 Mon Sep 17 00:00:00 2001
|
||||
From 2ee2e97e974e5b6f272f9df2df0daa5695919f30 Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Mon, 30 Jul 2018 22:38:23 +0000
|
||||
Subject: Fix stack protector check
|
||||
Date: Sat, 1 Sep 2018 18:38:42 +0200
|
||||
Subject: Fix mysqlc build error
|
||||
|
||||
* "return 0;" is not enough to trigger it.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9b31d89..e19cd6c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -5916,7 +5916,8 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
|
||||
AC_MSG_CHECKING([whether $CC supports -fstack-protector-strong])
|
||||
save_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -Werror -fstack-protector-strong"
|
||||
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ char a[8]; return 0; ]])],[
|
||||
+HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
|
||||
CFLAGS=$save_CFLAGS
|
||||
if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From 02b3dd8acfdb06aed8a46e2143cf16971c968a7f Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Wed, 1 Aug 2018 19:14:07 +0200
|
||||
Subject: qt5: Fix invalid casts
|
||||
|
||||
|
||||
diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
|
||||
index 6e22ad1..7fe7bb5 100644
|
||||
--- a/vcl/qt5/Qt5Bitmap.cxx
|
||||
+++ b/vcl/qt5/Qt5Bitmap.cxx
|
||||
@@ -152,15 +152,15 @@ bool Qt5Bitmap::Create(const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount)
|
||||
buffer_data_pos += pBitmap->m_nScanline;
|
||||
for (sal_uInt32 w = 0; w < nWidth; ++w)
|
||||
{
|
||||
- *image_data = reinterpret_cast<sal_uInt32>(colorTable.at(*buffer_data >> 4));
|
||||
+ *image_data = static_cast<sal_uInt32>(colorTable.at(*buffer_data >> 4));
|
||||
++image_data;
|
||||
- *image_data = reinterpret_cast<sal_uInt32>(colorTable.at(*buffer_data & 0xF));
|
||||
+ *image_data = static_cast<sal_uInt32>(colorTable.at(*buffer_data & 0xF));
|
||||
++image_data;
|
||||
++buffer_data;
|
||||
}
|
||||
if (isOdd)
|
||||
{
|
||||
- *image_data = reinterpret_cast<sal_uInt32>(colorTable.at(*buffer_data >> 4));
|
||||
+ *image_data = static_cast<sal_uInt32>(colorTable.at(*buffer_data >> 4));
|
||||
++image_data;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From 1fe94cf5bcb0e681a0b2d265489e98f38d6b2c10 Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
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 2d6f58b3a7bb7a4d058e67e511dc26b40642a6e0 Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
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
|
||||
|
||||
|
||||
From f6ae0e64559603e4b8e8f239cf338a046d05e30a Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Fri, 3 Aug 2018 23:45:26 +0200
|
||||
Subject: Fetch xmlsec only when requested
|
||||
|
||||
|
||||
diff --git a/Makefile.fetch b/Makefile.fetch
|
||||
index 44f5031..1a7bf14 100644
|
||||
--- a/Makefile.fetch
|
||||
+++ b/Makefile.fetch
|
||||
@@ -161,7 +161,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
|
||||
$(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \
|
||||
$(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
|
||||
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
|
||||
- XMLSEC_TARBALL \
|
||||
+ $(call fetch_Optional,XMLSEC,XMLSEC_TARBALL) \
|
||||
$(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
|
||||
$(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \
|
||||
$(call fetch_Optional,LXML,LXML_TARBALL) \
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From dd987143576aed1aec1299043792bcdd6ac3462a Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Sun, 5 Aug 2018 22:43:12 +0200
|
||||
Subject: Use correct Haiku settings path
|
||||
|
||||
|
||||
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
|
||||
index 49a0320..a7a4764 100644
|
||||
--- a/sal/osl/unx/security.cxx
|
||||
+++ b/sal/osl/unx/security.cxx
|
||||
@@ -41,6 +41,11 @@
|
||||
#include <crypt.h>
|
||||
#endif
|
||||
|
||||
+#if defined HAIKU
|
||||
+#include <fs_info.h>
|
||||
+#include <FindDirectory.h>
|
||||
+#endif
|
||||
+
|
||||
#include "secimpl.hxx"
|
||||
|
||||
#ifdef ANDROID
|
||||
@@ -246,6 +251,18 @@ static bool osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal
|
||||
if (pSecImpl == nullptr)
|
||||
return false;
|
||||
|
||||
+#ifdef HAIKU
|
||||
+ dev_t volume = dev_for_path("/boot");
|
||||
+ sal_Char homeDir[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH];
|
||||
+ status_t result = find_directory(B_USER_DIRECTORY, volume, false, homeDir,
|
||||
+ sizeof(homeDir));
|
||||
+ if (result == B_OK && strlen(homeDir) < nMax) {
|
||||
+ strcpy(pszDirectory, homeDir);
|
||||
+ return true;
|
||||
+ }
|
||||
+ return false;
|
||||
+#endif
|
||||
+
|
||||
#ifdef ANDROID
|
||||
{
|
||||
sal_Bool bRet = sal_False;
|
||||
@@ -347,7 +364,23 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
|
||||
return bRet;
|
||||
}
|
||||
|
||||
-#if !defined(MACOSX) && !defined(IOS)
|
||||
+#if defined HAIKU
|
||||
+
|
||||
+static bool osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
|
||||
+{
|
||||
+ (void) Security;
|
||||
+ dev_t volume = dev_for_path("/boot");
|
||||
+ sal_Char configDir[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH];
|
||||
+ status_t result = find_directory(B_USER_SETTINGS_DIRECTORY, volume, false,
|
||||
+ configDir, sizeof(configDir));
|
||||
+ if (result == B_OK && strlen(configDir) < nMax) {
|
||||
+ strcpy(pszDirectory, configDir);
|
||||
+ return true;
|
||||
+ }
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+#elif !defined(MACOSX) && !defined(IOS)
|
||||
|
||||
#define DOT_CONFIG "/.config"
|
||||
|
||||
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
|
||||
index 3d9d915..30c2163 100644
|
||||
--- a/connectivity/Library_mysqlc.mk
|
||||
+++ b/connectivity/Library_mysqlc.mk
|
||||
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_libs,mysqlc,\
|
||||
- $(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\
|
||||
+ $(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),-lz -lm,\
|
||||
-rdynamic -lz -lcrypt -lm)) \
|
||||
$(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
|
||||
))
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user