from:"Kacper Kasper"

[Libreoffice-commits] core.git: configure.ac Repository.mk vcl/Library_vcl.mk vcl/Module_vcl.mk

2018-06-21 Thread Kacper Kasper

 Repository.mk  |1 +
 configure.ac   |   11 +--
 vcl/Library_vcl.mk |6 ++
 vcl/Module_vcl.mk  |6 ++
 4 files changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 8ef359b89c8970ed8d4c9afbe63c4f84ac0318a1
Author: Kacper Kasper 
Date:   Sun Jun 10 03:51:57 2018 +0200

Allow building KDE5 backend on Haiku

Change-Id: I3138d26596af4c615fe2caaa2b160a76d8d2a352
Reviewed-on: https://gerrit.libreoffice.org/55548
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/Repository.mk b/Repository.mk
index 2a66608621a5..e8e5af6e81f8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -312,6 +312,7 @@ endif
 ifeq ($(OS),HAIKU)
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,haiku, \
 $(if $(ENABLE_QT5),vclplug_qt5) \
+$(if $(ENABLE_KDE5),vclplug_kde5) \
 ))
 endif
 
diff --git a/configure.ac b/configure.ac
index e45a312672fd..cdc5322c460e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4646,6 +4646,7 @@ fi
 if test "$OS" = "HAIKU"; then
 enable_cairo_canvas=yes
 test_qt5=yes
+test_kde5=yes
 fi
 
 dnl ===
@@ -11150,8 +11151,14 @@ if test \( "$test_kde5" = "yes" -a "$ENABLE_KDE5" = 
"TRUE" \) -o \
 \( "$test_kf5" = "yes" -a "$ENABLE_KF5" = "TRUE" \) -o \
 \( "$test_gtk3_kde5" = "yes" -a "$ENABLE_GTK3_KDE5" = "TRUE" \)
 then
