mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

update to svn 1517723.

Browse Source 
some cleanups [1].

PR:		181574
This commit is contained in:
Maho Nakata 2013-08-27 03:36:50 +00:00
parent f339f50854
commit dbea6b19e0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=325427
8 changed files with 185 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
editors/openoffice-devel/Makefile
View File

@ -3,7 +3,6 @@
PORTNAME= apache-openoffice
PORTVERSION= 4.0.${SVNREVISION}
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= editors java
MASTER_SITES= ${MASTER_SITE_LOCAL}
@ -25,39 +24,41 @@ USE_XORG= x11 ice xaw xau xext xrender xrandr \
xi xt xcursor xdamage xcomposite xfixes
USE_GL= gl glu
USE_GSTREAMER= yes
#WITH_GCC= yes
USE_GMAKE= yes
#USE_GCC= 4.6+
USE_PYTHON= yes
USE_BZIP2= yes
USES+= bison perl5
USES+= bison perl5 gmake
USE_PERL5= build
WITHOUT_CPU_CFLAGS= true
MAKE_JOBS_SAFE= yes
OPTIONS_DEFINE= GCONF GNOMEVFS
OPTIONS_DEFINE= GCONF GNOMEVFS CCACHE
OPTIONS_DEFAULT=GCONF GNOMEVFS
GNOMEVFS_DESC= Enable GNOME Virtual File System
CCACHE_DESC= Mimimize compile time of C/C++ programs
.include "${.CURDIR}/files/Makefile.localized"
.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_VENDOR= openjdk
JAVA_VERSION= 1.6+
.if !defined(WITHOUT_GCONF)
.if ${PORT_OPTIONS:MGCONF}
USE_GNOME+= gconf2
.else
CONFIGURE_ARGS+=--disable-gconf
.endif
.if !defined(WITHOUT_GNOMEVFS)
.if ${PORT_OPTIONS:MGNOMEVFS}
USE_GNOME+= gnomevfs2
.else
CONFIGURE_ARGS+=--disable-gnome-vfs
.endif
.include <${FILESDIR}/Makefile.localized>
ONLY_FOR_ARCHS= i386 amd64
.if ${ARCH} == amd64
@ -69,7 +70,7 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
OOOSRC= ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
EXTSRC= ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
OOODIR= openoffice4
SVNREVISION= 1479753
SVNREVISION= 1517723
INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION}
EXECBASE?= openoffice-r${SVNREVISION}
DIST_SUBDIR= openoffice
@ -96,7 +97,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hico
${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
.if defined(WITH_CCACHE)
.if ${PORT_OPTIONS:MCCACHE) || defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
CCACHE_PREFIX= ccache
OOOCC= ${CCACHE_PREFIX} ${CC}
@ -109,20 +110,20 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
PATH=${WRKSRC}/solenv/bin:$$PATH \
CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
expat.6:${PORTSDIR}/textproc/expat2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
expat:${PORTSDIR}/textproc/expat2 \
jpeg:${PORTSDIR}/graphics/jpeg \
curl:${PORTSDIR}/ftp/curl \
hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
rdf.0:${PORTSDIR}/textproc/redland \
textcat.0:${PORTSDIR}/textproc/libtextcat \
freetype.9:${PORTSDIR}/print/freetype2 \
apr-1.4:${PORTSDIR}/devel/apr1 \
CoinMP.8:${PORTSDIR}/math/coinmp \
serf-1.0:${PORTSDIR}/www/serf \
freetype.9:${PORTSDIR}/print/freetype2 \
textcat.0:${PORTSDIR}/textproc/libtextcat
hunspell-1.3:${PORTSDIR}/textproc/hunspell \
poppler-glib:${PORTSDIR}/graphics/poppler-glib \
rdf:${PORTSDIR}/textproc/redland \
textcat:${PORTSDIR}/textproc/libtextcat \
freetype:${PORTSDIR}/print/freetype2 \
apr-1:${PORTSDIR}/devel/apr1 \
CoinMP:${PORTSDIR}/math/coinmp \
serf-1:${PORTSDIR}/www/serf \
freetype:${PORTSDIR}/print/freetype2 \
textcat:${PORTSDIR}/textproc/libtextcat
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
@ -146,7 +147,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
WRKSRC?= ${WRKDIR}/ooo/main
WRKSRC?= ${WRKDIR}/aoo/main
BASH?= ${PREFIX}/bin/bash
SUB_FILES= pkg-message
SUB_LIST= EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
@ -206,6 +207,8 @@ CONFIGURE_ARGS+= --enable-verbose \
--with-system-serf
# --with-system-jpeg
# --enable-pdfimport
# --without-stlport --disable-mozilla \
# --with-system-graphite \
#OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
#OOOEXTENSIONS+= presenter/presenter-screen.oxt
@ -237,8 +240,10 @@ pre-everything::
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
# @${MKDIR} ${WRKSRC}/../ext_sources
# @${MV} ${WRKDIR}/ooo/ext_sources/* ${WRKSRC}/../ext_sources/
# @${MV} ${WRKDIR}/aoo/ext_sources/* ${WRKSRC}/../ext_sources/
# @${RM} -rf ${WRKSRC}/l10n
@${MKDIR} ${WRKSRC}/../ext_sources
@${RM} -rf ${WRKSRC}/l10n
post-patch:
.if defined (USE_GCC)
@ -253,9 +258,9 @@ pre-configure:
@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
do-build:
@cd ${WRKDIR}/ooo ; ${PRINTF} "[repositories]\n" > source_config
@cd ${WRKDIR}/ooo ; ${PRINTF} "main=active\n" >> source_config
@cd ${WRKDIR}/ooo ; ${PRINTF} "extras=active\n" >> source_config
@cd ${WRKDIR}/aoo ; ${PRINTF} "[repositories]\n" > source_config
@cd ${WRKDIR}/aoo ; ${PRINTF} "main=active\n" >> source_config
@cd ${WRKDIR}/aoo ; ${PRINTF} "extras=active\n" >> source_config
@cd ${WRKSRC} ; ./bootstrap
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"

8
editors/openoffice-devel/distinfo
View File

@ -1,6 +1,6 @@
SHA256 (openoffice/ApacheOpenOffice.r1479753.tar.bz2) = 5f52372c74c23b8ba028b9b6d0e69c608b6b3ca35b094eca778d7368b4fe85ce
SIZE (openoffice/ApacheOpenOffice.r1479753.tar.bz2) = 240621675
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1479753.tar.bz2) = 2774e5ba11174842a950fa6f9b2b935948d79ff685cc08f80d6a1e0abd446b88
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1479753.tar.bz2) = 80437514
SHA256 (openoffice/ApacheOpenOffice.r1517723.tar.bz2) = 4361231d3a74d08042484220da96c9d3342de7f95f9be44a833258ac722cc4db
SIZE (openoffice/ApacheOpenOffice.r1517723.tar.bz2) = 240252315
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1517723.tar.bz2) = 3f85960f7d9c1b95dca26456dcc8c0b6871046e6bec5be40a218a719cec0ef16
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1517723.tar.bz2) = 68267885
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144

