Update to 3.5.6.2 based on ftigeot's version in wip.
Security and bug fixes.
This commit is contained in:
wiz
parent
05f2cf1500
commit
83a30754da
6 changed files with 47 additions and 41 deletions
|
|
@ -1,11 +1,11 @@
|
|||
# $NetBSD: Makefile,v 1.7 2012/07/04 12:43:36 obache Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2012/08/12 15:55:55 wiz Exp $
|
||||
|
||||
VER= 3.5.4.2
|
||||
VER= 3.5.6.2
|
||||
DISTNAME= libreoffice-${VER}
|
||||
PKGNAME= libreoffice-${VER:S/-//g}
|
||||
PKGREVISION= 3
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/3.5.4/ \
|
||||
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/3.5.6/ \
|
||||
http://dev-www.libreoffice.org/src/ \
|
||||
http://www.numbertext.org/linux/
|
||||
|
||||
MAINTAINER= ftigeot@wolfpond.org
|
||||
|
|
@ -43,7 +43,6 @@ EXTRACT_ONLY+= libreoffice-${component}-${VER}.tar.xz
|
|||
|
||||
.for md in ${MORE_DISTFILES}
|
||||
DISTFILES+= ${md}
|
||||
SITES.${md}= http://dev-www.libreoffice.org/src/
|
||||
.endfor
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
|
@ -58,7 +57,7 @@ EXTRACT_USING= gtar
|
|||
|
||||
WRKSRC= ${WRKDIR}/${LO_BOOTSTRAP}
|
||||
|
||||
BUILD_DEPENDS+= cppunit>1.12:../../devel/cppunit
|
||||
BUILD_DEPENDS+= cppunit>=1.12.1:../../devel/cppunit
|
||||
BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
|
||||
BUILD_DEPENDS+= hunspell>=1.2.8:../../textproc/hunspell
|
||||
BUILD_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.3 2012/08/12 07:09:19 marino Exp $
|
||||
$NetBSD: distinfo,v 1.4 2012/08/12 15:55:55 wiz Exp $
|
||||
|
||||
SHA1 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = 025d5d0d566a23ddb353495c116116c1088ba2e9
|
||||
RMD160 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = aefa80476ef8340be84440b61f738f432da51c92
|
||||
|
|
@ -30,24 +30,24 @@ Size (libreoffice/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip) =
|
|||
SHA1 (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 6e836945719e137596df1ca82f0afa809e8a2e88
|
||||
RMD160 (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 6443438ddf0bb5cd277c96108aa2671213edf8df
|
||||
Size (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 547217 bytes
|
||||
SHA1 (libreoffice/libreoffice-core-3.5.4.2.tar.xz) = a01d77612c9678d52a75fb160590bb76d670d7f6
|
||||
RMD160 (libreoffice/libreoffice-core-3.5.4.2.tar.xz) = e118cfa44ba198fa3d3fe8fc21bd1e3940270868
|
||||
Size (libreoffice/libreoffice-core-3.5.4.2.tar.xz) = 103422460 bytes
|
||||
SHA1 (libreoffice/libreoffice-dictionaries-3.5.4.2.tar.xz) = 719604c225293006c7168a7db672f7c57e4c91b4
|
||||
RMD160 (libreoffice/libreoffice-dictionaries-3.5.4.2.tar.xz) = 24ef97db9503a37fecf8cd6db519ff0cec8be0cf
|
||||
Size (libreoffice/libreoffice-dictionaries-3.5.4.2.tar.xz) = 32765928 bytes
|
||||
SHA1 (libreoffice/libreoffice-help-3.5.4.2.tar.xz) = 0d417affc2b91ef345cb010f3a2d11a6417b7f44
|
||||
RMD160 (libreoffice/libreoffice-help-3.5.4.2.tar.xz) = ce00c1893e0315fa7cee156707553fdcebb552d2
|
||||
Size (libreoffice/libreoffice-help-3.5.4.2.tar.xz) = 1857756 bytes
|
||||
SHA1 (libreoffice/libreoffice-core-3.5.6.2.tar.xz) = 8e6c6cee419608c985dbcba005384a8555e9c531
|
||||
RMD160 (libreoffice/libreoffice-core-3.5.6.2.tar.xz) = ecc0fe10bbd72be14f3691169137af4b7ab0bf7a
|
||||
Size (libreoffice/libreoffice-core-3.5.6.2.tar.xz) = 102714756 bytes
|
||||
SHA1 (libreoffice/libreoffice-dictionaries-3.5.6.2.tar.xz) = 733abaa1b718d41486d7c571749a198202d65929
|
||||
RMD160 (libreoffice/libreoffice-dictionaries-3.5.6.2.tar.xz) = fee843eee5081135e3d77297227e51d6bf730e45
|
||||
Size (libreoffice/libreoffice-dictionaries-3.5.6.2.tar.xz) = 32351944 bytes
|
||||
SHA1 (libreoffice/libreoffice-help-3.5.6.2.tar.xz) = d53969208aaa99d87300cdd06a6c310502f6485d
|
||||
RMD160 (libreoffice/libreoffice-help-3.5.6.2.tar.xz) = c28458688db57d5e9825eb88cd101e0c952da4b4
|
||||
Size (libreoffice/libreoffice-help-3.5.6.2.tar.xz) = 1856988 bytes
|
||||
SHA1 (patch-bridges_source_cpp_uno_gcc3_linux_x86-64_uno2cpp.cxx) = 0ebc0a071acd66f4b52f3e8f5361336a9e4248cb
|
||||
SHA1 (patch-configure.in) = 32df5a0994e4424fda15c7fb78ef9e8f5e406cad
|
||||
SHA1 (patch-i18npool_source_breakiterator_data_char.txt) = b290516019fb431e9b1ea5c5ced29aaa596cf44b
|
||||
SHA1 (patch-i18npool_source_breakiterator_data_char_in.txt) = 028988f143ec67bf71f602b784dc8b5929492ca8
|
||||
SHA1 (patch-lingucomponent_source_languageguessing_simpleguesser.cxx) = 3dc51fa1cd0381a7d607107dbbaaa017e50a228a
|
||||
SHA1 (patch-lotuswordpro_Module_lotuswordpro.mk) = 15f65e86c7b47f2113b68561a9a361ca69405000
|
||||
SHA1 (patch-sc_Module_sc.mk) = 615e2cfd132fbb8eb4b5272f36f95b2881e27959
|
||||
SHA1 (patch-sd_Module_sd.mk) = c1c49ed37086d868c44e600bf1d1784ae2973276
|
||||
SHA1 (patch-set_soenv.in) = 754a82444bab39d5d51f2a033da153479f33d2ae
|
||||
SHA1 (patch-solenv_gbuild_Module.mk) = 2193f4edf7c2f8ea918191b4d48ab6725f7b6b92
|
||||
SHA1 (patch-solenv_inc_unxgcc.mk) = 1bebcc32475b6592a97384410c1036ab647eacec
|
||||
SHA1 (patch-solenv_gbuild_Module.mk) = f16443d43be20bffce957b0a4ea16964d942b06b
|
||||
SHA1 (patch-solenv_inc_unxgcc.mk) = f5914c651e54da7a4e0ac1ec0e00be4c43579d98
|
||||
SHA1 (patch-sw_Module_sw.mk) = 358f7172278267cccfa6a624f49b1047af1a5788
|
||||
SHA1 (patch-writerfilter_Module_writerfilter.mk) = 1eb3caa50258be5f8b5e2bb19e5f5d039b5eb7a0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
$NetBSD: patch-bridges_source_cpp_uno_gcc3_linux_x86-64_uno2cpp.cxx,v 1.1 2012/08/12 15:55:56 wiz Exp $
|
||||
|
||||
Do not try to include alloca.h if it doesn't exist
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx.orig 2012-07-03 11:01:28.000000000 +0000
|
||||
+++ bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
|
||||
@@ -26,7 +26,9 @@
|
||||
*
|
||||
************************************************************************/
|
||||
|
||||
+#ifdef HAVE_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
+#endif
|
||||
#include <exception>
|
||||
#include <typeinfo>
|
||||
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
$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;
|
||||
|
|
@ -1,4 +1,11 @@
|
|||
$NetBSD: patch-solenv_gbuild_Module.mk,v 1.1 2012/08/12 07:09:20 marino Exp $
|
||||
$NetBSD: patch-solenv_gbuild_Module.mk,v 1.2 2012/08/12 15:55:56 wiz Exp $
|
||||
|
||||
Disable unit testing
|
||||
|
||||
Some of the libreoffice unit tests, for example system fonts, require
|
||||
additional and currently unidentified dependencies to run. As a
|
||||
result, Libreoffice will build outside a clean environment but fails
|
||||
to build in pbulk chroot or Tinderbox.
|
||||
|
||||
--- solenv/gbuild/Module.mk.orig 2012-08-07 13:32:53.000000000 +0000
|
||||
+++ solenv/gbuild/Module.mk
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-solenv_inc_unxgcc.mk,v 1.1 2012/06/05 21:53:42 wiz Exp $
|
||||
$NetBSD: patch-solenv_inc_unxgcc.mk,v 1.2 2012/08/12 15:55:56 wiz Exp $
|
||||
|
||||
Using -std=gnu++0x instead of -std=c++0x may avoid
|
||||
crashes on NetBSD and OpenBSD
|
||||
|
|
@ -6,7 +6,7 @@ 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.orig 2012-06-26 13:50:03.000000000 +0000
|
||||
+++ solenv/inc/unxgcc.mk
|
||||
@@ -88,7 +88,7 @@ CFLAGSCXX= -pipe $(ARCH_FLAGS)
|
||||
CFLAGSCXX+=-fvisibility-inlines-hidden
|
||||
|
|
@ -14,6 +14,6 @@ https://bugs.freedesktop.org/show_bug.cgi?id=48134
|
|||
.IF "$(HAVE_CXX0X)" == "TRUE"
|
||||
-CFLAGSCXX+=-std=c++0x
|
||||
+CFLAGSCXX+=-std=gnu++0x
|
||||
.IF "$(GCCNUMVER)" <= "000400059999"
|
||||
CFLAGSCXX+=-Wno-deprecated-declarations
|
||||
.ENDIF
|
||||
CFLAGSCXX+=-Wno-deprecated-declarations -Wno-deprecated
|
||||
.ENDIF # "$(HAVE_CXX0X)" == "TRUE"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue