[Libreoffice-commits] core.git: solenv/bin
solenv/bin/concat-deps.c | 20 1 file changed, 16 insertions(+), 4 deletions(-) New commits: commit f0cf5557d7e309e84ec997b8bdd84c6d029271d2 Author: Baptiste Daroussin <b...@freebsd.org> Date: Sat Dec 12 12:49:49 2015 +0100 Fix build on BSDs Change-Id: I88fbad89a78262f4c3275aa3a01fbebaacece245 Reviewed-on: https://gerrit.libreoffice.org/20660 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 4e6b432..2b5956f 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -33,9 +33,7 @@ #define CORE_LITTLE_ENDIAN #endif /* Def _MSC_VER */ -#if defined(__linux) || defined(__OpenBSD__) || \ -defined(__FreeBSD__) || defined(__NetBSD__) || \ -defined(__DragonFly__) || defined(__FreeBSD_kernel__) +#if defined(__linux) || defined(__FreeBSD_kernel__) #include #if __BYTE_ORDER == __LITTLE_ENDIAN #undef CORE_BIG_ENDIAN @@ -46,7 +44,21 @@ #undef CORE_LITTLE_ENDIAN #endif /* __BYTE_ORDER == __BIG_ENDIAN */ #endif /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */ -#endif /* Def __linux || Def *BSD */ +#endif /* Def __linux */ + +#if defined(__OpenBSD__) || defined(__FreeBSD__) || \ +defined(__NetBSD__) || defined(__DragonFly__) +#include +#if _BYTE_ORDER == _LITTLE_ENDIAN +#undef CORE_BIG_ENDIAN +#define CORE_LITTLE_ENDIAN +#else /* !(_BYTE_ORDER == _LITTLE_ENDIAN) */ +#if _BYTE_ORDER == _BIG_ENDIAN +#define CORE_BIG_ENDIAN +#undef CORE_LITTLE_ENDIAN +#endif /* _BYTE_ORDER == _BIG_ENDIAN */ +#endif /* !(_BYTE_ORDER == _LITTLE_ENDIAN) */ +#endif /* Def *BSD */ #ifdef __sun #ifdef __sparc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/scripts
desktop/scripts/soffice.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3a8b00910e0dbcad29e8af74f3ab1dff4645e867
Author: Baptiste Daroussin <b...@freebsd.org>
Date: Sat Dec 12 00:59:50 2015 +0100
FreeBSD can live with default search path
Change-Id: I3fa26aaf57d9620e952823c303ee77e2fc642045
Reviewed-on: https://gerrit.libreoffice.org/20651
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 06a7ff7..a8c5004 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -142,7 +142,7 @@ if echo "$checks" | grep -q "cc" ; then
fi
case "`uname -s`" in
-NetBSD|OpenBSD|FreeBSD|DragonFly)
+NetBSD|OpenBSD|DragonFly)
# this is a temporary hack until we can live with the default search paths
LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/Library_avmediaogl.mk chart2/Library_chartcore.mk chart2/Library_chartopengl.mk sd/Module_sd.mk vcl/StaticLibrary_glxtest.mk
avmedia/Library_avmediaogl.mk |2 +- chart2/Library_chartcore.mk |4 ++-- chart2/Library_chartopengl.mk |4 ++-- sd/Module_sd.mk |2 +- vcl/StaticLibrary_glxtest.mk |3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) New commits: commit 6ac9a4f0a36677216660b29e26ce99c3b0a51e36 Author: Baptiste Daroussin <b...@freebsd.org> Date: Sat Dec 12 01:24:07 2015 +0100 Make .mk files more portable Replace some -ldl by $(DLOPEN_LIBS) Add some FREEBSD tests Change-Id: Ic30fe29b938d877694db2927775f89de15c02d87 Reviewed-on: https://gerrit.libreoffice.org/20652 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Matúš Kukan <ma...@libreoffice.org> diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index d3f14f7..b7498bf 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -51,7 +51,7 @@ else ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\ OpenGL \ )) -else ifeq ($(OS),LINUX) +else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,avmediaogl,\ -lGL \ )) diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index ce5e706..ce2043a 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -253,9 +253,9 @@ else ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\ OpenGL \ )) -else ifeq ($(OS),LINUX) +else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,chartcore,\ - -ldl \ + $(DLOPEN_LIBS) \ -lGL \ -lX11 \ )) diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index 2ed86f0..95ea58d 100644 --- a/chart2/Library_chartopengl.mk +++ b/chart2/Library_chartopengl.mk @@ -65,9 +65,9 @@ else ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\ OpenGL \ )) -else ifeq ($(OS),LINUX) +else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,chartopengl,\ - -ldl \ + $(DLOPEN_LIBS) \ -lGL \ -lX11 \ )) diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 09b36b2..ae1a83f 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_l10n_targets,sd,\ UIConfig_simpress \ )) -ifneq ($(OS),DRAGONFLY) +ifeq ($(filter DRAGONFLY FREEBSD,$(OS)),) $(eval $(call gb_Module_add_check_targets,sd,\ $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ CppunitTest_sd_uimpress) \ diff --git a/vcl/StaticLibrary_glxtest.mk b/vcl/StaticLibrary_glxtest.mk index 6e90b24..227cbaa 100644 --- a/vcl/StaticLibrary_glxtest.mk +++ b/vcl/StaticLibrary_glxtest.mk @@ -30,8 +30,7 @@ $(eval $(call gb_StaticLibrary_use_api,glxtest,\ )) $(eval $(call gb_StaticLibrary_add_libs,glxtest,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ -lX11 \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/BitmapTest.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c68b47ea1aae449599c8a616b6240daaf4be1d61
Author: Baptiste Daroussin <b...@freebsd.org>
Date: Thu Dec 10 17:28:15 2015 +0100
Fix test on FreeBSD which uses the same backend as Linux
Change-Id: Ibc43b9f3d0fc9e343b0ff9abd627ee9afb881d69
Reviewed-on: https://gerrit.libreoffice.org/20624
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index fe8c933..7813adb 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -70,7 +70,7 @@ void BitmapTest::testConvert()
CPPUNIT_ASSERT_EQUAL(sal_uInt16(24), aBitmap.GetBitCount());
{
Bitmap::ScopedReadAccess pReadAccess(aBitmap);
-#if defined LINUX
+#if defined LINUX || defined FREEBSD
// 24 bit Bitmap on SVP backend uses 32bit BGRA format
CPPUNIT_ASSERT_EQUAL(static_cast(32),
pReadAccess->GetBitCount());
CPPUNIT_ASSERT_EQUAL(sal_uLong(40), pReadAccess->GetScanlineSize());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx |8
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx |4
2 files changed, 12 deletions(-)
New commits:
commit cee2655445319133095b0f6b19fc5b31d321099f
Author: Baptiste Daroussin <b...@freebsd.org>
Date: Thu Dec 10 17:38:06 2015 +0100
Kill check for ancient FreeBSD version
Change-Id: Ia6f7d55d2d8d346695658549d2e86eef77215377
Reviewed-on: https://gerrit.libreoffice.org/20625
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 61ae307..feaa394 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -100,11 +100,7 @@ public:
};
RTTI::RTTI()
-#if defined(FREEBSD) && __FreeBSD_version < 702104
-: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
-#endif
{
}
@@ -139,11 +135,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription
*pTypeDescr )
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if defined(FREEBSD) && __FreeBSD_version < 702104 /* #i22253# */
-rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-#else
rtti = static_cast(dlsym( m_hApp, symName.getStr() ));
-#endif
if (rtti)
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 47a5004..20c402f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -95,11 +95,7 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription const
& pTypeDescr)
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if defined(FREEBSD) && __FreeBSD_version < 702104 /* #i22253# */
-rtti = (std::type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-#else
rtti = static_cast(dlsym( m_hApp, symName.getStr()
));
-#endif
if (rtti)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/33/9733/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/9752/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/9752/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/9714/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/33/9733/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/9715/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/9730/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/9730/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/9730/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/9723/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/22/9722/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/22/9722/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/9723/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/31/9731/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] Do not hard code /usr
On Thu, Jun 12, 2014 at 10:52:54AM +0200, Stephan Bergmann wrote:
The below breaks e. g. Linux --with-package-format=rpm builds (cf.
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERfull-log=140255.29267),
because e. g. sysui/desktop/freedesktop/freedesktop-menus.spec still
assumes *.desktop files at /usr/share/applications while
sysui/desktop/share/create_tree.sh now assumes them at
${PREFIXDIR}/share/applications, where configure.ac gives
PREFIXDIR=/usr/local at least for me.
No idea what the right fix is, whether the sysui/desktop/ *.specs need
to be adapted to PREFIXDIR or whether those /usr/share paths should be
left hardcoded.
Won't a patch like this just do the trick ?
http://people.freebsd.org/~bapt/attempt-to-fix-rpm.diff
imho this is important to have the less possible hardcoded path not only for non
linux targets but also for linux distributions that does not install everything
in /usr
regards,
Bapt
pgpDfZmtR36ft.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db67702eb3ae2b353da0a2bc144be77c997039c8 Author: Baptiste Daroussin b...@freebsd.org Date: Thu Jun 12 15:09:02 2014 +0200 redland = 1.0.16 is required not 1.16 Change-Id: I92e7e6a1b871c3cefc5aca39d32b6837e624c157 Reviewed-on: https://gerrit.libreoffice.org/9752 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/configure.ac b/configure.ac index 7b73434..298aa3c 100644 --- a/configure.ac +++ b/configure.ac @@ -9452,7 +9452,7 @@ libo_CHECK_SYSTEM_MODULE([redland],[REDLAND],[redland = 1.0.8 raptor2 = 2.0.7] if test $with_system_redland = yes; then libo_MINGW_CHECK_DLL([librdf]) AC_CHECK_LIB([rdf], [librdf_world_set_raptor_init_handler], [:], -[AC_MSG_ERROR(librdf too old. Need = 1.16)], []) +[AC_MSG_ERROR(librdf too old. Need = 1.0.16)], []) libo_MINGW_TRY_DLL([libraptor]) libo_MINGW_TRY_DLL([librasqal]) libo_MINGW_TRY_DLL([libsqlite3]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 32 +++
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |7
2 files changed, 39 insertions(+)
New commits:
commit d2725abf5d8f1e33dfd061f899101afc970292fb
Author: Baptiste Daroussin b...@freebsd.org
Date: Tue Jun 10 18:35:36 2014 +0200
Fix build on FreeBSD with libc++
Change-Id: Ib51b05eb3f7c5d1288bee0f9f738ab1f37251c3e
Reviewed-on: https://gerrit.libreoffice.org/9722
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index e476119..624d543 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -31,6 +31,32 @@
#include config_gcc.h
#include uno/mapping.h
+#ifdef _LIBCPP_VERSION
+
+namespace __cxxabiv1
+{
+struct __class_type_info : public std::type_info
+{
+explicit __class_type_info( const char *__n ) : type_info( __n ) { }
+virtual ~__class_type_info();
+};
+
+struct __si_class_type_info : public __class_type_info
+{
+explicit __si_class_type_info( const char *__n, const
__class_type_info *__b ) :
+__class_type_info( __n ), __base_type( __b ) { }
+virtual ~__si_class_type_info();
+const __class_type_info *__base_type;
+};
+
+extern C void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT;
+
+extern C _LIBCPP_NORETURN void __cxa_throw(
+void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) );
+}
+
+#else
+
namespace CPPU_CURRENT_NAMESPACE
{
@@ -101,6 +127,8 @@ extern C void __cxa_throw(
__attribute__((noreturn));
}
#endif
+}
+#endif
namespace CPPU_CURRENT_NAMESPACE
{
@@ -109,7 +137,11 @@ void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
void fillUnoException(
+#ifdef _LIBCPP_VERSION
+__cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#else
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index b520054..f4c70a1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -285,10 +285,17 @@ static void cpp_call(
catch (...)
{
// fill uno exception
+#ifdef _LIBCPP_VERSION
+ CPPU_CURRENT_NAMESPACE::fillUnoException(
+ reinterpret_cast __cxxabiv1::__cxa_eh_globals * (
+ __cxxabiv1::__cxa_get_globals())-caughtExceptions,
+ *ppUnoExc, pThis-getBridge()-getCpp2Uno());
+#else
fillUnoException(
reinterpret_cast CPPU_CURRENT_NAMESPACE::__cxa_eh_globals * (
__cxxabiv1::__cxa_get_globals())-caughtExceptions,
*ppUnoExc, pThis-getBridge()-getCpp2Uno());
+#endif
// temporary params
for ( ; nTempIndices--; )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/Module_shell.mk
shell/Module_shell.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5a37986b4cae4c1c5d25fd19cfa2edb9edd4ba53 Author: Baptiste Daroussin b...@freebsd.org Date: Wed Jun 11 11:28:14 2014 +0200 the BSD family also uses gio Change-Id: I75fb934e52beb2ab752df4c969aa2e10d4f5966e Reviewed-on: https://gerrit.libreoffice.org/9733 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 15ab847..2cbf294 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,shell,\ Library_localebe \ )) -ifeq ($(OS),LINUX) +ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) ifeq ($(ENABLE_GIO),TRUE) $(eval $(call gb_Module_add_targets,shell,\ Library_losessioninstall \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/distro-install-desktop-integration sysui/desktop
bin/distro-install-desktop-integration |1 +
sysui/desktop/share/create_tree.sh | 20 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit d2cc121e0798a007a6e0409b09c16ce747ab959f
Author: Baptiste Daroussin b...@freebsd.org
Date: Wed Jun 11 11:04:07 2014 +0200
Do not hard code /usr
Not all operation system install packages into /usr, make sure
create-tree.sh do respect the PREFIX variable
Change-Id: Iff358c9e22fb8969afaef2bb96e1f91eb7e91123
Reviewed-on: https://gerrit.libreoffice.org/9730
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/bin/distro-install-desktop-integration
b/bin/distro-install-desktop-integration
index 40ad98c..4cf652d 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -113,6 +113,7 @@ sed -i \
export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons
export PRODUCTVERSION=
export KDEMAINDIR=$PREFIXDIR
+export PREFIXDIR=${PREFIXDIR}
export GNOMEDIR=$PREFIXDIR
export GNOME_MIME_THEME=hicolor
bash ./create_tree.sh
diff --git a/sysui/desktop/share/create_tree.sh
b/sysui/desktop/share/create_tree.sh
index 2221a46..c6be0bb 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -57,33 +57,33 @@ if [ ${GNOMEDIR} ]; then
chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.*
fi
-mkdir -p ${DESTDIR}/usr/bin
+mkdir -p ${DESTDIR}/${PREFIXDIR}/bin
test -n ${OFFICE_PREFIX} office_prefix=${OFFICE_PREFIX} ||
office_prefix=/opt
office_root=${office_prefix}/${PREFIX}
#this symlink is needed to have the API boostrap functions running right
-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/${PREFIX}
+ln -sf ${office_root}/program/soffice ${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}
if test ${PREFIX} != libreoffice${PRODUCTVERSION} -a ${PREFIX} !=
libreofficedev${PRODUCTVERSION} ; then
# compat symlinks
mkdir -p ${DESTDIR}${office_prefix}
ln -sf libreoffice${PRODUCTVERSION} ${DESTDIR}${office_root}
-ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}
+ln -sf /${PREFIXDIR}/bin/${PREFIX}
${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}
fi
test ${PREFIX} = libreofficedev${PRODUCTVERSION}
mime_def_file=libreofficedev${PRODUCTVERSION}.xml ||
mime_def_file=libreoffice${PRODUCTVERSION}.xml
-mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/$mime_def_file
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/$mime_def_file
+mkdir -p ${DESTDIR}/${PREFIXDIR}/share/mime/packages
+cp openoffice.org.xml
${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file
+chmod 0644 ${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file
-mkdir -p ${DESTDIR}/usr/share/applications
+mkdir -p ${DESTDIR}/${PREFIXDIR}/share/applications
for i in `cat launcherlist`; do
- ln -sf ${office_root}/share/xdg/${i}
${DESTDIR}/usr/share/applications/${PREFIX}-${i}
+ ln -sf ${office_root}/share/xdg/${i}
${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}
done
-mkdir -p ${DESTDIR}/usr/share/appdata
+mkdir -p ${DESTDIR}/${PREFIXDIR}/share/appdata
for i in base calc draw impress writer; do
-cp ${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml
${DESTDIR}/usr/share/appdata/${PREFIX}-${i}.appdata.xml
+cp ${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml
${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml
done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 93152e2633c3da2b1993c69857baf11edada705e Author: Baptiste Daroussin b...@freebsd.org Date: Tue Jun 10 18:22:53 2014 +0200 On FreeBSD x86_64 is named amd64 Change-Id: I14c653f8b3fe0dc9855aa51643cfc40cbccb763e Reviewed-on: https://gerrit.libreoffice.org/9714 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/configure.ac b/configure.ac index 63e9667..65dd75e 100644 --- a/configure.ac +++ b/configure.ac @@ -4209,7 +4209,7 @@ freebsd*) PLATFORMID=freebsd_x86 OUTPATH=unxfbsdi ;; -x86_64) +x86_64|amd64) CPUNAME=X86_64 RTL_ARCH=X86_64 PLATFORMID=freebsd_x86_64 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/distro-install-desktop-integration
bin/distro-install-desktop-integration |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 098b0bf8630f233fe7d3eba49c85a98929ce9929 Author: Baptiste Daroussin b...@freebsd.org Date: Tue Jun 10 18:58:19 2014 +0200 Do not hard code bash path Change-Id: I24ee2599ffe8029c3d3888de49cff8bfd0a368e0 Reviewed-on: https://gerrit.libreoffice.org/9723 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 18107e0..40ad98c 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -115,7 +115,7 @@ sed -i \ export KDEMAINDIR=$PREFIXDIR export GNOMEDIR=$PREFIXDIR export GNOME_MIME_THEME=hicolor -/bin/bash ./create_tree.sh +bash ./create_tree.sh ) cd - rm -rf $sysui_temp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk extensions/Library_npsoplugin.mk vcl/Executable_xid_fullscreen_on_all_monitors.mk
bridges/Library_cpp_uno.mk |2 +- extensions/Library_npsoplugin.mk |2 ++ vcl/Executable_xid_fullscreen_on_all_monitors.mk |2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) New commits: commit a5a17ccdbc870b475e6a2dc076a780b55e16ccab Author: Baptiste Daroussin b...@freebsd.org Date: Tue Jun 10 18:32:51 2014 +0200 Filter out OS not needing -ldl Change-Id: I5863de6d8b1f0fe2419ea7419b1ff90087bb513d Reviewed-on: https://gerrit.libreoffice.org/9715 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index f56a1d3..c6ab9a0 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -199,7 +199,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ $(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \ )) -ifeq ($(filter ANDROID WNT,$(OS)),) +ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) $(eval $(call gb_Library_add_libs,gcc3_uno,\ -ldl \ )) diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 4f385d9..9178a9d 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -23,9 +23,11 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ ifneq ($(OS),WNT) +ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) $(eval $(call gb_Library_add_libs,npsoplugin,\ -ldl \ )) +endif $(eval $(call gb_Library_use_external,npsoplugin,gtk)) diff --git a/vcl/Executable_xid_fullscreen_on_all_monitors.mk b/vcl/Executable_xid_fullscreen_on_all_monitors.mk index 5f9c127..ee17162 100644 --- a/vcl/Executable_xid_fullscreen_on_all_monitors.mk +++ b/vcl/Executable_xid_fullscreen_on_all_monitors.mk @@ -9,9 +9,11 @@ $(eval $(call gb_Executable_Executable,xid-fullscreen-on-all-monitors)) +ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) $(eval $(call gb_Executable_add_libs,xid-fullscreen-on-all-monitors,\ -ldl \ )) +endif $(eval $(call gb_Executable_add_cobjects,xid-fullscreen-on-all-monitors,\ vcl/unx/gtk/window/xid_fullscreen_on_all_monitors \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 3 commits - bin/distro-install-desktop-integration bridges/Library_cpp_uno.mk configure.ac extensions/Library_npsoplugin.mk vcl/Executable_xi
bin/distro-install-desktop-integration |2 +- bridges/Library_cpp_uno.mk |2 +- configure.ac |2 +- extensions/Library_npsoplugin.mk |2 ++ vcl/Executable_xid_fullscreen_on_all_monitors.mk |2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 560e41d50a946c2c548671f4e0a0c6f5dcd4066c Author: Baptiste Daroussin b...@freebsd.org Date: Tue Jun 10 18:32:51 2014 +0200 Filter out OS not needing -ldl Change-Id: I5863de6d8b1f0fe2419ea7419b1ff90087bb513d Reviewed-on: https://gerrit.libreoffice.org/9715 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com (cherry picked from commit a5a17ccdbc870b475e6a2dc076a780b55e16ccab) diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index f56a1d3..c6ab9a0 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -199,7 +199,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ $(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \ )) -ifeq ($(filter ANDROID WNT,$(OS)),) +ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) $(eval $(call gb_Library_add_libs,gcc3_uno,\ -ldl \ )) diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 4f385d9..9178a9d 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -23,9 +23,11 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ ifneq ($(OS),WNT) +ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) $(eval $(call gb_Library_add_libs,npsoplugin,\ -ldl \ )) +endif $(eval $(call gb_Library_use_external,npsoplugin,gtk)) diff --git a/vcl/Executable_xid_fullscreen_on_all_monitors.mk b/vcl/Executable_xid_fullscreen_on_all_monitors.mk index 5f9c127..ee17162 100644 --- a/vcl/Executable_xid_fullscreen_on_all_monitors.mk +++ b/vcl/Executable_xid_fullscreen_on_all_monitors.mk @@ -9,9 +9,11 @@ $(eval $(call gb_Executable_Executable,xid-fullscreen-on-all-monitors)) +ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) $(eval $(call gb_Executable_add_libs,xid-fullscreen-on-all-monitors,\ -ldl \ )) +endif $(eval $(call gb_Executable_add_cobjects,xid-fullscreen-on-all-monitors,\ vcl/unx/gtk/window/xid_fullscreen_on_all_monitors \ commit 476eec28198379c9279febc1ec2d07f4f2369c27 Author: Baptiste Daroussin b...@freebsd.org Date: Tue Jun 10 18:58:19 2014 +0200 Do not hard code bash path Change-Id: I24ee2599ffe8029c3d3888de49cff8bfd0a368e0 Reviewed-on: https://gerrit.libreoffice.org/9723 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com (cherry picked from commit 098b0bf8630f233fe7d3eba49c85a98929ce9929) diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 18107e0..40ad98c 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -115,7 +115,7 @@ sed -i \ export KDEMAINDIR=$PREFIXDIR export GNOMEDIR=$PREFIXDIR export GNOME_MIME_THEME=hicolor -/bin/bash ./create_tree.sh +bash ./create_tree.sh ) cd - rm -rf $sysui_temp commit cba10428496f6685d71b6ffecefc4f4bfce088d5 Author: Baptiste Daroussin b...@freebsd.org Date: Tue Jun 10 18:22:53 2014 +0200 On FreeBSD x86_64 is named amd64 Change-Id: I14c653f8b3fe0dc9855aa51643cfc40cbccb763e Reviewed-on: https://gerrit.libreoffice.org/9714 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com (cherry picked from commit 93152e2633c3da2b1993c69857baf11edada705e) diff --git a/configure.ac b/configure.ac index 7d27e92..d2ffa7d 100644 --- a/configure.ac +++ b/configure.ac @@ -4235,7 +4235,7 @@ freebsd*) PLATFORMID=freebsd_x86 OUTPATH=unxfbsdi ;; -x86_64) +x86_64|amd64) CPUNAME=X86_64 RTL_ARCH=X86_64 PLATFORMID=freebsd_x86_64 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
libreoffice + clang == success
Hi I think some of you might be interested with this information: short version: libreoffice 3.5.x builds and run sucessfully with clang 3.0 and (upcoming) 3.1 long version: On FreeBSD I completly fail at building libreoffice 3.5 using gcc, may that be from the old 4.2.1 we provide by default or the new shiny 4.6 (weekly snapshot) this is not due to gcc at all but something I should miss (for the 4.6 part). Just to test I tried with clang (FreeBSD 9 and 10) comes with clang by default (3.0) and for 8 we have clang available in packages. except from two small patches (already in master) it compiled totally out of box. this only missing stuff is a bug in boost (boost/config/compiler/clang.hpp doesn't define BOOST_HAS_LONG_LONG) which should be fixed if you use the bundled boost, and a bug in configure (I'm working on it) preventing from correctly detecting system-mdds (works great when bundled). This was done and tested without java stuff, I'll now try to enable all possible options but it shouldn't be a problem. FYI, I'll now ship libreoffice 3.5+ on FreeBSD built using clang by default and won't support gcc anymore (except if someone give me a hand to find my mistake :)) regards, Bapt pgpPw5EV3vske.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Use $(GPERF) not gperf
Hi, With the new gmake build work the bug #32195 has been reintroduce in some part: The folloing fixes the one I have found so far: http://people.freebsd.org/~bapt/0001-use-GPERF-instead-of-using-gperf-from-path.patch As ususal, it respect all the license that fits the best libreoffice :) regards, Bapt pgpGZkGw1sLJL.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Use $(GPERF) not gperf
On Mon, Jan 23, 2012 at 11:31:14AM +0100, Baptiste Daroussin wrote: Hi, With the new gmake build work the bug #32195 has been reintroduce in some part: The folloing fixes the one I have found so far: http://people.freebsd.org/~bapt/0001-use-GPERF-instead-of-using-gperf-from-path.patch As ususal, it respect all the license that fits the best libreoffice :) regards, Bapt It would be nice if this could be also pushed to 3.5.0 :) regards, Bapt pgp6QiBB79bga.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] FreeBSD share some failures with OSX
Here is a patch to avoid a unit test that fail the same on FreeBSD as on OSX
(Apparently because of aKname don't know more about it yet)
regards,
Bapt
From f3fa7cc001c4309e0dcbd94f0732e56c7d4bc8c9 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin b...@freebsd.org
Date: Mon, 19 Sep 2011 13:55:04 +0200
Subject: [PATCH 3/5] FreeBSD has the same cppunit failure as OSX does
---
sal/qa/osl/module/osl_Module.cxx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index a7339b3..5e0c47f 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -294,7 +294,7 @@ namespace osl_Module
// load lib which is under a CJK directory
void load_002( )
{
-#if defined( UNX ) !defined( MACOSX )
+#if defined( UNX ) !defined( MACOSX ) !defined( FREEBSD )
// TODO: Find out why this fails on Mac OS X
//Can not get a CJK directory already exist, so here create one. Perhaps reason is encoding problem.
::rtl::OUString aPidDirURL = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///tmp/)) + ::rtl::OUString::valueOf( ( long )getpid( ) );
--
1.7.6
pgpE3wbu88KFe.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] use PREFIXDIR in create_tree.sh
use PREFIXDIR instead of hard coding /usr in create_tree.sh
---
Bapt
From 54636c9ca659736040e8cafed2c201815de2ffbd Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin b...@freebsd.org
Date: Mon, 19 Sep 2011 13:56:26 +0200
Subject: [PATCH 4/5] Use PREFIXDIR when possible
---
sysui/desktop/share/create_tree.sh | 22 +++---
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 141e9a1..a694f6d 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -42,31 +42,31 @@ if [ ${GNOMEDIR} ]; then
chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.*
fi
-mkdir -p ${DESTDIR}/usr/bin
+mkdir -p ${DESTDIR}$PREFIXDIR/bin
test -n ${OFFICE_PREFIX} office_prefix=${OFFICE_PREFIX} || office_prefix=/opt
office_root=${office_prefix}/${PREFIX}
#this symlink is needed to have the API boostrap functions running right
-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/${PREFIX}
+ln -sf ${office_root}/program/soffice ${DESTDIR}$PREFIXDIR/bin/${PREFIX}
-cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
-chmod 0755 ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
+cp printeradmin.sh ${DESTDIR}$PREFIXDIR/bin/${PREFIX}-printeradmin
+chmod 0755 ${DESTDIR}$PREFIXDIR/bin/${PREFIX}-printeradmin
if test ${PREFIX} != libreoffice${PRODUCTVERSION} ; then
# compat symlinks
mkdir -p ${DESTDIR}${office_prefix}
ln -sf libreoffice${PRODUCTVERSION} ${DESTDIR}${office_root}
-ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}
-ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}-printeradmin
+ln -sf $PREFIXDIR/bin/${PREFIX} ${DESTDIR}$PREFIXDIR/bin/libreoffice${PRODUCTVERSION}
+ln -sf $PREFIXDIR/bin/${PREFIX}-printeradmin ${DESTDIR}$PREFIXDIR/bin/libreoffice${PRODUCTVERSION}-printeradmin
fi
-mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
+mkdir -p ${DESTDIR}$PREFIXDIR/share/mime/packages
+cp openoffice.org.xml ${DESTDIR}$PREFIXDIR/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
+chmod 0644 ${DESTDIR}$PREFIXDIR/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
-mkdir -p ${DESTDIR}/usr/share/applications
+mkdir -p ${DESTDIR}$PREFIXDIR/share/applications
for i in `cat launcherlist`; do
- ln -sf ${office_root}/share/xdg/${i} ${DESTDIR}/usr/share/applications/${PREFIX}-${i}
+ ln -sf ${office_root}/share/xdg/${i} ${DESTDIR}$PREFIXDIR/share/applications/${PREFIX}-${i}
done
--
1.7.6
pgpkOua0n8aql.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATH] fix FreeBSD specific soenv entry
Some FreeBSD only fixes for soenv
---
Bapt
From ac0e87bf8cd604557eb541261816f87dd254f4de Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin b...@freebsd.org
Date: Mon, 19 Sep 2011 13:57:23 +0200
Subject: [PATCH 5/5] Fix soenv for FreeBSD
---
set_soenv.in |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/set_soenv.in b/set_soenv.in
index 5ffd45f..c36a45d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -316,13 +316,13 @@ elsif ( $platform =~ m/freebsd/ )
$OS = FREEBSD;
$PATH_SEPERATOR = $ps;
$OSVERSION = '@OSVERSION@';
+ $OUTPATH= 'unxfbsd';
+ $oldoutfile = 'FreeBSDEnv.Set.sh';
if ($platform =~ m/^(amd64|x86_64)/)
{ my ( $JAVA_OS );
print Setting FreeBSD AMD64 specific values... ;
- $oldoutfile = FreeBSDAMDEnv.Set.sh;
$CPU= X;
$CPUNAME= X86_64;
- $OUTPATH= unxfbsdx;
$JAVA_OS= '@JAVA_HOME@';
$JAVA_OS=~ s/.*\///;
if ($JAVA_OS =~ m/^linux/)
@@ -338,7 +338,6 @@ elsif ( $platform =~ m/freebsd/ )
}
elsif ($platform =~ m/^i386/)
{ print Setting FreeBSD x86 specific values... ;
- $oldoutfile = FreeBSDX86Env.Set.sh;
$CPU= I;
$CPUNAME= INTEL;
$OUTPATH= unxfbsdi;
--
1.7.6
pgpQIeWB1Dofl.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] use PREFIXDIR in distro-install-desktop-integration
Hi, Here is a patch to use $PREFIXDIR instead of hardcoding /usr in the deistro-install-desktop-integration script. This is necessary to build on FreeBSD as libreoffice is not installed in /usr but we still want to use distro-install-desktop-integration. Of course, the patch is in the licenses that you prefers :) regards, Bapt From 18e18a49e359f964da10075147591e8c4074ef70 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin b...@freebsd.org Date: Mon, 19 Sep 2011 13:40:48 +0200 Subject: [PATCH] Use PREFIXDIR each time possible to allow installing where /usr is not the prefix --- bin/distro-install-desktop-integration | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 80e5c4a..466a9ad 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -12,10 +12,10 @@ create_wrapper() echo Install $PREFIXDIR/bin/$1 if test -L $DESTDIR$PREFIXDIR/bin/$1 ; then -# do not overwrite /usr/bin/libreoffice symlink created by create_tree.sh +# do not overwrite $PREFIXDIR/bin/libreoffice symlink created by create_tree.sh # the symlink is necessary by java UNO components to find # the UNO installation using $PATH; this function used to be provided -# by /usr/bin/soffice symlink, see +# by $PREFIXDIR/bin/soffice symlink, see # http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html # Note: if you want to support parallel installation of more OOo versions # you cannot include this link directly into the package @@ -87,7 +87,7 @@ add_wrapper() test -n $oowrapper_name create_man_link $oowrapper_name $used_man_page $file_list # add desktop file to the right file list -test -n $desktop_file -a -f $DESTDIR/$file_list echo /usr/share/applications/$desktop_file $DESTDIR/$file_list +test -n $desktop_file -a -f $DESTDIR/$file_list echo $PREFIXDIR/share/applications/$desktop_file $DESTDIR/$file_list } # install desktop integration from plain packages @@ -109,8 +109,8 @@ sed -i \ export ICON_PREFIX=$INSTALLDIRNAME export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons export PRODUCTVERSION= -export KDEMAINDIR=/usr -export GNOMEDIR=/usr +export KDEMAINDIR=$PREFIXDIR +export GNOMEDIR=$PREFIXDIR export GNOME_MIME_THEME=hicolor /bin/bash ./create_tree.sh ) @@ -119,8 +119,8 @@ rm -rf $sysui_temp # we do not want some stuff from the plain packages rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME-printeradmin -rm -f $DESTDIR/usr/share/applications/libreoffice-javafilter.desktop -rm -f $DESTDIR/usr/share/applications/libreoffice-printeradmin.desktop +rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-javafilter.desktop +rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-printeradmin.desktop if test -d $DESTDIR/opt ; then rm -f $DESTDIR/opt/$INSTALLDIRNAME rmdir --ignore-fail-on-non-empty $DESTDIR/opt @@ -139,11 +139,11 @@ cd - # put the stuff installed by create_tree.sh into the right file lists # desktop files will be added by the corresponding add_wrapper command if test -f $DESTDIR/gid_Module_Root_Brand ; then -for dir in /usr/share/application-registry \ - /usr/share/mimelnk/application \ - /usr/share/mime/packages \ - /usr/share/mime-info \ - /usr/share/icons ; do +for dir in $PREFIXDIR/share/application-registry \ + $PREFIXDIR/share/mimelnk/application \ + $PREFIXDIR/share/mime/packages \ + $PREFIXDIR/share/mime-info \ + $PREFIXDIR/share/icons ; do find $DESTDIR$dir \( -type f -o -type l \) -printf $dir/%P\n $DESTDIR/gid_Module_Root_Brand done fi @@ -162,7 +162,7 @@ add_wrapper libreofficesoffice libreoffice libreoffice-star add_wrapper lofficesoffice libreoffice gid_Module_Root_Brand add_wrapper unopkg unopkg unopkg gid_Module_Root_Brand -# /usr/bin/ooffice symlink is necessary by java UNO components to find +# $PREFIXDIR/bin/ooffice symlink is necessary by java UNO components to find # the UNO installation using $PATH, see # http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html # Note: if you want to support parallel installation of more OOo versions -- 1.7.6 pgpjDozquLPbb.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] unify unxfbsd.mk
On Mon, Sep 19, 2011 at 03:24:52PM +0200, Francois Tigeot wrote: On Mon, Sep 19, 2011 at 01:49:25PM +0200, Baptiste Daroussin wrote: Here is a patch to remove the unxfbsdi.mk and unxfbsx.mk, using a single unxfbsd.mk highly simplified Thanks for the patch, I've pushed it (apart from the DLLPOSTFIX= line). Thanks, --- Bapt pgp3YQRoWgdbZ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] do not hardcode gperf
Here is a patch to remove a hard coded gperf call. regards, Bapt From fa78e8613963ab809d3de72be69a1c85421d9c5a Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin b...@freebsd.org Date: Mon, 19 Sep 2011 19:22:32 +0200 Subject: [PATCH 6/6] Do not hard code gperf --- filter/source/svg/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile index bd0e85e..20ed8f8 100644 --- a/filter/source/svg/Makefile +++ b/filter/source/svg/Makefile @@ -53,7 +53,7 @@ $(filter_GEN_svg_Tokens_hxx) : $(filter_GEN_svg_Tokens_gperf) $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) $(call gb_Output_announce,$@,build,GPF,1) $(call gb_Helper_abbreviate_dirs, \ - gperf --compare-strncmp -C -m 20 $(filter_GEN_svg_Tokens_gperf) \ + $(GPERF) --compare-strncmp -C -m 20 $(filter_GEN_svg_Tokens_gperf) \ | sed -e s/(char\*)0/(char\*)0$(COMMA) 0/g \ $(filter_GEN_svg_Tokens_cxx)) -- 1.7.6 pgpZhn0n6jtjs.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] no libreoffice-build-3.3.99.1 ?
Hi, I wanted to prepare the freebsd port for libreoffice 3.4 beta1, but I can find the distfile for libreoffice-build-3.3.99.1 on the mirrors, it is missing or I missed something and it is not needed anymore? regards, Bapt ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] FreeBSD support round2
Hi, here is a new set of simple patches for freebsd. libs-gui-fix-spadmin set the LD_LIBRARY_PATH so be able to correctly launch spadmin bootstrap-cleanup-unx-fbsd.mk is inspired by openbsd, it is a huge simplification of what was done before + it prevents from having different shared library name depending on architecture which easier the management a plist. libs-core-fix-unopkg.sh add FreeBSD to the list of BSD OS which needs the LD_LIBRARY_PATH to be able to correctly launch it? Hope this could be also committed in the 3.3.1 branch :) regards, Bapt libs-gui-fix-spadmin Description: Binary data bootstrap-cleanup-unxfbsd.mk Description: Binary data libs-core-fix-unopkg.sh Description: Bourne shell script ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] FreeBSD support round2
2011/2/8 Baptiste Daroussin b...@freebsd.org: Hi, here is a new set of simple patches for freebsd. libs-gui-fix-spadmin set the LD_LIBRARY_PATH so be able to correctly launch spadmin bootstrap-cleanup-unx-fbsd.mk is inspired by openbsd, it is a huge simplification of what was done before + it prevents from having different shared library name depending on architecture which easier the management a plist. libs-core-fix-unopkg.sh add FreeBSD to the list of BSD OS which needs the LD_LIBRARY_PATH to be able to correctly launch it? Hope this could be also committed in the 3.3.1 branch :) regards, Bapt Please forget about the unxfbsd.mk patch currently as it brings some bugs, the other patches are still ok sorry for noise. regards, Bapt ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] bsdtar works as fine as gnu tar
Hi, On FreeBSD we use bsdtar (libarchive) and from my testings it works great with libreoffice (no regression compared to gnu tar) here is an attempt to allow checking for both bsdtar and gnu tar in configure (against build git repository) Hope this is ok regards, Bapt diff --git a/configure.in b/configure.in index d23440c..b427511 100755 --- a/configure.in +++ b/configure.in @@ -1334,9 +1334,9 @@ if test -z $BASH; then fi AC_SUBST(BASH) -AC_MSG_CHECKING([for GNU tar]) +AC_MSG_CHECKING([for GNU or BSD tar]) for a in $GNUTAR gtar gnutar tar; do - $a --version 2 /dev/null | grep GNU 21 /dev/null + $a --version 2 /dev/null | egrep GNU|bsdtar 21 /dev/null if test $? -eq 0; then GNUTAR=$a break @@ -1344,7 +1344,7 @@ for a in $GNUTAR gtar gnutar tar; do done AC_MSG_RESULT($GNUTAR) if test -z $GNUTAR; then -AC_MSG_ERROR([not found. install GNU tar.]) +AC_MSG_ERROR([not found. install GNU or BSD tar.]) fi AC_SUBST(GNUTAR) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] freebsd support
2011/2/1 Robert Nagy rob...@openbsd.org: Hey, I am not sure that the a/desktop/scripts/soffice.sh diff is needed on FreeBSD, I tought $ORIGIN works fine there. nope I wasn't able to run it without sur LD_LIBRARY_PATH but maybe there is something I don't know which would prevent me from doing that :) regards, Bapt ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] bsdtar works as fine as gnu tar
2011/2/1 Nguyen Vu Hung vuhung16p...@gmail.com:
On Tue, Feb 1, 2011 at 4:26 PM, Baptiste Daroussin b...@freebsd.org wrote:
Hi,
On FreeBSD we use bsdtar (libarchive) and from my testings it works
great with libreoffice (no regression compared to gnu tar)
here is an attempt to allow checking for both bsdtar and gnu tar in
configure (against build git repository)
A person who tries to compile LibO *is* a programmer++.
So, to make things simple, let's force user having GNU tar, not BSD tar.
GNU tar can be installed on BSD as well as other non-Linux OSes.
I am use we don't want too much checking in configure.in in order to
make LibO support more platforms.
--
Best Regards,
Nguyen Hung Vu [aka: NVH] ( in Vietnamese: Nguyễn Vũ Hưng )
vuhung16plus{remove}@gmail.dot.com , YIM: vuhung16 , Skype: vuhung16plus
Seriously why not supporting bsdtar? It has a great effort is made to
make it gnu compatible in fact compatible with the largest possible
set of archive formats.
All the testing I have done with bsd tar shows it performs at least as
well as gnu tar.
The patch is minimalistic and works. it is not as if it added 10+
lines of cryptic code.
regards,
Bapt
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] LibreOffice on FreeBSD
2011/1/31 ski libreoff...@mail.ru: Hi! Is there any possibility to build the LibreOffice under the FreeBSD? Now I get this error: I am currently writing a ports for libreoffice, it should hit the ports tree this week (my be next week depending on the testing) it builds and run fine, I just have to polish some stuff : desktop files and mime types. I you want to test my : http://git.etoilebsd.net/ports/ regards, Bapt ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] LibreOffice on FreeBSD
2011/1/31 Michael Meeks michael.me...@novell.com: Heh; could you submit the patches to the list (with suitable LGPLv3+ / MPL license (if you're ok with that). If you could glup the clean ones together into one patch: soffice.sh, ooinstall, build-ooo can go in as-is; the others need some more polish to not break other platforms I think :-) it would be wonderful to get them included. Of course I will, I was planning to send that today, but ENOTIME :) I will in the next days. regards, Bapt ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] freebsd support
Hi all,
Here are the first patch for freebsd support :
I splitted them corresponding to the different git and prefix them
with the git repository name.
Of course those patches are in any license you want that best fits your needs :)
The other patch are not included as they need more work, and I don't
know how to integrate them cleanly.
For example using bsdtar (libarchive) instead of GNU tar perfectly
works to may be there should be a test in configure.in to allow bsdtar
as well as gnu tar
Another patch is that build/libreoffice/oox/util/makefile.mk needs to
link to -lcrypto on freebsd. Don't know how to integrate that cleanly
building with java bring a problem apache-commons/java/*/makefile.mk
because the ANT_OPT line fails with our openjdk6 or our version of
ant, don't know. It leads to a class def not found exception,
searching -Dencoding... in classpath
commenting out the ANT_OPT line fix the problem.
regards,
Bapt
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index e718b8a..ba226fa 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -14,7 +14,7 @@ use Cwd;
$path = '';
$do_link = 0;
-( $^O =~ /netbsd/i ) || ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f /proc/meminfo ) || die The installer cannot work without javaldx running, which requires /proc to be mounted;
+( $^O =~ /freebsd/i ) || ( $^O =~ /netbsd/i ) || ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f /proc/meminfo ) || die The installer cannot work without javaldx running, which requires /proc to be mounted;
# Workaround for system Mozilla
if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
diff --git a/bin/build-ooo b/bin/build-ooo
index e4ab354..c3b2248 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -11,7 +11,7 @@ fi
export TARFILE_LOCATION
-if test z$BUILD_WIN32 = z -a z`uname -s` != zSunOS -a z`uname -s` != zDarwin -a z`uname -s` != zOpenBSD; then
+if test z$BUILD_WIN32 = z -a z`uname -s` != zSunOS -a z`uname -s` != zDarwin -a z`uname -s` != zOpenBSD -a z`uname -s` != zFreeBSD; then
if ! test -f /proc/cpuinfo; then
echo Looks like proc isn't mounted - this means almost certain
echo Java related weird build failure: please check /proc
diff --git a/bin/ooinstall b/bin/ooinstall
index 170ee29..2f54005 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -31,7 +31,7 @@ sub suck_setup($)
return 0;
}
-( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f /proc/meminfo ) || die The installer cannot work without javaldx running, which requires /proc to be mounted;
+( $^O =~ /freebsd/i) || ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f /proc/meminfo ) || die The installer cannot work without javaldx running, which requires /proc to be mounted;
suck_setup (./setup) || suck_setup (bin/setup) || die can't find bin/setup;
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 2989edd..e485b11 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -70,7 +70,7 @@ fi
sd_binary=`basename $0 | sed 's/libreoffice/soffice/g'`.bin
case `uname -s` in
-NetBSD|OpenBSD) # this is a temporary hack until we can live with the default search paths
+NetBSD|OpenBSD|FreeBSD) # this is a temporary hack until we can live with the default search paths
sd_prog1=$sd_prog/../basis-link/program
sd_prog2=$sd_prog/../basis-link/ure-link/lib
LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