19
editors/openoffice-devel/files/patch-configmgr Normal file
View File

@ -0,0 +1,19 @@
--- configmgr/source/partial.hxx
+++ configmgr/source/partial.hxx
@@ -26,6 +26,7 @@
#include "sal/config.h"
+#include <boost/functional/hash.hpp>
#include <boost/unordered_map.hpp> // using the boost container because it explicitly allows recursive types
#include <set>
@@ -50,7 +51,7 @@ public:
private:
struct Node {
- typedef boost::unordered_map< rtl::OUString, Node > Children;
+ typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > Children;
Node(): startInclude(false) {}
void clear() { startInclude=false; children.clear(); }

112
editors/openoffice-devel/files/patch-i114430 Normal file
View File

@ -0,0 +1,112 @@
Index: sal/inc/rtl/math.h
===================================================================
--- sal/inc/rtl/math.h (revision 1447988)
+++ sal/inc/rtl/math.h (working copy)
@@ -396,6 +396,21 @@
*/
double SAL_CALL rtl_math_pow10Exp(double fValue, int nExp) SAL_THROW_EXTERN_C();
+/** Similar to pow() with stricter exception handling for indeterminate values.
+
+ powr is specified in the IEEE 754 - 2008 Floating Point Standard.
+
+ @param fValue
+ The value to be raised.
+
+ @param fExp
+ The exponent.
+
+ @return
+ powr(fValue, fExp)
+ */
+double SAL_CALL rtl_math_powr(double fValue, double fExp) SAL_THROW_EXTERN_C();
+
/** Rounds value to 15 significant decimal digits.
@param fValue
Index: sal/inc/rtl/math.hxx
===================================================================
--- sal/inc/rtl/math.hxx (revision 1447988)
+++ sal/inc/rtl/math.hxx (working copy)
@@ -186,6 +186,13 @@
return rtl_math_pow10Exp(fValue, nExp);
}
+/** A wrapper around rtl_math_powr.
+ */
+inline double powr(double fValue, double fExp)
+{
+ return rtl_math_powr(fValue, fExp);
+}
+
/** A wrapper around rtl_math_approxValue.
*/
inline double approxValue(double fValue)
Index: sal/rtl/source/math.cxx
===================================================================
--- sal/rtl/source/math.cxx (revision 1447988)
+++ sal/rtl/source/math.cxx (working copy)
@@ -1113,7 +1113,20 @@
return (fe-1.0) * fValue / log(fe);
}
+double SAL_CALL rtl_math_powr( double fValue, double fExp ) SAL_THROW_EXTERN_C()
+{
+ if ((fValue == 0.0 && fExp == 0.0) ||
+ (rtl::math::isInf( fExp ) && !rtl::math::isSignBitSet( fExp )) ||
+ (rtl::math::isInf( fValue ) && !rtl::math::isSignBitSet( fValue )))
+ {
+ double fResult;
+ ::rtl::math::setNan( &fResult );
+ return fResult;
+ }
+ return pow(fValue, fExp);
+}
+
double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C()
{
// Use volatile because a compiler may be too smart "optimizing" the
Index: sal/util/sal.map
===================================================================
--- sal/util/sal.map (revision 1447988)
+++ sal/util/sal.map (working copy)
@@ -629,6 +629,8 @@
global:
osl_loadAsciiModule;
osl_loadAsciiModuleRelative;
+
+ rtl_math_powr;
} UDK_3.11;
PRIVATE_1.0 {
Index: sc/source/core/tool/interpr5.cxx
===================================================================
--- sc/source/core/tool/interpr5.cxx (revision 1447988)
+++ sc/source/core/tool/interpr5.cxx (working copy)
@@ -1611,14 +1611,14 @@
if (bFlag)
{ for ( SCSIZE i = 0; i < nCount; i++ )
if (pMat->IsValue(i))
- pResMat->PutDouble(pow(fVal,pMat->GetDouble(i)), i);
+ pResMat->PutDouble(::rtl::math::powr(fVal,pMat->GetDouble(i)), i);
else
pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
}
else
{ for ( SCSIZE i = 0; i < nCount; i++ )
if (pMat->IsValue(i))
- pResMat->PutDouble(pow(pMat->GetDouble(i),fVal), i);
+ pResMat->PutDouble(::rtl::math::powr(pMat->GetDouble(i),fVal), i);
else
pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
}
@@ -1628,7 +1628,7 @@
PushIllegalArgument();
}
else
- PushDouble(pow(fVal1,fVal2));
+ PushDouble(::rtl::math::powr(fVal1,fVal2));
}
void ScInterpreter::ScSumProduct()

