cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use textproc/icu4c instead of the bundled one; bump PKGNAMEs

Browse Source
This commit is contained in:
robert 2008-05-05 15:18:29 +00:00
parent cb84e7bab6
commit e6ee9472c5
7 changed files with 41 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editors/openoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.71 2008/04/28 11:18:46 robert Exp $
# $OpenBSD: Makefile,v 1.72 2008/05/05 15:18:29 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -9,17 +9,13 @@ COMMENT-java= optional integration of OpenOffice java features
VERSION= 2.4.0
DISTNAME= OOo_${VERSION}
WRKDIST= ${WRKDIR}/OOH680_m12
PKGNAME= openoffice-${VERSION}
PKGNAME-main= openoffice-${VERSION}
PKGNAME= openoffice-${VERSION}p0
PKGNAME-main= openoffice-${VERSION}p0
PKGNAME-kde= openoffice-kde-${VERSION}
PKGNAME-java= openoffice-java-${VERSION}
CATEGORIES= editors productivity
SHARED_LIBS= icudata 36.0 \
icui18n 36.0 \
icule 36.0 \
icuuc 36.0 \
stlport_gcc 4.5
SHARED_LIBS= stlport_gcc 4.5
MAINTAINER= Robert Nagy <robert@openbsd.org>
@ -79,7 +75,8 @@ BUILD_DEPENDS= :zip-*:archivers/zip \
::print/cups \
::devel/apache-ant \
:db-java-4.*:databases/db/v4,-java,java \
::devel/boost
::devel/boost \
::textproc/icu4c
MODULES+= lang/python
LIB_DEPENDS-main=gdk-x11-2.0.>=400.14,gdk_pixbuf-2.0.>=400.14,gtk-x11-2.0.>=400.14::x11/gtk+2 \
@ -151,6 +148,7 @@ CONFIGURE_ARGS= --disable-gnome-vfs \
--with-system-boost \
--with-system-libwpd \
--with-system-openssl \
--with-system-icu \
--with-epm=internal \
--with-alloc=system \
--with-java \

40
editors/openoffice/patches/patch-config_office_configure_in
View File

