[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit efe50300c45add25b513659308cdea70f6e4668f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 25 10:35:37 2013 +0100 Bump version to 0.0.25 diff --git a/configure.ac b/configure.ac index a353639..508e034 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.65]) # m4_define([libvisio_version_major],[0]) m4_define([libvisio_version_minor],[0]) -m4_define([libvisio_version_micro],[24]) +m4_define([libvisio_version_micro],[25]) m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro]) # = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac lo.xcent.in Makefile.in
Makefile.in | 14 -- configure.ac |2 +- lo.xcent.in | 15 +++ 3 files changed, 28 insertions(+), 3 deletions(-) New commits: commit 4783eea7269010910879ed3584b229d9492a2ddc Author: Tor Lillqvist t...@iki.fi Date: Sat Feb 2 23:25:56 2013 +0200 Experiment with sandboxing Change-Id: If491917069ef7c474c27190c4759dd75f025f032 diff --git a/Makefile.in b/Makefile.in index c0425f8..6565ab8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -324,7 +324,13 @@ install-strip: echo Installation finished, you can now execute: \ echo $(INSTALLDIR)/program/soffice -dev-install: build +ifeq ($(ENABLE_MACOSX_SANDBOX),YES) +entitlements:=--entitlements $(SRC_ROOT)/lo.xcent +endif + +dev-install: build do-dev-install + +do-dev-install: @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) @@ -363,6 +369,7 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) # Yeah, we don't bundle any other framework than our Python one, and # it has just one version, so this generic search is mostly for # completeness. +# for framework in `find $(DEVINSTALLDIR)/opt/LibreOffice.app -name '*.framework' -type d`; do \ for version in $$framework/Versions/*; do \ test -d $$version codesign --force --verbose --prefix=$(MACOSX_BUNDLE_IDENTIFIER). --sign $(MACOSX_CODESIGNING_IDENTITY) $$version; \ @@ -374,7 +381,10 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) # The soffice binary will have been signed after linking but it needs # to be re-signed as it has been renamed, or modified, or something # after linking. - codesign --force --verbose --sign $(MACOSX_CODESIGNING_IDENTITY) $(DEVINSTALLDIR)/opt/LibreOffice.app +# +# At this stage we also attach the entitlements in the sandboxing case +# + codesign --force --verbose --sign $(MACOSX_CODESIGNING_IDENTITY) $(entitlements) $(DEVINSTALLDIR)/opt/LibreOffice.app # endif @install-gdb-printers -L diff --git a/configure.ac b/configure.ac index 2a72b40..d5d6857 100644 --- a/configure.ac +++ b/configure.ac @@ -12381,7 +12381,7 @@ else echo config_host.mk.last fi -AC_CONFIG_FILES([config_host.mk Makefile solenv/inc/minor.mk instsetoo_native/util/openoffice.lst]) +AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk instsetoo_native/util/openoffice.lst]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_graphite.h]) diff --git a/lo.xcent.in b/lo.xcent.in new file mode 100644 index 000..5ed76f1 --- /dev/null +++ b/lo.xcent.in @@ -0,0 +1,15 @@ +?xml version=1.0 encoding=UTF-8? +!DOCTYPE plist PUBLIC -//Apple//DTD PLIST 1.0//EN http://www.apple.com/DTDs/PropertyList-1.0.dtd; +plist version=1.0 +dict + keycom.apple.application-identifier/key + string@MACOSX_BUNDLE_IDENTIFIER@/string + keycom.apple.security.app-sandbox/key + true/ + keycom.apple.security.files.user-selected.read-write/key + true/ + !-- usb needed for the apple_remote thingie... -- + keycom.apple.security.device.usb/key + true/ +/dict +/plist ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit e6093cff4776fde16a038fdd1d000ffbfc7b77b1
Author: Tor Lillqvist t...@iki.fi
Date: Sat Feb 2 12:38:13 2013 +0200
Clarify the different kinds of signing certificates (stackoverflow.com)
Change-Id: Ib0a7e74d394c3c5f7d2f3d7f5ba70bf6a714b604
diff --git a/configure.ac b/configure.ac
index 2c27d51..2a72b40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2720,9 +2720,13 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([whether to do code signing])
if test \( -z $enable_macosx_code_signing -o
$enable_macosx_code_signing = yes \) -a $MACOSX_SDK_VERSION -ge 1070; then
-# By default use the first suitable certificate. Not sure if should be
looking for the
-# 'Developer ID Application:' ones instead. The code signing stuff
could be much better
-# documented...
+# By default use the first suitable certificate (?).
+
+#
http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application
+# says that the Mac Developer certificate is useful just for
self-testing. For distribution
+# outside the Mac App Store, use the Developer ID Application one,
and for distribution in
+# the App Store, the 3rd Party Mac Developer one.
+
identity=`security find-identity -p codesigning -v 2/dev/null | grep
'Mac Developer:' | awk '{print $2}' |head -1`
if test -n $identity; then
MACOSX_CODESIGNING_IDENTITY=$identity
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 6719c7893ba89da2a5c9f45e1c258bb758e48876 Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 1 08:38:28 2013 +0200 Warn about 10.4 compatibility only as required for TDF builds After all, if somebody else wants to distribute builds that require something newer, they are allowed to. diff --git a/configure.ac b/configure.ac index 2c2d272..2862668 100644 --- a/configure.ac +++ b/configure.ac @@ -2608,14 +2608,14 @@ if test $_os = Darwin; then 10.4) ;; *) -AC_MSG_WARN([Building with a SDK 10.4 possibly breaks 10.4 compatibility. Do not use for deliverable build until verified that it really works]) -add_warning Building with a SDK 10.4 possibly breaks 10.4 compatibility. Do not use for deliverable build until verified that it really works +AC_MSG_WARN([Building with a SDK 10.4 possibly breaks 10.4 compatibility. Do not use for the TDF build]) +add_warning Building with a SDK 10.4 possibly breaks 10.4 compatibility. Do not use for the TDF build ;; esac ;; *) -AC_MSG_WARN([Building with a minimum version requirement 10.4 breaks 10.4 compatibility. Do not use for deliverable build]) -add_warning Building with a minimum version requirement 10.4 breaks 10.4 compatibility. Do not use for deliverable build +AC_MSG_WARN([Building with a minimum version requirement 10.4 breaks 10.4 compatibility. Do not use for the TDF build]) +add_warning Building with a minimum version requirement 10.4 breaks 10.4 compatibility. Do not use for the TDF build ;; esac fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit 165387b4e714d87ee080add6e45bc47fcde8e556 Author: David Ostrovsky da...@ostrovsky.org Date: Tue Jan 29 20:35:45 2013 +0100 WITH_LANG: add en-US if it is missing Change-Id: Ie12913691fa3d01bc7ad2fc0c108821d0937d250 Reviewed-on: https://gerrit.libreoffice.org/1919 Tested-by: Miklos Vajna vmik...@suse.cz Reviewed-by: Miklos Vajna vmik...@suse.cz diff --git a/configure.ac b/configure.ac index a18eed4..d3a2a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -11808,6 +11808,10 @@ for lang in $WITH_LANG; do AC_MSG_ERROR([invalid language: $lang; supported languages are: $ALL_LANGS]) fi done +if test -n $WITH_LANG -a $WITH_LANG != ALL; then +echo $WITH_LANG | grep -q en-US +test $? -ne 1 || WITH_LANG=`echo $WITH_LANG en-US` +fi # list with substituted ALL WITH_LANG_LIST=`echo $WITH_LANG | sed s/ALL/$ALL_LANGS/` test -z $WITH_LANG_LIST WITH_LANG_LIST=en-US ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac instsetoo_native/util
configure.ac| 378 ++-- instsetoo_native/util/openoffice.lst.in |2 2 files changed, 79 insertions(+), 301 deletions(-) New commits: commit 8d16259c3428c3badfe7d156546be05ab0796a9c Author: Mathias Michel m...@gmx.fr Date: Thu Dec 6 02:39:16 2012 +0100 Consolidated branding in configure Removed individual options (intro* and startcenter* + images) in favor of a folder with graceful fallback. Grouped progress bar intro settings in a text file into the branding folder Change-Id: Ib56b80e43c474a944ac79c0a842d66487e9f91d5 Reviewed-on: https://gerrit.libreoffice.org/1704 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/configure.ac b/configure.ac index d3a2a2c..eb0a434 100644 --- a/configure.ac +++ b/configure.ac @@ -1832,110 +1832,37 @@ dnl Branding dnl === AC_ARG_WITH(branding, -[ --with-brandingUse given path to retrieve all branding images. - Expects /path/intro.png ... - /path/backing_rtl_right.png to be there. Individual - images can be overridden via --with-intro-bitmap ... - --with-startcenter-rtl-left-bitmap switches. - - Usage: --with-branding=/path/to/images -],,) - -AC_ARG_WITH(intro-bitmap, -[ --with-intro-bitmapPrefer the specified intro bitmap over the - the default one. - - Usage: --with-intro-bitmap=/path/my_ooo_intro.png -],,) - -AC_ARG_WITH(intro-progressbar-color, -[ --with-intro-progressbar-colorSet color of progress bar on intro screen. - Comma separated RGB values in decimal format. - - Usage: --with-intro-progressbar-color=126,170,23 -],,) - -AC_ARG_WITH(intro-progressbar-size, -[ --with-intro-progressbar-size Set size of progress bar on intro screen. - Comma separated values in decimal format. - - Usage: --with-intro-progressbar-size=319,10 -],,) - -AC_ARG_WITH(intro-progressbar-position, -[ --with-intro-progressbar-position Set position of progress bar on intro screen. - Comma separated values in decimal format. - - Usage: --with-intro-progressbar-position=164,225 -],,) - -AC_ARG_WITH(intro-progressbar-frame-color, -[ --with-intro-progressbar-frame-colorSet color of progress bar frame on intro screen. - Comma separated RGB values in decimal format. - - Usage: --with-intro-progressbar-frame-color=207,208,211 -],,) - -AC_ARG_WITH(intro-progressbar-text-color, -AS_HELP_STRING([--with-intro-progressbar-text-color], -[Set color of progress bar text on intro screen. Comma separated RGB values in decimal format.]) -[ - Usage: --with-intro-progressbar-text-color=207,208,211 -],,) - -AC_ARG_WITH(intro-progressbar-text-baseline, -AS_HELP_STRING([--with-intro-progressbar-text-baseline], -[Set vertical position of progress bar text on intro screen. Value in decimal format.]) +AS_HELP_STRING([--with-branding], +[Use given path to retrieve branding images set.]) [ - Usage: --with-intro-progressbar-text-baseline=250 -],,) + Search for intro.png about.svg flat_logo.svg + backing_left.png backing_right.png + backing_rtl_left.png backing_rtl_right.png + backing_space.png. If any is missing, default + ones will be used instead. + + Search also progress.conf for progress + settings on intro screen : + + PROGRESSBARCOLOR=255,255,255 Set color of + progress bar. Comma separated RGB decimal values. + PROGRESSSIZE=407,6 Set size of progress bar. + Comma separated decimal values (width, height). + PROGRESSPOSITION=61,317 Set position of progress + bar from left,top. Comma separated decimal values. + PROGRESSFRAMECOLOR=20,136,3 Set color of progress + bar frame. Comma separated RGB decimal values. + PROGRESSTEXTCOLOR=255,255,255 Set color of progress + bar text. Comma separated RGB decimal values. + PROGRESSTEXTBASELINE=287 Set vertical position of + progress bar text from top. Decimal value. + + Default values will be used if not found.
[Libreoffice-commits] .: configure.ac
configure.ac |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 5f27719e4e501506b82bf095aa1b2b1aac5eb390 Author: Miklos Vajna vmik...@suse.cz Date: Wed Jan 30 21:04:28 2013 +0100 configure: better libstdc++ ABI breakage check The old code expected that gcc -dumpversion outputs x.y.z, but just x.y is also a valid output. Use the preprocessor defines instead, this way SUSE 4.7.2 gcc will use -std=gnu++0x as well. Change-Id: I9871b05953ab255c66dd152c0befd29037522902 diff --git a/configure.ac b/configure.ac index eb0a434..e49cc38 100644 --- a/configure.ac +++ b/configure.ac @@ -5558,10 +5558,17 @@ if test $GCC = yes; then AC_MSG_RESULT([no]) fi +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#if __GNUC__ == 4 __GNUC_MINOR__ == 7 (__GNUC_PATCHLEVEL__ == 0 || __GNUC_PATCHLEVEL__ == 1) +#else +abi ok +#endif +]])],[HAVE_BROKEN_ABI=TRUE],[HAVE_BROKEN_ABI=FALSE]) + AC_MSG_CHECKING([whether $CXX supports C++11 without Language Defect 757]) # This should check libstdc++ version, not gcc, but clang has incidentally C++11 support # disabled in this case by the __float128 case below. -if test $GCCVER -ge 040700 -a $GCCVER -lt 040702; then +if test $HAVE_BROKEN_ABI = TRUE; then AC_MSG_NOTICE([Not using -std=gnu++0x on $CXX version 4.7.0/4.7.1 due to libstdc++ ABI breakage.]) else save_CXXFLAGS=$CXXFLAGS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9efe8c8f2b8339d8d5b477eb98a409797ce2cafb Author: Tomas Chvatal tchva...@suse.cz Date: Mon Jan 28 19:01:19 2013 +0100 Explicitely check for gtk when enabling telepathy This is needed in tubes. Change-Id: Ia77968a68da4e781c6e5d4c202b3e5f751f1c952 Signed-off-by: Tomas Chvatal tchva...@suse.cz Reviewed-on: https://gerrit.libreoffice.org/1904 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/configure.ac b/configure.ac index a1dbc23..a18eed4 100644 --- a/configure.ac +++ b/configure.ac @@ -9686,7 +9686,7 @@ if test $_os != WINNT -a $_os != Darwin -a $enable_telepathy = yes; ENABLE_TELEPATHY=TRUE AC_DEFINE(ENABLE_TELEPATHY) AC_MSG_RESULT([yes]) -PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 ) +PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 gtk+-2.0 = 2.4 ) else AC_MSG_RESULT([no]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac src/conv src/lib
configure.ac |9 - src/conv/raw/Makefile.am |6 +++--- src/conv/svg/Makefile.am |6 +++--- src/lib/Makefile.am |4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) New commits: commit 9ae7b703255feb022ebf4e9a8360d26ab43474e5 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 28 10:51:23 2013 +0100 A bit of cleanup of build system diff --git a/configure.ac b/configure.ac index 23d5e93..d0279b7 100644 --- a/configure.ac +++ b/configure.ac @@ -37,11 +37,18 @@ PKG_PROG_PKG_CONFIG([0.20]) # # Find additional apps # -PKG_CHECK_MODULES([LIBMSPUB],[ +PKG_CHECK_MODULES([WPD],[ libwpd-0.9 libwpd-stream-0.9 +]) +AC_SUBST(WPD_CFLAGS) +AC_SUBST(WPD_LIBS) + +PKG_CHECK_MODULES([WPG],[ libwpg-0.2 ]) +AC_SUBST(WPG_CFLAGS) +AC_SUBST(WPG_LIBS) # = # Find zlib diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am index 08ec6f3..26a41b5 100644 --- a/src/conv/raw/Makefile.am +++ b/src/conv/raw/Makefile.am @@ -1,14 +1,14 @@ bin_PROGRAMS = pub2raw -AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBMSPUB_CXXFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPG_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS) pub2raw_DEPENDENCIES = @PUB2RAW_WIN32_RESOURCE@ if STATIC_TOOLS -pub2raw_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.a $(LIBMSPUB_LIBS) @PUB2RAW_WIN32_RESOURCE@ +pub2raw_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.a $(WPD_LIBS) @PUB2RAW_WIN32_RESOURCE@ pub2raw_LDFLAGS = -all-static else -pub2raw_LDADD = ../../lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la $(LIBMSPUB_LIBS) @PUB2RAW_WIN32_RESOURCE@ +pub2raw_LDADD = ../../lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la $(WPD_LIBS) @PUB2RAW_WIN32_RESOURCE@ endif pub2raw_SOURCES = \ diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am index a19f2ca..52fa201 100644 --- a/src/conv/svg/Makefile.am +++ b/src/conv/svg/Makefile.am @@ -1,14 +1,14 @@ bin_PROGRAMS = pub2xhtml -AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBMSPUB_CXXFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPG_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS) pub2xhtml_DEPENDENCIES = @PUB2XHTML_WIN32_RESOURCE@ if STATIC_TOOLS -pub2xhtml_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.a $(LIBMSPUB_LIBS) @PUB2XHTML_WIN32_RESOURCE@ +pub2xhtml_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.a $(WPD_LIBS) @PUB2XHTML_WIN32_RESOURCE@ pub2xhtml_LDFLAGS = -all-static else -pub2xhtml_LDADD = ../../lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la $(LIBMSPUB_LIBS) @PUB2XHTML_WIN32_RESOURCE@ +pub2xhtml_LDADD = ../../lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la $(WPD_LIBS) @PUB2XHTML_WIN32_RESOURCE@ endif pub2xhtml_SOURCES = \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 463116d..b932314 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -11,9 +11,9 @@ libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_include_HEADERS = \ MSPUBDocument.h \ MSPUBStringVector.h -AM_CXXFLAGS = $(LIBMSPUB_CXXFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LIBADD = $(LIBMSPUB_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@ +libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@ libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_DEPENDENCIES = @LIBMSPUB_WIN32_RESOURCE@ libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no_undefined libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_SOURCES = \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac src/conv src/lib
configure.ac | 10 ++
src/conv/raw/Makefile.am | 10 +-
src/conv/svg/Makefile.am | 10 +-
src/lib/Makefile.am |4 ++--
4 files changed, 18 insertions(+), 16 deletions(-)
New commits:
commit 76e810ab718354fe9f246761876faff04951fc54
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jan 28 11:06:42 2013 +0100
Build cleanup
diff --git a/configure.ac b/configure.ac
index cf5d9bb..0c98560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,14 +41,20 @@ PKG_CHECK_MODULES([WPD],[
libwpd-0.9
libwpd-stream-0.9
])
+AC_SUBST(WPD_CFLAGS)
+AC_SUBST(WPD_LIBS)
PKG_CHECK_MODULES([WPG],[
libwpg-0.2
])
+AC_SUBST(WPG_CFLAGS)
+AC_SUBST(WPG_LIBS)
PKG_CHECK_MODULES([LCMS2],[
lcms2
])
+AC_SUBST(LCMS2_CFLAGS)
+AC_SUBST(LCMS2_LIBS)
# =
# Find zlib
@@ -226,10 +232,6 @@ AS_IF([test x$enable_debug = xyes], [
], [
DEBUG_CXXFLAGS=-DNDEBUG
])
-LIBCDR_CXXFLAGS=${WPD_CFLAGS} ${WPG_CFLAGS} ${LCMS2_CFLAGS}
-LIBCDR_LIBS=${WPD_LIBS} ${WPG_LIBS} ${LCMS2_LIBS}
-AC_SUBST(LIBCDR_CXXFLAGS)
-AC_SUBST(LIBCDR_LIBS)
AC_SUBST(DEBUG_CXXFLAGS)
#
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index f67ca45..9a9cffc 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,14 +1,14 @@
bin_PROGRAMS = cdr2raw cmx2raw
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBCDR_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS)
$(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
cdr2raw_DEPENDENCIES = @CDR2RAW_WIN32_RESOURCE@
if STATIC_TOOLS
-cdr2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CDR2RAW_WIN32_RESOURCE@
+cdr2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CDR2RAW_WIN32_RESOURCE@
cdr2raw_LDFLAGS = -all-static
else
-cdr2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CDR2RAW_WIN32_RESOURCE@
+cdr2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CDR2RAW_WIN32_RESOURCE@
endif
cdr2raw_SOURCES = \
@@ -17,10 +17,10 @@ cdr2raw_SOURCES = \
cmx2raw_DEPENDENCIES = @CMX2RAW_WIN32_RESOURCE@
if STATIC_TOOLS
-cmx2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CMX2RAW_WIN32_RESOURCE@
+cmx2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CMX2RAW_WIN32_RESOURCE@
cmx2raw_LDFLAGS = -all-static
else
-cmx2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CMX2RAW_WIN32_RESOURCE@
+cmx2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CMX2RAW_WIN32_RESOURCE@
endif
cmx2raw_SOURCES = \
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 0e5dfbd..6f0c65e 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,14 +1,14 @@
bin_PROGRAMS = cdr2xhtml cmx2xhtml
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBCDR_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS)
$(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
cdr2xhtml_DEPENDENCIES = @CDR2XHTML_WIN32_RESOURCE@
if STATIC_TOOLS
-cdr2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CDR2XHTML_WIN32_RESOURCE@
+cdr2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CDR2XHTML_WIN32_RESOURCE@
cdr2xhtml_LDFLAGS = -all-static
else
-cdr2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CDR2XHTML_WIN32_RESOURCE@
+cdr2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CDR2XHTML_WIN32_RESOURCE@
endif
cdr2xhtml_SOURCES = \
@@ -17,10 +17,10 @@ cdr2xhtml_SOURCES = \
cmx2xhtml_DEPENDENCIES = @CMX2XHTML_WIN32_RESOURCE@
if STATIC_TOOLS
-cmx2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CMX2XHTML_WIN32_RESOURCE@
+cmx2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CMX2XHTML_WIN32_RESOURCE@
cmx2xhtml_LDFLAGS = -all-static
else
-cmx2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CMX2XHTML_WIN32_RESOURCE@
+cmx2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CMX2XHTML_WIN32_RESOURCE@
endif
cmx2xhtml_SOURCES = \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index bff4ce3..69d7497 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -12,9 +12,9 @@
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
CDRStringVector.h \
CMXDocument.h
-AM_CXXFLAGS = $(LIBCDR_CXXFLAGS) $(ZLIB_CFLAGS)
[Libreoffice-commits] .: configure.ac
configure.ac | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) New commits: commit 9cacd76701360e30cbee2ccee61a3722b19b4531 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Sat Jan 26 16:59:36 2013 +0100 configure: accept building without themes If --with-theme=no is specified disallow any check for valid themes which would otherwise give an error. Change-Id: I45d2872145f3bd15e17beac4f69f8b4b1855d9a3 Reviewed-on: https://gerrit.libreoffice.org/1879 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/configure.ac b/configure.ac index dc13c15..7a29b48 100644 --- a/configure.ac +++ b/configure.ac @@ -10824,14 +10824,16 @@ if test x$with_theme = x -o x$with_theme = xyes; then fi WITH_THEMES= -for theme in $with_theme; do -case $theme in - crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;; -*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; -esac -WITH_THEMES=$WITH_THEMES $theme -SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'` -done +if test x$with_theme != xno; then +for theme in $with_theme; do +case $theme in + crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;; +*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; +esac +WITH_THEMES=$WITH_THEMES $theme +SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'` +done +fi AC_MSG_RESULT([$WITH_THEMES]) AC_SUBST([WITH_THEMES]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 715f2c8a7015676c26e009228a4197da14f929fa
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Sun Jan 27 12:30:00 2013 +0100
When running icu-config, get cxxflags too
diff --git a/configure.ac b/configure.ac
index 6aee4f3..446aa40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ PKG_CHECK_MODULES([ICU],[icu-i18n],[],[
AC_PATH_PROG([ICU_CONFIG],[icu-config])
AC_MSG_CHECKING([ICU installation])
if ${ICU_CONFIG} --cflags /dev/null 21; then
- ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath`
+ ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
ICU_LIBS=`${ICU_CONFIG} --ldflags`
AC_MSG_RESULT([found])
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 14d0efcd5387a26c8e364efbd4b7a6fd1f925194
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jan 28 06:36:10 2013 +0100
Check for icu CXXFLAGS in pkg-config branch too
diff --git a/configure.ac b/configure.ac
index 446aa40..cf5d9bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,16 +65,20 @@ AC_SUBST(ZLIB_LIBS)
#
# Find icu
#
-PKG_CHECK_MODULES([ICU],[icu-i18n],[],[
+AS_IF([test ${ICU_CFLAGS+set} = set],[
+ ICU_CFLAGS_overriden=yes],[
+ ICU_CFLAGS_overriden=no])
+PKG_CHECK_MODULES([ICU],[icu-i18n],[
+ AS_IF([test ${ICU_CFLAGS_overriden} = no], [
+ ICU_CFLAGS=${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n
--variable=CXXFLAGS`])
+ ], [
AC_PATH_PROG([ICU_CONFIG],[icu-config])
AC_MSG_CHECKING([ICU installation])
- if ${ICU_CONFIG} --cflags /dev/null 21; then
+ AS_IF([${ICU_CONFIG} --cflags /dev/null 21],[
ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
ICU_LIBS=`${ICU_CONFIG} --ldflags`
- AC_MSG_RESULT([found])
- else
- AC_MSG_ERROR([libicu config program icu-config not found])
- fi]
+ AC_MSG_RESULT([found])],[
+ AC_MSG_ERROR([libicu config program icu-config not found])])]
)
AC_SUBST(ICU_CFLAGS)
AC_SUBST(ICU_LIBS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 8e01e195d20dba9f32ee0954fd7e3374ac02f16a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jan 28 06:36:55 2013 +0100
Check for icu CXXFLAGS too
diff --git a/configure.ac b/configure.ac
index ddd0f71..885ce3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,16 +68,20 @@ AC_CHECK_HEADER(
#
# Find icu
#
-PKG_CHECK_MODULES([ICU],[icu-i18n],[],[
+AS_IF([test ${ICU_CFLAGS+set} = set],[
+ ICU_CFLAGS_overriden=yes],[
+ ICU_CFLAGS_overriden=no])
+PKG_CHECK_MODULES([ICU],[icu-i18n],[
+ AS_IF([test ${ICU_CFLAGS_overriden} = no], [
+ ICU_CFLAGS=${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n
--variable=CXXFLAGS`])
+ ], [
AC_PATH_PROG([ICU_CONFIG],[icu-config])
AC_MSG_CHECKING([ICU installation])
- if ${ICU_CONFIG} --cflags /dev/null 21; then
- ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath`
+ AS_IF([${ICU_CONFIG} --cflags /dev/null 21],[
+ ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
ICU_LIBS=`${ICU_CONFIG} --ldflags`
- AC_MSG_RESULT([found])
- else
- AC_MSG_ERROR([libicu config program icu-config not found])
- fi]
+ AC_MSG_RESULT([found])],[
+ AC_MSG_ERROR([libicu config program icu-config not found])])]
)
AC_SUBST(ICU_CFLAGS)
AC_SUBST(ICU_LIBS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
New commits:
commit be6b5a214a365dedb8351014a90604d30b3bd4ac
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Jan 24 10:10:49 2013 +0100
Detect ICU by pkg-config first and fallback on icu-config only after
diff --git a/configure.ac b/configure.ac
index 9ae19b8..ddd0f71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,15 +68,17 @@ AC_CHECK_HEADER(
#
# Find icu
#
-AC_PATH_PROG([ICU_CONFIG],[icu-config])
-AC_MSG_CHECKING([ICU installation])
-if ${ICU_CONFIG} --cflags /dev/null 21; then
- ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath`
- ICU_LIBS=`${ICU_CONFIG} --ldflags`
- AC_MSG_RESULT([found])
-else
- AC_MSG_ERROR([libicu config program icu-config not found])
-fi
+PKG_CHECK_MODULES([ICU],[icu-i18n],[],[
+ AC_PATH_PROG([ICU_CONFIG],[icu-config])
+ AC_MSG_CHECKING([ICU installation])
+ if ${ICU_CONFIG} --cflags /dev/null 21; then
+ ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath`
+ ICU_LIBS=`${ICU_CONFIG} --ldflags`
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_ERROR([libicu config program icu-config not found])
+ fi]
+)
AC_SUBST(ICU_CFLAGS)
AC_SUBST(ICU_LIBS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 535006f3657feb2a64b50fb879e73294ab726852
Author: Andras Timar ati...@suse.com
Date: Thu Jan 24 10:50:26 2013 +0100
fix MSM name for x64 in the VC90 case
Change-Id: I69ff4f69e3ef93ed36cdcda9c54513624e8c98d0
diff --git a/configure.ac b/configure.ac
index d8ef0d5..dc13c15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4962,21 +4962,27 @@ find_msms()
if test -e $msmdir/policy_9_0_Microsoft_VC90_CRT_x86.msm; then
msms=$msms policy_9_0_Microsoft_VC90_CRT_x86.msm
else
-AC_MSG_ERROR([Merge modules not found])
+AC_MSG_ERROR([Merge module policy_9_0_Microsoft_VC90_CRT_x86.msm
not found])
fi
fi
if test $BUILD_X64 = TRUE; then
-if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm; then
-msms=$msms Microsoft_VC${VCVER}_CRT_x64.msm
-else
-AC_MSG_ERROR([Failed to copy x64 merge modules])
-fi
if test $VCVER = 90; then
if test -e $msmdir/policy_9_0_Microsoft_VC90_CRT_x86_x64.msm; then
msms=$msms policy_9_0_Microsoft_VC90_CRT_x86_x64.msm
else
-AC_MSG_ERROR([Merge modules not found])
+AC_MSG_ERROR([Merge module
policy_9_0_Microsoft_VC90_CRT_x86_x64.msm not found])
+fi
+if test -e $msmdir/Microsoft_VC90_CRT_x86_x64.msm; then
+msms=$msms Microsoft_VC90_CRT_x86_x64.msm
+else
+AC_MSG_ERROR([Merge module Microsoft_VC90_CRT_x86_x64.msm not
found])
+fi
+else
+if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm; then
+msms=$msms Microsoft_VC${VCVER}_CRT_x64.msm
+else
+AC_MSG_ERROR([Merge module Microsoft_VC${VCVER}_CRT_x64.msm
not found])
fi
fi
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
New commits:
commit a5794f08635ef5f526e25c45542c9ac009a07757
Author: Andras Timar ati...@suse.com
Date: Wed Jan 23 16:02:25 2013 +0100
sort out msm finding/copying issues
Change-Id: Id54b9a480b345b52f86c53f6a0a939c18807ec05
diff --git a/configure.ac b/configure.ac
index c005756..7001d12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4959,11 +4959,7 @@ find_msms()
fi
msms=Microsoft_VC${VCVER}_CRT_x86.msm
-if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm; then
-msms=$msms Microsoft_VC${VCVER}_CRT_x64.msm
-else
-AC_MSG_WARN([Failed to copy x64 merge modules, installation will lack
the 64-bit Explorer extension])
-fi
+
if test $VCVER = 90; then
if test -e $msmdir/policy_9_0_Microsoft_VC90_CRT_x86.msm; then
msms=$msms policy_9_0_Microsoft_VC90_CRT_x86.msm
@@ -4971,6 +4967,21 @@ find_msms()
AC_MSG_ERROR([Merge modules not found])
fi
fi
+
+if test $BUILD_X64 = TRUE; then
+if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x86_x64.msm; then
+msms=$msms Microsoft_VC${VCVER}_CRT_x86_x64.msm
+else
+AC_MSG_ERROR([Failed to copy x64 merge modules])
+fi
+if test $VCVER = 90; then
+if test -e $msmdir/policy_9_0_Microsoft_VC90_CRT_x86_x64.msm; then
+msms=$msms policy_9_0_Microsoft_VC90_CRT_x86_x64.msm
+else
+AC_MSG_ERROR([Merge modules not found])
+fi
+fi
+fi
}
find_msvc_dlls()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 7a4275a142dcce310f63d50a0baa9fc067539580 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Jan 23 16:11:02 2013 +0100 Adapt configure --help output ...to 75e32e150133511d8f098a253a56426ed0302cec default to --without-help and --without-myspell-dicts. Change-Id: I018b8033f3a9d485b5cf5a9392719748426de53b diff --git a/configure.ac b/configure.ac index 7001d12..d2810fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1286,10 +1286,8 @@ AC_ARG_WITH(system-nss, [with_system_nss=$with_system_libs]) AC_ARG_WITH(myspell-dicts, -AS_HELP_STRING([--without-myspell-dicts], -[Removes myspell dictionaries from LibreOffice installation set, for - people building for specific distributions where the myspell dictionaries - are installed from other sources.]), +AS_HELP_STRING([--with-myspell-dicts], +[Adds myspell dictionaries to the LibreOffice installation set]), ,) AC_ARG_WITH(system-dicts, @@ -1711,8 +1709,8 @@ AC_ARG_WITH(jdk-home, ,) AC_ARG_WITH(help, -AS_HELP_STRING([--without-help], -[Disable the build of help.])) +AS_HELP_STRING([--with-help], +[Enable the build of help.])) AC_ARG_WITH(java, AS_HELP_STRING([--with-java], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 774dd42dd11142371e21c6842b53d72c13c2d0ef
Author: Peter Foley pefol...@verizon.net
Date: Wed Jan 23 19:12:37 2013 -0500
fix MSM name for x64
Change-Id: Idc81352de3d2a9550457e8f56fd819c0296fd2a8
diff --git a/configure.ac b/configure.ac
index d2810fd..d8ef0d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4967,8 +4967,8 @@ find_msms()
fi
if test $BUILD_X64 = TRUE; then
-if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x86_x64.msm; then
-msms=$msms Microsoft_VC${VCVER}_CRT_x86_x64.msm
+if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm; then
+msms=$msms Microsoft_VC${VCVER}_CRT_x64.msm
else
AC_MSG_ERROR([Failed to copy x64 merge modules])
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeiOS.conf distro-configs/LibreOfficeLinux.conf distro-co
configure.ac |4 ++-- distro-configs/LibreOfficeAndroid.conf|1 + distro-configs/LibreOfficeAndroidX86.conf |1 + distro-configs/LibreOfficeLinux.conf |2 ++ distro-configs/LibreOfficeMacOSX.conf |2 ++ distro-configs/LibreOfficeMinGW.conf |2 ++ distro-configs/LibreOfficeOpenBSD.conf|1 + distro-configs/LibreOfficeWin32.conf |2 ++ distro-configs/LibreOfficeWin64.conf |2 ++ distro-configs/LibreOfficeiOS.conf|2 ++ 10 files changed, 17 insertions(+), 2 deletions(-) New commits: commit 75e32e150133511d8f098a253a56426ed0302cec Author: Norbert Thiebaud nthieb...@gmail.com Date: Sun Jan 20 23:42:12 2013 -0600 default to --without-help and --without-myspell-dicts Updated the distro-configs so that the default change does not impact build based on distro profile The intent is that with this change of defaults the build does only rely on core and does not need any submodules. Making a initial build simpler for new dev, since they won't be exposed to submodules unless they really need them. Change-Id: I446e912d607ce7358fd11f54a3de025dc3f25144 Reviewed-on: https://gerrit.libreoffice.org/1791 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/configure.ac b/configure.ac index 7f001a6..23ebf23 100644 --- a/configure.ac +++ b/configure.ac @@ -4503,7 +4503,7 @@ fi AC_SUBST(DO_FETCH_TARBALLS) AC_MSG_CHECKING([whether to build help]) -if test $with_help != no -a $_os != iOS -a $_os != Android; then +if test $with_help = yes -a $_os != iOS -a $_os != Android; then AC_MSG_RESULT([yes]) BUILD_TYPE=$BUILD_TYPE HELP SCPDEFS=$SCPDEFS -DWITH_HELP @@ -4515,7 +4515,7 @@ fi dnl Test whether to include MySpell dictionaries dnl === AC_MSG_CHECKING([whether to include MySpell dictionaries]) -if test -z $with_myspell_dicts -o $with_myspell_dicts = yes; then +if test $with_myspell_dicts = yes; then AC_MSG_RESULT([yes]) WITH_MYSPELL_DICTS=YES BUILD_TYPE=$BUILD_TYPE DICTIONARIES diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index b07359a..6280c87 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -21,3 +21,4 @@ --without-helppack-integration --without-myspell-dicts --with-build-platform-configure-options=--disable-liblangtag +--with-help diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf index 590d069..e4fdf4c 100644 --- a/distro-configs/LibreOfficeAndroidX86.conf +++ b/distro-configs/LibreOfficeAndroidX86.conf @@ -21,3 +21,4 @@ --without-helppack-integration --without-myspell-dicts --with-build-platform-configure-options=--disable-liblangtag +--with-help diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 4ed55ee..1934c1c 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -1,5 +1,6 @@ --with-vendor=The Document Foundation --with-system-dicts +--with-myspell-dicts --without-unix-wrapper --without-system-zlib --without-system-stdlibs @@ -14,6 +15,7 @@ --without-system-cairo --without-system-postgresql --without-junit +--with-help --without-helppack-integration --with-linker-hash-style=both --with-fonts diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 2ca1070..23ff683 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -10,3 +10,5 @@ --enable-online-update --without-system-postgresql --disable-gtk +--with-help +--with-myspell-dicts diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index e14e993..e44899a 100644 --- a/distro-configs/LibreOfficeMinGW.conf +++ b/distro-configs/LibreOfficeMinGW.conf @@ -29,3 +29,5 @@ --disable-mozilla --disable-postgresql-sdbc --disable-gtk +--with-help +--with-myspell-dicts diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index a56c097..f149adc 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -45,3 +45,4 @@ --without-system-mozilla --without-unix-wrapper --without-system-libwpd +--with-help diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 19364be..0fc5940 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -15,3 +15,5 @@ --enable-online-update --enable-win-mozab-driver --disable-build-mozab +--with-help +--with-myspell-dicts diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 35ca061..ee6386e 100644 --- a/distro-configs/LibreOfficeWin64.conf +++
[Libreoffice-commits] .: configure.ac
configure.ac | 49 +++-- 1 file changed, 27 insertions(+), 22 deletions(-) New commits: commit 62bc5c29ff518f849d5a29747355382f75d99364 Author: Norbert Thiebaud nthieb...@gmail.com Date: Sun Jan 20 23:21:56 2013 -0600 disable odk if not explicitly requested and doxygen not in PATH if odk is not explicitly requested by --enable-odk and --with-doxygen is yes , i.e not a specific location and doxygen could not be found in the PATH then enable_odk is set to no as a default value rather than an implicit 'yes' Change-Id: I4f04ecc8dbe959001f6dfdccf0c97b61f79faff6 Reviewed-on: https://gerrit.libreoffice.org/1789 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/configure.ac b/configure.ac index 23ebf23..c005756 100644 --- a/configure.ac +++ b/configure.ac @@ -6944,6 +6944,33 @@ AC_SUBST(GPERF) dnl === dnl Check for building ODK dnl === +if test $enable_odk = no; then +unset DOXYGEN +else +if test $with_doxygen = no; then +AC_MSG_CHECKING([for doxygen]) +unset DOXYGEN +AC_MSG_RESULT([no]) +else +if test $with_doxygen = yes; then +AC_PATH_PROG([DOXYGEN], [doxygen]) +if test -z $DOXYGEN; then +AC_MSG_RESULT([no]) +if test $enable_odk = ; then +enable_odk=no +else +AC_MSG_ERROR([doxygen not found in \$PATH; specify its pathname via --with-doxygen=..., or disable its use via --without-doxygen]) +fi +fi +else +AC_MSG_CHECKING([for doxygen]) +DOXYGEN=$with_doxygen +AC_MSG_RESULT([$DOXYGEN]) +fi +fi +fi +AC_SUBST([DOXYGEN]) + AC_MSG_CHECKING([whether to build the ODK]) if test $enable_odk = -o $enable_odk != no; then AC_MSG_RESULT([yes]) @@ -11655,28 +11682,6 @@ location (/usr/share/java), specify its pathname via fi AC_SUBST(OOO_JUNIT_JAR) -if test $enable_odk = no; then -unset DOXYGEN -else -if test $with_doxygen = no; then -AC_MSG_CHECKING([for doxygen]) -unset DOXYGEN -AC_MSG_RESULT([no]) -else -if test $with_doxygen = yes; then -AC_PATH_PROG([DOXYGEN], [doxygen]) -if test -z $DOXYGEN; then -AC_MSG_RESULT([no]) -AC_MSG_ERROR([doxygen not found in \$PATH; specify its pathname via --with-doxygen=..., or disable its use via --without-doxygen]) -fi -else -AC_MSG_CHECKING([for doxygen]) -DOXYGEN=$with_doxygen -AC_MSG_RESULT([$DOXYGEN]) -fi -fi -fi -AC_SUBST([DOXYGEN]) AC_SUBST(SCPDEFS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] .: configure.ac
On Mon, Jan 21, 2013 at 5:55 AM, Rene Engelhard r...@debian.org wrote: Can we please stop this auto-deect-everything-and-disable-stuff-silently nonsense? Well it is 'auto-select-and-enable-stuff-based-on-what-is-avaialble' nonsense :-) Imagine the following scenario. Default build without doxygen but *with* the SDK. (e.g. binary-only builds). The Debian buildds won't install doxygen because it's only needed for arch-indep stuff (and the arch-dep part uses -without-doxygen). So the binary-only build will see no doxygen - builds no SDK - bad. distro-config build should be explicit and not rely on implicit 'default' values, since these will change eventually over time. There *IS* already -without-doxygen for people who want the SDK but not doxygen. There *IS* --enable-odk for people who want the SDK and it *IS* honored if specified. The only case that this patch impact is: Before: if you did _not_ specified --enable-odk _and_ you did not specify --with-dogygen=/path or --without-doxygen then the configure would imply --enable-odk=yes and fail if doxygen is not in the PATH After: In the same circumstance the configure default --enable-odk to no iow: before: if you did plain ./autogen.sh and did not have doxygen = enable-odk=yes and error because doxygen is not in the PATH after: if you do plain .autogen.sh if doxygen is not in the PATH enable-odk is defaulted to no. = no error All other behavior of the combinations of enable-odk /with-doxygen are left unchanged Oh, and it wozld make more sense to get such changes reviewed by Linux people or distro packjagers who heavily rely on configure switches in their packaging... I purposefully pushed that patch to gerrit and did not push it directly. what else can I do to get review-before-hitting-the-tree ? Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d6b10adc30c0d370887c9caf94fe462100c46f96 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 18 08:40:34 2013 +0100 Fix build with newer autotools diff --git a/configure.ac b/configure.ac index 1e32311..8669ede 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_ver # = AC_INIT([libcdr],[libcdr_version]) AC_CONFIG_MACRO_DIR([m4]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([1.11 foreign dist-xz dist-bzip2]) AM_SILENT_RULES([yes]) AC_LANG([C++]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c3df537ec26d0ffa05c1c1e9fe8ddc81a9b23d1e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 18 08:41:06 2013 +0100 Fix build with newer autotools diff --git a/configure.ac b/configure.ac index 7f44b9b..a353639 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libv # = AC_INIT([libvisio],[libvisio_version]) AC_CONFIG_MACRO_DIR([m4]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([1.11 foreign dist-xz dist-bzip2]) AM_SILENT_RULES([yes]) AC_LANG([C++]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fcfe59ed3b0fe2d186ff44f2a3809b97ee116639 Author: Brennan T. Vincent brenn...@email.arizona.edu Date: Wed Jan 16 18:44:47 2013 -0700 update to work with latest autotools diff --git a/configure.ac b/configure.ac index 6bfc167..914aaf5 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ m4_define([libmspub_version],[libmspub_version_major.libmspub_version_minor.libm # = AC_INIT([libmspub],[libmspub_version]) AC_CONFIG_MACRO_DIR([m4]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([1.11 foreign dist-xz dist-bzip2]) AM_SILENT_RULES([yes]) AC_LANG([C++]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac .gitignore src/lib
.gitignore |1 +
configure.ac| 18 --
src/lib/Makefile.am |4 ++--
3 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 1f8d38e91ea3d7a90ba152560ae5c863d3cee72a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Wed Jan 16 10:37:01 2013 +0100
Check for icu and set ICU_CFLAGS and ICU_LDFLAGS
diff --git a/.gitignore b/.gitignore
index b708b99..612cbb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
Makefile
Makefile.in
+ar-lib
aclocal.m4
autom4te.cache
config.guess
diff --git a/configure.ac b/configure.ac
index 914aaf5..9ae19b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,11 +55,9 @@ PKG_CHECK_MODULES([ZLIB],[zlib],[],[
AC_SUBST(ZLIB_CFLAGS)
AC_SUBST(ZLIB_LIBS)
-
# ===
# Find required boost headers
# ===
-
AC_CHECK_HEADER(
boost/ptr_container/ptr_map.hpp,
[],
@@ -67,6 +65,22 @@ AC_CHECK_HEADER(
[]
)
+#
+# Find icu
+#
+AC_PATH_PROG([ICU_CONFIG],[icu-config])
+AC_MSG_CHECKING([ICU installation])
+if ${ICU_CONFIG} --cflags /dev/null 21; then
+ ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath`
+ ICU_LIBS=`${ICU_CONFIG} --ldflags`
+ AC_MSG_RESULT([found])
+else
+ AC_MSG_ERROR([libicu config program icu-config not found])
+fi
+AC_SUBST(ICU_CFLAGS)
+AC_SUBST(ICU_LIBS)
+
+
# =
# Libtool/Version Makefile settings
# =
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f990384..463116d 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -11,9 +11,9 @@
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_include_HEADERS = \
MSPUBDocument.h \
MSPUBStringVector.h
-AM_CXXFLAGS = $(LIBMSPUB_CXXFLAGS) $(ZLIB_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = $(LIBMSPUB_CXXFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS)
$(DEBUG_CXXFLAGS)
-libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LIBADD =
$(LIBMSPUB_LIBS) $(ZLIB_LIBS) @LIBMSPUB_WIN32_RESOURCE@
+libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LIBADD =
$(LIBMSPUB_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_DEPENDENCIES =
@LIBMSPUB_WIN32_RESOURCE@
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LDFLAGS =
$(version_info) -export-dynamic -no_undefined
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_SOURCES = \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9f813d9f692d10f6d151c27617c2c5a36fac8c19 Author: Andras Timar ati...@suse.com Date: Tue Jan 15 11:25:35 2013 +0100 fdo#58026 typo fix in Addons.xcu of Google Docs extension Change-Id: I44e6ade6f9c89cc8086a7a69a0f7a81470c85ba8 diff --git a/configure.ac b/configure.ac index 8bc4101..5bb9c33 100644 --- a/configure.ac +++ b/configure.ac @@ -10973,7 +10973,7 @@ AC_MSG_CHECKING([for Google Docs extension integration]) GOOGLE_DOCS_EXTENSION_PACK= if test x$enable_ext_google_docs = xyes -a x$enable_extension_integration != xno; then SCPDEFS=$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS - GOOGLE_DOCS_EXTENSION_PACK=2a64b8e6f185a7f6c19d00fb8bb4cf64-gdocs_3.0.1_modified.oxt + GOOGLE_DOCS_EXTENSION_PACK=27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt WITH_EXTRA_EXTENSIONS=YES AC_MSG_RESULT([yes]) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac instsetoo_native/util
configure.ac| 13
instsetoo_native/util/openoffice.lst| 421
instsetoo_native/util/openoffice.lst.in | 421
3 files changed, 431 insertions(+), 424 deletions(-)
New commits:
commit e1a467e618d2ba7aa7abe5ae3d19c048175108ff
Author: Tor Lillqvist t...@iki.fi
Date: Sat Jan 12 14:33:37 2013 +0200
Expand also openoffice.lst for version numbers from configury
Change-Id: I7bad1639488616db3823e25d6508e8e57f2212ef
diff --git a/configure.ac b/configure.ac
index 8d31d56..6139832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,9 @@ dnl in order to create a configure script.
# The version number in the second argumemnt to AC_INIT should be four numbers
separated by
# periods. Some parts of the code requires the first one to be less than 128
and the others to be less
-# than 256.
-AC_INIT([LibreOffice],[4.1.0.0],[],[],[http://documentfoundation.org/])
+# than 256. The four numbers can optionally be followed by a period and a
free-form string containing no
+# spaces or periods, like frobozz-mumble-42 or alpha0.
+AC_INIT([LibreOffice],[4.1.0.0.alpha0],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
@@ -4205,6 +4206,7 @@ if test $cross_compiling = yes; then
solenv/inc/langlist.mk \
solenv/inc/postset.mk \
solenv/inc/minor.mk.in \
+instsetoo_native/util/openoffice.lst.in \
| (cd CONF-FOR-BUILD tar xf -)
(
unset COM GUI GUIBASE OS CPU CPUNAME
@@ -4330,10 +4332,15 @@ LIBO_VERSION_MINOR=$2
LIBO_VERSION_MICRO=$3
LIBO_VERSION_PATCH=$4
+# Note that LIBO_VERSION_SUFFIX, if non-empty, includes the period separator
+LIBO_VERSION_SUFFIX=$5
+test -n $LIBO_VERSION_SUFFIX LIBO_VERSION_SUFFIX=.$LIBO_VERSION_SUFFIX
+
AC_SUBST(LIBO_VERSION_MAJOR)
AC_SUBST(LIBO_VERSION_MINOR)
AC_SUBST(LIBO_VERSION_MICRO)
AC_SUBST(LIBO_VERSION_PATCH)
+AC_SUBST(LIBO_VERSION_SUFFIX)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
@@ -12456,7 +12463,7 @@ else
echo config_host.mk.last
fi
-AC_CONFIG_FILES([config_host.mk Makefile solenv/inc/minor.mk])
+AC_CONFIG_FILES([config_host.mk Makefile solenv/inc/minor.mk
instsetoo_native/util/openoffice.lst])
AC_CONFIG_HEADERS([config/config_clang.h])
AC_CONFIG_HEADERS([config/config_global.h])
AC_CONFIG_HEADERS([config/config_graphite.h])
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
deleted file mode 100644
index 94197bf..000
--- a/instsetoo_native/util/openoffice.lst
+++ /dev/null
@@ -1,421 +0,0 @@
-Globals
-{
-Settings
-{
-variables
-{
-UREPACKAGEVERSION 4.1.0.0.alpha0
-URELAYERVERSION 1
-REFERENCEOOOMAJORMINOR 3.4
-UNIXBASISROOTNAME libreoffice4.1
-SERVICETAG_PRODUCTNAME LibreOffice 4.1
-SERVICETAG_PRODUCTVERSION 4.1
-SERVICETAG_PARENTNAME LibreOffice 4.1
-SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
-SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
-HIDELICENSEDIALOG 1
-PACKAGEPREFIX
-BASISPACKAGEPREFIX libobasis
-UREPACKAGEPREFIX libreoffice
-SOLSUREPACKAGEPREFIX libreoffice
-REGISTRATION_HOST
https://registration.libreoffice.org/RegistrationWeb
-REGISTRATIONURL http://survey.libreoffice.org/user/index.php
-PROGRESSBARCOLOR 126,170,23
-PROGRESSSIZE 319,10
-PROGRESSPOSITION 164,225
-PROGRESSFRAMECOLOR 207,208,211
-NATIVEPROGRESS false
-REGISTRYLAYERNAME Layers
-SERVICEPACK 1
-UPDATE_DATABASE 1
-CREATE_MSP_INSTALLSET 0
-UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
-PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 8
-OOOVENDOR The Document Foundation
-OOODOWNLOADNAME 1
-BUILDIDCWS {buildidcws}
-STARTCENTER_HIDE_EXTERNAL_LINKS 0
-}
-}
-}
-
-LibreOffice
-{
-Settings
-{
-variables
-{
-PRODUCTNAME LibreOffice
-PRODUCTVERSION 4.1
-PRODUCTEXTENSION
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha0
-POSTVERSIONEXTENSION
-POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 4.1
-USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
-ABOUTBOXPRODUCTVERSIONSUFFIX +
-BASEPRODUCTVERSION 4.1
-PCPFILENAME libreoffice.pcp
-UPDATEURL http://update.libreoffice.org/check.php
-ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
-ADDSYSTEMINTEGRATION 1
-FILEFORMATNAME OpenOffice.org
-
[Libreoffice-commits] .: configure.ac
configure.ac |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 484bb96aa975d834e326d927d36ee17808b8b6b5 Author: Tor Lillqvist t...@iki.fi Date: Sat Jan 12 15:34:28 2013 +0200 Update comment Change-Id: I7afe33dc6ec3ce8f8fa3abe73463ff5293920a41 diff --git a/configure.ac b/configure.ac index 6139832..8bc4101 100644 --- a/configure.ac +++ b/configure.ac @@ -9745,9 +9745,9 @@ ENABLE_OPENGL= if test -z $enable_opengl; then if test $_os = WINNT; then -# By default disable the OpenGL transitions for Windows (the code doesn't even compile -# currently). In other words, use --enable-opengl only if you plan to hack on that code for -# Windows. +# By default disable the OpenGL transitions for Windows (the code compiles but works very +# badly and crashes). In other words, use --enable-opengl only if you plan to hack on that +# code for Windows. enable_opengl=no else enable_opengl=yes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 37c6106f3a74f249cd421454d20f8ce561f71eb0 Author: Tor Lillqvist t...@iki.fi Date: Mon Jan 7 14:40:51 2013 +0200 Since 6eff6fae6272e8ed5d74553597bb4b73db3f2864 Python needed on Windows Change-Id: Id49730b7ad2f7122a2c9b0415330b6fb803ec21c diff --git a/configure.ac b/configure.ac index 0a1fd05..2fa044f 100644 --- a/configure.ac +++ b/configure.ac @@ -7415,12 +7415,18 @@ AC_MSG_CHECKING([which Python to use]) case $enable_python in no|disable) +if test $build_os = cygwin; then +# Python is required to build nss. In theory we could separate the build-time Python +# requirement from the choice whether to include Python stuff in the installer, but why +# bother? +AC_MSG_ERROR([Python is required at build time when building on Windows]) +fi enable_python=no AC_MSG_RESULT([none]) DISABLE_PYTHON=TRUE ;; |yes|auto) -if test $DISABLE_SCRIPTING = TRUE; then +if test $DISABLE_SCRIPTING = TRUE -a $build_os != cygwin; then AC_MSG_RESULT([no, overridden by --disable-scripting]) enable_python=no DISABLE_PYTHON=TRUE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8620f8b51dcc2c9f50364d42e756fd8b11bdc1e3
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jan 2 13:09:00 2013 +0100
fix use of MINGW_SYSROOT
This got broken in a084ea60680372efb7998f7369c9fc99eb85c50a.
diff --git a/configure.ac b/configure.ac
index 68723f4..1e6327a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7529,9 +7529,9 @@ if test $enable_python = system; then
dnl How to find out the cross-compilation Python installation path?
dnl Let's hardocode what we know for different distributions for now...
for python_version in 2.6; do
-if test -f
${MINGW_SYSROOT}/include/python${python_version}/Python.h; then
-
PYTHON_CFLAGS=-I${MINGW_SYSROOT}/include/python$python_version
-PYTHON_LIBS=-L${MINGW_SYSROOT}lib -lpython$python_version
$python_libs
+if test -f
${MINGW_SYSROOT}/mingw/include/python${python_version}/Python.h; then
+
PYTHON_CFLAGS=-I${MINGW_SYSROOT}/mingw/include/python$python_version
+PYTHON_LIBS=-L${MINGW_SYSROOT}/mingw/lib
-lpython$python_version $python_libs
AC_MSG_CHECKING([for python.exe])
AS_IF([test -f $MINGW_SYSROOT/mingw/bin/python.exe],
[AC_MSG_RESULT([$MINGW_SYSROOT/mingw/bin/python.exe])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac external/Package_mingw_dlls.mk m4/mingw.m4
configure.ac | 14 +++---
external/Package_mingw_dlls.mk |2 +-
m4/mingw.m4|2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit dc277bc6a1c357fe725db2c567d3e1cf16fb7806
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jan 2 17:04:34 2013 +0100
use MINGW_SYSROOT consistently
Restore all cases to expect /mingw/ included in the path.
diff --git a/configure.ac b/configure.ac
index 1e6327a..59e20c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5315,8 +5315,8 @@ dnl
===
if test $WITH_MINGW = yes; then
AC_MSG_CHECKING([for MinGW sysroot])
sysroot=`$CC -print-sysroot`
-AS_IF([test -d $sysroot],
- [MINGW_SYSROOT=$sysroot
+AS_IF([test -d $sysroot/mingw],
+ [MINGW_SYSROOT=$sysroot/mingw
AC_MSG_RESULT([$MINGW_SYSROOT])],
[AC_MSG_RESULT([not found])
AC_MSG_ERROR([cannot determine MinGW sysroot])])
@@ -7529,12 +7529,12 @@ if test $enable_python = system; then
dnl How to find out the cross-compilation Python installation path?
dnl Let's hardocode what we know for different distributions for now...
for python_version in 2.6; do
-if test -f
${MINGW_SYSROOT}/mingw/include/python${python_version}/Python.h; then
-
PYTHON_CFLAGS=-I${MINGW_SYSROOT}/mingw/include/python$python_version
-PYTHON_LIBS=-L${MINGW_SYSROOT}/mingw/lib
-lpython$python_version $python_libs
+if test -f
${MINGW_SYSROOT}/include/python${python_version}/Python.h; then
+
PYTHON_CFLAGS=-I${MINGW_SYSROOT}/include/python$python_version
+PYTHON_LIBS=-L${MINGW_SYSROOT}/lib -lpython$python_version
$python_libs
AC_MSG_CHECKING([for python.exe])
-AS_IF([test -f $MINGW_SYSROOT/mingw/bin/python.exe],
- [AC_MSG_RESULT([$MINGW_SYSROOT/mingw/bin/python.exe])
+AS_IF([test -f $MINGW_SYSROOT/bin/python.exe],
+ [AC_MSG_RESULT([$MINGW_SYSROOT/bin/python.exe])
MINGW_PYTHON_EXE=python.exe],
[AC_MSG_RESULT([not found])
AC_MSG_ERROR([could not find python.exe])])
diff --git a/external/Package_mingw_dlls.mk b/external/Package_mingw_dlls.mk
index 6b613d1..50a8cda 100644
--- a/external/Package_mingw_dlls.mk
+++ b/external/Package_mingw_dlls.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/mingw/bin))
+$(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin))
$(eval $(call gb_Package_add_files,mingw_dlls,bin,\
$(MINGW_BOOST_DATE_TIME_DLL) \
diff --git a/m4/mingw.m4 b/m4/mingw.m4
index eb2dadb..d7aecbd 100644
--- a/m4/mingw.m4
+++ b/m4/mingw.m4
@@ -47,7 +47,7 @@ AC_DEFUN([libo_MINGW_CHECK_DLL],
[AC_ARG_VAR([MINGW_][$1][_DLL],[output variable containing the found dll
name])dnl
if test -n $WITH_MINGW; then
-_libo_mingw_dlldir=[$MINGW_SYSROOT]/mingw/bin
+_libo_mingw_dlldir=[$MINGW_SYSROOT]/bin
_libo_mingw_dllname=
AC_MSG_CHECKING([for $2 dll])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) New commits: commit 2210bade74626de68e51adb9759b81f62d7c0b01 Author: Tor Lillqvist t...@iki.fi Date: Wed Jan 2 15:18:11 2013 +0200 Check also for a (self-built) 64-bit NDK tool-chain Also make the --with-android-ndk-toolchain-version option mandatory. Otherwise it would be possible to leave it out and that would appear to work in the configure phase but in fact mix stuff up when using a self-built 64-bit tool-chain merged into a r8b,c,d NDK. Sigh, maybe we shouldn't even try to have the configury generic enough to work with any NDK version (which probably it doesn't anyway), but explicitly accept only a small set of NDKs, like r8b,c,d (which probably are the only that we work with anyway). Change-Id: Iecdf3a2d841e7b29598228ae49f48eca9640a82c diff --git a/configure.ac b/configure.ac index dbcaf66..af1b786 100644 --- a/configure.ac +++ b/configure.ac @@ -154,7 +154,24 @@ if test -n $with_android_ndk; then android_cpu=x86 fi -ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/$android_cpu*-*$with_android_ndk_toolchain_version/prebuilt/*/bin` +# Check if there is a (self-built) 64-bit tool-chain +toolchain_system='*' +if test $build_os = linux-gnu; then +case $build_cpu in +x86_64) +case `echo $ANDROID_NDK_HOME/toolchains/$android_cpu*-*$with_android_ndk_toolchain_version/prebuilt/linux-x86_64/bin` in +*/bin|*/bin\ */bin*) +toolchain_system=linux-x86_64 +;; +esac +;; +i?86|x86) +toolchain_system=linux-x86 +;; +esac +fi + +ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/$android_cpu*-*$with_android_ndk_toolchain_version/prebuilt/$toolchain_system/bin` # Check if there are several toolchain versions case $ANDROID_ABI_PREBUILT_BIN in */bin\ */bin*) @@ -489,6 +506,10 @@ linux-android*) AC_MSG_ERROR([the --with-android-ndk option is mandatory]) fi +if test -z $with_android_ndk_toolchain_version; then +AC_MSG_ERROR([the --with-android-ndk-toolchain-version option is mandatory]) +fi + if test -z $with_android_sdk; then AC_MSG_ERROR([the --with-android-sdk option is mandatory]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 61e0deb8c5200cdc66a8d6215a462e433f1804da Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 1 12:13:23 2013 +0100 Obsolete AM_CONFIG_HEADER - AC_CONFIG_HEADERS (cf. https://trac.macports.org/ticket/37428 gnome-keyring @2.30.3 autoreconf fails with automake 1.13: possibly undefined macro: AM_CONFIG_HEADER) diff --git a/configure.ac b/configure.ac index aef555b..89562c5 100644 --- a/configure.ac +++ b/configure.ac @@ -123,7 +123,7 @@ AC_SUBST(CPPUNIT_CXXFLAGS) # == # Setup config.h # == -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AX_PREFIX_CONFIG_H([include/cppunit/config-auto.h]) # = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) New commits: commit a084ea60680372efb7998f7369c9fc99eb85c50a Author: David Tardon dtar...@redhat.com Date: Mon Dec 31 12:41:31 2012 +0100 do not second-guess the location of mingw sysroot Change-Id: I669b6c7b90f2b803f68df86704b357967481f6ce diff --git a/configure.ac b/configure.ac index c74e1a2..8428abc 100644 --- a/configure.ac +++ b/configure.ac @@ -5313,12 +5313,13 @@ dnl === dnl Set the MinGW sys-root dnl === if test $WITH_MINGW = yes; then -for sysroot in /usr/i686-w64-mingw32/sys-root/mingw; do -if test -d $sysroot; then -MINGW_SYSROOT=$sysroot -break -fi -done +AC_MSG_CHECKING([for MinGW sysroot]) +sysroot=`$CC -print-sysroot` +AS_IF([test -d $sysroot], + [MINGW_SYSROOT=$sysroot + AC_MSG_RESULT([$MINGW_SYSROOT])], + [AC_MSG_RESULT([not found]) + AC_MSG_ERROR([cannot determine MinGW sysroot])]) fi AC_SUBST([MINGW_SYSROOT]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit 8b456d10989438616466e95bf2062efc2ba32659 Author: Tor Lillqvist t...@iki.fi Date: Wed Dec 26 02:32:13 2012 +0200 Add config/config_graphite.h.in diff --git a/configure.ac b/configure.ac index 032c9c4..9de1aec 100644 --- a/configure.ac +++ b/configure.ac @@ -4165,6 +4165,7 @@ if test $cross_compiling = yes; then configure \ Makefile.in \ config/config_global.h.in \ +config/config_graphite.h.in \ config/config_telepathy.h.in \ config/config_vclplug.h.in \ bin/get_config_variables \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 19340f79a8e8fbd291d1b431848ad7c44aacded3
Author: Tor Lillqvist tlillqv...@suse.com
Date: Sun Dec 23 01:51:57 2012 +0200
We only build for Windows on Cygwin
It is pointless to test for both $build_os = cygwin and $_os = WINNT.
Change-Id: I89b5196439f79284ca1a3fb08369decf20810b5b
diff --git a/configure.ac b/configure.ac
index 83def27..3ecce6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5986,7 +5986,7 @@ dnl
===
if test $SOLAR_JAVA != ; then
# Windows-specific tests
-if test $build_os = cygwin -a $_os = WINNT; then
+if test $build_os = cygwin; then
if test $BITNESS_OVERRIDE = 64; then
bitness=64-bit
otherbitness=32-bit
@@ -6029,7 +6029,7 @@ if test $SOLAR_JAVA != ; then
fi
fi
-if test $build_os = cygwin -a $_os = WINNT; then
+if test $build_os = cygwin; then
# Check that the JDK found is correct architecture
# Why is this necessary, we don't link with any library from the JDK I
think,
@@ -6159,7 +6159,7 @@ if test $SOLAR_JAVA != ; then
if test -z $JAVACOMPILER; then
AC_MSG_ERROR([$javacompiler not found set with_jdk_home])
fi
-if test $build_os = cygwin -a $_os = WINNT; then
+if test $build_os = cygwin; then
if test x`echo $JAVACOMPILER | $GREP -i '\.exe$'` = x; then
JAVACOMPILER=${JAVACOMPILER}.exe
fi
@@ -6215,7 +6215,7 @@ if test $SOLAR_JAVA != ; then
if test -z $JAVADOC; then
AC_MSG_ERROR([$_javadoc_path not found set with_jdk_home])
fi
-if test $build_os = cygwin -a $_os = WINNT; then
+if test $build_os = cygwin; then
if test x`echo $JAVADOC | $GREP -i '\.exe$'` = x; then
JAVADOC=${JAVADOC}.exe
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) New commits: commit 6f1541dfb3b7732af6da3604c6d9e240eaf54cb4 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Dec 20 09:26:55 2012 +0100 Thou shall not mention qtz twice, thy packaging breaketh Change-Id: Icd65d8a456cf59b6e4b6b6bfb095c0bff498bcbc diff --git a/configure.ac b/configure.ac index 819ea6d..d344884 100644 --- a/configure.ac +++ b/configure.ac @@ -11731,11 +11731,7 @@ AC_MSG_CHECKING([which languages to be built]) # + removes en-US; we want to put it on the beginning # + prints just the section starting with 'completelangiso=' and ending with the at the end of line [eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/=/;s/\([^\\]\)$/\1/;s/en-US//;/^completelangiso/p' $SRC_ROOT/solenv/inc/langlist.mk)] -if test $enable_release_build = -o $enable_release_build = no; then -ALL_LANGS=en-US $completelangiso qtz -else -ALL_LANGS=en-US $completelangiso -fi +ALL_LANGS=en-US $completelangiso # check the configured localizations WITH_LANG=$with_lang if test -z $WITH_LANG -o $WITH_LANG = en-US; then @@ -11763,6 +11759,7 @@ test -z $WITH_LANG_LIST WITH_LANG_LIST=en-US test $WITH_LANG = en-US WITH_LANG= if test $enable_release_build = -o $enable_release_build = no; then test $WITH_LANG_LIST = en-US || WITH_LANG_LIST=`echo $WITH_LANG_LIST qtz` +ALL_LANGS=`echo $ALL_LANGS qtz` fi AC_SUBST(ALL_LANGS) AC_SUBST(WITH_LANG) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac src/lib
configure.ac |2 +-
src/lib/VSDXMLParserBase.cpp |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d421a44cd16ac32b5622f11884265751a04bfc82
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 18 10:22:46 2012 +0100
Bump version in view of a possible release
diff --git a/configure.ac b/configure.ac
index 0b83c05..7f44b9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
#
m4_define([libvisio_version_major],[0])
m4_define([libvisio_version_minor],[0])
-m4_define([libvisio_version_micro],[23])
+m4_define([libvisio_version_micro],[24])
m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro])
# =
diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index e18c8bb..4174e16 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -1430,7 +1430,7 @@ void
libvisio::VSDXMLParserBase::readParaIX(xmlTextReaderPtr reader)
tokenType = xmlTextReaderNodeType(reader);
switch (tokenId)
- {
+{
case XML_INDFIRST:
if (XML_READER_TYPE_ELEMENT == tokenType)
ret = readDoubleData(indFirst, reader);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit ccd519c582cc897b9276b5d04801688c253c1e94 Author: Tor Lillqvist t...@iki.fi Date: Tue Dec 18 14:52:04 2012 +0200 The Impress remote control makes sense only on desktop OSes Change-Id: I48166fd5ee3dec8c140ef1905023db72c2aa2bd4 diff --git a/configure.ac b/configure.ac index 2e9983b..a2b1777 100644 --- a/configure.ac +++ b/configure.ac @@ -2279,6 +2279,7 @@ dnl cross-compiling would imply a non-desktop OS. if test $_os != iOS -a $_os != Android; then BUILD_TYPE=$BUILD_TYPE DESKTOP +BUILD_TYPE_IS_DESKTOP=YES fi # Currently we build only viewer apps for Android (and for iOS not even that yet), so to avoid getting @@ -9498,7 +9499,7 @@ fi AC_SUBST(ENABLE_PACKAGEKIT) AC_MSG_CHECKING([whether to enable Impress remote control]) -if test -n $enable_sdremote -a $enable_sdremote != no; then +if test $BUILD_TYPE_IS_DESKTOP = YES -a -n $enable_sdremote -a $enable_sdremote != no; then AC_MSG_RESULT([yes]) ENABLE_SDREMOTE=YES AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 6f9eadb0c4a2095e1dc64997cf88806b96e17574 Author: Tor Lillqvist t...@iki.fi Date: Tue Dec 18 15:06:44 2012 +0200 Revert The Impress remote control makes sense only on desktop OSes Nah, sure it makes sense also on tablets. Consider having your tablet attached to a projector while you dance around on stage talking and controlling the presentation with your phone (or other smaller device). This reverts commit ccd519c582cc897b9276b5d04801688c253c1e94. diff --git a/configure.ac b/configure.ac index db19ff4..9b845c0 100644 --- a/configure.ac +++ b/configure.ac @@ -2279,7 +2279,6 @@ dnl cross-compiling would imply a non-desktop OS. if test $_os != iOS -a $_os != Android; then BUILD_TYPE=$BUILD_TYPE DESKTOP -BUILD_TYPE_IS_DESKTOP=YES fi # Currently we build only viewer apps for Android (and for iOS not even that yet), so to avoid getting @@ -9495,7 +9494,7 @@ fi AC_SUBST(ENABLE_PACKAGEKIT) AC_MSG_CHECKING([whether to enable Impress remote control]) -if test $BUILD_TYPE_IS_DESKTOP = YES -a -n $enable_sdremote -a $enable_sdremote != no; then +if test -n $enable_sdremote -a $enable_sdremote != no; then AC_MSG_RESULT([yes]) ENABLE_SDREMOTE=YES AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit 991466907b91255c47caf7726e3de1854849133e Author: Tor Lillqvist t...@iki.fi Date: Wed Dec 19 09:56:02 2012 +0200 Add a few missing files to be expanded (from *.in) to CONF-FOR-BUILD But note that currently the config/config_*.h files are created and used so that those created for the HOST platform are used also when compiling (the cross-toolset) for the BUILD platform. Seems to work by luck so far, but this is really broken. We need to have the config_*.h files separately for HOST and BUILD. Change-Id: I500694eee8bb2a8d2d7afbf78171c0e2ea1e66b3 diff --git a/configure.ac b/configure.ac index 9b845c0..eb0334c 100644 --- a/configure.ac +++ b/configure.ac @@ -4130,6 +4130,10 @@ if test $cross_compiling = yes; then config.guess \ config_host.mk.in \ configure \ +Makefile.in \ +config/config_global.h.in \ +config/config_telepathy.h.in \ +config/config_vclplug.h.in \ bin/get_config_variables \ $srcdir/solenv/bin/getcompver.awk \ $SRC_ROOT/solenv/inc/langlist.mk \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac instsetoo_native/util l10ntools/source postprocess/packregistry solenv/bin solenv/inc
configure.ac | 11 ---
instsetoo_native/util/makefile.mk|4 ++--
l10ntools/source/lngmerge.cxx|6 +-
postprocess/packregistry/makefile.mk |1 +
solenv/bin/ooinstall | 15 ++-
solenv/inc/postset.mk|2 +-
6 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit c7b1a2fe811f1d5a233cd790cec9067cea246845
Author: Andras Timar ati...@suse.com
Date: Wed Dec 12 10:07:35 2012 +0100
Make KeyID (qtz) work again
Conflicts:
configure.ac
Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
diff --git a/configure.ac b/configure.ac
index 320384c..63e1479 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11829,7 +11829,11 @@ AC_MSG_CHECKING([which languages to be built])
# + removes en-US; we want to put it on the beginning
# + prints just the section starting with 'completelangiso=' and ending with
the at the end of line
[eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e
's/=/=/;s/\([^\\]\)$/\1/;s/en-US//;/^completelangiso/p'
$SRC_ROOT/solenv/inc/langlist.mk)]
-ALL_LANGS=en-US $completelangiso
+if test $enable_release_build = -o $enable_release_build = no; then
+ALL_LANGS=en-US $completelangiso qtz
+else
+ALL_LANGS=en-US $completelangiso
+fi
# check the configured localizations
WITH_LANG=$with_lang
if test -z $WITH_LANG -o $WITH_LANG = en-US; then
@@ -11853,10 +11857,11 @@ for lang in $WITH_LANG; do
done
# list with substituted ALL
WITH_LANG_LIST=`echo $WITH_LANG | sed s/ALL/$ALL_LANGS/`
-# this variable is used only by bin/distro-install-* helper scripts
-# they need a real list of languages
test -z $WITH_LANG_LIST WITH_LANG_LIST=en-US
test $WITH_LANG = en-US WITH_LANG=
+if test $enable_release_build = -o $enable_releasbie_build = no; then
+test $WITH_LANG_LIST = en-US || WITH_LANG_LIST=`echo $WITH_LANG_LIST
qtz`
+fi
AC_SUBST(ALL_LANGS)
AC_SUBST(WITH_LANG)
AC_SUBST(WITH_LANG_LIST)
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 7d79e29..e4dd09f 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -76,9 +76,9 @@ OOOHELPPACK=ooohelppack
OOODEVHELPPACK=ooodevhelppack
.ENDIF
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name helpcontent2
2/dev/null | sed -e s|/helpcontent2|| -e s|^.*/|| ) en-US
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name helpcontent2
2/dev/null | sed -e s|/helpcontent2|| -e s|^.*/|| ) en-US qtz
-# do not build key is pseudolanguage for release builds
+# do not build KeyID pseudolanguage (qtz) for release builds
.IF $(ENABLE_RELEASE_BUILD)==TRUE
alllangiso:=$(alllangiso:s/qtz //)
.ENDIF
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 9da45b6..71f68ef 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -184,7 +184,7 @@ sal_Bool LngParser::Merge(
}
nError = LNG_OK;
-MergeDataFile aMergeDataFile( rSDFFile, sSource, false, false );
+MergeDataFile aMergeDataFile( rSDFFile, sSource, false, true );
rtl::OString sTmp( Export::sLanguages );
if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(ALL)) )
Export::SetLanguages( aMergeDataFile.GetLanguages() );
@@ -260,6 +260,8 @@ sal_Bool LngParser::Merge(
{
rtl::OString sNewText;
pEntrys-GetText( sNewText, STRING_TYP_TEXT,
sLang, sal_True );
+if( sLang == qtz )
+sNewText = sNewText.copy(6);
if ( !sNewText.isEmpty()) {
rtl::OString *pLine = (*pLines)[ nPos ];
@@ -296,6 +298,8 @@ sal_Bool LngParser::Merge(
rtl::OString sNewText;
pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur,
sal_True );
+if( sCur == qtz )
+sNewText = sNewText.copy(6);
if (( !sNewText.isEmpty())
!((
sCur.equalsL(RTL_CONSTASCII_STRINGPARAM(x-comment))) ( sNewText == - )))
{
diff --git a/postprocess/packregistry/makefile.mk
b/postprocess/packregistry/makefile.mk
index f576a10..819dbab 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -517,6 +517,7 @@ $(MISC)/lang/Langpack-{$(alllangiso)}.xcd :
$(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu
$(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
$(MKDIRHIER) $(@:d)
+echo ' $(alllangiso) ***'
- $(RM) $(MISC)/$(@:b).list
echo 'listdependency file=main/' \
'filename$(MY_MOD)/$(@:b).xcu/filename/list'
$(MISC)/$(@:b).list
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index a4ce6ce..3b086c6 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -91,19 +91,8 @@
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a0134feb001416015a27184efd51265ea2e0d0c Author: Andras Timar ati...@suse.com Date: Fri Dec 14 23:56:58 2012 +0100 typo in configure.ac Change-Id: Ic20c758034309a7b67966d73066770c4b870f146 diff --git a/configure.ac b/configure.ac index 63e1479..29462cd 100644 --- a/configure.ac +++ b/configure.ac @@ -11859,7 +11859,7 @@ done WITH_LANG_LIST=`echo $WITH_LANG | sed s/ALL/$ALL_LANGS/` test -z $WITH_LANG_LIST WITH_LANG_LIST=en-US test $WITH_LANG = en-US WITH_LANG= -if test $enable_release_build = -o $enable_releasbie_build = no; then +if test $enable_release_build = -o $enable_release_build = no; then test $WITH_LANG_LIST = en-US || WITH_LANG_LIST=`echo $WITH_LANG_LIST qtz` fi AC_SUBST(ALL_LANGS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |1 - 1 file changed, 1 deletion(-) New commits: commit 5abad485f0efa4e71f99d47e6d053298102eb2b3 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Dec 10 15:00:11 2012 +0100 remove AC_DEFINE(HAVE_CXX0X) There should be no #ifdef for that anyway (given compiler support each feature will need its own check). Change-Id: I1998bfff362f2aef23717735834cacf87d3db90b diff --git a/configure.ac b/configure.ac index 195b832..696f975 100644 --- a/configure.ac +++ b/configure.ac @@ -5735,7 +5735,6 @@ return !(i != 0 j != 0); fi if test $HAVE_CXX0X = TRUE; then AC_MSG_RESULT([yes ($CXXFLAGS_CXX11)]) -AC_DEFINE([HAVE_CXX0X]) else AC_MSG_RESULT([no]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 37 ++---
1 file changed, 2 insertions(+), 35 deletions(-)
New commits:
commit 02e2202894652751f59a0709e1b767e8ed2ab30c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Dec 10 16:15:39 2012 +0100
do not try to use -std=c++11 after all
The very same libstdc++ that breaks with clang and -std=gnu++0x
has also the ABI breakage that prevents using C++11 anyway.
Moreover, there's still the idea that we should preferably use
the gnu variant, just like the default is -std=gnu++98, rather
than strict C++11 (the gcc manpage for -ansi e.g. says that
some builtins are disabled in this case).
Change-Id: I4dac01374ee7a34796161f6e0e76eb962953e709
diff --git a/configure.ac b/configure.ac
index 696f975..caac659 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5658,6 +5658,8 @@ if test $GCC = yes; then
fi
AC_MSG_CHECKING([whether $CXX supports C++11 without Language Defect 757])
+# This should check libstdc++ version, not gcc, but clang has incidentally
C++11 support
+# disabled in this case by the __float128 case below.
if test $GCCVER -ge 040700 -a $GCCVER -lt 040702; then
AC_MSG_NOTICE([Not using -std=gnu++0x on $CXX version 4.7.0/4.7.1 due
to libstdc++ ABI breakage.])
else
@@ -5697,41 +5699,6 @@ return !(i != 0 j != 0);
AC_LANG_POP([C++])
CXXFLAGS=$save_CXXFLAGS
-
-if test $HAVE_CXX0X != TRUE; then
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS=$CXXFLAGS -std=c++11
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include stddef.h
-#include vector
-// some Clang fail when compiling against GCC 4.7 headers
-// with -std=gnu++0x (__float128)
-template typename T, size_t S char
-(sal_n_array_size( T()[S] ))[S];
-namespace
-{
-struct b
-{
-int i;
-int j;
-};
-}
-]], [[
-struct a
-{
-int i;
-int j;
-};
-a thinga[]={{0,0}, {1,1}};
-b thingb[]={{0,0}, {1,1}};
-size_t i = sizeof(sal_n_array_size(thinga));
-size_t j = sizeof(sal_n_array_size(thingb));
-return !(i != 0 j != 0);
-]])],[HAVE_CXX0X=TRUE CXXFLAGS_CXX11=-std=c++11],[])
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-fi
fi
if test $HAVE_CXX0X = TRUE; then
AC_MSG_RESULT([yes ($CXXFLAGS_CXX11)])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |6 ++ 1 file changed, 6 insertions(+) New commits: commit 3c64d866379c3ae78b95b68fffe62685037da707 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Dec 10 19:06:48 2012 +0100 no need for wget/curl when not fetching anything Change-Id: I097675450a0eed87eccf90356c81657485609d13 diff --git a/configure.ac b/configure.ac index caac659..2b12bca 100644 --- a/configure.ac +++ b/configure.ac @@ -11753,6 +11753,10 @@ AC_SUBST(SCPDEFS) # WGET= MD5SUM= +CURL= + +if test $enable_fetch_external != no; then + CURL=`which curl 2/dev/null` for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do @@ -11794,6 +11798,8 @@ if test -z $MD5SUM; then add_warning no md5sum: found! fi +fi + AC_SUBST(WGET) AC_SUBST(CURL) AC_SUBST(MD5SUM) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 15 --- 1 file changed, 15 deletions(-) New commits: commit 0b8077bc0cd027aa51091a004ed7fe1fcab5f5ce Author: Tomáš Chvátal tchva...@suse.cz Date: Sat Dec 8 21:05:51 2012 +0100 Do not keep deprecated switches around This is pretty bad idea, because when you really remove them it prints nice warning, this way tho you have no damn chance to see it unless you read the ./configure --help. Change-Id: I2fc9ffc1dec4d69522e2a7c90cb5cf06f3d70c3d Reviewed-on: https://gerrit.libreoffice.org/1271 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/configure.ac b/configure.ac index 6a5b769..192e28f 100644 --- a/configure.ac +++ b/configure.ac @@ -677,11 +677,6 @@ AC_ARG_ENABLE(vba, [Disables the vba compatibility feature.]) ) -AC_ARG_ENABLE(pch, -AS_HELP_STRING([--enable-pch], -[DEPRECATED : is ignored]) -) - AC_ARG_ENABLE(win-mozab-driver, AS_HELP_STRING([--enable-win-mozab-driver], [LibreOffice includes a driver to connect to Mozilla @@ -1245,11 +1240,6 @@ AC_ARG_WITH(system-nss, [Use NSS/nspr libraries already on system.]),, [with_system_nss=$with_system_libs]) -AC_ARG_WITH(mozilla-toolkit, -AS_HELP_STRING([--with-mozilla-toolkit], -[DEPRECATED : is ignored]), -,) - AC_ARG_WITH(myspell-dicts, AS_HELP_STRING([--without-myspell-dicts], [Removes myspell dictionaries from LibreOffice installation set, for @@ -1646,11 +1636,6 @@ AC_ARG_WITH(system-liblangtag, [Use liblangtag library already on system.]),, [with_system_liblangtag=$with_system_libs]) -AC_ARG_WITH(system-mozilla, -AS_HELP_STRING([--with-system-mozilla], -[DEPRECATED : is ignored]),, -) - AC_ARG_WITH(system-npapi-headers, AS_HELP_STRING([--with-system-npapi-headers], [Use NPAPI headers provided by system instead of bundled ones. Used in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit 1a65a1b4fb54583a1fb1e5b6e7325bfc8a210c34 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Dec 6 02:33:46 2012 +0200 Set OOO_VENDOR to the login name as fallback If OOO_VENDOR is empty you get annoying warnings from the Windows Resource Compiler at line 55 in solenv/inc/shlinfo.rc. diff --git a/configure.ac b/configure.ac index 7a96485..55ca717 100644 --- a/configure.ac +++ b/configure.ac @@ -11866,7 +11866,17 @@ AC_SUBST(EXTRA_BUILDID) OOO_VENDOR= AC_MSG_CHECKING([for vendor]) if test -z $with_vendor -o $with_vendor = no; then -AC_MSG_RESULT([not set]) +OOO_VENDOR=$USERNAME + +if test -z $OOO_VENDOR; then +OOO_VENDOR=$USER +fi + +if test -z $OOO_VENDOR; then +OOO_VENDOR=`id -u -n` +fi + +AC_MSG_RESULT([not set, using $OOO_VENDOR]) else OOO_VENDOR=$with_vendor AC_MSG_RESULT([$OOO_VENDOR]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac download Makefile.top oowintool
Makefile.top |9 -
configure.ac | 229 --
download | 81 --
oowintool| 438 ---
4 files changed, 209 insertions(+), 548 deletions(-)
New commits:
commit f9a687719960a6636186cbd2db917ad660139a11
Author: Peter Foley pefol...@verizon.net
Date: Mon Dec 3 18:11:54 2012 -0500
kill oowintool
Change-Id: Ifb0c8a34ecb7b77a92fb67ca947b4ed46f51fd9a
diff --git a/Makefile.top b/Makefile.top
index 9d88c7c..42e134b 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -145,7 +145,7 @@ ifeq ($(BUILD_DMAKE),YES)
endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
config.log config.status configure \
- config_host.mk.last config_host.mk.stamp src.downloaded warn
+ config_host.mk.last config_host.mk.stamp warn
find $(SOLARENV)/gdb -name *.pyc -exec rm {} \;
#
@@ -165,7 +165,6 @@ ifneq ($(DO_FETCH_TARBALLS),NO)
include $(SRCDIR)/Makefile.fetch
fetch: download
fetch: get-submodules
-fetch: $(SRCDIR)/src.downloaded
ifneq (,$(wildcard .git))
get-submodules:
@@ -195,12 +194,6 @@ endif
endif
-# TODO: This should be really in external/ module, I think.
-$(SRCDIR)/src.downloaded : $(SRCDIR)/download $(SRCDIR)/config_host.mk |
download
-ifeq ($(COM),MSC)
- $ touch $@
-endif
-
else
fetch:
@echo Automatic fetching of external tarballs is disabled.
diff --git a/configure.ac b/configure.ac
index b09f2c2..fc908e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2829,6 +2829,18 @@ AC_SUBST(XCRUN)
dnl ===
dnl Windows specific tests and stuff
dnl ===
+
+reg_get_value()
+{
+ unset regvalue
+ _regvalue=`cat /proc/registry/$1 2 /dev/null`
+
+ if test $? -eq 0; then
+ regvalue=$_regvalue
+ fi
+}
+
+
if test $_os = WINNT -a $WITH_MINGW != yes; then
AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
if test $enable_64_bit = -o $enable_64_bit = no; then
@@ -3029,12 +3041,44 @@ AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
dnl ===
dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
dnl ===
+find_msvs() {
+# find Visual Studio 2012/2010/2008
+for ver in 11.0 10.0 9.0; do
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/ProductDir
+ if test -n $regvalue; then
+ vstest=$regvalue
+ break
+ fi
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VS/ProductDir
+ if test -n $regvalue; then
+ vstest=$regvalue
+ break
+ fi
+done
+}
+
+find_msvc() {
+# find Visual Studio 2012/2010/2008
+for ver in 11.0 10.0 9.0; do
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
+ if test -n $regvalue; then
+ vctest=$regvalue
+ break
+ fi
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VC/ProductDir
+ if test -n $regvalue; then
+ vctest=$regvalue
+ break
+ fi
+done
+}
+
SHOWINCLUDES_PREFIX=
if test $_os = WINNT; then
if test $WITH_MINGW != yes; then
AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation
path])
if test -z $with_cl_home; then
-vctest=`./oowintool --msvc-productdir`
+ find_msvc
if test $BITNESS_OVERRIDE = ; then
if test -x $vctest/bin/cl.exe; then
with_cl_home=$vctest
@@ -4099,7 +4143,6 @@ if test $cross_compiling = yes; then
config.guess \
config_host.mk.in \
configure \
-oowintool \
bin/get_config_variables \
solenv/bin/getcompver.awk \
solenv/inc/langlist.mk \
@@ -4697,7 +4740,146 @@ dnl that to mean Visual Studio .NET 2003 ? And does
this also
dnl in fact apply equally to what we actually support, i.e.
dnl Visual Studio 2008 and 2010?)
dnl ===
+find_csc() {
+if test $VCVER -eq 90; then
+ reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework
Setup/NDP/v3.5/InstallPath
+ if test -n $regvalue; then
+ csctest=$regvalue
+ return
+ fi
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot
+ if test -n $regvalue; then
+ csctest=${regvalue}v2.0.50727
+ fi
+else
+ reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework
Setup/NDP/v4/Client/InstallPath
+ if test -n $regvalue; then
+
[Libreoffice-commits] .: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d5516e8fe2933b482058b0d6ec2e256e21ae93a3
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Dec 6 07:42:21 2012 +0100
MinGW: Fix configure.
Change-Id: Ia4f72b7bfe12f8f7e526b7dc2a2a2ba3d6eae861
diff --git a/configure.ac b/configure.ac
index fc908e3..c9f9337 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5983,7 +5983,7 @@ if test $_os = Linux -a $host_cpu = powerpc; then
fi
AC_SUBST([JITC_PROCESSOR_TYPE])
-if test $_os = WINNT; then
+if test $_os = WINNT -a $WITH_MINGW != yes; then
AC_MSG_CHECKING([for Microsoft_VC${VCVER}_CRT_x86.msm])
copy_msms
if test -n $msms_copied ; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac .gitignore
.gitignore |1 -
configure.ac |6 --
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit de2c6007fc584150210eb29d15044fca0d8321f7
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 14:59:42 2012 +0100
Do not accumulate warnings across configure runs
...and remove temporary file again.
Change-Id: I199b054d8e7b87d1c9268abbe628393d480e42f7
diff --git a/.gitignore b/.gitignore
index ddb84f7..4431992 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,6 @@
# misc
/file-lists
/cross-build-toolset.built
-/warn
/build.log
/build_error.log
/install
diff --git a/configure.ac b/configure.ac
index eb2389d..1e80d4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,11 +49,12 @@ PathFormat()
fi
}
+rm -f warn
have_WARNINGS=no
add_warning()
{
if test $have_WARNINGS = no; then
-echo * warn
+echo * warn
have_WARNINGS=yes
if which tput /dev/null 2/dev/null test `tput colors` -ge 8; then
dnl esc as actual byte (U+1b), [ escaped using quadrigraph @:@
@@ -12492,7 +12493,8 @@ _EOF
fi
if test -f warn; then
- cat warn
+cat warn
+rm warn
fi
dnl vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac Makefile.fetch
Makefile.fetch |2 +- configure.ac |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 56da3f2a9fbf9e8787c8bc14d171fc77eb53d876 Author: Andras Timar ati...@suse.com Date: Thu Dec 6 22:07:53 2012 +0100 Numbertext 0.9.5 (Python 3 fixes) Change-Id: Ic5d8f8a975861c63354d28f5043abb5ead29192b diff --git a/Makefile.fetch b/Makefile.fetch index 12f3750..0cc0e32 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -142,6 +142,7 @@ $(WORKDIR)/download: $(SRCDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/M $(call fetch_Optional,MYTHES,$(MYTHES_TARBALL)) \ $(call fetch_Optional,NEON,$(NEON_TARBALL)) \ $(call fetch_Optional,NSS,$(NSS_TARBALL)) \ + $(NUMBERTEXT_EXTENSION_PACK) \ $(call fetch_Optional,OPENLDAP,$(OPENLDAP_TARBALL)) \ $(call fetch_Optional,OPENSSL,$(OPENSSL_TARBALL)) \ $(call fetch_Optional,ORCUS,$(ORCUS_TARBALL)) \ @@ -172,7 +173,6 @@ $(WORKDIR)/download: $(SRCDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/M $(BARCODE_EXTENSION_PACK) \ $(DIAGRAM_EXTENSION_PACK) \ $(HUNART_EXTENSION_PACK) \ - $(NUMBERTEXT_EXTENSION_PACK) \ $(OOOP_FONTS_PACK) \ $(OOOP_GALLERY_PACK) \ $(OOOP_SAMPLES_PACK) \ diff --git a/configure.ac b/configure.ac index 1e80d4f..149ebbb 100644 --- a/configure.ac +++ b/configure.ac @@ -10909,7 +10909,7 @@ AC_MSG_CHECKING([for Numbertext extension integration]) NUMBERTEXT_EXTENSION_PACK= if test x$enable_ext_numbertext = xyes -a x$enable_extension_integration != xno; then SCPDEFS=$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT - NUMBERTEXT_EXTENSION_PACK=b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt + NUMBERTEXT_EXTENSION_PACK=b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt WITH_EXTRA_EXTENSIONS=YES AC_MSG_RESULT([yes]) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 340 ++-
1 file changed, 174 insertions(+), 166 deletions(-)
New commits:
commit 987d991ecd25b295f9694920b84823f148e6c8b5
Author: Peter Foley pefol...@verizon.net
Date: Thu Dec 6 17:27:27 2012 -0500
formating cleanup
Change-Id: I851f4f82caa8483a296da3c8337ccbedccf7c5de
diff --git a/configure.ac b/configure.ac
index 149ebbb..add8364 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2823,12 +2823,12 @@ dnl
===
reg_get_value()
{
- unset regvalue
- _regvalue=`cat /proc/registry/$1 2 /dev/null`
+unset regvalue
+_regvalue=`cat /proc/registry/$1 2 /dev/null`
- if test $? -eq 0; then
- regvalue=$_regvalue
- fi
+if test $? -eq 0; then
+regvalue=$_regvalue
+fi
}
@@ -3032,36 +3032,38 @@ AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
dnl ===
dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
dnl ===
-find_msvs() {
-# find Visual Studio 2012/2010/2008
-for ver in 11.0 10.0 9.0; do
- reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/ProductDir
- if test -n $regvalue; then
- vstest=$regvalue
- break
- fi
- reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VS/ProductDir
- if test -n $regvalue; then
- vstest=$regvalue
- break
- fi
-done
+find_msvs()
+{
+# find Visual Studio 2012/2010/2008
+for ver in 11.0 10.0 9.0; do
+reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/ProductDir
+if test -n $regvalue; then
+vstest=$regvalue
+break
+fi
+reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VS/ProductDir
+if test -n $regvalue; then
+vstest=$regvalue
+break
+fi
+done
}
-find_msvc() {
-# find Visual Studio 2012/2010/2008
-for ver in 11.0 10.0 9.0; do
- reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
- if test -n $regvalue; then
- vctest=$regvalue
- break
- fi
- reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VC/ProductDir
- if test -n $regvalue; then
- vctest=$regvalue
- break
- fi
-done
+find_msvc()
+{
+# find Visual Studio 2012/2010/2008
+for ver in 11.0 10.0 9.0; do
+reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
+if test -n $regvalue; then
+vctest=$regvalue
+break
+fi
+reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VC/ProductDir
+if test -n $regvalue; then
+vctest=$regvalue
+break
+fi
+done
}
SHOWINCLUDES_PREFIX=
@@ -3069,7 +3071,7 @@ if test $_os = WINNT; then
if test $WITH_MINGW != yes; then
AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation
path])
if test -z $with_cl_home; then
- find_msvc
+find_msvc
if test $BITNESS_OVERRIDE = ; then
if test -x $vctest/bin/cl.exe; then
with_cl_home=$vctest
@@ -4731,145 +4733,151 @@ dnl that to mean Visual Studio .NET 2003 ? And does
this also
dnl in fact apply equally to what we actually support, i.e.
dnl Visual Studio 2008 and 2010?)
dnl ===
-find_csc() {
-if test $VCVER -eq 90; then
- reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework
Setup/NDP/v3.5/InstallPath
- if test -n $regvalue; then
- csctest=$regvalue
- return
- fi
- reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot
- if test -n $regvalue; then
- csctest=${regvalue}v2.0.50727
- fi
-else
- reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework
Setup/NDP/v4/Client/InstallPath
- if test -n $regvalue; then
- csctest=$regvalue
- break
- fi
-fi
+find_csc()
+{
+if test $VCVER -eq 90; then
+reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework
Setup/NDP/v3.5/InstallPath
+if test -n $regvalue; then
+csctest=$regvalue
+return
+
[Libreoffice-commits] .: configure.ac
configure.ac |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 2d655683dda815021011d9dd135a263f0003bed5 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Dec 4 12:32:10 2012 +0100 Typos Change-Id: I40aff76df4ddef3774632a3dcdf67b943229feb3 diff --git a/configure.ac b/configure.ac index ff95721..9af58c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1848,7 +1848,7 @@ AC_ARG_WITH(nss-build-tools, AS_HELP_STRING([--with-nss-build-tools], [For Windows users, please supply the path to the nss build tools.]) [ - Usage: --with-nss-build=absolute path to + Usage: --with-nss-build-tools=absolute path to nss build tools At the moment of this writing, an installer for the @@ -8038,7 +8038,7 @@ if test $_os != WINNT; then # new and shiny mork driver AC_MSG_RESULT([yes (new mork driver)]) else -if test WITH_MOZAB4WIN = NO; then +if test $WITH_MOZAB4WIN = NO; then AC_MSG_RESULT([no]) else AC_MSG_RESULT([yes, internal (old windows mozab driver)]) @@ -8103,7 +8103,7 @@ else AC_MSG_CHECKING([for nss build tooling]) # coming from mozilla if test -z $NSSBUILDTOOLS; then AC_MSG_ERROR([nss build tooling not provided -Use the --with-nss-build option after installing the tools obtained +Use the --with-nss-build-tools option after installing the tools obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32]) else if test \( $WITH_MINGW = yes -a ! -d $NSSBUILDTOOLS \) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac instsetoo_native/util solenv/inc
configure.ac |2
instsetoo_native/util/openoffice.lst | 92 +--
solenv/inc/minor.mk |6 +-
solenv/inc/productversion.mk |2
4 files changed, 51 insertions(+), 51 deletions(-)
New commits:
commit 0178ef0039a10a9d2adfe081845ac2e6e8e0ef05
Author: Petr Mladek pmla...@suse.cz
Date: Tue Dec 4 17:17:11 2012 +0100
bump product version to 4.1.0.0.alpha0+, build id to 0
Change-Id: I0a8e86dc862b05e8c92738a565ae1513ea9e60b0
diff --git a/configure.ac b/configure.ac
index 9af58c7..bb7575f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil;
fill-column: 102 -*
dnl configure.ac serves as input for the GNU autoconf package
dnl in order to create a configure script.
-AC_INIT([LibreOffice],[4.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 2f1ccf8..487f460 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,13 +4,13 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.0.0.alpha1
+UREPACKAGEVERSION 4.1.0.0.alpha0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
-UNIXBASISROOTNAME libreoffice4.0
-SERVICETAG_PRODUCTNAME LibreOffice 4.0
-SERVICETAG_PRODUCTVERSION 4.0
-SERVICETAG_PARENTNAME LibreOffice 4.0
+UNIXBASISROOTNAME libreoffice4.1
+SERVICETAG_PRODUCTNAME LibreOffice 4.1
+SERVICETAG_PRODUCTVERSION 4.1
+SERVICETAG_PARENTNAME LibreOffice 4.1
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
HIDELICENSEDIALOG 1
@@ -47,17 +47,17 @@ LibreOffice
variables
{
PRODUCTNAME LibreOffice
-PRODUCTVERSION 4.0
+PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
+SHORT_PRODUCTEXTENSION .0.0.alpha0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 4.0
+BRANDPACKAGEVERSION 4.1
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha1
+ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
ABOUTBOXPRODUCTVERSIONSUFFIX +
-BASEPRODUCTVERSION 4.0
+BASEPRODUCTVERSION 4.1
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -99,18 +99,18 @@ LibreOffice_Dev
variables
{
PRODUCTNAME LOdev
-PRODUCTVERSION 4.0
+PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
-UNIXBASISROOTNAME lodev4.0
+SHORT_PRODUCTEXTENSION .0.0.alpha0
+UNIXBASISROOTNAME lodev4.1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 4.0
+BRANDPACKAGEVERSION 4.1
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha1
+ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
ABOUTBOXPRODUCTVERSIONSUFFIX +
-BASEPRODUCTVERSION 4.0
+BASEPRODUCTVERSION 4.1
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -123,7 +123,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -160,13 +160,13 @@ URE
variables
{
PRODUCTNAME URE
-PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.0.0.alpha1
+PRODUCTVERSION 4.1
+PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION 1
PRODUCTEXTENSION
-BRANDPACKAGEVERSION 4.0
+BRANDPACKAGEVERSION 4.1
LONG_PRODUCTEXTENSION
-
[Libreoffice-commits] .: configure.ac officecfg/registry scp2/source scripting/Extension_ScriptProviderForPython.mk scripting/Module_scripting.mk scripting/Package_scriptproviderforpython.mk scripting
configure.ac|2 officecfg/registry/data/org/openoffice/Setup.xcu|1 scp2/source/extensions/directory_extensions.scp | 11 - scp2/source/extensions/file_extensions.scp | 17 +-- scp2/source/extensions/module_extensions.scp|5 +- scripting/Extension_ScriptProviderForPython.mk | 36 scripting/Module_scripting.mk |3 - scripting/Package_scriptproviderforpython.mk| 15 ++ scripting/source/pyprov/META-INF/manifest.xml | 24 -- scripting/source/pyprov/components.rdb | 26 --- scripting/source/pyprov/description-en-US.txt |1 scripting/source/pyprov/description.xml | 44 scripting/source/pyprov/pythonscript.py |2 scripting/source/pyprov/scriptproviderforpython.rdb | 28 14 files changed, 63 insertions(+), 152 deletions(-) New commits: commit 1f3496e204cd305264d27a362f34fdcb6fa5f693 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 30 10:23:23 2012 +0100 Turn Python Scripting Provider from bundled extension to plain code To avoid unnecessary confusion between the newly plain code and any instance of the old extension still installed (per-user or shared), I renamed the UNO implementation identifier org.openoffice.pyuno.LanguageScriptProviderForPython to org.libreoffice.pyuno.LanguageScriptProviderForPython. Also, existing installations of the extension are explicitly not migrated to new user profiles. Change-Id: Id3dd66ba5e52e0962f7ad0ccb5e4ad5b0bec97fa diff --git a/configure.ac b/configure.ac index 4b51831..4cfcb92 100644 --- a/configure.ac +++ b/configure.ac @@ -10182,7 +10182,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 +SCPDEFS=$SCPDEFS -DWITHOUT_SCRIPTING_PYTHON else ENABLE_SCRIPTING_PYTHON=YES fi diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 05ddaac..da0c62e 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -798,6 +798,7 @@ !-- arguably, dropping PDFImport extensions should be conditional on having in-core PDF import actually built and installed -- +itcom.sun.star.script.provider.ScriptProviderForPython/it /value /prop /node diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index 9d3a018..eb3a08e 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -226,15 +226,4 @@ End #endif -/* ** Script provider for Python ** */ - -#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON - -Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python -ParentID = gid_Brand_Dir_Share_Extensions; -DosName = script-provider-for-python; -End - -#endif - #endif diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 24b2e77..7633125 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -297,13 +297,20 @@ End /* ** Script provider for Python ** */ -#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON +#ifndef WITHOUT_SCRIPTING_PYTHON -File gid_File_Oxt_Script_Provider_For_Python +File gid_File_Py_Pythonscript TXT_FILE_BODY; -Styles = (PACKED, ARCHIVE); -Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python; -Name = script-provider-for-python.oxt; +Dir = gid_Brand_Dir_Program; +Name = pythonscript.py; +Styles = (PACKED); +End + +File gid_File_Rdb_Scriptproviderforpython +TXT_FILE_BODY; +Dir = gid_Brand_Dir_Program_Services; +Name = scriptproviderforpython.rdb; +Styles = (PACKED); End #endif diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 37558c3..17c7710 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -334,14 +334,15 @@ End /* ** Script provider for Python ** */ -#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON +#ifndef WITHOUT_SCRIPTING_PYTHON Module gid_Module_Optional_Extensions_Script_Provider_For_Python PackageInfo = packinfo_extensions.txt; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON); ParentID = gid_Module_Optional_Extensions; Files = ( -gid_File_Oxt_Script_Provider_For_Python ); +gid_File_Py_Pythonscript, +
[Libreoffice-commits] .: configure.ac Makefile.top
Makefile.top |4 ++--
configure.ac |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 81b959dd976d4caf8a5be9ef7e9cc343ab2f6289
Author: Peter Foley pefol...@verizon.net
Date: Fri Nov 30 10:20:28 2012 -0500
cosmetic fixes
Change-Id: I763412bd1b6713b91c2e4a8d575ee2a14e9d5cf2
diff --git a/Makefile.top b/Makefile.top
index 559b300..3cd9034 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -29,10 +29,10 @@ endif
# by the module being mentioned in packimages/prj/build.lst, etc, recursively.
$(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake)
$(SRCDIR)/config_host.mk
mkdir -p $(dir $@)
- echo -n gbuild_modules:= $@
+ echo -n gbuild_modules:= $@
for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done $@
echo $@
- echo -n dmake_modules:= $@
+ echo -n dmake_modules:= $@
for m in */prj/dmake; do echo $$m | sed -e 's/\/.*$$/ \\/'; done $@
echo $@
diff --git a/configure.ac b/configure.ac
index 4cfcb92..e0b8342 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5821,7 +5821,7 @@ fi
AC_SUBST([JITC_PROCESSOR_TYPE])
if test $_os = WINNT; then
-AC_MSG_CHECKING([for Microsoft_VC$VCVER_CRT_x86.msm])
+AC_MSG_CHECKING([for Microsoft_VC${VCVER}_CRT_x86.msm])
if ./oowintool --msvc-find-msms; then
AC_MSG_RESULT([yes])
SCPDEFS=$SCPDEFS -DWITH_VC$VCVER_REDIST
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 26 +- 1 file changed, 25 insertions(+), 1 deletion(-) New commits: commit 49c728d4179d12551c9394c1f58191f71f1f6e66 Author: Tor Lillqvist t...@iki.fi Date: Thu Nov 29 10:22:16 2012 +0200 For now, we need a system Python to run build-time Python scripts on OS X Change-Id: Ia46126f9f56668a14a66679b697ce54cec6ea0b8 diff --git a/configure.ac b/configure.ac index cbbc0f6..1811643 100644 --- a/configure.ac +++ b/configure.ac @@ -7362,11 +7362,35 @@ else AM_PATH_PYTHON([3.3]) fi elif test $enable_python = auto; then -dnl This allows lack of system Python +# We should not come here in a MSVC build, I think? +if test $build_os = cygwin; then +AC_MSG_ERROR([Assertion failed - should not be here in a MSVC build]) +fi + +# This allows a lack of system Python 3.3 with no error, we check below for a system Python of +# earlier version. AM_PATH_PYTHON([3.3],, [:]) if test $PYTHON = :; then enable_python=internal + +if test $_os = Darwin; then + # See the fixme in gbuild.mk + + # There must be a system Python, 2.6 should be fine (?), to run build-time Python scripts + # like filter/source/svg/js2hxx.py. (Is that the only build-time Python script?) If we + # don't do this, PYTHON will stay with the value : which of course makes runing + # build-time Python scripts rather ineffective. + + # Unset variables set by the above AM_PATH_PYTHON so that we acutally do check anew + # Finding an (old) system Python should not confuse our already decided intent to build an + # internal Python 3.3, that is directed by enable_python = internal. + unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON + AM_PATH_PYTHON([2.6]) + else + # For Linux it works to use the internally built Python, see gbuild.mk + : + fi else enable_python=system fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 32 1 file changed, 16 insertions(+), 16 deletions(-) New commits: commit 8b2dfe517571fdf001a54ad6b10feb1badac6815 Author: Tor Lillqvist t...@iki.fi Date: Thu Nov 29 10:26:20 2012 +0200 Fix indentation Change-Id: I7efac64042fdd0b985114b06314cd7b81a6ecf6d diff --git a/configure.ac b/configure.ac index 1811643..ef57fbb 100644 --- a/configure.ac +++ b/configure.ac @@ -7375,22 +7375,22 @@ else enable_python=internal if test $_os = Darwin; then - # See the fixme in gbuild.mk - - # There must be a system Python, 2.6 should be fine (?), to run build-time Python scripts - # like filter/source/svg/js2hxx.py. (Is that the only build-time Python script?) If we - # don't do this, PYTHON will stay with the value : which of course makes runing - # build-time Python scripts rather ineffective. - - # Unset variables set by the above AM_PATH_PYTHON so that we acutally do check anew - # Finding an (old) system Python should not confuse our already decided intent to build an - # internal Python 3.3, that is directed by enable_python = internal. - unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON - AM_PATH_PYTHON([2.6]) - else - # For Linux it works to use the internally built Python, see gbuild.mk - : - fi +# See the fixme in gbuild.mk + +# There must be a system Python, 2.6 should be fine (?), to run build-time Python scripts +# like filter/source/svg/js2hxx.py. (Is that the only build-time Python script?) If we +# don't do this, PYTHON will stay with the value : which of course makes runing +# build-time Python scripts rather ineffective. + +# Unset variables set by the above AM_PATH_PYTHON so that we acutally do check anew +# Finding an (old) system Python should not confuse our already decided intent to build an +# internal Python 3.3, that is directed by enable_python = internal. +unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON +AM_PATH_PYTHON([2.6]) +else +# For Linux it works to use the internally built Python, see gbuild.mk +: +fi else enable_python=system fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro
README.cross |1
configure.ac | 31 +-
distro-configs/LibreOfficeAndroid.conf|1
distro-configs/LibreOfficeAndroidX86.conf |1
distro-configs/LibreOfficeLinux.conf |1
distro-configs/LibreOfficeMacOSX.conf |1
distro-configs/LibreOfficeOpenBSD.conf|1
distro-configs/LibreOfficeWin32.conf |1
distro-configs/LibreOfficeWin64.conf |1
9 files changed, 2 insertions(+), 37 deletions(-)
New commits:
commit 5c159626c6b3ace5becf03aad5ed9a1851065c15
Author: Tor Lillqvist t...@iki.fi
Date: Thu Nov 29 15:47:51 2012 +0200
Always use Java target version 1.5
It has been way too common for people to accidentally have a javac
from JDK 7 create class files that are of the newest version, which
older JREs and Android's dex then don't understand.
As many of the distro-configs files specified
--with-java-target-version=1.5 anyway, let's just hardcode that for
now.
Change-Id: I0853820dc56a062f053b5c2c30097bf1ff3798c1
diff --git a/README.cross b/README.cross
index 22f434a..474b65c 100644
--- a/README.cross
+++ b/README.cross
@@ -356,7 +356,6 @@ And here is an autogen.lastrun for Android when
cross-compiling from Linux:
--with-android-ndk=/home/tml/android-ndk-r8b
--with-android-ndk-toolchain-version=4.6
--with-android-sdk=/home/tml/android-sdk-linux
---with-java-target-version=1.5
And here is an autogen.lastrun for Android when cross-compiling to x86 from
Linux:
diff --git a/configure.ac b/configure.ac
index c40e523..de685d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1724,18 +1724,6 @@ AC_ARG_WITH(java,
[ with_java=java ]
)
-AC_ARG_WITH(java-target-version,
-AS_HELP_STRING([--with-java-target-version],
-[Generate class files that will work on JVMs with the specified
version.
- For example, use --with-java-target-version=1.5 to make sure that the
- application will work with JVM 1.5 even when compiled with JDK 1.6.])
-[
- This option is ignored when you compile with gcj/gij.
-
- Usage: --with-java-target-version=jvm version
-],
-,)
-
AC_ARG_WITH(jvm-path,
AS_HELP_STRING([--with-jvm-path],
[Use a specific JVM search path at runtime.])
@@ -5979,25 +5967,10 @@ else
fi
dnl ===
-dnl Check for target Java bytecode version
+dnl Set target Java bytecode version
dnl ===
if test $SOLAR_JAVA != ; then
-AC_MSG_CHECKING([for target Java bytecode version])
-if test $JDK = gcj -o $JDK = kaffe; then
-_java_target_ver=1.5
-AC_MSG_RESULT([default by $JDK])
-if test -n $with_java_target_version -a $with_java_target_version
!= no; then
-AC_MSG_WARN([Value defined by --with-java-target-version is
ignored!])
-fi
-elif test -n $with_java_target_version -a $with_java_target_version !=
no; then
-_java_target_ver=$with_java_target_version
-AC_MSG_RESULT([$_java_target_ver])
-elif test $_jdk_ver -gt 1; then
-_java_target_ver=`echo $_jdk_ver | $AWK '{ maj=substr($0,1,1);
min=substr($0,2,2); print int(maj).int(min) }'`
-AC_MSG_RESULT([$_java_target_ver])
-else
-AC_MSG_ERROR([Unable to guess Java bytecode version from Java
version!])
-fi
+_java_target_ver=1.5
JAVA_SOURCE_VER=$_java_target_ver
JAVA_TARGET_VER=$_java_target_ver
diff --git a/distro-configs/LibreOfficeAndroid.conf
b/distro-configs/LibreOfficeAndroid.conf
index 14b31df..0758a8a 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -23,4 +23,3 @@
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
---with-java-target-version=1.5
diff --git a/distro-configs/LibreOfficeAndroidX86.conf
b/distro-configs/LibreOfficeAndroidX86.conf
index 43f1c0b..a453fa3 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -23,4 +23,3 @@
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
---with-java-target-version=1.5
diff --git a/distro-configs/LibreOfficeLinux.conf
b/distro-configs/LibreOfficeLinux.conf
index 0ffc31c..244bffd 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -15,7 +15,6 @@
--without-junit
--without-helppack-integration
--with-linker-hash-style=both
---with-java-target-version=1.5
--with-fonts
--with-external-thes-dir=/usr/share/mythes
--with-external-hyph-dir=/usr/share/hyphen
diff --git a/distro-configs/LibreOfficeMacOSX.conf
b/distro-configs/LibreOfficeMacOSX.conf
index 686f5fe..2ca1070 100644
---
[Libreoffice-commits] .: configure.ac distro-configs/LibreOfficeMinGW.conf README.cross
README.cross |3 ++- configure.ac | 26 +- distro-configs/LibreOfficeMinGW.conf |1 + 3 files changed, 16 insertions(+), 14 deletions(-) New commits: commit 7861bf081e2802a16f0be31edf7b3d1667f238dc Author: Jan Holesovsky ke...@suse.cz Date: Sun Nov 25 12:46:10 2012 +0100 Update to be able to at least start the MinGW build again. Change-Id: I51a3cf81bf6ba4f0d50cb3f2ac52c2d220955b56 diff --git a/README.cross b/README.cross index 7b366d1..22f434a 100644 --- a/README.cross +++ b/README.cross @@ -92,7 +92,8 @@ zypper in mingw32-cross-gcc mingw32-cross-gcc-c++ mingw32-python-devel \ mingw32-cross-pkg-config mingw32-pkg-config mingw32-libcppunit \ mingw32-libcppunit-devel mingw32-libredland mingw32-libredland-devel \ mingw32-libmythes mingw32-libmythes-devel mingw32-mozilla-nss \ -mingw32-mozilla-nss-devel mingw32-mozilla-nspr mingw32-mozilla-nspr-devel +mingw32-mozilla-nss-devel mingw32-mozilla-nspr \ +mingw32-mozilla-nspr-devel mingw32-libpoppler mingw32-libpoppler-devel You also need wine, ideally: diff --git a/configure.ac b/configure.ac index 605dd1a..dd4c40d 100644 --- a/configure.ac +++ b/configure.ac @@ -4158,6 +4158,7 @@ if test $cross_compiling = yes; then ./configure \ --disable-graphite \ --disable-build-mozilla \ +--disable-pdfimport \ --disable-postgresql-sdbc \ --disable-zenity \ --with-parallelism=$with_parallelism \ @@ -6938,9 +6939,11 @@ if test $with_system_expat = yes; then else AC_MSG_RESULT([internal]) SYSTEM_EXPAT=NO -EXPAT_TARBALL=dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz BUILD_TYPE=$BUILD_TYPE EXPAT fi +if test $with_system_expat != yes -o $with_system_expat_for_build != yes; then +EXPAT_TARBALL=dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz +fi AC_SUBST(SYSTEM_EXPAT) AC_SUBST(EXPAT_TARBALL) AC_SUBST([MINGW_EXPAT_DLL]) @@ -7087,9 +7090,11 @@ if test $with_system_cppunit = yes; then else AC_MSG_RESULT([internal]) SYSTEM_CPPUNIT=NO -CPPUNIT_TARBALL=fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz BUILD_TYPE=$BUILD_TYPE CPPUNIT fi +if test $with_system_cppunit != yes -o $with_system_cppunit_for_build != yes; then +CPPUNIT_TARBALL=fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz +fi AC_SUBST(SYSTEM_CPPUNIT) AC_SUBST(CPPUNIT_CFLAGS) AC_SUBST(CPPUNIT_LIBS) @@ -7924,6 +7929,8 @@ else AC_MSG_RESULT([internal]) BUILD_TYPE=$BUILD_TYPE BOOST SYSTEM_BOOST=NO +fi +if test $with_system_boost != yes -o $with_system_boost_for_build != yes; then BOOST_TARBALL=f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 fi AC_SUBST([MINGW_BOOST_DATE_TIME_DLL]) @@ -8476,6 +8483,10 @@ You can use --with-system-icu-for-build=force to use it anyway.]) else AC_MSG_RESULT([internal]) SYSTEM_ICU=NO + +BUILD_TYPE=$BUILD_TYPE ICU +fi +if test $with_system_icu != yes -o $with_system_icu_for_build != yes; then ICU_TARBALL=7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz # Save space when using a bundled ICU by leaving out unneeded parts of the ICU data. Generated by @@ -8487,10 +8498,7 @@ else # appropriately. Let's not bother trying to list what stuff has been removed in the file name. # Describe it in the comment above instead. ICU_DATA_SUBSET_ZIP=fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip - -BUILD_TYPE=$BUILD_TYPE ICU fi - AC_SUBST(SYSTEM_ICU) AC_SUBST(SYSTEM_GENBRK) AC_SUBST(SYSTEM_GENCCODE) @@ -12490,14 +12498,6 @@ fi AC_SUBST(LO_PATH) -BUILD_TARBALLS= -# Ugly hack to get what we need for build platform into ooo.lst -if test $CROSS_COMPILING = YES ; then -# ICU_DATA_SUBSET_ZIP -BUILD_TARBALLS=$BUILD_TARBALLS fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip -fi -AC_SUBST(BUILD_TARBALLS) - # make sure config.guess is +x; we execute config.guess, so it has to be so chmod +x ./config.guess diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index 2ac91eb..039ce78 100644 --- a/distro-configs/LibreOfficeMinGW.conf +++ b/distro-configs/LibreOfficeMinGW.conf @@ -16,6 +16,7 @@ --with-system-neon --with-system-nss --with-system-openssl +--with-system-poppler --with-system-redland --without-junit --without-myspell-dicts ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit febad365b8eba7712ec820d17bbfac9bea41cf6b Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Nov 26 13:05:22 2012 +0200 Clarify --disable-export meaning Change-Id: I7074ece89025f4a82c7ce1818576591f8852cd3c diff --git a/configure.ac b/configure.ac index dd4c40d..68cb5bc 100644 --- a/configure.ac +++ b/configure.ac @@ -551,8 +551,9 @@ AC_ARG_ENABLE(ext-barcode, AC_ARG_ENABLE(export, AS_HELP_STRING([--disable-export], -[Disable (some) code for document format export. Useful when building *viewer* apps to avoid - having export-related code and data linked in. Work in progress, use only if you are hacking on it.]) +[Disable (some) code for document export. Useful when building viewer-only apps that lack + save/export functionality, to avoid having an excessive amount of code and data used + only for exporrt linked in. Work in progress, use only if you are hacking on it.]) ) AC_ARG_ENABLE(database-connectivity, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac libvisio/libvisio-0.0.20-zlib.patch libvisio/UnpackedTarball_visio.mk
configure.ac|2 +-
libvisio/UnpackedTarball_visio.mk |6 --
libvisio/libvisio-0.0.20-zlib.patch | 26 --
3 files changed, 1 insertion(+), 33 deletions(-)
New commits:
commit d34ce24fb22566ed3db91aba71a003d5919a3f00
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Wed Nov 21 10:55:35 2012 +0100
Uploading libvisio 0.0.21 release
We can now open ALL Visio file-formats that ever existed
Change-Id: Icfe91421c8ddbba206e2cc0ce59bf718883e5477
diff --git a/configure.ac b/configure.ac
index 2f16682..4fb7e73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6960,7 +6960,7 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBVISIO=NO
-VISIO_TARBALL=2d8c3b50f77c544f317ab0a8838fadcb-libvisio-0.0.20.tar.bz2
+VISIO_TARBALL=1e961f0112e5986105749640c2b9bc41-libvisio-0.0.21.tar.bz2
fi
AC_SUBST(SYSTEM_LIBVISIO)
AC_SUBST(VISIO_CFLAGS)
diff --git a/libvisio/UnpackedTarball_visio.mk
b/libvisio/UnpackedTarball_visio.mk
index 59d4adb..aa9113b 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,visio,\
- libvisio/libvisio-0.0.20-zlib.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.20-zlib.patch
b/libvisio/libvisio-0.0.20-zlib.patch
deleted file mode 100644
index 28cf881..000
--- a/libvisio/libvisio-0.0.20-zlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
libvisio-0.0.20/configure
-+++ libvisio-0.0.20/configure
-@@ -17165,8 +17165,8 @@
- fi
-
- fi
--LIBVISIO_CXXFLAGS=${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS}
--LIBVISIO_LIBS=${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS}
-+LIBVISIO_CXXFLAGS=${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS}
${ZLIB_CFLAGS}
-+LIBVISIO_LIBS=${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS}
-
-
-
libvisio-0.0.20/Makefile.in
-+++ libvisio-0.0.20/Makefile.in
-@@ -55,8 +55,8 @@
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/libvisio-0.0.pc.in $(srcdir)/libvisio-zip.in \
- $(srcdir)/libvisio.spec.in $(top_srcdir)/configure AUTHORS \
-- NEWS ar-lib config.guess config.sub install-sh ltmain.sh \
-- missing
-+ NEWS ar-lib config.guess config.sub depcomp install-sh \
-+ ltmain.sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac scp2/source
configure.ac |5 +++-- scp2/source/ooo/file_library_ooo.scp |8 +--- 2 files changed, 4 insertions(+), 9 deletions(-) New commits: commit e22be4a8e4da40dd6609147513aea36bc8f5cfb9 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Nov 21 11:08:21 2012 +0100 scp2: more cairo fixes Change-Id: Icaaf0c8355d992fcf652c275ea1ebff98f6d3d58 diff --git a/configure.ac b/configure.ac index 4fb7e73..347f43b 100644 --- a/configure.ac +++ b/configure.ac @@ -11358,8 +11358,6 @@ else fi AC_SUBST(ENABLE_SILENT_MSI) -AC_SUBST(SCPDEFS) - AC_MSG_CHECKING([whether and how to use Xinerama]) if test $_os = Darwin; then USE_XINERAMA=YES @@ -11473,6 +11471,7 @@ if test $test_cairo = yes ; then CAIRO_TARBALL=f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz PIXMAN_TARBALL=c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 BUILD_TYPE=$BUILD_TYPE CAIRO +SCPDEFS=$SCPDEFS -DNEED_CAIRO fi fi @@ -11825,6 +11824,8 @@ else fi AC_SUBST([DOXYGEN]) +AC_SUBST(SCPDEFS) + dnl === dnl Product version dnl === diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 19e7158..9df93a8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -569,11 +569,7 @@ End #endif -#ifndef LIBO_HEADLESS - -#if !defined SYSTEM_CAIRO \ - (defined ENABLE_CAIRO_CANVAS \ -|| (defined WNT !defined ENABLE_DIRECTX)) +#ifdef NEED_CAIRO File gid_File_Lib_Cairo LIB_FILE_BODY; @@ -609,8 +605,6 @@ End #endif -#endif - STD_LIB_FILE( gid_File_Lib_Frm , frm) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 93abcf4e4bb1a460d7695b6374bf4a92c9203512 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Nov 21 14:55:58 2012 +0100 get ICU_DATA_SUBSET_ZIP into ooo.lst when cross-compiling Change-Id: I73ef1e331f3cec8e2769b177ec1767cf35fcb817 diff --git a/configure.ac b/configure.ac index 347f43b..b09d2c9 100644 --- a/configure.ac +++ b/configure.ac @@ -12506,9 +12506,13 @@ fi AC_SUBST(LO_PATH) -# We need at least berkeleydb for build platform in ooo.lst +BUILD_TARBALLS= +# Ugly hack to get what we need for build platform into ooo.lst if test $CROSS_COMPILING = YES ; then - BUILD_TARBALLS=d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz +# BERKELEYDB_TARBALL +BUILD_TARBALLS=$BUILD_TARBALLS d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz +# ICU_DATA_SUBSET_ZIP +BUILD_TARBALLS=$BUILD_TARBALLS fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip fi AC_SUBST(BUILD_TARBALLS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac editeng/prj instsetoo_native/prj librelogo/prj Module_cross_tail_build.mk Module_tail_build.mk RepositoryModule_ooo.mk sdext/prj setup_native/prj svl/prj sysui/pr
Module_cross_tail_build.mk |1 - Module_tail_build.mk |1 - RepositoryModule_ooo.mk|1 - configure.ac |1 - editeng/prj/build.lst |2 +- instsetoo_native/prj/build.lst |2 +- librelogo/prj/build.lst|2 +- sdext/prj/build.lst|2 +- setup_native/prj/build.lst |2 +- svl/prj/build.lst |2 +- sysui/prj/build.lst|2 +- vcl/prj/build.lst |2 +- 12 files changed, 8 insertions(+), 12 deletions(-) New commits: commit c75ed68f056342477586ebd4214786f5a440005e Author: Andras Timar ati...@suse.com Date: Tue Nov 20 22:10:21 2012 +0100 translations is a source-only module Change-Id: Ib89ccdfe3646f68df6b483c54eb330c0b223c32a diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index de8bc75..2e15516 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -68,7 +68,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ stoc \ store \ tools \ - $(call gb_Helper_optional,TRANSLATIONS,translations) \ ucbhelper \ $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index c237d26..f499dcb 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -171,7 +171,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ toolkit \ tools \ touch \ - $(call gb_Helper_optional,TRANSLATIONS,translations) \ tubes \ twain \ ucb \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index cc37259..6b942c3 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -182,7 +182,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ toolkit \ tools \ touch \ - $(call gb_Helper_optional,TRANSLATIONS,translations) \ tubes \ twain \ ucb \ diff --git a/configure.ac b/configure.ac index 7e36a36..1545ca8 100644 --- a/configure.ac +++ b/configure.ac @@ -11863,7 +11863,6 @@ WITH_LANG_LIST=`echo $WITH_LANG | sed s/ALL/$ALL_LANGS/` # they need a real list of languages test -z $WITH_LANG_LIST WITH_LANG_LIST=en-US test $WITH_LANG = en-US WITH_LANG= -test -z $WITH_LANG || BUILD_TYPE=$BUILD_TYPE TRANSLATIONS AC_SUBST(ALL_LANGS) AC_SUBST(WITH_LANG) AC_SUBST(WITH_LANG_LIST) diff --git a/editeng/prj/build.lst b/editeng/prj/build.lst index 72b4636..37c850a 100644 --- a/editeng/prj/build.lst +++ b/editeng/prj/build.lst @@ -1,2 +1,2 @@ -ed editeng : TRANSLATIONS:translations svtools xmloff linguistic unotest NULL +ed editeng : svtools xmloff linguistic unotest NULL ed editeng\prj nmake - all ed_prj NULL diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst index 1347e36..46b09be 100644 --- a/instsetoo_native/prj/build.lst +++ b/instsetoo_native/prj/build.lst @@ -1,4 +1,4 @@ -ooninstsetoo_native:: TRANSLATIONS:translations postprocess packimages NULL +ooninstsetoo_native:: postprocess packimages NULL ooninstsetoo_nativeusr1 - all oon_mkout NULL ooninstsetoo_native\inc_openoffice\unixnmake - u oon_unix NULL ooninstsetoo_native\inc_openoffice\windows\msi_languages nmake - all oon_msilang NULL diff --git a/librelogo/prj/build.lst b/librelogo/prj/build.lst index d280a4a..6274580 100644 --- a/librelogo/prj/build.lst +++ b/librelogo/prj/build.lst @@ -1,2 +1,2 @@ -librelogo librelogo : TRANSLATIONS:translations offapi officecfg comphelper unotools l10ntools cppu tools cppuhelper sal javaunohelper officecfg DESKTOP:xmlhelp DESKTOP:helpcompiler NULL +librelogo librelogo : offapi officecfg comphelper unotools DESKTOP:l10ntools cppu tools cppuhelper sal javaunohelper officecfg DESKTOP:xmlhelp DESKTOP:helpcompiler NULL librelogo librelogo\prjnmake -alllibrelogo_prj NULL diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst index 3e540fe..27a7306 100644 --- a/sdext/prj/build.lst +++ b/sdext/prj/build.lst @@ -1,3 +1,3 @@ -dx sdext : TRANSLATIONS:translations offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt DESKTOP:xmlhelp DESKTOP:helpcompiler NULL +dx sdext : offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt DESKTOP:xmlhelp DESKTOP:helpcompiler NULL dx sdext usr1- all sdext_mkout NULL dx sdext\prj nmake - all sdext_prj NULL diff --git a/setup_native/prj/build.lst
[Libreoffice-commits] .: configure.ac
configure.ac |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit d23764182ccb5d1e96774cc958a7afaaa659e114 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Nov 20 22:31:21 2012 +0100 check harder whether to build cairo Change-Id: Ica2b9f1535f92c1b1cbceb7ec99ea96696742568 diff --git a/configure.ac b/configure.ac index 1545ca8..20299e9 100644 --- a/configure.ac +++ b/configure.ac @@ -9425,7 +9425,10 @@ if test $_os = Darwin -o $_os = iOS -o $_os = Android -o $enable_headless = y fi ENABLE_GTK= if test x$enable_gtk = xyes; then -test_cairo=yes +if test $GUIBASE = unx; then +# Used in vcl/Library_vclplug_gtk.mk +test_cairo=yes +fi ENABLE_GTK=TRUE R=gtk $R fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] .: configure.ac
On Tuesday 20 of November 2012, Libreoffice Gerrit user wrote: configure.ac |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit d23764182ccb5d1e96774cc958a7afaaa659e114 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Nov 20 22:31:21 2012 +0100 check harder whether to build cairo Change-Id: Ica2b9f1535f92c1b1cbceb7ec99ea96696742568 diff --git a/configure.ac b/configure.ac index 1545ca8..20299e9 100644 --- a/configure.ac +++ b/configure.ac @@ -9425,7 +9425,10 @@ if test $_os = Darwin -o $_os = iOS -o $_os = Android -o $enable_headless = y fi ENABLE_GTK= if test x$enable_gtk = xyes; then -test_cairo=yes +if test $GUIBASE = unx; then +# Used in vcl/Library_vclplug_gtk.mk +test_cairo=yes +fi ENABLE_GTK=TRUE R=gtk $R fi Does this actually make sense? Isn't it rather that we only ever build gtk if test $GUIBASE = unx -a $enable_headless != yes ? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: configure.ac
On 20 November 2012 23:02, Lubos Lunak l.lu...@suse.cz wrote: On Tuesday 20 of November 2012, Libreoffice Gerrit user wrote: configure.ac |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit d23764182ccb5d1e96774cc958a7afaaa659e114 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Nov 20 22:31:21 2012 +0100 check harder whether to build cairo Change-Id: Ica2b9f1535f92c1b1cbceb7ec99ea96696742568 diff --git a/configure.ac b/configure.ac index 1545ca8..20299e9 100644 --- a/configure.ac +++ b/configure.ac @@ -9425,7 +9425,10 @@ if test $_os = Darwin -o $_os = iOS -o $_os = Android -o $enable_headless = y fi ENABLE_GTK= if test x$enable_gtk = xyes; then -test_cairo=yes +if test $GUIBASE = unx; then +# Used in vcl/Library_vclplug_gtk.mk +test_cairo=yes +fi ENABLE_GTK=TRUE R=gtk $R fi Does this actually make sense? Isn't it rather that we only ever build gtk if test $GUIBASE = unx -a $enable_headless != yes ? It's ugly but I think (hope) it works. It was blind fix for WNT where I guess ENABLE_GTK=TRUE but in vcl/Module_vcl.mk it's also guarded with ifeq ($(GUIBASE),unx), so just I've just added that also to configure. I did not feel like making it nicer, it was just quick hack. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac moz/makefile.mk ooo.lst.in
configure.ac| 55 ++-
moz/makefile.mk | 19 +--
ooo.lst.in |4
3 files changed, 51 insertions(+), 27 deletions(-)
New commits:
commit 67fca36dbecaf0d35322f930d6462ab0d4ea56c5
Author: Mathias Michel m...@gmx.fr
Date: Mon Nov 19 01:07:53 2012 +0100
Better handling of well-know prerequisites under windows
Add moz prebuilt msvcrt80 copy
Change-Id: I335c25904c16db534a4878ff6a17db202eaef4f5
Reviewed-on: https://gerrit.libreoffice.org/1100
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/configure.ac b/configure.ac
index 78440ae..c85e0e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8225,19 +8225,37 @@ else
fi
fi
else
-AC_MSG_CHECKING([which pre-built Mozilla module in moz/zipped])
-if test -e $SRC_ROOT/moz/zipped/${OS}${COM}${CPU}inc.zip -a \
--e $SRC_ROOT/moz/zipped/${OS}${COM}${CPU}lib.zip -a \
--e $SRC_ROOT/moz/zipped/${OS}${COM}${CPU}runtime.zip; then
+AC_MSG_CHECKING([which pre-built Mozilla module in $TARFILE_LOCATION])
+MOZ_ZIP_INC=${OS}${COM}${CPU}inc.zip
+MOZ_ZIP_LIB=${OS}${COM}${CPU}lib.zip
+MOZ_ZIP_RUNTIME=${OS}${COM}${CPU}runtime.zip
+PREBUILD_MOZAB=YES
+if test -e $TARFILE_LOCATION/${OS}${COM}${CPU}inc.zip -a \
+-e $TARFILE_LOCATION/${OS}${COM}${CPU}lib.zip -a \
+-e $TARFILE_LOCATION/${OS}${COM}${CPU}runtime.zip; then
AC_MSG_RESULT([Found])
-PREBUILD_MOZAB=YES
-if test $_os = WINNT; then
-AC_MSG_CHECKING([for MSVC 2005 runtime needed for prebuilt
Mozilla])
-if test -e
$SRC_ROOT/external/msvcp80/Microsoft.VC80.CRT.manifest -a \
--e $SRC_ROOT/external/msvcp80/msvcp80.dll -a \
--e $SRC_ROOT/external/msvcp80/msvcr80.dll; then
+MOZ_ZIP_INC=
+MOZ_ZIP_LIB=
+MOZ_ZIP_RUNTIME=
+fi
+if test $_os = WINNT; then
+AC_MSG_CHECKING([for MSVC 2005 runtime needed for prebuilt
Mozilla])
+if test -e
$SRC_ROOT/external/msvcp80/Microsoft.VC80.CRT.manifest -a \
+-e $SRC_ROOT/external/msvcp80/msvcp80.dll -a \
+-e $SRC_ROOT/external/msvcp80/msvcr80.dll; then
+AC_MSG_RESULT([Found])
+else
+#uwin-prefixed paths are with no quotes to allow for mask, and
uwin to not have spaces, btw
+uwin=`cygpath -d $WINDIR`
+uwin=`cygpath -u $uwin`
+#if we have one we have all
+if test -e
$uwin/winsxs/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053* ; then
+MSVC80_DLL_DIR=`cd $uwin/winsxs/; ls -d
x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053*`
+MSVC80_MNFST=`ls
$uwin/winsxs/Manifests/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053_*.manifest`
AC_MSG_RESULT([Found])
else
+MSVC80_DLL_DIR=
+MSVC80_MNFST=
AC_MSG_RESULT([Not Found])
AC_MSG_ERROR([For the pre-built Mozilla libraries, you
need MSVC 2005 runtime files
Microsoft.VC80.CRT.manifest, msvcp80.dll, and msvcr80.dll
@@ -8245,19 +8263,9 @@ in external/msvcp80.
You can get them by installing:
http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE
-and copying the abovementioned files from:
-c:/windows/winsxs/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989/
-and
-c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989.manifest
-])
+and relaunch ./autogen.sh])
fi
fi
-else
-AC_MSG_RESULT([Not Found])
-AC_MSG_ERROR([If you don't use system mozilla and also disable the
build of internal mozilla, you must provided the appropriate libraries yourself.
-You need to copy $OS$COM$CPU{inc,lib,runtime}.zip into moz/zipped.
-These files can be found at http://dev-www.libreoffice.org/mozilla/
-])
fi
fi
fi
@@ -8275,6 +8283,11 @@ AC_SUBST(MOZ_INC)
AC_SUBST(MOZ_LIB)
AC_SUBST(MOZ_LIB_XPCOM)
AC_SUBST(MOZ_TARBALL)
+AC_SUBST(MSVC80_DLL_DIR)
+AC_SUBST(MSVC80_MNFST)
+AC_SUBST(MOZ_ZIP_INC)
+AC_SUBST(MOZ_ZIP_LIB)
+AC_SUBST(MOZ_ZIP_RUNTIME)
# libxmlsec is mandatory
if test $_os != Android -a $_os != iOS ; then
diff --git a/moz/makefile.mk b/moz/makefile.mk
index f154b95..a30c87e 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -32,7 +32,7 @@ TARGET=ooo_mozab
# --- Settings -
-.INCLUDE : settings.mk
+.INCLUDE :settings.mk
# --- Files
@@ -66,7
[Libreoffice-commits] .: configure.ac extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk postprocess/packcomponents Repository.mk scp2/source
Repository.mk | 14 -- configure.ac |7 --- extensions/Module_extensions.mk| 11 +++ np_sdk/Module_np_sdk.mk|9 ++--- postprocess/packcomponents/makefile.mk |2 +- scp2/source/ooo/file_library_ooo.scp |2 +- scp2/source/ooo/file_ooo.scp | 22 +++--- 7 files changed, 26 insertions(+), 41 deletions(-) New commits: commit f9059d4eee8e53c0a6b531fff16e1fade58cb8b0 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 19 17:41:01 2012 +0100 Key all browser plugin features to --enable-nsplugin ...instead of having them spread across --enable-nsplugin (plug LO into browser windows) and --enable-mozilla (plug browser plugins into LO documents). The ultimate goal is to clean up the various configure options mentioning mozilla and WITH_MOZILLA. Change-Id: I6f4b1c3a5701424f586cc1e303af90c9d59a91b6 diff --git a/Repository.mk b/Repository.mk index 754fc20..82aac94 100755 --- a/Repository.mk +++ b/Repository.mk @@ -190,21 +190,15 @@ endif ifeq ($(ENABLE_NSPLUGIN),YES) $(eval $(call gb_Helper_register_executables,OOO,\ nsplugin \ -)) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ -npsoplugin \ -)) -endif - -ifeq ($(WITH_MOZILLA),YES) -$(eval $(call gb_Helper_register_executables,OOO,\ pluginapp.bin \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ pl \ )) -endif # WITH_MOZILLA - +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ +npsoplugin \ +)) +endif ifeq ($(OS),MACOSX) diff --git a/configure.ac b/configure.ac index c85e0e0..101ea03 100644 --- a/configure.ac +++ b/configure.ac @@ -1015,7 +1015,9 @@ AC_ARG_ENABLE(zenity, AC_ARG_ENABLE(nsplugin, AS_HELP_STRING([--disable-nsplugin], -[Do not build nsplugin extension for browser embedding.]) +[Do not build NPAPI-based plugin features (allowing to plug LibreOffice + into browser windows, and to plug browser plugins into LibreOffice + documents.]) ) AC_ARG_ENABLE(cups, @@ -8387,8 +8389,7 @@ if test $with_system_npapi_headers = yes; then AC_LANG_POP([C]) else AC_MSG_RESULT([internal]) -dnl ...but will not be built/used unless ENABLE_NSPLUGIN or WITH_MOZILLA -dnl is YES +dnl ...but will not be built/used unless ENABLE_NSPLUGIN is YES SYSTEM_NPAPI_HEADERS=NO fi AC_SUBST(NPAPI_HEADERS_CFLAGS) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 67133d0..99ec13f 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -104,19 +104,14 @@ endif # DISABLE_ATL endif # WNT ifeq ($(ENABLE_NSPLUGIN),YES) + $(eval $(call gb_Module_add_targets,extensions,\ Executable_nsplugin \ Library_npsoplugin \ + Library_pl \ StaticLibrary_npsoenv \ WinResTarget_npsoplugin \ )) -endif - -ifeq ($(WITH_MOZILLA),YES) - -$(eval $(call gb_Module_add_targets,extensions,\ - Library_pl \ -)) ifeq ($(GUI),UNX) ifneq ($(GUIBASE),aqua) @@ -127,7 +122,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ endif endif -endif # WITH_MOZILLA=YES +endif # ENABLE_PLUGIN=YES ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk index 6ebba87..81c3742 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/np_sdk/Module_np_sdk.mk @@ -27,10 +27,11 @@ $(eval $(call gb_Module_Module,np_sdk)) -ifneq (,$(filter YES,$(ENABLE_NSPLUGIN) $(WITH_MOZILLA))) +ifeq ($(ENABLE_NSPLUGIN),YES) $(eval $(call gb_Module_add_targets,np_sdk,\ Package_inc \ + StaticLibrary_nputils \ )) ifeq ($(SYSTEM_NPAPI_HEADERS),NO) @@ -39,12 +40,6 @@ $(eval $(call gb_Module_add_targets,np_sdk,\ )) endif -ifeq ($(ENABLE_NSPLUGIN),YES) -$(eval $(call gb_Module_add_targets,np_sdk,\ - StaticLibrary_nputils \ -)) -endif - endif # vim: set noet sw=4 ts=4: diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 47c6c2b..d8d6edd 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -298,7 +298,7 @@ my_components += \ component/wizards/com/sun/star/wizards/web/web .END -.IF $(WITH_MOZILLA) != NO +.IF $(ENABLE_NSPLUGIN) == YES my_components += component/extensions/source/plugin/pl .END diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b4bb392..1e038f8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -934,7 +934,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui) STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) -#ifndef WITHOUT_MOZILLA +#if defined ENABLE_NSPLUGIN STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif diff --git a/scp2/source/ooo/file_ooo.scp
[Libreoffice-commits] .: configure.ac
configure.ac |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 96682a78cfe076714616a880f214248b4498ebf3 Author: Tor Lillqvist tlillqv...@suse.com Date: Sun Nov 18 11:18:18 2012 +0200 Fix misleading comment Change-Id: I70155825cb591b9ef60d82d81e2a51e9e25b96e4 diff --git a/configure.ac b/configure.ac index 101ea03..18d4277 100644 --- a/configure.ac +++ b/configure.ac @@ -568,8 +568,9 @@ AC_ARG_ENABLE(scripting, [Disable BASIC, Java and Python. Work in progress, use only if you are hacking on it.]) ) -# This is mainly for iOS, but could potentially be used in some +# This is mainly for Android and iOS, but could potentially be used in some # special case otherwise, too, so factored out as a separate setting + AC_ARG_ENABLE(dynamic-loading, AS_HELP_STRING([--disable-dynamic-loading], [Disable any use of dynamic loading of code. Work in progress, use only if you are hacking on it.]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |4 1 file changed, 4 deletions(-) New commits: commit c78d7a8a0e255d6603f8ce2e7f5566e127b0f0ef Author: Tomas Chvatal tchva...@suse.cz Date: Thu Nov 15 10:43:19 2012 +0100 Drop the check for unordered_map.hxx The check itself was always failing unless you added 0x to cxxflags and we can safely assume the header to be there. If the header fails during compile time it throws nice error explaining what is going on anyway. Change-Id: Iedff10f3b2562f731063107df7220efa124aca08 Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/configure.ac b/configure.ac index 96ee115..39fb2cf 100644 --- a/configure.ac +++ b/configure.ac @@ -7924,8 +7924,6 @@ if test $with_system_boost = yes; then [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost = 1.36)], []) AC_CHECK_HEADER(boost/function.hpp, [], [AC_MSG_ERROR(boost/function.hpp not found. install boost)], []) -AC_CHECK_HEADER([boost/unordered_map.hpp], [HAVE_BOOST_UNORDERED_MAP=TRUE], - [AC_MSG_WARN([boost/unordered_map.hpp not found])], []) save_CXXFLAGS=$CXXFLAGS CXXFLAGS=$CXXFLAGS -fno-exceptions @@ -7955,9 +7953,7 @@ else BUILD_TYPE=$BUILD_TYPE BOOST SYSTEM_BOOST=NO BOOST_TARBALL=f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 -HAVE_BOOST_UNORDERED_MAP=TRUE fi -AC_SUBST([HAVE_BOOST_UNORDERED_MAP]) AC_SUBST([MINGW_BOOST_DATE_TIME_DLL]) AC_SUBST(SYSTEM_BOOST) AC_SUBST(BOOST_TARBALL) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac ooo.lst.in
configure.ac |6 ++ ooo.lst.in |1 + 2 files changed, 7 insertions(+) New commits: commit c06e51aa4384fc5f10f1f9b09c097465881b42cd Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Nov 15 14:11:35 2012 +0100 ooo.lst: add also tarballs needed for build platform Change-Id: I121b9f8822afc379a619eaa52c5e050457f1d8c3 Reviewed-on: https://gerrit.libreoffice.org/1082 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/configure.ac b/configure.ac index 4219d95..91b151c 100644 --- a/configure.ac +++ b/configure.ac @@ -12484,6 +12484,12 @@ fi AC_SUBST(LO_PATH) +# We need at least berkeleydb for build platform in ooo.lst +if test $CROSS_COMPILING = YES ; then + BUILD_TARBALLS=d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz +fi +AC_SUBST(BUILD_TARBALLS) + # make sure config.guess is +x; we execute config.guess, so it has to be so chmod +x ./config.guess diff --git a/ooo.lst.in b/ooo.lst.in index b052712..89228f0 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -1,4 +1,5 @@ http://dev-www.libreoffice.org/src +@BUILD_TARBALLS@ 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit 3d98192d1dd723f1a12c1fd54bee739dbe854124 Author: Tor Lillqvist t...@iki.fi Date: Wed Nov 14 13:24:46 2012 +0200 Copy also bin/get_config_variables to the CONF-FOR-BUILD directory Change-Id: Ifb9980257b639651c88c5ec65ba9362bccbca183 diff --git a/configure.ac b/configure.ac index 1acf4b5..98cb6dc 100644 --- a/configure.ac +++ b/configure.ac @@ -4080,6 +4080,7 @@ if test $cross_compiling = yes; then configure \ ooo.lst.in \ oowintool \ +bin/get_config_variables \ solenv/bin/getcompver.awk \ solenv/inc/langlist.mk \ solenv/inc/postset.mk \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b537d0219f51c909f5409c8a0cee28cfc318c0f2 Author: Tor Lillqvist t...@iki.fi Date: Wed Nov 14 14:24:38 2012 +0200 We need also PATH from the BUILD platform environment Change-Id: I339760db569cefd43353a205b0c364f6c5976448 diff --git a/configure.ac b/configure.ac index 98cb6dc..3afc2fc 100644 --- a/configure.ac +++ b/configure.ac @@ -4134,7 +4134,7 @@ if test $cross_compiling = yes; then test -f ./config_host.mk 2/dev/null || exit cp config_host.mk ../config_build.mk cp config.log ../config.Build.log -. ./bin/get_config_variables COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR +. ./bin/get_config_variables COM GUI GUIBASE OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ PYTHON SYSTEM_LIBXSLT; do ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac distro-configs/LibreOfficeMinGW.conf README.cross
README.cross |1 - configure.ac |5 - distro-configs/LibreOfficeMinGW.conf |1 - 3 files changed, 7 deletions(-) New commits: commit 8ea17cdae772fa5e4853d576c766088a8fb3b206 Author: Enrico Weigelt, metux ITS metuxitserv...@googlemail.com Date: Wed Nov 14 14:15:38 2012 +0100 dropped obsolete --with-system-gettext configure option Change-Id: Ia46cb802d40bb1ba199cf937f332c4b343bc22e9 Reviewed-on: https://gerrit.libreoffice.org/1060 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/README.cross b/README.cross index 06123b6..d72954d 100644 --- a/README.cross +++ b/README.cross @@ -158,7 +158,6 @@ CXX_FOR_BUILD=ccache g++ --with-system-curl --with-system-db --with-system-expat ---with-system-gettext --with-system-hunspell --with-system-icu --with-system-libpng diff --git a/configure.ac b/configure.ac index 3afc2fc..4e5ddd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1683,11 +1683,6 @@ AC_ARG_WITH(system-mozilla-headers, [with_system_mozilla_headers=$with_system_headers] ) -AC_ARG_WITH(system-gettext, -AS_HELP_STRING([--with-system-gettext], -[Use gettext runtime library already on system.]),, -[with_system_gettext=$with_system_libs]) - AC_ARG_WITH(system-libpng, AS_HELP_STRING([--with-system-libpng], [Use libpng already on system.]),, diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index 9ffade5..b6ef3b5 100644 --- a/distro-configs/LibreOfficeMinGW.conf +++ b/distro-configs/LibreOfficeMinGW.conf @@ -7,7 +7,6 @@ --with-system-curl --with-system-db --with-system-expat ---with-system-gettext --with-system-graphite --with-system-hunspell --with-system-icu ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac postgresql/libpq-parallel-build.patch postgresql/postgresql-9.1.1-autoreconf.patch postgresql/postgresql-9.1.1-libreoffice.patch postgresql/postgresql-9.2.1-autor
configure.ac |2
postgresql/UnpackedTarball_postgresql.mk |6
postgresql/libpq-parallel-build.patch | 11
postgresql/postgresql-9.1.1-autoreconf.patch | 531 --
postgresql/postgresql-9.1.1-libreoffice.patch | 115 -
postgresql/postgresql-9.2.1-autoreconf.patch | 521 +
postgresql/postgresql-9.2.1-libreoffice.patch | 113 +
postgresql/postgresql-libs-leak.patch |5
postgresql/postgresql-moz-ldap.patch | 228 ---
9 files changed, 640 insertions(+), 892 deletions(-)
New commits:
commit f3d2d9aaaf72291a5733b5ba0edd1c7b75e4f345
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Nov 13 17:04:18 2012 +0100
Upgrading postgresql to 9.2.1
Change-Id: If6e58db174159111dec9c6ab39258d757a3e6ba5
diff --git a/configure.ac b/configure.ac
index 35727c0..55ed524 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7799,7 +7799,7 @@ if test x$enable_postgresql_sdbc != xno; then
POSTGRESQL_LIB=
POSTGRESQL_INC=%OVERRIDE_ME%
BUILD_TYPE=$BUILD_TYPE POSTGRESQL
-
POSTGRESQL_TARBALL=061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2
+
POSTGRESQL_TARBALL=c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
fi
fi
if test ${SYSTEM_POSTGRESQL} = YES; then
diff --git a/postgresql/UnpackedTarball_postgresql.mk
b/postgresql/UnpackedTarball_postgresql.mk
index f6b9472..3409a02 100644
--- a/postgresql/UnpackedTarball_postgresql.mk
+++ b/postgresql/UnpackedTarball_postgresql.mk
@@ -14,11 +14,9 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,postgresql,$(POSTGRESQL_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3))
$(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
- postgresql/postgresql-moz-ldap.patch \
postgresql/postgresql-libs-leak.patch \
- postgresql/libpq-parallel-build.patch \
- postgresql/postgresql-9.1.1-autoreconf.patch \
- postgresql/postgresql-9.1.1-libreoffice.patch \
+ postgresql/postgresql-9.2.1-autoreconf.patch \
+ postgresql/postgresql-9.2.1-libreoffice.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/postgresql/libpq-parallel-build.patch
b/postgresql/libpq-parallel-build.patch
deleted file mode 100644
index 237a483..000
--- a/postgresql/libpq-parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile
misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile
misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile 2012-02-06
15:11:19.0 +0100
-+++ misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile
2012-02-06 15:02:51.0 +0100
-@@ -109,6 +109,7 @@
- libpq.rc: $(top_builddir)/src/Makefile.global
-
- fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h
-+fe-misc.o: fe-misc.c $(top_builddir)/src/port/pg_config_paths.h
-
- $(top_builddir)/src/port/pg_config_paths.h:
- $(MAKE) -C $(top_builddir)/src/port pg_config_paths.h
diff --git a/postgresql/postgresql-9.1.1-autoreconf.patch
b/postgresql/postgresql-9.1.1-autoreconf.patch
deleted file mode 100644
index ce91c51..000
--- a/postgresql/postgresql-9.1.1-autoreconf.patch
+++ /dev/null
@@ -1,531 +0,0 @@
-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
-+++ misc/build/postgresql-9.1.1.patched/configure 2012-02-03
11:50:07.0 +0100
-@@ -718,6 +718,7 @@
- with_selinux
- with_openssl
- with_bonjour
-+with_mozldap
- with_ldap
- with_pam
- krb_srvtab
-@@ -836,6 +837,7 @@
- with_krb_srvnam
- with_pam
- with_ldap
-+with_mozldap
- with_bonjour
- with_openssl
- with_selinux
-@@ -1533,6 +1535,7 @@
- [postgres]
- --with-pam build with PAM support
- --with-ldap build with LDAP support
-+ --with-mozldap build with Mozilla LDAP support
- --with-bonjour build with Bonjour support
- --with-openssl build with OpenSSL support
- --with-selinux build with SELinux support
-@@ -5432,6 +5435,42 @@
- $as_echo $with_ldap 6; }
-
-
-+{ $as_echo $as_me:$LINENO: checking whether to use Mozilla C SDK for LDAP
support 5
-+$as_echo_n checking whether to use Mozilla C SDK for LDAP support... 6; }
-+
-+
-+
-+# Check whether --with-mozldap was given.
-+if test ${with_mozldap+set} = set; then
-+ withval=$with_mozldap;
-+ case $withval in
-+yes)
-+
-+cat confdefs.h \_ACEOF
-+#define USE_MOZLDAP 1
-+_ACEOF
-+
-+ ;;
-+no)
-+ :
-+ ;;
-+*)
-+ { { $as_echo $as_me:$LINENO: error: no argument expected for
--with-mozldap option 5
-+$as_echo $as_me: error: no argument expected for --with-mozldap option 2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+
[Libreoffice-commits] .: configure.ac instsetoo_native/util solenv/inc
configure.ac |2
instsetoo_native/util/openoffice.lst | 90 +--
solenv/inc/minor.mk | 10 +--
solenv/inc/productversion.mk |4 -
4 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit bf83aaf609cfec6ebc7d2bfa0f088e972ba28e22
Author: Petr Mladek pmla...@suse.cz
Date: Mon Nov 12 12:31:35 2012 +0100
bump version to 4.0.0.0.alpha0+
Change-Id: I04cb89d04ebebcaef2276813864f79365f6899fd
diff --git a/configure.ac b/configure.ac
index d940aa9..35727c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil;
fill-column: 102 -*
dnl configure.ac serves as input for the GNU autoconf package
dnl in order to create a configure script.
-AC_INIT([LibreOffice],[3.7],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.0],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 0739bd7..1cdf3f7 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,13 +4,13 @@ Globals
{
variables
{
-UREPACKAGEVERSION 3.7.0.0.alpha0
+UREPACKAGEVERSION 4.0.0.0.alpha0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
-UNIXBASISROOTNAME libreoffice3.7
-SERVICETAG_PRODUCTNAME LibreOffice 3.7
-SERVICETAG_PRODUCTVERSION 3.7
-SERVICETAG_PARENTNAME LibreOffice 3.7
+UNIXBASISROOTNAME libreoffice4.0
+SERVICETAG_PRODUCTNAME LibreOffice 4.0
+SERVICETAG_PRODUCTVERSION 4.0
+SERVICETAG_PARENTNAME LibreOffice 4.0
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
HIDELICENSEDIALOG 1
@@ -47,17 +47,17 @@ LibreOffice
variables
{
PRODUCTNAME LibreOffice
-PRODUCTVERSION 3.7
+PRODUCTVERSION 4.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 3.7
-USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.7.0.0.alpha0
+BRANDPACKAGEVERSION 4.0
+USERDIRPRODUCTVERSION 4
+ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha0
ABOUTBOXPRODUCTVERSIONSUFFIX +
-BASEPRODUCTVERSION 3.7
+BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.7.0.0.alpha0
+PACKAGEVERSION 4.0.0.0.alpha0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -99,18 +99,18 @@ LibreOffice_Dev
variables
{
PRODUCTNAME LOdev
-PRODUCTVERSION 3.7
+PRODUCTVERSION 4.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0
-UNIXBASISROOTNAME lodev3.7
+UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 3.7
-USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.7.0.0.alpha0
+BRANDPACKAGEVERSION 4.0
+USERDIRPRODUCTVERSION 4
+ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha0
ABOUTBOXPRODUCTVERSIONSUFFIX +
-BASEPRODUCTVERSION 3.7
+BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -123,7 +123,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.7.0.0.alpha0
+PACKAGEVERSION 4.0.0.0.alpha0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -160,11 +160,11 @@ URE
variables
{
PRODUCTNAME URE
-PRODUCTVERSION 3.7
-PACKAGEVERSION 3.7.0.0.alpha0
+PRODUCTVERSION 4.0
+PACKAGEVERSION 4.0.0.0.alpha0
PACKAGEREVISION 1
PRODUCTEXTENSION
-BRANDPACKAGEVERSION 3.7
+BRANDPACKAGEVERSION 4.0
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0
[Libreoffice-commits] .: configure.ac .gitignore Makefile.top odk/source scp2/CustomTarget_langmacros.mk scp2/macros
.gitignore |2 +-
Makefile.top |2 +-
configure.ac | 13 ++---
odk/source/unowinreg/win/makefile.mk |1 -
scp2/CustomTarget_langmacros.mk |4 ++--
scp2/macros/macro.pl |2 +-
6 files changed, 11 insertions(+), 13 deletions(-)
New commits:
commit e7037b2e7e487d6075d17fcff7cd95a6e98700c0
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Sat Nov 10 22:14:47 2012 +0100
Kill set_oenv remnants (by just renaming the required timestamp file)
Change-Id: I779128111a4f69235a4c8cc6510018fc61d1b24b
Reviewed-on: https://gerrit.libreoffice.org/1026
Tested-by: Tor Lillqvist t...@iki.fi
Reviewed-by: Tor Lillqvist t...@iki.fi
diff --git a/.gitignore b/.gitignore
index bfcbb56..e1799e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@
/config.parms
/config_host.mk
/config_host.mk.last
+/config_host.mk.stamp
/config_build.mk
/configure
/desktop/scripts/soffice.sh
@@ -75,7 +76,6 @@
# misc
/file-lists
/cross-build-toolset.built
-/set_soenv.stamp
/warn
/build.log
/build_error.log
diff --git a/Makefile.top b/Makefile.top
index 42e63a0..1842c55 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -354,7 +354,7 @@ ifeq ($(BUILD_DMAKE),YES)
endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
config.log config.status configure ooo.lst \
- config_host.mk.last set_soenv.stamp src.downloaded warn
+ config_host.mk.last config_host.mk.stamp src.downloaded warn
find $(SOLARENV)/gdb -name *.pyc -exec rm {} \;
#
diff --git a/configure.ac b/configure.ac
index c968dc2..c75c082 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2903,7 +2903,7 @@ if test $GCC = yes; then
if test $_os = Darwin -a $with_macosx_sdk = 10.4 -a $GCCVER -ge
040100; then
if test -z $save_CC -a -x $GCC_HOME/bin/gcc-4.0; then
export CC=$GCC_HOME/bin/gcc-4.0
-# export CC to have it available in set_soenv - config.guess
+# export CC to make it finally available to config.guess
GCCVER2=`$CC -dumpversion | $AWK -F. '{ print
\$1*1+\$2*100+\$3 }'`
if test $GCCVER2 -ge 04 -a $GCCVER2 -lt 040100; then
GCCVER=$GCCVER2
@@ -3215,8 +3215,7 @@ if test $_os = WINNT; then
fi
AC_SUBST(BUILD_X64)
-# These are passed to the environment through set_soenv.in as usual,
and then
-# used in set_wntx64.mk
+# These are passed to the environment and then used in set_wntx64.mk
AC_SUBST(CXX_X64_BINARY)
AC_SUBST(LINK_X64_BINARY)
AC_SUBST(LIBMGR_X64_BINARY)
@@ -12524,13 +12523,13 @@ fi
AC_CONFIG_FILES([config_host.mk ooo.lst])
AC_OUTPUT
-# touch the config timestamp file set_soenv.stamp
-if test ! -f set_soenv.stamp; then
-echo set_soenv.stamp
+# touch the config timestamp file
+if test ! -f config_host.mk.stamp; then
+echo config_host.mk.stamp
elif diff config_host.mk config_host.mk.last /dev/null 21; then
echo Configuration unchanged - avoiding scp2 stamp update
else
-echo set_soenv.stamp
+echo config_host.mk.stamp
fi
diff --git a/odk/source/unowinreg/win/makefile.mk
b/odk/source/unowinreg/win/makefile.mk
index f614b36..36cce52 100644
--- a/odk/source/unowinreg/win/makefile.mk
+++ b/odk/source/unowinreg/win/makefile.mk
@@ -40,7 +40,6 @@ USE_DEFFILE=TRUE
JAVA_INCLUDES:= -I$(JAVA_HOME)/include
-# values taken from set_soenv.in
.IF $(OS) == LINUX
JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux
.ELIF $(OS) == FREEBSD
diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk
index 1d1a157..19c680f 100644
--- a/scp2/CustomTarget_langmacros.mk
+++ b/scp2/CustomTarget_langmacros.mk
@@ -31,10 +31,10 @@ $(call gb_CustomTarget_get_target,scp2/macros) : $(call
gb_CustomTarget_get_work
$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call
gb_CustomTarget_get_workdir,scp2/macros)/.dir
-$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :
$(SRCDIR)/scp2/macros/macro.pl $(SRCDIR)/set_soenv.stamp
+$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :
$(SRCDIR)/scp2/macros/macro.pl $(SRCDIR)/config_host.mk.stamp
$(call gb_Helper_abbreviate_dirs,\
export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' \
- $(PERL) $ -verbose -o $@ -c $(SRCDIR)/set_soenv.stamp \
+ $(PERL) $ -verbose -o $@ -c $(SRCDIR)/config_host.mk.stamp \
)
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 9ea949c..dc5d2a9 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -261,7 +261,7 @@ sub args_require_build
# changed script - run always
return 1 if (stat($0))[9] (stat($destfile))[9] ;
-# changed set_soenv.stamp - run always
+# changed config timestamp - run
[Libreoffice-commits] .: configure.ac
configure.ac |1 - 1 file changed, 1 deletion(-) New commits: commit 13bfe67103e6c0a9d3fa9db48dc4448e35ad006b Author: Miklos Vajna vmik...@suse.cz Date: Sun Nov 11 12:13:16 2012 +0100 configure: don't pass --disable-mozilla around, it's the default already Change-Id: I439db77e36af700b34ab9656704cdb3b3359c9ec diff --git a/configure.ac b/configure.ac index c75c082..d4ab49c 100644 --- a/configure.ac +++ b/configure.ac @@ -4125,7 +4125,6 @@ if test $cross_compiling = yes; then ./configure \ --disable-graphite \ --disable-build-mozilla \ ---disable-mozilla \ --disable-postgresql-sdbc \ --disable-zenity \ --with-parallelism=$with_parallelism \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac sal/Library_sal.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk
configure.ac |1 +
sal/Library_sal.mk |5 +
vcl/Library_vcl.mk |5 +
vcl/Library_vclplug_gen.mk |5 +
4 files changed, 4 insertions(+), 12 deletions(-)
New commits:
commit 89f80c167112837346ec5a63873f620a07a76493
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 9 19:29:05 2012 +0100
configure: why not set up VALGRIND_CFLAGS all in one place
Also unbreaks the build because VALGRIND_CFLAGS is now never
empty with cedd9ebdd260e99e74ad54391c0d0b1d1ebd9891.
Change-Id: Ide5ca799b3656ccaff483ca05dbc18682136345f
diff --git a/configure.ac b/configure.ac
index c968dc2..77a6011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5058,6 +5058,7 @@ if test $cross_compiling != yes -a -n
$ENABLE_DBGUTIL -a \
AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=])
fi
CPPFLAGS=$prev_cppflags
+VALGRIND_CFLAGS=${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1
fi
AC_SUBST([VALGRIND_CFLAGS])
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 73335be..854e95f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,sal,\
))
$(eval $(call gb_Library_add_defs,sal,\
- $(if $(VALGRIND_CFLAGS), \
- $(VALGRIND_CFLAGS) \
- -DHAVE_MEMCHECK_H=1 \
- ) \
+ $(VALGRIND_CFLAGS) \
$(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC), \
-DFORCE_SYSALLOC \
) \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 469aa5e..6b1545a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -471,10 +471,7 @@ vcl_headless_code=\
vcl/headless/svpvd
$(eval $(call gb_Library_add_defs,vcl,\
-$(if $(VALGRIND_CFLAGS), \
-$(VALGRIND_CFLAGS) \
--DHAVE_MEMCHECK_H=1 \
-) \
+ $(VALGRIND_CFLAGS) \
))
ifeq ($(GUIBASE),unx)
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 0f709fd..38b866c 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -123,10 +123,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
endif
$(eval $(call gb_Library_add_defs,vclplug_gen,\
-$(if $(VALGRIND_CFLAGS), \
-$(VALGRIND_CFLAGS) \
--DHAVE_MEMCHECK_H=1 \
-) \
+ $(VALGRIND_CFLAGS) \
))
## handle Xinerama
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d91c37274fda0d18eeba684e905c2a2201d85134
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 9 19:59:04 2012 +0100
configure: oops, let's try to fix that valgrind thing again...
Change-Id: I151aa45838edbaa713b40716e45a75e812b7c782
diff --git a/configure.ac b/configure.ac
index 77a6011..f7bf0f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5057,8 +5057,10 @@ if test $cross_compiling != yes -a -n
$ENABLE_DBGUTIL -a \
CPPFLAGS=$VALGRIND_CFLAGS
AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=])
fi
+if test -n $VALGRIND_CFLAGS; then
+VALGRIND_CFLAGS=${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1
+fi
CPPFLAGS=$prev_cppflags
-VALGRIND_CFLAGS=${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1
fi
AC_SUBST([VALGRIND_CFLAGS])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac RepositoryExternal.mk sal/Library_sal.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk
RepositoryExternal.mk |6 --
configure.ac |3 ---
sal/Library_sal.mk |5 -
vcl/Library_vcl.mk |5 +
vcl/Library_vclplug_gen.mk |5 +
5 files changed, 10 insertions(+), 14 deletions(-)
New commits:
commit 3bdb950f5edac0cdb09318cea307b4342a0fd714
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 9 20:20:04 2012 +0100
RepositoryExternal: fix gb_LinkTarget__use_valgrind
... which i've also managed to break, unaware of its existence.
Consolidate 2 different ways to use VALGRIND_CFLAGS.
Change-Id: I245c7a9a2b6bc904a227a15063cf5d8a2f64313c
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3c0dc3a..782f3e5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1527,11 +1527,13 @@ endef
endif # SYSTEM_CURL
-ifneq ($(VALGRIND_CFLAGS),)
+# strip because of gb_SPACE
+ifneq ($(strip $(VALGRIND_CFLAGS)),)
define gb_LinkTarget__use_valgrind
$(call gb_LinkTarget_add_defs,$(1),\
--DHAVE_VALGRIND_H \
+ -DHAVE_VALGRIND_H \
+ -DHAVE_MEMCHECK_H \
)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/configure.ac b/configure.ac
index f7bf0f7..c968dc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5057,9 +5057,6 @@ if test $cross_compiling != yes -a -n
$ENABLE_DBGUTIL -a \
CPPFLAGS=$VALGRIND_CFLAGS
AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=])
fi
-if test -n $VALGRIND_CFLAGS; then
-VALGRIND_CFLAGS=${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1
-fi
CPPFLAGS=$prev_cppflags
fi
AC_SUBST([VALGRIND_CFLAGS])
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 854e95f..51e6d9e 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_include,sal,\
))
$(eval $(call gb_Library_add_defs,sal,\
- $(VALGRIND_CFLAGS) \
$(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC), \
-DFORCE_SYSALLOC \
) \
@@ -60,6 +59,10 @@ $(eval $(call gb_Library_use_libraries,sal,\
$(gb_UWINAPI) \
))
+$(eval $(call gb_Library_use_externals,sal,\
+valgrind \
+))
+
$(eval $(call gb_Library_use_system_win32_libs,sal,\
advapi32 \
comdlg32 \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6b1545a..efb39b8 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -470,10 +470,6 @@ vcl_headless_code=\
vcl/headless/svptext \
vcl/headless/svpvd
-$(eval $(call gb_Library_add_defs,vcl,\
- $(VALGRIND_CFLAGS) \
-))
-
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\$(gb_Library_SYSPRE)\ \
@@ -497,6 +493,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
dbus \
fontconfig \
freetype \
+ valgrind \
x11extensions \
))
endif
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 38b866c..341b48f 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
graphite \
icule \
icuuc \
+ valgrind \
Xrender \
))
@@ -122,10 +123,6 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
))
endif
-$(eval $(call gb_Library_add_defs,vclplug_gen,\
- $(VALGRIND_CFLAGS) \
-))
-
## handle Xinerama
ifneq ($(USE_XINERAMA),NO)
ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f26dac751473045b894e97ca4090957bbb865cd Author: Tor Lillqvist t...@iki.fi Date: Thu Nov 8 11:01:26 2012 +0200 Fix thinko Change-Id: I84f023a906671a5dfc99e1c6c0a74ae317258dde diff --git a/configure.ac b/configure.ac index 200092a..b018638 100644 --- a/configure.ac +++ b/configure.ac @@ -2732,7 +2732,7 @@ if test $_os = Darwin; then esac fi -if test $BITNESS_OVERRIDE == ; then +if test $BITNESS_OVERRIDE = ; then case $with_macosx_version_min_required in 10.4) case $with_macosx_sdk in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0ab6421028ba715dfc7c152d0185333e0a5f79f9
Author: Tor Lillqvist t...@iki.fi
Date: Thu Nov 8 14:38:57 2012 +0200
Use -ffunction-sections for Android
Part of work towards making the linker more eager to drop unused
functions from the output file.
Change-Id: Id4edb50ef4048f02277a13885b5f81707cb9c8a3
diff --git a/configure.ac b/configure.ac
index ef6a3d8..0829514 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,7 @@ if test -n $with_android_ndk; then
ANDROID_APP_ABI=x86
ANDROIDCFLAGS=-march=atom
fi
+ANDROIDCFLAGS=$ANDROIDCFLAGS -ffunction-sections
ANDROIDCFLAGS=$ANDROIDCFLAGS -Wno-psabi --sysroot
$ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI
# When using the 4.6 or newer toolchain, use the gold linker
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit c75cf529f72f340c2fc99dfc3c3e87cce84b Author: Rene Engelhard r...@debian.org Date: Tue Nov 6 21:21:31 2012 +0100 add AC_MSG_CHECKING/RESULT for ENABLE_SYSTRAY_GTK check Change-Id: Id82e2102f3742e16750440a0db77a81175fb647d diff --git a/configure.ac b/configure.ac index d5e784b..eb1f0a1 100644 --- a/configure.ac +++ b/configure.ac @@ -9549,10 +9549,14 @@ if test $test_gtk = yes; then PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) BUILD_TYPE=$BUILD_TYPE GTK + AC_MSG_CHECKING([whether to enable the systray quickstarter]) if test x$enable_systray = xyes; then + AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( GTK210, gtk+-2.0 = 2.10.0, [ ENABLE_SYSTRAY_GTK=TRUE ], [ ENABLE_SYSTRAY_GTK= ]) +else + AC_MSG__RESULT([no]) fi AC_MSG_CHECKING([whether to enable Gtk print dialog support]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ae4e4a11d4300f7448cb6bd170fcb034542caddc Author: Rene Engelhard r...@debian.org Date: Tue Nov 6 21:24:32 2012 +0100 typo... Change-Id: I2c7968194afbcf74967cd16c639dce7de858a513 diff --git a/configure.ac b/configure.ac index eb1f0a1..fcfd197 100644 --- a/configure.ac +++ b/configure.ac @@ -9556,7 +9556,7 @@ if test $test_gtk = yes; then [ ENABLE_SYSTRAY_GTK=TRUE ], [ ENABLE_SYSTRAY_GTK= ]) else - AC_MSG__RESULT([no]) + AC_MSG_RESULT([no]) fi AC_MSG_CHECKING([whether to enable Gtk print dialog support]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac filter/source libvisio/ExternalPackage_libvisio.mk libvisio/ExternalProject_libvisio.mk libvisio/libvisio-0.0.19.patch libvisio/Module_libvisio.mk libvisio/prj li
RepositoryExternal.mk|7 configure.ac |2 filter/source/config/fragments/filters/VisioDocument.xcu |2 filter/source/config/fragments/types/draw_Visio_Document.xcu |4 libvisio/ExternalPackage_libvisio.mk | 13 + libvisio/ExternalProject_libvisio.mk | 80 +++ libvisio/Module_libvisio.mk |2 libvisio/StaticLibrary_visio.mk | 47 libvisio/UnpackedTarball_visio.mk|9 libvisio/libvisio-0.0.19.patch | 116 --- libvisio/prj/build.lst |2 writerperfect/Library_wpftdraw.mk|1 12 files changed, 103 insertions(+), 182 deletions(-) New commits: commit 64ab61152cddafec62e0a4106f9844fb137ff83c Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Nov 5 11:43:55 2012 +0100 Uploading new libvisio 0.0.20 release Change-Id: Ic090ae81c28f12a106a74aa6d10b43cce9d68fed diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a1fc086..716e1a7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1097,12 +1097,15 @@ endef else # !SYSTEM_LIBVISIO $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - visiolib \ + visio-0.0 \ )) define gb_LinkTarget__use_visio +$(call gb_LinkTarget_use_package,$(1),\ + libvisio \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ - visiolib \ + visio-0.0 \ ) endef diff --git a/configure.ac b/configure.ac index 9517836..186f1cf 100644 --- a/configure.ac +++ b/configure.ac @@ -6982,7 +6982,7 @@ elif test $_os = iOS; then else AC_MSG_RESULT([internal]) SYSTEM_LIBVISIO=NO -VISIO_TARBALL=94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 +VISIO_TARBALL=2d8c3b50f77c544f317ab0a8838fadcb-libvisio-0.0.20.tar.bz2 fi AC_SUBST(SYSTEM_LIBVISIO) AC_SUBST(VISIO_CFLAGS) diff --git a/filter/source/config/fragments/filters/VisioDocument.xcu b/filter/source/config/fragments/filters/VisioDocument.xcu index 82b3569..15c504b 100644 --- a/filter/source/config/fragments/filters/VisioDocument.xcu +++ b/filter/source/config/fragments/filters/VisioDocument.xcu @@ -21,7 +21,7 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Draw.VisioImportFilter/value/prop prop oor:name=UserDatavalue/value/prop prop oor:name=UIName -value xml:lang=x-defaultMicrosoft Visio 2000-2010/value +value xml:lang=x-defaultMicrosoft Visio 2000-2013/value /prop prop oor:name=FileFormatVersionvalue0/value/prop prop oor:name=Typevaluedraw_Visio_Document/value/prop diff --git a/filter/source/config/fragments/types/draw_Visio_Document.xcu b/filter/source/config/fragments/types/draw_Visio_Document.xcu index a7234b4..b6c6992 100644 --- a/filter/source/config/fragments/types/draw_Visio_Document.xcu +++ b/filter/source/config/fragments/types/draw_Visio_Document.xcu @@ -18,12 +18,12 @@ node oor:name=draw_Visio_Document oor:op=replace prop oor:name=DetectServicevaluecom.sun.star.comp.Draw.VisioImportFilter/value/prop prop oor:name=URLPattern/ -prop oor:name=Extensionsvaluevsd vst/value/prop +prop oor:name=Extensionsvaluevdx vsd vsdm vsdx/value/prop prop oor:name=MediaTypevalueapplication/vnd.visio/value/prop prop oor:name=Preferredvaluetrue/value/prop prop oor:name=PreferredFiltervalueVisio Document/value/prop prop oor:name=UIName -valueMicrosoft Visio 2000/XP/2003/value +valueMicrosoft Visio/value /prop prop oor:name=ClipboardFormat/ /node diff --git a/libvisio/ExternalPackage_libvisio.mk b/libvisio/ExternalPackage_libvisio.mk index a876f14..76d573a 100644 --- a/libvisio/ExternalPackage_libvisio.mk +++ b/libvisio/ExternalPackage_libvisio.mk @@ -7,12 +7,21 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,libvisio_inc,visio)) +$(eval $(call gb_ExternalPackage_ExternalPackage,libvisio,visio)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libvisio_inc,inc/external/libvisio,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libvisio,inc/external/libvisio,\ src/lib/libvisio.h \ src/lib/VisioDocument.h \ src/lib/VSDStringVector.h \ )) +$(eval $(call gb_ExternalPackage_use_external_project,libvisio,libvisio)) + +ifeq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_ExternalPackage_add_file,libvisio,lib/visio-0.0.lib,build/win32/Release/lib/libvisio-0.0.lib)) +else +$(eval $(call gb_ExternalPackage_add_file,libvisio,lib/libvisio-0.0.a,src/lib/.libs/libvisio-0.0.a)) +endif + + # vim: set noet sw=4
[Libreoffice-commits] .: configure.ac lcms2/ExternalPackage_lcms2.mk lcms2/prj libcdr/ExternalProject_libcdr.mk RepositoryExternal.mk
RepositoryExternal.mk| 14 --
configure.ac |2 ++
lcms2/ExternalPackage_lcms2.mk |8 ++--
lcms2/prj/build.lst |3 +--
libcdr/ExternalProject_libcdr.mk |1 +
5 files changed, 18 insertions(+), 10 deletions(-)
New commits:
commit faef2e51d0c7b74334a11400b205daf382805780
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Nov 4 15:23:23 2012 -0600
fix some lcms2 gbuildification breakages...
Change-Id: Icad3132c1710c62559c35964fe5ce3f466646f13
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5db629b..bbf352f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -878,7 +878,6 @@ gb_LinkTarget__use_graphite :=
endif # SYSTEM_GRAPHITE
-
ifeq ($(SYSTEM_ICU),YES)
define gb_LinkTarget__use_icudata
@@ -910,7 +909,7 @@ else
gb_ICU_suffix:=
endif
-# icudata and icui18n is called icudt and icuin when built with MSVC :-(
+# icudata and icui18n is called icudt and icuin when built with MSVC :-/
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icudt \
@@ -1219,7 +1218,7 @@ ifeq ($(SYSTEM_LCMS2),YES)
define gb_LinkTarget__use_lcms2
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-$(LCMS2_CFLAGS) \
+ $(LCMS2_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
@@ -1257,9 +1256,12 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
$$(INCLUDE) \
)
-$(call gb_LinkTarget_use_libraries,$(1),\
- lcms2 \
-)
+$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
+
+endef
+
+define gb_ExternalProject__use_lcms2
+$(call gb_ExternalProject_use_package,$(1),lcms2)
endef
diff --git a/configure.ac b/configure.ac
index d206c3f..e325f4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7042,6 +7042,8 @@ if test $with_system_lcms2 = yes; then
else
AC_MSG_RESULT([internal])
SYSTEM_LCMS2=NO
+LCMS2_CFLAGS=-I${OUTDIR}/inc/lcms2
+LCMS2_LIBS=-L${OUTDIR}/lib -llcms2
LCMS2_TARBALL=861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
BUILD_TYPE=$BUILD_TYPE LCMS2
fi
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index d1c1d3c..628930f 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -10,8 +10,10 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2))
$(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,inc/lcms2/lcms2.h,include/lcms2.h))
+
ifeq ($(OS),MACOSX)
-$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.2.dylib))
else ifeq ($(filter-out IOS ANDROID,$(OS)),)
$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a))
else ifeq ($(OS),WNT)
@@ -23,6 +25,8 @@ $(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/lcms2.lib,bin/lcms2.lib))
$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2.dll))
endif
else
-$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so.2.0.4))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4))
endif
# vim: set noet sw=4 ts=4:
diff --git a/lcms2/prj/build.lst b/lcms2/prj/build.lst
index 551f0f3..e9c203e 100644
--- a/lcms2/prj/build.lst
+++ b/lcms2/prj/build.lst
@@ -1,3 +1,2 @@
lcms lcms2 : soltools ZLIB:zlib NULL
-lcms lcms2 usr1- all lcms_mkout NULL
-lcms lcms2 nmake - all lcms_libwpd NULL
+lcms lcms2/prj nmake - all lcms_prj NULL
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 83267dd..0f894f4 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\
))
$(eval $(call gb_ExternalProject_use_externals,libcdr,\
+ lcms2 \
wpd \
wpg \
))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |3 +++
1 file changed, 3 insertions(+)
New commits:
commit c4c160a4519f20d50e7189ef92aac99b83c4cc6a
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Nov 4 15:50:39 2012 -0600
libcms2: mac has issue with long long
Change-Id: Ibd1ec8d540597e611609dafdffb39266a2ec064d
diff --git a/configure.ac b/configure.ac
index e325f4b..877a72f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7043,6 +7043,9 @@ else
AC_MSG_RESULT([internal])
SYSTEM_LCMS2=NO
LCMS2_CFLAGS=-I${OUTDIR}/inc/lcms2
+if test $_os = Darwin; then
+LCMS2_CFLAGS=$LCMS2_CFLAGS -Wno-long-long
+fi
LCMS2_LIBS=-L${OUTDIR}/lib -llcms2
LCMS2_TARBALL=861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
BUILD_TYPE=$BUILD_TYPE LCMS2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 42 ++ 1 file changed, 22 insertions(+), 20 deletions(-) New commits: commit cb225ab3a25bef4ac304ec314b61e75369440e38 Author: Tor Lillqvist tlillqv...@suse.com Date: Sat Nov 3 10:30:08 2012 +0200 Don't look for a x64 compiler separately if we are building with it This change just to avoid misleading warnings. Will have to verify later that a proper 64-bit Explorer extension gets built in this case. (There should be no need to build a separate 32-bit Explorer extension when building a 64-bit LibreOffice. After all, a 64-bit LO can be installed only on a 64-bit OS with a 64-bit Explorer.) diff --git a/configure.ac b/configure.ac index f6a7fec..e9c035b 100644 --- a/configure.ac +++ b/configure.ac @@ -3201,27 +3201,29 @@ if test $_os = WINNT; then LINK_X64_BINARY= LIBMGR_X64_BINARY= -AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer extensions]) -if test $BITNESS_OVERRIDE = -a -f $with_cl_home/atlmfc/lib/amd64/atls.lib; then -# Prefer native x64 compiler to cross-compiler, in case we are running -# the build on a 64-bit OS. -if $with_cl_home/bin/amd64/cl.exe -? /dev/null /dev/null 21; then -BUILD_X64=TRUE -CXX_X64_BINARY=$with_cl_home/bin/amd64/cl.exe -LINK_X64_BINARY=$with_cl_home/bin/amd64/link.exe -LIBMGR_X64_BINARY=$with_cl_home/bin/amd64/lib.exe -elif $with_cl_home/bin/x86_amd64/cl.exe -? /dev/null /dev/null 21; then -BUILD_X64=TRUE -CXX_X64_BINARY=$with_cl_home/bin/x86_amd64/cl.exe -LINK_X64_BINARY=$with_cl_home/bin/x86_amd64/link.exe -LIBMGR_X64_BINARY=$with_cl_home/bin/x86_amd64/lib.exe +if test $BITNESS_OVERRIDE = ; then +AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer extensions]) +if test -f $with_cl_home/atlmfc/lib/amd64/atls.lib; then +# Prefer native x64 compiler to cross-compiler, in case we are running +# the build on a 64-bit OS. +if $with_cl_home/bin/amd64/cl.exe -? /dev/null /dev/null 21; then +BUILD_X64=TRUE +CXX_X64_BINARY=$with_cl_home/bin/amd64/cl.exe +LINK_X64_BINARY=$with_cl_home/bin/amd64/link.exe +LIBMGR_X64_BINARY=$with_cl_home/bin/amd64/lib.exe +elif $with_cl_home/bin/x86_amd64/cl.exe -? /dev/null /dev/null 21; then +BUILD_X64=TRUE +CXX_X64_BINARY=$with_cl_home/bin/x86_amd64/cl.exe +LINK_X64_BINARY=$with_cl_home/bin/x86_amd64/link.exe +LIBMGR_X64_BINARY=$with_cl_home/bin/x86_amd64/lib.exe +fi +fi +if test $BUILD_X64 = TRUE; then +AC_MSG_RESULT([found]) +else +AC_MSG_RESULT([not found]) +AC_MSG_WARN([Installation set will not contain 64-bit Explorer extensions]) fi -fi -if test $BUILD_X64 = TRUE; then -AC_MSG_RESULT([found]) -else -AC_MSG_RESULT([not found]) -AC_MSG_WARN([Installation set will not contain 64-bit Explorer extensions]) fi AC_SUBST(BUILD_X64) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |3 +++ 1 file changed, 3 insertions(+) New commits: commit f3c09cc3c41e7ec1faf9dfef269a99a8ef7d5838 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Thu Nov 1 18:48:53 2012 +0100 configure: don't accept -enable-headless where it won't work Don't even try to build --enable-headless where GUIBASE would not be unx. Change-Id: I6e5a6d3071317171f42c0b1336502cec50ba72fa diff --git a/configure.ac b/configure.ac index b420286..e1598e7 100644 --- a/configure.ac +++ b/configure.ac @@ -3945,6 +3945,9 @@ solaris*) esac if test $enable_headless = yes; then +if test $GUIBASE != unx; then +AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice with --enable-headless]) +fi GUIBASE=headless fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 12 1 file changed, 12 insertions(+) New commits: commit 5f8fdb3f250441c7d225c494b7d418448d5fe658 Author: Petr Mladek pmla...@suse.cz Date: Wed Oct 31 14:14:13 2012 +0100 define fallback alligment values also for Linux i586 and x86_64 The macro AC_CHECK_ALIGNOF does not exist on SLED10 Change-Id: I30fcc8f3715b1855418ea406d0e7b038c7bfb4b3 diff --git a/configure.ac b/configure.ac index 0900d85..8910055 100644 --- a/configure.ac +++ b/configure.ac @@ -4982,6 +4982,18 @@ if test $_os != WINNT -o $WITH_MINGW = yes; then test -z $ac_cv_alignof_long ac_cv_alignof_long=1 test -z $ac_cv_alignof_double ac_cv_alignof_double=1 ;; +Linux-i686) +test -z $ac_cv_alignof_short ac_cv_alignof_short=2 +test -z $ac_cv_alignof_int ac_cv_alignof_int=4 +test -z $ac_cv_alignof_long ac_cv_alignof_long=4 +test -z $ac_cv_alignof_double ac_cv_alignof_double=4 +;; +Linux-x86_64) +test -z $ac_cv_alignof_short ac_cv_alignof_short=2 +test -z $ac_cv_alignof_int ac_cv_alignof_int=4 +test -z $ac_cv_alignof_long ac_cv_alignof_long=8 +test -z $ac_cv_alignof_double ac_cv_alignof_double=8 +;; *) if test -z $ac_cv_alignof_short -o \ -z $ac_cv_alignof_int -o \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac sdext/source
configure.ac |3 --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |4 +++- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |8 +--- 3 files changed, 8 insertions(+), 7 deletions(-) New commits: commit bb6a12caede53029ecb99810f2f58daae4e11af7 Author: Rene Engelhard r...@debian.org Date: Wed Oct 31 18:00:18 2012 +0100 fix sdext build with poppler = 0.19.x Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a diff --git a/configure.ac b/configure.ac index d1dc127..145569b 100644 --- a/configure.ac +++ b/configure.ac @@ -9788,9 +9788,6 @@ if test x$enable_ext_pdfimport != xno -a x$enable_extension_integration != AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler = 0.8.0 ) - # sdext test fails with 0.20.0 - PKG_CHECK_MODULES( POPPLER_NOT_0_20_0, poppler 0.20.0, -, [AC_MSG_ERROR([Poppler 0.20.x is broken, do not use --with-system-poppler or use a different version])]) AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS save_CPPFLAGS=$CPPFLAGS diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 77a9aa6..7adc487 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -489,7 +489,9 @@ void PDFOutDev::endPage() printf(endPage\n); } -#if POPPLER_CHECK_VERSION(0, 17, 0) +#if POPPLER_CHECK_VERSION(0, 19, 0) +void PDFOutDev::processLink(AnnotLink *link) +#elif POPPLER_CHECK_VERSION(0, 17, 0) void PDFOutDev::processLink(AnnotLink *link, Catalog *) #else void PDFOutDev::processLink(Link* link, Catalog*) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 0a19b9a..e5e48fc 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -189,10 +189,12 @@ namespace pdfi // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); -#if POPPLER_CHECK_VERSION(0, 17, 0) -virtual void processLink(AnnotLink *link, Catalog *catalog); -#else //- link borders + #if POPPLER_CHECK_VERSION(0, 19, 0) +virtual void processLink(AnnotLink *link); +#elif POPPLER_CHECK_VERSION(0, 17, 0) + virtual void processLink(AnnotLink *link, Catalog *catalog); +#else virtual void processLink(Link *link, Catalog *catalog); #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) New commits: commit 388ec32d79616bbb9a69f67dea0bad1751d46f48 Author: Michael Stahl mst...@redhat.com Date: Wed Oct 31 19:40:41 2012 +0100 configure: fix --with-parallelism, --without-parallelism make -jyes considered useless Change-Id: I044e95f76e8ea961e781e75c4b6923e700e0d375 diff --git a/configure.ac b/configure.ac index 145569b..b420286 100644 --- a/configure.ac +++ b/configure.ac @@ -12531,8 +12531,13 @@ dnl === dnl Number of CPUs to use during the build dnl === AC_MSG_CHECKING([for number of processors to use]) -if test -n $with_parallelism; then -PARALLELISM=$with_parallelism +# plain --with-parallelism is just the default +if test -n $with_parallelism -a $with_parallelism != yes; then +if test $with_parallelism = no; then +PARALLELISM=1 +else +PARALLELISM=$with_parallelism +fi else if test $enable_icecream = yes; then PARALLELISM=10 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit 562c486349ed679802ca334b71b74c7a0f91987f Author: Tor Lillqvist t...@iki.fi Date: Tue Oct 30 15:43:25 2012 +0200 Build platform configure needs solenv/bin/getcompver.awk now diff --git a/configure.ac b/configure.ac index 55bfb90..a63eb7a 100644 --- a/configure.ac +++ b/configure.ac @@ -4078,6 +4078,7 @@ if test $cross_compiling = yes; then ooo.lst.in \ oowintool \ post_download.in \ +solenv/bin/getcompver.awk \ solenv/inc/langlist.mk \ solenv/inc/postset.mk \ | (cd CONF-FOR-BUILD tar xf -) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac mythes/ExternalProject_mythes.mk
configure.ac |2 ++
mythes/ExternalProject_mythes.mk |6 ++
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 67a23b6af991d383de5d431db9cc88d18f488b7c
Author: Michael Stahl mst...@redhat.com
Date: Mon Oct 29 12:02:36 2012 +0100
move setup of HUNSPELL_CFLAGS etc. to configure
Change-Id: Id50ca2e0804d9e56334c9f7149dc4080a7fee729
diff --git a/configure.ac b/configure.ac
index 276e991..d53c6a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8840,6 +8840,8 @@ if test $with_system_hunspell = yes; then
else
AC_MSG_RESULT([internal])
SYSTEM_HUNSPELL=NO
+HUNSPELL_CFLAGS=-I${WORKDIR}/UnpackedTarball/hunspell/src/hunspell
+HUNSPELL_LIBS=-L${OUTDIR}/lib -lhunspell
HUNSPELL_TARBALL=3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
BUILD_TYPE=$BUILD_TYPE HUNSPELL
fi
diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index 1d2ab7b..b146823 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -21,10 +21,8 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
cd $(EXTERNAL_WORKDIR) \
./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM) gio_can_sniff=no) \
- $(if $(filter NO,$(SYSTEM_HUNSPELL)), \
- HUNSPELL_CFLAGS=-I$(call
gb_UnpackedTarball_get_dir,hunspell/src/hunspell) \
- HUNSPELL_LIBS=-L$(OUTDIR)/lib -lhunspell \
- ) \
+ HUNSPELL_CFLAGS= $(HUNSPELL_CFLAGS) \
+ HUNSPELL_LIBS= $(HUNSPELL_LIBS) \
$(if $(filter C52U,$(COM)$(CPU)),CFLAGS=-m64) \
$(GNUMAKE) -j$(EXTMAXPROCESS) \
touch $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac | 12 1 file changed, 12 deletions(-) New commits: commit c627560d7a2e5f5c9b8ec8ea7d82291da67a7a31 Author: Tomas Chvatal tchva...@suse.cz Date: Thu Oct 25 12:52:12 2012 +0200 Do not die when using old configure options Packagers get warning from autotools about using wrong configure opts. If they decide to ignore it then its their problem. With this approach we would have to die on all the configure script changes which is bit annoying. diff --git a/configure.ac b/configure.ac index 498b426..969e6b0 100644 --- a/configure.ac +++ b/configure.ac @@ -636,18 +636,6 @@ AC_ARG_ENABLE(ext-report-builder, [Disable the Report Builder extension.]) ) -AC_ARG_ENABLE(ext-scripting-beanshell, -AS_HELP_STRING([--enable-ext-scripting-beanshell], - [DEPRECATED: use --enable-scripting-beanshell instead.]) -,AC_MSG_ERROR([--enable-ext-scripting-beanshell is no longer supported.]) -) - -AC_ARG_ENABLE(ext-scripting-javascript, -AS_HELP_STRING([--enable-ext-scripting-javascript], - [DEPRECATED: use --enable-scripting-javascript instead.]) -,AC_MSG_ERROR([--enable-ext-scripting-javascript is no longer supported.]) -) - AC_ARG_ENABLE(ext-typo, AS_HELP_STRING([--enable-ext-typo], [Enable the Typography Toolbar extension.]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
