diff options
| author | wiz <wiz> | 2012-06-05 21:53:42 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2012-06-05 21:53:42 +0000 |
| commit | f9e51e0ea0cd72b76bf7542b75de611918eef5a7 (patch) | |
| tree | cbabf873f9cbce48c952f5395f9cb6d7a87f1a82 /misc/libreoffice/patches | |
| parent | be8ce34af5b10848345e9c890b0b12e40a859d43 (diff) | |
| download | pkgsrc-f9e51e0ea0cd72b76bf7542b75de611918eef5a7.tar.gz | |
Add two patches from wip (ftigeot). Bump PKGREVISION.
Diffstat (limited to 'misc/libreoffice/patches')
| -rw-r--r-- | misc/libreoffice/patches/patch-lingucomponent_source_languageguessing_simpleguesser.cxx | 16 | ||||
| -rw-r--r-- | misc/libreoffice/patches/patch-solenv_inc_unxgcc.mk | 19 |
2 files changed, 35 insertions, 0 deletions
diff --git a/misc/libreoffice/patches/patch-lingucomponent_source_languageguessing_simpleguesser.cxx b/misc/libreoffice/patches/patch-lingucomponent_source_languageguessing_simpleguesser.cxx new file mode 100644 index 00000000000..d03b2be6cd4 --- /dev/null +++ b/misc/libreoffice/patches/patch-lingucomponent_source_languageguessing_simpleguesser.cxx @@ -0,0 +1,16 @@ +$NetBSD: patch-lingucomponent_source_languageguessing_simpleguesser.cxx,v 1.1 2012/06/05 21:53:42 wiz Exp $ + +Fixes a build issue: 'utfstrlen' was not declared in this scope +utfstrlen was never supposed to be used anyway: +http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg30469.html +--- lingucomponent/source/languageguessing/simpleguesser.cxx.orig 2012-05-22 12:48:18.000000000 +0000 ++++ lingucomponent/source/languageguessing/simpleguesser.cxx +@@ -118,7 +118,7 @@ vector<Guess> SimpleGuesser::GuessLangua + return guesses; + + //calculate le number of unicode charcters (symbols) +- int len = utfstrlen(text); ++ int len = strlen(text); + + if (len > MAX_STRING_LENGTH_TO_ANALYSE) + len = MAX_STRING_LENGTH_TO_ANALYSE; diff --git a/misc/libreoffice/patches/patch-solenv_inc_unxgcc.mk b/misc/libreoffice/patches/patch-solenv_inc_unxgcc.mk new file mode 100644 index 00000000000..dc50f98c608 --- /dev/null +++ b/misc/libreoffice/patches/patch-solenv_inc_unxgcc.mk @@ -0,0 +1,19 @@ +$NetBSD: patch-solenv_inc_unxgcc.mk,v 1.1 2012/06/05 21:53:42 wiz Exp $ + +Using -std=gnu++0x instead of -std=c++0x may avoid +crashes on NetBSD and OpenBSD + +Upstream bug report: +https://bugs.freedesktop.org/show_bug.cgi?id=48134 + +--- solenv/inc/unxgcc.mk.orig 2012-05-22 12:48:18.000000000 +0000 ++++ solenv/inc/unxgcc.mk +@@ -88,7 +88,7 @@ CFLAGSCXX= -pipe $(ARCH_FLAGS) + CFLAGSCXX+=-fvisibility-inlines-hidden + .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + .IF "$(HAVE_CXX0X)" == "TRUE" +-CFLAGSCXX+=-std=c++0x ++CFLAGSCXX+=-std=gnu++0x + .IF "$(GCCNUMVER)" <= "000400059999" + CFLAGSCXX+=-Wno-deprecated-declarations + .ENDIF |