@ -1,6 +1,6 @@
--- config_office/configure.in.orig.port Thu Jan 31 12:45:01 2008
+++ config_office/configure.in Wed Apr 23 15:47:49 2008
@@ -920,6 +920,16 @@ case "$build_os" in
--- config_office/configure.in.orig.port Thu May 1 13:10:51 2008
+++ config_office/configure.in Thu May 1 13:19:08 2008
@@ -931,6 +931,16 @@ case "$build_os" in
echo "AIX is an alpha port --- Use at own risk" >> warn
_os=AIX
;;
@ -17,7 +17,7 @@
*)
AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!])
;;
@@ -2916,6 +2926,9 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -
@@ -2978,6 +2988,9 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -
AIX)
PKGFORMAT=aix
;;
@ -27,7 +27,7 @@
*BSD)
PKGFORMAT=bsd
;;
@@ -3244,7 +3257,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_l
@@ -3306,7 +3319,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_l
test "$with_system_libwpd" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPD=YES
@ -36,7 +36,7 @@
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPD=NO
@@ -3355,12 +3368,14 @@ if test -n "$with_system_python" && test "$with_system
@@ -3417,12 +3430,14 @@ if test -n "$with_system_python" && test "$with_system
python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
@ -52,7 +52,7 @@
fi
dnl check if the headers really work:
@@ -3398,15 +3413,12 @@ if test -n "$with_system_db" -o -n "$with_system_libs"
@@ -3460,15 +3475,12 @@ if test -n "$with_system_db" -o -n "$with_system_libs"
test "$with_system_db" != "no"; then
SYSTEM_DB=YES
AC_MSG_RESULT([external])
@ -72,7 +72,7 @@
for v in 1 2 3 4 5 6; do
AC_TRY_RUN([
#include <db.h>
@@ -3417,6 +3429,7 @@ int main(int argc, char **argv) {
@@ -3479,6 +3491,7 @@ int main(int argc, char **argv) {
}
], [DB_VERSION_MINOR=$v], [])
done
@ -80,7 +80,21 @@
if test "$DB_VERSION_MINOR" -gt "1"; then
AC_MSG_RESULT([OK])
DB_VERSION=4.$DB_VERSION_MINOR
@@ -4114,7 +4127,7 @@ elif test "$_os" != "WINNT" ; then
@@ -4065,11 +4078,11 @@ if test -n "$with_system_icu" -o -n "$with_system_libs
if test -z "$SYSTEM_GENBRK"; then
AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
fi
- AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin])
+ AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
if test -z "$SYSTEM_GENCCODE"; then
AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
fi
- AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin])
+ AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
if test -z "$SYSTEM_GENCMN"; then
AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
fi
@@ -4176,7 +4189,7 @@ elif test "$_os" != "WINNT" ; then
AC_MSG_ERROR([No X includes found]) # Exit
fi
CFLAGS=$X_CFLAGS
@ -89,7 +103,7 @@
AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
dnl Check if the XauDisposeAuth symbol is provided by libXau.
AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", [])
@@ -4331,7 +4344,7 @@ if test -n "$with_system_openssl" -o -n "$with_system_
@@ -4393,7 +4406,7 @@ if test -n "$with_system_openssl" -o -n "$with_system_
AC_MSG_RESULT([external])
# Mac OS builds should get out without extra stuff is the Mac porters'
# wish. And pkg-config is although Xcode ships a .pc for openssl
@ -98,7 +112,7 @@
OPENSSL_CFLAGS=
OPENSSL_LIBS="-lssl -lcrypto"
else
@@ -5213,42 +5226,23 @@ KDE_LIBS=""
@@ -5275,42 +5288,23 @@ KDE_LIBS=""
MOC="moc"
if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
dnl Search paths for Qt and KDE
@ -149,7 +163,7 @@
dnl Check for Qt headers
AC_MSG_CHECKING([for Qt headers])
@@ -5269,7 +5263,7 @@ your Qt installation by exporting QTDIR before running
@@ -5331,7 +5325,7 @@ your Qt installation by exporting QTDIR before running
AC_MSG_CHECKING([for Qt libraries])
qt_libdir="no"
for qt_check in $qt_libdirs ; do
@ -158,7 +172,7 @@
qt_libdir="$qt_check"
break
fi
@@ -5305,7 +5299,7 @@ your KDE installation by exporting KDEDIR before runni
@@ -5367,7 +5361,7 @@ your KDE installation by exporting KDEDIR before runni
AC_MSG_CHECKING([for KDE libraries])
kde_libdir="no"
for kde_check in $kde_libdirs ; do

487
editors/openoffice/patches/patch-icu_icu-3_6_patch
View File

