[Libreoffice-commits] .: 6 commits - connectivity/source framework/source redland/raptor redland/rasqal redland/redland ucb/source
David Tardon
dtardon at kemper.freedesktop.org
Thu Mar 1 06:51:50 PST 2012
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 3 +
framework/source/fwi/helper/networkdomain.cxx | 20 +++++++---
redland/raptor/makefile.mk | 16 ++++++--
redland/raptor/raptor-1.4.18.patch.mingw | 11 +++++
redland/rasqal/makefile.mk | 9 +++-
redland/rasqal/rasqal-0.9.16.patch.mingw | 11 +++++
redland/redland/makefile.mk | 9 +++-
redland/redland/redland-1.0.8.patch.mingw | 11 +++++
ucb/source/ucp/odma/odma_inputstream.cxx | 6 +--
9 files changed, 78 insertions(+), 18 deletions(-)
New commits:
commit 54442c917d7bb6b2e955c8c8315e0352dc6d2281
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 1 13:50:48 2012 +0100
WaE: initialization order
diff --git a/ucb/source/ucp/odma/odma_inputstream.cxx b/ucb/source/ucp/odma/odma_inputstream.cxx
index dbce62d..1dd96df 100644
--- a/ucb/source/ucp/odma/odma_inputstream.cxx
+++ b/ucb/source/ucp/odma/odma_inputstream.cxx
@@ -60,12 +60,12 @@ public:
OOdmaStream::OOdmaStream(::ucbhelper::Content* _pContent,
ContentProvider* _pProvider,
const ::rtl::Reference<ContentProperties>& _rProp)
- :m_pContent(_pContent)
+ :m_aProp(_rProp)
+ ,m_pContent(_pContent)
+ ,m_pProvider(_pProvider)
,m_bInputStreamCalled(sal_False)
,m_bOutputStreamCalled(sal_False)
,m_bModified(sal_False)
- ,m_pProvider(_pProvider)
- ,m_aProp(_rProp)
{
}
// -----------------------------------------------------------------------------
commit 856ad69ffe8b39fe44b245933c17e1e03248611a
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 1 13:44:29 2012 +0100
work around ICE with mingw32-gcc-4.7.0-0.5.20120224
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 6dd7881..2dfb960 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -173,7 +173,8 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const ::rtl::OUString
template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::getInteger ( sal_Int32 columnIndex )
{
- checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
+ ::cppu::OBroadcastHelper& rBHelper(ODatabaseMetaDataResultSet_BASE::rBHelper);
+ checkDisposed(rBHelper.bDisposed);
::osl::MutexGuard aGuard( m_aMutex );
columnIndex = mapColumn(columnIndex);
commit 2fb1fe6c24a62b954f3a4bbdb5628d94269df946
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 1 13:00:09 2012 +0100
get redland built with mingw
Do not ask me how or why this works. There are things man was not meant
to know.
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 6a95955..d898f94 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -102,6 +102,14 @@ BUILD_ACTION=dmake
BUILD_DIR=$(CONFIGURE_DIR)$/src
.ENDIF
+# Hack to get librdf.dll linked on mingw. I am already wearied of
+# fighting libtool's pseudo-intelligence, so I am just going to go with
+# the flow here.
+ALL : $(OUT)/lib/libraptor.la
+
+$(OUT)/lib/libraptor.la : $(MISC)/build/so_built_so_raptor
+ $(SED) "/^dlname/s@='@='../bin/@" $(MISC)/build/$(TARFILE_NAME)/src/libraptor.la > $@
+
.ELSE # "WNT"
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 2b605a0..0ce48c4 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -64,18 +64,21 @@ PATCH_FILES=$(OOO_PATCH_FILES) \
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
redland_CC=$(CC) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
redland_CC+=-shared-libgcc
.ENDIF
redland_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
+
+redland_LDFLAGS=-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols
+.IF "$(ILIB)"!=""
+redland_LDFLAGS+= -L$(ILIB:s/;/ -L/)
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqal=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(redland_LDFLAGS)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) $(HOST_PLATFORM)-objdump" LIBXML2LIB="$(LIBXML2LIB)" XSLTLIB="$(XSLTLIB)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/redland/redland-1.0.8.patch.mingw b/redland/redland/redland-1.0.8.patch.mingw
new file mode 100644
index 0000000..a32621b
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.mingw
@@ -0,0 +1,11 @@
+--- misc/redland-1.0.8/librdf/Makefile.in
++++ misc/build/redland-1.0.8/librdf/Makefile.in
+@@ -463,7 +463,7 @@
+ rdf_parser_raptor.c
+
+ EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl
+-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
++librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -no-undefined \
+ @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
+
+ pkgdata_DATA = $(am__append_11)
commit 2824a8b40289344c788c3b18f2e33f2e238eeff8
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 1 10:46:37 2012 +0100
get rasqal built with mingw
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 76146d4..45dbba6 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -64,18 +64,21 @@ PATCH_FILES=$(OOO_PATCH_FILES)
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
rasqal_CC=$(CC) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
rasqal_CC+=-shared-libgcc
.ENDIF
rasqal_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
+
+rasqal_LDFLAGS=-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols
+.IF "$(ILIB)"!=""
+rasqal_LDFLAGS+= -L$(ILIB:s/;/ -L/)
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(rasqal_LDFLAGS)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) $(HOST_PLATFORM)-objdump" LIBXML2LIB="$(LIBXML2LIB)" XSLTLIB="$(XSLTLIB)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/rasqal/rasqal-0.9.16.patch.mingw b/redland/rasqal/rasqal-0.9.16.patch.mingw
new file mode 100644
index 0000000..9c42a98
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.mingw
@@ -0,0 +1,11 @@
+--- misc/rasqal-0.9.16/src/Makefile.in
++++ misc/build/rasqal-0.9.16/src/Makefile.in
+@@ -355,7 +355,7 @@
+ rasqal_xsd_datatypes.c rasqal_decimal.c rasqal_datetime.c \
+ rasqal_rowsource.c rasqal_sparql_xml.c $(am__append_3) \
+ $(am__append_4) $(am__append_5)
+-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
++librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -no-undefined
+ librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
+ librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
+ EXTRA_DIST = \
commit b8b088daf8c993e90b86a632c1077ae324414a84
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 1 10:21:36 2012 +0100
get raptor built with mingw
I _really_ love how libtool, when called without -no-undefined, silently
falls back to building a static lib (AFAICS without even trying to check
if there really will be any undefined symbols in the resulting dll).
Thank you, libtool author! I cannot express how much I enjoyed the hours
I spent figuring out what is happening there!
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index d7864b8..6a95955 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -83,14 +83,16 @@ raptor_CC=$(CC) -mthreads
raptor_CC+=-shared-libgcc
.ENDIF
raptor_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
+
+raptor_LDFLAGS=-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols
+.IF "$(ILIB)"!=""
+raptor_LDFLAGS+= -L$(ILIB:s/;/ -L/)
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB="$(LIBXML2LIB)" XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --enable-shared --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(raptor_LDFLAGS)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) $(HOST_PLATFORM)-objdump" LIBXML2LIB="$(LIBXML2LIB)" XSLTLIB="$(XSLTLIB)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/raptor/raptor-1.4.18.patch.mingw b/redland/raptor/raptor-1.4.18.patch.mingw
index e29a0a0..bb9f6f4 100644
--- a/redland/raptor/raptor-1.4.18.patch.mingw
+++ b/redland/raptor/raptor-1.4.18.patch.mingw
@@ -28,3 +28,14 @@
if test "$USE_MAINTAINER_MODE" = yes; then
rdf_parsers_available="$rdf_parsers_available n3"
fi
+--- misc/raptor-1.4.18/src/Makefile.in
++++ misc/build/raptor-1.4.18/src/Makefile.in
+@@ -404,7 +404,7 @@
+ $(am__append_20) $(am__append_21) $(am__append_22) \
+ $(am__append_23) $(am__append_24) $(am__append_25) \
+ $(am__append_26)
+-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
++libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined
+ libraptor_la_LIBADD = @LTLIBOBJS@
+ EXTRA_DIST = \
+ raptor-config.in \
commit b60cf256b76cd12601b6e243f084dcc25bea172e
Author: David Tardon <dtardon at redhat.com>
Date: Wed Feb 29 13:04:49 2012 +0100
do not include external stuff into namespace
diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
index 22066c6..818cd94 100644
--- a/framework/source/fwi/helper/networkdomain.cxx
+++ b/framework/source/fwi/helper/networkdomain.cxx
@@ -28,9 +28,6 @@
#include <helper/networkdomain.hxx>
-namespace framework
-{
-
#ifdef WNT
//_________________________________________________________________________________________________________________
// Windows
@@ -67,6 +64,9 @@ static rtl::OUString GetUserDomain()
// Windows
//_________________________________________________________________________________________________________________
+namespace framework
+{
+
rtl::OUString NetworkDomain::GetYPDomainName()
{
return ::rtl::OUString();
@@ -77,6 +77,8 @@ rtl::OUString NetworkDomain::GetNTDomainName()
return GetUserDomain();
}
+}
+
#elif defined( UNIX )
#include <rtl/ustring.h>
@@ -192,6 +194,9 @@ static rtl_uString *getDomainName()
// Unix
//_________________________________________________________________________________________________________________
+namespace framework
+{
+
rtl::OUString NetworkDomain::GetYPDomainName()
{
rtl_uString* pResult = getDomainName();
@@ -206,12 +211,17 @@ rtl::OUString NetworkDomain::GetNTDomainName()
return ::rtl::OUString();
}
+}
+
#else /* UNIX */
//_________________________________________________________________________________________________________________
// Other operating systems (non-Windows and non-Unix)
//_________________________________________________________________________________________________________________
+namespace framework
+{
+
rtl::OUString NetworkDomain::GetYPDomainName()
{
return rtl::OUString();
@@ -222,8 +232,8 @@ rtl::OUString NetworkDomain::GetNTDomainName()
return rtl::OUString();
}
-#endif
+}
-} // namespace framework
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list