-kf5_incdirs="$KF5INC /usr/include/ $x_includes"
-kf5_libdirs="$KF5LIB /usr/lib /usr/lib/kf5 /usr/lib/kf5/devel $x_libraries"
+if test "$OS" = "HAIKU"; then
+haiku_arch="`echo $RTL_ARCH | tr X x`"
+kf5_haiku_incdirs="`findpaths -c ' ' -a $haiku_arch 
B_FIND_PATH_HEADERS_DIRECTORY`"
+kf5_haiku_libdirs="`findpaths -c ' ' -a $haiku_arch 
B_FIND_PATH_DEVELOP_LIB_DIRECTORY`"
+fi
+
+kf5_incdirs="$KF5INC /usr/include/ $kf5_haiku_incdirs $x_includes"
+kf5_libdirs="$KF5LIB /usr/lib /usr/lib/kf5 /usr/lib/kf5/devel 
$kf5_haiku_libdirs $x_libraries"
 if test -n "$supports_multilib"; then
 kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 
/usr/lib64/kf5/devel"
 fi
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f01302fd1080..ea2b6fac2aee 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -676,11 +676,9 @@ $(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 \
+$(eval $(call gb_Library_add_exception_objects,vcl, \
+$(if $(or $(ENABLE_QT5),$(ENABLE_KDE5)),vcl/unx/generic/plugadapt/salplug) 
\
 ))
-endif
 
 $(eval $(call gb_Library_use_externals,vcl,\
 cairo \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index f2dfff71d862..0fc88c18c26f 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -122,6 +122,12 @@ $(eval $(call gb_Module_add_targets,vcl,\
 Library_vclplug_qt5 \
 ))
 endif
+ifneq ($(ENABLE_KDE5),)
+$(eval $(call gb_Module_add_targets,vcl,\
+CustomTarget_kde5_moc \
+Library_vclplug_kde5 \
+))
+endif
 endif
 
 ifneq ($(ENABLE_FUZZERS),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/qt5

2018-06-10 Thread Kacper Kasper

 vcl/inc/qt5/Qt5FontFace.hxx  |3 ++-
 vcl/inc/qt5/Qt5Graphics.hxx  |2 +-
 vcl/qt5/Qt5Font.hxx  |3 ++-
 vcl/qt5/Qt5FontFace.cxx  |3 ++-
 vcl/qt5/Qt5Graphics.cxx  |2 +-
 vcl/qt5/Qt5Graphics_Text.cxx |8 +++-
 6 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 812cae2f0b96c3d95d267b83727dd5a2114e611a
Author: Kacper Kasper 
Date:   Sun Jun 10 05:59:31 2018 +0200

qt5: hold LogicalFontInstance with rtl::Reference

Build fix after c4c56de1b0e62ec866b519b2b24c5e805f0a86d3.

Change-Id: I49303528ccbe49894a0fbae3c24d3f3d08c016eb
Reviewed-on: https://gerrit.libreoffice.org/55547
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx
index 4cc21010a8b7..0e1a359acbb5 100644
--- a/vcl/inc/qt5/Qt5FontFace.hxx
+++ b/vcl/inc/qt5/Qt5FontFace.hxx
@@ -47,7 +47,8 @@ public:
 bool GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const;
 bool HasChar(sal_uInt32 cChar) const;
 
-LogicalFontInstance* CreateFontInstance(const FontSelectPattern& rFSD) 
const override;
+rtl::Reference
+CreateFontInstance(const FontSelectPattern& rFSD) const override;
 
 protected:
 Qt5FontFace(const Qt5FontFace&);
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index af21ee462b18..40284db9f33a 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -48,7 +48,7 @@ class Qt5Graphics : public SalGraphics
 QPainter::CompositionMode m_eCompositionMode;
 
 PhysicalFontCollection* m_pFontCollection;
-Qt5Font* m_pTextStyle[MAX_FALLBACK];
+rtl::Reference m_pTextStyle[MAX_FALLBACK];
 Color m_aTextColor;
 
 Qt5Graphics(Qt5Frame* pFrame, QImage* pQImage);
diff --git a/vcl/qt5/Qt5Font.hxx b/vcl/qt5/Qt5Font.hxx
index 4e37f7d28bdd..81bd723c1ab6 100644
--- a/vcl/qt5/Qt5Font.hxx
+++ b/vcl/qt5/Qt5Font.hxx
@@ -27,7 +27,8 @@
 
 class Qt5Font final : public QFont, public LogicalFontInstance
 {
-friend LogicalFontInstance* Qt5FontFace::CreateFontInstance(const 
FontSelectPattern&) const;
+friend rtl::Reference
+Qt5FontFace::CreateFontInstance(const FontSelectPattern&) const;
 
 virtual hb_font_t* ImplInitHbFont() override;
 
diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx
index bd3994a721ee..d0efb488d57c 100644
--- a/vcl/qt5/Qt5FontFace.cxx
+++ b/vcl/qt5/Qt5FontFace.cxx
@@ -62,7 +62,8 @@ Qt5FontFace::~Qt5FontFace() {}
 
 sal_IntPtr Qt5FontFace::GetFontId() const { return 
reinterpret_cast(_aFontId); }
 
-LogicalFontInstance* Qt5FontFace::CreateFontInstance(const FontSelectPattern& 
rFSD) const
+rtl::Reference
+Qt5FontFace::CreateFontInstance(const FontSelectPattern& rFSD) const
 {
 return new Qt5Font(*this, rFSD);
 }
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index c7ca69a8a606..7257b8059926 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -47,7 +47,7 @@ Qt5Graphics::~Qt5Graphics()
 {
 if (!m_pTextStyle[i])
 break;
-m_pTextStyle[i]->Release();
+m_pTextStyle[i].clear();
 }
 }
 
diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx
index cf244d3f4d78..cb7bef853ba8 100644
--- a/vcl/qt5/Qt5Graphics_Text.cxx
+++ b/vcl/qt5/Qt5Graphics_Text.cxx
@@ -41,8 +41,7 @@ void Qt5Graphics::SetFont(const FontSelectPattern* pReqFont, 
int nFallbackLevel)
 {
 if (!m_pTextStyle[i])
 break;
-m_pTextStyle[i]->Release();
-m_pTextStyle[i] = nullptr;
+m_pTextStyle[i].clear();
 }
 
 if (!pReqFont)
@@ -51,8 +50,7 @@ void Qt5Graphics::SetFont(const FontSelectPattern* pReqFont, 
int nFallbackLevel)
 if (!pReqFont->mpFontInstance)
 return;
 
-m_pTextStyle[nFallbackLevel] = 
static_cast(pReqFont->mpFontInstance);
-m_pTextStyle[nFallbackLevel]->Acquire();
+m_pTextStyle[nFallbackLevel] = 
static_cast(pReqFont->mpFontInstance.get());
 }
 
 void Qt5Graphics::GetFontMetric(ImplFontMetricDataRef& rFMD, int 
nFallbackLevel)
@@ -137,7 +135,7 @@ bool Qt5Graphics::GetGlyphBoundRect(const GlyphItem& 
rGlyph, tools::Rectangle& r
 if (nLevel >= MAX_FALLBACK)
 return false;
 
-Qt5Font* pFont = m_pTextStyle[nLevel];
+Qt5Font* pFont = m_pTextStyle[nLevel].get();
 if (!pFont)
 return false;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac Repository.mk vcl/Library_vcl.mk vcl/Library_vclplug_qt5.mk vcl/Module_vcl.mk

2018-05-06 Thread Kacper Kasper

 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(-)

New commits:
commit 99614e0a782a15749bdc3781d5319309c8d48b46
Author: Kacper Kasper <kacperkas...@gmail.com>
Date:   Sat May 5 15:31:52 2018 +0200

Allow building Qt5 backend on Haiku

Change-Id: I7e928e9e29076bdfaaeffb83791bdc35f1952055
Reviewed-on: https://gerrit.libreoffice.org/53892
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

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 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/inc bridges/source configure.ac desktop/Module_desktop.mk distro-configs/LibreOfficeHaiku.conf idlc/source include/osl include/sal sal/Library_sal.mk sal/osl sa

2018-03-05 Thread Kacper Kasper

 bridges/inc/vtablefactory.hxx   |3 +-
 bridges/source/cpp_uno/shared/vtablefactory.cxx |2 -
 configure.ac|7 +++-
 desktop/Module_desktop.mk   |2 +
 distro-configs/LibreOfficeHaiku.conf|2 -
 idlc/source/idlccompile.cxx |2 -
 include/osl/endian.h|2 -
 include/sal/alloca.h|2 -
 include/sal/config.h|3 +-
 sal/Library_sal.mk  |5 ++-
 sal/osl/unx/file_error_transl.cxx   |2 +
 sal/osl/unx/system.cxx  |2 -
 sal/osl/unx/system.hxx  |   35 +++-
 sal/qa/osl/file/osl_File_Const.h|6 ++--
 solenv/bin/concat-deps.c|   13 
 solenv/gbuild/platform/HAIKU_INTEL_GCC.mk   |2 -
 solenv/gbuild/platform/HAIKU_X86_64_GCC.mk  |2 -
 solenv/gbuild/platform/haiku.mk |   19 +
 svl/Library_svl.mk  |2 -
 tools/source/stream/strmunx.cxx |2 -
 vcl/Executable_svpclient.mk |4 ++
 vcl/Library_vcl.mk  |   21 ++
 vcl/inc/headless/svpinst.hxx|1 
 vcl/source/opengl/OpenGLHelper.cxx  |6 ++--
 vcl/source/salmain/salmain.cxx  |4 +-
 25 files changed, 128 insertions(+), 23 deletions(-)

New commits:
commit 9c036b1d3db253a1fd43ce76ce1d919e2029af59
Author: Kacper Kasper <kacperkas...@gmail.com>
Date:   Sun Feb 25 02:55:15 2018 +0100

Make LibreOffice buildable on Haiku.

* Obviously VCL wiring is missing, but most components do build.

Change-Id: Ie853ada1423a8f4c2b647be59cd47a7730c42978
Reviewed-on: https://gerrit.libreoffice.org/50293
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>

diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index 991716b423e8..70c87c385952 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -30,7 +30,8 @@
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
-|| defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID)
+|| defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) \
+|| defined(HAIKU)
 #define USE_DOUBLE_MMAP
 #endif
 
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx 
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 2c289ea58657..9e3a91fb0a93 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -63,7 +63,7 @@ extern "C" void * allocExec(
 {
 std::size_t pagesize;
 #if defined SAL_UNX
-#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY
+#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY 
|| defined HAIKU
 pagesize = getpagesize();
 #else
 pagesize = sysconf(_SC_PAGESIZE);
diff --git a/configure.ac b/configure.ac
index 59df9857b616..6eacbc878174 100644
--- a/configure.ac
+++ b/configure.ac
@@ -792,7 +792,6 @@ haiku*)
 test_randr=no
 test_xrender=no
 test_freetype=yes
-test_cairo=yes
 enable_java=no
 enable_opengl=no
 enable_odk=no
@@ -803,7 +802,7 @@ haiku*)
 enable_gltf=no
 enable_collada=no
 enable_coinmp=no
-enable_pdfimport=no
+enable_pdfium=no
 enable_postgresql_sdbc=no
 enable_firebird_sdbc=no
 _os=Haiku
@@ -4614,6 +4613,10 @@ if test "$USING_X11" != TRUE; then
 enable_cairo_canvas=no
 fi
 
+if test "$OS" = "HAIKU"; then
+enable_cairo_canvas=yes
+fi
+
 dnl ===
 dnl check for cups support
 dnl ===
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index e18b23126dff..878febd603fb 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -102,6 +102,8 @@ else ifeq ($(OS),ANDROID)
 
 else ifeq ($(OS),IOS)
 
+else ifeq ($(OS),HAIKU)
+
 else
 
 $(eval $(call gb_Module_add_targets,desktop,\
diff --git a/distro-configs/LibreOfficeHaiku.conf 
b/distro-configs/LibreOfficeHaiku.conf
index 6026c7fb5942..426d19a825f6 100644
--- a/distro-configs/LibreOfficeHaiku.conf
+++ b/distro-configs/LibreOfficeHaiku.conf
@@ -47,6 +47,7 @@
 --with-system-redland
 --with-system-libcmis
 --with-system-cairo
+--with-system-poppler
 --with-theme=breeze sifr
 --with-galleries=no
 --without-helppack-integration
@@ -62,5 +63,4 @@
 --disable-postgresql-sdbc
 --disable-lotuswordpro
 --disable-firebird-sdbc
---disable-cairo-canvas
 --enable-python=no
diff --git a/idlc/source/idlcco

Kacper Kasper license statement

2018-02-19 Thread Kacper Kasper

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bin/run bridges/Library_cpp_uno.mk configure.ac distro-configs/LibreOfficeHaiku.conf Makefile.in solenv/gbuild

2018-02-19 Thread Kacper Kasper

 Makefile.in|2 
 bin/run|   22 +
 bridges/Library_cpp_uno.mk |6 +-
 configure.ac   |   48 +
 distro-configs/LibreOfficeHaiku.conf   |   66 +
 solenv/gbuild/platform/HAIKU_INTEL_GCC.mk  |   16 +++
 solenv/gbuild/platform/HAIKU_X86_64_GCC.mk |   14 ++
 solenv/gbuild/platform/com_GCC_defs.mk |2 
 8 files changed, 172 insertions(+), 4 deletions(-)

New commits:
commit 60f1490af9b29ac2df8e9e9411e9d41b472f9113
Author: Kacper Kasper <kacperkas...@gmail.com>
Date:   Sun Feb 18 15:15:56 2018 +0100

Buildsystem changes to recognize Haiku.

Change-Id: I219d556f8e124cfe426cc1ac3c54da34eb7ef790
Reviewed-on: https://gerrit.libreoffice.org/49925
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/Makefile.in b/Makefile.in
index bedd90a40d18..2b7b4e2a7125 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ else # MAKE_RESTARTS
 all: build
 
 check-if-root:
-   @if test `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then 
\
+   @if test ! `uname` = 'Haiku' && `id -u` = 0 && ! grep -q 'lxc\|docker' 
/proc/self/cgroup; then \
echo; \
echo 'No. You make ME a sandwich.'; \
echo; \
diff --git a/bin/run b/bin/run
index 7055ffe177b3..51de1f153512 100755
--- a/bin/run
+++ b/bin/run
@@ -53,6 +53,28 @@ elif [ $(uname) = Darwin ]; then
 
 exec ${LO_TRACE} "${exedir}/$@"
 
