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

Update to OpenOffice.Org 3.2.1

Browse Source
This commit is contained in:
robert 2010-06-26 15:48:11 +00:00
parent 2c66bfeb1f
commit 2c5a3b8131
118 changed files with 555 additions and 2206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
editors/openoffice3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2010/06/09 12:50:23 robert Exp $
# $OpenBSD: Makefile,v 1.45 2010/06/26 15:48:11 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -6,13 +6,13 @@ COMMENT-main= multi-platform productivity suite
COMMENT-kde= optional integration of OpenOffice to the KDE environment
COMMENT-java= optional integration of OpenOffice java features
VERSION= 3.2.0
VERSION= 3.2.1
DISTNAME= OOo_${VERSION}
WRKDIST= ${WRKDIR}/OOO320_m12
PKGNAME= openoffice-${VERSION}p1
PKGNAME-main= openoffice-${VERSION}p4
PKGNAME-kde= openoffice-kde-${VERSION}p1
PKGNAME-java= openoffice-java-${VERSION}p2
WRKDIST= ${WRKDIR}/OOO320_m19
PKGNAME= openoffice-${VERSION}
PKGNAME-main= openoffice-${VERSION}
PKGNAME-kde= openoffice-kde-${VERSION}
PKGNAME-java= openoffice-java-${VERSION}
CATEGORIES= editors productivity
MAINTAINER= Robert Nagy <robert@openbsd.org>
@ -68,7 +68,7 @@ LANGS= bg ca de es fa fi fr hu it ja ko \
.for l in ${LANGS:L}
MULTI_PACKAGES+= -i18n-$l
PKGNAME-i18n-$l= openoffice-i18n-$l-${VERSION}p0
PKGNAME-i18n-$l= openoffice-i18n-$l-${VERSION}
COMMENT-i18n-$l= $l language pack for OpenOffice.Org
RUN_DEPENDS-i18n-$l= ::editors/openoffice3
WANTLIB-i18n-$l=
@ -198,11 +198,11 @@ CONFIGURE_ARGS+= --enable-minimizer \
--enable-pdfimport \
--enable-report-builder \
--enable-wiki-publisher
EXTENSIONS= minimizer/sun-presentation-minimizer.oxt \
EXTENSIONS= minimizer/presentation-minimizer.oxt \
presenter/presenter-screen.oxt \
pdfimport/pdfimport.oxt \
swext/wiki-publisher.oxt \
sun-report-builder.oxt
report-builder.oxt
.if ${FLAVOR:L:Mdebug}
@ -234,7 +234,8 @@ BUILD_CMD= cd instsetoo_native && build.pl ${NCPUFLAG} --all --dlv_switch -link
post-extract:
@mkdir -p ${WRKDIST}/xpdf/unxobsd.pro/misc
@echo mv ${WRKDIR}/textproc/xpdf/xpdf-3.02 . > ${WRKDIST}/xpdf/unxobsd.pro/misc/xpdf-3.02.unpack
@mv ${WRKDIR}/textproc/xpdf/xpdf-3.02 ${WRKDIST}/xpdf/unxobsd.pro/misc/ > \
${WRKDIST}/xpdf/unxobsd.pro/misc/so_unpacked_xpdflib
pre-patch:
.if ${FLAVOR:L:Mparallel}

50
editors/openoffice3/distinfo
View File

@ -1,35 +1,35 @@
MD5 (openoffice/OOo_3.2.0_src_binfilter.tar.bz2) = ElYERMih0u7Eto/oBHLxyQ==
MD5 (openoffice/OOo_3.2.0_src_core.tar.bz2) = IJTQfCbS/88i4TFlilMcZw==
MD5 (openoffice/OOo_3.2.0_src_extensions.tar.bz2) = WG1MlgepkhaYIPzMsfXMAA==
MD5 (openoffice/OOo_3.2.0_src_l10n.tar.bz2) = Vhq2D3mwol6Qtod5In73Bw==
MD5 (openoffice/OOo_3.2.0_src_system.tar.bz2) = 9qc46HrfmO5KFBk/mCyX4Q==
MD5 (openoffice/OOo_3.2.1_src_binfilter.tar.bz2) = VzVL0hFQHFnRrSTb0XZt1w==
MD5 (openoffice/OOo_3.2.1_src_core.tar.bz2) = T6cT+3lrxX5eud+wdYrdoA==
MD5 (openoffice/OOo_3.2.1_src_extensions.tar.bz2) = cnfW3SWF2idcojfNH9hLWw==
MD5 (openoffice/OOo_3.2.1_src_l10n.tar.bz2) = 9AbpKO3kHYwp32MujDLZIA==
MD5 (openoffice/OOo_3.2.1_src_system.tar.bz2) = 5kBcgQi9z0zCvwZtiKpa4Q==
MD5 (openoffice/nbcat-0.1.tar.gz) = s7omtB1poGIjFr2rBrus5w==
MD5 (openoffice/ooo-desktop-0.2.tar.gz) = p7CEcVF+1OOO5r5skxRcdg==
RMD160 (openoffice/OOo_3.2.0_src_binfilter.tar.bz2) = GpJYL36dxMPdV75tsFGfXVPgua0=
RMD160 (openoffice/OOo_3.2.0_src_core.tar.bz2) = JTUkDyiqmXd8o3aMNm1aRl4ET3I=
RMD160 (openoffice/OOo_3.2.0_src_extensions.tar.bz2) = onT6vMdrzDlkD+DEekqwCLr/vP0=
RMD160 (openoffice/OOo_3.2.0_src_l10n.tar.bz2) = SCE2ZJTA8SEzRR2UISoVUEuV4oE=
RMD160 (openoffice/OOo_3.2.0_src_system.tar.bz2) = AigbiJDHJLfyrTEVV42HbNSNqwo=
RMD160 (openoffice/OOo_3.2.1_src_binfilter.tar.bz2) = LQpc/EsVVYLMqzDbJpmPrhCnRuo=
RMD160 (openoffice/OOo_3.2.1_src_core.tar.bz2) = 9YtK3+S+7JvPN+jQY74lMGncMdA=
RMD160 (openoffice/OOo_3.2.1_src_extensions.tar.bz2) = bSI9tX+wQt/kPnbHIJy2YxidoWE=
RMD160 (openoffice/OOo_3.2.1_src_l10n.tar.bz2) = GyQr9WFEaBRwfNgVkTG2HOpnT/A=
RMD160 (openoffice/OOo_3.2.1_src_system.tar.bz2) = YZs4L0M4fLW6vZlSwU8GqwWU3Vo=
RMD160 (openoffice/nbcat-0.1.tar.gz) = gAWngyXsdW/H71IKrhUZ1hAOw4M=
RMD160 (openoffice/ooo-desktop-0.2.tar.gz) = wrAjoTTdz8cU4kD6TxWmqDrePOo=
SHA1 (openoffice/OOo_3.2.0_src_binfilter.tar.bz2) = 7xBBZFrkRDlfAE7vTb4xxHJQFHY=
SHA1 (openoffice/OOo_3.2.0_src_core.tar.bz2) = Aka3ewy4RF6ww+6ftD9uAMpUphs=
SHA1 (openoffice/OOo_3.2.0_src_extensions.tar.bz2) = hgJizA88a/DknTStSVuVZRImWtM=
SHA1 (openoffice/OOo_3.2.0_src_l10n.tar.bz2) = f+/od6VRtJEK1A98goAk1krZKr0=
SHA1 (openoffice/OOo_3.2.0_src_system.tar.bz2) = 6gzapQrGICGWcd6zAHDTxS0OUJw=
SHA1 (openoffice/OOo_3.2.1_src_binfilter.tar.bz2) = Eg3LTAgEI+sRNcWC6NElG2dYWiU=
SHA1 (openoffice/OOo_3.2.1_src_core.tar.bz2) = UEFpmOzKBhGNv7fKixqzSM2UGcM=
SHA1 (openoffice/OOo_3.2.1_src_extensions.tar.bz2) = 4M0JSjiXP5MU53Xs4D5tcxVgdzM=
SHA1 (openoffice/OOo_3.2.1_src_l10n.tar.bz2) = cAu8LqN4yGaFVRJoE2nmeyGgNBc=
SHA1 (openoffice/OOo_3.2.1_src_system.tar.bz2) = p6wL84Bv+x7j/QW3Hp5rGnv1d7E=
SHA1 (openoffice/nbcat-0.1.tar.gz) = kkR/zrOcOLpgkwq6FOgVrai2Ctw=
SHA1 (openoffice/ooo-desktop-0.2.tar.gz) = Yp/LUpTAPR8ySoqrmyqzuzW4vnQ=
SHA256 (openoffice/OOo_3.2.0_src_binfilter.tar.bz2) = KsvVg/iwkOD7216gHVNirUZ7cTKZ0pNE/HyA5f9Qg8o=
SHA256 (openoffice/OOo_3.2.0_src_core.tar.bz2) = tEq5THW4nJNUUx3bqcIRN0VnU14UcwipNOjDXXsmgUo=
SHA256 (openoffice/OOo_3.2.0_src_extensions.tar.bz2) = aGK3KPsbWUY5ndwcejc1qauEtpYwmjr2woy6e4hfXdA=
SHA256 (openoffice/OOo_3.2.0_src_l10n.tar.bz2) = SS1pCaPP9d5HsT0QlHn2rbeFMrpncl0O4p9FbHJa5Oo=
SHA256 (openoffice/OOo_3.2.0_src_system.tar.bz2) = l3ljM+svF+gZkCbUq0M01Zu7/8jS+dkQCgwn6CPhMFo=
SHA256 (openoffice/OOo_3.2.1_src_binfilter.tar.bz2) = 1yy9nzwXMlDHx+w9VUXTtHg+rVrdyV2yPdGYwlsOsFs=
SHA256 (openoffice/OOo_3.2.1_src_core.tar.bz2) = 0dyU0agsDChnxvkJF8Qx9khWegFWhUkI/Gp+C22EQj4=
SHA256 (openoffice/OOo_3.2.1_src_extensions.tar.bz2) = MtujpmjC6te8k2oEKWodObSbT0GNcCZE1B0wBZ73qzQ=
SHA256 (openoffice/OOo_3.2.1_src_l10n.tar.bz2) = VdfpDxzRMFvOVHKsqY6mh3dORv/hNrpiFcwzzD8bcVQ=
SHA256 (openoffice/OOo_3.2.1_src_system.tar.bz2) = zH2kOtII7DrgNoj8uZ3As6w8M+vZgHV4CjISo74ePj4=
SHA256 (openoffice/nbcat-0.1.tar.gz) = lqWTF8fBKanSGH1fOpHidb7XxtBxez+uM8cyfzcok6A=
SHA256 (openoffice/ooo-desktop-0.2.tar.gz) = qkFIuLw5cdr36NqUVcHwU4n76Q+Cj7drcqW41SdqCQY=
SIZE (openoffice/OOo_3.2.0_src_binfilter.tar.bz2) = 6485071
SIZE (openoffice/OOo_3.2.0_src_core.tar.bz2) = 214923121
SIZE (openoffice/OOo_3.2.0_src_extensions.tar.bz2) = 13921000
SIZE (openoffice/OOo_3.2.0_src_l10n.tar.bz2) = 104383205
SIZE (openoffice/OOo_3.2.0_src_system.tar.bz2) = 59670795
SIZE (openoffice/OOo_3.2.1_src_binfilter.tar.bz2) = 6461292
SIZE (openoffice/OOo_3.2.1_src_core.tar.bz2) = 214703203
SIZE (openoffice/OOo_3.2.1_src_extensions.tar.bz2) = 13898563
SIZE (openoffice/OOo_3.2.1_src_l10n.tar.bz2) = 106071765
SIZE (openoffice/OOo_3.2.1_src_system.tar.bz2) = 61044358
SIZE (openoffice/nbcat-0.1.tar.gz) = 103801
SIZE (openoffice/ooo-desktop-0.2.tar.gz) = 43547

6
editors/openoffice3/patches/patch-autodoc_source_mkinc_fullcpp_mk
View File

@ -1,6 +1,6 @@
--- autodoc/source/mkinc/fullcpp.mk.orig.port Fri Aug 1 07:17:37 2008
+++ autodoc/source/mkinc/fullcpp.mk Thu Jan 15 14:47:49 2009
@@ -39,7 +39,7 @@
--- autodoc/source/mkinc/fullcpp.mk.orig.port Wed May 26 20:20:17 2010
+++ autodoc/source/mkinc/fullcpp.mk Fri Jun 25 23:56:13 2010
@@ -35,7 +35,7 @@
.IF "$(GUI)"=="WNT"
CFLAGS+= -GR
.ENDIF

6
editors/openoffice3/patches/patch-automation_source_testtool_objtest_cxx
View File

@ -1,6 +1,6 @@
--- automation/source/testtool/objtest.cxx.orig.port Fri Aug 1 07:17:40 2008
+++ automation/source/testtool/objtest.cxx Thu Jan 15 14:47:49 2009
@@ -521,6 +521,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEin
--- automation/source/testtool/objtest.cxx.orig.port Wed May 26 20:20:18 2010
+++ automation/source/testtool/objtest.cxx Fri Jun 25 23:56:13 2010
@@ -518,6 +518,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEin
abGP.Append( "20" ); // Linux ia64
#elif defined LINUX && defined S390
abGP.Append( "21" ); // Linux S390

8
editors/openoffice3/patches/patch-binfilter_bf_sc_source_core_data_sc_cell_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-binfilter_bf_sc_source_core_data_sc_cell_cxx,v 1.2 2009/01/22 17:44:38 robert Exp $
--- binfilter/bf_sc/source/core/data/sc_cell.cxx.orig.port Fri Aug 1 07:18:01 2008
+++ binfilter/bf_sc/source/core/data/sc_cell.cxx Thu Jan 15 14:47:49 2009
@@ -45,7 +45,7 @@
$OpenBSD: patch-binfilter_bf_sc_source_core_data_sc_cell_cxx,v 1.3 2010/06/26 15:48:11 robert Exp $
--- binfilter/bf_sc/source/core/data/sc_cell.cxx.orig.port Wed May 26 20:20:24 2010
+++ binfilter/bf_sc/source/core/data/sc_cell.cxx Fri Jun 25 23:56:13 2010
@@ -42,7 +42,7 @@
#include <mac_end.h>
#endif