270
editors/openoffice-devel/files/patch-jdk7-hsqldb-debian
View File

@ -1,270 +0,0 @@
--- hsqldb/patches/jdbc-4.1.patch
+++ hsqldb/patches/jdbc-4.1.patch
@@ -0,0 +1,267 @@
+--- misc/hsqldb/build/build.xml 2012-02-08 15:14:42.827123541 +0000
++++ misc/build/hsqldb/build/build.xml 2012-02-08 15:21:43.827722388 +0000
+@@ -98,7 +98,11 @@
+ <echo message="ant.java.hasjsse=${ant.java.hasjsse}" />
+ </target>
+
+- <target name="javaversion6">
++ <target name="javaversion7">
++ <available classname="java.util.Objects" property="ant.java.iscjava17"/>
++ </target>
++
++ <target name="javaversion6" depends="javaversion7" unless="ant.java.iscjava17">
+ <available classname="java.net.IDN" property="ant.java.iscjava16"/>
+ </target>
+
+@@ -210,6 +214,7 @@
+ <arg value="+JAVA2FULL"/>
+ <arg value="-JAVA4"/>
+ <arg value="-JAVA6"/>
++ <arg value="-JAVA7"/>
+ </java>
+ </target>
+
+@@ -244,6 +249,7 @@
+ <arg value="+JAVA2FULL"/>
+ <arg value="+JAVA4"/>
+ <arg value="-JAVA6"/>
++ <arg value="-JAVA7"/>
+ </java>
+ </target>
+
+@@ -279,10 +285,47 @@
+ <arg value="+JAVA2FULL"/>
+ <arg value="+JAVA4"/>
+ <arg value="+JAVA6"/>
++ <arg value="+JAVA7"/>
++ </java>
++ </target>
++
++ <target name="switchtojdk17" depends="switchtojdk16"
++ description="self explanatory" if="ant.java.iscjava17">
++ <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
++ <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
++ <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
++ <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcCallableStatement.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcClob.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcConnection.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSet.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java"/>
++ <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/>
++ <arg file="${src}/org/hsqldb/persist/LockFile.java"/>
++ <arg file="${src}/org/hsqldb/persist/Logger.java"/>
++ <arg file="${src}/org/hsqldb/persist/ScaledRAFile.java"/>
++ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
++ <arg file="${src}/org/hsqldb/util/DatabaseManager.java"/>
++ <arg file="${src}/org/hsqldb/util/ConnectionDialogCommon.java"/>
++ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
++ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
++ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
++ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
++ <arg file="${src}/org/hsqldb/HsqlDateTime.java"/>
++ <arg value="+JAVA2"/>
++ <arg value="+JAVA2FULL"/>
++ <arg value="+JAVA4"/>
++ <arg value="+JAVA6"/>
++ <arg value="+JAVA7"/>
+ </java>
+ </target>
+
+- <target name="store" depends="switchtojdk16"
++ <target name="store" depends="switchtojdk17"
+ description="compiles the /store folder">
+ <javac srcdir="${src}"
+ destdir="classes"
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-02-08 15:14:42.802123563 +0000
++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-02-08 15:47:35.842635642 +0000
+@@ -3375,4 +3375,18 @@
+ }
+
+ //#endif JAVA6
++
++//#ifdef JAVA7
++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public <T> T getObject(int ColumnIndex, Class<T> type) throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++
++//#endif JAVA7
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:14:42.802123563 +0000
++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:47:35.851635628 +0000
+@@ -48,6 +48,12 @@
+ import java.sql.SQLXML;
+
+ //#endif JAVA6
++
++//#ifdef JAVA7
++import java.util.concurrent.Executor;
++
++//#endif JAVA7
++
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
+ import java.sql.SQLWarning;
+@@ -2793,4 +2799,31 @@
+ }
+
+ //#endif JAVA6
++
++//#ifdef JAVA7
++ public int getNetworkTimeout() throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public void setNetworkTimeout(Executor executor, int millis) throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public void abort(Executor executor) throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public String getSchema() throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public void setSchema(String schema) throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++//#endif JAVA7
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:14:42.802123563 +0000
++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:47:35.835635654 +0000
+@@ -5693,4 +5693,21 @@
+ }
+
+ //#endif JAVA6
++
++
++//#ifdef JAVA7
++ public boolean generatedKeyAlwaysReturned() throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
++ String tableNamePattern, String columnNamePattern) throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++
++//#endif JAVA7
++
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:14:42.802123563 +0000
++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:47:35.836635653 +0000
+@@ -47,6 +47,11 @@
+ //#endif JAVA4
+ import org.hsqldb.jdbcDriver;
+
++//#ifdef JAVA7
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
++//#endif JAVA7
++
+ // boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final
+
+ /**
+@@ -323,4 +328,12 @@
+ }
+
+ //#endif JAVA6
++
++//#ifdef JAVA7
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException
++ {
++ throw new SQLFeatureNotSupportedException("Not supported yet.");
++ }
++
++//#endif JAVA7
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:14:42.802123563 +0000
++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:47:35.866635606 +0000
+@@ -5324,4 +5324,19 @@
+ }
+
+ //#endif JAVA6
++
++//#ifdef JAVA7
++
++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public <T> T getObject(int columnNum, Class<T> type) throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++//#endif JAVA7
++
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:14:42.802123563 +0000
++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:47:35.872635595 +0000
+@@ -1608,4 +1608,16 @@
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ //#endif JAVA6
++
++//#ifdef JAVA7
++ public boolean isCloseOnCompletion() throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public void closeOnCompletion() throws SQLException
++ {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++//#endif JAVA7
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:14:42.800123566 +0000
++++ misc/build/hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:47:35.826635667 +0000
+@@ -42,6 +42,11 @@
+ import org.hsqldb.persist.HsqlDatabaseProperties;
+ import org.hsqldb.persist.HsqlProperties;
+
++//#ifdef JAVA7
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
++//#endif JAVA7
++
+ // fredt@users 20011220 - patch 1.7.0 by fredt
+ // new version numbering scheme
+ // fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping
+@@ -321,4 +326,12 @@
+ DriverManager.registerDriver(new jdbcDriver());
+ } catch (Exception e) {}
+ }
++
++//#ifdef JAVA7
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException
++ {
++ throw new SQLFeatureNotSupportedException("Not supported yet.");
++ }
++
++//#endif JAVA7
+ }

12
editors/openoffice-devel/files/patch-jdk7-hsqldb-debian-x
View File

@ -1,12 +0,0 @@
--- hsqldb/makefile.mk.orig 2012-02-17 08:46:16.000000000 +0000
+++ hsqldb/makefile.mk 2012-09-15 18:00:27.000000000 +0000
@@ -52,7 +52,8 @@
PATCH_FILES=patches$/i96823.patch \
patches$/i97032.patch \
patches$/i103528.patch \
- patches$/i104901.patch
+ patches$/i104901.patch \
+ patches$/jdbc-4.1.patch
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=

16
editors/openoffice-devel/files/patch-sal-inline Normal file
View File

@ -0,0 +1,16 @@
Index: sal/util/makefile.mk
===================================================================
--- sal/util/makefile.mk (revision 1509387)
+++ sal/util/makefile.mk (working copy)
@@ -45,6 +45,11 @@
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
+# gcc can have some broken inlining optimizations
+.IF "$(OS)"=="FREEBSD" && "$(COM)" == "GCC"
+CFLAGS += -fkeep-inline-functions
+.ENDIF
+
.IF "$(depend)" == ""
# --- Files --------------------------------------------------------

1
editors/openoffice-devel/pkg-descr
View File

@ -15,4 +15,3 @@ Components include:
illustrations
WWW: http://openoffice.apache.org/