+elif [ $(uname) = Haiku ]; then
+
+dir=$(readlink -f "$(pwd)")
+
+while test ! -d "${dir}/instdir/program" ; do
+if test "${dir}" = "/"; then
+echo "error: cannot find \"program\" dir from \"$(pwd)\""
+exit 1
+fi
+dir=$(readlink -f "${dir}/..")
+done
+
+exedir="${dir}"/workdir/LinkTarget/Executable
+export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc
+export LIBRARY_PATH=${LIBRARY_PATH:+$LIBRARY_PATH:}"${dir}"/instdir/program
+
+#echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
+#echo "setting search path to: ${LIBRARY_PATH}"
+#echo "execing: ${exedir}/$1"
+
+exec ${LO_TRACE} "${exedir}/$@"
+
 else
 
 dir=$(readlink -f "$(pwd)")
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 11d3ea8808a4..5cc6b247126a 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -81,7 +81,7 @@ endif
 
 else ifeq ($(CPUNAME),INTEL)
 
-ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
+ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD HAIKU,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_intel
 bridge_asm_objects := call
 bridge_exception_objects := cpp2uno except uno2cpp
@@ -176,7 +176,7 @@ bridge_exception_objects := except
 
 else ifeq ($(CPUNAME),X86_64)
 
-ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD HAIKU,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
 bridge_asm_objects := call
 bridge_noncallexception_noopt_objects := callvirtualmethod