34
editors/openoffice3/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
--- configure.in.orig.port Sun Jan 24 16:14:31 2010
+++ configure.in Sun Jan 24 16:24:10 2010
@@ -1036,6 +1036,18 @@ case "$build_os" in
$OpenBSD: patch-configure_in,v 1.3 2010/06/26 15:48:11 robert Exp $
--- configure.in.orig.port Wed May 26 20:21:11 2010
+++ configure.in Fri Jun 25 23:57:08 2010
@@ -1053,6 +1053,18 @@ case "$build_os" in
echo "AIX is an alpha port --- Use at own risk" >> warn
_os=AIX
;;
@ -20,7 +20,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
*)
AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!])
;;
@@ -2482,6 +2494,8 @@ dnl ==================================================
@@ -2499,6 +2511,8 @@ dnl ==================================================
DEFAULT_TO_STLPORT="yes"
elif test "$_os" = "FreeBSD"; then
DEFAULT_TO_STLPORT="yes"
@ -29,7 +29,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
fi
if test "$DEFAULT_TO_STLPORT" = "yes"; then
AC_MSG_RESULT([stlport])
@@ -3345,6 +3359,9 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -
@@ -3362,6 +3376,9 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -
AIX)
PKGFORMAT=aix
;;
@ -39,7 +39,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
*BSD)
PKGFORMAT=bsd
;;
@@ -3674,7 +3691,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_l
@@ -3691,7 +3708,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
@ -48,7 +48,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPD=NO
@@ -3794,12 +3811,13 @@ if test -n "$with_system_python" -o -n "$with_system_l
@@ -3811,12 +3828,13 @@ if test -n "$with_system_python" -o -n "$with_system_l
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');"`
@ -63,7 +63,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
fi
dnl check if the headers really work:
@@ -3838,16 +3856,13 @@ if test -n "$with_system_db" -o -n "$with_system_libs"
@@ -3855,16 +3873,13 @@ if test -n "$with_system_db" -o -n "$with_system_libs"
test "$with_system_db" != "no"; then
SYSTEM_DB=YES
AC_MSG_RESULT([external])
@ -85,7 +85,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
AC_TRY_RUN([
#include <db.h>
@@ -3857,6 +3872,7 @@ int main(int argc, char **argv) {
@@ -3874,6 +3889,7 @@ int main(int argc, char **argv) {
}
], [DB_VERSION_MINOR=$v], [])
done
@ -93,7 +93,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
if test "$DB_VERSION_MINOR" -gt "1"; then
AC_MSG_RESULT([OK])
DB_VERSION=4.$DB_VERSION_MINOR
@@ -4522,11 +4538,11 @@ if test -n "$with_system_icu" -o -n "$with_system_libs
@@ -4661,11 +4677,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
@ -107,7 +107,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
if test -z "$SYSTEM_GENCMN"; then
AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
fi
@@ -4641,7 +4657,7 @@ elif test "$_os" != "WINNT" ; then
@@ -4780,7 +4796,7 @@ elif test "$_os" != "WINNT" ; then
AC_MSG_ERROR([No X includes found]) # Exit
fi
CFLAGS=$X_CFLAGS
@ -116,7 +116,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
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", [])
@@ -4818,7 +4834,7 @@ if test -n "$with_system_openssl" -o -n "$with_system_
@@ -4957,7 +4973,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
@ -125,7 +125,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
OPENSSL_CFLAGS=
OPENSSL_LIBS="-lssl -lcrypto"
else
@@ -5986,42 +6002,24 @@ KDE_LIBS=""
@@ -6125,42 +6141,24 @@ KDE_LIBS=""
MOC="moc"
if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
dnl Search paths for Qt and KDE
@ -176,7 +176,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
dnl Check for Qt headers
AC_MSG_CHECKING([for Qt headers])
@@ -6042,7 +6040,7 @@ your Qt installation by exporting QTDIR before running
@@ -6181,7 +6179,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
@ -185,7 +185,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
qt_libdir="$qt_check"
break
fi
@@ -6079,7 +6077,7 @@ your KDE installation by exporting KDEDIR before runni
@@ -6218,7 +6216,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
@ -194,7 +194,7 @@ $OpenBSD: patch-configure_in,v 1.2 2010/03/30 11:03:07 robert Exp $
kde_libdir="$kde_check"
break
fi
@@ -6320,7 +6318,7 @@ AC_SUBST(WITHOUT_AFMS)
@@ -6459,7 +6457,7 @@ AC_SUBST(WITHOUT_AFMS)
AC_SUBST(SCPDEFS)
AC_MSG_CHECKING([whether and how to use Xinerama])

8
editors/openoffice3/patches/patch-cppu_source_uno_data_cxx
View File

@ -1,6 +1,6 @@
--- cppu/source/uno/data.cxx.orig.port Fri Apr 11 12:39:24 2008
+++ cppu/source/uno/data.cxx Mon Jan 25 18:58:43 2010
@@ -362,7 +362,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
--- cppu/source/uno/data.cxx.orig.port Wed May 26 20:21:19 2010
+++ cppu/source/uno/data.cxx Fri Jun 25 23:56:13 2010
@@ -359,7 +359,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
#endif
#if defined(INTEL) \
@ -9,7 +9,7 @@
|| defined(__SUNPRO_CC) && defined(SOLARIS))
#define MAX_ALIGNMENT_4
#endif
@@ -375,7 +375,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
@@ -372,7 +372,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
#if OSL_DEBUG_LEVEL > 1

8
editors/openoffice3/patches/patch-cppu_test_alignment_diagnose_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cppu_test_alignment_diagnose_h,v 1.2 2009/01/22 17:44:38 robert Exp $
--- cppu/test/alignment/diagnose.h.orig.port Fri Aug 1 07:20:04 2008
+++ cppu/test/alignment/diagnose.h Thu Jan 15 14:47:49 2009
@@ -33,7 +33,7 @@
$OpenBSD: patch-cppu_test_alignment_diagnose_h,v 1.3 2010/06/26 15:48:11 robert Exp $
--- cppu/test/alignment/diagnose.h.orig.port Wed May 26 20:21:19 2010
+++ cppu/test/alignment/diagnose.h Fri Jun 25 23:56:13 2010
@@ -30,7 +30,7 @@
#include <sal/types.h>
#include <stdio.h>

8
editors/openoffice3/patches/patch-cppu_util_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cppu_util_makefile_mk,v 1.3 2010/03/30 11:03:07 robert Exp $
--- cppu/util/makefile.mk.orig.port Mon Apr 27 14:24:10 2009
+++ cppu/util/makefile.mk Mon Jan 25 18:59:09 2010
@@ -64,7 +64,7 @@ SHL1STDLIBS = $(SALLIB)
$OpenBSD: patch-cppu_util_makefile_mk,v 1.4 2010/06/26 15:48:11 robert Exp $
--- cppu/util/makefile.mk.orig.port Wed May 26 20:21:19 2010
+++ cppu/util/makefile.mk Fri Jun 25 23:56:13 2010
@@ -60,7 +60,7 @@ SHL1STDLIBS = $(SALLIB)
SHL1DEPN=
SHL1IMPLIB=i$(TARGET)

8
editors/openoffice3/patches/patch-crashrep_source_unx_main_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-crashrep_source_unx_main_cxx,v 1.3 2010/03/30 11:03:07 robert Exp $
--- crashrep/source/unx/main.cxx.orig.port Mon Jul 27 18:26:29 2009
+++ crashrep/source/unx/main.cxx Sun Jan 24 16:33:23 2010
@@ -47,7 +47,7 @@
$OpenBSD: patch-crashrep_source_unx_main_cxx,v 1.4 2010/06/26 15:48:11 robert Exp $
--- crashrep/source/unx/main.cxx.orig.port Wed May 26 20:21:20 2010
+++ crashrep/source/unx/main.cxx Fri Jun 25 23:56:13 2010
@@ -44,7 +44,7 @@
#include <vector>
#include <string>

8
editors/openoffice3/patches/patch-crashrep_source_unx_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-crashrep_source_unx_makefile_mk,v 1.3 2010/03/30 11:03:07 robert Exp $
--- crashrep/source/unx/makefile.mk.orig.port Sun Jan 24 16:13:35 2010
+++ crashrep/source/unx/makefile.mk Sun Jan 24 16:13:46 2010
@@ -63,7 +63,7 @@ APP1RPATH=BRAND
$OpenBSD: patch-crashrep_source_unx_makefile_mk,v 1.4 2010/06/26 15:48:11 robert Exp $
--- crashrep/source/unx/makefile.mk.orig.port Wed May 26 20:21:20 2010
+++ crashrep/source/unx/makefile.mk Fri Jun 25 23:56:13 2010
@@ -59,7 +59,7 @@ APP1RPATH=BRAND
.IF "$(OS)" != "MACOSX"
APP1STDLIBS=$(DYNAMIC) -lXext -lX11
.ENDIF

8
editors/openoffice3/patches/patch-desktop_scripts_soffice_sh
View File

@ -1,6 +1,6 @@
--- desktop/scripts/soffice.sh.orig.port Mon Apr 27 14:24:10 2009
+++ desktop/scripts/soffice.sh Sun Jan 24 16:37:46 2010
@@ -43,6 +43,11 @@ export SAL_ENABLE_FILE_LOCKING
--- desktop/scripts/soffice.sh.orig.port Wed May 26 20:21:55 2010
+++ desktop/scripts/soffice.sh Fri Jun 25 23:56:13 2010
@@ -39,6 +39,11 @@ export SAL_ENABLE_FILE_LOCKING
# working on your system.
# SAL_NOOPENGL=true; export SAL_NOOPENGL
@ -12,7 +12,7 @@
# the following test is needed on Linux PPC with IBM j2sdk142
if [ "`uname -s`" = "Linux" -a "`uname -m`" = "ppc" ] ; then
JITC_PROCESSOR_TYPE=6
@@ -97,6 +102,16 @@ for sd_arg in "$@"; do
@@ -93,6 +98,16 @@ for sd_arg in "$@"; do
done
"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
${sd_pagein_args}

8
editors/openoffice3/patches/patch-desktop_scripts_unopkg_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-desktop_scripts_unopkg_sh,v 1.2 2010/03/30 11:03:07 robert Exp $
--- desktop/scripts/unopkg.sh.orig.port Mon Aug 18 15:06:51 2008
+++ desktop/scripts/unopkg.sh Sun Jan 24 16:38:10 2010
@@ -56,6 +56,16 @@ do
$OpenBSD: patch-desktop_scripts_unopkg_sh,v 1.3 2010/06/26 15:48:11 robert Exp $
--- desktop/scripts/unopkg.sh.orig.port Wed May 26 20:21:55 2010
+++ desktop/scripts/unopkg.sh Fri Jun 25 23:56:13 2010
@@ -52,6 +52,16 @@ do
esac
done

8
editors/openoffice3/patches/patch-desktop_source_deployment_misc_dp_platform_cxx
View File

@ -1,6 +1,6 @@
--- desktop/source/deployment/misc/dp_platform.cxx.orig.port Fri Apr 10 10:36:58 2009
+++ desktop/source/deployment/misc/dp_platform.cxx Fri Apr 10 10:37:09 2009
@@ -64,6 +64,8 @@
--- desktop/source/deployment/misc/dp_platform.cxx.orig.port Wed May 26 20:21:55 2010
+++ desktop/source/deployment/misc/dp_platform.cxx Fri Jun 25 23:56:13 2010
@@ -60,6 +60,8 @@
#define PLATFORM_MACOSX_X86 "macosx_x86"
#define PLATFORM_MACOSX_PPC "macosx_powerpc"
#define PLATFORM_OS2_X86 "os2_x86"
@ -9,7 +9,7 @@
@@ -166,6 +168,10 @@ namespace
@@ -162,6 +164,10 @@ namespace
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_OS2_X86)))
ret = checkOSandCPU(OUSTR("OS2"), OUSTR("x86"));