@ -1,487 +0,0 @@
$OpenBSD: patch-icu_icu-3_6_patch,v 1.4 2008/04/28 11:18:46 robert Exp $
--- icu/icu-3.6.patch.orig.port Wed Apr 23 16:44:04 2008
+++ icu/icu-3.6.patch Wed Apr 23 16:51:35 2008
@@ -1,5 +1,5 @@
*** misc/icu/source/common/putil.c Mon Jul 31 20:14:28 2006
---- misc/build/icu/source/common/putil.c Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/putil.c Wed Apr 23 16:40:00 2008
***************
*** 48,54 ****
#endif
@@ -19,7 +19,7 @@
#endif
*** misc/icu/source/common/unicode/pwin32.h Tue Aug 29 23:34:38 2006
---- misc/build/icu/source/common/unicode/pwin32.h Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/pwin32.h Wed Apr 23 16:40:00 2008
***************
*** 266,273 ****
--- 266,278 ----
@@ -37,7 +37,7 @@
/*===========================================================================*/
/* Code alignment and C function inlining */
*** misc/icu/source/common/unicode/rbbi.h Fri Aug 11 07:46:40 2006
---- misc/build/icu/source/common/unicode/rbbi.h Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/rbbi.h Wed Apr 23 16:40:00 2008
***************
*** 611,622 ****
--- 611,624 ----
@@ -56,7 +56,7 @@
* Common initialization function, used by constructors and bufferClone.
* (Also used by DictionaryBasedBreakIterator::createBufferClone().)
*** misc/icu/source/common/unicode/umachine.h Tue Feb 7 02:54:16 2006
---- misc/build/icu/source/common/unicode/umachine.h Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/umachine.h Wed Apr 23 16:40:00 2008
***************
*** 322,328 ****
*/
@@ -75,7 +75,7 @@
#else
typedef uint16_t UChar;
*** misc/icu/source/common/unicode/unistr.h Tue Aug 29 23:52:50 2006
---- misc/build/icu/source/common/unicode/unistr.h Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/unistr.h Wed Apr 23 16:40:00 2008
***************
*** 3280,3286 ****
//========================================
@@ -179,7 +179,7 @@
}
*** misc/icu/source/common/unicode/ustring.h Tue Aug 29 23:52:50 2006
---- misc/build/icu/source/common/unicode/ustring.h Mon Jan 28 21:31:50 2008
+--- misc/build/icu/source/common/unicode/ustring.h Wed Apr 23 16:40:00 2008
***************
*** 918,924 ****
* </pre>
@@ -198,7 +198,7 @@
/**@stable ICU 2.0 */
# define U_STRING_INIT(var, cs, length)
*** misc/icu/source/common/uvectr32.cpp Wed Aug 27 03:01:30 2003
---- misc/build/icu/source/common/uvectr32.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/common/uvectr32.cpp Wed Apr 23 16:40:00 2008
***************
*** 1,6 ****
/*
@@ -306,7 +306,7 @@
}
*** misc/icu/source/common/uvectr32.h Wed Jan 18 04:52:04 2006
---- misc/build/icu/source/common/uvectr32.h Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/common/uvectr32.h Wed Apr 23 16:40:00 2008
***************
*** 1,6 ****
/*
@@ -370,7 +370,7 @@
count += size;
return rp;
*** misc/icu/source/config/mh-darwin Wed Feb 1 08:52:42 2006
---- misc/build/icu/source/config/mh-darwin Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-darwin Wed Apr 23 16:40:00 2008
***************
*** 25,31 ****
SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
@@ -389,7 +389,7 @@
## Compiler switch to embed a runtime search path
LD_RPATH=
*** misc/icu/source/config/mh-irix Thu Mar 23 19:51:52 2006
---- misc/build/icu/source/config/mh-irix Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-irix Wed Apr 23 16:40:00 2008
***************
*** 23,28 ****
--- 23,31 ----
@@ -403,7 +403,7 @@
THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS
LIBCPPFLAGS =
*** misc/icu/source/config/mh-linux Thu Mar 23 19:51:52 2006
---- misc/build/icu/source/config/mh-linux Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-linux Wed Apr 23 16:40:00 2008
***************
*** 20,25 ****
--- 20,33 ----
@@ -422,7 +422,7 @@
LDFLAGSICUDT=-nodefaultlibs -nostdlib
*** misc/icu/source/config/mh-mingw Tue Aug 15 10:24:14 2006
---- misc/build/icu/source/config/mh-mingw Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-mingw Wed Apr 23 16:40:00 2008
***************
*** 54,59 ****
--- 54,62 ----
@@ -453,9 +453,9 @@
CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M#
*** misc/icu/source/config/mh-solaris Fri Feb 24 20:31:14 2006
---- misc/build/icu/source/config/mh-solaris Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/config/mh-solaris Wed Apr 23 16:40:00 2008
***************
-*** 18,34 ****
+*** 18,33 ****
## Commands to link
## For Sun Workshop, use CC to link to bring in C++ runtime
@@ -472,8 +472,7 @@
#LIBRARY_PATH_PREFIX=/usr/lib/lwp:
- ## Compiler switch to embed a library name
---- 18,42 ----
+--- 18,41 ----
## Commands to link
## For Sun Workshop, use CC to link to bring in C++ runtime
@@ -488,19 +487,37 @@
## Compiler switch to embed a runtime search path
LD_RPATH= -R
LD_RPATH_PRE=
-
++
+ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
+ ENABLE_RPATH=YES
+ RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN'
+
+ #SH# ENABLE_RPATH=YES
+ #SH# RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'"
-+
+
#LIBRARY_PATH_PREFIX=/usr/lib/lwp:
- ## Compiler switch to embed a library name
+*** misc/icu/source/configure Tue Aug 15 10:24:14 2006
+--- misc/build/icu/source/configure Wed Apr 23 16:41:26 2008
+***************
+*** 4400,4406 ****
+
+ GENCCODE_ASSEMBLY=
+ case "${host}" in
+! i*86-*-linux*|x86_64-*-linux*|powerpc*-*-linux*|i*86-*-*bsd*|i*86-*-solaris*)
+ if test "$GCC" = yes; then
+ GENCCODE_ASSEMBLY="-a gcc"
+ fi ;;
+--- 4400,4406 ----
+
+ GENCCODE_ASSEMBLY=
+ case "${host}" in
+! i*86-*-linux*|x86_64-*-linux*|powerpc*-*-linux*|i*86-*-solaris*)
+ if test "$GCC" = yes; then
+ GENCCODE_ASSEMBLY="-a gcc"
+ fi ;;
*** misc/icu/source/data/Makefile.in Sat Aug 12 00:22:24 2006
---- misc/build/icu/source/data/Makefile.in Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/data/Makefile.in Wed Apr 23 16:40:00 2008
***************
*** 344,350 ****
ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
@@ -519,7 +536,7 @@
@echo "$@" > $@
endif
*** misc/icu/source/i18n/regexcmp.cpp Thu Feb 2 05:37:14 2006
---- misc/build/icu/source/i18n/regexcmp.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/i18n/regexcmp.cpp Wed Apr 23 16:40:00 2008
***************
*** 2,8 ****
//
@@ -572,7 +589,7 @@
break;
*** misc/icu/source/i18n/rematch.cpp Thu Aug 25 20:02:20 2005
---- misc/build/icu/source/i18n/rematch.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/i18n/rematch.cpp Wed Apr 23 16:40:00 2008
***************
*** 6,12 ****
//
@@ -697,7 +714,7 @@
}
}
*** misc/icu/source/i18n/windtfmt.cpp Tue Aug 15 08:48:02 2006
---- misc/build/icu/source/i18n/windtfmt.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/i18n/windtfmt.cpp Wed Apr 23 16:40:00 2008
***************
*** 232,249 ****
UChar stackBuffer[STACK_BUFFER_SIZE];
@@ -777,7 +794,7 @@
if (buffer != stackBuffer) {
DELETE_ARRAY(buffer);
*** misc/icu/source/i18n/winnmfmt.cpp Thu Aug 17 07:21:06 2006
---- misc/build/icu/source/i18n/winnmfmt.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/i18n/winnmfmt.cpp Wed Apr 23 16:40:00 2008
***************
*** 86,95 ****
GetLocaleInfoA(lcid, LOCALE_SGROUPING, buf, 10);
@@ -915,7 +932,7 @@
if (buffer != stackBuffer) {
DELETE_ARRAY(buffer);
*** misc/icu/source/layout/CoverageTables.cpp Sat May 8 01:28:42 2004
---- misc/build/icu/source/layout/CoverageTables.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/CoverageTables.cpp Wed Apr 23 16:40:00 2008
***************
*** 44,49 ****
--- 44,53 ----
@@ -930,7 +947,7 @@
le_uint16 probe = power;
le_uint16 index = 0;
*** misc/icu/source/layout/DeviceTables.cpp Fri Jan 14 18:25:12 2005
---- misc/build/icu/source/layout/DeviceTables.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/DeviceTables.cpp Wed Apr 23 16:40:00 2008
***************
*** 22,28 ****
le_uint16 format = SWAPW(deltaFormat) - 1;
@@ -950,7 +967,7 @@
le_uint16 bits = fieldBits[format];
le_uint16 count = 16 / bits;
*** misc/icu/source/layout/GXLayoutEngine.cpp Fri Sep 2 20:22:10 2005
---- misc/build/icu/source/layout/GXLayoutEngine.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/GXLayoutEngine.cpp Wed Apr 23 16:40:00 2008
***************
*** 39,45 ****
return 0;
@@ -969,7 +986,7 @@
if (LE_FAILURE(success)) {
return 0;
*** misc/icu/source/layout/IndicClassTables.cpp Wed Aug 23 02:12:40 2006
---- misc/build/icu/source/layout/IndicClassTables.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/IndicClassTables.cpp Wed Apr 23 16:40:00 2008
***************
*** 94,100 ****
_dr, _db, _db, _db, _db, _xx, _xx, _l1, _dl, _xx, _xx, _s1, _s2, _vr, _xx, _xx, // 09C0 - 09CF
@@ -988,14 +1005,14 @@
static const IndicClassTable::CharClass punjCharClasses[] =
***************
-*** 120,125 ****
---- 120,138 ----
+*** 120,127 ****
+--- 120,140 ----
_iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx // 0AE0 - 0AEF
};
+ #if 1
-+ static const IndicClassTable::CharClass oryaCharClasses[] =
-+ {
+ static const IndicClassTable::CharClass oryaCharClasses[] =
+ {
+ _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, /* 0B00 - 0B0F */
+ _iv, _xx, _xx, _iv, _iv, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _ct, _bb, /* 0B10 - 0B1F */
+ _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _pb, /* 0B20 - 0B2F */
@@ -1006,9 +1023,11 @@
+ _xx, _bb /* 0B70 - 0B71 */
+ };
+ #else
- static const IndicClassTable::CharClass oryaCharClasses[] =
- {
++ static const IndicClassTable::CharClass oryaCharClasses[] =
++ {
_xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, // 0B00 - 0B0F
+ _iv, _xx, _xx, _iv, _iv, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, // 0B10 - 0B1F
+ _ct, _ct, _ct, _ct, _bb, _ct, _ct, _ct, _bb, _xx, _ct, _ct, _bb, _bb, _bb, _pb, // 0B20 - 0B2F
***************
*** 131,136 ****
--- 144,150 ----
@@ -1103,7 +1122,7 @@
//
// IndicClassTable addresses
*** misc/icu/source/layout/IndicReordering.cpp Tue Apr 25 21:08:12 2006
---- misc/build/icu/source/layout/IndicReordering.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/IndicReordering.cpp Wed Apr 23 16:40:00 2008
***************
*** 50,55 ****
--- 50,63 ----
@@ -1185,11 +1204,13 @@
{-1, -1, -1, -1, -1, -1, 3, 2, -1, -1, -1, -1, -1, -1, -1}, // 7 - consonant virama ZWJ, consonant ZWJ virama
{-1, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1}, // 8 - independent vowels that can take a virama
***************
-*** 629,634 ****
---- 651,670 ----
+*** 627,632 ****
+--- 649,668 ----
+ // write base consonant
+ for (i = baseConsonant; i < bcSpan; i += 1) {
output.writeChar(chars[i], i, tagArray4);
- }
-
++ }
++
+ /* for the special conjuction of Cons+0x0d4d+0x0d31 or Cons+0x0d4d+0x0d30 of Malayalam */
+ if ((baseConsonant - 2 >= 0) &&
+ (chars[baseConsonant - 1] == 0x0d4d) &&
@@ -1202,13 +1223,11 @@
+
+ if (mpreFixups)
+ mpreFixups->reduce();
-+ }
-+
+ }
+
if ((classTable->scriptFlags & SF_MATRAS_AFTER_BASE) != 0) {
- output.writeMbelow();
- output.writeSMbelow(); // FIXME: there are no SMs in these scripts...
*** misc/icu/source/layout/LESwaps.h Thu Jun 23 00:39:36 2005
---- misc/build/icu/source/layout/LESwaps.h Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/LESwaps.h Wed Apr 23 16:40:00 2008
***************
*** 2,7 ****
--- 2,8 ----
@@ -1256,11 +1275,12 @@
#if U_IS_BIG_ENDIAN
#define SWAPW(value) (value)
***************
-*** 49,54 ****
---- 59,83 ----
+*** 48,53 ****
+--- 58,82 ----
+ #else
#define SWAPL(value) (LESwaps::isBigEndian() ? (value) : LESwaps::swapLong(value))
#endif
-
++
+ #else // ALLOW_UNALIGNED_HACK
+
+ #define SWAPW(rValue) loadBigEndianWord(reinterpret_cast<const le_uint16&>(rValue))
@@ -1279,12 +1299,11 @@
+ }
+
+ #endif // ALLOW_UNALIGNED_HACK
-+
+
/**
* This class is used to access data which stored in big endian order
- * regardless of the conventions of the platform. It has been designed
*** misc/icu/source/layout/MPreFixups.cpp Sat May 8 01:28:44 2004
---- misc/build/icu/source/layout/MPreFixups.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/MPreFixups.cpp Wed Apr 23 16:40:00 2008
***************
*** 40,45 ****
--- 40,51 ----
@@ -1301,7 +1320,7 @@
{
for (le_int32 fixup = 0; fixup < fFixupCount; fixup += 1) {
*** misc/icu/source/layout/MPreFixups.h Mon Apr 12 20:51:32 2004
---- misc/build/icu/source/layout/MPreFixups.h Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/layout/MPreFixups.h Wed Apr 23 16:40:00 2008
***************
*** 31,36 ****
--- 31,38 ----
@@ -1314,7 +1333,7 @@
FixupData *fFixupData;
le_int32 fFixupCount;
*** misc/icu/source/stubdata/Makefile.in Fri Dec 2 11:21:34 2005
---- misc/build/icu/source/stubdata/Makefile.in Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/stubdata/Makefile.in Wed Apr 23 16:40:00 2008
***************
*** 25,30 ****
--- 25,36 ----
@@ -1330,8 +1349,60 @@
ifneq ($(ENABLE_STATIC),)
TARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
+*** misc/icu/source/stubdata/stubdata.c Wed Nov 21 03:28:14 2001
+--- misc/build/icu/source/stubdata/stubdata.c Wed Apr 23 16:43:50 2008
+***************
+*** 28,41 ****
+ UDataInfo info;
+ char padding[8];
+ uint32_t count, reserved;
+- /*
+ const struct {
+ const char *const name;
+ const void *const data;
+! } toc[1];
+! */
+! int fakeNameAndData[4]; /* TODO: Change this header type from */
+! /* pointerTOC to OffsetTOC. */
+ } ICU_Data_Header;
+
+ U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = {
+--- 28,37 ----
+ UDataInfo info;
+ char padding[8];
+ uint32_t count, reserved;
+ const struct {
+ const char *const name;
+ const void *const data;
+! } toc[537]; /* set to real toc size to avoid symbol size mismatch runtime link errors */
+ } ICU_Data_Header;
+
+ U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = {
+***************
+*** 64,73 ****
+ 0, /* count */
+ 0, /* Reserved */
+ { /* TOC structure */
+! /* { */
+! 0 , 0 , 0, 0 /* name and data entries. Count says there are none, */
+ /* but put one in just in case. */
+! /* } */
+ }
+ };
+
+--- 60,69 ----
+ 0, /* count */
+ 0, /* Reserved */
+ { /* TOC structure */
+! {
+! { 0 , 0 } /* name and data entries. Count says there are none, */
+ /* but put one in just in case. */
+! }
+ }
+ };
+
*** misc/icu/source/test/intltest/loctest.cpp Thu Jul 6 03:50:04 2006
---- misc/build/icu/source/test/intltest/loctest.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/loctest.cpp Wed Apr 23 16:40:00 2008
***************
*** 4,9 ****
--- 4,10 ----
@@ -1343,7 +1414,7 @@
#include "unicode/decimfmt.h"
#include "unicode/ucurr.h"
*** misc/icu/source/test/intltest/regextst.cpp Tue Jul 5 20:39:00 2005
---- misc/build/icu/source/test/intltest/regextst.cpp Mon Jan 28 23:18:47 2008
+--- misc/build/icu/source/test/intltest/regextst.cpp Wed Apr 23 16:40:00 2008
***************
*** 1,6 ****
/********************************************************************
@@ -1424,7 +1495,7 @@
#endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS */
*** misc/icu/source/test/intltest/regextst.h Wed Dec 3 07:58:28 2003
---- misc/build/icu/source/test/intltest/regextst.h Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/regextst.h Wed Apr 23 16:40:00 2008
***************
*** 1,6 ****
/********************************************************************
@@ -1451,7 +1522,7 @@
// The following functions are internal to the regexp tests.
virtual UBool doRegexLMTest(const char *pat, const char *text, UBool looking, UBool match, int line);
*** misc/icu/source/test/intltest/tsputil.cpp Wed Jul 19 00:18:10 2006
---- misc/build/icu/source/test/intltest/tsputil.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/tsputil.cpp Wed Apr 23 16:40:00 2008
***************
*** 4,9 ****
--- 4,10 ----
@@ -1463,7 +1534,7 @@
#include <float.h> // DBL_MAX, DBL_MIN
*** misc/icu/source/test/intltest/uobjtest.cpp Thu Mar 23 01:54:12 2006
---- misc/build/icu/source/test/intltest/uobjtest.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/uobjtest.cpp Wed Apr 23 16:40:00 2008
***************
*** 4,9 ****
--- 4,10 ----
@@ -1475,7 +1546,7 @@
#include "cmemory.h" // UAlignedMemory
#include <string.h>
*** misc/icu/source/test/intltest/ustrtest.cpp Tue Dec 28 22:13:54 2004
---- misc/build/icu/source/test/intltest/ustrtest.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/test/intltest/ustrtest.cpp Wed Apr 23 16:40:00 2008
***************
*** 4,9 ****
--- 4,10 ----
@@ -1487,7 +1558,7 @@
#include "unicode/unistr.h"
#include "unicode/uchar.h"
*** misc/icu/source/tools/icupkg/icupkg.cpp Fri Jul 21 23:17:52 2006
---- misc/build/icu/source/tools/icupkg/icupkg.cpp Mon Jan 28 21:31:51 2008
+--- misc/build/icu/source/tools/icupkg/icupkg.cpp Wed Apr 23 16:40:00 2008
***************
*** 332,337 ****
--- 332,341 ----

11
editors/openoffice/patches/patch-icu_makefile_mk
View File

@ -1,11 +0,0 @@
--- icu/makefile.mk.orig.port Tue Jul 31 15:04:47 2007
+++ icu/makefile.mk Thu Oct 25 16:23:46 2007
@@ -91,7 +91,7 @@ LDFLAGSADD += -Wl,--hash-style=both
CONFIGURE_DIR=source
-CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
+CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS) -fPIC" CXXFLAGS="$(icu_CXXFLAGS) -fPIC" LDFLAGS="$(icu_LDFLAGS) -fPIC" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
#CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no
CONFIGURE_FLAGS=

10
editors/openoffice/patches/patch-solenv_inc_settings_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-solenv_inc_settings_mk,v 1.8 2008/04/28 11:18:46 robert Exp $
--- solenv/inc/settings.mk.orig.port Thu Jan 17 17:04:51 2008
+++ solenv/inc/settings.mk Wed Apr 23 15:24:06 2008
@@ -1067,6 +1067,8 @@ CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
$OpenBSD: patch-solenv_inc_settings_mk,v 1.9 2008/05/05 15:18:29 robert Exp $
--- solenv/inc/settings.mk.orig.port Thu May 1 13:10:51 2008
+++ solenv/inc/settings.mk Thu May 1 13:10:53 2008
@@ -1070,6 +1070,8 @@ CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
.ENDIF
@ -10,7 +10,7 @@ $OpenBSD: patch-solenv_inc_settings_mk,v 1.8 2008/04/28 11:18:46 robert Exp $
.IF "$(optimize)"!=""
CDEFS+=$(CDEFSOPT)
CFLAGS+=$(CFLAGSOPT)
@@ -1199,7 +1201,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
@@ -1202,7 +1204,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
CDEFS+= $(ADDCDEFS)
CDEFS+= $(ENVCDEFS)

6
editors/openoffice/pkg/PFRAG.shared-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.6 2008/04/28 11:18:46 robert Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.7 2008/05/05 15:18:29 robert Exp $
openoffice/program/acceptor.uno.so
openoffice/program/basprov680.uno.so
openoffice/program/behelper.uno.so
@ -114,10 +114,6 @@ openoffice/program/libi18nregexpgcc3.so
openoffice/program/libi18nutilgcc3.so
openoffice/program/libicd680.so
openoffice/program/libicg680.so
@lib openoffice/program/libicudata.so.${LIBicudata_VERSION}
@lib openoffice/program/libicui18n.so.${LIBicui18n_VERSION}
@lib openoffice/program/libicule.so.${LIBicule_VERSION}
@lib openoffice/program/libicuuc.so.${LIBicuuc_VERSION}
openoffice/program/libidx680.so
openoffice/program/libime680.so
openoffice/program/libindex_data.so

6
editors/openoffice/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.11 2008/04/28 11:18:46 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.12 2008/05/05 15:18:29 robert Exp $
@pkgpath editors/openoffice
%%SHARED%%
bin/sbase
@ -219,10 +219,6 @@ openoffice/program/libbf_so680.so
openoffice/program/libcppu.so.3
openoffice/program/libcppuhelpergcc3.so.3
openoffice/program/libhelplinker680.so
openoffice/program/libicudata.so.36
openoffice/program/libicui18n.so.36
openoffice/program/libicule.so.36
openoffice/program/libicuuc.so.36
openoffice/program/libjvmaccessgcc3.so.3
openoffice/program/libjvmfwk.so.3
openoffice/program/libreg.so.3