@@ -223,7 +223,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
 ))
 
-ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX IOS,$(OS)),)
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX IOS 
HAIKU,$(OS)),)
 $(eval $(call gb_Library_add_libs,gcc3_uno,\
-ldl \
 ))
diff --git a/configure.ac b/configure.ac
index c40f61b3f1c7..e20e91e7fa42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -786,6 +786,29 @@ linux-android*)
 BUILD_TYPE="$BUILD_TYPE CAIRO FONTCONFIG FREETYPE"
 ;;
 
+haiku*)
+test_cups=no
+test_dbus=no
+test_randr=no
+test_xrender=no
+test_freetype=yes
+test_cairo=yes
+enable_java=no
+enable_opengl=no
+enable_odk=no
+enable_gconf=no
+enable_gnome_vfs=no
+enable_gstreamer=no
+enable_vlc=no
+enable_gltf=no
+enable_collada=no
+enable_coinmp=no
+enable_pdfimport=no
+enable_postgresql_sdbc=no
+enable_firebird_sdbc=no
+_os=Haiku
+;;
+
 *)
 AC_MSG_ERROR([$host_os operating system is not suitable to build 
LibreOffice for!])
 ;;
@@ -4020,6 +4043,31 @@ freebsd*)
 esac
 ;;
 
+haiku*)
+COM=GCC
+USING_X11=
+GUIBASE=haiku
+RTL_OS=Haiku
+OS=HAIKU
+P_SEP=:
+
+case "$host_cpu" in
+i*86)
+CPUNAME=INTEL
+RTL_ARCH=x86
+PLATFORMID=haiku_x86
+;;
+x86_64|amd64)
+CPUNAME=X86_64
+RTL_ARCH=X86_64
+PLATFORMID=haiku_x