10
editors/openoffice3/patches/patch-desktop_source_migration_wizard_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-desktop_source_migration_wizard_cxx,v 1.2 2009/01/22 17:44:38 robert Exp $
--- desktop/source/migration/wizard.cxx.orig.port Fri Aug 1 07:22:09 2008
+++ desktop/source/migration/wizard.cxx Thu Jan 15 14:47:49 2009
@@ -116,6 +116,7 @@ FirstStartWizard::FirstStartWizard( Window* pParent, s
$OpenBSD: patch-desktop_source_migration_wizard_cxx,v 1.3 2010/06/26 15:48:11 robert Exp $
--- desktop/source/migration/wizard.cxx.orig.port Wed May 26 20:21:58 2010
+++ desktop/source/migration/wizard.cxx Fri Jun 25 23:56:13 2010
@@ -141,6 +141,7 @@ FirstStartWizard::FirstStartWizard( Window* pParent, s
,m_bAutomaticUpdChk(sal_True)
,m_aLicensePath( rLicensePath )
{
@ -9,7 +9,7 @@ $OpenBSD: patch-desktop_source_migration_wizard_cxx,v 1.2 2009/01/22 17:44:38 ro
// ---
// FreeResource();
// enableState(STATE_USER, sal_False);
@@ -373,7 +374,7 @@ sal_Bool FirstStartWizard::onFinish(sal_Int32 _nResult
@@ -456,7 +457,7 @@ sal_Bool FirstStartWizard::onFinish(sal_Int32 _nResult
short FirstStartWizard::Execute()
{

8
editors/openoffice3/patches/patch-desktop_util_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-desktop_util_makefile_mk,v 1.2 2009/01/22 17:44:38 robert Exp $
--- desktop/util/makefile.mk.orig.port Sat Jan 10 18:10:53 2009
+++ desktop/util/makefile.mk Thu Jan 15 14:47:49 2009
@@ -61,7 +61,7 @@ RCFILES=ooverinfo2.rc
$OpenBSD: patch-desktop_util_makefile_mk,v 1.3 2010/06/26 15:48:11 robert Exp $
--- desktop/util/makefile.mk.orig.port Wed May 26 20:21:59 2010
+++ desktop/util/makefile.mk Fri Jun 25 23:56:13 2010
@@ -57,7 +57,7 @@ RCFILES=ooverinfo2.rc
LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//)
.ENDIF # MACOSX

6
editors/openoffice3/patches/patch-extensions_source_nsplugin_source_makefile_mk
View File

@ -1,6 +1,6 @@
--- extensions/source/nsplugin/source/makefile.mk.orig.port Fri Aug 1 07:22:47 2008
+++ extensions/source/nsplugin/source/makefile.mk Thu Jan 15 14:47:49 2009
@@ -53,7 +53,7 @@ dummy:
--- extensions/source/nsplugin/source/makefile.mk.orig.port Wed May 26 20:22:21 2010
+++ extensions/source/nsplugin/source/makefile.mk Fri Jun 25 23:56:13 2010
@@ -49,7 +49,7 @@ dummy:
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""

6
editors/openoffice3/patches/patch-extensions_source_plugin_unx_makefile_mk
View File

@ -1,6 +1,6 @@
--- extensions/source/plugin/unx/makefile.mk.orig.port Sun Jan 24 16:12:34 2010
+++ extensions/source/plugin/unx/makefile.mk Sun Jan 24 16:44:47 2010
@@ -82,7 +82,7 @@ APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
--- extensions/source/plugin/unx/makefile.mk.orig.port Wed May 26 20:22:21 2010
+++ extensions/source/plugin/unx/makefile.mk Fri Jun 25 23:56:13 2010
@@ -78,7 +78,7 @@ APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
.IF "$(DISABLE_XAW)" != "TRUE"
APP1STDLIBS+=-lXaw
.ENDIF

8
editors/openoffice3/patches/patch-extensions_source_scanner_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-extensions_source_scanner_makefile_mk,v 1.3 2010/03/30 11:03:07 robert Exp $
--- extensions/source/scanner/makefile.mk.orig.port Sun Jan 24 16:12:34 2010
+++ extensions/source/scanner/makefile.mk Sun Jan 24 16:44:47 2010
@@ -84,7 +84,9 @@ SHL1STDLIBS=\
$OpenBSD: patch-extensions_source_scanner_makefile_mk,v 1.4 2010/06/26 15:48:11 robert Exp $
--- extensions/source/scanner/makefile.mk.orig.port Wed May 26 20:22:22 2010
+++ extensions/source/scanner/makefile.mk Fri Jun 25 23:56:13 2010
@@ -80,7 +80,9 @@ SHL1STDLIBS=\
.IF "$(GUI)"=="UNX"
.IF "$(OS)"!="FREEBSD"
.IF "$(OS)"!="NETBSD"

14
editors/openoffice3/patches/patch-external_gcc3_specific_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-external_gcc3_specific_makefile_mk,v 1.5 2010/05/26 20:36:31 robert Exp $
--- external/gcc3_specific/makefile.mk.orig.port Sun Jan 24 16:12:33 2010
+++ external/gcc3_specific/makefile.mk Sun Jan 24 16:44:47 2010
@@ -45,18 +45,20 @@ $(MINGWGXXDLL) :
$OpenBSD: patch-external_gcc3_specific_makefile_mk,v 1.6 2010/06/26 15:48:12 robert Exp $
--- external/gcc3_specific/makefile.mk.orig.port Wed May 26 20:22:23 2010
+++ external/gcc3_specific/makefile.mk Fri Jun 25 23:56:15 2010
@@ -45,10 +45,11 @@ $(MINGWGXXDLL) :
.IF "$(OS)"!="MACOSX"
.IF "$(OS)"!="IRIX"
.IF "$(OS)"!="FREEBSD"
@ -10,13 +10,11 @@ $OpenBSD: patch-external_gcc3_specific_makefile_mk,v 1.5 2010/05/26 20:36:31 rob
.EXPORT : CC
-all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.1
+all .SEQUENTIAL : $(LB)$/lib%%STDLIB%%++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.1
+all .SEQUENTIAL : $(LB)$/libstdc++++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.1
$(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
- $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
+ $(GCCINSTLIB) lib%%STDLIB%%.so.$(SHORTSTDCPP3) $(LB)
@@ -57,6 +58,7 @@ $(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
$(LB)$/libgcc_s.so.1 :
$(GCCINSTLIB) libgcc_s.so.1 $(LB)

8
editors/openoffice3/patches/patch-filter_source_config_fragments_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-filter_source_config_fragments_makefile_mk,v 1.2 2010/03/30 11:03:07 robert Exp $
--- filter/source/config/fragments/makefile.mk.orig.port Sun Jan 24 16:12:33 2010
+++ filter/source/config/fragments/makefile.mk Sun Jan 24 19:08:21 2010
@@ -186,7 +186,7 @@ $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS)
$OpenBSD: patch-filter_source_config_fragments_makefile_mk,v 1.3 2010/06/26 15:48:12 robert Exp $
--- filter/source/config/fragments/makefile.mk.orig.port Wed May 26 20:22:54 2010
+++ filter/source/config/fragments/makefile.mk Fri Jun 25 23:56:13 2010
@@ -182,7 +182,7 @@ $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS)
.IF "$(SOLAR_JAVA)"==""
#cmc, hack to workaround the java build requirement
.IF "$(SYSTEM_PYTHON)" == "YES"

8
editors/openoffice3/patches/patch-hyphen_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hyphen_makefile_mk,v 1.2 2009/05/08 15:43:50 robert Exp $
--- hyphen/makefile.mk.orig.port Fri Apr 10 10:36:58 2009
+++ hyphen/makefile.mk Fri Apr 10 10:37:09 2009
@@ -52,7 +52,7 @@ CONFIGURE_DIR=$(BUILD_DIR)
$OpenBSD: patch-hyphen_makefile_mk,v 1.3 2010/06/26 15:48:12 robert Exp $
--- hyphen/makefile.mk.orig.port Wed May 26 20:23:29 2010
+++ hyphen/makefile.mk Fri Jun 25 23:56:13 2010
@@ -48,7 +48,7 @@ CONFIGURE_DIR=$(BUILD_DIR)
#relative to CONFIGURE_DIR
# still needed also in system-hyphen case as it creates the makefile
CONFIGURE_ACTION=configure

8
editors/openoffice3/patches/patch-i18npool_source_paper_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-i18npool_source_paper_makefile_mk,v 1.1 2010/03/30 11:03:07 robert Exp $
--- i18npool/source/paper/makefile.mk.orig.port Tue May 19 15:45:46 2009
+++ i18npool/source/paper/makefile.mk Mon Jan 25 17:51:34 2010
@@ -35,6 +35,7 @@ PRJNAME=i18npool
$OpenBSD: patch-i18npool_source_paper_makefile_mk,v 1.2 2010/06/26 15:48:12 robert Exp $
--- i18npool/source/paper/makefile.mk.orig.port Wed May 26 20:23:31 2010
+++ i18npool/source/paper/makefile.mk Fri Jun 25 23:56:13 2010
@@ -31,6 +31,7 @@ PRJNAME=i18npool
TARGET=i18npaper
ENABLE_EXCEPTIONS=TRUE

8
editors/openoffice3/patches/patch-idlc_source_idlccompile_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-idlc_source_idlccompile_cxx,v 1.2 2009/01/22 17:44:39 robert Exp $
--- idlc/source/idlccompile.cxx.orig.port Fri Aug 1 07:26:31 2008
+++ idlc/source/idlccompile.cxx Thu Jan 15 14:47:50 2009
@@ -44,7 +44,7 @@
$OpenBSD: patch-idlc_source_idlccompile_cxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- idlc/source/idlccompile.cxx.orig.port Wed May 26 20:23:34 2010
+++ idlc/source/idlccompile.cxx Fri Jun 25 23:56:13 2010
@@ -41,7 +41,7 @@
#ifdef SAL_UNX
#include <unistd.h>

10
editors/openoffice3/patches/patch-instsetoo_native_util_makefile_mk
View File

@ -1,6 +1,6 @@
--- instsetoo_native/util/makefile.mk.orig.port Wed Oct 7 12:58:21 2009
+++ instsetoo_native/util/makefile.mk Wed Feb 17 00:01:19 2010
@@ -47,12 +47,14 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDI
--- instsetoo_native/util/makefile.mk.orig.port Wed May 26 20:23:36 2010
+++ instsetoo_native/util/makefile.mk Fri Jun 25 23:56:13 2010
@@ -43,12 +43,14 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDI
.ENDIF # "$(GUI)"=="WNT"
.EXPORT: PYTHONPATH
@ -15,7 +15,7 @@
.EXPORT: ENABLE_DOWNLOADSETS
.EXPORT: LAST_MINOR
@@ -104,9 +106,9 @@ ALLTAR : $(LOCALPYFILES)
@@ -100,9 +102,9 @@ ALLTAR : $(LOCALPYFILES)
.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
.IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
@ -27,7 +27,7 @@
.ENDIF
.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
ALLTAR : updatepack
@@ -396,14 +398,14 @@ hack_msitemplates .PHONY:
@@ -391,14 +393,14 @@ hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary

10
editors/openoffice3/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx,v 1.3 2010/03/30 11:03:07 robert Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx.orig.port Sun Jan 24 16:12:34 2010
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Sun Jan 24 16:44:48 2010
@@ -202,7 +202,7 @@ bool SunVersion::init(const char *szVersion)
$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx,v 1.4 2010/06/26 15:48:12 robert Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx.orig.port Wed May 26 20:23:38 2010
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Fri Jun 25 23:56:13 2010
@@ -199,7 +199,7 @@ bool SunVersion::init(const char *szVersion)
m_preRelease = getPreRelease(pCur);
if (m_preRelease == Rel_NONE)
return false;
@ -10,7 +10,7 @@ $OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx,v 1.3 2010/03/3
if (m_preRelease == Rel_FreeBSD)
{
pCur++; //elemnate `p'
@@ -253,7 +253,7 @@ SunVersion::PreRelease SunVersion::getPreRelease(const
@@ -250,7 +250,7 @@ SunVersion::PreRelease SunVersion::getPreRelease(const
return Rel_RC2;
else if (! strcmp(szRelease, "rc3"))
return Rel_RC3;

8
editors/openoffice3/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx,v 1.2 2009/01/22 17:44:39 robert Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx.orig.port Fri Aug 1 07:26:49 2008
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx Thu Jan 15 14:47:50 2009
@@ -79,7 +79,7 @@ class SunVersion (protected)
$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx.orig.port Wed May 26 20:23:38 2010
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx Fri Jun 25 23:56:13 2010
@@ -76,7 +76,7 @@ class SunVersion (protected)
Rel_RC1,
Rel_RC2,
Rel_RC3

8
editors/openoffice3/patches/patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx,v 1.3 2010/03/30 11:03:07 robert Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig.port Fri Sep 11 01:44:47 2009
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Fri Feb 12 13:41:06 2010
@@ -91,6 +91,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
$OpenBSD: patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx,v 1.4 2010/06/26 15:48:12 robert Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig.port Wed May 26 20:23:38 2010
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Fri Jun 25 23:56:13 2010
@@ -88,6 +88,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
static char const * ar[] = {
"/lib/" JFW_PLUGIN_ARCH "/client",

10
editors/openoffice3/patches/patch-lingucomponent_source_hyphenator_altlinuxhyph_hyphen_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lingucomponent_source_hyphenator_altlinuxhyph_hyphen_makefile_mk,v 1.3 2010/03/30 11:03:07 robert Exp $
--- lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk.orig.port Tue May 19 12:31:27 2009
+++ lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk Fri Feb 12 00:23:14 2010
@@ -39,7 +39,7 @@ USE_DEFFILE=TRUE
$OpenBSD: patch-lingucomponent_source_hyphenator_altlinuxhyph_hyphen_makefile_mk,v 1.4 2010/06/26 15:48:12 robert Exp $
--- lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk.orig.port Wed May 26 20:24:57 2010
+++ lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk Fri Jun 25 23:56:13 2010
@@ -35,7 +35,7 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="OS2"
HNJLIB=hyphen.lib
.ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
@ -10,7 +10,7 @@ $OpenBSD: patch-lingucomponent_source_hyphenator_altlinuxhyph_hyphen_makefile_mk
.ELSE
HNJLIB=hyphen.lib
.ENDIF
@@ -66,7 +66,7 @@ SLOFILES= \
@@ -62,7 +62,7 @@ SLOFILES= \
REALNAME:=hyphen
SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)

8
editors/openoffice3/patches/patch-odk_configure_pl
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-odk_configure_pl,v 1.3 2010/03/30 11:03:07 robert Exp $
--- odk/configure.pl.orig.port Sun Jan 24 16:12:34 2010
+++ odk/configure.pl Sun Jan 24 16:44:48 2010
@@ -45,6 +45,10 @@ if ( $main::operatingSystem =~ m/solaris/ ||
$OpenBSD: patch-odk_configure_pl,v 1.4 2010/06/26 15:48:12 robert Exp $
--- odk/configure.pl.orig.port Wed May 26 20:25:01 2010
+++ odk/configure.pl Fri Jun 25 23:56:13 2010
@@ -46,6 +46,10 @@ if ( $main::operatingSystem =~ m/solaris/ ||
{
$main::makeName = "gmake";
}

8
editors/openoffice3/patches/patch-odk_source_unoapploader_unx_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-odk_source_unoapploader_unx_makefile_mk,v 1.2 2009/01/22 17:44:39 robert Exp $
--- odk/source/unoapploader/unx/makefile.mk.orig.port Fri Aug 1 07:27:16 2008
+++ odk/source/unoapploader/unx/makefile.mk Thu Jan 15 14:47:50 2009
@@ -47,7 +47,7 @@ LIBSALCPPRT=
$OpenBSD: patch-odk_source_unoapploader_unx_makefile_mk,v 1.3 2010/06/26 15:48:12 robert Exp $
--- odk/source/unoapploader/unx/makefile.mk.orig.port Wed May 26 20:25:03 2010
+++ odk/source/unoapploader/unx/makefile.mk Fri Jun 25 23:56:14 2010
@@ -43,7 +43,7 @@ LIBSALCPPRT=
LINK=$(CC)
.ENDIF

10
editors/openoffice3/patches/patch-odk_util_makefile_pmk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-odk_util_makefile_pmk,v 1.4 2010/03/30 11:03:07 robert Exp $
--- odk/util/makefile.pmk.orig.port Sun Jan 24 16:12:34 2010
+++ odk/util/makefile.pmk Sun Jan 24 16:44:49 2010
@@ -74,7 +74,7 @@ CONVERTTAGFLAG = $(MISC)$/$(CONVERTTAGFLAGNAME)
$OpenBSD: patch-odk_util_makefile_pmk,v 1.5 2010/06/26 15:48:12 robert Exp $
--- odk/util/makefile.pmk.orig.port Wed May 26 20:25:03 2010
+++ odk/util/makefile.pmk Fri Jun 25 23:56:14 2010
@@ -70,7 +70,7 @@ CONVERTTAGFLAG = $(MISC)$/$(CONVERTTAGFLAGNAME)
MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)$/autodoc
@ -10,7 +10,7 @@ $OpenBSD: patch-odk_util_makefile_pmk,v 1.4 2010/03/30 11:03:07 robert Exp $
MY_COPY=$(GNUCOPY)
MY_COPY_RECURSIVE=$(GNUCOPY) -r
.ELSE
@@ -161,6 +161,12 @@ DESTPLATFROM=netbsd
@@ -157,6 +157,12 @@ DESTPLATFROM=netbsd
# FREEBSD
###########
DESTPLATFROM=freebsd

8
editors/openoffice3/patches/patch-padmin_source_spadmin_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-padmin_source_spadmin_sh,v 1.1 2009/01/31 01:06:20 robert Exp $
--- padmin/source/spadmin.sh.orig.port Wed Jan 28 17:03:20 2009
+++ padmin/source/spadmin.sh Thu Jan 29 15:31:47 2009
@@ -56,6 +56,16 @@ do
$OpenBSD: patch-padmin_source_spadmin_sh,v 1.2 2010/06/26 15:48:12 robert Exp $
--- padmin/source/spadmin.sh.orig.port Wed May 26 20:26:22 2010
+++ padmin/source/spadmin.sh Fri Jun 25 23:56:14 2010
@@ -52,6 +52,16 @@ do
esac
done

6
editors/openoffice3/patches/patch-pyuno_source_module_makefile_mk
View File

@ -1,6 +1,6 @@
--- pyuno/source/module/makefile.mk.orig.port Sun Jan 24 16:12:34 2010
+++ pyuno/source/module/makefile.mk Sun Jan 24 16:44:53 2010
@@ -150,6 +150,8 @@ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
--- pyuno/source/module/makefile.mk.orig.port Wed May 26 20:26:24 2010
+++ pyuno/source/module/makefile.mk Fri Jun 25 23:56:14 2010
@@ -146,6 +146,8 @@ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "MACOSX"
@echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) > $(MISC)$/$(@:b).cmd

6
editors/openoffice3/patches/patch-sal_inc_osl_endian_h
View File

@ -1,6 +1,6 @@
--- sal/inc/osl/endian.h.orig.port Fri Aug 1 07:32:14 2008
+++ sal/inc/osl/endian.h Thu Jan 15 14:47:50 2009
@@ -167,7 +167,8 @@ extern "C" {
--- sal/inc/osl/endian.h.orig.port Wed May 26 20:28:28 2010
+++ sal/inc/osl/endian.h Fri Jun 25 23:56:14 2010
@@ -164,7 +164,8 @@ extern "C" {
!defined(LINUX) && !defined(NETBSD) && !defined(SCO) && \
!defined(AIX) && !defined(HPUX) && \
!defined(SOLARIS) && !defined(IRIX) && \

8
editors/openoffice3/patches/patch-sal_inc_rtl_uuid_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_inc_rtl_uuid_h,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/inc/rtl/uuid.h.orig.port Fri Aug 1 07:32:15 2008
+++ sal/inc/rtl/uuid.h Thu Jan 15 14:47:50 2009
@@ -203,6 +203,8 @@ void SAL_CALL rtl_createNamedUuid(
$OpenBSD: patch-sal_inc_rtl_uuid_h,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/inc/rtl/uuid.h.orig.port Wed May 26 20:28:28 2010
+++ sal/inc/rtl/uuid.h Fri Jun 25 23:56:14 2010
@@ -200,6 +200,8 @@ void SAL_CALL rtl_createNamedUuid(
#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000
#elif IRIX
#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10

8
editors/openoffice3/patches/patch-sal_inc_sal_alloca_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_inc_sal_alloca_h,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/inc/sal/alloca.h.orig.port Fri Aug 1 07:32:15 2008
+++ sal/inc/sal/alloca.h Thu Jan 15 14:47:50 2009
@@ -38,7 +38,7 @@
$OpenBSD: patch-sal_inc_sal_alloca_h,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/inc/sal/alloca.h.orig.port Wed May 26 20:28:28 2010
+++ sal/inc/sal/alloca.h Fri Jun 25 23:56:14 2010
@@ -35,7 +35,7 @@
#define INCLUDED_ALLOCA_H
#endif

8
editors/openoffice3/patches/patch-sal_inc_sal_config_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_inc_sal_config_h,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/inc/sal/config.h.orig.port Fri Aug 1 07:32:15 2008
+++ sal/inc/sal/config.h Thu Jan 15 14:47:50 2009
@@ -102,7 +102,7 @@ extern "C" {
$OpenBSD: patch-sal_inc_sal_config_h,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/inc/sal/config.h.orig.port Wed May 26 20:28:28 2010
+++ sal/inc/sal/config.h Fri Jun 25 23:56:14 2010
@@ -99,7 +99,7 @@ extern "C" {
#define SAL_SYSCONFIGFILE( name ) name ".ini"
#endif

6
editors/openoffice3/patches/patch-sal_inc_sal_types_h
View File

@ -1,6 +1,6 @@
--- sal/inc/sal/types.h.orig.port Sun Jan 24 16:12:33 2010
+++ sal/inc/sal/types.h Sun Jan 24 16:44:53 2010
@@ -346,7 +346,7 @@ typedef struct _sal_Sequence
--- sal/inc/sal/types.h.orig.port Wed May 26 20:28:28 2010
+++ sal/inc/sal/types.h Fri Jun 25 23:56:14 2010
@@ -343,7 +343,7 @@ typedef struct _sal_Sequence
lack RTTI support, dynamic_cast is not included here).
*/
#ifdef __cplusplus

20
editors/openoffice3/patches/patch-sal_osl_unx_asm_interlck_sparc_s
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_osl_unx_asm_interlck_sparc_s,v 1.1 2009/06/02 21:48:39 robert Exp $
--- sal/osl/unx/asm/interlck_sparc.s.orig.port Tue Jun 2 01:19:31 2009
+++ sal/osl/unx/asm/interlck_sparc.s Tue Jun 2 01:20:10 2009
@@ -68,7 +68,7 @@ osl_decrementInterLockCountFuncPtr:
$OpenBSD: patch-sal_osl_unx_asm_interlck_sparc_s,v 1.2 2010/06/26 15:48:12 robert Exp $
--- sal/osl/unx/asm/interlck_sparc.s.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/asm/interlck_sparc.s Fri Jun 25 23:56:14 2010
@@ -65,7 +65,7 @@ osl_decrementInterLockCountFuncPtr:
.section ".text"
@ -10,7 +10,7 @@ $OpenBSD: patch-sal_osl_unx_asm_interlck_sparc_s,v 1.1 2009/06/02 21:48:39 rober
/* add the address of the calling "call" instruction (stored in %o7) to
* %o5 which contains _GLOBAL_OFFSET_TABLE_
*/
@@ -82,7 +82,7 @@ osl_decrementInterLockCountFuncPtr:
@@ -79,7 +79,7 @@ osl_decrementInterLockCountFuncPtr:
osl_incrementInterlockedCount:
@ -19,7 +19,7 @@ $OpenBSD: patch-sal_osl_unx_asm_interlck_sparc_s,v 1.1 2009/06/02 21:48:39 rober
mov %o7, %g1
sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %o5
call .Laddoseven
@@ -105,7 +105,7 @@ osl_incrementInterlockedCount:
@@ -102,7 +102,7 @@ osl_incrementInterlockedCount:
osl_decrementInterlockedCount:
@ -28,7 +28,7 @@ $OpenBSD: patch-sal_osl_unx_asm_interlck_sparc_s,v 1.1 2009/06/02 21:48:39 rober
mov %o7, %g1
sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %o5
call .Laddoseven
@@ -113,7 +113,7 @@ osl_decrementInterlockedCount:
@@ -110,7 +110,7 @@ osl_decrementInterlockedCount:
mov %g1, %o7
#endif
set osl_decrementInterLockCountFuncPtr, %o1
@ -37,7 +37,7 @@ $OpenBSD: patch-sal_osl_unx_asm_interlck_sparc_s,v 1.1 2009/06/02 21:48:39 rober
ld [%o1 + %o5], %o1
#endif
ld [%o1], %o1
@@ -128,7 +128,7 @@ osl_decrementInterlockedCount:
@@ -125,7 +125,7 @@ osl_decrementInterlockedCount:
osl_InterlockedCountSetV9:
@ -46,7 +46,7 @@ $OpenBSD: patch-sal_osl_unx_asm_interlck_sparc_s,v 1.1 2009/06/02 21:48:39 rober
mov %o7, %g1
sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %o5
call .Laddoseven
@@ -142,7 +142,7 @@ osl_InterlockedCountSetV9:
@@ -139,7 +139,7 @@ osl_InterlockedCountSetV9:
nop ! delay slot
set osl_incrementInterlockedCountV8, %o0
set osl_decrementInterlockedCountV8, %o3
@ -55,7 +55,7 @@ $OpenBSD: patch-sal_osl_unx_asm_interlck_sparc_s,v 1.1 2009/06/02 21:48:39 rober
ld [%o0 + %o5], %o0
ld [%o1 + %o5], %o1
ld [%o2 + %o5], %o2
@@ -153,7 +153,7 @@ osl_InterlockedCountSetV9:
@@ -150,7 +150,7 @@ osl_InterlockedCountSetV9:
st %o0,[%o1]
1: set osl_incrementInterlockedCountV9, %o0
set osl_decrementInterlockedCountV9, %o3

8
editors/openoffice3/patches/patch-sal_osl_unx_backtrace_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_osl_unx_backtrace_c,v 1.3 2009/05/08 15:43:50 robert Exp $
--- sal/osl/unx/backtrace.c.orig.port Wed Aug 27 15:41:55 2008
+++ sal/osl/unx/backtrace.c Thu May 7 23:14:17 2009
@@ -142,7 +142,7 @@ void backtrace_symbols_fd( void **buffer, int size, in
$OpenBSD: patch-sal_osl_unx_backtrace_c,v 1.4 2010/06/26 15:48:12 robert Exp $
--- sal/osl/unx/backtrace.c.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/backtrace.c Fri Jun 25 23:56:14 2010
@@ -139,7 +139,7 @@ void backtrace_symbols_fd( void **buffer, int size, in
#endif /* defined SOLARIS */

10
editors/openoffice3/patches/patch-sal_osl_unx_backtrace_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_osl_unx_backtrace_h,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/osl/unx/backtrace.h.orig.port Fri Aug 8 07:56:09 2008
+++ sal/osl/unx/backtrace.h Thu Jan 15 14:47:50 2009
@@ -29,7 +29,7 @@
$OpenBSD: patch-sal_osl_unx_backtrace_h,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/osl/unx/backtrace.h.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/backtrace.h Fri Jun 25 23:56:14 2010
@@ -26,7 +26,7 @@
************************************************************************/
@ -10,7 +10,7 @@ $OpenBSD: patch-sal_osl_unx_backtrace_h,v 1.2 2009/01/22 17:44:39 robert Exp $
#ifdef __cplusplus
extern "C" {
@@ -42,7 +42,7 @@ int backtrace( void **buffer, int max_frames );
@@ -39,7 +39,7 @@ int backtrace( void **buffer, int max_frames );
void backtrace_symbols_fd( void **buffer, int size, int fd );
/* no frame.h on FreeBSD */

6
editors/openoffice3/patches/patch-sal_osl_unx_file_cxx
View File

@ -1,6 +1,6 @@
--- sal/osl/unx/file.cxx.orig.port Sun Jan 24 16:12:33 2010
+++ sal/osl/unx/file.cxx Sun Jan 24 19:12:56 2010
@@ -274,7 +274,7 @@ void FileHandle_Impl::operator delete (void * p, size_
--- sal/osl/unx/file.cxx.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/file.cxx Fri Jun 25 23:56:14 2010
@@ -271,7 +271,7 @@ void FileHandle_Impl::operator delete (void * p, size_
size_t FileHandle_Impl::getpagesize()
{

10
editors/openoffice3/patches/patch-sal_osl_unx_file_error_transl_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_osl_unx_file_error_transl_cxx,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/osl/unx/file_error_transl.cxx.orig.port Fri Aug 1 07:32:17 2008
+++ sal/osl/unx/file_error_transl.cxx Thu Jan 15 14:47:50 2009
@@ -217,19 +217,19 @@ oslFileError oslTranslateFileError(sal_Bool bIsError,
$OpenBSD: patch-sal_osl_unx_file_error_transl_cxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/osl/unx/file_error_transl.cxx.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/file_error_transl.cxx Fri Jun 25 23:56:14 2010
@@ -214,19 +214,19 @@ oslFileError oslTranslateFileError(sal_Bool bIsError,
osl_error = osl_File_E_LOOP;
break;
@ -24,7 +24,7 @@ $OpenBSD: patch-sal_osl_unx_file_error_transl_cxx,v 1.2 2009/01/22 17:44:39 robe
case EMULTIHOP:
osl_error = osl_File_E_MULTIHOP;
break;
@@ -239,9 +239,11 @@ oslFileError oslTranslateFileError(sal_Bool bIsError,
@@ -236,9 +236,11 @@ oslFileError oslTranslateFileError(sal_Bool bIsError,
osl_error = osl_File_E_USERS;
break;

8
editors/openoffice3/patches/patch-sal_osl_unx_makefile_mk
View File

@ -1,6 +1,6 @@
--- sal/osl/unx/makefile.mk.orig.port Sun Jan 24 16:12:33 2010
+++ sal/osl/unx/makefile.mk Sun Jan 24 16:44:53 2010
@@ -122,7 +122,7 @@ OBJFILES= $(OBJ)$/conditn.obj \
--- sal/osl/unx/makefile.mk.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/makefile.mk Fri Jun 25 23:56:14 2010
@@ -118,7 +118,7 @@ OBJFILES= $(OBJ)$/conditn.obj \
SLOFILES += $(SLO)$/osxlocale.obj
.ENDIF
@ -9,7 +9,7 @@
SLOFILES += $(SLO)$/backtrace.obj
OBJFILES += $(OBJ)$/backtrace.obj
.ENDIF
@@ -154,7 +154,7 @@ CFLAGS+=-DSAL_ENABLE_CRASH_REPORT
@@ -150,7 +150,7 @@ CFLAGS+=-DSAL_ENABLE_CRASH_REPORT
.INCLUDE : target.mk

18
editors/openoffice3/patches/patch-sal_osl_unx_nlsupport_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/osl/unx/nlsupport.c.orig.port Fri Aug 1 07:32:17 2008
+++ sal/osl/unx/nlsupport.c Thu Jan 15 14:47:50 2009
@@ -33,7 +33,7 @@
$OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/osl/unx/nlsupport.c.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/nlsupport.c Fri Jun 25 23:56:14 2010
@@ -30,7 +30,7 @@
#include <osl/process.h>
#include <rtl/memory.h>
@ -10,7 +10,7 @@ $OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.2 2009/01/22 17:44:39 robert Exp $
#include <pthread.h>
#ifndef MACOSX
#include <locale.h>
@@ -229,7 +229,7 @@ static rtl_Locale * _parse_locale( const char * locale
@@ -226,7 +226,7 @@ static rtl_Locale * _parse_locale( const char * locale
return NULL;
}
@ -19,7 +19,7 @@ $OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.2 2009/01/22 17:44:39 robert Exp $
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -552,6 +552,35 @@ const _pair _nl_language_list[] = {
@@ -549,6 +549,35 @@ const _pair _nl_language_list[] = {
{ "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
};
@ -55,7 +55,7 @@ $OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.2 2009/01/22 17:44:39 robert Exp $
#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -941,7 +970,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
@@ -938,7 +967,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
@ -64,7 +64,7 @@ $OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.2 2009/01/22 17:44:39 robert Exp $
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -953,7 +982,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
@@ -950,7 +979,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
@ -73,7 +73,7 @@ $OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.2 2009/01/22 17:44:39 robert Exp $
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -965,7 +994,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
@@ -962,7 +991,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);

8
editors/openoffice3/patches/patch-sal_osl_unx_process_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_osl_unx_process_c,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/osl/unx/process.c.orig.port Fri Aug 1 07:32:17 2008
+++ sal/osl/unx/process.c Thu Jan 15 14:47:50 2009
@@ -474,7 +474,7 @@ static void ChildStatusProc(void *pData)
$OpenBSD: patch-sal_osl_unx_process_c,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/osl/unx/process.c.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/process.c Fri Jun 25 23:56:14 2010
@@ -471,7 +471,7 @@ static void ChildStatusProc(void *pData)
if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));

6
editors/openoffice3/patches/patch-sal_osl_unx_security_c
View File

@ -1,6 +1,6 @@
--- sal/osl/unx/security.c.orig.port Fri Aug 1 07:32:17 2008
+++ sal/osl/unx/security.c Thu Jan 15 14:47:50 2009
@@ -506,7 +506,7 @@ osl_psz_loginUser(const sal_Char* pszUserName, const s
--- sal/osl/unx/security.c.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/security.c Fri Jun 25 23:56:14 2010
@@ -503,7 +503,7 @@ osl_psz_loginUser(const sal_Char* pszUserName, const s
oslSecurity* pSecurity)
{
#if defined NETBSD || defined SCO || defined AIX || defined FREEBSD || \

6
editors/openoffice3/patches/patch-sal_osl_unx_socket_c
View File

@ -1,6 +1,6 @@
--- sal/osl/unx/socket.c.orig.port Wed Oct 1 11:19:55 2008
+++ sal/osl/unx/socket.c Fri Apr 10 10:22:47 2009
@@ -48,7 +48,7 @@
--- sal/osl/unx/socket.c.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/socket.c Fri Jun 25 23:56:14 2010
@@ -45,7 +45,7 @@
#undef HAVE_POLL_H
#endif

8
editors/openoffice3/patches/patch-sal_osl_unx_system_h
View File

@ -1,6 +1,6 @@
--- sal/osl/unx/system.h.orig.port Wed Oct 1 11:19:55 2008
+++ sal/osl/unx/system.h Thu May 7 23:14:17 2009
@@ -190,6 +190,32 @@
--- sal/osl/unx/system.h.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/system.h Fri Jun 25 23:56:14 2010
@@ -187,6 +187,32 @@
# define NO_PTHREAD_RTL
#endif
@ -33,7 +33,7 @@
#ifdef SCO
# define AF_IPX -1
# include <strings.h>
@@ -365,7 +391,7 @@ int macxp_resolveAlias(char *path, int buflen);
@@ -362,7 +388,7 @@ int macxp_resolveAlias(char *path, int buflen);
!defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO) && \
!defined(AIX) && !defined(HPUX) && \
!defined(SOLARIS) && !defined(IRIX) && \

8
editors/openoffice3/patches/patch-sal_osl_unx_tempfile_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_osl_unx_tempfile_c,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/osl/unx/tempfile.c.orig.port Fri Aug 1 07:32:17 2008
+++ sal/osl/unx/tempfile.c Thu Jan 15 14:47:50 2009
@@ -68,7 +68,7 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString**
$OpenBSD: patch-sal_osl_unx_tempfile_c,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/osl/unx/tempfile.c.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/tempfile.c Fri Jun 25 23:56:14 2010
@@ -65,7 +65,7 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString**
if ( !pValue )
{
pValue = getenv( "TMP" );

12
editors/openoffice3/patches/patch-sal_osl_unx_thread_c
View File

@ -1,6 +1,6 @@
--- sal/osl/unx/thread.c.orig.port Wed Oct 1 12:04:58 2008
+++ sal/osl/unx/thread.c Thu May 7 23:14:17 2009
@@ -30,6 +30,7 @@
--- sal/osl/unx/thread.c.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/thread.c Fri Jun 25 23:56:14 2010
@@ -27,6 +27,7 @@
#include "system.h"
#include <string.h>
@ -8,7 +8,7 @@
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <osl/nlsupport.h>
@@ -284,6 +285,7 @@ static oslThread osl_thread_create_Impl (
@@ -281,6 +282,7 @@ static oslThread osl_thread_create_Impl (
{
Thread_Impl* pImpl;
int nRet=0;
@ -16,7 +16,7 @@
pImpl = osl_thread_construct_Impl();
if (!pImpl)
@@ -295,9 +297,18 @@ static oslThread osl_thread_create_Impl (
@@ -292,9 +294,18 @@ static oslThread osl_thread_create_Impl (
pthread_mutex_lock (&(pImpl->m_Lock));
@ -36,7 +36,7 @@
osl_thread_start_Impl,
(void*)(pImpl))) != 0)
{
@@ -309,6 +320,8 @@ static oslThread osl_thread_create_Impl (
@@ -306,6 +317,8 @@ static oslThread osl_thread_create_Impl (
return (0);
}

8
editors/openoffice3/patches/patch-sal_osl_unx_time_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_osl_unx_time_c,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/osl/unx/time.c.orig.port Fri Aug 1 07:32:17 2008
+++ sal/osl/unx/time.c Thu Jan 15 14:47:50 2009
@@ -35,7 +35,7 @@
$OpenBSD: patch-sal_osl_unx_time_c,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/osl/unx/time.c.orig.port Wed May 26 20:28:29 2010
+++ sal/osl/unx/time.c Fri Jun 25 23:56:14 2010
@@ -32,7 +32,7 @@
#include <osl/time.h>
/* FIXME: detection should be done in configure script */

10
editors/openoffice3/patches/patch-sal_rtl_source_alloc_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_rtl_source_alloc_c,v 1.3 2010/03/30 11:03:07 robert Exp $
--- sal/rtl/source/alloc.c.orig.port Thu Apr 10 14:00:24 2008
+++ sal/rtl/source/alloc.c Mon Jan 25 19:05:50 2010
@@ -72,7 +72,7 @@ typedef pthread_mutex_t mutex_type;
$OpenBSD: patch-sal_rtl_source_alloc_c,v 1.4 2010/06/26 15:48:12 robert Exp $
--- sal/rtl/source/alloc.c.orig.port Wed May 26 20:28:32 2010
+++ sal/rtl/source/alloc.c Fri Jun 25 23:56:14 2010
@@ -69,7 +69,7 @@ typedef pthread_mutex_t mutex_type;
#define RTL_MUTEX_ACQUIRE(a) pthread_mutex_lock((a))
#define RTL_MUTEX_RELEASE(a) pthread_mutex_unlock((a))
@ -10,7 +10,7 @@ $OpenBSD: patch-sal_rtl_source_alloc_c,v 1.3 2010/03/30 11:03:07 robert Exp $
static sal_Size __rtl_memory_vmpagesize (void)
{
/* xBSD */
@@ -90,7 +90,7 @@ static sal_Size __rtl_memory_vmpagesize (void)
@@ -87,7 +87,7 @@ static sal_Size __rtl_memory_vmpagesize (void)
/* other */
return (sal_Size)(0x2000);
}

8
editors/openoffice3/patches/patch-sal_rtl_source_macro_hxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_rtl_source_macro_hxx,v 1.2 2009/01/22 17:44:39 robert Exp $
--- sal/rtl/source/macro.hxx.orig.port Fri Aug 29 11:50:59 2008
+++ sal/rtl/source/macro.hxx Thu Jan 15 14:47:50 2009
@@ -51,6 +51,8 @@
$OpenBSD: patch-sal_rtl_source_macro_hxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sal/rtl/source/macro.hxx.orig.port Wed May 26 20:28:32 2010
+++ sal/rtl/source/macro.hxx Fri Jun 25 23:56:14 2010
@@ -48,6 +48,8 @@
#define THIS_OS "FreeBSD"
#elif defined IRIX
#define THIS_OS "Irix"

8
editors/openoffice3/patches/patch-sal_workben_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_workben_makefile_mk,v 1.3 2010/03/30 11:03:07 robert Exp $
--- sal/workben/makefile.mk.orig.port Sun Jan 24 16:12:33 2010
+++ sal/workben/makefile.mk Sun Jan 24 16:44:53 2010
@@ -370,7 +370,7 @@ APP4DEPN= $(SLB)$/sal.lib
$OpenBSD: patch-sal_workben_makefile_mk,v 1.4 2010/06/26 15:48:12 robert Exp $
--- sal/workben/makefile.mk.orig.port Wed May 26 20:28:40 2010
+++ sal/workben/makefile.mk Fri Jun 25 23:56:14 2010
@@ -366,7 +366,7 @@ APP4DEPN= $(SLB)$/sal.lib
# tgetpwnam
#
.IF "$(TESTAPP)" == "tgetpwnam"

6
editors/openoffice3/patches/patch-scp2_source_ooo_file_library_ooo_scp
View File

@ -1,6 +1,6 @@
--- scp2/source/ooo/file_library_ooo.scp.orig.port Sun Jan 24 16:12:33 2010
+++ scp2/source/ooo/file_library_ooo.scp Sun Jan 24 16:44:53 2010
@@ -36,7 +36,7 @@ File gid_File_Lib_Accessbridge
--- scp2/source/ooo/file_library_ooo.scp.orig.port Wed May 26 20:29:06 2010
+++ scp2/source/ooo/file_library_ooo.scp Fri Jun 25 23:56:14 2010
@@ -34,7 +34,7 @@ File gid_File_Lib_Accessbridge
Name = "java_uno_accessbridge.dll";
End
#endif

10
editors/openoffice3/patches/patch-scp2_source_ooo_ure_scp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scp2_source_ooo_ure_scp,v 1.1 2010/03/30 11:03:07 robert Exp $
--- scp2/source/ooo/ure.scp.orig.port Mon Jan 25 19:13:43 2010
+++ scp2/source/ooo/ure.scp Mon Jan 25 19:14:01 2010
@@ -885,7 +885,7 @@ File gid_File_Dl_Stlport
$OpenBSD: patch-scp2_source_ooo_ure_scp,v 1.2 2010/06/26 15:48:12 robert Exp $
--- scp2/source/ooo/ure.scp.orig.port Wed May 26 20:29:07 2010
+++ scp2/source/ooo/ure.scp Fri Jun 25 23:56:14 2010
@@ -882,7 +882,7 @@ File gid_File_Dl_Stlport
End
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-scp2_source_ooo_ure_scp,v 1.1 2010/03/30 11:03:07 robert Exp $
|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
File gid_File_Dl_GccS
TXT_FILE_BODY;
@@ -896,7 +896,7 @@ File gid_File_Dl_GccS
@@ -893,7 +893,7 @@ File gid_File_Dl_GccS
End
#endif

8
editors/openoffice3/patches/patch-sdext_source_pdfimport_filterdet_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sdext_source_pdfimport_filterdet_cxx,v 1.2 2010/03/30 11:03:07 robert Exp $
--- sdext/source/pdfimport/filterdet.cxx.orig.port Sun Jan 24 16:12:34 2010
+++ sdext/source/pdfimport/filterdet.cxx Sun Jan 24 19:15:08 2010
@@ -714,46 +714,6 @@ uno::Reference< io::XStream > getAdditionalStream( con
$OpenBSD: patch-sdext_source_pdfimport_filterdet_cxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sdext/source/pdfimport/filterdet.cxx.orig.port Wed May 26 20:29:30 2010
+++ sdext/source/pdfimport/filterdet.cxx Fri Jun 25 23:56:14 2010
@@ -710,46 +710,6 @@ uno::Reference< io::XStream > getAdditionalStream( con
OSL_ENSURE( pObject, "object not found\n" );
if( pObject )
{

8
editors/openoffice3/patches/patch-sdext_source_pdfimport_wrapper_wrapper_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sdext_source_pdfimport_wrapper_wrapper_cxx,v 1.2 2010/03/30 11:03:07 robert Exp $
--- sdext/source/pdfimport/wrapper/wrapper.cxx.orig.port Sun Jan 24 16:12:34 2010
+++ sdext/source/pdfimport/wrapper/wrapper.cxx Sun Jan 24 16:44:53 2010
@@ -890,8 +890,6 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&
$OpenBSD: patch-sdext_source_pdfimport_wrapper_wrapper_cxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- sdext/source/pdfimport/wrapper/wrapper.cxx.orig.port Wed May 26 20:29:31 2010
+++ sdext/source/pdfimport/wrapper/wrapper.cxx Fri Jun 25 23:56:14 2010
@@ -941,8 +941,6 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&
// check for encryption, if necessary get password
rtl::OUString aPwd( rPwd );
bool bIsEncrypted = false;

6
editors/openoffice3/patches/patch-sfx2_source_doc_objuno_cxx
View File

@ -1,6 +1,6 @@
--- sfx2/source/doc/objuno.cxx.orig.port Sun Jan 24 16:12:33 2010
+++ sfx2/source/doc/objuno.cxx Sun Jan 24 16:44:53 2010
@@ -382,7 +382,7 @@ void SfxDocumentInfoObject_Impl::Reset(uno::Reference<
--- sfx2/source/doc/objuno.cxx.orig.port Wed May 26 20:29:53 2010
+++ sfx2/source/doc/objuno.cxx Fri Jun 25 23:56:14 2010
@@ -379,7 +379,7 @@ void SfxDocumentInfoObject_Impl::Reset(uno::Reference<
for (sal_Int32 i = 0; i < oldLength; ++i) {
names.push_back(props[i].Name);
}

10
editors/openoffice3/patches/patch-shell_source_backends_localebe_localebackend_cxx
View File

@ -1,6 +1,6 @@
--- shell/source/backends/localebe/localebackend.cxx.orig.port Fri Aug 1 07:34:17 2008
+++ shell/source/backends/localebe/localebackend.cxx Thu Jan 15 14:47:50 2009
@@ -39,7 +39,7 @@
--- shell/source/backends/localebe/localebackend.cxx.orig.port Wed May 26 20:29:56 2010
+++ shell/source/backends/localebe/localebackend.cxx Fri Jun 25 23:56:14 2010
@@ -36,7 +36,7 @@
#include <stdio.h>
@ -9,7 +9,7 @@
#include <rtl/ustrbuf.hxx>
#include <locale.h>
@@ -256,7 +256,7 @@ LocaleBackend* LocaleBackend::createInstance(
@@ -253,7 +253,7 @@ LocaleBackend* LocaleBackend::createInstance(
rtl::OUString LocaleBackend::getLocale(void)
{
@ -18,7 +18,7 @@
return ImplGetLocale(LC_CTYPE);
#elif defined (MACOSX)
return ImplGetLocale("AppleLocale");
@@ -269,7 +269,7 @@ rtl::OUString LocaleBackend::getLocale(void)
@@ -266,7 +266,7 @@ rtl::OUString LocaleBackend::getLocale(void)
rtl::OUString LocaleBackend::getUILocale(void)
{

10
editors/openoffice3/patches/patch-shell_source_unix_misc_gnome-open-url_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-shell_source_unix_misc_gnome-open-url_c,v 1.2 2009/01/22 17:44:39 robert Exp $
--- shell/source/unix/misc/gnome-open-url.c.orig.port Fri Aug 1 07:34:21 2008
+++ shell/source/unix/misc/gnome-open-url.c Thu Jan 15 14:47:50 2009
@@ -56,7 +56,7 @@ typedef enum {
$OpenBSD: patch-shell_source_unix_misc_gnome-open-url_c,v 1.3 2010/06/26 15:48:12 robert Exp $
--- shell/source/unix/misc/gnome-open-url.c.orig.port Wed May 26 20:29:57 2010
+++ shell/source/unix/misc/gnome-open-url.c Fri Jun 25 23:56:14 2010
@@ -53,7 +53,7 @@ typedef enum {
gchar* gnome_gconf_get_gnome_libs_settings_relative (const gchar *subkey)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-shell_source_unix_misc_gnome-open-url_c,v 1.2 2009/01/22 17:44:3
(void)subkey; /* avoid warning due to unused parameter */
@@ -77,7 +77,7 @@ gchar* gnome_gconf_get_gnome_libs_settings_relative (c
@@ -74,7 +74,7 @@ gchar* gnome_gconf_get_gnome_libs_settings_relative (c
gboolean gnome_url_show (const char *url, GError **error)
{

8
editors/openoffice3/patches/patch-shell_source_unix_misc_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-shell_source_unix_misc_makefile_mk,v 1.3 2010/03/30 11:03:07 robert Exp $
--- shell/source/unix/misc/makefile.mk.orig.port Sun Jan 24 16:12:33 2010
+++ shell/source/unix/misc/makefile.mk Sun Jan 24 19:19:21 2010
@@ -72,7 +72,7 @@ APP1TARGET = gnome-open-url.bin
$OpenBSD: patch-shell_source_unix_misc_makefile_mk,v 1.4 2010/06/26 15:48:12 robert Exp $
--- shell/source/unix/misc/makefile.mk.orig.port Wed May 26 20:29:57 2010
+++ shell/source/unix/misc/makefile.mk Fri Jun 25 23:56:14 2010
@@ -68,7 +68,7 @@ APP1TARGET = gnome-open-url.bin
APP1OBJS = \
$(OBJ)$/gnome-open-url.obj
APP1LIBS =

8
editors/openoffice3/patches/patch-shell_source_unix_sysshell_makefile_mk
View File

@ -1,6 +1,6 @@
--- shell/source/unix/sysshell/makefile.mk.orig.port Sun Jan 24 16:12:33 2010
+++ shell/source/unix/sysshell/makefile.mk Sun Jan 24 16:44:53 2010
@@ -44,6 +44,11 @@ ENABLE_EXCEPTIONS=TRUE
--- shell/source/unix/sysshell/makefile.mk.orig.port Wed May 26 20:29:57 2010
+++ shell/source/unix/sysshell/makefile.mk Fri Jun 25 23:56:14 2010
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+=-DSYSTEM_EXPAT
.ENDIF
@ -12,7 +12,7 @@
# --- Files --------------------------------------------------------
.IF "$(OS)" != "MACOSX"
@@ -67,7 +72,7 @@ SHL1STDLIBS=$(EXPATASCII3RDLIB)\
@@ -63,7 +68,7 @@ SHL1STDLIBS=$(EXPATASCII3RDLIB)\
SHL1LIBS=$(SLB)$/xmlparser.lib
SHL1OBJS=$(SLOFILES)
SHL1VERSIONMAP=recfile.map

8
editors/openoffice3/patches/patch-shell_source_unix_sysshell_recently_used_file_handler_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-shell_source_unix_sysshell_recently_used_file_handler_cxx,v 1.2 2010/03/30 11:03:07 robert Exp $
--- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig.port Sun Jan 24 16:12:33 2010
+++ shell/source/unix/sysshell/recently_used_file_handler.cxx Sun Jan 24 16:44:53 2010
@@ -113,7 +113,7 @@ namespace /* private */ {
$OpenBSD: patch-shell_source_unix_sysshell_recently_used_file_handler_cxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig.port Wed May 26 20:29:57 2010
+++ shell/source/unix/sysshell/recently_used_file_handler.cxx Fri Jun 25 23:56:14 2010
@@ -110,7 +110,7 @@ namespace /* private */ {
void set_timestamp(const string_t& character)
{
time_t t;

8
editors/openoffice3/patches/patch-solenv_bin_mapgen_pl
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-solenv_bin_mapgen_pl,v 1.2 2009/01/22 17:44:39 robert Exp $
--- solenv/bin/mapgen.pl.orig.port Fri Aug 1 07:34:38 2008
+++ solenv/bin/mapgen.pl Thu Jan 15 14:47:50 2009
@@ -139,7 +139,8 @@ sub filter_symbols {
$OpenBSD: patch-solenv_bin_mapgen_pl,v 1.3 2010/06/26 15:48:12 robert Exp $
--- solenv/bin/mapgen.pl.orig.port Wed May 26 20:30:08 2010
+++ solenv/bin/mapgen.pl Fri Jun 25 23:56:14 2010
@@ -135,7 +135,8 @@ sub filter_symbols {
$env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
$env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
$env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));

8
editors/openoffice3/patches/patch-solenv_bin_modules_installer_download_pm
View File

@ -1,6 +1,6 @@
--- solenv/bin/modules/installer/download.pm.orig.port Fri Mar 6 21:54:06 2009
+++ solenv/bin/modules/installer/download.pm Thu May 7 23:14:17 2009
@@ -147,7 +147,7 @@ sub put_checksum_and_size_into_script
--- solenv/bin/modules/installer/download.pm.orig.port Wed May 26 20:30:08 2010
+++ solenv/bin/modules/installer/download.pm Fri Jun 25 23:56:14 2010
@@ -143,7 +143,7 @@ sub put_checksum_and_size_into_script
}
else
{
@ -9,7 +9,7 @@
}
my $infoline = "Adding checksum $checksum and size $size into download shell script\n";
@@ -233,7 +233,7 @@ sub call_sum
@@ -229,7 +229,7 @@ sub call_sum
{
my ($filename, $getuidlibrary) = @_;

10
editors/openoffice3/patches/patch-solenv_bin_modules_installer_globals_pm
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.5 2010/03/30 11:03:07 robert Exp $
--- solenv/bin/modules/installer/globals.pm.orig.port Tue Nov 24 15:40:24 2009
+++ solenv/bin/modules/installer/globals.pm Tue Feb 16 19:37:42 2010
@@ -125,7 +125,7 @@ BEGIN
$OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.6 2010/06/26 15:48:12 robert Exp $
--- solenv/bin/modules/installer/globals.pm.orig.port Wed May 26 20:30:08 2010
+++ solenv/bin/modules/installer/globals.pm Fri Jun 25 23:56:14 2010
@@ -122,7 +122,7 @@ BEGIN
$servicesrdb_can_be_created = 0;
$islinux = 0;
$issolaris = 0;
@ -10,7 +10,7 @@ $OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.5 2010/03/30 11:03:0
$iswindowsbuild = 0;
$islinuxbuild = 0;
$islinuxrpmbuild = 0;
@@ -242,7 +242,7 @@ BEGIN
@@ -241,7 +241,7 @@ BEGIN
$jdklib = "";
$jrepath = "";

6
editors/openoffice3/patches/patch-solenv_bin_modules_installer_packagepool_pm
View File

@ -1,6 +1,6 @@
--- solenv/bin/modules/installer/packagepool.pm.orig.port Thu Feb 26 12:06:13 2009
+++ solenv/bin/modules/installer/packagepool.pm Mon Feb 15 23:25:15 2010
@@ -840,9 +840,9 @@ sub determine_new_packagename
--- solenv/bin/modules/installer/packagepool.pm.orig.port Wed May 26 20:30:08 2010
+++ solenv/bin/modules/installer/packagepool.pm Fri Jun 25 23:56:14 2010
@@ -832,9 +832,9 @@ sub determine_new_packagename
my $newentriesnumber = $#{$newcontent} + 1;
if ( $newentriesnumber > 1 )
{

8
editors/openoffice3/patches/patch-solenv_bin_modules_installer_regmerge_pm
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-solenv_bin_modules_installer_regmerge_pm,v 1.2 2009/01/22 17:44:39 robert Exp $
--- solenv/bin/modules/installer/regmerge.pm.orig.port Fri Aug 1 07:34:40 2008
+++ solenv/bin/modules/installer/regmerge.pm Thu Jan 15 14:47:50 2009
@@ -215,7 +215,13 @@ sub merge_files
$OpenBSD: patch-solenv_bin_modules_installer_regmerge_pm,v 1.3 2010/06/26 15:48:12 robert Exp $
--- solenv/bin/modules/installer/regmerge.pm.orig.port Wed May 26 20:30:08 2010
+++ solenv/bin/modules/installer/regmerge.pm Fri Jun 25 23:56:14 2010
@@ -211,7 +211,13 @@ sub merge_files
my $databasename = $databasefile->{'Name'};
my $databasedest = $databasedir . $installer::globals::separator . $databasename;

8
editors/openoffice3/patches/patch-solenv_bin_modules_installer_worker_pm
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-solenv_bin_modules_installer_worker_pm,v 1.3 2009/05/08 15:43:50 robert Exp $
--- solenv/bin/modules/installer/worker.pm.orig.port Fri Mar 20 11:11:01 2009
+++ solenv/bin/modules/installer/worker.pm Thu May 7 23:14:17 2009
@@ -528,7 +528,7 @@ sub clean_output_tree
$OpenBSD: patch-solenv_bin_modules_installer_worker_pm,v 1.4 2010/06/26 15:48:12 robert Exp $
--- solenv/bin/modules/installer/worker.pm.orig.port Wed May 26 20:30:09 2010
+++ solenv/bin/modules/installer/worker.pm Fri Jun 25 23:56:14 2010
@@ -530,7 +530,7 @@ sub clean_output_tree
if ( -d $installer::globals::removedirs[$i] )
{
installer::logger::print_message( "... removing directory $installer::globals::removedirs[$i] ...\n" );

10
editors/openoffice3/patches/patch-solenv_inc_libs_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-solenv_inc_libs_mk,v 1.4 2010/03/30 11:03:07 robert Exp $
--- solenv/inc/libs.mk.orig.port Sun Jan 24 16:12:33 2010
+++ solenv/inc/libs.mk Sun Jan 24 16:44:53 2010
@@ -205,7 +205,7 @@ ZLIB3RDLIB=-lz
$OpenBSD: patch-solenv_inc_libs_mk,v 1.5 2010/06/26 15:48:12 robert Exp $
--- solenv/inc/libs.mk.orig.port Wed May 26 20:30:10 2010
+++ solenv/inc/libs.mk Fri Jun 25 23:56:14 2010
@@ -201,7 +201,7 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
.IF "$(SYSTEM_JPEG)"=="YES"
@ -10,7 +10,7 @@ $OpenBSD: patch-solenv_inc_libs_mk,v 1.4 2010/03/30 11:03:07 robert Exp $
#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so
@@ -327,7 +327,7 @@ USED_RCLIENT_LIBS = $(VCLLIB) $(SOTLIB) $(TOOLSLIB) \
@@ -323,7 +323,7 @@ USED_RCLIENT_LIBS = $(VCLLIB) $(SOTLIB) $(TOOLSLIB) \
SABLOT3RDLIB=-lsablot
APP3RDLIB=-lapp
SAMPLE3RDLIB=-lsample

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

@ -1,7 +1,7 @@
$OpenBSD: patch-solenv_inc_settings_mk,v 1.4 2010/03/30 11:03:07 robert Exp $
--- solenv/inc/settings.mk.orig.port Sun Jan 24 16:12:33 2010
+++ solenv/inc/settings.mk Sun Jan 24 16:44:53 2010
@@ -1135,6 +1135,8 @@ CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
$OpenBSD: patch-solenv_inc_settings_mk,v 1.5 2010/06/26 15:48:12 robert Exp $
--- solenv/inc/settings.mk.orig.port Wed May 26 20:30:11 2010
+++ solenv/inc/settings.mk Fri Jun 25 23:56:14 2010
@@ -1131,6 +1131,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.4 2010/03/30 11:03:07 robert Exp $
.IF "$(optimize)"!=""
CDEFS+=$(CDEFSOPT)
CFLAGS+=$(CFLAGSOPT)
@@ -1275,7 +1277,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
@@ -1271,7 +1273,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
CDEFS+= $(ADDCDEFS)
CDEFS+= $(ENVCDEFS)

10
editors/openoffice3/patches/patch-solenv_inc_unx_mk
View File

@ -1,8 +1,8 @@
# i100395
$OpenBSD: patch-solenv_inc_unx_mk,v 1.3 2010/03/30 11:03:07 robert Exp $
--- solenv/inc/unx.mk.orig.port Fri Oct 2 10:24:56 2009
+++ solenv/inc/unx.mk Fri Feb 12 15:57:26 2010
@@ -32,6 +32,9 @@
$OpenBSD: patch-solenv_inc_unx_mk,v 1.4 2010/06/26 15:48:12 robert Exp $
--- solenv/inc/unx.mk.orig.port Wed May 26 20:30:12 2010
+++ solenv/inc/unx.mk Fri Jun 25 23:56:14 2010
@@ -28,6 +28,9 @@
# --- Unix-Environment ---------------------------------------
# Used if "$(GUI)" == "UNX"
@ -12,7 +12,7 @@ $OpenBSD: patch-solenv_inc_unx_mk,v 1.3 2010/03/30 11:03:07 robert Exp $
# Dieses Define gilt fuer alle WNT- Plattformen
# fuer Compiler, wo kein Java unterstuetzt wird, muss dies ge'undeft werden
@@ -220,7 +223,13 @@ SOLARLIB+=-L$(KDE_ROOT)/lib
@@ -216,7 +219,13 @@ SOLARLIB+=-L$(KDE_ROOT)/lib
AUGMENT_LIBRARY_PATH *= : && \
LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR)
.ELSE

8
editors/openoffice3/patches/patch-solenv_inc_unxobsd_mk
View File

@ -1,5 +1,5 @@
--- solenv/inc/unxobsd.mk.orig.port Thu Feb 11 12:28:02 2010
+++ solenv/inc/unxobsd.mk Thu Feb 11 13:39:37 2010
--- solenv/inc/unxobsd.mk.orig.port Fri Jun 25 23:56:14 2010
+++ solenv/inc/unxobsd.mk Fri Jun 25 23:56:15 2010
@@ -0,0 +1,248 @@
+#*************************************************************************
+#
@ -11,7 +11,7 @@
+#
+# $RCSfile: patch-solenv_inc_unxobsd_mk,v $
+#
+# $Revision: 1.8 $
+# $Revision: 1.9 $
+#
+# This file is part of OpenOffice.org.
+#
@ -191,7 +191,7 @@
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-l%%STDLIB%%
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o

8
editors/openoffice3/patches/patch-soltools_checkdll_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-soltools_checkdll_makefile_mk,v 1.2 2009/01/22 17:44:39 robert Exp $
--- soltools/checkdll/makefile.mk.orig.port Fri Aug 1 07:34:46 2008
+++ soltools/checkdll/makefile.mk Sat Jan 17 19:21:15 2009
@@ -49,7 +49,7 @@ LIBSALCPPRT=$(0)
$OpenBSD: patch-soltools_checkdll_makefile_mk,v 1.3 2010/06/26 15:48:12 robert Exp $
--- soltools/checkdll/makefile.mk.orig.port Wed May 26 20:30:13 2010
+++ soltools/checkdll/makefile.mk Fri Jun 25 23:56:14 2010
@@ -45,7 +45,7 @@ LIBSALCPPRT=$(0)
APP1TARGET = checkdll
APP1OBJS = $(OBJ)$/checkdll.obj
DEPOBJFILES = $(APP1OBJS)

8
editors/openoffice3/patches/patch-stoc_source_corereflection_criface_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-stoc_source_corereflection_criface_cxx,v 1.1 2010/03/30 11:03:07 robert Exp $
--- stoc/source/corereflection/criface.cxx.orig.port Mon Jan 25 19:12:22 2010
+++ stoc/source/corereflection/criface.cxx Mon Jan 25 19:12:59 2010
@@ -35,7 +35,7 @@
$OpenBSD: patch-stoc_source_corereflection_criface_cxx,v 1.2 2010/06/26 15:48:12 robert Exp $
--- stoc/source/corereflection/criface.cxx.orig.port Wed May 26 20:30:18 2010
+++ stoc/source/corereflection/criface.cxx Fri Jun 25 23:56:14 2010
@@ -32,7 +32,7 @@
#ifdef SAL_UNX
#include <sal/alloca.h>
#endif

8
editors/openoffice3/patches/patch-svx_source_customshapes_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-svx_source_customshapes_makefile_mk,v 1.3 2010/03/30 11:03:07 robert Exp $
--- svx/source/customshapes/makefile.mk.orig.port Sun Jan 24 16:12:33 2010
+++ svx/source/customshapes/makefile.mk Sun Jan 24 16:44:55 2010
@@ -45,7 +45,8 @@ ENABLE_EXCEPTIONS=TRUE
$OpenBSD: patch-svx_source_customshapes_makefile_mk,v 1.4 2010/06/26 15:48:12 robert Exp $
--- svx/source/customshapes/makefile.mk.orig.port Wed May 26 20:30:49 2010
+++ svx/source/customshapes/makefile.mk Fri Jun 25 23:56:14 2010
@@ -41,7 +41,8 @@ ENABLE_EXCEPTIONS=TRUE
# Disable optimization for SunCC SPARC and MACOSX (funny loops
# when parsing e.g. "x+width/2"),
# also http://gcc.gnu.org/PR22392

8
editors/openoffice3/patches/patch-tools_bootstrp_command_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_bootstrp_command_cxx,v 1.2 2009/01/22 17:44:39 robert Exp $
--- tools/bootstrp/command.cxx.orig.port Fri Aug 1 07:38:01 2008
+++ tools/bootstrp/command.cxx Thu Jan 15 14:47:51 2009
@@ -75,7 +75,7 @@
$OpenBSD: patch-tools_bootstrp_command_cxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- tools/bootstrp/command.cxx.orig.port Wed May 26 20:33:51 2010
+++ tools/bootstrp/command.cxx Fri Jun 25 23:56:14 2010
@@ -72,7 +72,7 @@
#include <sys/types.h>
#include <unistd.h>
#if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \

8
editors/openoffice3/patches/patch-tools_inc_tools_inetdef_hxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_inc_tools_inetdef_hxx,v 1.2 2009/01/22 17:44:39 robert Exp $
--- tools/inc/tools/inetdef.hxx.orig.port Fri Aug 1 07:38:04 2008
+++ tools/inc/tools/inetdef.hxx Thu Jan 15 14:47:51 2009
@@ -59,6 +59,8 @@
$OpenBSD: patch-tools_inc_tools_inetdef_hxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- tools/inc/tools/inetdef.hxx.orig.port Wed May 26 20:33:52 2010
+++ tools/inc/tools/inetdef.hxx Fri Jun 25 23:56:14 2010
@@ -56,6 +56,8 @@
#define TOOLS_INETDEF_OS "FreeBSD/i386"
#elif defined FREEBSD && defined X86_64
#define TOOLS_INETDEF_OS "FreeBSD/amd64"

8
editors/openoffice3/patches/patch-tools_inc_tools_solar_h
View File

@ -1,6 +1,6 @@
--- tools/inc/tools/solar.h.orig.port Wed Aug 27 15:53:52 2008
+++ tools/inc/tools/solar.h Thu May 7 23:14:18 2009
@@ -332,6 +332,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?
--- tools/inc/tools/solar.h.orig.port Wed May 26 20:33:52 2010
+++ tools/inc/tools/solar.h Fri Jun 25 23:56:14 2010
@@ -329,6 +329,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?
#define SYSTEM_UNXSOGI 32
#define SYSTEM_UNXMACXI 33
#define SYSTEM_OS2GCCI 34
@ -8,7 +8,7 @@
#define SYSTEM_WNTGCCI 99
#if defined WNT
@@ -397,6 +398,8 @@ template<typename T> inline T Abs(T a) { return (a>=0?
@@ -394,6 +395,8 @@ template<typename T> inline T Abs(T a) { return (a>=0?
#define __DLLEXTENSION "mxp.dylib"
#elif defined MACOSX && defined X86
#define __DLLEXTENSION "mxi.dylib"

8
editors/openoffice3/patches/patch-tools_inc_tools_stream_hxx
View File

@ -1,6 +1,6 @@
--- tools/inc/tools/stream.hxx.orig.port Fri Aug 1 07:38:04 2008
+++ tools/inc/tools/stream.hxx Thu Jan 15 14:47:51 2009
@@ -293,7 +293,7 @@ class TOOLS_DLLPUBLIC SvStream (private)
--- tools/inc/tools/stream.hxx.orig.port Wed May 26 20:33:52 2010
+++ tools/inc/tools/stream.hxx Fri Jun 25 23:56:14 2010
@@ -290,7 +290,7 @@ class TOOLS_DLLPUBLIC SvStream (private)
void CreateFormatString();
TOOLS_DLLPRIVATE void ImpInit();
@ -9,7 +9,7 @@
SvStream& operator=( const SvStream& rStream ); // not implemented
protected:
@@ -732,7 +732,7 @@ class TOOLS_DLLPUBLIC SvFileStream : public SvStream (
@@ -729,7 +729,7 @@ class TOOLS_DLLPUBLIC SvFileStream : public SvStream (
sal_uInt32 GetFileHandle() const;
// Forbidden and not implemented.

8
editors/openoffice3/patches/patch-tools_source_fsys_unx_cxx
View File

@ -1,6 +1,6 @@
--- tools/source/fsys/unx.cxx.orig.port Fri Aug 1 07:38:06 2008
+++ tools/source/fsys/unx.cxx Thu Jan 15 14:47:51 2009
@@ -47,7 +47,7 @@
--- tools/source/fsys/unx.cxx.orig.port Wed May 26 20:33:52 2010
+++ tools/source/fsys/unx.cxx Fri Jun 25 23:56:14 2010
@@ -44,7 +44,7 @@
extern "C" int mntctl( int cmd, size_t size, char* buf );
#elif defined(NETBSD)
#include <sys/mount.h>
@ -9,7 +9,7 @@
#elif defined DECUNIX
struct mnttab
{
@@ -97,7 +97,7 @@ struct mymnttab
@@ -94,7 +94,7 @@ struct mymnttab
};

10
editors/openoffice3/patches/patch-tools_source_stream_strmunx_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_source_stream_strmunx_cxx,v 1.2 2009/01/22 17:44:39 robert Exp $
--- tools/source/stream/strmunx.cxx.orig.port Fri Aug 1 07:38:07 2008
+++ tools/source/stream/strmunx.cxx Thu Jan 15 14:47:51 2009
@@ -212,7 +212,7 @@ static sal_uInt32 GetSvError( int nErrno )
$OpenBSD: patch-tools_source_stream_strmunx_cxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- tools/source/stream/strmunx.cxx.orig.port Wed May 26 20:33:53 2010
+++ tools/source/stream/strmunx.cxx Fri Jun 25 23:56:14 2010
@@ -209,7 +209,7 @@ static sal_uInt32 GetSvError( int nErrno )
{ 0, SVSTREAM_OK },
{ EACCES, SVSTREAM_ACCESS_DENIED },
{ EBADF, SVSTREAM_INVALID_HANDLE },
@ -10,7 +10,7 @@ $OpenBSD: patch-tools_source_stream_strmunx_cxx,v 1.2 2009/01/22 17:44:39 robert
{ EDEADLK, SVSTREAM_LOCKING_VIOLATION },
#else
{ EDEADLOCK, SVSTREAM_LOCKING_VIOLATION },
@@ -226,7 +226,7 @@ static sal_uInt32 GetSvError( int nErrno )
@@ -223,7 +223,7 @@ static sal_uInt32 GetSvError( int nErrno )
{ EAGAIN, SVSTREAM_LOCKING_VIOLATION },
{ EISDIR, SVSTREAM_PATH_NOT_FOUND },
{ ELOOP, SVSTREAM_PATH_NOT_FOUND },

8
editors/openoffice3/patches/patch-ucb_source_ucp_ftp_ftpcontent_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ucb_source_ucp_ftp_ftpcontent_cxx,v 1.3 2010/03/30 11:03:07 robert Exp $
--- ucb/source/ucp/ftp/ftpcontent.cxx.orig.port Sun Jan 24 16:12:33 2010
+++ ucb/source/ucp/ftp/ftpcontent.cxx Sun Jan 24 16:44:55 2010
@@ -577,13 +577,12 @@ Any SAL_CALL FTPContent::execute(
$OpenBSD: patch-ucb_source_ucp_ftp_ftpcontent_cxx,v 1.4 2010/06/26 15:48:12 robert Exp $
--- ucb/source/ucp/ftp/ftpcontent.cxx.orig.port Wed May 26 20:33:59 2010
+++ ucb/source/ucp/ftp/ftpcontent.cxx Fri Jun 25 23:56:14 2010
@@ -574,13 +574,12 @@ Any SAL_CALL FTPContent::execute(
action = THROWINTERACTIVECONNECT;
else if(e.code() == CURLE_COULDNT_RESOLVE_HOST )
action = THROWRESOLVENAME;

8
editors/openoffice3/patches/patch-ucb_source_ucp_ftp_ftpurl_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ucb_source_ucp_ftp_ftpurl_cxx,v 1.2 2009/01/22 17:44:39 robert Exp $
--- ucb/source/ucp/ftp/ftpurl.cxx.orig.port Fri Aug 1 07:38:13 2008
+++ ucb/source/ucp/ftp/ftpurl.cxx Thu Jan 15 14:47:51 2009
@@ -586,11 +586,11 @@ rtl::OUString FTPURL::net_title() const
$OpenBSD: patch-ucb_source_ucp_ftp_ftpurl_cxx,v 1.3 2010/06/26 15:48:12 robert Exp $
--- ucb/source/ucp/ftp/ftpurl.cxx.orig.port Wed May 26 20:33:59 2010
+++ ucb/source/ucp/ftp/ftpurl.cxx Fri Jun 25 23:56:14 2010
@@ -583,11 +583,11 @@ rtl::OUString FTPURL::net_title() const
aNetTitle = aNetTitle.copy(1+index1);
}
try_more = false;

8
editors/openoffice3/patches/patch-udm_source_mkinc_fullcpp_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-udm_source_mkinc_fullcpp_mk,v 1.2 2009/01/22 17:44:39 robert Exp $
--- udm/source/mkinc/fullcpp.mk.orig.port Fri Aug 1 07:38:22 2008
+++ udm/source/mkinc/fullcpp.mk Thu Jan 15 14:47:51 2009
@@ -58,7 +58,7 @@ CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(
$OpenBSD: patch-udm_source_mkinc_fullcpp_mk,v 1.3 2010/06/26 15:48:12 robert Exp $
--- udm/source/mkinc/fullcpp.mk.orig.port Wed May 26 20:34:08 2010
+++ udm/source/mkinc/fullcpp.mk Fri Jun 25 23:56:14 2010
@@ -54,7 +54,7 @@ CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(
.ENDIF

8
editors/openoffice3/patches/patch-vcl_unx_inc_saldata_hxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vcl_unx_inc_saldata_hxx,v 1.3 2010/03/30 11:03:07 robert Exp $
--- vcl/unx/inc/saldata.hxx.orig.port Sun Jan 24 16:12:33 2010
+++ vcl/unx/inc/saldata.hxx Sun Jan 24 19:20:51 2010
@@ -51,7 +51,7 @@ class SalPrinter;
$OpenBSD: patch-vcl_unx_inc_saldata_hxx,v 1.4 2010/06/26 15:48:12 robert Exp $
--- vcl/unx/inc/saldata.hxx.orig.port Wed May 26 20:34:28 2010
+++ vcl/unx/inc/saldata.hxx Fri Jun 25 23:56:14 2010
@@ -48,7 +48,7 @@ class SalPrinter;
DECLARE_LIST( SalDisplays, SalDisplay* )

8
editors/openoffice3/patches/patch-vcl_unx_inc_salunx_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vcl_unx_inc_salunx_h,v 1.3 2010/03/30 11:03:07 robert Exp $
--- vcl/unx/inc/salunx.h.orig.port Sun Jan 24 16:12:33 2010
+++ vcl/unx/inc/salunx.h Sun Jan 24 19:21:00 2010
@@ -32,7 +32,7 @@
$OpenBSD: patch-vcl_unx_inc_salunx_h,v 1.4 2010/06/26 15:48:12 robert Exp $
--- vcl/unx/inc/salunx.h.orig.port Wed May 26 20:34:28 2010
+++ vcl/unx/inc/salunx.h Fri Jun 25 23:56:14 2010
@@ -29,7 +29,7 @@
#define _SALUNX_H
// -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

10
editors/openoffice3/patches/patch-vcl_unx_source_app_i18n_ic_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vcl_unx_source_app_i18n_ic_cxx,v 1.3 2010/03/30 11:03:07 robert Exp $
--- vcl/unx/source/app/i18n_ic.cxx.orig.port Sun Jan 24 16:12:33 2010
+++ vcl/unx/source/app/i18n_ic.cxx Sun Jan 24 19:21:28 2010
@@ -340,7 +340,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame
$OpenBSD: patch-vcl_unx_source_app_i18n_ic_cxx,v 1.4 2010/06/26 15:48:12 robert Exp $
--- vcl/unx/source/app/i18n_ic.cxx.orig.port Wed May 26 20:34:29 2010
+++ vcl/unx/source/app/i18n_ic.cxx Fri Jun 25 23:56:14 2010
@@ -337,7 +337,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame
if ( mnPreeditStyle != XIMPreeditNone )
{
@ -10,7 +10,7 @@ $OpenBSD: patch-vcl_unx_source_app_i18n_ic_cxx,v 1.3 2010/03/30 11:03:07 robert
if ( mpPreeditAttributes != NULL )
#endif
mpAttributes = XVaAddToNestedList( mpAttributes,
@@ -348,7 +348,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame
@@ -345,7 +345,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame
}
if ( mnStatusStyle != XIMStatusNone )
{

10
editors/openoffice3/patches/patch-vcl_unx_source_app_saldisp_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vcl_unx_source_app_saldisp_cxx,v 1.4 2010/03/30 11:03:07 robert Exp $
--- vcl/unx/source/app/saldisp.cxx.orig.port Sun Jan 24 16:12:33 2010
+++ vcl/unx/source/app/saldisp.cxx Sun Jan 24 19:22:13 2010
@@ -898,7 +898,7 @@ void SalDisplay::Init()
$OpenBSD: patch-vcl_unx_source_app_saldisp_cxx,v 1.5 2010/06/26 15:48:12 robert Exp $
--- vcl/unx/source/app/saldisp.cxx.orig.port Wed May 26 20:34:29 2010
+++ vcl/unx/source/app/saldisp.cxx Fri Jun 25 23:56:14 2010
@@ -895,7 +895,7 @@ void SalDisplay::Init()
sscanf( pProperties, "%li", &nProperties_ );
else
{
@ -10,7 +10,7 @@ $OpenBSD: patch-vcl_unx_source_app_saldisp_cxx,v 1.4 2010/03/30 11:03:07 robert
nProperties_ |= PROPERTY_FEATURE_Maximize;
#endif
// Server Bugs & Properties
@@ -924,7 +924,7 @@ void SalDisplay::Init()
@@ -921,7 +921,7 @@ void SalDisplay::Init()
if( GetServerVendor() == vendor_xfree )
{
nProperties_ |= PROPERTY_BUG_XCopyArea_GXxor;

8
editors/openoffice3/patches/patch-vcl_unx_source_dtrans_X11_selection_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vcl_unx_source_dtrans_X11_selection_cxx,v 1.1 2010/03/30 11:03:07 robert Exp $
--- vcl/unx/source/dtrans/X11_selection.cxx.orig.port Mon Jan 25 19:02:10 2010
+++ vcl/unx/source/dtrans/X11_selection.cxx Mon Jan 25 19:04:29 2010
@@ -40,7 +40,7 @@
$OpenBSD: patch-vcl_unx_source_dtrans_X11_selection_cxx,v 1.2 2010/06/26 15:48:12 robert Exp $
--- vcl/unx/source/dtrans/X11_selection.cxx.orig.port Wed May 26 20:34:30 2010
+++ vcl/unx/source/dtrans/X11_selection.cxx Fri Jun 25 23:56:14 2010
@@ -37,7 +37,7 @@
#include <X11/Xlib.h>
#include <X11/X.h>
#include <X11/Xutil.h>

8
editors/openoffice3/patches/patch-vcl_unx_source_printer_cupsmgr_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vcl_unx_source_printer_cupsmgr_cxx,v 1.1 2010/03/30 11:03:07 robert Exp $
--- vcl/unx/source/printer/cupsmgr.cxx.orig.port Fri Feb 12 00:33:18 2010
+++ vcl/unx/source/printer/cupsmgr.cxx Fri Feb 12 00:33:28 2010
@@ -55,7 +55,7 @@ typedef void cups_option_t;
$OpenBSD: patch-vcl_unx_source_printer_cupsmgr_cxx,v 1.2 2010/06/26 15:48:12 robert Exp $
--- vcl/unx/source/printer/cupsmgr.cxx.orig.port Wed May 26 20:34:32 2010
+++ vcl/unx/source/printer/cupsmgr.cxx Fri Jun 25 23:56:15 2010
@@ -52,7 +52,7 @@ typedef void cups_option_t;
#include <setjmp.h>
#include <signal.h>

10
editors/openoffice3/patches/patch-vcl_unx_source_printer_printerinfomanager_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vcl_unx_source_printer_printerinfomanager_cxx,v 1.1 2010/03/30 11:03:07 robert Exp $
--- vcl/unx/source/printer/printerinfomanager.cxx.orig.port Fri Feb 12 00:34:30 2010
+++ vcl/unx/source/printer/printerinfomanager.cxx Fri Feb 12 00:35:07 2010
@@ -1207,7 +1207,7 @@ struct SystemCommandParameters
$OpenBSD: patch-vcl_unx_source_printer_printerinfomanager_cxx,v 1.2 2010/06/26 15:48:12 robert Exp $
--- vcl/unx/source/printer/printerinfomanager.cxx.orig.port Wed May 26 20:34:32 2010
+++ vcl/unx/source/printer/printerinfomanager.cxx Fri Jun 25 23:56:15 2010
@@ -1204,7 +1204,7 @@ struct SystemCommandParameters
tokenHandler pHandler;
};
@ -10,7 +10,7 @@ $OpenBSD: patch-vcl_unx_source_printer_printerinfomanager_cxx,v 1.1 2010/03/30 1
static void lpgetSysQueueTokenHandler(
const std::list< rtl::OString >& i_rLines,
std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues,
@@ -1352,7 +1352,7 @@ static void standardSysQueueTokenHandler(
@@ -1349,7 +1349,7 @@ static void standardSysQueueTokenHandler(
static const struct SystemCommandParameters aParms[] =
{

8
editors/openoffice3/patches/patch-writerfilter_source_resourcemodel_makefile_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-writerfilter_source_resourcemodel_makefile_mk,v 1.2 2009/05/08 15:43:50 robert Exp $
--- writerfilter/source/resourcemodel/makefile.mk.orig.port Fri Apr 10 10:36:58 2009
+++ writerfilter/source/resourcemodel/makefile.mk Fri Apr 10 10:37:10 2009
@@ -52,6 +52,9 @@ CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
$OpenBSD: patch-writerfilter_source_resourcemodel_makefile_mk,v 1.3 2010/06/26 15:48:12 robert Exp $
--- writerfilter/source/resourcemodel/makefile.mk.orig.port Wed May 26 20:34:42 2010
+++ writerfilter/source/resourcemodel/makefile.mk Fri Jun 25 23:56:15 2010
@@ -48,6 +48,9 @@ CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
NOOPTFILES= \
$(SLO)$/qnametostr.obj

8
editors/openoffice3/patches/patch-xpdf_makefile_mk
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-xpdf_makefile_mk,v 1.4 2010/03/30 11:03:07 robert Exp $
$OpenBSD: patch-xpdf_makefile_mk,v 1.5 2010/06/26 15:48:12 robert Exp $
--- xpdf/makefile.mk.orig.port Sun Jan 24 16:12:34 2010
+++ xpdf/makefile.mk Sun Jan 24 19:24:36 2010
@@ -81,7 +81,14 @@ LDFLAGS:=$(ARCH_FLAGS)
--- xpdf/makefile.mk.orig.port Wed May 26 20:35:11 2010
+++ xpdf/makefile.mk Fri Jun 25 23:56:15 2010
@@ -77,7 +77,14 @@ LDFLAGS:=$(ARCH_FLAGS)
.ENDIF
CONFIGURE_ACTION=configure

1660
editors/openoffice3/patches/patch-xpdf_xpdf-3_02_patch
View File

File diff suppressed because it is too large Load Diff

4
editors/openoffice3/pkg/PLIST-i18n-bg
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-i18n-bg,v 1.7 2010/04/21 13:53:01 robert Exp $
@comment $OpenBSD: PLIST-i18n-bg,v 1.8 2010/06/26 15:48:12 robert Exp $
@pkgpath editors/openoffice,-i18n-bg
!%%no_java%%
openoffice.org/basis3.2/help/bg/
@ -387,8 +387,8 @@ openoffice.org/basis3.2/share/template/bg/wizard/styles/nostalgic.ots
openoffice.org/basis3.2/share/template/bg/wizard/styles/pastell.ots
openoffice.org/basis3.2/share/template/bg/wizard/styles/pool.ots
openoffice.org/basis3.2/share/template/bg/wizard/styles/pumpkin.ots
openoffice.org/basis3.2/share/template/bg/wizard/styles/sunstyle.ots
openoffice.org/basis3.2/share/template/bg/wizard/styles/xos.ots
openoffice.org/basis3.2/share/template/wizard/letter/bg/
openoffice.org/basis3.2/share/template/wizard/letter/bg/bus-elegant_l.ott
openoffice.org/basis3.2/share/template/wizard/letter/bg/bus-modern_l.ott
openoffice.org/basis3.2/share/template/wizard/letter/bg/bus-office_l.ott

15
editors/openoffice3/pkg/PLIST-i18n-ca
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-i18n-ca,v 1.6 2010/03/30 11:03:07 robert Exp $
@comment $OpenBSD: PLIST-i18n-ca,v 1.7 2010/06/26 15:48:12 robert Exp $
@pkgpath editors/openoffice,-i18n-ca
!%%no_java%%
openoffice.org/basis3.2/help/ca/
@ -91,12 +91,12 @@ openoffice.org/basis3.2/help/ca/swriter.idxl/segments_3
openoffice.org/basis3.2/help/ca/swriter.jar
openoffice.org/basis3.2/help/ca/swriter.key
openoffice.org/basis3.2/help/ca/swriter.tree
openoffice.org/basis3.2/presets/config/arrowhd_en-US_ca.soe
openoffice.org/basis3.2/presets/config/classic_en-US_ca.sog
openoffice.org/basis3.2/presets/config/hatching_en-US_ca.soh
openoffice.org/basis3.2/presets/config/modern_en-US_ca.sog
openoffice.org/basis3.2/presets/config/palette_en-US_ca.soc
openoffice.org/basis3.2/presets/config/styles_en-US_ca.sod
openoffice.org/basis3.2/presets/config/arrowhd_ca.soe
openoffice.org/basis3.2/presets/config/classic_ca.sog
openoffice.org/basis3.2/presets/config/hatching_ca.soh
openoffice.org/basis3.2/presets/config/modern_ca.sog
openoffice.org/basis3.2/presets/config/palette_ca.soc
openoffice.org/basis3.2/presets/config/styles_ca.sod
openoffice.org/basis3.2/program/resource/abpca.res
openoffice.org/basis3.2/program/resource/accca.res
openoffice.org/basis3.2/program/resource/adabasuica.res
@ -410,7 +410,6 @@ openoffice.org/basis3.2/share/template/ca/wizard/styles/nostalgic.ots
openoffice.org/basis3.2/share/template/ca/wizard/styles/pastell.ots
openoffice.org/basis3.2/share/template/ca/wizard/styles/pool.ots
openoffice.org/basis3.2/share/template/ca/wizard/styles/pumpkin.ots
openoffice.org/basis3.2/share/template/ca/wizard/styles/sunstyle.ots
openoffice.org/basis3.2/share/template/ca/wizard/styles/xos.ots
openoffice.org/basis3.2/share/wordbook/ca/
openoffice.org/basis3.2/share/wordbook/ca/soffice.dic

Some files were not shown because too many files have changed in this diff Show More