Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross
On Thu, May 17, 2012 at 11:41:52PM -0700, Tor Lillqvist wrote: commit 6868d84b13a52efe91337f2dccb88e59b9f8d2b7 Author: Tor Lillqvist t...@iki.fi Date: Thu May 17 22:45:04 2012 +0300 Add generic --with-build-platform-configure-options diff --git a/configure.in b/configure.in index 9c23d8a..510d82a 100644 --- a/configure.in +++ b/configure.in @@ -991,6 +991,9 @@ AC_ARG_WITH(gnu-patch, [Specify location of GNU patch on Solaris or FreeBSD.]), ,) +AC_ARG_WITH(build-platform-configure-options, +[Specify options for the configure script run for the *build* platform in a cross-compilation]) + AC_ARG_WITH(gnu-cp, AS_HELP_STRING([--with-gnu-cp], [Specify location of GNU cp on Solaris or FreeBSD.]), @@ -2021,6 +2024,7 @@ AC_ARG_WITH(macosx-version-max-allowed, dnl === dnl options for stuff used during cross-compilation build +dnl These are superseded by --with-build-platform-configure-options dnl === AC_ARG_WITH(system-boost-for-build, @@ -3472,6 +3476,7 @@ if test $cross_compiling = yes; then test -n $with_system_expat_for_build sub_conf_opts=$sub_conf_opts --with-system-expat test $with_system_icu_for_build = yes -o $with_system_icu_for_build = force sub_conf_opts=$sub_conf_opts --with-system-icu test -n $with_system_libxml_for_build sub_conf_opts=$sub_conf_opts --with-system-libxml +sub_conf_opts=$sub_conf_opts $with_build_platform_configure_options ./configure \ --disable-mozilla \ --disable-build-mozilla \ This is a good idea, but I think it would be even better to have autogen.lastrun.build (or whatever you want to call it). Then we would not need to specify _any_ build-specific options for the host configure. Opinions? D. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in | 66 +--
1 file changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 2bbbd615d6a3bab89a6df7d7f0d2bb62e3781b43
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Apr 24 10:11:30 2012 +0200
move the GXX_INCLUDE_PATH so that it's more obvious it's only for STLPort
diff --git a/configure.in b/configure.in
index 867a534..a1568ec 100644
--- a/configure.in
+++ b/configure.in
@@ -4257,39 +4257,6 @@ fi
AC_SUBST([VALGRIND_CFLAGS])
dnl ===
-dnl Set the gcc/gxx include directories
-dnl ===
-# Removed the special FreeBSD treatment. The problem was that
with_gxx_include_path
-# often contains an i386 which is expanded as a macro.
-if test $GXX = yes; then
-AC_MSG_CHECKING([for g++ include path])
-if test -z $with_gxx_include_path; then
-with_gxx_include_path=`echo #include cstring | $CXX -E -xc++ -
2/dev/null | $SED -n '/.*1*\(.*\)\/cstring.*/s//\1/p' | head -n 1`
-if test $with_gxx_include_path = /usr/libexec/(null)/include; then
-with_gxx_include_path=/usr/include
-fi
-if echo $with_gxx_include_path | $GREP -q linux; then
-# workaround for Mandriva - issue 100049
-with_gxx_include_path=`cd -P $with_gxx_include_path pwd`
-fi
-fi
-dnl This is the original code...
-dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{
print \$2 }'`/include
-if test -z $with_gxx_include_path; then
-with_gxx_include_path=NO_GXX_INCLUDE
-AC_MSG_RESULT([none])
-else
-PathFormat $with_gxx_include_path
-with_gxx_include_path=$formatted_path
-AC_MSG_RESULT([$with_gxx_include_path])
-fi
-else
-with_gxx_include_path=NO_GXX_INCLUDE
-fi
-GXX_INCLUDE_PATH=$with_gxx_include_path
-AC_SUBST(GXX_INCLUDE_PATH)
-
-dnl ===
dnl Set the MinGW include directories
dnl ===
if test $WITH_MINGW = yes; then
@@ -4447,6 +4414,39 @@ fi
AC_SUBST(WITH_STLPORT)
dnl ===
+dnl gxx include directories needed by STLPort
+dnl ===
+# Removed the special FreeBSD treatment. The problem was that
with_gxx_include_path
+# often contains an i386 which is expanded as a macro.
+if test $GXX = yes; then
+AC_MSG_CHECKING([for g++ include path])
+if test -z $with_gxx_include_path; then
+with_gxx_include_path=`echo #include cstring | $CXX -E -xc++ -
2/dev/null | $SED -n '/.*1*\(.*\)\/cstring.*/s//\1/p' | head -n 1`
+if test $with_gxx_include_path = /usr/libexec/(null)/include; then
+with_gxx_include_path=/usr/include
+fi
+if echo $with_gxx_include_path | $GREP -q linux; then
+# workaround for Mandriva - issue 100049
+with_gxx_include_path=`cd -P $with_gxx_include_path pwd`
+fi
+fi
+dnl This is the original code...
+dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{
print \$2 }'`/include
+if test -z $with_gxx_include_path; then
+with_gxx_include_path=NO_GXX_INCLUDE
+AC_MSG_RESULT([none])
+else
+PathFormat $with_gxx_include_path
+with_gxx_include_path=$formatted_path
+AC_MSG_RESULT([$with_gxx_include_path])
+fi
+else
+with_gxx_include_path=NO_GXX_INCLUDE
+fi
+GXX_INCLUDE_PATH=$with_gxx_include_path
+AC_SUBST(GXX_INCLUDE_PATH)
+
+dnl ===
dnl thread-safe statics
dnl ===
AC_MSG_CHECKING([whether $CXX supports thread safe statics])
commit 7874eb15ee7b1be90570ea5a5b60004462979f08
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Apr 24 09:55:07 2012 +0200
do not cd get confused by symlinks
diff --git a/configure.in b/configure.in
index d8a1611..867a534 100644
--- a/configure.in
+++ b/configure.in
@@ -4270,7 +4270,7 @@ if test $GXX = yes; then
fi
if echo $with_gxx_include_path | $GREP -q linux; then
# workaround for Mandriva - issue 100049
-with_gxx_include_path=`cd $with_gxx_include_path pwd`
+with_gxx_include_path=`cd -P $with_gxx_include_path pwd`
fi
fi
dnl This is the original code...
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in test/Library_test.mk
configure.in |2 +- test/Library_test.mk |1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 1b62ccdcb5a44effe4f6f9de105d96fbbd18102d Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Apr 20 20:07:57 2012 +0200 it seems tests runtime-depend on ucpchelp1 too CppunitTest_sc_databaserangeobj can fail with 'UcbContentProviderProxy::getContentProvider - No provider for ´com.sun.star.help.XMLHelp.' diff --git a/test/Library_test.mk b/test/Library_test.mk index 571d26c..b795f8a 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -56,6 +56,7 @@ ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,test) : \ $(call gb_Library_get_target,desktop_detector) \ $(call gb_Library_get_target,vclplug_svp) \ +$(call gb_Library_get_target,ucpchelp1) \ endif commit 4be258a2f7aa10b781e2a67545d547cd6cac192a Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Apr 20 13:34:59 2012 +0200 fix typo diff --git a/configure.in b/configure.in index c3847c1..15d8ce6 100644 --- a/configure.in +++ b/configure.in @@ -966,7 +966,7 @@ AC_ARG_WITH(vba-package-format, means the api component and associated type library are part of the installation set. Specifying extn creates an uno extension that is part of the installation set (located in the program directory) that - MUST be optionly registered using either the unopkg executeable or the + MUST be optionally registered using either the unopkg executeable or the extension manager gui.]) [ Note: builtin is the default, extn can cause ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in sysui/desktop
configure.in|4 +++- sysui/desktop/share/launcher_unityquicklist.ulf | 23 +++ 2 files changed, 26 insertions(+), 1 deletion(-) New commits: commit 04ce0e891ecb9c4bb51fd19e9588ecb8613ac788 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Apr 18 13:14:07 2012 +0200 lp#720716: add unity quicklist support (add missed file) diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf b/sysui/desktop/share/launcher_unityquicklist.ulf new file mode 100644 index 000..d1b0c86 --- /dev/null +++ b/sysui/desktop/share/launcher_unityquicklist.ulf @@ -0,0 +1,23 @@ +[writer] +en-US = New Document + +[impress] +en-US = New Presentation + +[calc] +en-US = New Spreadsheet + +[base] +en-US = New Database + +[math] +en-US = New Formula + +[draw] +en-US = New Drawing + +[startcenter] +en-US = + +[javafilter] +en-US = commit 79e185898a577a2f90493f128628e559a481a374 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Apr 18 13:07:51 2012 +0200 update configure help for --enable-debug diff --git a/configure.in b/configure.in index 499cbf0..4f981fc 100644 --- a/configure.in +++ b/configure.in @@ -637,7 +637,9 @@ AC_ARG_ENABLE(debug, [Include debugging symbols from --enable-symbols plus extra debugging code. Extra large build! (enables -g compiler flag and dmake debug=true) If you need even more verbose output, build a module with - build -- debug=true dbglevel=2.])) + build -- debug=true dbglevel=2. You can also use this switch as follows: + --enable-debug=tl svx to enable debug only for the specified + gbuild-build libraries.])) AC_ARG_ENABLE(dbgutil, AS_HELP_STRING([--enable-dbgutil], ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) New commits: commit f9f8d9ac12979e7ec2f269e7f42f1408da9b6795 Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 09:57:19 2012 +0200 --enable-ext-languagetool requires --with-java now bit more sanely. diff --git a/configure.in b/configure.in index d1dff86..13cc862 100644 --- a/configure.in +++ b/configure.in @@ -9655,7 +9655,7 @@ dnl === dnl Test whether to include LanguageTool extension dnl === AC_MSG_CHECKING([for LanguageTool extension integration]) -if test x$enable_ext_languagetool = xyes -a x$enable_extension_integration != xno; then +if test x$enable_ext_languagetool = xyes -a x$enable_extension_integration != xno -a x$with_java != xno; then BUILD_TYPE=$BUILD_TYPE LANGUAGETOOL SCPDEFS=$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL AC_MSG_RESULT([yes]) commit a774c6e38503975fdeea165db914176ef1c9a3be Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 09:55:28 2012 +0200 Revert --enable-ext-languagetool requires --with-java This reverts commit 844b4520a9f0879d7b756654cef8fdbaa03a9000. diff --git a/configure.in b/configure.in index eb4e746..d1dff86 100644 --- a/configure.in +++ b/configure.in @@ -435,7 +435,7 @@ AC_ARG_ENABLE(ext-hunart, AC_ARG_ENABLE(ext-languagetool, AS_HELP_STRING([--enable-ext-languagetool], -[Enable the LanguageTool extension. Does not work --without-java.]) +[Enable the LanguageTool extension.]) ) AC_ARG_ENABLE(ext-mysql-connector, @@ -9656,9 +9656,6 @@ dnl Test whether to include LanguageTool extension dnl === AC_MSG_CHECKING([for LanguageTool extension integration]) if test x$enable_ext_languagetool = xyes -a x$enable_extension_integration != xno; then -if test -z $SOLAR_JAVA; then -AC_MSG_ERROR([--enable_ext_languagetool requires --with-java]) -fi BUILD_TYPE=$BUILD_TYPE LANGUAGETOOL SCPDEFS=$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL AC_MSG_RESULT([yes]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in scp2/source
configure.in |4 +++-
scp2/source/graphicfilter/module_graphicfilter.scp |3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6cc3499c777bfe07438a24b23bf79ea5c4c2cd74
Author: Rene Engelhard r...@debian.org
Date: Mon Apr 9 15:37:03 2012 +0200
fix mysqlcppconn version check
diff --git a/configure.in b/configure.in
index 090c4eb..24d55e4 100644
--- a/configure.in
+++ b/configure.in
@@ -6493,6 +6493,8 @@ if test $ENABLE_MYSQLC = YES; then
[AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++
Connectivity)], [])
AC_CHECK_LIB([mysqlcppconn], [main], [:],
[AC_MSG_ERROR(MySQL C++ Connectivity lib not found or
functional)], [])
+save_LDFLAGS=$LDFLAGS
+LDFLAGS=$LDFLAGS -lmysqlcppconn
AC_MSG_CHECKING([version])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include mysql_driver.h
@@ -6510,7 +6512,7 @@ int main(int argc, char **argv) {
]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need =
1.0.6])],[])
AC_LANG_POP([C++])
-
+LDFLAGS=$save_LDFLAGS
else
AC_MSG_RESULT([internal])
AC_MSG_CHECKING([for mysqlcppconn module])
commit 28f6fedd11aff6bf3b3579d9101e39560f83113f
Author: Rene Engelhard r...@debian.org
Date: Mon Apr 9 15:25:25 2012 +0200
actually add gid_File_Lib_CDRImport to gid_Module_Optional_Grfflt
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp
b/scp2/source/graphicfilter/module_graphicfilter.scp
index 984b247..dd66724 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -34,5 +34,6 @@ Module gid_Module_Optional_Grfflt
ParentID = gid_Module_Optional;
Default = YES;
Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
-gid_File_Lib_VisioImport,
gid_File_Share_Registry_Graphicfilter_Xcd);
+gid_File_Lib_VisioImport, gid_File_Lib_CDRImport,
+ gid_File_Share_Registry_Graphicfilter_Xcd);
End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit febdb8aeb7dbb07b7380808ce0cecfa7bb2b6101 Author: Tor Lillqvist t...@iki.fi Date: Fri Mar 30 09:39:07 2012 +0300 Use mktemp(1) more portably diff --git a/configure.in b/configure.in index dcfb3ec..face6c2 100644 --- a/configure.in +++ b/configure.in @@ -3654,7 +3654,7 @@ if test $_make_longver -ge 038200; then elif test $_make_longver -ge 038100; then AC_MSG_RESULT([$GNUMAKE $_make_version]) AC_MSG_CHECKING([for GNU make bug 20033]) -TESTGMAKEBUG20033=`mktemp -d` +TESTGMAKEBUG20033=`mktemp -d tmp.XX` cat $TESTGMAKEBUG20033/Makefile EOF A := \$(wildcard *.a) commit adf0076b56869d804fbdac774318e65ec0b28554 Author: Tor Lillqvist t...@iki.fi Date: Fri Mar 30 09:35:09 2012 +0300 Look for shasum (as on Mac OS X) too Hmm, /usr/bin/shasum is a Perl implementation (!), should we use openssl sha1 instead? diff --git a/configure.in b/configure.in index bed0180..dcfb3ec 100644 --- a/configure.in +++ b/configure.in @@ -3616,9 +3616,9 @@ AC_MSG_RESULT([no, obsolete]) dnl === dnl Search all the common names for sha1sum dnl === -AC_PATH_PROGS(SHA1SUM, sha1sum sha1) +AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum) if test -z $SHA1SUM; then -AC_MSG_ERROR([install sha1sum to run this script]) +AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this OS]) fi dnl === ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in sw/Module_sw.mk
configure.in|6 --
sw/Module_sw.mk |4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit b1c472c7021ebb85afdc5c4afd0e0fcd74ab15d9
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Mar 15 16:04:12 2012 +0100
do not leave temporary files after a configure check
diff --git a/configure.in b/configure.in
index f71014d..72b45b9 100644
--- a/configure.in
+++ b/configure.in
@@ -4495,13 +4495,15 @@ struct S2: S1int { virtual ~S2(); };
struct S3: S2 { virtual ~S3(); }; S3::~S3() {}
_ACEOF
gccvisinlineshiddenok=yes
-if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC
-fvisibility-inlines-hidden conftestlib1.cc -o lib1.so /dev/null 2/dev/null;
then
+if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC
-fvisibility-inlines-hidden conftestlib1.cc -o libconftest1.so /dev/null
2/dev/null; then
gccvisinlineshiddenok=no
else
-if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC
-fvisibility-inlines-hidden conftestlib2.cc -L. -l1 -Wl,-z,defs -o lib2.so
/dev/null 2/dev/null; then
+if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC
-fvisibility-inlines-hidden conftestlib2.cc -L. -lconftest1 -Wl,-z,defs -o
libconftest2.so /dev/null 2/dev/null; then
gccvisinlineshiddenok=no
fi
fi
+
+rm -f libconftest1.so libconftest2.so
AC_MSG_RESULT([$gccvisinlineshiddenok])
if test $gccvisinlineshiddenok = no; then
commit 2db82ffc1bdd5865e51932930bb5c4688e2de8a3
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Mar 15 16:00:02 2012 +0100
these writer unittests surely are slow
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 6ecc588..8cf4f39 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -48,12 +48,12 @@ $(eval $(call gb_Module_add_targets,sw,\
endif
$(eval $(call gb_Module_add_check_targets,sw,\
-CppunitTest_sw_filters_test \
-CppunitTest_sw_macros_test \
CppunitTest_sw_swdoc_test \
))
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
+CppunitTest_sw_filters_test \
+CppunitTest_sw_macros_test \
CppunitTest_sw_subsequent_rtftok \
))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in openssl/makefile.mk
configure.in|1 + openssl/makefile.mk |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 5eb87c7b6a3e8c6e1057c71cd623b005b6745467 Author: David Tardon dtar...@redhat.com Date: Tue Mar 6 09:16:03 2012 +0100 fix case diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 666a202..68fb409 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -138,7 +138,7 @@ UNAME=$(shell uname) .IF $(COM)==GCC PATCH_FILES=opensslmingw.patch -CONFIGURE_ACTION=$(PERL) configure +CONFIGURE_ACTION=$(PERL) Configure CONFIGURE_FLAGS=mingw shared INSTALL_ACTION=mv libcrypto.a libcrypto_static.a mv libcrypto.dll.a libcrypto.a mv libssl.a libssl_static.a mv libssl.dll.a libssl.a OUT2LIB = libcrypto_static.* commit 27eb7b93dc0f3db356d1836e66e03ee9fac716bf Author: David Tardon dtar...@redhat.com Date: Tue Mar 6 09:01:49 2012 +0100 mingw: pass --disable-ccache to build's configure diff --git a/configure.in b/configure.in index 49ce97f..f6a2367 100644 --- a/configure.in +++ b/configure.in @@ -3249,6 +3249,7 @@ if test $cross_compiling = yes; then test -n $PKG_CONFIG_FOR_BUILD export PKG_CONFIG=$PKG_CONFIG_FOR_BUILD cd CONF-FOR-BUILD sub_conf_opts= +test -n $enable_ccache sub_conf_opts=$sub_conf_opts --enable-ccache=$enable_ccache test -n $with_ant_home sub_conf_opts=$sub_conf_opts --with-ant-home=$with_ant_home test $with_java = no sub_conf_opts=$sub_conf_opts --without-java test $with_junit = no sub_conf_opts=$sub_conf_opts --without-junit ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 190ff38183b8d763234d32ae712a2298021a1a73 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 27 10:13:25 2012 +0200 Just call it Windows here, too diff --git a/configure.in b/configure.in index 5cbd236..a7da32b 100644 --- a/configure.in +++ b/configure.in @@ -6366,7 +6366,7 @@ if test x$enable_postgresql_sdbc != xno; then ;; WINNT) if test $with_krb5 = yes -o $with_gssapi = yes; then -AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft Windows.]) +AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Windows.]) fi ;; Linux|GNU|*BSD|DragonFly) commit 675cfeee6f66e265c696d539974a87e479b7b769 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 27 10:12:34 2012 +0200 Fix shell / test OR operator confusion diff --git a/configure.in b/configure.in index cc251d2..5cbd236 100644 --- a/configure.in +++ b/configure.in @@ -6365,7 +6365,7 @@ if test x$enable_postgresql_sdbc != xno; then fi ;; WINNT) -if test $with_krb5 = yes || $with_gssapi = yes; then +if test $with_krb5 = yes -o $with_gssapi = yes; then AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft Windows.]) fi ;; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit c35e81202cc709f3061e8b189af94e6858418940 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 10:28:39 2012 +0200 Wonder what integration means diff --git a/configure.in b/configure.in index aef0562..d7681d6 100644 --- a/configure.in +++ b/configure.in @@ -371,6 +371,12 @@ AC_SUBST(FONTCONFIG_TARBALL) # If there is extra dependency over configure options then the enable should # be automagic based on wether the requiring feature is enabled or not. # All this options change anything only with --enable-extension-integration. + +# The name of this option and its help string makes it sound as if +# extensions are built anyway, just not integrated in the installer, +# if you use --disable-extension-integration. Is that really the +# case? + AC_ARG_ENABLE(extension-integration, AS_HELP_STRING([--disable-extension-integration], [Disable integration of the built extensions in the installer of the commit e28c5b15d72f1982636e8853cbd7e8838bc93a04 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 10:24:33 2012 +0200 s/builded/built diff --git a/configure.in b/configure.in index a7da32b..aef0562 100644 --- a/configure.in +++ b/configure.in @@ -373,7 +373,7 @@ AC_SUBST(FONTCONFIG_TARBALL) # All this options change anything only with --enable-extension-integration. AC_ARG_ENABLE(extension-integration, AS_HELP_STRING([--disable-extension-integration], -[Disable integration of the builded extensions to the installer of the +[Disable integration of the built extensions in the installer of the product. Use this switch to disable the integration.]) ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in writerperfect/Module_writerperfect.mk
configure.in |3 +++ writerperfect/Module_writerperfect.mk | 29 + 2 files changed, 32 insertions(+) New commits: commit 9fb0ad21f467f6e8960e3559337f8ebdfa206ff9 Author: Tor Lillqvist t...@iki.fi Date: Tue Feb 28 00:29:14 2012 +0200 writerperfect depends on libwp[dgs], libcdr and libvisio Don't try to build libraries that depend on libraries we don't have. diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 4b2faad..dc2039c 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -28,13 +28,42 @@ $(eval $(call gb_Module_Module,writerperfect)) +ifneq (,$(filter YES,$(SYSTEM_LIBCDR))$(filter LIBCDR,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,writerperfect,\ Library_cdrimport \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) +ifneq (,$(filter YES,$(SYSTEM_LIBWPS))$(filter LIBWPS,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_msworks \ +)) +endif +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBVISIO))$(filter LIBVISIO,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_visioimport \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpft \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpgimport \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ StaticLibrary_writerperfect \ )) +endif # vim: set noet sw=4 ts=4: commit 44f3a76e979575a642373f3e1fb2db31612c5485 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 19:48:23 2012 +0200 libvisio depends on the LGPL libwpd and libwpg so bypass on iOS then diff --git a/configure.in b/configure.in index 8271431..e6e1205 100644 --- a/configure.in +++ b/configure.in @@ -5748,6 +5748,9 @@ if test $with_system_libvisio = yes; then AC_MSG_RESULT([external]) SYSTEM_LIBVISIO=YES PKG_CHECK_MODULES( VISIO, libvisio-0.0 ) +elif test $_os = iOS; then +# libvisio depends on libwpd and libwpg and those are LGPL +AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) SYSTEM_LIBVISIO=NO ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in moz/makefile.mk moz/patches solenv/gbuild
configure.in |6 +++--- moz/makefile.mk |1 - moz/patches/seamonkey-1.1.14.source-typeof.patch | 18 -- solenv/gbuild/platform/WNT_INTEL_GCC.mk |2 +- solenv/gbuild/platform/unxgcc.mk |2 +- 5 files changed, 5 insertions(+), 24 deletions(-) New commits: commit 5fd1a34816b81fee6f54ad93d0047daaeaea51c1 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Feb 24 13:25:32 2012 +0100 Revert Work around g++ -std=c++0x rejecting typeof keyword We now default to -std=gnu++0x, so this shouldn't be necessary. This reverts commit 437fe5a11f68d1848c49121394f16f09611b. diff --git a/moz/makefile.mk b/moz/makefile.mk index 4146f41..7f926e5 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -88,7 +88,6 @@ PATCH_FILES = \ patches/nss-linux3.patch \ patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \ patches/clang_missing_this_pointers.patch \ -patches/seamonkey-1.1.14.source-typeof.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/seamonkey-1.1.14.source-typeof.patch b/moz/patches/seamonkey-1.1.14.source-typeof.patch deleted file mode 100644 index 632e155..000 --- a/moz/patches/seamonkey-1.1.14.source-typeof.patch +++ /dev/null @@ -1,18 +0,0 @@ misc/mozilla/xpcom/base/nscore.h 2006-08-24 23:46:32.0 +0200 -+++ misc/build/mozilla/xpcom/base/nscore.h 2012-02-21 09:22:51.136057997 +0100 -@@ -211,9 +211,14 @@ - * when http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11893 is fixed. - */ - -+// At least g++ (GCC) 4.6.2 20111027 (Red Hat 4.6.2-1) with -std=c++0x no -+// longer recognizes typeof as a (GCC extension) keyword (an alternative fix -+// might be to check the GCC version, as the bug mentioned above is reportedly -+// fixed in GCC 4.4.3, see -+// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9381#c15): - #ifdef __GNUC__ - #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \ -- typeof(class::func) name -+ __typeof__(class::func) name - #else - #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \ - ret (NS_STDCALL class::*name) args commit 1cf7ab61a71d4b7295942ff5c855896e60c15081 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Feb 24 13:24:01 2012 +0100 use -std=gnu++0x rather than -std=c++0x The gcc default for C++ is -std=gnu++98, and -std=c++98 is used explicitly or with -ansi, so the C++0x default should be gnu++0x. diff --git a/configure.in b/configure.in index cefc6e8..9c24409 100644 --- a/configure.in +++ b/configure.in @@ -4333,9 +4333,9 @@ if test $GCC = yes; then AC_MSG_RESULT([no]) fi -AC_MSG_CHECKING([whether $CC supports -std=c++0x without Language Defect 757]) +AC_MSG_CHECKING([whether $CC supports -std=gnu++0x without Language Defect 757]) save_CXXFLAGS=$CXXFLAGS -CXXFLAGS=$CXXFLAGS -std=c++0x +CXXFLAGS=$CXXFLAGS -std=gnu++0x AC_LANG_PUSH([C++]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -6702,7 +6702,7 @@ if test $with_system_mdds = yes; then dnl === AC_MSG_CHECKING([which hash container mdds shall use]) if test x$HAVE_CXX0X = xTRUE; then -MDDS_CPPFLAGS=-std=c++0x +MDDS_CPPFLAGS=-std=gnu++0x AC_MSG_RESULT([std::unordered_map]) else MDDS_CPPFLAGS=-DMDDS_HASH_CONTAINER_BOOST diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 43d0d28..bf6155b 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -75,7 +75,7 @@ endif ifeq ($(HAVE_CXX0X),TRUE) # We can turn on additional useful checks with c++0x -# FIXME still does not compile fully gb_CXXFLAGS += -std=c++0x +# FIXME still does not compile fully gb_CXXFLAGS += -std=gnu++0x endif gb_LinkTarget_EXCEPTIONFLAGS += \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 51693c9..67871be 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -103,7 +103,7 @@ endif ifeq ($(HAVE_CXX0X),TRUE) #Currently, as well as for its own merits, c++11/c++0x mode allows use to use #a template for SAL_N_ELEMENTS to detect at compiler time its misuse -gb_CXXFLAGS += -std=c++0x +gb_CXXFLAGS += -std=gnu++0x #We have so many std::auto_ptr uses that we need to be able to disable #warnings for those so that -Werror continues to be useful, seeing as moving ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in python/makefile.mk python/Python-2.6.1-dylib_dynload.patch
configure.in| 54 ++--
python/Python-2.6.1-dylib_dynload.patch | 14
python/makefile.mk |2 -
3 files changed, 26 insertions(+), 44 deletions(-)
New commits:
commit 2484811c3a004d531a6c216c0cd8ff34f6fad68c
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 22 09:58:16 2012 +0100
Revert add dylib to the list of native python modules for Mac (for
pyuno.dylib)
This reverts those parts of commit f892f979ce17c70ccff5c802db17f24129628504
that add .dylib as an extension for native Python modules, which in turn was
obsoleted by 2ea723e8ce4077c7efa957d278637c4d9f32cf14 Revert 'Mac OS X uses
.dylib and not .so for python modules.' (and I verified on Mac OS X 10.6.8
that both LO's internal Pyton 2.6.1 and MacPort's python3.2 indeed import a
pyuno.so just fine).
There were additional modifications regarding pyversion stuff in the
original
commit f892f979ce17c70ccff5c802db17f24129628504 that appear unrelated and
which
I left intact.
diff --git a/python/Python-2.6.1-dylib_dynload.patch
b/python/Python-2.6.1-dylib_dynload.patch
deleted file mode 100644
index 3e44502..000
--- a/python/Python-2.6.1-dylib_dynload.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-add dylib to the extensions, to be able to load pyuno.dylib via import pyuno
misc/Python-2.6.1/Python/dynload_shlib.c 2006-01-04 02:30:17.0
+0100
-+++ misc/build/Python-2.6.1/Python/dynload_shlib.c 2011-06-11
19:42:09.0 +0200
-@@ -46,6 +46,10 @@
- {module.exe, rb, C_EXTENSION},
- {MODULE.EXE, rb, C_EXTENSION},
- #else
-+#ifdef __APPLE__
-+ {.dylib, rb, C_EXTENSION},
-+ {module.dylib, rb, C_EXTENSION},
-+#endif
- {.so, rb, C_EXTENSION},
- {module.so, rb, C_EXTENSION},
- #endif
diff --git a/python/makefile.mk b/python/makefile.mk
index 4f50ed3..be7fcbb 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -90,7 +90,7 @@ CONFIGURE_ACTION += --disable-ipv6
.ENDIF
.IF $(OS) == MACOSX
-PATCH_FILES+=Python-2.6.1-py8067.patch Python-2.6.1-dylib_dynload.patch
+PATCH_FILES+=Python-2.6.1-py8067.patch
# don't build dual-arch version as OOo itself is not universal binary either
PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch
commit b96b5aff2bfb4b0c4545e0a7f52679301dfcdb52
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 22 09:55:24 2012 +0100
Allow to override --with-python=system withh $PYTHON on Mac OS X
diff --git a/configure.in b/configure.in
index 22f6945..32186ac 100644
--- a/configure.in
+++ b/configure.in
@@ -5938,7 +5938,7 @@ internal)
AC_MSG_RESULT([internal])
;;
system)
-if test $_os = Darwin -a \( $with_macosx_version_min_required = 10.4 -o
$with_macosx_version_min_required = 10.5 \); then
+if test $_os = Darwin -a -z $PYTHON -a \(
$with_macosx_version_min_required = 10.4 -o
$with_macosx_version_min_required = 10.5 \); then
AC_MSG_ERROR([Cannot use system Python, the Python in Mac OS X
$with_macosx_version_min_required is incompatible with Python3-ified pyuno])
fi
AC_MSG_RESULT([system])
@@ -5963,13 +5963,29 @@ if test $cross_compiling = yes; then
enable_python=system
fi
else
-if test $enable_python = system; then
-# This causes an error if no python command is found
-# Note that this takes the system python called just python,
-# which isn't actually what we want on MacOSX when building
-# against the 10.6 SDK. But that shouldn't matter, we
-# select the correct python command manually below anyway.
-AM_PATH_PYTHON([2.6])
+if test $enable_python = system -a -z $PYTHON; then
+if test $_os = Darwin; then
+# We already have logic above to make sure the system Python
+# is used only when building against SDK 10.6 or newer.
+
+# Make sure we use the 2.6 Python when building against the
+# 10.6 SDK.
+case $with_macosx_sdk in
+10.6)
+python_version=2.6;;
+10.7)
+python_version=2.7;;
+*)
+# ???
+python_version=2.7;;
+esac
+PYTHON=python$python_version
+
PYTHON_CFLAGS=-I/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk/System/Library/Frameworks/Python.framework/Versions/${python_version}/include/python${python_version}
+PYTHON_LIBS=-framework Python
+else
+# This causes an error if no python command is found
+AM_PATH_PYTHON([2.6])
+fi
elif test $enable_python = auto; then
dnl This allows lack of system Python
AM_PATH_PYTHON([2.6],, [:])
@@ -5983,26 +5999,6 @@ else
fi
if test $enable_python = system; then
-if test $_os = Darwin; then
-# We already have logic above to make sure the system Python
-# is used only
[Libreoffice-commits] .: 2 commits - configure.in m4/mingw.m4
configure.in | 12 +++
m4/mingw.m4 | 90 ---
2 files changed, 62 insertions(+), 40 deletions(-)
New commits:
commit 0c128345eaa94686b67039346b7ce20ef43ab024
Author: David Tardon dtar...@redhat.com
Date: Tue Feb 21 13:41:37 2012 +0100
reintroduce hardcoded dll names as defaults
diff --git a/configure.in b/configure.in
index 12ce546..c099579 100644
--- a/configure.in
+++ b/configure.in
@@ -5651,7 +5651,7 @@ if test $with_system_expat = yes; then
[AC_MSG_ERROR(expat.h not found. install expat)], [])
AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
[AC_MSG_RESULT(expat library not found or functional.)], [])
-libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS],[libexpat-1.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_EXPAT=NO
@@ -5843,7 +5843,7 @@ if test $with_system_libxml = yes; then
AC_MSG_ERROR([xsltproc is required])
fi
-libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS],[libxslt-1.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=NO
@@ -5893,7 +5893,7 @@ if test $with_system_libxml = yes; then
AC_MSG_ERROR([xmllint is required])
fi
-libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS])
+libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS],[zlib1.dll
libxml2-2.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXML=NO
@@ -6694,7 +6694,7 @@ if test $with_system_curl = yes; then
;;
esac
-libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS],[libintl-8.dll
libidn-11.dll libnspr4.dll nssutil3.dll libplc4.dll libplds4.dll nss3.dll
ssl3.dll libgpg-error-0.dll libgcrypt-11.dll libssh2-1.dll libcurl-4.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_CURL=NO
@@ -7599,7 +7599,7 @@ if test $with_system_hunspell = yes; then
HUNSPELL_LIBS=-lhunspell
fi
AC_LANG_POP([C++])
-libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS],[libhunspell-1.3-0.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_HUNSPELL=NO
@@ -9794,7 +9794,7 @@ if test $enable_cairo_canvas = yes -a
$with_system_cairo = yes; then
AC_LANG_POP([C])
fi
fi
-libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS],[libfontconfig-1.dll
libfreetype-6.dll libpixman-1-0.dll libpng15-15.dll libcairo-2.dll])
else
AC_MSG_RESULT([no])
commit 743a56fcce564c461c4ad86ad55edb069cc764bc
Author: David Tardon dtar...@redhat.com
Date: Tue Feb 21 13:37:53 2012 +0100
allow to pass default dll list
diff --git a/m4/mingw.m4 b/m4/mingw.m4
index 952b2ed..35d638c 100644
--- a/m4/mingw.m4
+++ b/m4/mingw.m4
@@ -1,36 +1,25 @@
-# libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude])
+#
libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude],[?default-value])
# uses: CC, SED, WITH_MINGW
#
AC_DEFUN([libo_FIND_MINGW_EXTERNAL_DLLS],
[if test $WITH_MINGW = yes -a -n $CC; then
_libo_mingw_libdir=`$CC -print-sysroot`/mingw/lib
-for _libo_mingw_lib in $1; do
-_libo_mingw_lib=$_libo_mingw_libdir/$_libo_mingw_lib.la
-_libo_mingw_find_dll([$_libo_mingw_lib],[$3],[_libo_mingw_new_dll])
-if test -n $_libo_mingw_new_dll; then
-_libo_mingw_new_dlls=$_libo_mingw_new_dll
-fi
-
-
_libo_mingw_get_libtool_var([dependency_libs],[$_libo_mingw_lib],[_libo_mingw_dep_libs])
-for _libo_mingw_dep_lib in $_libo_mingw_dep_libs; do
-if test ${_libo_mingw_dep_lib%.la} != $_libo_mingw_dep_lib;
then
-_libo_mingw_new_dll=''
-
_libo_mingw_find_dll([$_libo_mingw_dep_lib],[$3],[_libo_mingw_new_dll])
-if test -n $_libo_mingw_new_dll; then
-_libo_mingw_new_dlls=$_libo_mingw_new_dlls
$_libo_mingw_new_dll
-fi
-fi
-done
-$2=$_libo_mingw_new_dlls
-done
+_libo_mingw_found_la=
+_libo_mingw_test_la([$1],[_libo_mingw_found_la],[$_libo_mingw_libdir])
+if test $_libo_mingw_found_la = yes; then
+_libo_mingw_find_dlls([$1],[$2],[$3],[$_libo_mingw_libdir])
+else
+# no .la files found, use defaults
+$2=$4
+fi
fi[]dnl
]) # libo_FIND_MINGW_EXTERNAL_DLLS
-# libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable])
+# libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable],[?default-value])
# uses: CC, SED, WITH_MINGW
#
AC_DEFUN([libo_ADD_MINGW_EXTERNAL_DLLS],
[Libreoffice-commits] .: 2 commits - configure.in jvmaccess/Library_jvmaccess.mk jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk README.cross unotest/Library_unoexceptionprotector.mk unotest/
README.cross |4 ++-- configure.in |2 +- jvmaccess/Library_jvmaccess.mk |7 +-- jvmfwk/Library_jvmfwk.mk |1 + jvmfwk/Library_sunjavaplugin.mk |1 + unotest/Library_unoexceptionprotector.mk |1 + unotest/Library_unotest.mk |1 + 7 files changed, 8 insertions(+), 9 deletions(-) New commits: commit 33b6af02195144875e9fa1a0663d55441aa3f5f4 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Feb 17 17:41:33 2012 +0200 We want gb_STDLIBS here surely? diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index 98bfb46..c7bddf2 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -45,14 +45,9 @@ $(eval $(call gb_Library_add_linked_libs,jvmaccess,\ cppu \ sal \ salhelper \ + $(gb_STDLIBS) \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,jvmaccess,\ -advapi32 \ -)) -endif - $(eval $(call gb_Library_add_exception_objects,jvmaccess,\ jvmaccess/source/classpath \ jvmaccess/source/unovirtualmachine \ diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index e58dade..5b424d0 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_api,jvmfwk,\ $(eval $(call gb_Library_add_linked_libs,jvmfwk,\ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) ifeq ($(OS),WNT) diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 734e564..d1d2af4 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ cppuhelper \ sal \ salhelper \ + $(gb_STDLIBS) \ )) ifeq ($(OS),ANDROID) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index 079574b..3324f3e 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_add_linked_libs,unoexceptionprotector,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,unoexceptionprotector,\ diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 9cfd371..aad6abd 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,unotest,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,unotest,\ commit 18f4ff23179620e834aa3ebd83a2e15c2f77cbe1 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Feb 17 13:54:25 2012 +0200 Recommend to use NDK r7b Drop compiler options -fexceptions -frtti for Android, I hope they are taken care of by the makefilery where needed. At least either -fexceptions or -fno-exceptions is used for each C++ compilation as far as I know. Not so sure about RTTI, let's see. diff --git a/README.cross b/README.cross index 2acd497..d2a8b14 100644 --- a/README.cross +++ b/README.cross @@ -322,7 +322,7 @@ Here is an autogen.lastrun for Android, when cross-compiling from Mac OS X: CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 ---with-android-ndk=/Users/tml/android-ndk-r7 +--with-android-ndk=/Users/tml/android-ndk-r7b --with-android-sdk=/Users/tml/android-sdk-macosx --build=x86_64-apple-darwin11 --disable-zenity @@ -338,7 +338,7 @@ And here is an autogen.lastrun for Android when cross-compiling from Linux: CC_FOR_BUILD=ccache gcc CXX_FOR_BUILD=ccache g++ ---with-android-ndk=/home/tml/android-ndk-r7 +--with-android-ndk=/home/tml/android-ndk-r7b --with-android-sdk=/home/tml/android-sdk-linux_x86 --with-ant-home=/opt/apache-ant-1.8.2 --build=x86_64-unknown-linux-gnu diff --git a/configure.in b/configure.in index 2459b76..486d061 100644 --- a/configure.in +++ b/configure.in @@ -111,7 +111,7 @@ if test -n $with_android_ndk; then ANDROIDCFLAGS=-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a test -z $CC CC=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc $ANDROIDCFLAGS - test -z $CXX CXX=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ $ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -fexceptions -frtti + test -z $CXX CXX=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ $ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include fi AC_SUBST(ANDROID_NDK_HOME)
[Libreoffice-commits] .: 2 commits - configure.in desktop/Executable_oosplash.mk desktop/Module_desktop.mk postprocess/packcomponents postprocess/packregistry scp2/source toolkit/Library_tk.mk vcl/hea
configure.in | 53 +++- desktop/Executable_oosplash.mk |2 desktop/Module_desktop.mk |7 + postprocess/packcomponents/makefile.mk | 11 +- postprocess/packregistry/makefile.mk |2 scp2/source/ooo/common_brand.scp |2 scp2/source/ooo/file_library_ooo.scp | 14 ++- scp2/source/ooo/file_ooo.scp |2 scp2/source/ooo/file_resource_ooo.scp |2 scp2/source/ooo/module_hidden_ooo.scp |2 toolkit/Library_tk.mk |2 vcl/Library_vcl.mk | 95 +-- vcl/Module_vcl.mk |6 + vcl/headless/headlessinst.cxx | 135 + vcl/inc/generic/gendata.hxx|3 vcl/inc/svsys.h|1 vcl/null/printerinfomanager.cxx|4 vcl/unx/generic/plugadapt/salplug.cxx |4 vcl/unx/generic/printer/ppdparser.cxx |2 vcl/vcl.headless.component | 40 + 20 files changed, 330 insertions(+), 59 deletions(-) New commits: commit c04e865ff6b48d49d7ae73479710f255135d80a6 Author: Michael Meeks michael.me...@suse.com Date: Fri Feb 17 16:43:41 2012 + vcl: simplify cut/paste shared module lists diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 3ac253d..3420f7d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -396,13 +396,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_add_defs,vcl,\ --DSAL_DLLPREFIX=\$(gb_Library_SYSPRE)\ \ --DSAL_DLLPOSTFIX=\$(gb_Library_OOOEXT)\ \ --D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \ -)) -$(eval $(call gb_Library_add_exception_objects,vcl,\ +vcl_generic_code=\ vcl/generic/app/gensys \ vcl/generic/app/geninst \ vcl/generic/app/gendisp \ @@ -423,7 +417,28 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/fontmanager/fontconfig \ vcl/generic/fontmanager/fontmanager \ vcl/generic/fontmanager/helper \ -vcl/generic/fontmanager/parseAFM \ +vcl/generic/fontmanager/parseAFM + +vcl_headless_code=\ +vcl/headless/svpbmp \ +vcl/headless/svpdummies \ +vcl/headless/svpelement \ +vcl/headless/svpframe \ +vcl/headless/svpgdi \ +vcl/headless/svpinst \ +vcl/headless/svpdata \ +vcl/headless/svpprn \ +vcl/headless/svptext \ +vcl/headless/svpvd + +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_add_defs,vcl,\ +-DSAL_DLLPREFIX=\$(gb_Library_SYSPRE)\ \ +-DSAL_DLLPOSTFIX=\$(gb_Library_OOOEXT)\ \ +-D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \ +)) +$(eval $(call gb_Library_add_exception_objects,vcl,\ + $(vcl_generic_code) \ vcl/unx/generic/plugadapt/salplug \ vcl/unx/generic/printer/cupsmgr \ vcl/unx/generic/printer/jobdata \ @@ -447,41 +462,12 @@ $(eval $(call gb_Library_add_defs,vcl,\ -D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \ )) $(eval $(call gb_Library_add_exception_objects,vcl,\ -vcl/generic/app/gensys \ -vcl/generic/app/geninst \ -vcl/generic/app/gendisp \ -vcl/generic/print/bitmap_gfx \ -vcl/generic/print/common_gfx \ -vcl/generic/print/glyphset \ -vcl/generic/print/printerjob \ -vcl/generic/print/psputil \ -vcl/generic/print/genpspgraphics \ -vcl/generic/print/genprnpsp \ -vcl/generic/print/text_gfx \ -vcl/generic/fontmanager/fontsubst \ -vcl/generic/glyphs/gcach_ftyp \ -vcl/generic/glyphs/gcach_layout \ -vcl/generic/glyphs/gcach_rbmp \ -vcl/generic/glyphs/glyphcache \ -vcl/generic/fontmanager/fontcache \ -vcl/generic/fontmanager/fontconfig \ -vcl/generic/fontmanager/fontmanager \ -vcl/generic/fontmanager/helper \ -vcl/generic/fontmanager/parseAFM \ + $(vcl_generic_code) \ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ vcl/null/printerinfomanager \ vcl/headless/headlessinst \ -vcl/headless/svpbmp \ -vcl/headless/svpdummies \ -vcl/headless/svpelement \ -vcl/headless/svpframe \ -vcl/headless/svpgdi \ -vcl/headless/svpinst \ -vcl/headless/svpdata \ -vcl/headless/svpprn \ -vcl/headless/svptext \ -vcl/headless/svpvd \ + $(vcl_headless_code) \ )) $(eval $(call gb_Library_add_linked_libs,vcl,\ @@ -507,41 +493,12 @@ $(eval $(call gb_Library_add_defs,vcl,\ -D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \ )) $(eval $(call gb_Library_add_exception_objects,vcl,\ -vcl/generic/app/gensys \ -vcl/generic/app/geninst \ -vcl/generic/app/gendisp \ -vcl/generic/print/bitmap_gfx \ -vcl/generic/print/common_gfx \ -vcl/generic/print/glyphset \ -vcl/generic/print/printerjob \ -vcl/generic/print/psputil \ -vcl/generic/print/genpspgraphics \ -vcl/generic/print/genprnpsp \ -vcl/generic/print/text_gfx \ -
[Libreoffice-commits] .: 2 commits - configure.in sw/source
configure.in |2 +- sw/source/ui/inc/FrameControl.hxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 5ba36c0e820e7ef32ea332d9be58441729f6993e Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 13 10:39:21 2012 +0200 Say MSVC build as that is what build_os = cygwin means diff --git a/configure.in b/configure.in index cdd09e3..2dbdd4e 100644 --- a/configure.in +++ b/configure.in @@ -10650,7 +10650,7 @@ AC_MSG_RESULT([$BUILD_NCPUS]) AC_SUBST(BUILD_NCPUS) # -# Set up ILIB for windows build +# Set up ILIB for MSVC build # if test $build_os = cygwin; then ILIB=.;$SRC_ROOT/solver/$INPATH/lib commit b7980663f0866629e7c54a085f31dba3d9c26b26 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 13 09:42:39 2012 +0200 WaE: type name first seen using 'class' now seen using 'struct' diff --git a/sw/source/ui/inc/FrameControl.hxx b/sw/source/ui/inc/FrameControl.hxx index cf887a9..53976f8 100644 --- a/sw/source/ui/inc/FrameControl.hxx +++ b/sw/source/ui/inc/FrameControl.hxx @@ -30,7 +30,7 @@ class SwEditWin; class SwFrm; -struct Point; +class Point; /** Class representing a control linked to a SwFrm. */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in Makefile
Makefile |2 ++
configure.in | 29 +
2 files changed, 31 insertions(+)
New commits:
commit 5582b7f129a4db4204107f2a38ac809684aa6893
Author: Rene Engelhard r...@debian.org
Date: Tue Feb 7 06:36:49 2012 +
add testtools to dmake_modules
diff --git a/Makefile b/Makefile
index 24b2a5b..38ed6fc 100644
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,7 @@ postgresql\
postprocess\
python\
pyuno\
+pyuno-py3\
rdbmaker\
readlicense_oo\
redland\
@@ -226,6 +227,7 @@ stlport\
stoc\
store\
sysui\
+testtools\
tomcat\
translations\
udm\
commit 8f06cc44149ca6be84b1cd8ce0f609d2dc3db346
Author: Rene Engelhard r...@debian.org
Date: Tue Feb 7 06:28:46 2012 +
configure.in: readd arch-detection for kFreeBSD
diff --git a/configure.in b/configure.in
index 7102f10..7910b2b 100644
--- a/configure.in
+++ b/configure.in
@@ -2820,6 +2820,35 @@ freebsd*)
SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
;;
+kfreebsd*)
+COM=GCC
+GUI=UNX
+GUIBASE=unx
+OS=LINUX
+
+case $host_cpu in
+
+i*86)
+CPU=I
+CPUNAME=INTEL
+OUTPATH=unxkfgi6
+;;
+x86_64)
+CPU=X
+CPUNAME=X86_64
+LIB64=lib64
+OUTPATH=unxkfgx6
+;;
+*)
+AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+;;
+esac
+SOLAREXTRALIB=-L../$LIB64
+SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
+SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
+SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
+;;
+
linux-gnu*)
COM=GCC
GUI=UNX
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in dbaccess/Module_dbaccess.mk reportdesign/Module_reportdesign.mk svx/prj sw/prj tail_build/prj
configure.in| 54 +--- dbaccess/Module_dbaccess.mk |4 ++ reportdesign/Module_reportdesign.mk |4 ++ svx/prj/build.lst |2 - sw/prj/build.lst|2 - tail_build/prj/build.lst|2 - 6 files changed, 37 insertions(+), 31 deletions(-) New commits: commit f8d30ec82d55f85a80ceda798a9e1a7ce0750035 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 6 14:29:18 2012 +0200 Attempt to disable database connectivity for iOS for now diff --git a/configure.in b/configure.in index 33facd8..f14d675 100644 --- a/configure.in +++ b/configure.in @@ -389,6 +389,11 @@ AC_ARG_ENABLE(ext-barcode, [Enable the Barcode extension.]) ) +AC_ARG_ENABLE(database-connectivity, +AS_HELP_STRING([--disable-database-connectivity], +[Disable various database connectivity.]) +) + AC_ARG_ENABLE(ext-diagram, AS_HELP_STRING([--enable-ext-diagram], [Enable the SmART Gallery (Diagram) extension.]) @@ -1996,6 +2001,22 @@ if test $_os != iOS -a $_os != Android; then BUILD_TYPE=$BUILD_TYPE DESKTOP fi +dnl Decide whether to build database connectivity stuff (including +dnl Base) or not. We probably don't want to on non-desktop OSes. + +if test -z $enable_database_connectivity; then +# Do enable database connectivity for Android for now as otherwise +# we presumably will get linking errors... We are not as far in +# the work for iOS, so we might as well disable it for iOS already. +if test $_os != iOS; then +enable_database_connectivity=yes +fi +fi + +if test $enable_database_connectivity = yes; then +BUILD_TYPE=$BUILD_TYPE DBCONNECTIVITY +fi + dnl === dnl Extra check for Windows. Cygwin builds need gcc to build dmake dnl although MSVC is used to build other build-time tools and @@ -6737,6 +6758,8 @@ if test $with_system_odbc = yes; then AC_CHECK_HEADER(sqlext.h, [], [AC_MSG_ERROR(odbc not found. install odbc)], []) +elif test $enable_database_connectivity != yes; then +AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) SYSTEM_ODBC_HEADERS=NO diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index b7788c1..88760ae 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Module_Module,dbaccess)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,dbaccess,\ AllLangResTarget_dba \ AllLangResTarget_dbmm \ @@ -48,4 +50,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ JunitTest_dbaccess_unoapi \ )) +endif + # vim: set noet sw=4 ts=4: diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index e72e430..854a822 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/reportdesign/Module_reportdesign.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Module_Module,reportdesign)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,reportdesign,\ AllLangResTarget_rpt \ AllLangResTarget_rptui \ @@ -42,4 +44,6 @@ $(eval $(call gb_Module_add_targets,reportdesign,\ JunitTest_reportdesign_complex \ )) +endif + # vim: set noet sw=4 ts=4: diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 6bdebb6..915bcc5 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,2 +1,2 @@ -sx svx : sfx2 TRANSLATIONS:translations oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL +sx svx : sfx2 TRANSLATIONS:translations oovbaapi DBCONNECTIVITY:connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL sx svx\prj nmake - all sx_prj NULL diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 42986b8..0ff450f 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,2 +1,2 @@ -sw sw :filter TRANSLATIONS:translations configmgr connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL +sw sw :filter TRANSLATIONS:translations configmgr DBCONNECTIVITY:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DBCONNECTIVITY:dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL sw sw\prj nmake - all sw_prj NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index ea551d5..5861359 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu
[Libreoffice-commits] .: 2 commits - configure.in postgresql/makefile.mk postgresql/postgresql-9.1.1-autoreconf.patch postgresql/postgresql-9.1.1-configure.patch postgresql/postgresql-libs-leak.patch
configure.in |8 postgresql/makefile.mk |9 postgresql/postgresql-9.1.1-autoreconf.patch | 326 postgresql/postgresql-9.1.1-configure.patch | 362 --- postgresql/postgresql-libs-leak.patch| 39 ++ 5 files changed, 369 insertions(+), 375 deletions(-) New commits: commit 3364fcc5a550fae001b24f4303a978662bb7c70f Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Feb 3 11:57:55 2012 +0100 enable Kerberos by default on DragonFly, too diff --git a/configure.in b/configure.in index 640a47b..6c255bb 100644 --- a/configure.in +++ b/configure.in @@ -6159,7 +6159,7 @@ if test x$enable_postgresql_sdbc != xno; then AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft Windows.]) fi ;; -Linux|GNU|*BSD) +Linux|GNU|*BSD|DragonFly) if test $with_krb5 != no; then WITH_KRB5=YES AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], commit d8b5d223877ea743f35424582284c15444e78a15 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Feb 3 11:56:48 2012 +0100 redo c16027de8423cdb6b33ce5f5f9e13fdc25b9dbeb cleaner Also align our configure.in to the changes Change source file (configure.in), not only generated file (configure) diff --git a/configure.in b/configure.in index d9979e2..640a47b 100644 --- a/configure.in +++ b/configure.in @@ -6143,7 +6143,7 @@ if test x$enable_postgresql_sdbc != xno; then # MacOS X has system MIT Kerberos 5 since 10.4 if test $with_krb5 != no; then WITH_KRB5=YES -AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err 'com_err -lssl -lcrypto'], [], +AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) @@ -6162,7 +6162,7 @@ if test x$enable_postgresql_sdbc != xno; then Linux|GNU|*BSD) if test $with_krb5 != no; then WITH_KRB5=YES -AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err 'com_err -lssl -lcrypto'], [], +AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) @@ -6176,7 +6176,7 @@ if test x$enable_postgresql_sdbc != xno; then *) if test $with_krb5 = yes; then WITH_KRB5=YES -AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err 'com_err -lssl -lcrypto'], [], +AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 44b7e6f..2d814bd 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -40,14 +40,9 @@ TARFILE_NAME=postgresql-9.1.1 TARFILE_MD5=061a9f17323117c9358ed60f33ecff78 PATCH_FILES=\ postgresql-moz-ldap.patch \ + postgresql-libs-leak.patch \ $(TARFILE_NAME)-libreoffice.patch \ - $(TARFILE_NAME)-autoreconf.patch \ -postgresql-9.1.1-configure.patch -# postgresql-9.1.1-configure.patch: move check for with_krb5 before with_gssapi, -# so that LIBS does not already contain -lgssapi_krb5 (which links against -# -lkrb5) when looking for symbols from -lkrb5, and within with_krb5, move -# com_err before krb5, so that looking with symbol com_err does not erroneously -# pick -lkrb5 (which links against -lcom_err) instead of -lcom_err + $(TARFILE_NAME)-autoreconf.patch .IF $(SYSTEM_POSTGRESQL) == YES @all: diff --git a/postgresql/postgresql-9.1.1-autoreconf.patch b/postgresql/postgresql-9.1.1-autoreconf.patch index 24e294a..ce91c51 100644 --- a/postgresql/postgresql-9.1.1-autoreconf.patch +++ b/postgresql/postgresql-9.1.1-autoreconf.patch @@ -1,6 +1,6 @@ diff --recursive -u misc/build/postgresql-9.1.1/configure misc/build/postgresql-9.1.1.patched/configure --- misc/build/postgresql-9.1.1/configure 2011-09-22 23:57:57.0 +0200 -+++
[Libreoffice-commits] .: 2 commits - configure.in README.cross
README.cross | 68 --- configure.in |2 - 2 files changed, 29 insertions(+), 41 deletions(-) New commits: commit c4feba9af53831a7bb1ff4765b4294ce0b6ea613 Author: Tor Lillqvist tlillqv...@suse.com Date: Sun Jan 22 10:18:47 2012 +0200 Wash my hands diff --git a/README.cross b/README.cross index 67fb1d4..f3c62b2 100644 --- a/README.cross +++ b/README.cross @@ -1,20 +1,16 @@ Cross-compiling LibreOffice === -Notes on cross-compiling LibreOffice, originally written by Tor -Lillqvist tlillqv...@suse.com t...@iki.fi in May, 2011, for later -history see git log. - -My cross-compilation experimentation is going on for four platforms: -Windows, iOS, Android and PowerPC Mac OS X. I work on the master -branch of LibreOffice. Some other people have talked about setting up -a separate branch for Android work, or even separate clones at -github. I am not interested in that. +The cross-compilation experimentation is going on for four platforms: +Windows, iOS, Android and PowerPC Mac OS X. It happens in the master +branch of LibreOffice. Some people have talked about setting up a +separate branch for Android work, or even separate clones at github, +but that is not necessary. Cross-compilation of LibreOffice completely is not possible yet. Much work has been done, baby steps for some platforms, much more for others, but a lot remains. For iOS and Android this work is highly -experimental, originally done in my spare time just for the hacking +experimental, originally done in spare time just for the hacking pleasure. No promise, explicit or implied, is given that it will ever be finished. @@ -64,27 +60,27 @@ Windows --- There is some support in LibreOffice already (from OpenOffice.org) for -building it locally on Windows with the GNU tool-chain (MinGW). But as -far as I know, that work has never attempted cross-compilation. +building it locally on Windows with the GNU tool-chain +(MinGW). Apparently, that work has never attempted cross-compilation. This OOo-originated MinGW support attempts to support both running Cygwin gcc in its -mno-cygwin mode, and a native MinGW compiler. The -mno-cygwin mechanism in the Cygwin gcc is rapidly being obsoleted, if -it isn't already, and I have not attempted to try to keep it working; -in fact I have activly cleaned out mechanisms related to this. Ditto +it isn't already, and we have not attempted to try to keep it working; +in fact we have activly cleaned out mechanisms related to this. Ditto for native MinGW. If one compiles natively on Windows, just use Microsoft's compiler. OOo/LO has been built for Windows all the time using that. -In my opinion, the only case where it makes sense to use MinGW is for +The only case where it makes sense to use MinGW is for cross-compilation. There is just too much crack on Windows anyway, and it is a semi-miracle (well, make that the result of years of work) that the MSVC build under Cygwin works as nicely as it does. MinGW is available as cross-build toolchains pre-packaged in more or -less official packages for many Linux distros including Debian, Fedora, -openSUSE and SLE. Personally I use the mingw32 packages in the Open -Build Service, running on openSUSE: +less official packages for many Linux distros including Debian, +Fedora, openSUSE and SLE. For instance the mingw32 packages in the +Open Build Service, running on openSUSE: http://download.opensuse.org/repositories/windows:/mingw:/win32/ @@ -119,8 +115,8 @@ that's likely to be fixed in the openSUSE project. It is somewhat unclear how well thought-out the conditionals and code for MinGW inside the OOo-originated code in LibreOffice actually -are. What I have noticed of it seems a bit randomish, with -copy-pasting having been preferred to factoring out differences. +are. It often seems a bit randomish, with copy-pasting having been +preferred to factoring out differences. Most of the configuration settings are maintained in the distro-configs/LibreOfficeMinGW.conf file, so in your autogen.lastrun, @@ -239,7 +235,7 @@ TODO: - much of the stuff currently relies on --with-system-*, and consequently on the mingw32-* openSUSE packages; might be good to be able to build with as few dependencies as possible - but that is low -prio I think +prio - profiling - when all the above is sorted out, we should look at the speed of @@ -273,9 +269,9 @@ how UNO is implemented and used. None of that has been spared much thought yet. The Apple tool-chain for iOS cross-building is available only for -Mac OS X, so that is where I have been doing it. +Mac OS X. -Here is my autogen.lastrun for iOS (device): +Here is an autogen.lastrun for iOS (device): CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++ -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk CC=ccache
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7afa76599cf0c9256e2dc85709f8cb2f1ac76282 Merge: 1684f1c... 799f2de... Author: Thomas Klausner w...@netbsd.org Date: Sun Jan 22 12:29:04 2012 +0100 Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/core commit 1684f1cb1a7ca155e613d3da4e2c168e9618e62a Author: Thomas Klausner w...@netbsd.org Date: Sun Jan 22 12:28:08 2012 +0100 Use more portable `=' comparison operator instead of `=='. diff --git a/configure.in b/configure.in index 3be6798..84beec3 100644 --- a/configure.in +++ b/configure.in @@ -9696,7 +9696,7 @@ dnlthis should be unified into using only one version for both AC_MSG_CHECKING([whether to use the system libjpeg]) -if test $SYSTEM_JPEG == YES; then +if test $SYSTEM_JPEG = YES; then SYSTEM_LIBJPEG=YES AC_MSG_RESULT([yes]) else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 6796128fbeea7b2cd71e99123bf86b56c23efd18 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Jan 19 11:43:58 2012 +0200 Don't point to non-existent directories in JAVA_LIB diff --git a/configure.in b/configure.in index 50f895c..f9a889e 100644 --- a/configure.in +++ b/configure.in @@ -4989,7 +4989,10 @@ esac if test -n $JAVA_ARCH ; then JRE_BASE_DIR=$JAVA_HOME/jre/lib/$JAVA_ARCH -JAVALIB=-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/$JAVA_TOOLKIT -L $JRE_BASE_DIR/native_thread +JAVALIB=-L $JAVA_HOME/$LIB64 +test -d $JRE_BASE_DIR JAVALIB=$JAVALIB -L $JRE_BASE_DIR +test -d $JRE_BASE_DIR/$JAVA_TOOLKIT JAVALIB=$JAVALIB -L $JRE_BASE_DIR/$JAVA_TOOLKIT +test -d $JRE_BASE_DIR/native_thread JAVALIB=$JAVALIB -L $JRE_BASE_DIR/native_thread fi AC_SUBST(x_JAVALIB) commit d199ce626d491d6c95e467bad60b4bb1c8b9f8c0 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Jan 19 11:30:36 2012 +0200 Google calls armel just arm diff --git a/configure.in b/configure.in index 24d6652..50f895c 100644 --- a/configure.in +++ b/configure.in @@ -4927,7 +4927,7 @@ linux-androideabi*) case $host_cpu in -armel) +arm|armel) JAVA_ARCH=arm JAVA_TOOLKIT=server ;; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in solenv/gbuild
configure.in |1 + solenv/gbuild/platform/macosx.mk |5 + 2 files changed, 6 insertions(+) New commits: commit 122940aba7392bfba17b04a4c166b28ebbc3bd1f Author: Norbert Thiebaud nthieb...@gmail.com Date: Sat Dec 17 18:11:49 2011 -0600 do not package pything scripting extension when building --with-python=no diff --git a/configure.in b/configure.in index 1772116..40cf257 100644 --- a/configure.in +++ b/configure.in @@ -7690,6 +7690,7 @@ dnl Scripting provider for Python extension? dnl We always provide this unless we have disabled Python completely if test $enable_python = no; then ENABLE_SCRIPTING_PYTHON=NO +SCPDEFS=$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_PYTHON else ENABLE_SCRIPTING_PYTHON=YES fi commit 8c0242d3a9689ff1c75693bd506b276f8fca75b3 Author: Norbert Thiebaud nthieb...@gmail.com Date: Sat Dec 17 18:11:18 2011 -0600 do not run cppunit on Mac when cross-compiling diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 3c8329b..f1187cc 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -339,7 +339,12 @@ endef # CppunitTest class +ifeq ($(CROSS_COMPILING),YES) +gb_CppunitTest_CPPTESTPRECOMMAND := : +else gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) +endif + gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in filter/Configuration_filter.mk filter/source libcdr/makefile.mk libcdr/prj postprocess/packcomponents RepositoryExternal.mk Repository.mk scp2/source
Repository.mk|1 RepositoryExternal.mk| 27 configure.in | 22 filter/Configuration_filter.mk |2 filter/source/config/fragments/filters/CorelDrawDocument.xcu | 13 filter/source/config/fragments/types/draw_CorelDraw_Document.xcu | 12 libcdr/makefile.mk | 67 ++ libcdr/prj/build.lst |3 libcdr/prj/d.lst |5 postprocess/packcomponents/makefile.mk |1 scp2/source/graphicfilter/file_graphicfilter.scp |2 set_soenv.in | 19 writerperfect/Library_cdrimport.mk | 69 ++ writerperfect/Module_writerperfect.mk|1 writerperfect/prj/build.lst |2 writerperfect/source/cdrimp/CDRImportFilter.cxx | 280 ++ writerperfect/source/cdrimp/CDRImportFilter.hxx | 117 writerperfect/source/cdrimp/cdrimport_genericfilter.cxx | 68 ++ writerperfect/util/cdrfilter.component |8 19 files changed, 710 insertions(+), 9 deletions(-) New commits: commit dd8b86ea55a69dbb211294e9cf5b65e2a39b3c8d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Dec 8 12:34:09 2011 +0100 CDR importer: fixing some build and esthetic issues diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index ae2789a..c09c663 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -545,7 +545,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s draw8_template \ draw_WordPerfect_Graphics \ draw_Visio_Document \ - draw_CDR_Document \ + draw_CorelDraw_Document \ ) $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\ diff --git a/filter/source/config/fragments/filters/CorelDrawDocument.xcu b/filter/source/config/fragments/filters/CorelDrawDocument.xcu index 7de8ac1..1f3a3c4 100644 --- a/filter/source/config/fragments/filters/CorelDrawDocument.xcu +++ b/filter/source/config/fragments/filters/CorelDrawDocument.xcu @@ -7,7 +7,7 @@ value xml:lang=x-defaultCorel Draw/value /prop prop oor:name=FileFormatVersionvalue0/value/prop -prop oor:name=Typevaluedraw_CDR_Document/value/prop +prop oor:name=Typevaluedraw_CorelDraw_Document/value/prop prop oor:name=TemplateName/ prop oor:name=DocumentServicevaluecom.sun.star.drawing.DrawingDocument/value/prop /node diff --git a/filter/source/config/fragments/types/draw_CDR_Document.xcu b/filter/source/config/fragments/types/draw_CDR_Document.xcu deleted file mode 100644 index 5b07b62..000 --- a/filter/source/config/fragments/types/draw_CDR_Document.xcu +++ /dev/null @@ -1,12 +0,0 @@ -node oor:name=draw_CDR_Document oor:op=replace -prop oor:name=DetectServicevaluecom.sun.star.comp.Draw.CDRImportFilter/value/prop -prop oor:name=URLPattern/ -prop oor:name=Extensionsvaluecdr/value/prop -prop oor:name=MediaTypevalueapplication/vnd.corel-draw/value/prop -prop oor:name=Preferredvaluetrue/value/prop -prop oor:name=PreferredFiltervalueCorel Draw Document/value/prop -prop oor:name=UIName -valueCorel Draw/value -/prop -prop oor:name=ClipboardFormat/ -/node diff --git a/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu b/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu new file mode 100644 index 000..d13a8fc --- /dev/null +++ b/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu @@ -0,0 +1,12 @@ +node oor:name=draw_CorelDraw_Document oor:op=replace +prop oor:name=DetectServicevaluecom.sun.star.comp.Draw.CDRImportFilter/value/prop +prop oor:name=URLPattern/ +prop oor:name=Extensionsvaluecdr/value/prop +prop oor:name=MediaTypevalueapplication/vnd.corel-draw/value/prop +prop oor:name=Preferredvaluetrue/value/prop +prop oor:name=PreferredFiltervalueCorel Draw Document/value/prop +prop oor:name=UIName +valueCorel Draw/value +/prop +prop oor:name=ClipboardFormat/ +/node diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index ce9e91d..c076512 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -45,17 +45,17 @@ TARGET=visio .IF $(SYSTEM_LIBWPD) == YES INCPRE+=$(WPD_CFLAGS) .ELSE
[Libreoffice-commits] .: 2 commits - configure.in connectivity/prj connectivity/source postgresql/makefile.mk postgresql/prj
configure.in | 44 +++
connectivity/prj/build.lst |2
connectivity/source/drivers/postgresql/makefile.mk |7 +
postgresql/makefile.mk | 81 +
postgresql/prj/build.lst |3
postgresql/prj/d.lst |7 +
6 files changed, 127 insertions(+), 17 deletions(-)
New commits:
commit 44ec239eba3b652fc8dbe1e0eb66c7f9ed018137
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Dec 1 21:59:09 2011 +0100
Internal libpq (PostgreSQL client lib)
diff --git a/configure.in b/configure.in
index 796c5f1..890ec7b 100644
--- a/configure.in
+++ b/configure.in
@@ -5403,7 +5403,7 @@ dnl
===
if test x$enable_ext_postgresql_sdbc = xyes -a
x$enable_extension_integration != xno; then
SCPDEFS=$SCPDEFS -DWITH_EXTENSION_POSTGRESQL
-AC_MSG_CHECKING([for PostgreSQL prerequisites])
+AC_MSG_CHECKING([PostgreSQL C interface])
if test $with_system_postgresql = yes; then
AC_MSG_RESULT([external PostgreSQL])
SYSTEM_POSTGRESQL=YES
@@ -5420,27 +5420,33 @@ if test x$enable_ext_postgresql_sdbc = xyes -a
x$enable_extension_integrati
POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
POSTGRESQL_LIB=-L$(${PGCONFIG} --libdir)
else
-SYSTEM_POSTGRESQL=NO
if test -n $with_libpq_path; then
+SYSTEM_POSTGRESQL=YES
AC_MSG_RESULT([external libpq])
POSTGRESQL_LIB=-L${with_libpq_path}/lib/
POSTGRESQL_INC=-I${with_libpq_path}/include/
else
-AC_MSG_ERROR([not given. Please specify either
--with-system-postgresql or --with-libpq-path])
+SYSTEM_POSTGRESQL=NO
+AC_MSG_RESULT([internal])
+POSTGRESQL_LIB=
+POSTGRESQL_INC=@@OVERRIDE_ME@@
+BUILD_TYPE=$BUILD_TYPE POSTGRESQL
fi
fi
-AC_MSG_CHECKING([for PostgreSQL C interface])
-save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
-CPPFLAGS=${CPPFLAGS} ${POSTGRESQL_INC}
-LIBS=${LIBS} ${POSTGRESQL_LIB}
-AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])],
[])
-AC_CHECK_LIB(pq, PQconnectdbParams, [],
-[AC_MSG_ERROR(libpq not found or too old. Need = 9.0)], [])
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+if test ${SYSTEM_POSTGRESQL} = YES; then
+AC_MSG_NOTICE([checking system PostgreSQL prerequisites])
+save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LIBS=$LIBS
+CPPFLAGS=${CPPFLAGS} ${POSTGRESQL_INC}
+LIBS=${LIBS} ${POSTGRESQL_LIB}
+AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is
needed])], [])
+AC_CHECK_LIB(pq, PQconnectdbParams, [],
+[AC_MSG_ERROR(libpq not found or too old. Need = 9.0)], [])
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LIBS=$save_LIBS
+fi
BUILD_POSTGRESQL_SDBC=YES
fi
AC_SUBST(BUILD_POSTGRESQL_SDBC)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index dae3499..fd358fa 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn connectivity:shell TRANSLATIONS:translations comphelper MOZ:moz
svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg
NSS:nss LIBXSLT:libxslt NULL
+cn connectivity:shell TRANSLATIONS:translations comphelper MOZ:moz
POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb
qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
cn connectivityusr1- all cn_mkout
NULL
cn connectivity\incnmake - all cn_inc NULL
cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all
cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/source/drivers/postgresql/makefile.mk
b/connectivity/source/drivers/postgresql/makefile.mk
index e498981..615b26b 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -101,11 +101,18 @@ SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
# LEM 17/11/2011: removed everything except libpq proper;
# as per instructions in libpq documentation.
# If it turns out the rest was needed, reenable it.
+.IF $(SYSTEM_POSTGRESQL)==YES
.IF $(GUI)==WNT
LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib
.ELSE
LIBPQ_LINK=-lpq #-lcrypt
.ENDIF
+.ELSE #SYSTEM_POSTGRESQL==NO
+LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a
+POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql
+POSTGRESQL_LIB=
+.ENDIF
+
SHL2TARGET=postgresql-sdbc-impl.uno
LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
LIB2OBJFILES= \
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
new file mode 100644
index 000..d75b0de
---
[Libreoffice-commits] .: 2 commits - configure.in scp2/source solenv/bin
configure.in |1 + scp2/source/base/folderitem_base.scp |2 ++ scp2/source/calc/folderitem_calc.scp |2 ++ scp2/source/draw/folderitem_draw.scp |2 ++ scp2/source/impress/folderitem_impress.scp |2 ++ scp2/source/math/folderitem_math.scp |2 ++ scp2/source/writer/folderitem_writer.scp |2 ++ solenv/bin/modules/installer/windows/property.pm |4 ++-- 8 files changed, 15 insertions(+), 2 deletions(-) New commits: commit 37676d162c29331c9f6235cf51406db8aaf8dfba Author: Andras Timar ati...@suse.com Date: Mon Nov 21 10:05:00 2011 +0100 only one launcher icon for silent MSI diff --git a/configure.in b/configure.in index 49d3b8e..eebcc78 100644 --- a/configure.in +++ b/configure.in @@ -8468,6 +8468,7 @@ if test z$enable_silent_msi = z -o z$enable_silent_msi = zno ; then else AC_MSG_RESULT([yes]) ENABLE_SILENT_MSI=TRUE +SCPDEFS=$SCPDEFS -DENABLE_SILENT_MSI fi AC_SUBST(ENABLE_SILENT_MSI) diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 671bd93..c21c2a8 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sbase Name = %PRODUCTNAME Base; ModuleID = gid_Module_Prg_Base_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sbase Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End +#endif diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 782d135..f77258a 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Scalc Name = %PRODUCTNAME Calc; ModuleID = gid_Module_Prg_Calc_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Scalc Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End +#endif diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index a07f710..1fe1de2 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sdraw Name = %PRODUCTNAME Draw; ModuleID = gid_Module_Prg_Draw_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sdraw Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End +#endif diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index 98954f1..31c56ad 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Simpress Name = %PRODUCTNAME Impress; ModuleID = gid_Module_Prg_Impress_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Simpress Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End +#endif diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 609de29..3ad3b07 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Smath Name = %PRODUCTNAME Math; ModuleID = gid_Module_Prg_Math_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Smath Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH); End +#endif diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp index 1fe448d..946ae65 100644 --- a/scp2/source/writer/folderitem_writer.scp +++ b/scp2/source/writer/folderitem_writer.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Swriter Name = %PRODUCTNAME Writer; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Swriter Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER); End +#endif commit 5fc21e87b9bcc55a542c4e675f4b78cc578026d1 Author: Andras Timar ati...@suse.com Date: Mon Nov 21 09:58:55 2011 +0100 in perl there are no barewords for true/false diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index ee33596..1e6e921 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -480,7 +480,7 @@ sub update_property_table my $propertyfile = installer::files::read_file($properyfilename); -my $hasarpnomodify = false; +my $hasarpnomodify = 0; # Getting the new values # Some values (arpcomments, arpcontacts, ...) are inserted from the
[Libreoffice-commits] .: 2 commits - configure.in desktop/unx
configure.in |2 +-
desktop/unx/source/start.c |5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 2264f482e57e989e649934d3980368f2b135d496
Author: Tomas Chvatal tchva...@suse.cz
Date: Tue Nov 15 12:34:12 2011 +0100
Use proper switch for on/of qstart-libpng.
diff --git a/configure.in b/configure.in
index 34400e7..6ae1fbb 100644
--- a/configure.in
+++ b/configure.in
@@ -7013,7 +7013,7 @@ AC_SUBST(LIBPNG_LIBS)
AC_SUBST(LIBPNG_CFLAGS)
AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
-if test x$enable_unix_libpng = xyes; then
+if test x$unix_qstart_libpng != xno; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
commit 4fe54ea11ed82dd662d0132585c199ec9f3a6c95
Author: Tomas Chvatal tchva...@suse.cz
Date: Tue Nov 15 12:33:49 2011 +0100
Instead of returning out of function just skip its calling.
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 940a997..6152e4c 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -697,9 +697,6 @@ static void extend_library_path (const char *new_element)
static void
exec_javaldx (Args *args)
{
-#ifndef SOLAR_JAVA
-return;
-#endif
char newpath[4096];
sal_uInt32 nArgs;
rtl_uString *pApp;
@@ -858,8 +855,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
exec_pagein (args);
/* javaldx */
+#ifdef SOLAR_JAVA
if (!args-bInhibitJavaLdx)
exec_javaldx (args);
+#endif
do
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in README.cross
README.cross | 23 ++- configure.in |2 +- 2 files changed, 15 insertions(+), 10 deletions(-) New commits: commit 768567e9591cda9bd1345efb1a7eb414c386b8aa Author: Tor Lillqvist t...@iki.fi Date: Fri Nov 11 08:59:11 2011 +0200 No accessible system libxslt for iOS diff --git a/configure.in b/configure.in index a6192a8..421289b 100644 --- a/configure.in +++ b/configure.in @@ -1031,7 +1031,7 @@ AC_ARG_WITH(system-libwpg, AC_ARG_WITH(system-libxml, AS_HELP_STRING([--with-system-libxml], [Use libxml/libxslt already on system.]),, - [if test $_os = Darwin -o $_os = iOS; then + [if test $_os = Darwin; then with_system_libxml=yes else with_system_libxml=$with_system_libs commit c71d50459e8f761843171eae8961f66a563c6465 Author: Tor Lillqvist t...@iki.fi Date: Fri Nov 11 07:52:01 2011 +0200 Update iOS examples diff --git a/README.cross b/README.cross index 9af4de7..6878cf9 100644 --- a/README.cross +++ b/README.cross @@ -278,26 +278,31 @@ The Apple tool-chain for iOS cross-building is available only for Mac OS X, so that is where I have been doing it. Here is my autogen.lastrun for iOS (device): -CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk -CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk -CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 +CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++ -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk +CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk +CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 +CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-distro=LibreOfficeiOS --with-external-tar=/Volumes/ooo/git/master/src --with-num-cpus=1 --with-max-jobs=1 +--without-help +--without-helppack-integration +--without-myspell-dicts And here for the iOS simulator: -CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk -CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk -CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 +CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++ -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk +CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk +CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 +CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-distro=LibreOfficeiOS --with-external-tar=/Volumes/ooo/git/master/src --with-num-cpus=1 --with-max-jobs=1 ---disable-librsvg --enable-debug +--without-help +--without-helppack-integration +--without-myspell-dicts Android ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in RepositoryExternal.mk set_soenv.in vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk
RepositoryExternal.mk | 28
configure.in|4
set_soenv.in|2 ++
vcl/Library_vclplug_gtk.mk | 15 +--
vcl/Library_vclplug_gtk3.mk | 17 -
5 files changed, 39 insertions(+), 27 deletions(-)
New commits:
commit 337b07d872e903cdc5f4411d76aca873567eee81
Author: David Tardon dtar...@redhat.com
Date: Wed Nov 2 13:04:19 2011 +0100
use external
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 2e1983e..e2f9b8d 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -41,20 +41,6 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\
-DVERSION=\$(UPD)$(LAST_MINOR)\ \
))
-ifneq ($(ENABLE_DBUS),)
-# FIXME: pkg-config calls should be done in configure, and this should be
_use_external
-$(eval $(call gb_Library_set_include,vclplug_gtk,\
- $$(INCLUDE) \
- $(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \
-))
-$(eval $(call gb_Library_add_defs,vclplug_gtk,\
--DENABLE_DBUS \
-))
-$(eval $(call gb_Library_add_libs,vclplug_gtk,\
-$(shell pkg-config --libs dbus-glib-1)\
-))
-endif
-
$(eval $(call gb_Library_add_api,vclplug_gtk,\
offapi \
udkapi \
@@ -84,6 +70,7 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
))
$(eval $(call gb_Library_use_externals,vclplug_gtk,\
+ dbus \
gtk \
gthread \
icule \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 72e7a75..9c589ff 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -51,19 +51,6 @@ $(eval $(call gb_Library_add_api,vclplug_gtk3,\
udkapi \
))
-ifneq ($(ENABLE_DBUS),)
-$(eval $(call gb_Library_set_include,vclplug_gtk3,\
- $$(INCLUDE) \
- $(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \
-))
-$(eval $(call gb_Library_add_defs,vclplug_gtk3,\
--DENABLE_DBUS \
-))
-$(eval $(call gb_Library_add_libs,vclplug_gtk3,\
-$(shell pkg-config --libs dbus-glib-1)\
-))
-endif
-
$(eval $(call gb_Library_add_libs,vclplug_gtk3,\
$$(GTK3_LIBS) \
$$(GTHREAD_LIBS) \
@@ -92,6 +79,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_use_externals,vclplug_gtk,\
+ dbus \
+))
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/a11y/gtk3atkaction \
vcl/unx/gtk3/a11y/gtk3atkbridge \
commit 1b717cee8c7e9d321dc8fdbfb47719cbd9b6c870
Author: David Tardon dtar...@redhat.com
Date: Wed Nov 2 13:00:48 2011 +0100
export DBUS_{CFLAGS,LIBS}
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index db8138c..8891d6b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -646,6 +646,34 @@ $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
endef
+
+ifeq ($(ENABLE_DBUS),YES)
+
+define gb_LinkTarget__use_dbus
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(DBUS_CFLAGS) \
+)
+
+$(call gb_Library_add_defs,$(1),\
+-DENABLE_DBUS \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(DBUS_LIBS) \
+)
+
+endef
+
+else # ENABLE_DBUS
+
+define gb_LinkTarget__use_dbus
+
+endef
+
+endif # ENABLE_DBUS
+
+
define gb_LinkTarget__use_dbusmenugtk
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
diff --git a/configure.in b/configure.in
index 6052587..a260a0a 100644
--- a/configure.in
+++ b/configure.in
@@ -6985,6 +6985,8 @@ GTK_CFLAGS=
GTK_LIBS=
ENABLE_SYSTRAY_GTK=
ENABLE_DBUS=
+DBUS_CFLAGS=
+DBUS_LIBS=
if test $test_gtk = yes; then
if test $ENABLE_GTK = TRUE ; then
@@ -7027,6 +7029,8 @@ AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTHREAD_CFLAGS)
AC_SUBST(GTHREAD_LIBS)
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG=TRUE,
ENABLE_QUICKSTART_LIBPNG= )
AC_SUBST(LIBPNG_LIBS)
diff --git a/set_soenv.in b/set_soenv.in
index dc2d996..2505e19 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1530,6 +1530,8 @@ ToFile( COMMONS_LOGGING_JAR,@COMMONS_LOGGING_JAR@,e
);
ToFile( SYSTEM_SERVLETAPI, @SYSTEM_SERVLETAPI@, e );
ToFile( SERVLETAPI_JAR,@SERVLETAPI_JAR@, e );
ToFile( ENABLE_DBUS, @ENABLE_DBUS@, e );
+ToFile( DBUS_CFLAGS, @DBUS_CFLAGS@, e );
+ToFile( DBUS_LIBS, @DBUS_LIBS@,e );
ToFile( ENABLE_GCONF, @ENABLE_GCONF@, e );
ToFile( ENABLE_GNOMEVFS, @ENABLE_GNOMEVFS@, e );
ToFile( ENABLE_GSTREAMER, @ENABLE_GSTREAMER@, e );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in sal/qa
configure.in | 116 ---
sal/qa/osl/module/osl_Module.cxx | 45 ---
2 files changed, 50 insertions(+), 111 deletions(-)
New commits:
commit 0ca1973c7c97e62c727484ea66adef26fa2f8162
Author: Tomas Chvatal tchva...@suse.cz
Date: Wed Oct 5 13:11:49 2011 +0200
Drop test that require tmp with exec rights.
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index c8fed7d..0a0a37e 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -291,54 +291,9 @@ namespace osl_Module
CPPUNIT_ASSERT_MESSAGE( #test comment#: load function should do
the same thing as constructor with library name.,
sal_True == bRes );
}
-// load lib which is under a CJK directory
-void load_002( )
-{
-#if defined( UNX ) !defined( MACOSX ) !defined( FREEBSD )
-// TODO: Find out why this fails on Mac OS X
-//Can not get a CJK directory already exist, so here create one.
Perhaps reason is encoding problem.
-::rtl::OUString aPidDirURL =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///tmp/)) +
::rtl::OUString::valueOf( ( long )getpid( ) );
-::rtl::OUString aMyDirURL = aPidDirURL + aKname;
-createTestDirectory( aPidDirURL );
-createTestDirectory( aMyDirURL );
-
-::rtl::OUString aDLLURL = aMyDirURL +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/libModule_DLL.so));
-//check if the lib exist.
-//FIXME: if assert condition is false, the case will return, so
the directory will not be clean-up
-CPPUNIT_ASSERT_MESSAGE( #Source file is not exist. please
manually clean-up directory and file under /tmp, ifFileExist( getDllURL( ) )
== sal_True );
-::osl::FileBase::RC nError = ::osl::File::copy( getDllURL( ),
aDLLURL );
-CPPUNIT_ASSERT_MESSAGE( #copy failed. please manually clean-up
directory and file under /tmp, nError == ::osl::FileBase::E_None );
-//ifFileExist returned false but the file exist
-CPPUNIT_ASSERT_MESSAGE( #This file is not exist, copy failed.
please manually clean-up directory and file under /tmp, ifFileExist( aDLLURL )
== sal_True );
-
-//test if can create a normal file
-::rtl::OUString aFileURL = aMyDirURL +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/test_file));
-::osl::File testFile( aFileURL );
-nError = testFile.open( osl_File_OpenFlag_Create );
-CPPUNIT_ASSERT_MESSAGE( #create failed. please manually clean-up
directory and file under /tmp, nError == ::osl::FileBase::E_None );
-CPPUNIT_ASSERT_MESSAGE( #This file is not exist, create failed.
please manually clean-up directory and file under /tmp, ifFileExist( aFileURL
) == sal_True );
-
-//load the copied dll
-::osl::Module aMod( aDLLURL );
-::osl::Module aMod1;
-
-sal_Bool bOK = aMod1.load( aDLLURL );
-bRes = oslModule(aMod) == oslModule(aMod1);
-aMod.unload( );
-aMod1.unload( );
-deleteTestFile( aFileURL );
-deleteTestFile( aDLLURL );
-deleteTestDirectory( aMyDirURL );
-deleteTestDirectory( aPidDirURL );
-
-CPPUNIT_ASSERT_MESSAGE( #test comment#: load lib which is under a
CJK directory.,
-sal_True == bRes bOK == sal_True );
-#endif
-}
SAL_CPPUNIT_TEST_SUITE( load );
CPPUNIT_TEST( load_001 );
-CPPUNIT_TEST( load_002 );
SAL_CPPUNIT_TEST_SUITE_END( );
}; // class load
commit e9cc0d9cabb6df2ec956be026970042cc3dbd70a
Author: Tomas Chvatal tchva...@suse.cz
Date: Tue Oct 4 11:02:22 2011 +0200
Use simpler detection for system/internal libs.
diff --git a/configure.in b/configure.in
index 9ba7653..21a1a5e 100644
--- a/configure.in
+++ b/configure.in
@@ -685,8 +685,8 @@ AC_ARG_WITH(external-thes-dir,
AC_ARG_WITH(system-libs,
AS_HELP_STRING([--with-system-libs],
-[Use libraries already on system -- enables all --with-system-* flags
except
- mozilla, libvisio, libexttextcat and translate-toolkit.]),
+[Use C/C++ libraries already on system -- enables all --with-system-*.
+ Except mozilla libs.]),
,)
AC_ARG_WITH(system-headers,
@@ -698,9 +698,7 @@ AC_ARG_WITH(system-headers,
AC_ARG_WITH(system-jars,
AS_HELP_STRING([--without-system-jars],
-[When building with --with-system-libs, also the needed jars are
expected
- on the system. Use this to disable that (except for the db case where
- --with-system-db *has to* imply using the db.jar from there, too).]),
+[Use Java packages already on system]),
,)
AC_ARG_WITH(system-zlib,
@@ -2280,7 +2278,7 @@ fi
dnl Set the ENABLE_WERROR variable. (Activate
[Libreoffice-commits] .: 2 commits - configure.in .gitignore
.gitignore |3 +++ configure.in |5 + 2 files changed, 8 insertions(+) New commits: commit 721bc1b42dc88b8bd5ddbfe0b9fdac8dbcb5fd95 Author: Tomas Chvatal tchva...@suse.cz Date: Mon Oct 3 12:16:21 2011 +0200 Add the libcmis switch to known flags. diff --git a/configure.in b/configure.in index 87c8627..49b7185 100644 --- a/configure.in +++ b/configure.in @@ -718,6 +718,11 @@ AC_ARG_WITH(system-expat, [Use expat already on system.]), ,) +AC_ARG_WITH(system-libcmis, +AS_HELP_STRING([--with-system-libcmis], +[Use libcmis already on system.]), +,) + AC_ARG_WITH(system-libvisio, AS_HELP_STRING([--with-system-libvisio], [Use libvisio already on system.]), commit b6d2ac014889f628942f1ffd32bb093421326298 Author: Tomas Chvatal tchva...@suse.cz Date: Mon Oct 3 12:15:18 2011 +0200 Add pspfontcache to gitignore. diff --git a/.gitignore b/.gitignore index f42c00a..8c0f62a 100644 --- a/.gitignore +++ b/.gitignore @@ -96,5 +96,8 @@ /solenv/gdb/libreoffice/*.py[co] /solenv/gdb/libreoffice/util/*.py[co] +# test output files +test/user-template/user/psprint/pspfontcache + # MSVC debug information /*/vc90.pdb ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in sw/source
configure.in |2 +-
sw/source/core/doc/docsort.cxx |2 +-
sw/source/ui/app/appopt.cxx|2 +-
sw/source/ui/app/docshini.cxx |2 +-
sw/source/ui/dbui/dbmgr.cxx|2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit cddea419b645c11819b9314acb95d8ea8df4fc98
Author: Tomas Chvatal tchva...@suse.cz
Date: Sat Sep 24 18:08:24 2011 +0200
Avoid ambiguous Locale type by specifying full path to sun::star... ; the
other definition is from ICU.
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 6a65b32..d76dcec 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -64,7 +64,7 @@ SwSortOptions* SwSortElement::pOptions = 0;
SwDoc* SwSortElement::pDoc = 0;
const FlatFndBox* SwSortElement::pBox = 0;
CollatorWrapper*SwSortElement::pSortCollator = 0;
-Locale* SwSortElement::pLocale = 0;
+com::sun::star::lang::Locale* SwSortElement::pLocale = 0;
String* SwSortElement::pLastAlgorithm = 0;
LocaleDataWrapper* SwSortElement::pLclData = 0;
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 6ab953e..689e875 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -161,7 +161,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
else
{
SvtLinguConfig aLinguCfg;
-Locale aLocale;
+com::sun::star::lang::Locale aLocale;
LanguageType nLang;
using namespace ::com::sun::star::i18n::ScriptType;
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index f2663d3..5c43206 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -138,7 +138,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference
embed::XStorage xStor )
SequenceLocale aLocales = aAsian.GetStartEndCharLocales();
if(aLocales.getLength())
{
-const Locale* pLocales = aLocales.getConstArray();
+const com::sun::star::lang::Locale* pLocales =
aLocales.getConstArray();
for(sal_Int32 i = 0; i aLocales.getLength(); i++)
{
ForbiddenCharacters aForbidden;
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 5ee9fca..2bdd83c 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1474,7 +1474,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference
XDataSource xSource,
uno::Reference XNumberFormats xDocNumberFormats =
xDocNumFmtsSupplier-getNumberFormats();
uno::Reference XNumberFormatTypes
xDocNumberFormatTypes(xDocNumberFormats, UNO_QUERY);
-Locale aLocale( MsLangId::convertLanguageToLocale(
(LanguageType)nLanguage ));
+com::sun::star::lang::Locale aLocale(
MsLangId::convertLanguageToLocale( (LanguageType)nLanguage ));
//get the number formatter of the data source
uno::ReferenceXPropertySet xSourceProps(xSource, UNO_QUERY);
commit 3a8c8537d1c8e03f3587a6823b2f6749b3115c46
Author: Tomas Chvatal tchva...@suse.cz
Date: Thu Sep 22 12:52:40 2011 +0200
For wiki-ext check also java and ext support.
diff --git a/configure.in b/configure.in
index 2359334..11f4681 100755
--- a/configure.in
+++ b/configure.in
@@ -7046,7 +7046,7 @@ if test $ENABLE_PRESENTER_SCREEN = YES -o
$ENABLE_MINIMIZER = YES -o $E
fi
AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
-AS_IF([test x$enable_ext_wiki_publisher = xyes], [
+AS_IF([test x$enable_ext_wiki_publisher = xyes -a -o
x$enable_extension_integration != xno -a $with_java != no], [
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([for swext module])
ENABLE_MEDIAWIKI=YES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
