Update to 4.2.3.3
* Fix build with icu 53 Changelog: Many bugfixes See: https://wiki.documentfoundation.org/Releases/4.2.3/RC1 https://wiki.documentfoundation.org/Releases/4.2.3/RC2 https://wiki.documentfoundation.org/Releases/4.2.3/RC3
This commit is contained in:
ryoon
parent
7cb875db33
commit
8675ff2006
8 changed files with 5653 additions and 24 deletions
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.21 2014/04/29 07:57:14 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.22 2014/05/01 00:32:11 ryoon Exp $
|
||||
|
||||
VER= 4.2.2.1
|
||||
VER= 4.2.3.3
|
||||
DISTNAME= libreoffice-${VER}
|
||||
PKGNAME= libreoffice4-${VER}
|
||||
PKGREVISION= 2
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/4.2.2/
|
||||
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/4.2.3/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
MAINTAINER= ryoon@NetBSD.org
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.12 2014/04/13 15:57:21 tsutsui Exp $
|
||||
$NetBSD: distinfo,v 1.13 2014/05/01 00:32:11 ryoon Exp $
|
||||
|
||||
SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
|
||||
RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
|
||||
|
|
@ -78,6 +78,9 @@ Size (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 76
|
|||
SHA1 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 47b58e0ef2d856df26372a7061ae43fae6e08051
|
||||
RMD160 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 61672340e92957a5b72cddddcfcbf56d9602842c
|
||||
Size (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721 bytes
|
||||
SHA1 (libreoffice/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz) = 6de440b71668f1a65a9344cdaf7a437291416781
|
||||
RMD160 (libreoffice/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz) = cbfbb18c3991ba55ebb50c607d5208cbfeb9fce3
|
||||
Size (libreoffice/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz) = 23875368 bytes
|
||||
SHA1 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d49e11b0b711970f494294dc3698f05eb294853
|
||||
RMD160 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 923870cf88023713a492e0a5c5d5707ec21d8739
|
||||
Size (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 23150 bytes
|
||||
|
|
@ -126,21 +129,28 @@ Size (libreoffice/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip) =
|
|||
SHA1 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 5ecb895ffc1eff2c381fa78d2197d0c57422b3df
|
||||
RMD160 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 575a7daf02efbab9ea972e03a6870f7f13112806
|
||||
Size (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 bytes
|
||||
SHA1 (libreoffice/libreoffice-4.2.2.1.tar.xz) = 080f800429d0e5eeabdc98f919acce5018be297d
|
||||
RMD160 (libreoffice/libreoffice-4.2.2.1.tar.xz) = f8ae4fc17fad83a0a1c2c2c608dc98c5e4d40b5d
|
||||
Size (libreoffice/libreoffice-4.2.2.1.tar.xz) = 123187640 bytes
|
||||
SHA1 (libreoffice/libreoffice-dictionaries-4.2.2.1.tar.xz) = 2ce7c25b1c099ad1286af6d2ec98ce6ff787e08d
|
||||
RMD160 (libreoffice/libreoffice-dictionaries-4.2.2.1.tar.xz) = 6a604552ccf1be3ed1f092cde40c9a72e24166ec
|
||||
Size (libreoffice/libreoffice-dictionaries-4.2.2.1.tar.xz) = 37180580 bytes
|
||||
SHA1 (libreoffice/libreoffice-help-4.2.2.1.tar.xz) = 0c2b9fb88cee3920581d6f3d3e8822316679eb00
|
||||
RMD160 (libreoffice/libreoffice-help-4.2.2.1.tar.xz) = 26336f1b3ad237fc9f55b2b7a365ed0e2e84aacd
|
||||
Size (libreoffice/libreoffice-help-4.2.2.1.tar.xz) = 1855420 bytes
|
||||
SHA1 (libreoffice/libreoffice-translations-4.2.2.1.tar.xz) = f31d051aaa0d3d14c2eefbe7df94ba1cfd105113
|
||||
RMD160 (libreoffice/libreoffice-translations-4.2.2.1.tar.xz) = 07091d30e6494294d3462bd44f19ceee4f0d3484
|
||||
Size (libreoffice/libreoffice-translations-4.2.2.1.tar.xz) = 127588320 bytes
|
||||
SHA1 (libreoffice/harfbuzz-0.9.23.tar.bz2) = 2eb43c11f47fbaf8bc4532bf5ee8afa44d56bdb6
|
||||
RMD160 (libreoffice/harfbuzz-0.9.23.tar.bz2) = ee3b1e805f61620e5884dd59d5fc6ae3157e56d4
|
||||
Size (libreoffice/harfbuzz-0.9.23.tar.bz2) = 1027508 bytes
|
||||
SHA1 (libreoffice/libreoffice-4.2.3.3.tar.xz) = 0dbd92f7fa212214df852cd01ffd2287b61d6b1a
|
||||
RMD160 (libreoffice/libreoffice-4.2.3.3.tar.xz) = a7cce8c1935fd25afb7391f3083109defa2d57fc
|
||||
Size (libreoffice/libreoffice-4.2.3.3.tar.xz) = 123291796 bytes
|
||||
SHA1 (libreoffice/libreoffice-dictionaries-4.2.3.3.tar.xz) = 39f5e3b883f66aefc772a375681599ae4c7f2ce5
|
||||
RMD160 (libreoffice/libreoffice-dictionaries-4.2.3.3.tar.xz) = fbbe19d1ff97c73200a9cd1b05709f303c06016e
|
||||
Size (libreoffice/libreoffice-dictionaries-4.2.3.3.tar.xz) = 37186844 bytes
|
||||
SHA1 (libreoffice/libreoffice-help-4.2.3.3.tar.xz) = 21dbe38a5b6504d3355b1e9dc03b1bd7983f8bdf
|
||||
RMD160 (libreoffice/libreoffice-help-4.2.3.3.tar.xz) = fcd089eeb1a779287f454a54bbe28d5be1e6e4b7
|
||||
Size (libreoffice/libreoffice-help-4.2.3.3.tar.xz) = 1855268 bytes
|
||||
SHA1 (libreoffice/libreoffice-translations-4.2.3.3.tar.xz) = ba41fd7aff5fd554738ee1a16e2bd402c586ea51
|
||||
RMD160 (libreoffice/libreoffice-translations-4.2.3.3.tar.xz) = 5ad111fda03b0abb6ba31b02e4085a7ad623df4d
|
||||
Size (libreoffice/libreoffice-translations-4.2.3.3.tar.xz) = 127774372 bytes
|
||||
SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = adb326c48a7dd05f2de56e12a7c15836545dab4e
|
||||
SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx) = a27b4b580f53260b00bcbd5897986da2505f28ab
|
||||
SHA1 (patch-configure.ac) = 38d8d81518764f8589c7540ddc7687da2d347366
|
||||
SHA1 (patch-configure.ac) = e63fff7c20c303db677edce71be56aaf555e8742
|
||||
SHA1 (patch-i18npool_CustomTarget__collator.mk) = 8d5304470e47f48e0febdbe0072bf99016334828
|
||||
SHA1 (patch-i18npool_Library__collator__data.mk) = a50574288ed7d6ad0bf45b6f0c30ad63a4043721
|
||||
SHA1 (patch-i18npool_source_collator_collator__unicode.cxx) = b68ea30313a02d53df3bc5027a8144110cb268f1
|
||||
SHA1 (patch-i18npool_source_collator_data_zh__TW__charset.txt) = 7631d523dd1e0f0eeeed546ba355c54392fd7eb2
|
||||
SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767
|
||||
SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98
|
||||
SHA1 (patch-solenv_gbuild_Module.mk) = 78d57071ac2c884bb6406356f45db3c55b61c678
|
||||
|
|
|
|||
|
|
@ -1,12 +1,21 @@
|
|||
$NetBSD: patch-configure.ac,v 1.2 2014/02/02 07:43:40 ryoon Exp $
|
||||
$NetBSD: patch-configure.ac,v 1.3 2014/05/01 00:32:11 ryoon Exp $
|
||||
|
||||
* Improve portability, replace == with =
|
||||
* Detect pkgsrc apache-ant library
|
||||
* Fix installation directory
|
||||
|
||||
--- configure.ac.orig 2014-01-27 21:35:34.000000000 +0000
|
||||
--- configure.ac.orig 2014-04-08 11:46:25.000000000 +0000
|
||||
+++ configure.ac
|
||||
@@ -11906,7 +11906,7 @@ EOF
|
||||
@@ -8930,7 +8930,7 @@ SYSTEM_GENBRK=
|
||||
SYSTEM_GENCCODE=
|
||||
SYSTEM_GENCMN=
|
||||
|
||||
-ICU_MAJOR=52
|
||||
+ICU_MAJOR=53
|
||||
ICU_MINOR=1
|
||||
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
|
||||
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
|
||||
@@ -11918,7 +11918,7 @@ EOF
|
||||
dnl Checking for ant.jar
|
||||
if test "$ANT_HOME" != "NO_ANT_HOME"; then
|
||||
AC_MSG_CHECKING([Ant lib directory])
|
||||
|
|
@ -15,7 +24,7 @@ $NetBSD: patch-configure.ac,v 1.2 2014/02/02 07:43:40 ryoon Exp $
|
|||
ANT_LIB="$ANT_HOME/lib"
|
||||
else
|
||||
if test -f $ANT_HOME/ant.jar; then
|
||||
@@ -12322,7 +12322,7 @@ AC_SUBST(MANDIR)
|
||||
@@ -12334,7 +12334,7 @@ AC_SUBST(MANDIR)
|
||||
DOCDIR=[$(eval echo $(eval echo $docdir))]
|
||||
AC_SUBST(DOCDIR)
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-i18npool_CustomTarget__collator.mk,v 1.1 2014/05/01 00:32:11 ryoon Exp $
|
||||
|
||||
* Fix icu 53 build
|
||||
The concept is from http://cgit.freedesktop.org/libreoffice/core/commit/?id=2d843bb104a3091a2ff2c7b4d5655f5fb1393a47
|
||||
|
||||
--- i18npool/CustomTarget_collator.mk.orig 2014-04-08 11:46:25.000000000 +0000
|
||||
+++ i18npool/CustomTarget_collator.mk
|
||||
@@ -17,7 +17,6 @@ i18npool_COTXTS := \
|
||||
ja_charset.txt \
|
||||
ja_phonetic_alphanumeric_first.txt \
|
||||
ja_phonetic_alphanumeric_last.txt \
|
||||
- ko_charset.txt \
|
||||
ku_alphanumeric.txt \
|
||||
ln_charset.txt \
|
||||
my_dictionary.txt \
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
$NetBSD: patch-i18npool_Library__collator__data.mk,v 1.1 2014/05/01 00:32:11 ryoon Exp $
|
||||
|
||||
* Fix icu53 build
|
||||
Partially from http://cgit.freedesktop.org/libreoffice/core/commit/?id=2d843bb104a3091a2ff2c7b4d5655f5fb1393a47
|
||||
|
||||
--- i18npool/Library_collator_data.mk.orig 2014-04-08 11:46:25.000000000 +0000
|
||||
+++ i18npool/Library_collator_data.mk
|
||||
@@ -7,6 +7,9 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
+i18npool_LCDALL := $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)
|
||||
+i18npool_LCDTXTS := $(filter-out %/ko_charset.txt, $(i18npool_LCDALL))
|
||||
+
|
||||
$(eval $(call gb_Library_Library,collator_data))
|
||||
|
||||
$(eval $(call gb_Library_use_libraries,collator_data,\
|
||||
@@ -14,7 +17,7 @@ $(eval $(call gb_Library_use_libraries,c
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_generated_exception_objects,collator_data,\
|
||||
- $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\
|
||||
+ $(foreach txt,$(i18npool_LCDTXTS),\
|
||||
CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \
|
||||
))
|
||||
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
$NetBSD: patch-i18npool_source_collator_collator__unicode.cxx,v 1.1 2014/05/01 00:32:11 ryoon Exp $
|
||||
|
||||
* Fix icu53 build
|
||||
The concept is from http://cgit.freedesktop.org/libreoffice/core/commit/?id=2d843bb104a3091a2ff2c7b4d5655f5fb1393a47
|
||||
|
||||
--- i18npool/source/collator/collator_unicode.cxx.orig 2014-04-08 11:46:25.000000000 +0000
|
||||
+++ i18npool/source/collator/collator_unicode.cxx
|
||||
@@ -170,9 +170,11 @@ Collator_Unicode::loadCollatorAlgorithm(
|
||||
func = get_collator_data_ja_phonetic_alphanumeric_first;
|
||||
else if ( rAlgorithm == "phonetic (alphanumeric last)" )
|
||||
func = get_collator_data_ja_phonetic_alphanumeric_last;
|
||||
+#if 0
|
||||
} else if ( rLocale.Language == "ko" ) {
|
||||
if ( rAlgorithm == "charset" )
|
||||
func = get_collator_data_ko_charset;
|
||||
+#endif
|
||||
} else if ( rLocale.Language == "ku" ) {
|
||||
if ( rAlgorithm == "alphanumeric" )
|
||||
func = get_collator_data_ku_alphanumeric;
|
||||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue