diff options
Diffstat (limited to 'editors/libreoffice/files')
42 files changed, 95 insertions, 895 deletions
diff --git a/editors/libreoffice/files/patch-Makefile.in b/editors/libreoffice/files/patch-Makefile.in index 1247bdf7fe54..b5bb0f95c29c 100644 --- a/editors/libreoffice/files/patch-Makefile.in +++ b/editors/libreoffice/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2015-08-22 06:41:35 UTC +--- Makefile.in.orig 2016-10-28 14:50:26 UTC +++ Makefile.in -@@ -321,7 +321,7 @@ else +@@ -355,7 +355,7 @@ else @exit 1 endif diff --git a/editors/libreoffice/files/patch-Repository.mk b/editors/libreoffice/files/patch-Repository.mk deleted file mode 100644 index 85f753452f45..000000000000 --- a/editors/libreoffice/files/patch-Repository.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- Repository.mk.orig 2015-08-22 06:41:35 UTC -+++ Repository.mk -@@ -68,7 +68,7 @@ $(eval $(call gb_Helper_register_executa - svpclient \ - pixelctl ) \ - $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \ -- $(if $(filter LINUX MACOSX WNT,$(OS)),icontest \ -+ $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),icontest \ - outdevgrind) \ - vcldemo \ - tiledrendering \ diff --git a/editors/libreoffice/files/patch-avmedia_Library__avmediaogl.mk b/editors/libreoffice/files/patch-avmedia_Library__avmediaogl.mk deleted file mode 100644 index 7782dd1ed7de..000000000000 --- a/editors/libreoffice/files/patch-avmedia_Library__avmediaogl.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- avmedia/Library_avmediaogl.mk.orig 2015-08-22 06:41:35 UTC -+++ avmedia/Library_avmediaogl.mk -@@ -52,7 +52,7 @@ else ifeq ($(OS),MACOSX) - $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\ - OpenGL \ - )) --else ifeq ($(OS),LINUX) -+else ifneq ($(filter FREEBSD LINUX,$(OS)),) - $(eval $(call gb_Library_add_libs,avmediaogl,\ - -lGL \ - )) diff --git a/editors/libreoffice/files/patch-bin_distro-install-desktop-integration b/editors/libreoffice/files/patch-bin_distro-install-desktop-integration index a10fcfbab2cf..41ddf7a8630b 100644 --- a/editors/libreoffice/files/patch-bin_distro-install-desktop-integration +++ b/editors/libreoffice/files/patch-bin_distro-install-desktop-integration @@ -1,14 +1,7 @@ ---- bin/distro-install-desktop-integration.orig 2015-08-22 06:41:35 UTC +--- bin/distro-install-desktop-integration.orig 2016-10-28 14:50:26 UTC +++ bin/distro-install-desktop-integration -@@ -94,13 +94,13 @@ add_wrapper() - } - - # install desktop integration from plain packages --sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX` -+sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX` - cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp" - cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" - builddir=`pwd` +@@ -99,7 +99,7 @@ cp -a workdir/CustomTarget/sysui/share/l + cp -a "${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp" cd $sysui_temp # we want non-versioned stuff in the distro packages -sed -i \ @@ -16,15 +9,23 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -111,6 +111,7 @@ sed -i \ +@@ -109,13 +109,13 @@ sed -i \ + export OFFICE_PREFIX=$LIBDIR export PREFIX=$INSTALLDIRNAME export ICON_PREFIX=$INSTALLDIRNAME - export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons -+ export APPDATA_SOURCE_DIR=$builddir/sysui/desktop/appstream-appdata +- export ICON_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/icons ++ export ICON_SOURCE_DIR="${SRCDIR}"/sysui/desktop/icons export PRODUCTVERSION= export KDEMAINDIR=$PREFIXDIR export PREFIXDIR=${PREFIXDIR} -@@ -130,7 +131,7 @@ fi + export GNOMEDIR=$PREFIXDIR + export GNOME_MIME_THEME=hicolor +- export APPDATA_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/appstream-appdata ++ export APPDATA_SOURCE_DIR="${SRCDIR}"/sysui/desktop/appstream-appdata + bash ./create_tree.sh + ) + cd - +@@ -130,7 +130,7 @@ fi # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages @@ -33,30 +34,21 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -145,7 +146,7 @@ if test -f $DESTDIR/gid_Module_Root_Bran - $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 -+ find "$DESTDIR$dir" \( -type f -o -type l \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand - done - fi - -@@ -177,12 +178,12 @@ ln -sf $INSTALLDIR/program/soffice $DEST +@@ -177,12 +177,12 @@ ln -sf $INSTALLDIR/program/soffice $DEST test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand # create bash completion --mkdir -p $DESTDIR/etc/bash_completion.d --./bin/generate-bash-completion bin/bash-completion.in $DESTDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh --test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand -+mkdir -p $DESTDIR$PREFIXDIR/etc/bash_completion.d -+./bin/generate-bash-completion bin/bash-completion.in $DESTDIR$PREFIXDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh -+test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand +-mkdir -p $DESTDIR/usr/share/bash-completion/completions +-"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh +-test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand ++mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions ++"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh ++test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then -- ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/etc/bash_completion.d/ooffice.sh -- test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand -+ ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR$PREFIXDIR/etc/bash_completion.d/ooffice.sh -+ test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand +- "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh +- test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand ++ "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh ++ test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand fi echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath"; diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx deleted file mode 100644 index 4b697fcd27f5..000000000000 --- a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx +++ /dev/null @@ -1,43 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx.orig 2015-08-22 06:41:35 UTC -+++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx -@@ -100,11 +100,7 @@ - }; - - 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 @@ - 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<type_info *>(dlsym( m_hApp, symName.getStr() )); --#endif - - if (rtti) - { -@@ -169,13 +161,13 @@ - // ensure availability of base - type_info * base_rtti = getRTTI( - (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription ); -- rtti = new __si_class_type_info( -- strdup( rttiName ), static_cast<__class_type_info *>(base_rtti) ); -+ rtti = new __cxxabiv1::__si_class_type_info( -+ strdup( rttiName ), static_cast<__cxxabiv1::__class_type_info *>(base_rtti) ); - } - else - { - // this class has no base class -- rtti = new __class_type_info( strdup( rttiName ) ); -+ rtti = new __cxxabiv1::__class_type_info( strdup( rttiName ) ); - } - - pair< t_rtti_map::iterator, bool > insertion( diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx index d08ce84df4a8..f1ae1eb17080 100644 --- a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx +++ b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx @@ -1,6 +1,6 @@ ---- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig 2016-05-04 21:28:24 UTC +--- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig 2016-10-28 14:50:26 UTC +++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx -@@ -32,10 +32,34 @@ +@@ -33,10 +33,34 @@ #include <uno/any2.h> #include "uno/mapping.h" @@ -35,9 +35,9 @@ +namespace CPPU_CURRENT_NAMESPACE +{ - // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h + // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h -@@ -105,6 +129,8 @@ extern "C" void __cxa_throw( +@@ -98,6 +122,8 @@ extern "C" void __cxa_throw( } #endif @@ -46,7 +46,7 @@ extern "C" void privateSnippetExecutorGeneral(); extern "C" void privateSnippetExecutorVoid(); extern "C" void privateSnippetExecutorHyper(); -@@ -115,12 +141,17 @@ extern "C" void privateSnippetExecutorCl +@@ -108,12 +134,17 @@ extern "C" void privateSnippetExecutorCl namespace CPPU_CURRENT_NAMESPACE { diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx index 09559faac4fe..9ddd064a932c 100644 --- a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx +++ b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx @@ -1,4 +1,4 @@ ---- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx.orig 2015-08-22 06:41:35 UTC +--- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx.orig 2016-10-28 14:50:26 UTC +++ bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -198,10 +198,17 @@ static void cpp_call( catch (...) diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_rtti.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_rtti.cxx deleted file mode 100644 index e47f529708a9..000000000000 --- a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_rtti.cxx +++ /dev/null @@ -1,44 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx.orig 2015-08-22 06:41:35 UTC -+++ bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx -@@ -57,11 +57,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 - { - } - -@@ -95,11 +91,7 @@ std::type_info * RTTI::getRTTI(typelib_T - 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<std::type_info *>(dlsym( m_hApp, symName.getStr() )); --#endif - - if (rtti) - { -@@ -165,6 +157,9 @@ std::type_info * RTTI::getRTTI(typelib_T - break; - default: - { -+#ifdef _LIBCPP_VERSION -+ //TODO -+#else - char * pad = new char[ - sizeof (__cxxabiv1::__vmi_class_type_info) - + ((itd.nBaseTypes - 1) -@@ -187,6 +182,7 @@ std::type_info * RTTI::getRTTI(typelib_T - | ((8 * i) << __cxxabiv1::__base_class_type_info::__offset_shift)); - } - rtti = info; -+#endif - break; - } - } diff --git a/editors/libreoffice/files/patch-chart2_Library__chartcore.mk b/editors/libreoffice/files/patch-chart2_Library__chartcore.mk deleted file mode 100644 index 48fc81281c8d..000000000000 --- a/editors/libreoffice/files/patch-chart2_Library__chartcore.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- chart2/Library_chartcore.mk.orig 2015-08-22 06:41:35 UTC -+++ chart2/Library_chartcore.mk -@@ -254,6 +254,11 @@ else ifeq ($(OS),MACOSX) - $(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\ - OpenGL \ - )) -+else ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Library_add_libs,chartcore,\ -+ -lGL \ -+ -lX11 \ -+)) - else ifeq ($(OS),LINUX) - $(eval $(call gb_Library_add_libs,chartcore,\ - -ldl \ diff --git a/editors/libreoffice/files/patch-chart2_Library__chartopengl.mk b/editors/libreoffice/files/patch-chart2_Library__chartopengl.mk deleted file mode 100644 index d651b795a87b..000000000000 --- a/editors/libreoffice/files/patch-chart2_Library__chartopengl.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- chart2/Library_chartopengl.mk.orig 2015-08-22 06:41:35 UTC -+++ chart2/Library_chartopengl.mk -@@ -66,6 +66,11 @@ else ifeq ($(OS),MACOSX) - $(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\ - OpenGL \ - )) -+else ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Library_add_libs,chartopengl,\ -+ -lGL \ -+ -lX11 \ -+)) - else ifeq ($(OS),LINUX) - $(eval $(call gb_Library_add_libs,chartopengl,\ - -ldl \ diff --git a/editors/libreoffice/files/patch-configure b/editors/libreoffice/files/patch-configure new file mode 100644 index 000000000000..3def1c5fb76a --- /dev/null +++ b/editors/libreoffice/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2016-10-28 14:59:52 UTC ++++ configure +@@ -31912,7 +31912,7 @@ fi + + + +- elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \ ++ elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" -o "$_os" = "FreeBSD" \ + && test "$with_system_openssl" != "no"; then + with_system_openssl=yes + SYSTEM_OPENSSL=TRUE diff --git a/editors/libreoffice/files/patch-configure.ac b/editors/libreoffice/files/patch-configure.ac deleted file mode 100644 index 7891d280c2ad..000000000000 --- a/editors/libreoffice/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2016-05-04 21:28:24 UTC -+++ configure.ac -@@ -9304,7 +9304,7 @@ if test "$enable_openssl" = "yes"; then - - with_system_openssl=no - libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) -- elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \ -+ elif test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \ - && test "$with_system_openssl" != "no"; then - with_system_openssl=yes - SYSTEM_OPENSSL=TRUE diff --git a/editors/libreoffice/files/patch-desktop_Library__sofficeapp.mk b/editors/libreoffice/files/patch-desktop_Library__sofficeapp.mk deleted file mode 100644 index 843b7e200e09..000000000000 --- a/editors/libreoffice/files/patch-desktop_Library__sofficeapp.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- desktop/Library_sofficeapp.mk.orig 2015-08-22 06:41:35 UTC -+++ desktop/Library_sofficeapp.mk -@@ -104,7 +104,16 @@ $(eval $(call gb_Library_add_libs,soffic - -lpthread \ - )) - else --ifeq ($(OS),LINUX) -+ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Library_use_static_libraries,sofficeapp,\ -+ glxtest \ -+)) -+ -+$(eval $(call gb_Library_add_libs,sofficeapp,\ -+ -lGL \ -+ -lX11 \ -+)) -+else ifeq ($(OS),LINUX) - $(eval $(call gb_Library_use_static_libraries,sofficeapp,\ - glxtest \ - )) diff --git a/editors/libreoffice/files/patch-desktop_scripts_soffice.sh b/editors/libreoffice/files/patch-desktop_scripts_soffice.sh deleted file mode 100644 index 21dcb49b0be1..000000000000 --- a/editors/libreoffice/files/patch-desktop_scripts_soffice.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- desktop/scripts/soffice.sh.orig 2015-09-17 13:33:12 UTC -+++ desktop/scripts/soffice.sh -@@ -128,7 +128,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) diff --git a/editors/libreoffice/files/patch-i18npool_CustomTarget__breakiterator.mk b/editors/libreoffice/files/patch-i18npool_CustomTarget__breakiterator.mk deleted file mode 100644 index 6e9d6876d75d..000000000000 --- a/editors/libreoffice/files/patch-i18npool_CustomTarget__breakiterator.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- i18npool/CustomTarget_breakiterator.mk.orig 2015-08-22 06:41:35 UTC -+++ i18npool/CustomTarget_breakiterator.mk -@@ -98,7 +98,7 @@ $(i18npool_BIDIR)/%.brk : $(i18npool_BID - # sed substitution... - $(i18npool_BIDIR)/%.txt : \ - $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir -- sed -e ': dummy' \ -+ $(GNUSED) -e ': dummy' \ - $(if $(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),-e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#") \ - $(if $(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER),,\ - -e '/\[:LineBreak = Conditional_Japanese_Starter:\]/d' \ diff --git a/editors/libreoffice/files/patch-include_LibreOfficeKit_LibreOfficeKitInit.h b/editors/libreoffice/files/patch-include_LibreOfficeKit_LibreOfficeKitInit.h new file mode 100644 index 000000000000..a94d3d155cde --- /dev/null +++ b/editors/libreoffice/files/patch-include_LibreOfficeKit_LibreOfficeKitInit.h @@ -0,0 +1,11 @@ +--- include/LibreOfficeKit/LibreOfficeKitInit.h.orig 2016-10-28 14:50:26 UTC ++++ include/LibreOfficeKit/LibreOfficeKitInit.h +@@ -19,7 +19,7 @@ extern "C" + + #if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) ||\ + defined(_WIN32) || defined(__APPLE__) || defined (__NetBSD__) ||\ +- defined (__sun) || defined(__OpenBSD__) ++ defined (__sun) || defined(__OpenBSD__) || defined (__FreeBSD__) + + #include <stdio.h> + #include <stdlib.h> diff --git a/editors/libreoffice/files/patch-liborcus b/editors/libreoffice/files/patch-liborcus deleted file mode 100644 index 3e6b67899560..000000000000 --- a/editors/libreoffice/files/patch-liborcus +++ /dev/null @@ -1,184 +0,0 @@ ---- configure.ac.orig 2015-08-22 06:41:35 UTC -+++ configure.ac -@@ -9016,7 +9016,7 @@ if test -z "$enable_orcus" -o "$enable_o - ENABLE_ORCUS="TRUE" - AC_DEFINE(ENABLE_ORCUS) - -- libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.8 >= 0.7.0]) -+ libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 >= 0.9.0]) - if test "$with_system_orcus" != "yes"; then - if test "$SYSTEM_BOOST" = "TRUE"; then - # =========================================================== ---- sc/source/filter/html/htmlpars.cxx.orig 2015-08-22 06:41:35 UTC -+++ sc/source/filter/html/htmlpars.cxx -@@ -3170,6 +3170,34 @@ public: - maPropName = MemStr(); - maPropValue = MemStr(); - } -+ -+ // new members -+ void simple_selector_type(const char* /*p*/, size_t /*n*/) {} -+ -+ void simple_selector_class(const char* /*p*/, size_t /*n*/) {} -+ -+ void simple_selector_pseudo_element(orcus::css::pseudo_element_t /*pe*/) {} -+ -+ void simple_selector_pseudo_class(orcus::css::pseudo_class_t /*pc*/) {} -+ -+ void simple_selector_id(const char* /*p*/, size_t /*n*/) {} -+ -+ void end_simple_selector() {} -+ -+ void end_selector() {} -+ -+ void combinator(orcus::css::combinator_t /*combinator*/) {} -+ -+ void rgb(uint8_t /*red*/ , uint8_t /*green*/ , uint8_t /*blue*/ ) {} -+ -+ void rgba(uint8_t /*red*/ , uint8_t /*green*/ , uint8_t /*blue*/ , double /*alpha*/ ) {} -+ -+ void hsl(uint8_t /*hue*/ , uint8_t /*sat*/ , uint8_t /*light*/ ) {} -+ -+ void hsla(uint8_t /*hue*/ , uint8_t /*sat*/ , uint8_t /*light*/ , double /*alpha*/ ) {} -+ -+ void url(const char* /*p*/, size_t /*n*/) {} -+ - }; - - } -@@ -3183,7 +3211,7 @@ void ScHTMLQueryParser::ParseStyle(const - { - aParser.parse(); - } -- catch (const orcus::css_parse_error&) -+ catch (const orcus::css::parse_error&) - { - // TODO: Parsing of CSS failed. Do nothing for now. - } ---- sc/source/filter/inc/orcusinterface.hxx.orig 2015-08-22 06:41:35 UTC -+++ sc/source/filter/inc/orcusinterface.hxx -@@ -43,6 +43,9 @@ public: - ScOrcusGlobalSettings(ScDocumentImport& rDoc); - - virtual void set_origin_date(int year, int month, int day) SAL_OVERRIDE; -+ -+ virtual void set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) SAL_OVERRIDE; -+ virtual orcus::spreadsheet::formula_grammar_t get_default_formula_grammar() const SAL_OVERRIDE; - }; - - class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings -@@ -120,9 +123,12 @@ public: - orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second) SAL_OVERRIDE; - - virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) SAL_OVERRIDE; -+ virtual void set_format(orcus::spreadsheet::row_t row_start, orcus::spreadsheet::col_t col_start, -+ orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end, size_t xf_index) SAL_OVERRIDE; - - virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) SAL_OVERRIDE; - virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE; -+ virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double val) SAL_OVERRIDE; - - virtual void set_shared_formula( - orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, -@@ -203,6 +209,10 @@ public: - virtual void set_cell_xf_count(size_t n) SAL_OVERRIDE; - virtual size_t commit_cell_xf() SAL_OVERRIDE; - -+ // dxf -+ virtual void set_dxf_count(size_t count) SAL_OVERRIDE; -+ virtual size_t commit_dxf() SAL_OVERRIDE; -+ - // xf (cell format) - used both by cell xf and cell style xf. - - virtual void set_xf_number_format(size_t index) SAL_OVERRIDE; ---- sc/source/filter/orcus/interface.cxx.orig 2015-08-22 06:41:35 UTC -+++ sc/source/filter/orcus/interface.cxx -@@ -35,6 +35,15 @@ void ScOrcusGlobalSettings::set_origin_d - mrDoc.setOriginDate(year, month, day); - } - -+void ScOrcusGlobalSettings::set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t /*grammar*/) -+{ -+} -+ -+orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const -+{ -+ return orcus::spreadsheet::formula_grammar_unknown; -+} -+ - ScOrcusFactory::StringCellCache::StringCellCache(const ScAddress& rPos, size_t nIndex) : - maPos(rPos), mnIndex(nIndex) {} - -@@ -263,6 +272,11 @@ void ScOrcusSheet::set_format(os::row_t - { - } - -+void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/, -+ os::row_t /*row_end*/, os::col_t /*col_end*/, size_t /*xf_index*/) -+{ -+} -+ - namespace { - - formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t grammar ) -@@ -270,16 +284,18 @@ formula::FormulaGrammar::Grammar getCalc - formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_ODFF; - switch(grammar) - { -- case orcus::spreadsheet::ods: -+ case orcus::spreadsheet::formula_grammar_ods: - eGrammar = formula::FormulaGrammar::GRAM_ODFF; - break; -- case orcus::spreadsheet::xlsx_2007: -- case orcus::spreadsheet::xlsx_2010: -+ case orcus::spreadsheet::formula_grammar_xlsx_2007: -+ case orcus::spreadsheet::formula_grammar_xlsx_2010: - eGrammar = formula::FormulaGrammar::GRAM_OOXML; - break; -- case orcus::spreadsheet::gnumeric: -+ case orcus::spreadsheet::formula_grammar_gnumeric: - eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1; - break; -+ case orcus::spreadsheet::formula_grammar_unknown: -+ break; - } - - return eGrammar; -@@ -309,6 +325,19 @@ void ScOrcusSheet::set_formula_result(os - pCell->SetHybridString(mrDoc.getDoc().GetSharedStringPool().intern(aResult)); - } - -+void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, double /*val*/) -+{ -+ ScFormulaCell* pCell = mrDoc.getDoc().GetFormulaCell(ScAddress(col, row, mnTab)); -+ if (!pCell) -+ { -+ SAL_WARN("sc", "trying to set formula result for non formula \ -+ cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab); -+ return; -+ } -+ -+ // TODO: FIXME -+} -+ - void ScOrcusSheet::set_shared_formula( - os::row_t row, os::col_t col, os::formula_grammar_t grammar, size_t sindex, - const char* p_formula, size_t n_formula) -@@ -577,6 +606,17 @@ size_t ScOrcusStyles::commit_cell_xf() - return 0; - } - -+// dxf -+ -+void ScOrcusStyles::set_dxf_count(size_t /*n*/) -+{ -+} -+ -+size_t ScOrcusStyles::commit_dxf() -+{ -+ return 0; -+} -+ - // xf (cell format) - used both by cell xf and cell style xf. - - void ScOrcusStyles::set_xf_number_format(size_t /*index*/) diff --git a/editors/libreoffice/files/patch-sal_osl_unx_backtrace.c b/editors/libreoffice/files/patch-sal_osl_unx_backtrace.c deleted file mode 100644 index ef92858930a0..000000000000 --- a/editors/libreoffice/files/patch-sal_osl_unx_backtrace.c +++ /dev/null @@ -1,21 +0,0 @@ ---- sal/osl/unx/backtrace.c.orig 2015-08-22 06:41:35 UTC -+++ sal/osl/unx/backtrace.c -@@ -177,15 +177,15 @@ void backtrace_symbols_fd( void **buffer - if ( dli.dli_fname && dli.dli_fbase ) - { - offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; -- fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); -+ fprintf( fp, "%s+0x%tx", dli.dli_fname, offset ); - } - if ( dli.dli_sname && dli.dli_saddr ) - { - offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; -- fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); -+ fprintf( fp, "(%s+0x%tx)", dli.dli_sname, offset ); - } - } -- fprintf( fp, "[0x%x]\n", *pFramePtr ); -+ fprintf( fp, "[%p]\n", *pFramePtr ); - } - fflush( fp ); - fclose( fp ); diff --git a/editors/libreoffice/files/patch-sal_osl_unx_pipe.cxx b/editors/libreoffice/files/patch-sal_osl_unx_pipe.cxx deleted file mode 100644 index 11efa9dfa21a..000000000000 --- a/editors/libreoffice/files/patch-sal_osl_unx_pipe.cxx +++ /dev/null @@ -1,65 +0,0 @@ ---- sal/osl/unx/pipe.cxx.orig 2015-12-11 02:29:35 UTC -+++ sal/osl/unx/pipe.cxx -@@ -82,10 +82,10 @@ oslPipe __osl_createPipeImpl() - return NULL; - pPipeImpl->m_nRefCount =1; - pPipeImpl->m_bClosed = false; --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - pPipeImpl->m_bIsInShutdown = false; - pPipeImpl->m_bIsAccepting = false; --#endif -+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - return pPipeImpl; - } - -@@ -359,7 +359,7 @@ void SAL_CALL osl_closePipe( oslPipe pPi - Thread does not return from accept on linux, so - connect to the accepting pipe - */ --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - struct sockaddr_un addr; - - if ( pPipe->m_bIsAccepting ) -@@ -387,7 +387,7 @@ void SAL_CALL osl_closePipe( oslPipe pPi - } - close(fd); - } --#endif /* LINUX */ -+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - - nRet = shutdown(ConnFD, 2); - if ( nRet < 0 ) -@@ -421,13 +421,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe - - OSL_ASSERT(strlen(pPipe->m_Name) > 0); - --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - pPipe->m_bIsAccepting = true; - #endif - - s = accept(pPipe->m_Socket, NULL, NULL); - --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - pPipe->m_bIsAccepting = false; - #endif - -@@ -437,13 +437,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe - return NULL; - } - --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - if ( pPipe->m_bIsInShutdown ) - { - close(s); - return NULL; - } --#endif /* LINUX */ -+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - else - { - /* alloc memory */ diff --git a/editors/libreoffice/files/patch-sal_osl_unx_socket.cxx b/editors/libreoffice/files/patch-sal_osl_unx_socket.cxx deleted file mode 100644 index f9ae9ceff0a8..000000000000 --- a/editors/libreoffice/files/patch-sal_osl_unx_socket.cxx +++ /dev/null @@ -1,98 +0,0 @@ ---- sal/osl/unx/socket.cxx.orig 2015-12-11 02:29:35 UTC -+++ sal/osl/unx/socket.cxx -@@ -447,7 +447,7 @@ oslSocket __osl_createSocketImpl(int Soc - pSocket->m_nLastError = 0; - pSocket->m_nRefCount = 1; - --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - pSocket->m_bIsAccepting = false; - #endif - -@@ -1364,13 +1364,13 @@ void SAL_CALL osl_releaseSocket( oslSock - { - if( pSocket && 0 == osl_atomic_decrement( &(pSocket->m_nRefCount) ) ) - { --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - if ( pSocket->m_bIsAccepting ) - { - SAL_WARN( "sal.osl", "attempt to destroy socket while accepting" ); - return; - } --#endif /* LINUX */ -+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - osl_closeSocket( pSocket ); - __osl_destroySocketImpl( pSocket ); - } -@@ -1393,7 +1393,7 @@ void SAL_CALL osl_closeSocket(oslSocket - - pSocket->m_Socket = OSL_INVALID_SOCKET; - --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - pSocket->m_bIsInShutdown = true; - - if ( pSocket->m_bIsAccepting ) -@@ -1437,7 +1437,7 @@ void SAL_CALL osl_closeSocket(oslSocket - } - pSocket->m_bIsAccepting = false; - } --#endif /* LINUX */ -+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - - nRet=close(nFD); - if ( nRet != 0 ) -@@ -1695,9 +1695,9 @@ oslSocket SAL_CALL osl_acceptConnectionO - } - - pSocket->m_nLastError=0; --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - pSocket->m_bIsAccepting = true; --#endif /* LINUX */ -+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - - if( ppAddr && *ppAddr ) - { -@@ -1718,22 +1718,22 @@ oslSocket SAL_CALL osl_acceptConnectionO - int nErrno = errno; - SAL_WARN( "sal.osl", "accept connection failed: (" << nErrno << ") " << strerror(nErrno) ); - --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - pSocket->m_bIsAccepting = false; --#endif /* LINUX */ -+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - return 0; - } - - assert(AddrLen == sizeof(struct sockaddr)); - --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - if ( pSocket->m_bIsInShutdown ) - { - close(Connection); - SAL_WARN( "sal.osl", "close while accept" ); - return 0; - } --#endif /* LINUX */ -+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - - if(ppAddr) - { -@@ -1758,11 +1758,11 @@ oslSocket SAL_CALL osl_acceptConnectionO - - pConnectionSockImpl->m_Socket = Connection; - pConnectionSockImpl->m_nLastError = 0; --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - pConnectionSockImpl->m_bIsAccepting = false; - - pSocket->m_bIsAccepting = false; --#endif /* LINUX */ -+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - return pConnectionSockImpl; - } - diff --git a/editors/libreoffice/files/patch-sal_osl_unx_sockimpl.hxx b/editors/libreoffice/files/patch-sal_osl_unx_sockimpl.hxx deleted file mode 100644 index 6cdd2ca4fc02..000000000000 --- a/editors/libreoffice/files/patch-sal_osl_unx_sockimpl.hxx +++ /dev/null @@ -1,28 +0,0 @@ ---- sal/osl/unx/sockimpl.hxx.orig 2015-12-11 02:29:35 UTC -+++ sal/osl/unx/sockimpl.hxx -@@ -24,11 +24,15 @@ - #include <osl/socket.h> - #include <osl/interlck.h> - -+#if defined(FREEBSD) || defined(LINUX) -+#define CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT 1 -+#endif -+ - struct oslSocketImpl { - int m_Socket; - int m_nLastError; - oslInterlockedCount m_nRefCount; --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - bool m_bIsAccepting; - bool m_bIsInShutdown; - #endif -@@ -45,7 +49,7 @@ struct oslPipeImpl { - sal_Char m_Name[PATH_MAX + 1]; - oslInterlockedCount m_nRefCount; - bool m_bClosed; --#if defined(LINUX) -+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT - bool m_bIsAccepting; - bool m_bIsInShutdown; - #endif diff --git a/editors/libreoffice/files/patch-sal_osl_unx_system.cxx b/editors/libreoffice/files/patch-sal_osl_unx_system.cxx index 5db2f43b0cf3..081fa2dd9acb 100644 --- a/editors/libreoffice/files/patch-sal_osl_unx_system.cxx +++ b/editors/libreoffice/files/patch-sal_osl_unx_system.cxx @@ -1,4 +1,4 @@ ---- sal/osl/unx/system.cxx.orig 2015-08-22 06:41:35 UTC +--- sal/osl/unx/system.cxx.orig 2016-10-28 14:50:26 UTC +++ sal/osl/unx/system.cxx @@ -247,6 +247,9 @@ int macxp_resolveAlias(char *path, int b #endif /* NO_PTHREAD_RTL */ diff --git a/editors/libreoffice/files/patch-sal_osl_unx_system.hxx b/editors/libreoffice/files/patch-sal_osl_unx_system.hxx index 9231c5fe9670..54fc10daf65e 100644 --- a/editors/libreoffice/files/patch-sal_osl_unx_system.hxx +++ b/editors/libreoffice/files/patch-sal_osl_unx_system.hxx @@ -1,6 +1,6 @@ ---- sal/osl/unx/system.hxx.orig 2015-08-22 06:41:35 UTC +--- sal/osl/unx/system.hxx.orig 2016-10-28 14:50:26 UTC +++ sal/osl/unx/system.hxx -@@ -113,7 +113,9 @@ +@@ -106,7 +106,9 @@ #endif #ifdef FREEBSD diff --git a/editors/libreoffice/files/patch-sc_Module__sc.mk b/editors/libreoffice/files/patch-sc_Module__sc.mk index e7e2adca8e51..4e4c3c5c36bc 100644 --- a/editors/libreoffice/files/patch-sc_Module__sc.mk +++ b/editors/libreoffice/files/patch-sc_Module__sc.mk @@ -1,12 +1,12 @@ ---- sc/Module_sc.mk.orig 2015-08-22 06:41:35 UTC +--- sc/Module_sc.mk.orig 2016-10-28 14:50:26 UTC +++ sc/Module_sc.mk @@ -54,7 +54,8 @@ $(eval $(call gb_Module_add_check_target $(eval $(call gb_Module_add_slowcheck_targets,sc, \ - CppunitTest_sc_condformats \ - CppunitTest_sc_new_cond_format_api \ -- CppunitTest_sc_subsequent_filters_test \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sc_subsequent_filters_test) \ - CppunitTest_sc_subsequent_export_test \ - CppunitTest_sc_bugfix_test \ - CppunitTest_sc_html_export_test \ + CppunitTest_sc_condformats \ + CppunitTest_sc_new_cond_format_api \ +- CppunitTest_sc_subsequent_filters_test \ ++ $(if $(filter FEEBSD,$(OS)),, ++ CppunitTest_sc_subsequent_filters_test) \ + CppunitTest_sc_subsequent_export_test \ + CppunitTest_sc_html_export_test \ + CppunitTest_sc_opencl_test \ diff --git a/editors/libreoffice/files/patch-sd_Module__sd.mk b/editors/libreoffice/files/patch-sd_Module__sd.mk deleted file mode 100644 index 695021d91b5e..000000000000 --- a/editors/libreoffice/files/patch-sd_Module__sd.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- sd/Module_sd.mk.orig 2015-08-22 06:41:35 UTC -+++ sd/Module_sd.mk -@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_l10n_targets - 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/editors/libreoffice/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx b/editors/libreoffice/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx deleted file mode 100644 index 33b0f91744db..000000000000 --- a/editors/libreoffice/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx +++ /dev/null @@ -1,16 +0,0 @@ ---- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig 2015-08-22 06:41:35 UTC -+++ shell/source/unix/sysshell/recently_used_file_handler.cxx -@@ -91,11 +91,11 @@ namespace /* private */ { - - void set_timestamp(const string_t& character) - { -- time_t t; -+ long t; - if (sscanf(character.c_str(), "%ld", &t) != 1) - timestamp_ = -1; - else -- timestamp_ = t; -+ timestamp_ = (time_t)t; - } - - void set_is_private(SAL_UNUSED_PARAMETER const string_t& /*character*/) diff --git a/editors/libreoffice/files/patch-solenv_bin_concat-deps.c b/editors/libreoffice/files/patch-solenv_bin_concat-deps.c deleted file mode 100644 index 259fa73cf256..000000000000 --- a/editors/libreoffice/files/patch-solenv_bin_concat-deps.c +++ /dev/null @@ -1,36 +0,0 @@ ---- solenv/bin/concat-deps.c.orig 2015-08-22 06:41:35 UTC -+++ 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 <sys/param.h> - #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 <machine/endian.h> -+#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 diff --git a/editors/libreoffice/files/patch-solenv_gbuild_UnpackedTarball.mk b/editors/libreoffice/files/patch-solenv_gbuild_UnpackedTarball.mk index f7fed2d6ee73..89be52f9638e 100644 --- a/editors/libreoffice/files/patch-solenv_gbuild_UnpackedTarball.mk +++ b/editors/libreoffice/files/patch-solenv_gbuild_UnpackedTarball.mk @@ -1,4 +1,4 @@ ---- solenv/gbuild/UnpackedTarball.mk.orig 2015-08-22 06:41:35 UTC +--- solenv/gbuild/UnpackedTarball.mk.orig 2016-10-28 14:50:26 UTC +++ solenv/gbuild/UnpackedTarball.mk @@ -20,6 +20,7 @@ $(GNUTAR) \ -x \ diff --git a/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk b/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk index 2823af75646e..b3026d4918c9 100644 --- a/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk +++ b/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk @@ -1,6 +1,6 @@ ---- solenv/gbuild/platform/unxgcc.mk.orig 2015-08-22 06:41:35 UTC +--- solenv/gbuild/platform/unxgcc.mk.orig 2016-10-28 14:50:26 UTC +++ solenv/gbuild/platform/unxgcc.mk -@@ -41,8 +41,7 @@ gb_CFLAGS := \ +@@ -44,8 +44,7 @@ gb_CFLAGS := \ gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -fPIC \ diff --git a/editors/libreoffice/files/patch-svtools_source_svrtf_parrtf.cxx b/editors/libreoffice/files/patch-svtools_source_svrtf_parrtf.cxx index 2c06ca179961..bc1efe3a43d4 100644 --- a/editors/libreoffice/files/patch-svtools_source_svrtf_parrtf.cxx +++ b/editors/libreoffice/files/patch-svtools_source_svrtf_parrtf.cxx @@ -1,10 +1,10 @@ ---- svtools/source/svrtf/parrtf.cxx.orig 2015-08-22 06:41:35 UTC +--- svtools/source/svrtf/parrtf.cxx.orig 2016-10-28 14:50:26 UTC +++ svtools/source/svrtf/parrtf.cxx -@@ -17,6 +17,7 @@ - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ +@@ -51,6 +51,7 @@ SvRTFParser::~SvRTFParser() + { + } +#include <cstdio> - #include <rtl/tencinfo.h> - #include <tools/stream.hxx> + int SvRTFParser::GetNextToken_() + { diff --git a/editors/libreoffice/files/patch-svx_Executable__gengal.mk b/editors/libreoffice/files/patch-svx_Executable__gengal.mk deleted file mode 100644 index 81a645fbe402..000000000000 --- a/editors/libreoffice/files/patch-svx_Executable__gengal.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- svx/Executable_gengal.mk.orig 2015-08-22 06:41:35 UTC -+++ svx/Executable_gengal.mk -@@ -67,7 +67,16 @@ $(eval $(call gb_Executable_add_libs,gen - -lpthread \ - )) - else --ifeq ($(OS),LINUX) -+ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Executable_add_libs,gengal,\ -+ -lGL \ -+ -lX11 \ -+)) -+ -+$(eval $(call gb_Executable_use_static_libraries,gengal,\ -+ glxtest \ -+)) -+else ifeq ($(OS),LINUX) - $(eval $(call gb_Executable_add_libs,gengal,\ - -ldl \ - -lpthread \ diff --git a/editors/libreoffice/files/patch-sw_Module__sw.mk b/editors/libreoffice/files/patch-sw_Module__sw.mk index dcdbc37052b1..4534242674d8 100644 --- a/editors/libreoffice/files/patch-sw_Module__sw.mk +++ b/editors/libreoffice/files/patch-sw_Module__sw.mk @@ -1,12 +1,22 @@ ---- sw/Module_sw.mk.orig 2015-08-22 06:41:35 UTC +--- sw/Module_sw.mk.orig 2016-10-28 14:50:26 UTC +++ sw/Module_sw.mk -@@ -62,7 +62,8 @@ $(eval $(call gb_Module_add_slowcheck_ta +@@ -62,13 +62,16 @@ $(eval $(call gb_Module_add_slowcheck_ta + CppunitTest_sw_ooxmlfieldexport \ CppunitTest_sw_ooxmlw14export \ CppunitTest_sw_ooxmlimport \ - CppunitTest_sw_ww8export \ +- CppunitTest_sw_ww8export \ - CppunitTest_sw_ww8import \ + $(if $(filter FREEBSD,$(OS)),, \ ++ CppunitTest_sw_ww8export) \ ++ $(if $(filter FREEBSD,$(OS)),, \ + CppunitTest_sw_ww8import) \ CppunitTest_sw_rtfexport \ CppunitTest_sw_rtfimport \ CppunitTest_sw_odfexport \ + CppunitTest_sw_odfimport \ +- CppunitTest_sw_uiwriter \ ++ $(if $(filter FREEBSD,$(OS)),, \ ++ CppunitTest_sw_uiwriter) \ + CppunitTest_sw_mailmerge \ + CppunitTest_sw_globalfilter \ + )) diff --git a/editors/libreoffice/files/patch-sysui_desktop_share_create__tree.sh b/editors/libreoffice/files/patch-sysui_desktop_share_create__tree.sh index 60ea0fa59b81..6b435f6ae68b 100644 --- a/editors/libreoffice/files/patch-sysui_desktop_share_create__tree.sh +++ b/editors/libreoffice/files/patch-sysui_desktop_share_create__tree.sh @@ -1,6 +1,6 @@ ---- sysui/desktop/share/create_tree.sh.orig 2015-08-22 06:41:35 UTC +--- sysui/desktop/share/create_tree.sh.orig 2016-10-28 14:50:26 UTC +++ sysui/desktop/share/create_tree.sh -@@ -82,8 +82,8 @@ for i in `cat launcherlist`; do +@@ -82,10 +82,10 @@ for i in `cat launcherlist`; do ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}" done @@ -13,3 +13,5 @@ +# cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml" +#done + # Generate gobject-introspection files + if [ -n "$INTROSPECTION_SCANNER" ]; then diff --git a/editors/libreoffice/files/patch-ucb_source_ucp_webdav_DateTimeHelper.cxx b/editors/libreoffice/files/patch-ucb_source_ucp_webdav_DateTimeHelper.cxx index 1d3a38c585b2..8f20dd897d49 100644 --- a/editors/libreoffice/files/patch-ucb_source_ucp_webdav_DateTimeHelper.cxx +++ b/editors/libreoffice/files/patch-ucb_source_ucp_webdav_DateTimeHelper.cxx @@ -1,4 +1,4 @@ ---- ucb/source/ucp/webdav/DateTimeHelper.cxx.orig 2015-08-22 06:41:35 UTC +--- ucb/source/ucp/webdav/DateTimeHelper.cxx.orig 2016-10-28 14:50:26 UTC +++ ucb/source/ucp/webdav/DateTimeHelper.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . diff --git a/editors/libreoffice/files/patch-vcl_Executable__icontest.mk b/editors/libreoffice/files/patch-vcl_Executable__icontest.mk deleted file mode 100644 index 12128adfa02c..000000000000 --- a/editors/libreoffice/files/patch-vcl_Executable__icontest.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- vcl/Executable_icontest.mk.orig 2015-08-22 06:41:35 UTC -+++ vcl/Executable_icontest.mk -@@ -25,7 +25,16 @@ $(eval $(call gb_Executable_use_static_l - vclmain \ - )) - --ifeq ($(OS),LINUX) -+ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Executable_add_libs,icontest,\ -+ -lGL \ -+ -lX11 \ -+)) -+ -+$(eval $(call gb_Executable_use_static_libraries,icontest,\ -+ glxtest \ -+)) -+else ifeq ($(OS),LINUX) - $(eval $(call gb_Executable_add_libs,icontest,\ - -lm \ - -ldl \ diff --git a/editors/libreoffice/files/patch-vcl_Executable__mtfdemo.mk b/editors/libreoffice/files/patch-vcl_Executable__mtfdemo.mk deleted file mode 100644 index 525df9da36eb..000000000000 --- a/editors/libreoffice/files/patch-vcl_Executable__mtfdemo.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- vcl/Executable_mtfdemo.mk.orig 2015-08-22 06:41:35 UTC -+++ vcl/Executable_mtfdemo.mk -@@ -40,7 +40,16 @@ $(eval $(call gb_Executable_use_static_l - vclmain \ - )) - --ifeq ($(OS),LINUX) -+ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Executable_add_libs,mtfdemo,\ -+ -lGL \ -+ -lX11 \ -+)) -+ -+$(eval $(call gb_Executable_use_static_libraries,mtfdemo,\ -+ glxtest \ -+)) -+else ifeq ($(OS),LINUX) - $(eval $(call gb_Executable_add_libs,mtfdemo,\ - -lm \ - -ldl \ diff --git a/editors/libreoffice/files/patch-vcl_Executable__ui-previewer.mk b/editors/libreoffice/files/patch-vcl_Executable__ui-previewer.mk deleted file mode 100644 index 36bcb9dd2ee0..000000000000 --- a/editors/libreoffice/files/patch-vcl_Executable__ui-previewer.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- vcl/Executable_ui-previewer.mk.orig 2015-08-22 06:41:35 UTC -+++ vcl/Executable_ui-previewer.mk -@@ -34,7 +34,16 @@ $(eval $(call gb_Executable_add_exceptio - vcl/source/uipreviewer/previewer \ - )) - --ifeq ($(OS),LINUX) -+ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Executable_add_libs,ui-previewer,\ -+ -lGL \ -+ -lX11 \ -+)) -+ -+$(eval $(call gb_Executable_use_static_libraries,ui-previewer,\ -+ glxtest \ -+)) -+else ifeq ($(OS),LINUX) - $(eval $(call gb_Executable_add_libs,ui-previewer,\ - -lm \ - -ldl \ diff --git a/editors/libreoffice/files/patch-vcl_Executable__vcldemo.mk b/editors/libreoffice/files/patch-vcl_Executable__vcldemo.mk deleted file mode 100644 index 2b39565b4e4f..000000000000 --- a/editors/libreoffice/files/patch-vcl_Executable__vcldemo.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- vcl/Executable_vcldemo.mk.orig 2015-08-22 06:41:35 UTC -+++ vcl/Executable_vcldemo.mk -@@ -41,7 +41,16 @@ $(eval $(call gb_Executable_use_static_l - vclmain \ - )) - --ifeq ($(OS),LINUX) -+ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Executable_add_libs,vcldemo,\ -+ -lGL \ -+ -lX11 \ -+)) -+ -+$(eval $(call gb_Executable_use_static_libraries,vcldemo,\ -+ glxtest \ -+)) -+else ifeq ($(OS),LINUX) - $(eval $(call gb_Executable_add_libs,vcldemo,\ - -lm \ - -ldl \ diff --git a/editors/libreoffice/files/patch-vcl_Library__vcl.mk b/editors/libreoffice/files/patch-vcl_Library__vcl.mk deleted file mode 100644 index 254630111dff..000000000000 --- a/editors/libreoffice/files/patch-vcl_Library__vcl.mk +++ /dev/null @@ -1,29 +0,0 @@ ---- vcl/Library_vcl.mk.orig 2015-08-22 06:41:35 UTC -+++ vcl/Library_vcl.mk -@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_custom_head - )) - - $(eval $(call gb_Library_use_externals,vcl,\ -- $(if $(filter LINUX MACOSX,$(OS)), \ -+ $(if $(filter FREEBSD LINUX MACOSX,$(OS)), \ - curl) \ - jpeg \ - $(if $(filter-out WNT,$(OS)), \ -@@ -716,7 +716,16 @@ $(eval $(call gb_Library_use_system_win3 - $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc)) - endif - --ifeq ($(OS),LINUX) -+ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Library_add_libs,vcl,\ -+ -lGL \ -+ -lX11 \ -+)) -+ -+$(eval $(call gb_Library_add_exception_objects,vcl,\ -+ vcl/opengl/x11/X11DeviceInfo \ -+)) -+else ifeq ($(OS),LINUX) - $(eval $(call gb_Library_add_libs,vcl,\ - -lm \ - -ldl \ diff --git a/editors/libreoffice/files/patch-vcl_Module__vcl.mk b/editors/libreoffice/files/patch-vcl_Module__vcl.mk deleted file mode 100644 index e1bc26413169..000000000000 --- a/editors/libreoffice/files/patch-vcl_Module__vcl.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- vcl/Module_vcl.mk.orig 2015-08-22 06:41:35 UTC -+++ vcl/Module_vcl.mk -@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,vcl, - StaticLibrary_vclmain \ - $(if $(ENABLE_HEADLESS),, \ - Executable_ui-previewer) \ -- $(if $(filter LINUX MACOSX WNT,$(OS)), \ -+ $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)), \ - Executable_outdevgrind \ - $(if $(ENABLE_HEADLESS),, \ - Executable_vcldemo \ diff --git a/editors/libreoffice/files/patch-vcl_StaticLibrary__glxtest.mk b/editors/libreoffice/files/patch-vcl_StaticLibrary__glxtest.mk deleted file mode 100644 index 8348d58ee2ac..000000000000 --- a/editors/libreoffice/files/patch-vcl_StaticLibrary__glxtest.mk +++ /dev/null @@ -1,26 +0,0 @@ ---- vcl/StaticLibrary_glxtest.mk.orig 2015-08-22 06:41:35 UTC -+++ vcl/StaticLibrary_glxtest.mk -@@ -29,6 +29,16 @@ $(eval $(call gb_StaticLibrary_use_api,g - udkapi \ - )) - -+ifeq ($(OS),FREEBSD) -+$(eval $(call gb_StaticLibrary_add_libs,glxtest,\ -+ -lGL \ -+ -lX11 \ -+)) -+ -+$(eval $(call gb_StaticLibrary_add_exception_objects,glxtest,\ -+ vcl/unx/glxtest \ -+)) -+else - $(eval $(call gb_StaticLibrary_add_libs,glxtest,\ - -lm \ - -ldl \ -@@ -40,5 +50,6 @@ $(eval $(call gb_StaticLibrary_add_libs, - $(eval $(call gb_StaticLibrary_add_exception_objects,glxtest,\ - vcl/unx/glxtest \ - )) -+endif - - # vim: set noet sw=4 ts=4: diff --git a/editors/libreoffice/files/patch-vcl_qa_cppunit_BitmapTest.cxx b/editors/libreoffice/files/patch-vcl_qa_cppunit_BitmapTest.cxx deleted file mode 100644 index de390fc9f690..000000000000 --- a/editors/libreoffice/files/patch-vcl_qa_cppunit_BitmapTest.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- vcl/qa/cppunit/BitmapTest.cxx.orig 2015-08-22 06:41:35 UTC -+++ vcl/qa/cppunit/BitmapTest.cxx -@@ -62,7 +62,7 @@ void BitmapTest::testConvert() - CPPUNIT_ASSERT_EQUAL(sal_uInt16(24), aBitmap.GetBitCount()); - { - Bitmap::ScopedReadAccess pReadAccess(aBitmap); --#if defined LINUX -+#if defined FREEBSD || defined LINUX - // 24 bit Bitmap on SVP backend uses 32bit BGRX format - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(32), pReadAccess->GetBitCount()); - CPPUNIT_ASSERT_EQUAL(sal_uLong(40), pReadAccess->GetScanlineSize()); |