pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/openoffice3 Update to 3.1.0. Bug fixes and impro...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0365c43f94bd
branches: trunk
changeset: 392772:0365c43f94bd
user: hira <hira%pkgsrc.org@localhost>
date: Sat May 09 18:43:41 2009 +0000
description:
Update to 3.1.0. Bug fixes and improvements (please see the following
URLs for details).
Release notes: http://development.openoffice.org/releases/3.1.0.html
New features : http://www.openoffice.org/dev_docs/features/3.1/index.html
Build confirmed on NetBSD 5.99.11/i386.
diffstat:
misc/openoffice3/Makefile | 17 ++-
misc/openoffice3/distinfo | 55 +++++-----
misc/openoffice3/options.mk | 21 ++-
misc/openoffice3/patches/patch-ad | 52 +--------
misc/openoffice3/patches/patch-ak | 30 ++--
misc/openoffice3/patches/patch-ap | 8 +-
misc/openoffice3/patches/patch-aq | 21 +--
misc/openoffice3/patches/patch-as | 32 +++---
misc/openoffice3/patches/patch-aw | 10 +-
misc/openoffice3/patches/patch-ba | 59 ++++------
misc/openoffice3/patches/patch-bs | 24 +--
misc/openoffice3/patches/patch-de | 29 ++---
misc/openoffice3/patches/patch-dy | 202 +++++++++++++++----------------------
misc/openoffice3/patches/patch-ed | 26 ----
misc/openoffice3/patches/patch-ee | 10 +-
15 files changed, 241 insertions(+), 355 deletions(-)
diffs (truncated from 1043 to 300 lines):
diff -r 8852ebfb0ca9 -r 0365c43f94bd misc/openoffice3/Makefile
--- a/misc/openoffice3/Makefile Sat May 09 17:26:38 2009 +0000
+++ b/misc/openoffice3/Makefile Sat May 09 18:43:41 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2009/04/16 21:42:43 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/09 18:43:41 hira Exp $
#
-OO_VER= 3.0.1
-OO_TAG= OOO300_m15
+OO_VER= 3.1.0
+OO_TAG= OOO310_m11
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice3-${OO_VER}
-PKGREVISION= 4
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
DIST_SUBDIR= ${DISTNAME}
@@ -32,7 +31,6 @@
.include "../../mk/bsd.prefs.mk"
WRKSRC= ${WRKDIR}/${OO_TAG}
-CONFIGURE_DIRS= config_office
# Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
GCC_REQD+= 3.4
@@ -116,6 +114,13 @@
CONFIGURE_ARGS+= --with-system-zlib
CONFIGURE_ARGS+= --with-dynamic-xinerama
+# Dictionaries
+CONFIGURE_ARGS+= --without-myspell-dicts
+CONFIGURE_ARGS+= --with-system-dicts
+CONFIGURE_ARGS+= --with-external-dict-dir=${PREFIX}/share/hunspell
+#CONFIGURE_ARGS+= --with-external-hyph-dir=${PREFIX}/share/hyphen
+#CONFIGURE_ARGS+= --with-external-thes-dir=${PREFIX}/share/mythes
+
# Extensions
CONFIGURE_ARGS+= --enable-minimizer
CONFIGURE_ARGS+= --enable-presenter-console
@@ -177,7 +182,7 @@
ln -sf ${DESTDIR}${OO_PREFIX}/${OO_UNXNAME}/program/$$f \
${DESTDIR}${PREFIX}/bin/$$f; \
done
- cd ${WRKSRC}/solver/300/${OPENOFFICE_OUTPATH}.pro/bin && \
+ cd ${WRKSRC}/solver/310/${OPENOFFICE_OUTPATH}.pro/bin && \
${INSTALL_DATA} ${OO_EXTENSIONS} ${DESTDIR}${OO_PREFIX}/extensions
cd ${WRKSRC}/sysui/${OPENOFFICE_OUTPATH}.pro/misc/openoffice.org && \
${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} _PREFIX=${PREFIX} \
diff -r 8852ebfb0ca9 -r 0365c43f94bd misc/openoffice3/distinfo
--- a/misc/openoffice3/distinfo Sat May 09 17:26:38 2009 +0000
+++ b/misc/openoffice3/distinfo Sat May 09 18:43:41 2009 +0000
@@ -1,35 +1,35 @@
-$NetBSD: distinfo,v 1.18 2009/01/31 16:54:30 hira Exp $
+$NetBSD: distinfo,v 1.19 2009/05/09 18:43:41 hira Exp $
-SHA1 (openoffice-3.0.1/OOo_3.0.1_src_binfilter.tar.bz2) = d84518159538ef736271177b7ebe4697fc4b811d
-RMD160 (openoffice-3.0.1/OOo_3.0.1_src_binfilter.tar.bz2) = c6859a376c55cd453be214dbfa2d56f1b845a32b
-Size (openoffice-3.0.1/OOo_3.0.1_src_binfilter.tar.bz2) = 6595398 bytes
-SHA1 (openoffice-3.0.1/OOo_3.0.1_src_core.tar.bz2) = 2da6b2cf0b75873477f22cc9d69a4f0c8b43b435
-RMD160 (openoffice-3.0.1/OOo_3.0.1_src_core.tar.bz2) = 9c4f18779a03cdabb0204d8eb1b661b4d9cc1369
-Size (openoffice-3.0.1/OOo_3.0.1_src_core.tar.bz2) = 182573274 bytes
-SHA1 (openoffice-3.0.1/OOo_3.0.1_src_extensions.tar.bz2) = c695982d166422a838560ef7b134a5665bc61198
-RMD160 (openoffice-3.0.1/OOo_3.0.1_src_extensions.tar.bz2) = e89c7594f642147a95e85612d5646bc3edc869db
-Size (openoffice-3.0.1/OOo_3.0.1_src_extensions.tar.bz2) = 13941829 bytes
-SHA1 (openoffice-3.0.1/OOo_3.0.1_src_l10n.tar.bz2) = 13f1bf0989a09c52c57dbc1d6cf1feaec369a085
-RMD160 (openoffice-3.0.1/OOo_3.0.1_src_l10n.tar.bz2) = a02e8c06c67ac7b2833afa4a54993d81674e8b9b
-Size (openoffice-3.0.1/OOo_3.0.1_src_l10n.tar.bz2) = 86008240 bytes
-SHA1 (openoffice-3.0.1/OOo_3.0.1_src_system.tar.bz2) = 8c73821b542c9c96b071550fe0e3e813e21a1246
-RMD160 (openoffice-3.0.1/OOo_3.0.1_src_system.tar.bz2) = 35f1822f3e3aa2f6af0c268dd51534568473e636
-Size (openoffice-3.0.1/OOo_3.0.1_src_system.tar.bz2) = 45625279 bytes
+SHA1 (openoffice-3.1.0/OOo_3.1.0_src_binfilter.tar.bz2) = 7128a2f8af0b0f1163a2f03331057242ec254f34
+RMD160 (openoffice-3.1.0/OOo_3.1.0_src_binfilter.tar.bz2) = e7ff15bd78713dcdbfd0df0ca499727cd412b070
+Size (openoffice-3.1.0/OOo_3.1.0_src_binfilter.tar.bz2) = 6543459 bytes
+SHA1 (openoffice-3.1.0/OOo_3.1.0_src_core.tar.bz2) = 7a2812823376c028d81c4d3aeaac56e00f89636c
+RMD160 (openoffice-3.1.0/OOo_3.1.0_src_core.tar.bz2) = 3395799874fd376fa82827f4b1b2d7af193748f8
+Size (openoffice-3.1.0/OOo_3.1.0_src_core.tar.bz2) = 186059913 bytes
+SHA1 (openoffice-3.1.0/OOo_3.1.0_src_extensions.tar.bz2) = fd6dff089f722c9d647f2ee5dd0e818b1a7e6576
+RMD160 (openoffice-3.1.0/OOo_3.1.0_src_extensions.tar.bz2) = d66bc267f92291ec0cc1b1530d95c8d9cfac7f62
+Size (openoffice-3.1.0/OOo_3.1.0_src_extensions.tar.bz2) = 14867603 bytes
+SHA1 (openoffice-3.1.0/OOo_3.1.0_src_l10n.tar.bz2) = 3ba93e779492bc6cf4955394a211462529057f03
+RMD160 (openoffice-3.1.0/OOo_3.1.0_src_l10n.tar.bz2) = 35ea76f926342a8bfa8b6b30edd08f048bb06811
+Size (openoffice-3.1.0/OOo_3.1.0_src_l10n.tar.bz2) = 96360273 bytes
+SHA1 (openoffice-3.1.0/OOo_3.1.0_src_system.tar.bz2) = a73c6aa867b7686d33611694e33d6351110d2a0a
+RMD160 (openoffice-3.1.0/OOo_3.1.0_src_system.tar.bz2) = 9ffd6694d4cdd7d3f4f8fd6aaf1ffa6c64b39d27
+Size (openoffice-3.1.0/OOo_3.1.0_src_system.tar.bz2) = 53314585 bytes
SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
-SHA1 (patch-ad) = 9513865551837a69202f4595232c36a656f200ca
+SHA1 (patch-ad) = 8f7afec29d927db694bf511ffd615fe903cc46dc
SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
-SHA1 (patch-ak) = a121e98afdc1e22a5579cb0c70759e8a16d57662
+SHA1 (patch-ak) = e8d2f5c8b7ff997b2aa83452f73b59420d01eb6b
SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
-SHA1 (patch-ap) = 806668c47374d46cc28ef41b17bf3632b9a81020
-SHA1 (patch-aq) = 651dad01336dce6901f1aacebe438b565a321be0
+SHA1 (patch-ap) = d9445a00083b7e847bf54b948f699a89b811d2da
+SHA1 (patch-aq) = 3e9a156887e108126c76f0735abb4dce177efa4b
SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
-SHA1 (patch-as) = 6f6992430e3cea8a914ad3dcbe9ebcdf288ddc2a
-SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = f7fc5e04a5af2f6ee8bdb4689b8b5b897eb43912
+SHA1 (patch-as) = c8a532c2b8a4dd676f09aba8d42677349f58c0a9
+SHA1 (patch-aw) = a331b0130b0b6bac0b81ee6a1aeeb7b216d5f511
+SHA1 (patch-ba) = 1f006516f7773407206a54001ef43f46db743646
SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4
SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
@@ -43,7 +43,7 @@
SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447
SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
SHA1 (patch-bq) = 2321d806bff054932f249a8b9445d790aa9eafbe
-SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
+SHA1 (patch-bs) = bea7e5fddee7056558747a6801816e2955dd0657
SHA1 (patch-bv) = b254cdb889bf5335aafe2b35982fc5cf370207cb
SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce
SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
@@ -64,7 +64,7 @@
SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
-SHA1 (patch-de) = e594e9a7a4bb442adc33757c71d9d875abafd24d
+SHA1 (patch-de) = cf7f1f160345bcbc2c0ba00c272da3b2a98a2b21
SHA1 (patch-dh) = 25d1c64a9531daf4a4f1d4fa616607b3eacfd4e0
SHA1 (patch-di) = 571b3fb1c65ab76e8bdace418654fff2d45406cf
SHA1 (patch-dj) = ca003c7964ad239fdd2406b0a3a76ae5e855d8d7
@@ -75,13 +75,12 @@
SHA1 (patch-du) = 093482d2847014fa894fe7e8d515c762723344b0
SHA1 (patch-dw) = 0737b08aafee1796dd83cd52b04a4fa589309f1b
SHA1 (patch-dx) = 272daa1f31af090f5aa1c99d17a63470c60fe3b5
-SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
+SHA1 (patch-dy) = 517a3b55418daf6639c7b42d157347efff38cfbc
SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172
SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292
SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834
SHA1 (patch-ec) = 4cfdda3d07972329de9d5e1c5ea7db2b4ab47247
-SHA1 (patch-ed) = 235cd96522e8fec1cd3cc2f49f410cf832a07604
-SHA1 (patch-ee) = 6a77e56645484367a96660e7f9a3ac402bad9f2a
+SHA1 (patch-ee) = fb6711c4c4ab53b6c213feed13883af7ffde1a16
SHA1 (patch-ef) = e53a75d497bc661467ca19fd0d00fa6dac17579d
SHA1 (patch-eg) = 970dae007766bea5c76c2312cfa7b35d44d3cb70
SHA1 (patch-eh) = 4f4b2cebe22e83ca6acd2b226281bf756fbc9083
diff -r 8852ebfb0ca9 -r 0365c43f94bd misc/openoffice3/options.mk
--- a/misc/openoffice3/options.mk Sat May 09 17:26:38 2009 +0000
+++ b/misc/openoffice3/options.mk Sat May 09 18:43:41 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2009/04/21 16:47:48 tnn Exp $
+# $NetBSD: options.mk,v 1.15 2009/05/09 18:43:41 hira Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3
@@ -6,14 +6,15 @@
PKG_OPTIONS_OPTIONAL_GROUPS= browser
PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey
# The list from completelangiso in solenv/inc/postset.mk.
-OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs by \
- ca cs cy da de dz el en-GB en-US en-ZA eo es \
- et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr \
- hu it ja ka km kn ko ku lo lt lv mk mn ms \
- ml-IN mr-IN my ne nb nl nn nr ns oc or-IN \
- pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv \
- sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg \
- ur-IN uk uz ve vi xh zh-CN zh-TW zu all
+OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs \
+ by ca cs cy da de dgo dz el en-GB en-US en-ZA \
+ eo es et eu fa fi fr ga gd gl gu gu-IN he \
+ hi-IN hr hu it ja ka kk km kn kn-IN ko kok ks \
+ ku lo lt lv mai mk mn mni ms ml-IN mr-IN my \
+ ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR \
+ ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw \
+ sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN \
+ uk uz ve vi xh zh-CN zh-TW zu all
.for l in ${OO_SUPPORTED_LANGUAGES}
PKG_SUPPORTED_OPTIONS+= lang-${l}
.endfor
@@ -89,7 +90,7 @@
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.else
-CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2
+CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2 --disable-gconf
.endif
.if !empty(PKG_OPTIONS:Mgtk2)
diff -r 8852ebfb0ca9 -r 0365c43f94bd misc/openoffice3/patches/patch-ad
--- a/misc/openoffice3/patches/patch-ad Sat May 09 17:26:38 2009 +0000
+++ b/misc/openoffice3/patches/patch-ad Sat May 09 18:43:41 2009 +0000
@@ -1,47 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
+$NetBSD: patch-ad,v 1.2 2009/05/09 18:43:41 hira Exp $
---- sal/osl/unx/system.c.orig 2008-04-10 20:13:33.000000000 +0900
-+++ sal/osl/unx/system.c 2008-08-23 12:45:39.000000000 +0900
-@@ -66,8 +66,11 @@
+--- sal/osl/unx/system.c.orig 2008-10-01 18:19:55.000000000 +0900
++++ sal/osl/unx/system.c 2009-05-09 13:52:08.000000000 +0900
+@@ -35,7 +35,7 @@
+ static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+ /* struct passwd differs on some platforms */
+-#if defined NETBSD
++#if defined NETBSD && (__NetBSD_Version__ < 299001000)
struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
- #endif /* BUILD_OS_APPLEOSX */
- #else /* MACOSX */
-+#if defined (NETBSD) && (__NetBSD_Version__ < 299001000)
- struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
-+#endif /* (NETBSD) && (__NetBSD_Version__ < 299001000) */
- #endif /* MACOSX */
-+#if defined (NETBSD) && (__NetBSD_Version__ < 299001000)
{
struct passwd* res;
-
-@@ -133,8 +136,9 @@
- return(res);
- #endif /* MACOSX */
- }
-+#endif /* (NETBSD) && (__NetBSD_Version__ < 299001000) */
-
--#if defined(NETBSD) || defined(MACOSX)
-+#if (defined(NETBSD) && (__NetBSD_Version__ < 299001000)) || defined(MACOSX)
- int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
- size_t buflen, struct passwd **result)
- {
-@@ -427,7 +431,7 @@
- }
- #endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
-
--#if defined(MACOSX)
-+#if defined(MACOSX) || defined(NETBSD)
- /*
- * This section works around calls that are missing or broken
- * in MacOS X 10.1.x and earlier.
-@@ -471,6 +475,10 @@
- return nRet;
- }
-
-+#endif /* defined(MACOSX) || defined(NETBSD) */
-+
-+#if defined(MACOSX)
-+
- /* No reentrant asctime() either... */
-
- /*******************************************************************************/
diff -r 8852ebfb0ca9 -r 0365c43f94bd misc/openoffice3/patches/patch-ak
--- a/misc/openoffice3/patches/patch-ak Sat May 09 17:26:38 2009 +0000
+++ b/misc/openoffice3/patches/patch-ak Sat May 09 18:43:41 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
+$NetBSD: patch-ak,v 1.2 2009/05/09 18:43:41 hira Exp $
---- config_office/set_soenv.in.orig 2008-04-09 00:16:24.000000000 +0900
-+++ config_office/set_soenv.in 2008-05-17 18:36:31.000000000 +0900
+--- set_soenv.in.orig 2009-04-22 23:54:40.000000000 +0900
++++ set_soenv.in 2009-05-09 12:33:40.000000000 +0900
@@ -40,7 +40,7 @@
#
my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
@@ -15,12 +15,12 @@
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
$PROEXT,
-- $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
-+ $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
+- $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS);
++ $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS);
#
#-------------------------------------------
# IId. Declaring the aliases.
-@@ -126,6 +126,7 @@
+@@ -121,6 +121,7 @@
$par_dir = ".."; # parrent directory
$I = " -I"; # include search path
$L = " -L"; # library search path
@@ -28,7 +28,7 @@
$D = " -D"; # define search path
$empty = ""; # used as argument
$no_stl = "NO_STLPORT4"; # possible argument
-@@ -274,6 +275,16 @@
+@@ -268,6 +269,16 @@
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
@@ -45,7 +45,7 @@
elsif ($platform =~ m/^sparc/)
{ print "Setting NetBSD Sparc specific values... ";
$outfile = "NetBSDSparcEnv.Set";
-@@ -299,8 +310,14 @@
+@@ -293,8 +304,14 @@
exit 1;
}
#Conditional setting depending on gcc3:
@@ -62,7 +62,7 @@
# General NetBSD settings:
$BIG_SVX = "TRUE";
$COM = "GCC";
-@@ -1361,7 +1378,8 @@
Home |
Main Index |
Thread Index |
Old Index