[Libreoffice-commits] .: 6 commits - config_host.mk.in configure.ac external/mingw-dlls graphite/graphite-2.3.1_debug.patch graphite/graphite2.issue1030.patch.1 graphite/graphite2.placementnew.patch graphite/UnpackedTarball_graphite.mk liblangtag/prj nss/nspr-4.9-build.patch scp2/InstallModule_ooo.mk scp2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 31 05:23:16 PDT 2012
config_host.mk.in | 2 ++
configure.ac | 11 +++++++++++
external/mingw-dlls/makefile.mk | 2 ++
graphite/UnpackedTarball_graphite.mk | 2 ++
graphite/graphite-2.3.1_debug.patch | 13 -------------
graphite/graphite2.issue1030.patch.1 | 12 ++++++++++++
graphite/graphite2.placementnew.patch | 10 ----------
liblangtag/prj/d.lst | 1 +
nss/nspr-4.9-build.patch | 5 +++--
scp2/InstallModule_ooo.mk | 2 ++
scp2/source/ooo/file_library_ooo.scp | 6 +++++-
scp2/source/ooo/mingw_dlls.scp | 25 +++++++++++++++++--------
12 files changed, 57 insertions(+), 34 deletions(-)
New commits:
commit 069704d390d70afe507b5f049a472a6aefaed64d
Author: David Tardon <dtardon at redhat.com>
Date: Wed Oct 31 13:21:25 2012 +0100
fdo#55514 libgmodule is needed too
Change-Id: Icee2ffbe18ea732220f174cd4bf433ceb03d128b
diff --git a/config_host.mk.in b/config_host.mk.in
index 5812862..105b672 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -366,6 +366,7 @@ export MINGW_FREETYPE_DLL=@MINGW_FREETYPE_DLL@
export MINGW_GCCDLL=@MINGW_GCCDLL@
export MINGW_GCRYPT_DLL=@MINGW_GCRYPT_DLL@
export MINGW_GLIB_DLL=@MINGW_GLIB_DLL@
+export MINGW_GMODULE_DLL=@MINGW_GMODULE_DLL@
export MINGW_GNUTLS_DLL=@MINGW_GNUTLS_DLL@
export MINGW_GPG_ERROR_DLL=@MINGW_GPG_ERROR_DLL@
export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@
diff --git a/configure.ac b/configure.ac
index 024aa98..0900d85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11592,6 +11592,7 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os !=
PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.3)
libo_MINGW_CHECK_DLL([LIBLANGTAG], [liblangtag])
libo_MINGW_TRY_DLL([GLIB], [libglib-2.0])
+ libo_MINGW_TRY_DLL([GMODULE], [libgmodule-2.0])
else
SYSTEM_LIBLANGTAG=NO
AC_MSG_RESULT([no])
@@ -11607,6 +11608,7 @@ AC_SUBST(LIBLANGTAG_CFLAGS)
AC_SUBST(LIBLANGTAG_LIBS)
AC_SUBST([MINGW_LIBLANGTAG_DLL])
AC_SUBST([MINGW_GLIB_DLL])
+AC_SUBST([MINGW_GMODULE_DLL])
dnl ===================================================================
dnl Test whether to build GLib or rely on the system version
@@ -11631,6 +11633,7 @@ if test "$want_glib" = yes; then
SYSTEM_GLIB=YES
PKG_CHECK_MODULES( GLIB, glib-2.0 )
libo_MINGW_CHECK_DLL([GLIB], [libglib-2.0])
+ libo_MINGW_TRY_DLL([GMODULE], [libgmodule-2.0])
else
AC_MSG_RESULT([internal])
SYSTEM_GLIB=NO
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index 9b9ceb2..57381fa 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -52,6 +52,7 @@ MINGW_DLLS:= \
$(MINGW_FREETYPE_DLL) \
$(MINGW_GCRYPT_DLL) \
$(MINGW_GLIB_DLL) \
+ $(MINGW_GMODULE_DLL) \
$(MINGW_GNUTLS_DLL) \
$(MINGW_GPG_ERROR_DLL) \
$(MINGW_GRAPHITE2_DLL) \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index c130b50..e118724 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
MINGW_FREETYPE_DLL \
MINGW_GCRYPT_DLL \
MINGW_GLIB_DLL \
+ MINGW_GMODULE_DLL \
MINGW_GNUTLS_DLL \
MINGW_GPG_ERROR_DLL \
MINGW_GRAPHITE2_DLL \
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 0fcf0b8..dab712a 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -46,10 +46,13 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
#endif
#endif
-#ifdef SYSTEM_GLIB
+#if defined SYSTEM_GLIB || defined SYSTEM_LIBLANGTAG
#ifdef NEEDS_MINGW_GLIB_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Glib, MINGW_GLIB_DLL )
#endif
+#ifdef NEEDS_MINGW_GMODULE_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Gmodule, MINGW_GMODULE_DLL )
+#endif
#endif
#ifdef SYSTEM_LIBLANGTAG
commit 13b967e0edf0372fbd76e3ec5282fac7de6763a8
Author: David Tardon <dtardon at redhat.com>
Date: Wed Oct 31 12:48:36 2012 +0100
fdo#55514 put liblangtag dll into the install set
Change-Id: I81019488c06d83e80ff63f43d416fa0b74be8e15
diff --git a/liblangtag/prj/d.lst b/liblangtag/prj/d.lst
index ae77f33..a508333 100644
--- a/liblangtag/prj/d.lst
+++ b/liblangtag/prj/d.lst
@@ -1,6 +1,7 @@
mkdir: %_DEST%\inc\liblangtag
..\%__SRC%\inc\* %_DEST%\inc\liblangtag\
+..\%__SRC%\bin\liblangtag-0.dll %_DEST%\bin\
..\%__SRC%\lib\liblangtag.so* %_DEST%\lib\
..\%__SRC%\lib\langtag.lib* %_DEST%\lib\
..\%__SRC%\lib\liblangtag*.dylib %_DEST%\lib\
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 48fab43..07a2cd7 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -761,7 +761,11 @@ File gid_File_Lib_Langtag
#ifdef MACOSX
Name = STRING(CONCAT4(liblangtag,.,0,UNXSUFFIX));
#elif defined WNT
- // Nothing, statically linked to libi18nisolang1
+ #if defined _gcc3
+ Name = STRING(CONCAT4(liblangtag,-,0,.dll));
+ #else
+ // Nothing, statically linked to libi18nisolang1
+ #endif
#else
// FIXME: use version vars
Name = STRING(CONCAT4(liblangtag,UNXSUFFIX,.,0));
commit a6f97a750dda531deabc00223c89abf043640701
Author: David Tardon <dtardon at redhat.com>
Date: Wed Oct 31 12:20:06 2012 +0100
fdo#54327 put system nss dlls into the install set
Change-Id: Ie809bba726c4d17eac25d36381d93ea9781d74be
diff --git a/config_host.mk.in b/config_host.mk.in
index cb38d43..5812862 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -406,6 +406,7 @@ export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@
export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@
export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@
export MINGW_SQLITE3_DLL=@MINGW_SQLITE3_DLL@
+export MINGW_SMIME3_DLL=@MINGW_SMIME3_DLL@
export MINGW_SSH2_DLL=@MINGW_SSH2_DLL@
export MINGW_SSL3_DLL=@MINGW_SSL3_DLL@
export MINGW_SSL_DLL=@MINGW_SSL_DLL@
diff --git a/configure.ac b/configure.ac
index 2acf0d7..024aa98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8280,6 +8280,13 @@ if test "$with_system_nss" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_NSS="YES"
PKG_CHECK_MODULES(NSS, nss >= 3.9.3 nspr >= 4.8)
+ libo_MINGW_CHECK_DLL([NSPR4], [libnspr4])
+ libo_MINGW_CHECK_DLL([PLC4], [libplc4])
+ libo_MINGW_CHECK_DLL([PLDS4], [libplds4])
+ libo_MINGW_CHECK_DLL([NSS3], [nss3])
+ libo_MINGW_CHECK_DLL([NSSUTIL3], [nssutil3])
+ libo_MINGW_CHECK_DLL([SMIME3], [smime3])
+ libo_MINGW_CHECK_DLL([SSL3], [ssl3])
else
SYSTEM_NSS="NO"
BUILD_TYPE="$BUILD_TYPE NSS"
@@ -8311,6 +8318,7 @@ fi # system nss
AC_SUBST(SYSTEM_NSS)
AC_SUBST(NSS_CFLAGS)
AC_SUBST(NSS_LIBS)
+AC_SUBST([MINGW_SMIME3_DLL])
dnl ===================================================================
dnl Check for system mozilla headers
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index b6d967c..9b9ceb2 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -86,6 +86,7 @@ MINGW_DLLS:= \
$(MINGW_READLINE_DLL) \
$(MINGW_REDLAND_DLL) \
$(MINGW_SQLITE3_DLL) \
+ $(MINGW_SMIME3_DLL) \
$(MINGW_SSH2_DLL) \
$(MINGW_SSL3_DLL) \
$(MINGW_SSL_DLL) \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index d33d6db..c130b50 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -131,6 +131,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
MINGW_RAPTOR_DLL \
MINGW_RASQAL_DLL \
MINGW_REDLAND_DLL \
+ MINGW_SMIME3_DLL \
MINGW_SQLITE3_DLL \
MINGW_SSH2_DLL \
MINGW_SSL3_DLL \
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 4588225..0fcf0b8 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -85,13 +85,7 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdb, MINGW_DB_DLL )
#endif
#endif
-#ifdef SYSTEM_CURL
-#ifdef NEEDS_MINGW_INTL_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl, MINGW_INTL_DLL )
-#endif
-#ifdef NEEDS_MINGW_IDN_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn, MINGW_IDN_DLL )
-#endif
+#if defined SYSTEM_CURL || defined SYSTEM_NSS
#ifdef NEEDS_MINGW_NSPR4_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr, MINGW_NSPR4_DLL )
#endif
@@ -110,12 +104,24 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_nss, MINGW_NSS3_DLL )
#ifdef NEEDS_MINGW_SSL3_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_ssl, MINGW_SSL3_DLL )
#endif
+#ifdef NEEDS_MINGW_SMIME3_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_smime, MINGW_SMIME3_DLL )
+#endif
+#endif
+
+#ifdef SYSTEM_CURL
#ifdef NEEDS_MINGW_GPG_ERROR_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgpgerror, MINGW_GPG_ERROR_DLL )
#endif
#ifdef NEEDS_MINGW_GCRYPT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgcrypt, MINGW_GCRYPT_DLL )
#endif
+#ifdef NEEDS_MINGW_INTL_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl, MINGW_INTL_DLL )
+#endif
+#ifdef NEEDS_MINGW_IDN_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn, MINGW_IDN_DLL )
+#endif
#ifdef NEEDS_MINGW_SSH2_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssh, MINGW_SSH2_DLL )
#endif
commit 6b9e9763681cbc85332bf8dde843fb9c485dc536
Author: David Tardon <dtardon at redhat.com>
Date: Wed Oct 31 10:47:39 2012 +0100
fix library names on mingw
This is a bit hackish and could benefit from further cleanup.
Change-Id: Ibb8eddf88bffdea41fd94fea09ad6499d05ae715
diff --git a/nss/nspr-4.9-build.patch b/nss/nspr-4.9-build.patch
index 757d68e..1ed211a 100644
--- a/nss/nspr-4.9-build.patch
+++ b/nss/nspr-4.9-build.patch
@@ -21,11 +21,12 @@
# Win95 and OS/2 require library names conforming to the 8.3 rule.
# other platforms do not.
#
- ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET)))
+-ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET)))
++ifeq (,$(filter-out WIN95 WINCE WINMO WINNT OS2,$(OS_TARGET)))
LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
-+IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
++IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
else
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
commit 8055b03d537c1e1a4e0a384acf59dbd786223352
Author: David Tardon <dtardon at redhat.com>
Date: Wed Oct 31 07:53:26 2012 +0100
drop unused patches
Change-Id: I8e4dc4c6a727ecb54b1555701d19554f9766d79d
diff --git a/graphite/graphite-2.3.1_debug.patch b/graphite/graphite-2.3.1_debug.patch
deleted file mode 100644
index 583fac7..0000000
--- a/graphite/graphite-2.3.1_debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2008-08-21 16:24:32.000000000 +0200
-+++ misc/build/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2011-02-21 13:22:23.159834368 +0100
-@@ -247,7 +247,9 @@
- GlyphSetIterator::reference GlyphSetIterator::operator*() const
- {
- assert(m_pseg != 0);
-- assert(m_vit != std::vector<int>::const_iterator());
-+ // #i116227# the check below is well meant but breaks itself when using stlport with debug facilities
-+ // a valid iterator cannot be compared to an empty one in that case
-+ // assert(m_vit != std::vector<int>::const_iterator());
- // in the case of a non-contiguous list
- return m_pseg->m_prgginf[(*m_vit) - m_pseg->m_isloutGinf0];
- }
diff --git a/graphite/graphite2.placementnew.patch b/graphite/graphite2.placementnew.patch
deleted file mode 100644
index 47b50a2..0000000
--- a/graphite/graphite2.placementnew.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/graphite2-1.0.2/src/GlyphFace.cpp 2011-08-23 11:37:11.971472000 +0100
-+++ misc/build/graphite2-1.0.2/src/GlyphFace.cpp 2011-08-23 11:38:13.979750400 +0100
-@@ -25,6 +25,7 @@
- of the License or (at your option) any later version.
- */
- #include <iterator>
-+#include <new>
- #include "GlyphFace.h"
- #include "XmlTraceLog.h"
- #include "GlyphFaceCache.h"
commit a17b98bc88736ca4a6fc6ccadcbed2c11f5f2351
Author: David Tardon <dtardon at redhat.com>
Date: Wed Oct 31 07:53:00 2012 +0100
fix mingw build of graphite
Change-Id: Ie4ac8f71de1816325f40d8c276b07e9e126a85b5
diff --git a/graphite/UnpackedTarball_graphite.mk b/graphite/UnpackedTarball_graphite.mk
index d50ef19..53b73b1 100644
--- a/graphite/UnpackedTarball_graphite.mk
+++ b/graphite/UnpackedTarball_graphite.mk
@@ -11,8 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite))
$(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
+# http://projects.palaso.org/issues/1030
$(eval $(call gb_UnpackedTarball_add_patches,graphite,\
graphite/graphite2.patch \
+ graphite/graphite2.issue1030.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/graphite/graphite2.issue1030.patch.1 b/graphite/graphite2.issue1030.patch.1
new file mode 100644
index 0000000..2bfe1a1
--- /dev/null
+++ b/graphite/graphite2.issue1030.patch.1
@@ -0,0 +1,12 @@
+diff -up workdir/wntgcci.pro/UnpackedTarball/graphite/src/gr_logging.cpp.dt workdir/wntgcci.pro/UnpackedTarball/graphite/src/gr_logging.cpp
+--- graphite/src/gr_logging.cpp.dt 2012-10-31 07:40:57.527381144 +0100
++++ graphite/src/gr_logging.cpp 2012-10-31 07:40:59.522333851 +0100
+@@ -33,7 +33,7 @@ of the License or (at your option) any l
+ #include "inc/Segment.h"
+
+ #if defined _WIN32
+-#include "Windows.h"
++#include "windows.h"
+ #endif
+
+ using namespace graphite2;
More information about the Libreoffice-commits
mailing list