[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 149cabe7ea3e0b038ea825c203d1f14921df7536 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Sat Nov 29 00:24:41 2014 +0100 bump product version to 4.2.9.0.0+ Change-Id: Ibe590e8df9ed52a94f0ecf56305b7c1566d77831 diff --git a/configure.ac b/configure.ac index ce1c0b2..89e948d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.8.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.9.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cb2af94684b0f6c161bd6d241a10f58e61afd468 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Oct 1 23:11:11 2014 +0200 bump product version to 4.2.8.0.0+ Change-Id: Icc0653847dbe1bf64d23326634246eee0242d24d diff --git a/configure.ac b/configure.ac index 2560a0d..ce1c0b2 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.7.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.8.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) New commits: commit ba754e8ba8897be196de48c48df63b9671115356 Author: Michael Stahl mst...@redhat.com Date: Fri Aug 15 13:25:22 2014 +0200 configure: don't try to use Win32 make on release branch Change-Id: Icd8c1b45659ca323aef25a55803f5b1ce078b9d3 Reviewed-on: https://gerrit.libreoffice.org/10932 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org (cherry picked from commit 2087b54aab25ddbab5128af9f777b1686bc0ce5e) Reviewed-on: https://gerrit.libreoffice.org/10990 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/configure.ac b/configure.ac index 312eacd..2560a0d 100644 --- a/configure.ac +++ b/configure.ac @@ -4798,8 +4798,18 @@ for a in $MAKE $GNUMAKE make gmake gnumake; do if test -n $a; then $a --version 2 /dev/null | grep GNU 21 /dev/null if test $? -eq 0; then -GNUMAKE=`which $a` -break +if test $build_os = cygwin; then +if test -n $($a -v | grep 'Built for Windows') ; then +AC_MSG_NOTICE([$a is a native Win32 make, which is not supported on this old branch.]) +unset GNUMAKE +else +GNUMAKE=`which $a` +break +fi +else +GNUMAKE=`which $a` +break +fi fi fi done ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7bbcb384fddb2cab99de4c6bd4b74c65dd80c432 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Jul 9 18:13:39 2014 +0200 bump product version to 4.2.7.0.0+ Change-Id: Ie7d38cc0bcb2852d5743a2e80b0ad69475d6cd04 diff --git a/configure.ac b/configure.ac index aa6f483..312eacd 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.6.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.7.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 221cd0323a6e80d607eaa323a2367a10108a94f1 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 27 19:33:43 2014 +0200 bump product version to 4.2.6.0.0+ Change-Id: Ifb7359efee0f5cefe41a8299c7e3e1db6bc57981 diff --git a/configure.ac b/configure.ac index 98e2a0e..aa6f483 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.5.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.6.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac vcl/CustomTarget_kde4_moc.mk vcl/unx
configure.ac | 45 -
vcl/CustomTarget_kde4_moc.mk |3
vcl/unx/kde4/KDE4FilePicker.cxx | 21 +---
vcl/unx/kde4/KDESalInstance.cxx |2
vcl/unx/kde4/KDEXLib.cxx | 21 ++--
vcl/unx/kde4/KDEXLib.hxx |4
vcl/unx/kde4/VCLKDEApplication.cxx| 44
vcl/unx/kde4/VCLKDEApplication.hxx|2
vcl/unx/kde4/tst_exclude_posted_events.hxx| 72 ++
vcl/unx/kde4/tst_exclude_socket_notifiers.hxx | 130 --
10 files changed, 231 insertions(+), 113 deletions(-)
New commits:
commit 80f113efa6f60c6b3aad33128921792451f114ce
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Fri Mar 28 15:09:13 2014 +0100
fix KFileDialog crashes (fdo#69002)
Requires Qt patches (or otherwise LO generic file dialog is used).
Squashed from several master patches.
(cherry picked from commit 2cd8a1e0f1e81efd15979953d7f274ab8a6806d6)
(cherry picked from commit 474ad6b0e2fb18370be9d228456a2abbfc15bad2)
(cherry picked from commit e809aa1e916e0f6d1a849d0374f59ef9619b1db7)
(cherry picked from commit 65a3622148ea67744c9c1fc18c2b8d48e5f1c79f)
(cherry picked from commit 508337db0c53caa5fb43ef26f781df159497a482)
(cherry picked from commit 9aa32a34c7c7a2ee4da5f01983a0ed224c38c875)
(cherry picked from commit 145f2e970f46a3a3e5456b122d71f17c3abe878f)
(cherry picked from commit f09d4bc2853be2fa3faa0502b8efe94ad9719731)
Change-Id: I6dba5da0170fb94bab928f71efc7dc8c03cc70d9
Reviewed-on: https://gerrit.libreoffice.org/9206
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/configure.ac b/configure.ac
index 5751f85..98e2a0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11240,6 +11240,8 @@ int main(int argc, char **argv) {
AC_DEFINE(KDE_HAVE_GLIB,1)
KDE_GLIB_CFLAGS=$(printf '%s' $KDE_GLIB_CFLAGS | sed -e
s/-I/${ISYSTEM?}/g)
+qt4_fix_warning=
+
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS=$CXXFLAGS $KDE4_CFLAGS
@@ -11266,12 +11268,53 @@ int main(int argc, char *argv[])
AC_MSG_RESULT([yes])
],[
AC_MSG_RESULT([no])
-AC_MSG_WARN([native KDE4 file pickers will be disabled at
runtime - fix your Qt4 library!])
+AC_MSG_WARN([native KDE4 file pickers will be disabled at
runtime])
+if test -z $qt4_fix_warning; then
+add_warning native KDE4 file pickers will be disabled at
runtime, Qt4 fixes needed
+fi
+qt4_fix_warning=1
+add_warning
https://bugreports.qt-project.org/browse/QTBUG-37380 (needed)
])
# Remove meta object data
rm -f ${TSTBASE}.*
+AC_MSG_CHECKING([whether Qt avoids QClipboard recursion caused by
posted events])
+
+# Prepare meta object data
+TSTBASE=tst_exclude_posted_events
+TSTMOC=${SRC_ROOT}/vcl/unx/kde4/${TSTBASE}
+ln -fs ${TSTMOC}.hxx
+$MOC4 ${TSTBASE}.hxx -o ${TSTBASE}.moc
+
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include tst_exclude_posted_events.moc
+
+int main(int argc, char *argv[])
+{
+QCoreApplication app(argc, argv);
+exit(tst_excludePostedEvents());
+return 0;
+}
+]])],[
+AC_MSG_RESULT([yes])
+],[
+AC_MSG_RESULT([no])
+AC_MSG_WARN([native KDE4 file pickers will be disabled at
runtime])
+if test -z $qt4_fix_warning; then
+add_warning native KDE4 file pickers will be disabled at
runtime, Qt4 fixes needed
+fi
+qt4_fix_warning=1
+add_warning
https://bugreports.qt-project.org/browse/QTBUG-34614 (needed)
+])
+
+# Remove meta object data
+rm -f ${TSTBASE}.*
+
+if test -n $qt4_fix_warning; then
+add_warning
https://bugreports.qt-project.org/browse/QTBUG-38585 (recommended)
+fi
+
LIBS=$save_LIBS
CXXFLAGS=$save_CXXFLAGS
AC_LANG_POP([C++])
diff --git a/vcl/CustomTarget_kde4_moc.mk b/vcl/CustomTarget_kde4_moc.mk
index 9e41754..16d1561 100644
--- a/vcl/CustomTarget_kde4_moc.mk
+++ b/vcl/CustomTarget_kde4_moc.mk
@@ -12,7 +12,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4))
$(call gb_CustomTarget_get_target,vcl/unx/kde4) : \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDEXLib.moc \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDE4FilePicker.moc \
- $(call
gb_CustomTarget_get_workdir,vcl/unx/kde4)/tst_exclude_socket_notifiers.moc
+ $(call
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b11605f36d8e5b9dda01fd577e095e4867f1ce5 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Apr 15 21:40:48 2014 +0200 bump version to 4.2.5.0.0+ Change-Id: I64f7fc5c4aa1bf32ded94540a6f90b43198a35a7 diff --git a/configure.ac b/configure.ac index b352974..f69d8ab 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.5.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit b6a0eacbc36b9db10f12a246606d8e2f1c30fef9 Author: Michael Stahl mst...@redhat.com Date: Thu Apr 10 12:48:41 2014 +0200 fdo#75376: configure: disable LTO by default for MSVC too MSVC 2010 LTO triggers some bug in painting Writer documents; unfortunately it's not possible to put a VCVER check in there to enable LTO by default only for MSVC2012 because the compiler detection actually uses the ENABLE_LTO value. Change-Id: I29ecdd552d8a8bbd673a844e6bf0c938a98825c2 (cherry picked from commit 0d8e3a145901ab0124d40d33a50e2de28dc0c8ab) Reviewed-on: https://gerrit.libreoffice.org/8918 Tested-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/configure.ac b/configure.ac index f36cbaf..b352974 100644 --- a/configure.ac +++ b/configure.ac @@ -2522,12 +2522,6 @@ COMPATH=`echo $COMPATH | $SED s@/[[Bb]][[Ii]][[Nn]]\\\$@@` # Set the ENABLE_LTO variable # === AC_MSG_CHECKING([whether to use link-time optimization]) -if test $_os = WINNT -a $WITH_MINGW != yes -a -z $enable_lto -a \ -\( -z $enable_dbgutil -o $enable_dbgutil = no \) -a \ -\( -z $enable_debug -o $enable_debug = no \); then -# Turn on LTO for MSVC when optimising unless told not to -enable_lto=yes -fi if test -n $enable_lto -a $enable_lto != no; then ENABLE_LTO=TRUE AC_MSG_RESULT([yes]) @@ -3591,6 +3585,11 @@ if test $_os = WINNT; then 100) COMEX=13 WINDOWS_SDK_ACCEPTABLE_VERSIONS=7.1A 7.1 7.0A 6.0A +if test $ENABLE_LTO = TRUE; then + +AC_MSG_WARN([LTO is known to cause problems with MSVC 2010]) +add_warning LTO is known to cause problems with MSVC 2010 +fi ;; 110) COMEX=14 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac vcl/CustomTarget_kde4_moc.mk vcl/Library_vclplug_kde4.mk vcl/unx
configure.ac | 51 +-
vcl/CustomTarget_kde4_moc.mk |3
vcl/Library_vclplug_kde4.mk |2
vcl/unx/kde4/KDE4FilePicker.cxx |8 +
vcl/unx/kde4/KDEData.cxx |2
vcl/unx/kde4/KDESalInstance.cxx | 10 +-
vcl/unx/kde4/KDEXLib.cxx | 30 --
vcl/unx/kde4/KDEXLib.hxx |2
vcl/unx/kde4/tst_exclude_socket_notifiers.hxx | 126 ++
9 files changed, 212 insertions(+), 22 deletions(-)
New commits:
commit f13a93eef2b860ce14d036e6657a6ed8dbfe3651
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Mon Mar 10 15:05:22 2014 +
KDE4: add Qt4 glib ExcludeSocket runtime check
Add a runtime check and configure warning to disable KDE4 native
file pickers, if the Qt4 glib dispatcher doesn't honor the
QEventLoop::ExcludeSocketNotifiers flag.
This way polling the QClipboard using the event loop won't
crash LibreOffice with recursive paint events,
See https://bugreports.qt-project.org/browse/QTBUG-37380
(cherry picked from commit cc8d566d74a2e0b969b92d9cf22cc95a3bf31a98)
Change-Id: I48795deef82eaf6f95a4e518baea66c52f0b7400
Reviewed-on: https://gerrit.libreoffice.org/8708
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/configure.ac b/configure.ac
index 50f1162..f36cbaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11126,7 +11126,7 @@ if test $test_kde4 = yes -a $ENABLE_KDE4 =
TRUE; then
fi
qt_test_include=Qt/qobject.h
-qt_test_library=libQtCore.so
+qt_test_library=libQtNetwork.so
kde_test_include=kwindowsystem.h
kde_test_library=libsolid.so
@@ -11213,8 +11213,9 @@ the root of your Qt installation by exporting QT4DIR
before running configure.
AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of
your KDE4 installation by exporting KDE4DIR before running configure.])
fi
-KDE4_CFLAGS=`pkg-config --cflags QtCore` `pkg-config --cflags QtGui`
-I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT
-KDE4_LIBS=-L$kde_libdir -L$qt_lib_dir -lkio -lkfile -lkdeui -lkdecore
-lQtCore -lQtGui
+PKG_CHECK_MODULES([QT4],[QtNetwork QtGui])
+KDE4_CFLAGS=-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE
-DQT_THREAD_SUPPORT
+KDE4_LIBS=-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir
$QT4_LIBS
KDE4_CFLAGS=$(printf '%s' $KDE4_CFLAGS | sed -e s/-I/${ISYSTEM?}/g)
AC_LANG_PUSH([C++])
@@ -11236,11 +11237,47 @@ int main(int argc, char **argv) {
# Sets also KDE_GLIB_CFLAGS/KDE_GLIB_LIBS if successful.
PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 = 2.4],
[
-KDE_HAVE_GLIB=1
-AC_DEFINE(KDE_HAVE_GLIB,1)
-KDE_GLIB_CFLAGS=$(printf '%s' $KDE_GLIB_CFLAGS | sed -e
s/-I/${ISYSTEM?}/g)
+KDE_HAVE_GLIB=1
+AC_DEFINE(KDE_HAVE_GLIB,1)
+KDE_GLIB_CFLAGS=$(printf '%s' $KDE_GLIB_CFLAGS | sed -e
s/-I/${ISYSTEM?}/g)
+
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS $KDE4_CFLAGS
+save_LIBS=$LIBS
+LIBS=$LIBS $KDE4_LIBS
+AC_MSG_CHECKING([whether Qt has fixed ExcludeSocketNotifiers])
+
+# Prepare meta object data
+TSTBASE=tst_exclude_socket_notifiers
+TSTMOC=${SRC_ROOT}/vcl/unx/kde4/${TSTBASE}
+ln -fs ${TSTMOC}.hxx
+$MOC4 ${TSTBASE}.hxx -o ${TSTBASE}.moc
+
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include tst_exclude_socket_notifiers.moc
+
+int main(int argc, char *argv[])
+{
+QCoreApplication app(argc, argv);
+exit(tst_processEventsExcludeSocket());
+return 0;
+}
+]])],[
+AC_MSG_RESULT([yes])
+],[
+AC_MSG_RESULT([no])
+AC_MSG_WARN([native KDE4 file pickers will be disabled at
runtime - fix your Qt4 library!])
+])
+
+# Remove meta object data
+rm -f ${TSTBASE}.*
+
+LIBS=$save_LIBS
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
],
-AC_MSG_WARN([[No Glib found, KDE4 support will not integrate with Qt's
Glib event loop support]]))
+AC_MSG_WARN([[No Glib found, KDE4 support will not use native file
pickers!]]))
fi
AC_SUBST(KDE4_CFLAGS)
AC_SUBST(KDE4_LIBS)
diff --git a/vcl/CustomTarget_kde4_moc.mk b/vcl/CustomTarget_kde4_moc.mk
index 0846b0b..9e41754 100644
--- a/vcl/CustomTarget_kde4_moc.mk
+++ b/vcl/CustomTarget_kde4_moc.mk
@@ -11,7 +11,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4))
$(call gb_CustomTarget_get_target,vcl/unx/kde4) : \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDEXLib.moc \
- $(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDE4FilePicker.moc
+ $(call
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 130bca44d85dcac10c83e3dfca26ad83c8fabe77 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Mar 12 23:47:17 2014 +0100 bump version to 4.2.4.0.0+ Change-Id: Ie96bed27a0610fafa65892293843fbcecffb4efa diff --git a/configure.ac b/configure.ac index b8def00..50f1162 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.3.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.4.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 597570b8c844050beca5a08e681b1ff5c771cc0f Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Feb 18 15:11:26 2014 +0100 bump version to 4.2.3.0.0+ libreoffice-4-2-2 has been branched off the libreoffice-4-2-1 branch Change-Id: Id1b347597b369ba9035fe528b2a4c348ce3de91e diff --git a/configure.ac b/configure.ac index f7fe5cd..b8def00 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.2.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.3.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac download.lst
configure.ac |2 +- download.lst |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 1bd22f6c86bac5adea4698fabc92b896864c77ba Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Feb 12 09:43:48 2014 -0500 fdo#74824: Update mdds to 0.10.2 which fixes one crasher bug. Change-Id: If05c7573530c892dc063dfb7accec1c24a322ddd (cherry picked from commit 07e2c31831ad265b018e5fdf59bdde048fbb4d35) Reviewed-on: https://gerrit.libreoffice.org/8018 Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/configure.ac b/configure.ac index c5ea528..7db3fab 100644 --- a/configure.ac +++ b/configure.ac @@ -8706,7 +8706,7 @@ AC_SUBST(SYSTEM_BOOST) dnl === dnl Check for system mdds dnl === -libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.1]) +libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.2]) dnl === dnl Determine which hash container mdds shall use diff --git a/download.lst b/download.lst index 1b14652..080d2ab 100644 --- a/download.lst +++ b/download.lst @@ -82,7 +82,7 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 -export MDDS_TARBALL := 01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2 +export MDDS_TARBALL := 47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1f793827dc1d278d7c84307fc2e245622393 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Feb 13 01:27:55 2014 +0100 bump version to 4.2.2.0.0+ Change-Id: I9763e7d8627d53f3b0d62dae916211a7396772d7 diff --git a/configure.ac b/configure.ac index 7db3fab..f7fe5cd 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.1.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.2.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit 21c682d54aa4368d9c9566f3875a425926d6ec0b Author: Michael Stahl mst...@redhat.com Date: Thu Jan 9 21:42:19 2014 +0100 configure: ENABLE_NPAPI_FROM_BROWSER requires Xt library Change-Id: I023927897787ae046baf2751d0e56bfca3fb688f (cherry picked from commit 1366a41c320a9bb173dc5e066ab532d679d89bcc) Reviewed-on: https://gerrit.libreoffice.org/7346 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configure.ac b/configure.ac index 41b1cba..9887963 100644 --- a/configure.ac +++ b/configure.ac @@ -9190,6 +9190,10 @@ if test $WANT_X11 = yes; then AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt headers not found])], [#include X11/Intrinsic.h]) +# ENABLE_NPAPI_FROM_BROWSER requires Xt library +AC_CHECK_LIB([Xt], [XtToolkitInitialize], [:], +[AC_MSG_ERROR(Xt library not found)]) + dnl === dnl Check for extension headers dnl === ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ba5c3753f736cdca9b6ffea4bf3db2e9b31d4ee2 Author: Michael Stahl mst...@redhat.com Date: Thu Jan 9 22:10:23 2014 +0100 configure: we need both cups header and library Change-Id: Ie27a67b7d1086fbbce5eb40a56b4d154afb3faf8 (cherry picked from commit 3b3c8c4796a89a76ce7574908096a91993412523) Reviewed-on: https://gerrit.libreoffice.org/7348 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configure.ac b/configure.ac index 9887963..ccf2704 100644 --- a/configure.ac +++ b/configure.ac @@ -4647,7 +4647,7 @@ if test $test_cups = yes; then AC_MSG_CHECKING([whether cups support is present]) AC_CHECK_LIB([cups], [cupsPrintFiles], [:]) AC_CHECK_HEADER(cups/cups.h, AC_DEFINE(HAVE_CUPS_H)) -if test $ac_cv_lib_cups_cupsPrintFiles != yes -a $ac_cv_header_cups_cups_h != yes; then +if test $ac_cv_lib_cups_cupsPrintFiles != yes -o $ac_cv_header_cups_cups_h != yes; then AC_MSG_ERROR([Could not find CUPS. Install libcupsys2-dev or cups-devel.]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |8 1 file changed, 8 insertions(+) New commits: commit 123a5a7079426d7d4cb6b980b384339d6150a0a8 Author: Michael Stahl mst...@redhat.com Date: Thu Jan 9 22:34:45 2014 +0100 configure: check for ICE and SM libraries too Change-Id: Id86b09c9f2fe8770da8cc6b13672e2bf37201962 (cherry picked from commit 415dfd0d89f550268dc66d4e7d447c1975a8aa44) Reviewed-on: https://gerrit.libreoffice.org/7349 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configure.ac b/configure.ac index ccf2704..4164d29 100644 --- a/configure.ac +++ b/configure.ac @@ -9199,6 +9199,14 @@ if test $WANT_X11 = yes; then dnl === AC_CHECK_HEADERS(X11/extensions/shape.h,[],[AC_MSG_ERROR([libXext headers not found])], [#include X11/extensions/shape.h]) + +# vcl needs ICE and SM +AC_CHECK_HEADERS(X11/ICE/ICElib.h,[],[AC_MSG_ERROR([libICE headers not found])]) +AC_CHECK_LIB([ICE], [IceConnectionNumber], [:], +[AC_MSG_ERROR(ICE library not found)]) +AC_CHECK_HEADERS(X11/SM/SMlib.h,[],[AC_MSG_ERROR([libSM headers not found])]) +AC_CHECK_LIB([SM], [SmcOpenConnection], [:], +[AC_MSG_ERROR(SM library not found)]) fi dnl === ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac download.lst external/mdds sc/inc sc/source
configure.ac |2 download.lst |2 external/mdds/0001-Workaround-for-an-old-gcc-bug.patch | 27 --- external/mdds/UnpackedTarball_mdds.mk |1 sc/inc/scmatrix.hxx| 12 + sc/source/core/inc/jumpmatrix.hxx | 31 sc/source/core/tool/interpr1.cxx | 71 +- sc/source/core/tool/jumpmatrix.cxx | 119 - sc/source/core/tool/scmatrix.cxx | 78 +++ 9 files changed, 271 insertions(+), 72 deletions(-) New commits: commit e1023ab62a62bb76b73841c02e44eacaba699d0e Author: Eike Rathke er...@redhat.com Date: Tue Jan 7 15:47:43 2014 -0500 resolved fdo#72929 buffer jump matrix' result matrix blocks Update mdds to 0.10.1, set it as the required baseline. Patch mdds to make available a method to empty multiple elements in one call. This is for multi_type_matrix. (cherry picked from commit 47a7565315dcfc4271c2b2c205225d914a1a5094) Update mdds to 0.10.1, set it as the required baseline. This update will obsolete two patches that were previously applied. (cherry picked from commit 12890dd7adfc70bc562bb2760084515cc1269a38) Conflicts: download.lst resolved fdo#72929 buffer jump matrix' result matrix blocks (cherry picked from commit ae4dc8e0ea3b78d804d1022905501a56030073c0) Change-Id: I7b1fcf6b16b5addbb76078506536542cddede25f Reviewed-on: https://gerrit.libreoffice.org/7320 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/configure.ac b/configure.ac index 637b3d9..41b1cba 100644 --- a/configure.ac +++ b/configure.ac @@ -8701,7 +8701,7 @@ AC_SUBST(SYSTEM_BOOST) dnl === dnl Check for system mdds dnl === -libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.9.1]) +libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.1]) dnl === dnl Determine which hash container mdds shall use diff --git a/download.lst b/download.lst index aaa4da6..1cf4224 100644 --- a/download.lst +++ b/download.lst @@ -80,7 +80,7 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 -export MDDS_TARBALL := 8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2 +export MDDS_TARBALL := 01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz diff --git a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch b/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch deleted file mode 100644 index 8529fbf..000 --- a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3e3a5c483217fe05b5bd556bf1b2c6f3ec297cb1 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida kohei.yosh...@gmail.com -Date: Sat, 22 Jun 2013 21:30:13 -0400 -Subject: [PATCH] Workaround for an old gcc bug. - -c.f. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44963 - include/mdds/multi_type_vector_types.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp -index c4b2772..44af655 100644 a/include/mdds/multi_type_vector_types.hpp -+++ b/c/d/include/mdds/multi_type_vector_types.hpp -@@ -278,7 +278,8 @@ public: - #ifndef MDDS_MULTI_TYPE_VECTOR_USE_DEQUE - d.reserve(d.size() + len); - #endif --std::copy(its.first, its.second, std::back_inserter(d)); -+for (; its.first != its.second; ++its.first) -+d.push_back(*its.first); - } - - static void assign_values_from_block( --- -1.8.1.4 - diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk index 1ccfc2a..387b8bc 100644 --- a/external/mdds/UnpackedTarball_mdds.mk +++ b/external/mdds/UnpackedTarball_mdds.mk @@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ external/mdds/mdds_0.6.0.patch \ - external/mdds/0001-Workaround-for-an-old-gcc-bug.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index 93105dd..1db1641 100644
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac download.lst external/python3
configure.ac|2
download.lst|2
external/python3/ExternalPackage_python3.mk | 14 +-
external/python3/UnpackedTarball_python3.mk | 11 -
external/python3/i100492-freebsd.patch.1|2
external/python3/python-3.3.0-15833.patch.1 | 28
external/python3/python-3.3.0-aix.patch.1 | 156
external/python3/python-3.3.0-elf-rpath.patch.1 | 13 --
external/python3/python-3.3.0-ffi-clang.patch.1 | 40 --
external/python3/python-3.3.3-aix.patch.1 | 145 ++
external/python3/python-3.3.3-elf-rpath.patch.1 | 13 ++
11 files changed, 170 insertions(+), 256 deletions(-)
New commits:
commit c5ab946abfe3b2c60253e3c724eee2be0bda0b81
Author: Michael Stahl mst...@redhat.com
Date: Mon Jan 6 16:05:56 2014 +0100
fdo#73087: python3: upgrade to version 3.3.3
- drop obsolete/upstreamed patches:
python-3.3.0-ffi-clang.patch.1
python-3.3.0-15833.patch.1
one hunk of python-3.3.0-aix.patch.1 in fficonfig.py.in
Change-Id: I12f0f78a172067986b63455847015ea2430a084c
Reviewed-on: https://gerrit.libreoffice.org/7278
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 45c537a1185dfca7e51229dde9e9220e5174bd57)
Reviewed-on: https://gerrit.libreoffice.org/7283
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/configure.ac b/configure.ac
index c3b6918..75d0054 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8123,7 +8123,7 @@ internal)
SYSTEM_PYTHON=NO
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
BUILD_TYPE=$BUILD_TYPE PYTHON
# Embedded Python dies without Home set
if test $HOME = ; then
diff --git a/download.lst b/download.lst
index 444d6dc..aaa4da6 100644
--- a/download.lst
+++ b/download.lst
@@ -92,7 +92,7 @@ export PIXMAN_TARBALL :=
c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
export POPPLER_TARBALL :=
1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_TARBALL := b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2
+export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
export REDLAND_TARBALL :=
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/external/python3/ExternalPackage_python3.mk
b/external/python3/ExternalPackage_python3.mk
index ac8e856..1b83bd2 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -114,6 +114,13 @@ endif
# headers are not delivered, but used from unpacked dir Include/
# (+ toplevel for pyconfig.h)
+# that one is generated...
+ifneq ($(OS)-$(COM),WNT-MSC)
+$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+ LO_lib/_sysconfigdata.py \
+))
+endif
+
# packages not shipped:
# dbm, sqlite3 - need some database stuff
# curses - need curses to build the C module
@@ -148,13 +155,6 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/plat-aix4/IN.py \
))
-# that one is generated...
-ifneq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
- Lib/_sysconfigdata.py \
-))
-endif
-
$(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
LICENSE \
Lib/__future__.py \
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index 62cc55e..200a9e13 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -22,28 +22,21 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
external/python3/python-3.3.0-i42553.patch.2 \
- external/python3/python-3.3.0-aix.patch.1 \
+ external/python3/python-3.3.3-aix.patch.1 \
external/python3/python-3.3.0-darwin.patch.1 \
external/python3/python-3.3.0-msvc2012.patch.1 \
external/python3/python-3.3.0-msvc-disable.patch.1 \
external/python3/python-3.3.0-msvc-x64.patch.1 \
external/python3/python-3.3.0-ssl.patch.1 \
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 668adad0e74668f7d8145d169dca9ec591e2 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Jan 7 19:34:28 2014 +0100 bump product version to 4.2.0.2.0+ Change-Id: Ib23ca2668b48aa88358210a3b42699b3f1b0e154 diff --git a/configure.ac b/configure.ac index 75d0054..3fbc362 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.0.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.0.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c2850eabb4cf9f6a661ccbc3eb7012999eec0faa Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Jan 7 20:16:44 2014 +0100 bump product version to 4.2.1.0.0+ Change-Id: Ib3d71f4f2d502b07be7e563d83e58d60eb6dc618 diff --git a/configure.ac b/configure.ac index 3fbc362..637b3d9 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.0.2.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.1.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac Repository.mk sc/Library_sc.mk
Repository.mk|2 +- configure.ac |6 +++--- sc/Library_sc.mk |3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) New commits: commit 1b215d42075ca7cb6afb50cde59261664f9ba545 Author: Andras Timar andras.ti...@collabora.com Date: Sat Dec 21 13:44:51 2013 -0800 build fix Change-Id: I6a2e8e69106584b6b7c9af35d4e0e79bf6ef5342 diff --git a/Repository.mk b/Repository.mk index eb02ae3..3977ac3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -157,7 +157,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ scd \ scfilt \ scui \ - solver \ + $(if $(MPL_SUBSET),,solver) \ $(if $(ENABLE_OPENCL),scopencl) \ $(if $(DISABLE_SCRIPTING),,vbaobj) \ $(if $(ENABLE_TELEPATHY),tubes) \ diff --git a/configure.ac b/configure.ac index 8c08b1e..c3b6918 100644 --- a/configure.ac +++ b/configure.ac @@ -9128,7 +9128,7 @@ AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents]) # Obviously no such thing on iOS or Android. Also not possible when building # 64-bit OS X code as the plugin code uses QuickTime and Carbon. if test $_os != Android -a $_os != iOS -a \( $_os != Darwin -o $BITNESS_OVERRIDE = \) -a \ -$enable_headless != yes +$enable_headless != yes -a $enable_mpl_subset != yes then AC_MSG_RESULT([yes]) ENABLE_NPAPI_FROM_BROWSER=TRUE @@ -9142,8 +9142,8 @@ dnl === dnl Check for NPAPI interface to plug LibreOffice into browser windows dnl === AC_MSG_CHECKING([whether to plug LibreOffice into browser windows]) -if test $_os = WINNT -o $_os != Android -a $_os != Darwin -a $_os != iOS -a \ -$enable_headless != yes -a $enable_gtk != no +if test $enable_mpl_subset != yes -a \( $_os = WINNT -o $_os != Android -a $_os != Darwin -a $_os != iOS -a \ +$enable_headless != yes -a $enable_gtk != no \) then AC_MSG_RESULT([yes]) ENABLE_NPAPI_INTO_BROWSER=TRUE diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 791752f..efdea71 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -331,7 +331,8 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/Accessibility/AccessibleCellBase \ sc/source/ui/Accessibility/AccessibleContextBase \ sc/source/ui/Accessibility/AccessibleCsvControl \ -sc/source/ui/Accessibility/AccessibleDataPilotControl \ +$(if $(filter TRUE,$(MPL_SUBSET)),, \ +sc/source/ui/Accessibility/AccessibleDataPilotControl) \ sc/source/ui/Accessibility/AccessibleDocument \ sc/source/ui/Accessibility/AccessibleDocumentBase \ sc/source/ui/Accessibility/AccessibleDocumentPagePreview \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b62c77d363aea607e35f65c06e9692a662195391 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Dec 17 18:19:01 2013 +0100 bump product version to 4.2.0.1.0+ Change-Id: If10fcf86ef07ce3f62bdc27783246a69d03f9004 diff --git a/configure.ac b/configure.ac index 176a7c8..8c08b1e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.0.0.beta2+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.0.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5df95fc776ff5a92402a55d27b110df6ca906662 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Dec 3 21:08:35 2013 +0100 bump version to 4.2.0.0.beta2+ Change-Id: Ia17cc7277be17f3584117e5a2deeb0f07505599d diff --git a/configure.ac b/configure.ac index 244fe05..176a7c8 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.0.0.beta1+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.0.0.beta2+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac download.lst external/libeot vcl/source
configure.ac | 18 download.lst |4 - external/libeot/UnpackedTarball_libeot.mk |4 - external/libeot/libeot-avoid-autotools-run.patch.0 | 44 - vcl/source/gdi/embeddedfontshelper.cxx |8 +-- vcl/source/gdi/pdfwriter_impl.cxx |2 6 files changed, 8 insertions(+), 72 deletions(-) New commits: commit 64736759bc1fa2014dc60247974c94379ee91aa5 Author: David Tardon dtar...@redhat.com Date: Sun Dec 1 09:02:13 2013 +0100 upload libeot-0.01 Change-Id: I877cab5e13ebb52911b2e238a0f4ebb87cda73e9 (cherry picked from commit 0f4be588622379388650d8fc451829d17d16a7bf) diff --git a/configure.ac b/configure.ac index e510bc6..244fe05 100644 --- a/configure.ac +++ b/configure.ac @@ -7707,28 +7707,12 @@ if test $_os != WINNT -a $_os != Darwin -a $enable_eot = yes; then AC_DEFINE([ENABLE_EOT]) AC_MSG_RESULT([yes]) -AC_MSG_CHECKING([which libeot to use]) -if test $with_system_libeot = yes; then -AC_MSG_RESULT([external]) -SYSTEM_LIBEOT=YES -AC_CHECK_HEADER([libeot.h], [], -[AC_MSG_ERROR([libeot.h not found. install libeot])], []) -AC_CHECK_LIB([libeot], [eot2ttf_file], [:], -[AC_MSG_RESULT([libeot library not found or functional.])], []) -libo_MINGW_CHECK_DLL([libeot]) -else -AC_MSG_RESULT([internal]) -SYSTEM_LIBEOT=NO -BUILD_TYPE=$BUILD_TYPE LIBEOT -fi +libo_CHECK_SYSTEM_MODULE([libeot],[LIBEOT],[libeot = 0.01]) else ENABLE_EOT= AC_MSG_RESULT([no]) fi AC_SUBST([ENABLE_EOT]) -AC_SUBST([SYSTEM_LIBEOT]) -AC_SUBST([LIBEOT_CFLAGS]) -AC_SUBST([LIBEOT_LIBS]) dnl === dnl Check for system libe-book diff --git a/download.lst b/download.lst index ee63b4d..444d6dc 100644 --- a/download.lst +++ b/download.lst @@ -22,8 +22,8 @@ HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2 LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip -LIBEOT_MD5SUM := 4c3fdbae53f3c155af94d6df0b6e12b6 -export LIBEOT_TARBALL := libeot.tar.bz2 +LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 +export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz diff --git a/external/libeot/UnpackedTarball_libeot.mk b/external/libeot/UnpackedTarball_libeot.mk index 9b95fd2..cbd1a69a 100644 --- a/external/libeot/UnpackedTarball_libeot.mk +++ b/external/libeot/UnpackedTarball_libeot.mk @@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libeot)) $(eval $(call gb_UnpackedTarball_set_tarball,libeot,$(LIBEOT_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,libeot,\ - external/libeot/libeot-avoid-autotools-run.patch.0 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libeot/libeot-avoid-autotools-run.patch.0 b/external/libeot/libeot-avoid-autotools-run.patch.0 deleted file mode 100644 index 875bda5..000 --- a/external/libeot/libeot-avoid-autotools-run.patch.0 +++ /dev/null @@ -1,44 +0,0 @@ Makefile.in.dt 2013-11-12 17:02:57.555418341 +0100 -+++ Makefile.in2013-11-12 17:04:03.100619894 +0100 -@@ -87,7 +87,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(sr - $(srcdir)/config.h.in depcomp $(libeot_include_HEADERS) ar-lib \ - compile config.guess config.sub install-sh missing ltmain.sh - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/configure.ac -+am__aclocal_m4_deps = - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -@@ -367,19 +367,6 @@ all: config.h - .SUFFIXES: .c .lo .o .obj - am--refresh: Makefile - @: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ --case '$(am__configure_deps)' in \ -- *$$dep*) \ --echo ' cd $(srcdir) $(AUTOMAKE) --foreign'; \ --$(am__cd) $(srcdir) $(AUTOMAKE) --foreign \ -- exit 0; \ --exit 1;; \ --esac; \ -- done; \ -- echo ' cd $(top_srcdir) $(AUTOMAKE) --foreign Makefile'; \ -- $(am__cd) $(top_srcdir) \ --$(AUTOMAKE) --foreign Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -394,12 +381,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - --$(top_srcdir)/configure: $(am__configure_deps) -- $(am__cd) $(srcdir)
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 479a54ed0475d0f305d78d7a29b127aa8122f248 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Nov 21 05:19:40 2013 +0100 bump product version to 4.2.0.0.beta1+ Change-Id: Iea3539376db2d9b136a30a577002f7ded69a58a4 diff --git a/configure.ac b/configure.ac index 394b8cd..b7c56fd 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.0.0.alpha1+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.0.0.beta1+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