Re: Haiku port

2014-07-03 Thread Kacper Kasper

2014-07-02 22:48 GMT+02:00 Norbert Thiebaud nthieb...@gmail.com:
 Provided that it is done properly, not overly invasive, and there is
 manpower to cater to the port(*), I'd say chances are good we would
 accept the patches.
 But, I strongly urge you to not wait 'when it is finished'.
 A big code dump is very unlikely to be reviewed favorably... I
 strongly encourage to get involved early with this dev community, and
 seek review of your work early to insure that you are on a track that
 will allow a smooth upstreaming.

Will a github fork suffice? I don't want to send my patches upstream
because they are very hacky at the moment and wouldn't get accepted
anyway.

 (*) Libreoffice is a fairly active and large project. any port will
 need some sustained attention to keep up.

I am aware of that. I am willing to maintain it.

About the issue with UNO I mentioned: it seems it is caused by some
modules not being compiled (I compile them manually one by one now).
I'll try to make full build work and come back with the results.

Regards,
Kacper
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Haiku port

2014-07-03 Thread Kacper Kasper

2014-07-03 20:23 GMT+02:00 Norbert Thiebaud nthieb...@gmail.com:
 On Thu, Jul 3, 2014 at 7:58 PM, Kacper Kasper kacperkas...@gmail.com wrote:
 2014-07-02 22:48 GMT+02:00 Norbert Thiebaud nthieb...@gmail.com:
 I don't want to send my patches upstream
 because they are very hacky at the moment and wouldn't get accepted
 anyway.

 Then they presumably won't be accepted as a massive code drop at then
 end either right ?
 The soonner you get them in shape, learning the quirck specific to
 this project, the easier it will be to upstream :-)
