diff options
| author | joerg <joerg@pkgsrc.org> | 2015-09-23 20:48:44 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-09-23 20:48:44 +0000 |
| commit | 1690853c8fb4ca2491ae9408a1717ff91c5f0e7b (patch) | |
| tree | 9485174976f9885c74cc25aa9826cb050d0e0dbf /misc/libreoffice | |
| parent | 72ec1197cb21e197b35bc6fcafb263e2c85acd12 (diff) | |
| download | pkgsrc-1690853c8fb4ca2491ae9408a1717ff91c5f0e7b.tar.gz | |
Deal with more non-standard introspection requirements from cxxabi.h.
Disabling doclint for JavaDoc.
Diffstat (limited to 'misc/libreoffice')
3 files changed, 70 insertions, 1 deletions
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo index 8df809da608..f3aaab6bdcf 100644 --- a/misc/libreoffice/distinfo +++ b/misc/libreoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2015/08/29 12:57:26 ryoon Exp $ +$NetBSD: distinfo,v 1.9 2015/09/23 20:48:44 joerg Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -129,6 +129,7 @@ Size (libreoffice/libreoffice-translations-5.0.1.2.tar.xz) = 130100092 bytes SHA1 (patch-Repository.mk) = 01a1fe049fc192a2b8b171b7162e3d34da1480c0 SHA1 (patch-bin_distro-install-desktop-integration) = 292abb5c40018547bc58efa092eb7014dc28dced SHA1 (patch-bin_distro-install-file-lists) = 782e2943a8438fb0ff033b97eda8ad4923453774 +SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = 9d7bb01d816003e90f36631c21b71c53b8ec0127 SHA1 (patch-configure.ac) = 4314429f4e612e340413e45c0b2dcec1db3b8495 SHA1 (patch-desktop_Library__sofficeapp.mk) = 320ab924a87607ed98c3404ed9d8688cbbed820a SHA1 (patch-include_LibreOfficeKit_LibreOfficeKitInit.h) = ce962b5d8646038150d57b02fd25a03eef592bb6 @@ -137,6 +138,7 @@ SHA1 (patch-libreofficekit_Executable__tilebench.mk) = 39bbf45e59a434c1b03a8ac18 SHA1 (patch-libreofficekit_Library__libreofficekitgtk.mk) = 7bfa2a61f6aa66050ff89d3a33d12e573a5f9671 SHA1 (patch-libreofficekit_Module__libreofficekit.mk) = 82e0c1dc6fd3ffacbe5e74b3e849879039ea0b24 SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767 +SHA1 (patch-odk_CustomTarget__javadoc.mk) = 403efd49783849318a895821e4e15af8fb4ea8a4 SHA1 (patch-solenv_bin_ooinstall) = f4c1f3c917719a33882a8cacd0043733d5cf5676 SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98 SHA1 (patch-solenv_gbuild_ExternalProject.mk) = c51913b6678084d283fc781cc54b2880a6ae6299 diff --git a/misc/libreoffice/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx b/misc/libreoffice/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx new file mode 100644 index 00000000000..36914a08761 --- /dev/null +++ b/misc/libreoffice/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx @@ -0,0 +1,54 @@ +$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.1 2015/09/23 20:48:44 joerg Exp $ + +--- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2015-08-13 17:21:26.000000000 +0000 ++++ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx +@@ -40,6 +40,14 @@ namespace __cxxabiv1 + { + explicit __class_type_info( const char *__n ) : type_info( __n ) { } + virtual ~__class_type_info(); ++ ++ enum __offset_flags_masks ++ { ++ __virtual_mask = 0x1, ++ __public_mask = 0x2, ++ __hwm_bit = 2, ++ __offset_shift = 8 ++ }; + }; + + struct __si_class_type_info : public __class_type_info +@@ -50,6 +58,34 @@ namespace __cxxabiv1 + const __class_type_info *__base_type; + }; + ++ struct __base_class_type_info { ++ const __class_type_info *__base_type; ++ uintptr_t __offset_flags; ++ ++ enum __offset_flags_masks { ++ __virtual_mask = 0x1, ++ __public_mask = 0x2, ++ __hwm_bit = 2, ++ __offset_shift = 8 ++ }; ++ }; ++ ++ struct __vmi_class_type_info : public __class_type_info { ++ unsigned int __flags; ++ unsigned int __base_count; ++ __base_class_type_info __base_info[0]; ++ ++ explicit __vmi_class_type_info(const char *__n, int ___flags) : ++ __class_type_info(__n), __flags(___flags), __base_count(0) {} ++ ++ enum __flags_masks ++ { ++ __non_diamond_repeat_mask = 0x1, ++ __diamond_shaped_mask = 0x2, ++ __flags_unknown_mask = 0x10 ++ }; ++ }; ++ + extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT; + + extern "C" _LIBCPP_NORETURN void __cxa_throw( diff --git a/misc/libreoffice/patches/patch-odk_CustomTarget__javadoc.mk b/misc/libreoffice/patches/patch-odk_CustomTarget__javadoc.mk new file mode 100644 index 00000000000..bb7fe3626ca --- /dev/null +++ b/misc/libreoffice/patches/patch-odk_CustomTarget__javadoc.mk @@ -0,0 +1,13 @@ +$NetBSD: patch-odk_CustomTarget__javadoc.mk,v 1.1 2015/09/23 20:48:44 joerg Exp $ + +--- odk/CustomTarget_javadoc.mk.orig 2015-08-14 13:38:24.000000000 +0000 ++++ odk/CustomTarget_javadoc.mk +@@ -32,7 +32,7 @@ $(call gb_CustomTarget_get_workdir,odk/d + $(call gb_Jar_get_target,ridl) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1) + $(call gb_Helper_abbreviate_dirs,\ +- $(JAVADOC) -J-Xmx120m -use -splitindex \ ++ $(JAVADOC) -J-Xmx120m -use -splitindex -Xdoclint:none \ + -windowtitle "Java UNO Runtime Reference" \ + -header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\ + -tag attention:a:"Attention:" \ |