[Libreoffice-commits] .: 6 commits - bootstrap connectivity/source Makefile postgresql/postgresql-9.1.1-libreoffice.patch
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Feb 10 04:14:49 PST 2012
Makefile | 10 +++-
bootstrap | 4 +
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 4 -
connectivity/source/drivers/postgresql/pq_driver.cxx | 2
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx | 6 +-
connectivity/source/drivers/postgresql/pq_tools.cxx | 4 -
connectivity/source/drivers/postgresql/pq_xcontainer.cxx | 4 -
postgresql/postgresql-9.1.1-libreoffice.patch | 22 +++++++++-
8 files changed, 41 insertions(+), 15 deletions(-)
New commits:
commit 386161779b55755f145106cd53c5df80967e1c3b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Feb 10 13:53:45 2012 +0200
On Cygwin, Make wants to see Unix-style pathnames
diff --git a/Makefile b/Makefile
index 38ed6fc..414de90 100644
--- a/Makefile
+++ b/Makefile
@@ -365,11 +365,17 @@ endif
#
# Bootstap
#
-$(WORKDIR)/bootstrap:
+ifeq ($(OS_FOR_BUILD),WNT)
+WORKDIR_BOOTSTRAP=$(shell cygpath -u $(WORKDIR))/bootstrap
+else
+WORKDIR_BOOTSTRAP=$(WORKDIR)/bootstrap
+endif
+
+$(WORKDIR_BOOTSTRAP):
@cd $(SRCDIR) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
-bootstrap: $(WORKDIR)/bootstrap
+bootstrap: $(WORKDIR_BOOTSTRAP)
#
# Build
commit cd2644df499dd0874514028ccd4f42571464e6a3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Feb 10 13:34:42 2012 +0200
Don't source config_host.mk as such but put quotes around the variable values
Otherwise lines like:
export CLASSPATH=C:/PROGRA~2/Java/JDK16~2.0_2/jre/lib/rt.jar;.
will cause problems on Windows.
diff --git a/bootstrap b/bootstrap
index 94d07aa..313c2a9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -5,7 +5,9 @@ if test -z "${SRC_ROOT}"; then
. ./config_build.mk
else
if test -f ./config_host.mk ; then
- . ./config_host.mk
+ sed -e 's/^\(export .*=\)\(.*\)$/\1"\2"/' <config_host.mk >config_host.mk.sh
+ . ./config_host.mk.sh
+ rm config_host.mk.sh
fi
fi
fi
commit 2e1faa12faf81c28dbf3ce005ecd16c27770b9ca
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Feb 9 10:41:16 2012 +0200
WaE: unreferenced local variable
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 8318080..180c3c6 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -422,9 +422,9 @@ Any BaseResultSet::convertTo( const Any & val , const Type & type )
{
aRet = m_tc->convertTo( val , type );
}
- catch( com::sun::star::lang::IllegalArgumentException & e )
+ catch( com::sun::star::lang::IllegalArgumentException & )
{}
- catch( com::sun::star::script::CannotConvertException & e )
+ catch( com::sun::star::script::CannotConvertException & )
{}
return aRet;
}
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index a67ca43..8fde1d1 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -263,7 +263,7 @@ sal_Int32 ResultSetMetaData::getIntColumnProperty( const rtl::OUString & name, i
set->getPropertyValue( name ) >>= ret;
}
}
- catch( com::sun::star::uno::Exception & e )
+ catch( com::sun::star::uno::Exception & )
{
}
return ret;
@@ -282,7 +282,7 @@ sal_Bool ResultSetMetaData::getBoolColumnProperty( const rtl::OUString & name, i
set->getPropertyValue( name ) >>= ret;
}
}
- catch( com::sun::star::uno::Exception & e )
+ catch( com::sun::star::uno::Exception & )
{
}
@@ -462,7 +462,7 @@ sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column )
ret = m_colDesc[column-1].typeName;
}
}
- catch( com::sun::star::uno::Exception & e )
+ catch( com::sun::star::uno::Exception & )
{
}
return ret;
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index c27bf15..d54d6d3 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -360,7 +360,7 @@ void disposeNoThrow( const com::sun::star::uno::Reference< com::sun::star::uno::
{
disposeObject( r );
}
- catch( SQLException & e )
+ catch( SQLException & )
{
// ignore this
}
@@ -437,7 +437,7 @@ TransactionGuard::~TransactionGuard()
if( ! m_commited )
m_stmt->executeUpdate( getStatics().ROLLBACK );
}
- catch( com::sun::star::uno::Exception & e )
+ catch( com::sun::star::uno::Exception & )
{
// ignore, we are within a dtor
}
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index a1dc210..e28c7f2 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -491,13 +491,13 @@ void Container::fire( const EventBroadcastHelper &helper )
{
helper.fire( (XEventListener * ) iterator.next() );
}
- catch ( com::sun::star::uno::RuntimeException & e )
+ catch ( com::sun::star::uno::RuntimeException & )
{
OSL_ENSURE( 0, "exception catched" );
// loose coupling, a runtime exception shall not break anything
// TODO: log away as warning !
}
- catch( com::sun::star::uno::Exception & e )
+ catch( com::sun::star::uno::Exception & )
{
OSL_ENSURE( 0, "exception from listener flying through" );
throw;
commit ece70bbfecd550fcd4d1d6525cd103bb7fec8b67
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Feb 9 10:39:46 2012 +0200
Silence silly MSVC "deprecation" warnings too
diff --git a/postgresql/postgresql-9.1.1-libreoffice.patch b/postgresql/postgresql-9.1.1-libreoffice.patch
index 83f3aec..8647a26 100644
--- a/postgresql/postgresql-9.1.1-libreoffice.patch
+++ b/postgresql/postgresql-9.1.1-libreoffice.patch
@@ -81,7 +81,7 @@ diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak m
CLEAN :
- at erase "$(INTDIR)\getaddrinfo.obj"
-@@ -192,7 +186,7 @@
+@@ -192,10 +186,11 @@
CPP_PROJ=/nologo /W3 /EHsc $(OPT) \
/I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" \
@@ -90,6 +90,10 @@ diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak m
/D "FRONTEND" $(DEBUGDEF) \
/D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" \
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
++ /D "_CRT_NONSTDC_NO_DEPRECATE" \
+ /D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES)
+
+ !IFDEF USE_SSL
@@ -230,7 +224,7 @@
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(LDAP_LIBS) $(KFW_LIBS) $(ADD_SECLIB) \
commit 1c343fd6e34e34e7620c550b33a55ad7dfcfee98
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Feb 9 10:34:21 2012 +0200
Don't use the debugging CRT and different name when building LO for debugging
diff --git a/postgresql/postgresql-9.1.1-libreoffice.patch b/postgresql/postgresql-9.1.1-libreoffice.patch
index d3ba124..83f3aec 100644
--- a/postgresql/postgresql-9.1.1-libreoffice.patch
+++ b/postgresql/postgresql-9.1.1-libreoffice.patch
@@ -11,7 +11,7 @@ diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile mi
diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak
--- misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-14 14:28:59.000000000 +0100
+++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak 2011-12-15 09:11:37.000000000 +0100
-@@ -13,18 +13,19 @@
+@@ -13,30 +13,29 @@
# CPU="i386" or CPU environment of nmake.exe (AMD64 or IA64)
@@ -35,6 +35,20 @@ diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak m
!ERROR Make aborted.
!ENDIF
+ !IFDEF DEBUG
+-OPT=/Od /Zi /MDd
++OPT=/Od /Zi
+ LOPT=/DEBUG
+-DEBUGDEF=/D _DEBUG
+-OUTFILENAME=libpqd
++OUTFILENAME=libpq
+ !ELSE
+ OPT=/O2 /MD
+ LOPT=
+-DEBUGDEF=/D NDEBUG
+ OUTFILENAME=libpq
+ !ENDIF
+
@@ -56,7 +57,7 @@
!ENDIF
commit 95e79b3ebd10c4c7dae89613a65b1678551caf21
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Feb 9 09:51:32 2012 +0200
WaE: unreferenced local variable
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index dce19c7..86d37be 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -367,7 +367,7 @@ void * SAL_CALL component_getFactory(
{
propSet->getPropertyValue( ASCII_STR( "DefaultContext" ) ) >>= defaultContext;
}
- catch( com::sun::star::uno::Exception &e )
+ catch( com::sun::star::uno::Exception & )
{
// if there is no default context, ignore it
}
More information about the Libreoffice-commits
mailing list