'At the moment' are the keywords here ;) These hacks are the result of
library ports missing (which I will make later) or other things I
don't need to work right now.

 (yes I read Haiku's code formatting convention :-) please do _not_
 follow them for LO patches :-) )
I know that each project has its own coding guidelines and that they
should be followed in the first place :)

 For example you prolly will need some patch/new files in
 solenv/gbuild/platform/*
 these would likely not be too controversial as they are platform
 specific files anyway.
Actually files for linux work fine. Not that much work here.

Regards,
Kacper
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Haiku port

2014-07-02 Thread Kacper Kasper

Hello,

I am hacking on LibreOffice Haiku port and I have two questions:
First of all, is The Document Foundation willing to accept the code of
the port into the main tree when it is finished?
Secondly, I have a problem with UNO (I think).
When I'm trying to run ui-previewer it throws Deployment exception,
after some debugging I found that the problem is null process service
factory.
If I remove UniversalContentBroker call it runs fine (no exception,
but it is hiding the problem rather than solving it).
My question is where should I start looking in order to solve it?

Regards,
Kacper
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac Repository.mk vcl/Library_vcl.mk vcl/Module_vcl.mk

[Libreoffice-commits] core.git: vcl/inc vcl/qt5

[Libreoffice-commits] core.git: configure.ac Repository.mk vcl/Library_vcl.mk vcl/Library_vclplug_qt5.mk vcl/Module_vcl.mk

[Libreoffice-commits] core.git: bridges/inc bridges/source configure.ac desktop/Module_desktop.mk distro-configs/LibreOfficeHaiku.conf idlc/source include/osl include/sal sal/Library_sal.mk sal/osl sa

Kacper Kasper license statement

[Libreoffice-commits] core.git: bin/run bridges/Library_cpp_uno.mk configure.ac distro-configs/LibreOfficeHaiku.conf Makefile.in solenv/gbuild

Re: Haiku port

Re: Haiku port

Haiku port

9 matches

Site Navigation

Mail list logo

Footer information