diff -Nru libreoffice-7.4.1~rc2/aclocal.m4 libreoffice-7.4.2~rc3/aclocal.m4 --- libreoffice-7.4.1~rc2/aclocal.m4 2022-09-09 18:50:10.000000000 +0000 +++ libreoffice-7.4.2~rc3/aclocal.m4 2022-10-10 11:10:49.000000000 +0000 @@ -13,7 +13,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) +# serial 12 (pkg-config-0.29.2) dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson @@ -55,7 +55,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -156,7 +156,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -166,11 +166,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -187,7 +187,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -288,74 +288,6 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------ -dnl -dnl Prepare a "--with-" configure option using the lowercase -dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and -dnl PKG_CHECK_MODULES in a single macro. -AC_DEFUN([PKG_WITH_MODULES], -[ -m4_pushdef([with_arg], m4_tolower([$1])) - -m4_pushdef([description], - [m4_default([$5], [build with ]with_arg[ support])]) - -m4_pushdef([def_arg], [m4_default([$6], [auto])]) -m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) -m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) - -m4_case(def_arg, - [yes],[m4_pushdef([with_without], [--without-]with_arg)], - [m4_pushdef([with_without],[--with-]with_arg)]) - -AC_ARG_WITH(with_arg, - AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, - [AS_TR_SH([with_]with_arg)=def_arg]) - -AS_CASE([$AS_TR_SH([with_]with_arg)], - [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], - [auto],[PKG_CHECK_MODULES([$1],[$2], - [m4_n([def_action_if_found]) $3], - [m4_n([def_action_if_not_found]) $4])]) - -m4_popdef([with_arg]) -m4_popdef([description]) -m4_popdef([def_arg]) - -])dnl PKG_WITH_MODULES - -dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ----------------------------------------------- -dnl -dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES -dnl check._[VARIABLE-PREFIX] is exported as make variable. -AC_DEFUN([PKG_HAVE_WITH_MODULES], -[ -PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) - -AM_CONDITIONAL([HAVE_][$1], - [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) -])dnl PKG_HAVE_WITH_MODULES - -dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------------------ -dnl -dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after -dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make -dnl and preprocessor variable. -AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], -[ -PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) - -AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], - [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) -])dnl PKG_HAVE_DEFINE_WITH_MODULES - # Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru libreoffice-7.4.1~rc2/avmedia/Library_avmediagst.mk libreoffice-7.4.2~rc3/avmedia/Library_avmediagst.mk --- libreoffice-7.4.1~rc2/avmedia/Library_avmediagst.mk 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/avmedia/Library_avmediagst.mk 2022-10-10 10:15:14.000000000 +0000 @@ -33,6 +33,7 @@ salhelper \ tl \ vcl \ + avmedia \ )) $(eval $(call gb_Library_add_exception_objects,avmediagst,\ diff -Nru libreoffice-7.4.1~rc2/avmedia/source/framework/mediaitem.cxx libreoffice-7.4.2~rc3/avmedia/source/framework/mediaitem.cxx --- libreoffice-7.4.1~rc2/avmedia/source/framework/mediaitem.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/avmedia/source/framework/mediaitem.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -64,6 +65,7 @@ bool m_bMute; css::media::ZoomLevel m_eZoom; Graphic m_aGraphic; + text::GraphicCrop m_aCrop; explicit Impl(AVMediaSetMask nMaskSet) : m_nMaskSet( nMaskSet ) @@ -107,6 +109,7 @@ && m_pImpl->m_Referer == rOther.m_pImpl->m_Referer && m_pImpl->m_sMimeType == rOther.m_pImpl->m_sMimeType && m_pImpl->m_aGraphic == rOther.m_pImpl->m_aGraphic + && m_pImpl->m_aCrop == rOther.m_pImpl->m_aCrop && m_pImpl->m_eState == rOther.m_pImpl->m_eState && m_pImpl->m_fDuration == rOther.m_pImpl->m_fDuration && m_pImpl->m_fTime == rOther.m_pImpl->m_fTime @@ -193,6 +196,9 @@ if (nMaskSet & AVMediaSetMask::GRAPHIC) bChanged |= setGraphic(rMediaItem.getGraphic()); + if (nMaskSet & AVMediaSetMask::CROP) + bChanged |= setCrop(rMediaItem.getCrop()); + if( AVMediaSetMask::STATE & nMaskSet ) bChanged |= setState( rMediaItem.getState() ); @@ -275,6 +281,17 @@ const Graphic & MediaItem::getGraphic() const { return m_pImpl->m_aGraphic; } +bool MediaItem::setCrop(const text::GraphicCrop& rCrop) +{ + m_pImpl->m_nMaskSet |= AVMediaSetMask::CROP; + bool bChanged = rCrop != m_pImpl->m_aCrop; + if (bChanged) + m_pImpl->m_aCrop = rCrop; + return bChanged; +} + +const text::GraphicCrop& MediaItem::getCrop() const { return m_pImpl->m_aCrop; } + bool MediaItem::setState(MediaState eState) { m_pImpl->m_nMaskSet |= AVMediaSetMask::STATE; diff -Nru libreoffice-7.4.1~rc2/avmedia/source/gstreamer/gstplayer.cxx libreoffice-7.4.2~rc3/avmedia/source/gstreamer/gstplayer.cxx --- libreoffice-7.4.1~rc2/avmedia/source/gstreamer/gstplayer.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/avmedia/source/gstreamer/gstplayer.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -30,6 +30,8 @@ #include #include +#include + #include #include #include @@ -37,6 +39,8 @@ #include #include #include +#include +#include #include "gstplayer.hxx" #include "gstframegrabber.hxx" @@ -867,6 +871,32 @@ g_object_set(G_OBJECT(mpPlaybin), "video-sink", pVideosink, nullptr); g_object_set(G_OBJECT(mpPlaybin), "force-aspect-ratio", FALSE, nullptr); + if ((rArguments.getLength() >= 4) && (rArguments[3] >>= pIntPtr) && pIntPtr) + { + auto pItem = reinterpret_cast(pIntPtr); + Graphic aGraphic = pItem->getGraphic(); + const text::GraphicCrop& rCrop = pItem->getCrop(); + if (!aGraphic.IsNone() && (rCrop.Bottom > 0 || rCrop.Left > 0 || rCrop.Right > 0 || rCrop.Top > 0)) + { + // The media item has a non-empty cropping set. Try to crop the video accordingly. + Size aPref = aGraphic.GetPrefSize(); + Size aPixel = aGraphic.GetSizePixel(); + tools::Long nLeft = aPixel.getWidth() * rCrop.Left / aPref.getWidth(); + tools::Long nTop = aPixel.getHeight() * rCrop.Top / aPref.getHeight(); + tools::Long nRight = aPixel.getWidth() * rCrop.Right / aPref.getWidth(); + tools::Long nBottom = aPixel.getHeight() * rCrop.Bottom / aPref.getHeight(); + GstElement* pVideoFilter = gst_element_factory_make("videocrop", nullptr); + if (pVideoFilter) + { + g_object_set(G_OBJECT(pVideoFilter), "left", nLeft, nullptr); + g_object_set(G_OBJECT(pVideoFilter), "top", nTop, nullptr); + g_object_set(G_OBJECT(pVideoFilter), "right", nRight, nullptr); + g_object_set(G_OBJECT(pVideoFilter), "bottom", nBottom, nullptr); + g_object_set(G_OBJECT(mpPlaybin), "video-filter", pVideoFilter, nullptr); + } + } + } + if (!mbUseGtkSink) { mnWindowID = pEnvData->GetWindowHandle(pParentWindow->ImplGetFrame()); diff -Nru libreoffice-7.4.1~rc2/avmedia/source/viewer/mediawindow_impl.cxx libreoffice-7.4.2~rc3/avmedia/source/viewer/mediawindow_impl.cxx --- libreoffice-7.4.1~rc2/avmedia/source/viewer/mediawindow_impl.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/avmedia/source/viewer/mediawindow_impl.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -298,6 +299,9 @@ void MediaWindowImpl::executeMediaItem( const MediaItem& rItem ) { + mpItem = &rItem; + comphelper::ScopeGuard g([this] { this->mpItem = nullptr; }); + const AVMediaSetMask nMaskSet = rItem.getMaskSet(); // set URL first @@ -418,7 +422,9 @@ uno::Sequence aArgs{ uno::Any(nParentWindowHandle), uno::Any(awt::Rectangle(aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height())), - uno::Any(reinterpret_cast(mpChildWindow.get())) + uno::Any(reinterpret_cast(mpChildWindow.get())), + // Media item contains media properties, e.g. cropping. + uno::Any(reinterpret_cast(mpItem)) }; try diff -Nru libreoffice-7.4.1~rc2/avmedia/source/viewer/mediawindow_impl.hxx libreoffice-7.4.2~rc3/avmedia/source/viewer/mediawindow_impl.hxx --- libreoffice-7.4.1~rc2/avmedia/source/viewer/mediawindow_impl.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/avmedia/source/viewer/mediawindow_impl.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -150,6 +150,7 @@ VclPtr mpMediaWindowControl; std::unique_ptr mpEmptyBmpEx; std::unique_ptr mpAudioBmpEx; + const MediaItem* mpItem = nullptr; }; }} // end namespace avmedia::priv diff -Nru libreoffice-7.4.1~rc2/basctl/source/basicide/basides2.cxx libreoffice-7.4.2~rc3/basctl/source/basicide/basides2.cxx --- libreoffice-7.4.1~rc2/basctl/source/basicide/basides2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/basctl/source/basicide/basides2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -56,7 +56,7 @@ return false; } -OUString Shell::GetSelectionText( bool bWholeWord ) +OUString Shell::GetSelectionText( bool bWholeWord, bool /*bOnlyASample*/ ) { OUString aText; if (ModulWindow* pMCurWin = dynamic_cast(pCurWin.get())) diff -Nru libreoffice-7.4.1~rc2/basctl/source/inc/basidesh.hxx libreoffice-7.4.2~rc3/basctl/source/inc/basidesh.hxx --- libreoffice-7.4.1~rc2/basctl/source/inc/basidesh.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/basctl/source/inc/basidesh.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -169,7 +169,7 @@ // virtual sal_uInt16 Print( SfxProgress &rProgress, sal_Bool bIsAPI, PrintDialog *pPrintDialog = 0 ); virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; - virtual OUString GetSelectionText( bool bCompleteWords = false ) override; + virtual OUString GetSelectionText( bool bCompleteWords = false, bool bOnlyASample = false ) override; virtual bool HasSelection( bool bText = true ) const override; void GetState( SfxItemSet& ); diff -Nru libreoffice-7.4.1~rc2/bin/ui-rules-enforcer.py libreoffice-7.4.2~rc3/bin/ui-rules-enforcer.py --- libreoffice-7.4.1~rc2/bin/ui-rules-enforcer.py 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/bin/ui-rules-enforcer.py 2022-10-10 10:15:14.000000000 +0000 @@ -242,19 +242,19 @@ if input_purpose != None: current.remove(input_purpose) -def remove_spin_button_caps_lock_warning(current): +def remove_caps_lock_warning(current): caps_lock_warning = None - isspinbutton = current.get('class') == "GtkSpinButton" + iscandidate = current.get('class') == "GtkSpinButton" or current.get('class') == "GtkEntry" for child in current: - remove_spin_button_caps_lock_warning(child) - if not isspinbutton: + remove_caps_lock_warning(child) + if not iscandidate: continue if child.tag == "property": attributes = child.attrib if attributes.get("name") == "caps_lock_warning" or attributes.get("name") == "caps-lock-warning": caps_lock_warning = child - if isspinbutton: + if iscandidate: if caps_lock_warning != None: current.remove(caps_lock_warning) @@ -628,7 +628,7 @@ remove_check_button_relief(root) remove_check_button_image_position(root) remove_spin_button_input_purpose(root) -remove_spin_button_caps_lock_warning(root) +remove_caps_lock_warning(root) remove_spin_button_max_length(root) remove_track_visited_links(root) remove_label_pad(root) diff -Nru libreoffice-7.4.1~rc2/ChangeLog libreoffice-7.4.2~rc3/ChangeLog --- libreoffice-7.4.1~rc2/ChangeLog 2022-09-09 18:50:07.000000000 +0000 +++ libreoffice-7.4.2~rc3/ChangeLog 2022-10-10 11:10:46.000000000 +0000 @@ -1,172 +1,2678 @@ -2022-09-09 Christian Lohmaier [3c58a8f3a960df8bc8fd77b461821e42c061c5f0] +2022-10-10 Xisco Fauli [382eef1f22670f7f4118c8c2dd222ec7ad009daf] - Version 7.4.1.2, tag libreoffice-7.4.1.2 + Version 7.4.2.3, tag libreoffice-7.4.2.3 -2022-09-09 Christian Lohmaier [9e534c8f93f11fdb81c592fb599f4dcbf702725c] +2022-10-10 Xisco Fauli [e689bad87edb007aec802c9411cfb819d535aa41] - bump product version to 7.4.1.2 + bump product version to 7.4.2.3 - Change-Id: Ibeb50b989bfff1961e5fee363e3b09426259f9f9 + Change-Id: I82ef384410168bff002a95b77fafbc70f926b6bf -2022-09-09 Christian Lohmaier [65005db2377ff7384d6ac623232b635f039de421] +2022-10-10 Caolán McNamara [26f7d989b7cee0843eaa36862d15a02a7060556c] - update credits + Resolves: tdf#151441 queries don't show any content - Change-Id: I2b1e2e53b0688369e9ebc480ab296ace4cdb804b - (cherry picked from commit 69b0c17f1e5d2fd8c7ca0548fb5c5ed8def26ce2) - (cherry picked from commit f3e2a0e2e353a278afdd85a79614ff0b6e2a2128) + Change-Id: I66ec14c7cb8816bc2181cc25f7d7f31fdc7d1604 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141069 + Reviewed-by: Xisco Fauli + Reviewed-by: Ilmari Lauhakangas + Reviewed-by: Christian Lohmaier + Tested-by: Christian Lohmaier -2022-09-09 Christian Lohmaier [23199599b48a0bb7af2487b88f20a89e2912f0cd] +2022-10-10 Xisco Fauli [68d7fab97c43c9ca12ae0889c0cc74eb1b9ba6bb] Update git submodules - * Update translations from branch 'libreoffice-7-4-1' - to e8cc69c4ac6bd1fb0d94ddac9f5d3afa0e39d85f - - update translations for 7.4.1 rc2 + * Update translations from branch 'libreoffice-7-4-2' + to 29b6c6265c353036330bf5a09c97d79e7fa93d5a + - update translations for 7.4.2 rc3 - and force-fix errors using pocheck - - Change-Id: Iead6e205e7824b0e4c5f7001661275410fe33360 - (cherry picked from commit d2af5ccdc269827d9738b6ed08c8166bfd5c91cf) - (cherry picked from commit ceb35d1d848b7ba6795c703a3bec6c5549844bfc) + Change-Id: I750a52f16dcf8f084d0a969ab454d714f2adeb7c + (cherry picked from commit 6c6f533fc042e93f846ab46f148607f19adc1f88) -2022-09-09 Eike Rathke [538f86a1a512b67b7abbe7edbc62acf341eb6606] +2022-10-06 Xisco Fauli [8e6a5390fbe6937e7ba07c788f30cbe4ee2048be] - crashtesting: prevent nullptr access - - There's a xlsx export crash on *2nd* export with data pilot data - of forum-en-38962.ods. We export without crash this .ods to xlsx - *once*, but on saving again to xlsx it crashes. It also crashes with an - export to .xls and then an export to .xlsx. Repeated exports to xls are - crash free. - - Already on the first export there are loads of warning messages of + bump product version to 7.4.2.2.0+ - ScDPMember::GetItemData: what data? nDim 0, mnDataId # - ScNameToIndexAccess getByIndex failed com.sun.star.container.NoSuchElementException message: "at sc/source/core/data/dptabsrc.cxx:2267 + Change-Id: Iee3ddc02a6f147ec5902ee36a28241d6f1a7737b + +2022-10-06 Caolán McNamara [3d6e58bf7db631043da44655cac5eb828dbbfdcc] + + Resolves: tdf#149277 we don't want to search the whole tree for dups - The pivot tables are broken on both exports. + just the immediate children of the supplied parent node - This smells like some sort of data pilot cache - corruption/insufficiency during .xlsx export but the root cause is - yet unknown. This only fixes the crash symptom. + Change-Id: I79595fd940257615f0d012cb9a4556aea51d7db9 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140963 + Tested-by: Jenkins + Reviewed-by: Adolfo Jayme Barrientos + (cherry picked from commit 98a35a2fdbd0de9afedc48812d9821dc0305f575) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140967 + Tested-by: Xisco Fauli + Reviewed-by: Xisco Fauli + +2022-10-06 Caolán McNamara [d16f94307a3182dcbd0ae639712d09cca208a28d] + + tdf#151316 recalc what dependencies should be sensitive - Change-Id: Ie479f7f0abc4af284e61f6aa5a69943ccdd72eab - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139611 - Reviewed-by: Eike Rathke + Change-Id: I40f78ec151c3d5901209b8587f6152ab76d04e88 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140960 Tested-by: Jenkins - (cherry picked from commit 5aa3f046f934092fbfd7cc92b93d79b4f548cc13) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139565 Reviewed-by: Xisco Fauli - (cherry picked from commit 0f434e0b91e240ff60418da4ae9c6415554e4d0f) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139572 - Reviewed-by: Christian Lohmaier + (cherry picked from commit 159a117c2e6d7fe768c9f76be0bc9f792ace96eb) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140962 Tested-by: Xisco Fauli -2022-09-09 Luboš Luňák [fc6cd5b1e214f6688dbfb5ffa70332b6bece8763] +2022-10-06 Luboš Luňák [495444d09dba7af63c0bf87804be02bc3f0f8c17] - try harder to ensure InterpretCellsIfNeeded() interprets (tdf#150499) + introduce ScTable::GetColumnData() (tdf#151182) - ScFormulaCell::Interpret() tries to interpret the whole formula group - (or the given range of it), but it's not guaranteed, and possibly - just the called cell will be interpreted. So if a specific range - really needs to be interpreted, handle that case. + This is intended to handle possibly unallocated columns similarly + to CreateColumnIfNotExists(), but unlike that one this one does not + allocate, if the column is not allocated then the default column + data is returned. This is intended for reading of columns. - Change-Id: I7fb563ae471eefd49e5bb6c92b6aff98c42a440e - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138741 + Change-Id: Ic3b637eb3d16bac69ebc7ecd389973407db4f7fd + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140737 Tested-by: Jenkins Reviewed-by: Luboš Luňák - (cherry picked from commit e1f02b8d00272be9cbf17cb8c351445a08a4c5f4) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138814 + (cherry picked from commit 305443d59a0fa579fe05b749d0891e63675d7050) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140613 Reviewed-by: Xisco Fauli - (cherry picked from commit 92ad0da73f23376d65b5367b44dd0ac9f7c59a12) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138820 - Reviewed-by: Christian Lohmaier + (cherry picked from commit a2f91c0d5315156df1d2700deec936a4ee1c61e0) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140879 Tested-by: Xisco Fauli -2022-09-09 Caolán McNamara [6167a3ca9c2a88814933b83f6ced75444983ae4a] +2022-10-06 Michael Stahl [f4961a28eaff289042d8f6fa3baa2b9e4cb23207] - tdf#150770: crashtesting: assert seen on loading forum-mso-en-2633.pptx + xmloff: ODF import: fix crash on fdo34997-1.odt - probably since: + Clean up the redundant checks too, these are all called after first + checking hasCurrentFieldCtx(). - commit 855a56fea4561135a63cb729d7a625a950b210e7 - Date: Fri May 13 08:12:17 2022 +0200 + (regression from 463178fef5c22f1a04d10e54491852d56e2038b0) - tdf#148965 PPTX import: fix internal hyperlinks on shapes + Change-Id: Ieec848944ef576caf319d5da7dc11139a4d26c58 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140503 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + (cherry picked from commit 61f5acad053db2ee019b639f2c2c861e9e8cd4f8) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140511 + Tested-by: Xisco Fauli + Reviewed-by: Xisco Fauli + +2022-10-06 Eike Rathke [253354e829777d0667c44d6da8e2ed71f894b89c] + + Fix incrementing number in dbrange names during copying, tdf#145054 follow-up - Change-Id: I920cbbb5544cbe9d76f37b3d524c9ccebd426132 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135682 + This is a combination of 2 commits. + + fix bug in lcl_IncrementNumberInNamedRange + + from + commit 690e4852809ea21b5fd909298c5fa2a053fa0458 + Date: Mon Jan 31 09:02:33 2022 +0100 + Fix copying range when it doesn't contain a number + + OUString::lastIndexOf() eithers returns an index or -1, so adding 1 to + it, means that nLastIndex is __always__ >= 0. + + xChange-Id: I197f8c856a52534690d7a0d28e49cecf296dccb3 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140704 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + (cherry picked from commit 36003e7644014cde9330bf45fee3815278a74035) + + Fix incrementing number in dbrange names during copying, tdf#145054 follow-up + + lcl_IncrementNumberInNamedRange() during copying a sheet didn't do + what it was supposed to do, it could generate names that would had + been cell references, and the loop it was called from could had + prematurely ended because it inserted into the set it was + iterating over; also the loop ended as soon as it encountered just + one dbrange that wasn't on the sheet that was copied. That never + worked as intended with more than just a very few names only on + the same sheet. + + Additionally after the actual change loplugin:stringviewparam + forced me to pass a std::u16string_view parameter, for that some + adaptions had to be made. + + xChange-Id: Ib83d317c69d821e8e8a2f1cd6791da9616ed188d + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140717 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 48b9cbc742de3f6120986cb6cafc92eb5009da82) + + Change-Id: Ib83d317c69d821e8e8a2f1cd6791da9616ed188d + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140719 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140901 + +2022-10-06 Julien Nabet [a350ecc0f048199ddbcbd78d7fc32aac279cdbdc] + + tdf#151260: crash in SfxItemPool::SetDefaults (reportdesign/ReportController) + + + deal with the case when there's no XATTR_FILLUSESLIDEBACKGROUND (like here) + + Change-Id: I2a4cccc80eea69aa88d45b3485d7f6d4448816e2 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140894 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + (cherry picked from commit 07aa8138db9bbaf222f2b7cea12a9f7d0a8192d7) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140886 + Reviewed-by: Xisco Fauli + (cherry picked from commit df897d6f962dc869de60951c7352b22f1b405edd) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140954 + Reviewed-by: Michael Stahl + Tested-by: Samuel Mehrbrodt + Reviewed-by: Samuel Mehrbrodt + +2022-10-05 Xisco Fauli [0a4775332ee62c8b8c728998bbde10d3b0d2b817] + + Update git submodules + + * Update translations from branch 'libreoffice-7-4-2' + to 7642e6dab65b2338a39834ab42c91970163539b2 + - update translations for 7.4.2 rc2 + + Change-Id: I10b515f5e154576169c6d6cfa1f8745f6818e52c + Reviewed-on: https://gerrit.libreoffice.org/c/translations/+/140989 + Tested-by: Xisco Fauli + Reviewed-by: Xisco Fauli + (cherry picked from commit 15aa88bdb1c9fca742b900568deea65bc2445040) + Reviewed-on: https://gerrit.libreoffice.org/c/translations/+/140966 + +2022-10-05 Xisco Fauli [7a9370ef892a3dd32f258a18986abb770775bbc0] + + update credits + + Change-Id: I101b0ffc043adae377c6ae4ef8741c015e5433d3 + Signed-off-by: Xisco Fauli + +2022-10-05 Miklos Vajna [6bbb7140c938d8f494ce75be5b5c7a3ae440ca87] + + tdf#151094 ODT export: fix crash when linked paragraph style is deleted + + If a document contains a linked paragraph-character style pair and the + paragraph style gets deleted, we crash on save. + + Commit 3227975c0f42ff23d528f5ab94b4538c8af764c (sw: paragraph styles: + add doc model & UNO API for a linked character style, 2021-09-24) added + support for linked para/char styles, but it failed to get the lifecycle + correctly when it comes to deleting these styles. + + Fix the dangling para/char style references by explicitly looking what + styles may refer to us and clear their references. + + An alternative would be to clear the "link" pointer of our own "link" + pointer only, but broken documents may e.g. link multiple paragraph + styles to a single character style, so this is probably not enough. + + Change-Id: I9465d43e90cf54c3c02bffda3e7c75b52c543a65 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140930 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140937 + (cherry picked from commit 7746f532a1e89bb946b40b5c111acc27e78ab812) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140955 + Reviewed-by: Michael Stahl + Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara + +2022-10-05 Michael Stahl [5b418bd88c1f5b04490d33308ff84852753fb4ab] + + rhbz#2122948 sw: fix ODF import of fieldmark in redline + + The problem is that SwXText::compareRegionStarts() calls + SwXText::CreateCursor() which creates a cursor on the last node in the + body text, but it's actually a redline. + + Override SwXRedlineText::CreateCursor() to create a cursor in the + redline text. + + Complete mystery why SwXText has 2 virtual functions to create + cursors in the first place. + + (regression from commit 463178fef5c22f1a04d10e54491852d56e2038b0) + + Change-Id: I0f3bcf4eda25f1ac7e1c1b0cf47a920f8302d2b7 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140504 + Tested-by: Jenkins Reviewed-by: Caolán McNamara - (cherry picked from commit 48de2ac37366d5671aabc64364660311431d3235) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139570 + (cherry picked from commit c80a3ef9f434230ae3d5ffec902edc19f34f75f7) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140595 + Reviewed-by: Xisco Fauli + Reviewed-by: Adolfo Jayme Barrientos + Tested-by: Caolán McNamara + +2022-10-05 Eike Rathke [1ea5633c8ca31fad574ea9fd98ddb20425054b48] + + Fix string length assertion and handle parentheses in multi-line formula + + soffice.bin: include/rtl/ustring.hxx:842: sal_Unicode rtl::OUString::operator[](sal_Int32) const: Assert ion `index >= 0 && static_cast(index) < static_cast(getLength())' failed. + + when editing a paragraph (line) longer than the first, because the + string was always obtained from the first paragraph but the + position from the current selection. + + Also match parentheses in the current paragraph, not somewhere + else in the first paragraph.. still we're matching only within one + paragraph. + + Change-Id: I955fd371c1e248ce58735a5b61603bbce6c997db + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140446 + Reviewed-by: Eike Rathke Tested-by: Jenkins + (cherry picked from commit 1df910dac84b4690371f2fc84299e3a918529484) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140387 + Reviewed-by: Michael Stahl Reviewed-by: Xisco Fauli - (cherry picked from commit 80551374ae7b5c010dac6bbdf36b3cf1897f952f) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139573 - Reviewed-by: Christian Lohmaier - Tested-by: Xisco Fauli + Reviewed-by: Caolán McNamara + Tested-by: Caolán McNamara -2022-09-09 Mike Kaganski [6e5b05302081b3cd5d046671ce5b1d340c880b30] +2022-10-05 Luboš Luňák [97715aacd8aa32bbd0fd4e0a3fa0bdb8e7fbeaa5] - tdf#150846: FilterOptions in descriptor could come from import filter + make sure SharedString::EMPTY_STRING is interned in pools (tdf#150647) - Tolerate failure parsing json here. Unfortunately this means that - we can't provide a diagnostics to user when they provide bad json - in the command line parameters. + Without this, it may not actually be there, so interning "" would + use a different string instance, and then comparing with + SharedString::getEmptyString() would actually compare non-equal. - Change-Id: Ia3fa18e709a4c0b891faf4365453b79e6c58a9c6 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139613 + Change-Id: I22660f63aa321e3a8f72cfb96df1db56e08fbb84 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140402 Tested-by: Jenkins - Reviewed-by: Miklos Vajna - (cherry picked from commit 467308d679a3f2b4bbdd117fcc73636d57d66c09) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139568 + Reviewed-by: Eike Rathke + (cherry picked from commit e47e0cb0ad1dc3554e9b57f8562a217cf785edbf) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140497 Reviewed-by: Xisco Fauli - (cherry picked from commit 7a9b45de539fc69c6a99e0f1cdf5e0554cc83cbc) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139654 - Reviewed-by: Christian Lohmaier - Tested-by: Xisco Fauli + (cherry picked from commit 84dae476666863f3367308cf1c5f80d45a43c3ef) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140601 + Reviewed-by: Caolán McNamara + Tested-by: Caolán McNamara -2022-09-09 Maxim Monastirsky [02293e09b5e1c066c377cf4f0b6aa5c0aa61a581] +2022-10-04 Xisco Fauli [5e65aabe40c114f8d4266491fa241833f93c65f6] - tdf#150506 Execution parameter confused with slot state + sw: fix crash in SwParagraphNumTabPage::ExecuteEditNumStyle_Impl - Regression of a6eddceda5d376cd73922123a3bb3a5683307c41 - ("rename some SID to FN_PARAM"). + SfxViewShell::Current() could be nullptr - Change-Id: I5bcafdcec16cc91b1b77f7a3affd630a2f6cc556 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139121 + See https://crashreport.libreoffice.org/stats/signature/SfxShell::GetDispatcher() + + Change-Id: Ic2ffc2a35eff8b8acbb896ece198916ee074b019 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140889 Tested-by: Jenkins - Reviewed-by: Maxim Monastirsky - (cherry picked from commit a72861e3be5b89544ae943c0c5cc6d43e8e70a7d) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138992 Reviewed-by: Caolán McNamara - (cherry picked from commit 3e39f667590355843336edda9b2f8f7676bbc870) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139419 + (cherry picked from commit cf15a1fc143536c20c81faab5950ab829ec8df19) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140893 + Reviewed-by: Xisco Fauli + Tested-by: Michael Stahl + Reviewed-by: Michael Stahl + +2022-10-04 Noel Grandin [6a8dd4b0e832793bddc1c16ce5586decd1f52d8e] + + tdf#150715 Animations in LO Impress do not work properly + + Revert "updatePathFromSdrPathObj can just call getRange" + This reverts commit 7c52337f9517135db13d75ecbbc10d7e26e01489. + + Not sure why this change did not work. + + Change-Id: I2c42b9b7ff4b85f3018bea289efd3d934dbe2be1 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140570 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + (cherry picked from commit 916d30ba7e8a5293f57ec04258f6c3839736295e) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140512 + Reviewed-by: Xisco Fauli + (cherry picked from commit 76ca860ee260c1b15a4dde036a3b7852fce12cd0) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140598 + Reviewed-by: Michael Stahl + Reviewed-by: Caolán McNamara + Tested-by: Caolán McNamara + +2022-10-04 Taichi Haradaguchi <20001722@ymail.ne.jp> [baa8318339dde43b185ce8a0895a90d9f1fba3d8] + + curl: upgrade to release 7.85.0 + + Fixes CVE-2022-35252 + + Change-Id: I549240f6ae31ae94f925422517cd03ef2e3b5732 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140411 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + (cherry picked from commit 31a8de10e8f60d79d6eb588a049567b89a48f0b1) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140495 + Reviewed-by: Michael Stahl + Reviewed-by: Xisco Fauli + Tested-by: Caolán McNamara + +2022-10-04 László Németh [d8aa72eafc62fe4778e3b1539e982e8954585097] + + LibreLogo: fix ast, gug, hsb and sid language support + + Asturian (ast), Paraguayan Guaraní (gug), Sidamo (sid) + and Upper-Sorbian (hsb) localizations did't work despite + their existing localization stored in the language fallback + dictionary of LibreLogo.py, because their 3-letter language + identifiers with their country codes trimmed to 2-letter, + for example: "hsb-DE" -> "hs" instead of the correct "hsb". + + Missing Upper-Sorbian support was reported by Michael Wolf. + + Change-Id: I57aa6752d05452d1f8bb95ff91f4d4456dffcd80 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140796 + Tested-by: László Németh + Reviewed-by: László Németh + (cherry picked from commit 5948e2e9f032916e3278f904097eff6b47b869d6) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140877 + Reviewed-by: Xisco Fauli + Reviewed-by: Adolfo Jayme Barrientos + Tested-by: Caolán McNamara + Reviewed-by: Caolán McNamara + +2022-09-28 Martin Srebotnjak [32dbc524e039682de88039885750357af7582046] + + Update git submodules + + * Update translations from branch 'libreoffice-7-4-2' + to 0abf95d0ff36afa188a530411b0acdb8c2267188 + - Updated Slovenian translation + + Change-Id: Ib30d3f707b02ca1ffbf1dd16287fb5cb275ceccd + +2022-09-26 Noel Grandin [b46221a4817ca41776446d2a8d81272ce1022c29] + + tdf#151148 Finding KATAKANA which has voice consonant mark wrong + + regression from + commit c7551e8a46e2f9f8142aa7921a0494221ae096e8 + Author: Noel Grandin + Date: Thu Sep 16 10:36:48 2021 +0200 + speedup CharacterClassificationImpl::toUpper + + Change-Id: I0309dec3d08220b9616be185360013869598fa1c + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140541 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + (cherry picked from commit 222e56157c6317435088e09e52a0705bc6a1a83a) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140508 Reviewed-by: Xisco Fauli + (cherry picked from commit 3f37523fb804c724bc2a33ec21786aa9a72f0422) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140599 Reviewed-by: Eike Rathke - Tested-by: Christian Lohmaier + Tested-by: Michael Stahl + Reviewed-by: Michael Stahl + +2022-09-23 Noel Grandin [3f0be840432453f407751398ccfab62a2243fc4e] + + tdf#151091 Revert "tdf#148635 cache some chart stuff" + + This reverts commit fd2ca9607431fc6ca49e37ab6fef228aa72da5f9, + since it causes a regression when copying a chart. + + Change-Id: I5d40de6f46b4b3e68531257d27f9a81540a06da4 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140427 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + (cherry picked from commit c3bc67bffd1e0b9bdd60ef274a6d5e59101d322d) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140391 + Reviewed-by: Xisco Fauli + (cherry picked from commit a93c8d4532f49ec5fde09e4886445a4855404d60) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140393 + Reviewed-by: Eike Rathke + Tested-by: Michael Stahl + Reviewed-by: Michael Stahl + +2022-09-23 Mike Kaganski [941949ff88bf01db41ce9793a3d306c96ff88ab5] + + tdf#151100: xText->getString() may be empty for content needing export + + The check that is removed prevents collecting the table data. + Assume that it's the performance optimization, and that processing + empty text objects would be fast anyway. + + This basically reverts commit 73fcb052edf1a21d785583bc53e8b4323b577bb1 + Author Christian Lippka + Date Thu Nov 22 12:26:35 2001 +0000 + #90330# only export text autostyles for shapes with text + + and commit 7661bbbaef31adfdb298b1447301b24a70f85834 + Author Michael Stahl + Date Fri Nov 25 22:46:34 2016 +0100 + tdf#102479 ODF export: ignore exceptions when checking shape text + + that becomes unnecessary after the former change is reverted. + + Change-Id: I709a7b4c5ac1cc0621d3a1b18f2eb74feb987efb + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140313 + Tested-by: Mike Kaganski + Reviewed-by: Mike Kaganski + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140352 + Tested-by: Jenkins + (cherry picked from commit 226b1c2006e936e4b32748b810624c5d655c4a98) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140379 + Reviewed-by: Eike Rathke + Tested-by: Michael Stahl + Reviewed-by: Michael Stahl + +2022-09-23 Taichi Haradaguchi <20001722@ymail.ne.jp> [45df0e9b38eebbf557b5e89fced6d6b0fdc0781c] + + Remove extra space + + Change-Id: I0f7c1675ec84b143554b6d8c3e4de650da3e4076 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140389 + Reviewed-by: Xisco Fauli + Tested-by: Xisco Fauli + +2022-09-21 Christian Lohmaier [b948558680c057d60c67c1b6c86f5eb726f98c03] + + bump product version to 7.4.2.1.0+ + + Change-Id: Ie0db4316829e647b7ae5991792ef11df54912588 + +2022-09-21 Christian Lohmaier [1bcae1478acf98291f5a22514a029026471576a4] + + Branch libreoffice-7-4-2 + + This is 'libreoffice-7-4-2' - the stable branch for the 7.4.2 release. + Only very safe changes, reviewed by three people are allowed. + + If you want to commit more complicated fix for the next 7.4.x release, + please use the 'libreoffice-7-4' branch. + + If you want to build something cool, unstable, and risky, use master. + +2022-09-21 Mike Kaganski [e5be1c6eec6b89cd62e970fb0aa7fe0aa47b7d99] + + tdf#119039: workaround an OleLoad bug releasing passed storage unexpectedly + + See https://developercommunity.visualstudio.com/t/10144795 + + Change-Id: I75ee88c1dd50e0772c358967ac09b7788156d9f0 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139756 + Tested-by: Jenkins + Reviewed-by: Mike Kaganski + (cherry picked from commit b31992ea518cec906a65ef971a637d0529302a2c) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139664 Reviewed-by: Christian Lohmaier -2022-09-09 Caolán McNamara [4a75447cfd96ba473e6f3a6089807868e3e5079b] +2022-09-21 Mark Hung [5e3abdf6ecded4f69bc7e1bdfb9dc8300f30685d] + + tdf#150642 fix table layout with vertical writing. + + Revert part of 1bf82b26ae3. + + N | V | WAS | 1bf82b26aea3 | WAS | 1bf82b26aea3 | + ------------------------------------------------------------------------------- + F | F | fnRectHori | fnRectHori | fnAddRight/fnSubLeft | | + F | T | fnRectVert | fnRectVert | fnAddRight/fnSubLeft | | + T | F | fnRectVert | fnRectHori | fnAddRight/fnSubLeft | fnAddBottom | + T | T | fnRectHori | fnRectVert | fnAddRight/fnSubLeft | fnAddBottom | * + + *: the case fixed in this patch. + + Ref: + + commit 1bf82b26aea3a403920a64cdfcb4671c947c7a01 + Author: Mark Hung + Date: Sun Aug 14 15:23:14 2022 +0800 + + tdf#135991 fix unexpected hidden RTL sections. + + Change-Id: I1e30c277dd03369bef0a6930b3d3534b7d57a640 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139777 + Tested-by: Jenkins + Reviewed-by: Mark Hung + (cherry picked from commit 11ec622b8405dcaabc359e3d6e38c8a9142dad6b) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140172 + Reviewed-by: Michael Stahl + +2022-09-21 Christian Lohmaier [55900a5afdd2d5a51557712ee7f9e9e051f58301] + + Update git submodules + + * Update translations from branch 'libreoffice-7-4' + to 26e09adb675a8fab61dec7817832b94ce23d9fb6 + - update translations for 7.4.2 rc1/master + + and force-fix errors using pocheck + + Change-Id: Ia36bd93db2652764c7ed865058467bb0b17eb545 + (cherry picked from commit a5f80090f50b6d1e06f579d12a22eb1ad805c99c) + +2022-09-21 Taichi Haradaguchi <20001722@ymail.ne.jp> [1bff2caff1bbb39fe431c455aeab1f0234200d8d] + + update expat to 2.4.9 + + Fixes CVE-2022-40674 + (https://github.com/libexpat/libexpat/blob/R_2_4_9/expat/Changes) + + Change-Id: I459cf5f5de31e7cf5420d3df6b11893d5c4ca4dd + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140173 + Tested-by: Jenkins + Reviewed-by: Michael Stahl + +2022-09-21 Jim Raykowski [0be24b5794656f159e02e52435a7226f530787d5] + + tdf#150604 Writer Navigator: Make delete shortcut key delete Indexes + + Change-Id: I651159794790972b430c9a420d6eaa1ed77e5718 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139550 + Tested-by: Jenkins + Reviewed-by: Jim Raykowski + (cherry picked from commit a8e4bf44012139adff7d1343f17edca13a70d0c5) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139560 + Reviewed-by: Christian Lohmaier + +2022-09-21 Sarper Akdemir [613494b0d2dbde377473b42412a33f20c4b7d45c] + + tdf#89928 pptx import: implement import of BiLevel threshold + + Implement import BiLevel effect's threshold value. + If threshold isn't exactly 50%, we can't map it to the doc model. + + Therefore as a workaround apply the BiLevel (Black/White) effect with + specified threshold directly to the graphic. + + Change-Id: Ib24d149d74b103d926560708c68bb937b02c4cfe + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140136 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140217 + +2022-09-21 Julien Nabet [35137efbb2b50b5eae8c9377f658f7bc8f23d9cc] + + tdf#150561: Page dimension don't match paper format in Print Preview + + ...like claiming 210x148 to be A4 + + Page size may have changed so sync mePaper with it + + Change-Id: I7d7329bbacfb2f0bd56e495b7390eedebecee02c + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138736 + Tested-by: Jenkins + Reviewed-by: Julien Nabet + (cherry picked from commit 653d098a00f737e79f2e1ea81978320b2d5d27cc) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138818 + Reviewed-by: Christian Lohmaier + +2022-09-21 Taichi Haradaguchi <20001722@ymail.ne.jp> [8102cf7ca2c7737aea8d39dcbd544511158748bb] + + nss: update to release 3.83 + + Change-Id: Ic1cb36b3a56cde40296fd46ef356dea286932692 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140231 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140305 + +2022-09-20 Miklos Vajna [5ef5b313ad0f6fdb8f8de0a7463cb2a0c4956f1a] + + tdf#150990 ODT export: fix zero layout size of scale/scale images + + The bugdoc has a broken image where both axis are set to a relative size + of 255%, which means "keep aspect", and the expectation is that only one + axis uses this to match the size of the other axis. + + The problem was that commit b578fa08a25a83abccad2386e12b707586fffb26 + (ODT export: fix fallback svg:width/height for text frames with relative + sizes, 2022-03-16) assumed that only one axis uses "scale", so we always + get a non-zero layout size. + + Fix the problem by only using the layout size when exactly one axis uses + the "scale" percentage, which is the expected the case. + + This way we just keep the aspect ratio of broken documents, then the UI + will in practice ignore the scale request of the width. + + Change-Id: I2dbd6bb92f912f6185422fd301b99b284a66ef74 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140218 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + (cherry picked from commit 80550ade305b9e68c6281a258d162bc2c413713a) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140167 + Reviewed-by: Caolán McNamara + +2022-09-20 Samuel Mehrbrodt [088cd9dc35b01dc5e8a7a7eedf5f52bcfc4c8001] + + tdf#150650 Fix changing fill style to None via Sidebar + + Regression from 5491a82854e3e6dd2dbb4b0012cb4bbeb4ee22e0 + + Change-Id: I17cfb037f2064a508317090e6b66f20e253a9436 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140150 + Tested-by: Jenkins + Reviewed-by: Samuel Mehrbrodt + (cherry picked from commit 6238758d80e170cdb586df2b34d479499574cb72) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140161 + Reviewed-by: Thorsten Behrens + +2022-09-20 Samuel Mehrbrodt [dbd89ccc4fd989f12d42ebcb68aa56ab969e84bd] + + tdf#150802 Fix setting gradient from Sidebar + + Regression from adc536e9efc77690df62177aa722f9252bdbf96b + + Change-Id: I37db76373a3b9b4a1084e830233561abc4b1e6d3 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140151 + Tested-by: Jenkins + Reviewed-by: Samuel Mehrbrodt + (cherry picked from commit c112e426bff4bdf2317363a534495498b0aa215a) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140158 + Reviewed-by: Thorsten Behrens + +2022-09-20 Armin Le Grand (allotropia) [8cefc95845c585d830f642a8d6a575863e75b987] + + tdf#150402 Correct wrong Bound of Shape in Slideshow + + Added and use mbContainsPageField that gets set in + prepareHyperlinkIndices() which has to be run anyways, + so this will cause no change in execution speed. + + It lets us detect the potential error case that a + PageField is contained in the Text of the Shape. + That is a hint that maBounds contains the wrong Range + and needs to be corrected. + + For more backgrund information please refer to + tdf#150402, Comment 16. + + Change-Id: Ifee01fffdb6e2f5915aa705afc7b5842781aae91 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140144 + Tested-by: Jenkins + Reviewed-by: Armin Le Grand + (cherry picked from commit 1b0ff1c166211b34370f53995ae9fb3f8eed182e) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140166 + +2022-09-20 Miklos Vajna [7c926242fb2ae81c67032042eaba503f27c13865] + + sw HTML import: fix height of images when it is missing and width is relative + + This is similar to commit 456abae730a787693c3ad98f7e57eba5f6163a76 (sw + HTML import: fix height of OLE objs when it is missing and width is + relative, 2022-09-06), but this is for images, while that was for OLE + objects. + + The idea is still that in case only axis is specified in the HTML and + that's a relative percentage, then the ratio should be taken from the + bitmap and it should be kept. + + Change-Id: I36184ff6531bff2775013462cd8cc711e1a249c5 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140178 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + (cherry picked from commit 2e6144fc350fd94f8e66be5a9007c7f06c0213e0) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140163 + Reviewed-by: Michael Stahl + +2022-09-20 Miklos Vajna [f51a4ad1380d932440c03acb754c82e01838c138] + + tdf#148214 RTF import: avoid fake paragraph for \page when possible + + The bugdoc has 2 pages, an explicit page break between them and the + first page has enough content that an additional fake paragraph at the + end would lead to a 3rd, unwanted page. + + The fake paragraph was introduced in commit + 7b58fc3dafc789aa55fff5ffef6ab83c3aa8b6e0 (fdo#48104 fix RTF import of + \page in inner groups, 2012-04-02), because dmapper ignores more than 1 + page breaks in a paragraph. + + Fix the problem by only inserting the fake paragraph in case the "page + break before" paragraph property would have no effect (very first + paragraph in the document) or we already sent characters (para props are + lazy-sent on the first character). This keeps existing cases working, + but avoids the unwanted fake paragraph in the bugdoc. + + I suspect the root cause is that dmapper doesn't handle multiple page + breaks in a paragraph -- once that's fixed, this parBreak() call can be + completely removed. + + Adjusted tests: + + - testImportHeaderFooter: this asserted the presence of fake paragraphs, + which are now gone in the easy case, so this change is an improvement + + - testTdf133437: no visual difference before/after, probably the test + intent was just "make sure this page has several shapes", the exact + number isn't that interesting + + Change-Id: Idd2b8a70b4122eb08d9d305018d384dc0bbb276a + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139704 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + (cherry picked from commit 3c610336a58f644525d5e4d2566c35eee6f7a618) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139666 + Reviewed-by: Michael Stahl + +2022-09-20 Sarper Akdemir [c544caf08b8809272aaced1186997292b74da575] + + tdf#94122 pptx export: fix automatic text color export + + MS Powerpoint doesn't have automatic colors unlike Word or Excel. + + Therefore on export the automatic text color should be first resolved + and then exported. + + Change-Id: Ied2c3a4235da403350d8518a3414ff6a372b57a8 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140059 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140216 + +2022-09-19 Caolán McNamara [286000f2df456cffabd678e3bde56af14c7bd185] + + tdf#151052 set Windows darkmode "ToolTextColor" to same as "WindowTextColor" + + they are the same in light mode, so do the same in darkmode + + Change-Id: Ib0186383fcd7f8d74c7ada6826c6955a747e4ecd + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140162 + Tested-by: Jenkins + Reviewed-by: Adolfo Jayme Barrientos + +2022-09-19 Mike Kaganski [3890b65ffa04c2cb9b4956ac65409d64b5c7f11c] + + tdf#151039: use the same defaults also for FontSubsetInfo::m_aFontBBox + + The defaults for "maFontBBox is not valid" case were already introduced + in commit 2d1f08d63942666c0094904f50ba8c512ab69b9d + Author Release Engineers + Date Thu Aug 27 12:02:29 2009 +0000 + CWS-TOOLING: integrate CWS otf01 + + but it used the four elements of maFontBBox unconditionally in later + calculations. Possibly that code path is untested, because unless the + wrong size is greater than 4, it would always crash. + + Unfortunately, use of { 0, 0, 0, 0 } here (as Khaled proposed in the + bug, for "garbage in, garbage out" principle) is impossible: the PDF + with such data shows an error in Acrobat Reader: "The font contains + a bad /BBox". + + As Khaled mentioned, a better fix would be to use the equivalent font + extents from head table. + + Change-Id: I949db23d8af7c1fd4c2362655bf602eea0e70062 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140121 + Tested-by: Mike Kaganski + Reviewed-by: Mike Kaganski + (cherry picked from commit 1f985cb4779b581a77d419605ceb084707d408b8) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139993 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + +2022-09-19 Julien Nabet [2c7052a76e5348981883ca95cf3c0b079ded5068] + + tdf#150992: fix crash popart filter to an SVG image + + part of bt: + 6 0x00007f018c80186f in BitmapPalette::operator[](unsigned short) const (this=0x5576a198fe48, nIndex=176) at vcl/source/bitmap/bitmappalette.cxx:139 + 7 0x00007f018c3d1fce in BitmapInfoAccess::GetPaletteColor(unsigned short) const (this=0x5576a2bbc520, nColor=176) at include/vcl/BitmapInfoAccess.hxx:121 + 8 0x00007f018c85b63f in BitmapPopArtFilter::execute(BitmapEx const&) const (this=0x7fffb7394728, rBitmapEx=...) at vcl/source/bitmap/BitmapPopArtFilter.cxx:73 + 9 0x00007f018c83e66b in BitmapFilter::Filter(BitmapEx&, BitmapFilter const&) (rBmpEx=..., rFilter=...) at vcl/source/bitmap/bitmapfilter.cxx:22 + 10 0x00007f01905e5bd4 in SvxGraphicFilter::ExecuteGrfFilterSlot(SfxRequest const&, GraphicObject&) (rReq=..., rFilterObject=...) at svx/source/dialog/grfflt.cxx:202 + + some gdb info + (gdb) p nIndex + $1 = 176 + (gdb) p mpImpl->GetBitmapData().size() + $2 = 34 + + full bt here: + https://bugs.documentfoundation.org/attachment.cgi?id=182499 + + See https://bugs.documentfoundation.org/show_bug.cgi?id=150992#c2 for some comments + + the main thing that makes me think that the order is reversed is the "nLastEntry" treatment. + Indeed with the current sort, mnCount with 0 come first nLastEntry = nEntryCount - 1 (unless there's no color at all) + + Change-Id: I3b89f2f4d6f115ea9f6752c49bad776a33f0b020 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140153 + Reviewed-by: Julien Nabet + (cherry picked from commit 8dbbc1ca6dfe75affe13dda92bdf82b6b38f1a37) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140160 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + +2022-09-19 Eike Rathke [98516c7698aa5a492c4e59b4dc6d29815ae77327] + + Resolves: tdf#150312 Move base-cell-address to a valid sheet upon deletion + + ... and adjust references accordingly. For + ScTokenArray::AdjustReferenceOnDeletedTab() that now also moves + the base of the first deleted sheet not only after, which was a + one-off before. + + Change-Id: I4c19e8b8a7318ba03b6a7d0b2dfaae5d05a51a29 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139720 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 9a6c350d8dff4b5228ec7451006115e387f819f2) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139659 + Reviewed-by: Mike Kaganski + +2022-09-19 Mike Kaganski [312704298ebff67db4a747014b8a0c5a306b665a] + + tdf#150982: properly unquote (URL-decode) vnd.sun.star.expand payload + + Similar to what is done in bootstrap_expandUri, expandUnoRcUrl, + UrlReference::expand, JavaLoader.expand_url, and is documented + in XVndSunStarExpandUrl interface. + + Change-Id: I92917adb38e42c3926494427e4df2451298033e0 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140042 + Reviewed-by: Stephan Bergmann + Tested-by: Mike Kaganski + (cherry picked from commit 2875d11939679ec319e5b098a9b85da629781d5c) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139992 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + +2022-09-19 Eike Rathke [4f66fada43cf50767066c756def7eb39654e376b] + + Resolves: tdf#151046 INDIRECT() try named expressions and DB range names first + + ... as older 1K columns allowed names that would now match a 16k + columns cell address, which ConvertSingleRef() would already + resolve. + + Change-Id: I9322732e554da20c81856c0a30c41a246356f65b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140147 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit cc28ea4c4483df1643154adc50bd537e35fabb05) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140154 + Reviewed-by: Xisco Fauli + +2022-09-19 Eike Rathke [d700377556ca6e1adf5972fcbc8eef658adc0b53] + + Resolves: tdf#132519 Use string reference syntax for CELL("ADDRESS";...) + + ... so the result can be used with INDIRECT(). + + Change-Id: I76e4d7739e22c53a3cfa3e004a9b24dc3dfcd233 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140021 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit c7bb9521ba67f52e9d665fdd24d40d8b42f0387d) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140155 + Reviewed-by: Xisco Fauli + +2022-09-19 László Németh [8c8ecb1ff2bfe5d40964736ef86ee3054791c493] + + tdf#147507 sw: fix crash with Reject All around not content nodes + + Regression from commit f3bec764ddbf3fd3ae986f034c89626bf22940e0 + "tdf144058 sw track changes: fix table deletion at paragraph join". + + Conflicts: + sw/source/core/doc/docredln.cxx + + (chrery-picked from commit 7462f728df54c28cea659dbf9aa92070019b489f) + + Change-Id: If08a2b85c3db9fe92ad623d3d7cb30f2feaaab36 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140174 + Reviewed-by: László Németh + Tested-by: Jenkins + +2022-09-19 Eike Rathke [9463d2a199e014b0ab66bfc22f59013438a1ce66] + + Update language-subtag-registry to 2022-08-08 + + Change-Id: I08609e88c1bdb62f778db25156363fbc6d2adff6 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140148 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 81fe0367593334c3d1b72f20a916f005fc2128d7) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140157 + Reviewed-by: Xisco Fauli + +2022-09-19 Noel Grandin [0df8551042fa193a52718ea2f62f7164f3f42bdf] + + tdf#150987 calc crash pasting content + + regression from + + commit d0119ff7f2c68aa05286bd303128f3a69c6bbd6a + improve tools::Rectangle->basegfx::B2?Rectangle conversion + + which resulted in Fraction throwing an exception because of + divide-by-zero + + Change-Id: I90a92a644c5fb40e9b93237c79f6760d4bb73d0f + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140064 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + (cherry picked from commit ab5928517639e49dbcab2c2de195849d611124b9) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139990 + Reviewed-by: Xisco Fauli + +2022-09-17 Taichi Haradaguchi <20001722@ymail.ne.jp> [aa571bf0a4b2c7bfe4b044ac27f98393c95bae8e] + + upgrade to libwebp-1.2.4 + + Change-Id: Iaa3872345abcc2b9042abb32a824ff4b95ec57b5 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139989 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + +2022-09-17 Noel Grandin [1f1342f30abaa39366b8f7f359ea2e3aa2e1d962] + + tdf#150974 Writer crashes when starting with WollMux installed + + regression from + commit b2aa646ef09dc8434d3ca8a5bba53a8d8ff3f910 + Author: Caolán McNamara + Date: Wed Dec 15 11:43:32 2021 +0000 + use more OInterfaceContainerHelper3 in toolkit + + Change-Id: I26532ea79b7c5f750b4bf693881cbf41aeb82266 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139986 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + +2022-09-17 Michael Weghorn [67e5d8ff8d9bf029ab7480fa1f907696ca8ee2e9] + + tdf#136928 Use dialog text color for signs in "Tabs" dialog + + and use an explicit matching background of dialog color + + Since the font color is black even in dark themes + like "Adwaita-Dark", using a dark style/theme would previously + result in black signs on a dark background for the Qt-based VCL + plugins (qt5/kf5/qt6). + + Change-Id: I470011c26861221310e898c8f63fceef5e1aca3c + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140029 + Tested-by: Jenkins + Reviewed-by: Michael Weghorn + (cherry picked from commit 2deabc28166af2fc84e74f705b503a42e5394d54) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139982 + Reviewed-by: Adolfo Jayme Barrientos + +2022-09-17 Michael Weghorn [2103178720fd485651b94b7819ea33ec602c3b79] + + tdf#137341 gtk: Set missing style text colors from theme + + commit 8d11b953c0a69f4f5eb5ca42dec3812a62d0cd0f + Date: Sun Feb 23 21:11:05 2020 +0100 + + tdf#125532: White text on default/action buttons and selected tabs on macOS + + had introduced various new text colors to the style + settings, but some were not set from the theme for gtk. + + Add the missing ones. + + Change-Id: I1bd7ce358626b3f4ff1d6f2794d5c0f19f78a668 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140058 + Tested-by: Jenkins + Reviewed-by: Michael Weghorn + (cherry picked from commit 8306152d5205dd35c118d06368f6c77254f87518) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139984 + Reviewed-by: Adolfo Jayme Barrientos + +2022-09-16 Caolán McNamara [c062358d7b58ce3a9b27681040d854ec7ea1868b] + + Resolves: tdf#144583 reuse lok hidpi icon scheme for gtk + + and includes... + + Related: tdf#144583 move current lok hidpi icon thing into SalGraphics + + Change-Id: If34a2b15aebc5316783d72564ede23e02db04302 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139947 + Tested-by: Jenkins + Reviewed-by: Adolfo Jayme Barrientos + +2022-09-16 Mike Kaganski [87f17803a907c29a121fcb84588da98a51cca543] + + tdf#106959: use table's first content node for cursor cleanup + + The problem was that when doing the SHELL mail merge with a document + starting with a table, the generated marks point to the first node on + the page, which is not a content node, but a table node. When getting + page numbers for such mark, cursor got cleaned up, meaning that it + looked for a content node as the cursor position. The lookup tried + to go to a previous content node first, and that gave a content node + on the previous page. + + The cursor position cleanup was introduced for i#18014 in commit + 468c7b8d3287712c6959cd531c71875f4d26bcbc + Author Jens-Heiner Rechtien + Date Fri Jan 04 12:19:29 2008 +0000 + INTEGRATION: CWS sw8u10bf02 (1.66.92); FILE MERGED + + The bug was incorrect restoration of cursor position after inserting + a row to a table, placing cursor there, and undoing. + I have checked that the mentioned scenario keeps the cursor inside the + table, not jumps to the beginning of the document, as it did before + the mentined commit. + + Unfortunately, I don't see how to test this properly in + sw/qa/extras/mailmerge/mailmerge.cxx; FILE mailmerge tests there use + a different code path; and SHELL tests obviously do not perform the + post-processing from SwMMResultSaveDialog::SaveOutputHdl_Impl. Likely, + an UITest would be needed. + + But why do we use this SHELL + post-processing here, instead of using + the same FILE mail merge that is performed from form letter dialog, + when SwDBManager::Merge is called from SwDBManager::ExecuteFormLetter + with properly constructed SwMergeDescriptor? That would also speed up + the merge, avoiding extra steps of generating full resulting document + in memory, saving it to a temporary file, just to split it to pieces + (TODO/LATER). + + Change-Id: I269de4ae3407261c4f6df51cacd5fc72643fd29a + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139973 + Tested-by: Jenkins + Reviewed-by: Mike Kaganski + (cherry picked from commit eb30df9b8e86f756ebc66be86ae2eb345fafc850) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139983 + Reviewed-by: Michael Stahl + +2022-09-16 Taichi Haradaguchi <20001722@ymail.ne.jp> [acef728fe6256b0284b910ab5d95620f950ebb41] + + upgrade expat to 2.4.8 + + Change-Id: I4dea32ad24e9a6c24f69c75fea75dbd63c14c91b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139920 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + (cherry picked from commit c228803662d1d892405bf6431c4d5bd8dc22f7f6) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139979 + +2022-09-16 Caolán McNamara [3acd979a0ff308abe3d4ac62f7eb6bca4c59df4e] + + crashtesting: FastSaxSerializer::endDocument assert on export + + of ooo26868-1.doc to ooo26868-1.docx + + since: + + commit 17e27b4a19f22b912460f090b754d11f9a32fb7f + Date: Tue Sep 6 14:28:22 2022 +0200 + + tdf#150756 - Assertion when opening report for editing + + but that commit looks blameless to me. Avoid the problem by + checking for an empty Any for "TextBox" here as is common + elsewhere + + Change-Id: I5f390952763044498d944a081703d0665cbb0444 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139839 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + +2022-09-15 Caolán McNamara [5ef6543e9e9cc3bb4b449027d0dcfbef87315efd] + + crashtesting: SvMemoryStream::PutData assert + + crashtesting logs contain a pile of SvMemoryStream::PutData assert + failures with the last ~90 documents + + some experimentation suggests that the fallback path in + TempFile::GetStream is getting taken to use a SvMemoryStream + if there was no filename. + + presumably there is no filename because there is no inodes left + in /tmp (see. https://gerrit.libreoffice.org/c/core/+/139881 to + remove left over OSL_PIPE when killed) or some other similar problem. + + But the SvMemoryStream ctor used gives a Stream which cannot be written + to because it's given an empty buffer to use and isn't allowed to resize + it. + + this went wrong at: + + commit 7f8f277b94704a289fbbd1b836e4e5d66311580d + Date: Wed Jan 7 09:28:42 2015 +0200 + + fdo#84938: convert STREAM_ #defines to 'enum class' + + with + + - pStream = new SvMemoryStream( eMode ); + + pStream = new SvMemoryStream( NULL, 0, eMode ); + + which selected ctor + a) SvMemoryStream(void* pBuf, std::size_t nSize, StreamMode eMode); + Previously eMode was just a sal_uInt16 typedef and this gave a fairly + arbitrary but useable nInitSize to select the other ctor of + b) SvMemoryStream(std::size_t nInitSize=512, std::size_t nResize=64); + + Using eMode as nInitSize was bogus and worked by chance, that was + introduced with: + + commit 160f790791d6e839919f0d0f9277cb047fe020ae + Date: Mon Oct 4 19:30:08 2004 +0000 + + INTEGRATION: CWS mav09 (1.14.114); FILE MERGED + 2004/07/08 08:29:38 mav 1.14.114.3: RESYNC: (1.15-1.17); FILE MERGED + 2004/04/29 16:50:04 mav 1.14.114.2: RESYNC: (1.14-1.15); FILE MERGED + 2004/04/29 11:03:41 mba 1.14.114.1: #i27773#: no SvFileStream please + + Change-Id: I23ca3e8033400f6b016a802037dad3443df8af34 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139926 + Tested-by: Caolán McNamara + Reviewed-by: Caolán McNamara + (cherry picked from commit 3076912419ddea4e1910a26e7c024cef4405dc5c) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139975 + Tested-by: Jenkins + Reviewed-by: Michael Stahl + +2022-09-15 Caolán McNamara [d1232444faf7f311d5d79f0e0291a8e261f8258b] + + Conditional jump or move depends on uninitialised value + + ==1533286== Conditional jump or move depends on uninitialised value(s) + ==1533286== at 0x12DEC3C9: param_double_validate (gparamspecs.c:592) + ==1533286== by 0x12DEF924: g_param_value_validate (gparam.c:700) + ==1533286== by 0x12DEFA9A: object_set_property (gobject.c:1594) + ==1533286== by 0x12DF1F96: g_object_set_valist (gobject.c:2538) + ==1533286== by 0x12DF2253: g_object_set (gobject.c:2705) + ==1533286== by 0x241E8C44: gtk_adjustment_configure (gtkadjustment.c:833) + ==1533286== by 0x23B6310A: (anonymous namespace)::GtkInstanceScrolledWindow::vadjustment_configure(int, int, int, int, int, int) (gtkinst.cxx:8207) + ==1533286== by 0x23B63D3D: virtual thunk to (anonymous namespace)::GtkInstanceScrolledWindow::vadjustment_configure(int, int, int, int, int, int) (gtkinst.cxx:0) + ==1533286== by 0x36424112: SmGraphicWindow::Resize() (view.cxx:227) + + Change-Id: Ib81e26b1042e7a5eebd0a2b561f57f7b4eb25dd4 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139977 + Tested-by: Jenkins + Reviewed-by: Michael Stahl + +2022-09-15 Michael Stahl [564591836b8560bde3c37de5b604d8748dfa5210] + + harfbuzz: add patch for CVE-2022-33068 + + Should be fixed in release 4.4.0 + + Change-Id: I9ff234f9687c7f57d9226df91b17ddb0bc083cca + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139950 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + +2022-09-15 Michael Stahl [16de18eeb5f1b94b699cc5f81bb214298c0f8dfe] + + poppler: upgrade to release 22.09.0 + + Fixes CVE-2022-38784 + + Add external/poppler/disable-freetype.patch.1 to get rid of some new + code that unconditionally requires freetype, to avoid building that on + WNT/MACOSX. + + Change-Id: I854d1865286b6fb4112cdf37898cda0203c52f2e + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139941 + Tested-by: Jenkins + Reviewed-by: Michael Stahl + (cherry picked from commit 8fce9a0a41b1bbebd325fc9d98a79d8decd3950c) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139850 + Reviewed-by: Thorsten Behrens + +2022-09-15 Xisco Fauli [d35782a8e42189c0e6f38d8e45f9b81448757d5d] + + Remove the now unused python test + + after 451a7e64fc1294f6ec089a5291ce03a0fc47361e + "tdf#148620: sd: move UITest to CppUnittest" + because the cherry-pick command didn't remove it + in master, the test is in + sd/qa/uitest/impress_tests2/tdf148620.py while in previous + branches it's in + sd/qa/uitest/impress_tests/tdf148620.py + + Change-Id: I49f9c74d4f147415b1b0e8b557966e5ec1fe6782 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139998 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + +2022-09-15 Caolán McNamara [5993277fb9ca4e9eca32a25ddb82db8f1e9c5856] + + try wait_until_property_is_updated in test_tdf134390 + + ====================================================================== + FAIL: test_tdf134390 (navigator.navigator) + ---------------------------------------------------------------------- + Traceback (most recent call last): + File "/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/sc/qa/uitest/calc_tests8/navigator.py", line 143, in test_tdf134390 + self.assertEqual(get_state_as_dict(xColumn)['Value'], '2') + AssertionError: '1' != '2' + - 1 + + 2 + + Change-Id: I7c781191facd10abbb25f895cb0d2bacb72d92ab + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139933 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + (cherry picked from commit 434f6a1b5a5089ff276918f9756501c91e146759) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139974 + +2022-09-15 Luboš Luňák [b2a5fa061c7e254a39b08523f2c6988baf699938] + + fix off-by-one in Calc shadow handling (tdf#150931) + + A mistake from d48e68407931fc33044aa7f3fc9e971897fac610, the number + is off as can be seen when compared to the bRightDiff part above. + + Change-Id: Id87d69c45cd3336ab8a122a2cae505a16848cdf7 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139902 + Tested-by: Jenkins + Reviewed-by: Luboš Luňák + (cherry picked from commit 308174945174bfd67f0444ef0c29634a4ecd961b) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139844 + Reviewed-by: Xisco Fauli + +2022-09-15 Michael Stahl [67aa6a4706bed9fc29d6162e93619c8e92ea774f] + + zlib: add patch for CVE-2022-37434 + + Change-Id: If09c419ba00fc9be021249e4d4da27d1650b9080 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139913 + Tested-by: Jenkins + Reviewed-by: Michael Stahl + (cherry picked from commit 521e920dda79f44a0ad637b6062f3dcb574f884b) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139848 + Reviewed-by: Thorsten Behrens + +2022-09-15 Michael Stahl [6a3e7e80131f54608a5e68189a2fca88b3ed79b8] + + libxml2: upgrade to release 2.10.2 + + Fixes CVE-2022-2309 + + Change-Id: I180218be275d3b6d38f8f74aa51c57e50d2734ee + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139911 + Tested-by: Jenkins + Reviewed-by: Michael Stahl + (cherry picked from commit d621a8839cebf96fe3ac374026f344f8e68bf011) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139847 + Reviewed-by: Thorsten Behrens + +2022-09-15 Xisco Fauli [451a7e64fc1294f6ec089a5291ce03a0fc47361e] + + tdf#148620: sd: move UITest to CppUnittest + + hopefully this will fix the sporadic failures of + UITest_impress_tests2 in Jenkins + + Change-Id: I3df2484b07a0cf7a0efdafb7235c3ff83f187200 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139928 + Tested-by: Xisco Fauli + Reviewed-by: Xisco Fauli + (cherry picked from commit 657d6e1698136813d852b920f099c11d94144a4d) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139846 + Tested-by: Jenkins + +2022-09-15 Eike Rathke [2919441c102122455b7b9967885a0a8a342eff56] + + Resolves: tdf#150926 Add-In result svl::SharedString needs to be interned + + Change-Id: If582e7e1bf818dcf9eaddd5313aa21f5768a578f + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139886 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 4a702b978384bf733363a64cd9ec64014675d515) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139841 + Reviewed-by: Mike Kaganski + +2022-09-14 Mike Kaganski [ec447be0adc32a16af02732fab4af22bc17e02cd] + + tdf#150927: properly handle nesting in tables + + This re-implements the relevant part of commit + 35021cd56b3b4e38035804087f215c80085564be, to follow the same + recursion logic that is used in SwXMLExport::ExportTable. + + Additionally, it found a place where XML was still emitted + when collecting autostyles (breaks were exported); fixed. + + Change-Id: I3b7eed06e0eca9ad20304b45db4c3e9d72478c9b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139901 + Tested-by: Jenkins + Reviewed-by: Mike Kaganski + (cherry picked from commit 58cb4fc7d17ae5b339c5ed6ae139e6ef2433c927) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139843 + Reviewed-by: Xisco Fauli + +2022-09-14 Taichi Haradaguchi <20001722@ymail.ne.jp> [e85b29e09bfdc51f361f58872a319cd59224a44b] + + Python3: upgrade to release 3.8.14 + + Fixes CVE-2020-10735. + + Change-Id: I028bb1fe6154beffdd80c0190c9de40ab8a80c4c + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139747 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + (cherry picked from commit e6fd6f4bfbc73c0461be4b5b0c924e6738aa1485) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139838 + +2022-09-14 Michael Weghorn [1c0f44cbacb4bcefcf383586e7ccd32d47388fa4] + + tdf#150779 tdf#150856 Revert "VCL add vcl::WindowPosSize ... + + ... abstract class" for 7-4 + + According to the commit message, this was mostly + meant to be a refactoring, but it caused issues + like tdf#150856 ("Opening Forms: Form is minimized in middle of the + screen with Linux/KDE") and tdf#150779 + ("kf5 - Opening LO only shows left pane of start screen, no recent + documents visible (LO 7.4 only)"). + The issues are fixed on master, but that can't be + easily backported to 7-4 (s. tdf#150779 comment 8), + so revert this commit on the 7-4 branch only. + + From all I can see, the only commit on this branch + making use of something introduced in the reverted + commit was + + commit f777a25f32b3c98a45cf1a24e130a5cce153f5d0 + Date: Wed Jun 15 12:07:31 2022 +0200 + + Related tdf#101285 - Remember position of conditional format dialog + + which was using `vcl::WindowDataMask::Pos`. Since + the revert undoes the renaming from + `WindowStateState` to `WindowState`, just + switch that one to use the old name for the flag, + `WindowStateMask::Pos`. + + This reverts commit ea5a0918c8c32309821ab239c4b95f4d6a3b5c12. + + Change-Id: Ie62b06e9488a7a2c4f27ce35ef0a9374d1f41b7a + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139903 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + +2022-09-14 Caolán McNamara [61dae407d98d07a67e4eda63415cc8588e13c91d] + + tdf#142631 use document background color in the spelling widget + + Change-Id: Ie33a0e305192697c18e20c3b6c1a554ccddf4284 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139668 + Tested-by: Jenkins + Reviewed-by: Adolfo Jayme Barrientos + +2022-09-13 Noel Grandin [4cef3204e011b235b807d26ddb3c901690b633ff] + + tdf#150712 limit the dialog to only a sample of the data + + instead of the entire area, which makes the dialog pretty much + instantaneous + + Change-Id: Icb08a09733ee872b67d5be00cb083139f05fba7b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139214 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + (cherry picked from commit b24eceb5178fda17fcc4b20c5286e8d27c5ae474) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139186 + +2022-09-13 Bjoern Michaelsen [51c558930a261a5bd63569965fe360f316b9f3f4] + + tdf#129163: GC cursor table at the end of the life of an portion enumeration + + Change-Id: I864c0ba9ec43a5b164bb9a118911e0507f2a538a + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139778 + Tested-by: Jenkins + Reviewed-by: Michael Stahl + (cherry picked from commit 2bb92469c9f6074f7d969ebe0323b623631dd3e8) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139836 + Reviewed-by: Caolán McNamara + +2022-09-13 Miklos Vajna [f07d4faac47cdf3cd09b036d07b03c6bb8d86372] + + tdf#140302 RTF import: fix unexpected repeated image + + The bugdoc has 2 images, but the resulting doc model had 3 images since + commit 7e863504854ae8ab286b32510aba8b363a8e314b (tdf#81943 sw RTF + import: fix missing wrap in background for in-table shape, 2018-07-16). + + The trouble was that shape replay wants to access the current shape at + m_aStates.top().aShape, but we only set it, forgot to unset it after + replay was done, which can result in duplicated insertions. + + Fix this by saving the old current shape on the stack, set the current + shape to the wanted value and then undo it after replay. + + This only affects documents that have a \picprop group, since the + unwanted insertion happened when popping that group. + + Change-Id: I088054de2332deb4b45f7e269672fa799dd49c2f + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139818 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + (cherry picked from commit b9fcf43a38773f81ef1833897c4e36d8db16c0b1) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139672 + Reviewed-by: Michael Stahl + +2022-09-13 Sam James [89742b554f567f2567f365d28816e87d690ff78e] + + Fix build with Poppler 22.09.0 + + With Poppler 22.09.0, LO fails to build with: + ``` + /var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments + state->getLineDash(&dashArray, &arrayLen, &startOffset); + ~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~ + /usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here + const std::vector &getLineDash(double *start) + ^ + 1 error generated. + ``` + + Poppler changed the getLineDash interface: + ``` + - void getLineDash(double **dash, int *length, double *start) + + const std::vector &getLineDash(double *start) + ``` + + Signed-off-by: Sam James + Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139249 + Tested-by: Jenkins + Reviewed-by: Michael Stahl + (cherry picked from commit 2c14c5885dae8c6e23e7bdde36a749c9febf62ac) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139834 + +2022-09-13 Samuel Mehrbrodt [f2c4ecbd38a274ca36db21a61ef7712b3db8ca87] + + tdf#150267 Import docvar value correctly + + Change-Id: I388923e3f7bea35c1247f47812c158f5ab92fc0e + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139793 + Tested-by: Jenkins + Reviewed-by: Samuel Mehrbrodt + (cherry picked from commit bae62d8792d1ce31408ae101eeb305c302037849) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139667 + Reviewed-by: Michael Stahl + +2022-09-12 Rene Engelhard [dbf584e9fbf1563fb63a0daeeadb91f323cc149d] + + bump harfbuzz dependency to >= 2.1.0 + + as we already use hb_ot_name_get_utf8() and HB_OT_NAME_ID_FONT_FAMILY + + https: //harfbuzz.github.io/harfbuzz-hb-ot-name.html says + Since: 2.1.0 + Change-Id: I19bac8be529e4919c4df5a4d2be4ea3363e4a249 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139814 + Reviewed-by: Rico Tzschichholz + Reviewed-by: René Engelhard + Tested-by: René Engelhard + (cherry picked from commit b4fbffe25a4b8c78843b3e04d8336a46aa2a6925) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139669 + Reviewed-by: Adolfo Jayme Barrientos + +2022-09-12 Miklos Vajna [8c904116d660f67341540860cc4a1fb10bc6b0d1] + + vcl: fix crash in SalInstanceWidget::set_busy_cursor() + + Crashreport signature: + + Fatal signal received: SIGSEGV code: 128 for address: 0x0 + + program/libmergedlo.so + vcl::Window::LeaveWait() + vcl/source/window/mouse.cxx:640 + program/libsclo.so + ScSpellingEngine::ShowTableWrapDialog() + sc/source/ui/view/spelleng.cxx:315 + program/libsclo.so + ScConversionEngineBase::FindNextConversionCell() + sc/source/ui/view/spelleng.cxx:168 + program/libsclo.so + ScSpellDialogChildWindow::GetNextWrongSentence(bool) + /opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:173 + + Change-Id: I298789211d6ee038bd5a9a7bff7cf9ae4f132a91 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139731 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + (cherry picked from commit 37d778b601966434ff6042373c1a82d4687fd034) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139665 + Reviewed-by: Xisco Fauli + +2022-09-12 Eike Rathke [23d607b104013e412295ac83956edc74e94ed2df] + + Resolves: tdf#150766 Listen to entire shared formula group instead of a slice + + Change-Id: I677602bd3401dbd401e35f7db64cd34d164d9d92 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139744 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 0919d8a389cba5626c14b08549243546830cfb8d) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139662 + Reviewed-by: Xisco Fauli + +2022-09-11 Caolán McNamara [0e263244f13f1dd0586ca4f262dae84e515b35da] + + crashtesting: threaded assert on loading forum-de3-3100.ods + + use SetInterpreterContext like I see in similar places to avoid the need + to call ScDocument::GetFormatTable + + #9 0x00007fd35b1af283 in ScDocument::GetFormatTable() const (this=this@entry=0x5573153bf1d0) at sc/source/core/data/documen2.cxx:463 + __PRETTY_FUNCTION__ = "SvNumberFormatter* ScDocument::GetFormatTable() const" + #10 0x00007fd35b196f57 in ScAttrArray_IterGetNumberFormat(sal_uInt32&, ScAttrArray const*&, SCROW&, ScAttrArray const*, SCROW, ScDocument const&, ScInterpreterContext const*) (nFormat=@0x7fd354458b38: 0, rpArr=@0x7fd354458b30: 0x0, nAttrEndRow=@0x7fd354458b54: 0, pNewArr=0x557315063910, nRow=nRow@entry=30, rDoc=..., pContext=0x0) at sc/source/core/data/dociter.cxx:80 + nRowStart = 30 + nRowEnd = 30 + pPattern = 0x557316c093f0 + #11 0x00007fd35b19e5b7 in ScValueIterator::GetThis(double&, FormulaError&) (this=this@entry=0x7fd354458b20, rValue=@0x7fd354458b00: 0, rErr=@0x7fd354458af8: FormulaError::NONE) at sc/source/core/data/dociter.cxx:196 + bNextColumn = + pCol = 0x557316aca050 + nCurRow = 30 + nLastRow = 32723 + #12 0x00007fd35b19e8c4 in ScValueIterator::GetNext(double&, FormulaError&) (this=, this@entry=0x7fd354458b20, rValue=@0x7fd354458b00: 0, rErr=@0x7fd354458af8: FormulaError::NONE) at sc/source/core/data/dociter.cxx:297 + #13 0x00007fd35b6a5307 in ScInterpreter::GetNumberSequenceArray(unsigned char, std::__debug::vector >&, bool) (this=this@entry=0x5573169d9900, nParamCount=nParamCount@entry=1 '\001', rArray=std::__debug::vector of length 2, capacity 200 = {...}, bConvertTextInArray=bConvertTextInArray@entry=false) at sc/source/core/tool/interpr3.cxx:3986 + nCellCount = + nErr = FormulaError::NONE + fCellVal = 0 + aValIter = {mrDoc = @0x5573153bf1d0, pContext = 0x0, pAttrArray = 0x0, nNumFormat = 0, nNumFmtIndex = 0, maStartPos = {nRow = 0, nCol = 0, nTab = 4, static detailsOOOa1 = {eConv = formula::FormulaGrammar::CONV_OOO, nRow = 0, nCol = 0}}, maEndPos = {nRow = 199, nCol = 0, nTab = 4, static detailsOOOa1 = {eConv = formula::FormulaGrammar::CONV_OOO, nRow = 0, nCol = 0}}, mnCol = 0, mnTab = 4, nAttrEndRow = 0, mnSubTotalFlags = SubtotalFlags::NONE, nNumFmtType = SvNumFormatType::UNDEFINED, bNumValid = false, bCalcAsShown = true, bTextAsZero = false, mpCells = 0x557316aca280, maCurPos = {first = {, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreTrait>::const_iterator_trait>> = {m_cur_node = {type = 10, position = 30, size = 1, data = 0x557316d734d0, __private_data = {parent = 0x557316aca280, block_index = 1}}, m_pos = {position_iterator = 30, size_iterator = 1, element_block_iterator = 0x557316d734d0}, m_end = {position_iterator = 7378697629483820646, size_iterator = 7378697629483820646, element_block_iterator = 0x6666666666666666}}, }, second = 0}} + eStackType = + aAdr = {nRow = 0, nCol = 0, nTab = 0, static detailsOOOa1 = {eConv = formula::FormulaGrammar::CONV_OOO, nRow = 0, nCol = 0}} + aRange = {aStart = {nRow = 0, nCol = 0, nTab = 4, static detailsOOOa1 = {eConv = formula::FormulaGrammar::CONV_OOO, nRow = 0, nCol = 0}}, aEnd = {nRow = 199, nCol = 0, nTab = 4, static detailsOOOa1 = {eConv = formula::FormulaGrammar::CONV_OOO, nRow = 0, nCol = 0}}} + bIgnoreErrVal = false + nParam = 0 + nRefInList = 0 + #14 0x00007fd35b6aa9ed in ScInterpreter::CalculateSmallLarge(bool) (this=this@entry=0x5573169d9900, bSmall=bSmall@entry=true) at sc/source/core/tool/interpr3.cxx:3657 + nCol = 1 + nRow = 1 + aArray = std::__debug::vector of length 1, capacity 1 = {1} + nRankArraySize = 1 + __PRETTY_FUNCTION__ = "void ScInterpreter::CalculateSmallLarge(bool)" + aRankArray = std::__debug::vector of length 1, capacity 1 = {1} + aSortArray = std::__debug::vector of length 2, capacity 200 = {1, 21} + nSize = + #15 0x00007fd35b6abac8 in ScInterpreter::ScSmall() (this=this@entry=0x5573169d9900) at sc/source/core/tool/interpr3.cxx:3717 + #16 0x00007fd35b6cd929 in ScInterpreter::Interpret() (this=this@entry=0x5573169d9900) at sc/source/core/tool/interpr4.cxx:4373 + bGotResult = + nRetTypeExpr = SvNumFormatType::NUMBER + nRetIndexExpr = 0 + nErrorFunction = 0 + nErrorFunctionCount = 0 + aErrorFunctionStack = std::__debug::vector of length 0, capacity 0 + nStackBase = 0 + aTokenMatrixMapIter = Python Exception 'NoneType' object has no attribute 'pointer': + {_M_node = 0x5573169d99c8} + eOp = ocSmall + __PRETTY_FUNCTION__ = "formula::StackVar ScInterpreter::Interpret()" + bForcedResultType = + p = + eType = + #17 0x00007fd35b3c6ed1 in ScFormulaCell::InterpretTail(ScInterpreterContext&, ScFormulaCell::ScInterpretTailParameter) (this=0x55731309d8f0, rContext=..., eTailParam=eTailParam@entry=ScFormulaCell::SCITP_NORMAL) at sc/source/core/data/formulacell.cxx:1945 + pScopedInterpreter = std::unique_ptr = {get() = 0x0} + pInterpreter = 0x5573169d9900 + nOldErrCode = FormulaError::NONE + bContentChanged = + aNewResult = {static MULTILINE_UNKNOWN = 0 '\000', static MULTILINE_FALSE = 1 '\001', static MULTILINE_TRUE = 2 '\002', {mfValue = 6.9438766800236802e-310, mpToken = 0x7fd3544591e8}, mbToken = false, mbEmpty = false, mbEmptyDisplayedAsString = false, mbValueCached = true, meMultiline = 3 '\003', mnError = 28442} + bOldRunning = false + bForceNumberFormat = + aRecursionCounter = {rRec = @0x557316da2b40, bStackedInIteration = false, cell = 0x55731309d8f0} + #18 0x00007fd35b0c84cb in ScColumn::CalculateInThread(ScInterpreterContext&, int, unsigned long, unsigned long, unsigned int, unsigned int) (this=, rContext=..., nRow=nRow@entry=0, nLen=nLen@entry=30, nOffset=nOffset@entry=0, nThisThread=nThisThread@entry=0, nThreadsTotal=48) at sc/source/core/data/column2.cxx:3218 + + always pass ScInterpreterContext to ScValueIterator + + its available at every call site + + Change-Id: Ifeddbfda8afe47c3754ed1fcab836dfd2c8f38ca + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139636 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139741 + Reviewed-by: Eike Rathke + +2022-09-09 Christian Lohmaier [f3e2a0e2e353a278afdd85a79614ff0b6e2a2128] + + update credits + + Change-Id: I2b1e2e53b0688369e9ebc480ab296ace4cdb804b + (cherry picked from commit 69b0c17f1e5d2fd8c7ca0548fb5c5ed8def26ce2) + +2022-09-09 Christian Lohmaier [12551520e84a152b6ade32c45ff6c1fbdf285a2b] + + Update git submodules + + * Update translations from branch 'libreoffice-7-4' + to ceb35d1d848b7ba6795c703a3bec6c5549844bfc + - update translations for 7.4.1 rc2 + + and force-fix errors using pocheck + + Change-Id: Iead6e205e7824b0e4c5f7001661275410fe33360 + (cherry picked from commit d2af5ccdc269827d9738b6ed08c8166bfd5c91cf) + +2022-09-09 Xisco Fauli [4a7b856c2b6b97b9538a6945cf2afa95e59a3031] + + sw: avoid divide by zero in SwDoc::AdjustCellWidth + + See https://crashreport.libreoffice.org/stats/signature/SwDoc::AdjustCellWidth(SwCursor%20const%20&,bool,bool) + + Change-Id: I98b90dcbed6b6f3ea0a7d1668a5c248f39e7a2a5 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139658 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + +2022-09-09 Caolán McNamara [1cba31a159fb1ed4795adeea968dc915b95d64a5] + + tdf#150810 get visible placeholder text in GtkEntry with focus + + in gtk3 focus causes placeholders to be not rendered + https://gitlab.gnome.org/GNOME/gtk/-/issues/378 + https://bugzilla.gnome.org/show_bug.cgi?id=657613 + + FWIW, currently in gtk4 they are shown when focused + + Change-Id: I623c81dd71f651d8b24a717a63fe428bc9d6a505 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139592 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + (cherry picked from commit 7ef1de66eb974fdb7638582e80b1cdab46f4e81d) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139561 + Reviewed-by: Miklos Vajna + +2022-09-09 Caolán McNamara [425cfd785337b9087d083904f3ff07db0f186a83] + + gtk4: caps-lock-warning is gone as a property + + Change-Id: I66aac55f0ebb381bc2f9f1fffbdb887d4a016005 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139559 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + +2022-09-09 Caolán McNamara [104f50264b34c16a772f1068bbd4e56c49129485] + + every other .ui is version="3.20" + + Change-Id: Ifc45b74e06069855021b7c963a3e5c83c8eacfcb + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139558 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + +2022-09-09 Xisco Fauli [b69a37e567a6a0b6c24a4438a0da906497c750f0] + + writerfilter: avoid divide by zero + + in DomainMapperTableManager::endOfRowAction() + + See https://crashreport.libreoffice.org/stats/signature/writerfilter::dmapper::DomainMapperTableManager::endOfRowAction() + + Probably since 116cadb5d2582532c69677a2f8499e8e9b7b9b80 + "tdf#59274 DOCX import: fix tables with incomplete grid" + + Change-Id: I12f2842107885fbbc62be2186511102f642e3efc + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139657 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + +2022-09-09 László Németh [431c2af3241ebc027fe95213846b98e0456da359] + + tdf#150876 sw: track new rows inserted after a tracked row insertion + + New row insertions after an already tracked row insertion + weren't tracked. + + Regression from commit b251228d2e5e2832e0a617213173e8841f5b7428 + "tdf#150666 sw: allow to delete tracked table row insertions" + + Follow-up to commit dbc82c02eb24ec1c97c6ee32069771d8deb394f9 + "tdf#143358 sw: track insertion of empty table rows". + + Change-Id: Ic365e70aa7808237a1bd69d0101a098ae70e8813 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139594 + Tested-by: László Németh + Reviewed-by: László Németh + (cherry picked from commit e0bd04c21b9905f4cfadbf9bb879a089ebb49908) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139656 + Tested-by: Jenkins + +2022-09-09 László Németh [c46ab9ff1e6bd53881e5f9dfdf9f44e030a93d2b] + + tdf#150666 sw: allow to delete tracked table row insertions + + It was not possible to delete tracked table row insertions, + if only those were selected, or if they were own insertions. + + Regression from commit 95213407dfcbf34056037d60243ff915340d1a2e + "tdf#146622 sw crash fix: don't delete already deleted rows". + + Change-Id: Idd3bc78bca1c76bceba63cf339c6d8c73f8f9508 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139575 + Tested-by: Jenkins + Reviewed-by: László Németh + (cherry picked from commit a0566ae34a704a9ad9b147d560007dde7d2ccf7d) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139556 + Tested-by: László Németh + +2022-09-08 Mike Kaganski [ebc7558cb22039f69d86c512b6318957b79d6a0e] + + SAL_WARN on parse exception + + Change-Id: I124b73844105b43ba9c474d5ff685d703bd30f77 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139630 + Tested-by: Jenkins + Reviewed-by: Mike Kaganski + (cherry picked from commit 6b0ba9c94ed094cf9963b90c33671df9475867ce) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139571 + Reviewed-by: Xisco Fauli + +2022-09-08 Mike Kaganski [807ae248ade0b0c6465e752fc800e34ef1664d59] + + tdf#150846: FilterOptions in descriptor could come from import filter + + Tolerate failure parsing json here. Unfortunately this means that + we can't provide a diagnostics to user when they provide bad json + in the command line parameters. + + Change-Id: Ia3fa18e709a4c0b891faf4365453b79e6c58a9c6 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139613 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + (cherry picked from commit 467308d679a3f2b4bbdd117fcc73636d57d66c09) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139568 + Reviewed-by: Xisco Fauli + +2022-09-08 Caolán McNamara [f6b2bef0fc46bf6e087950cf712b79bf7d0bb2be] + + tdf#150770: crashtesting: assert seen on loading forum-mso-en-2633.pptx + + probably since: + + commit 855a56fea4561135a63cb729d7a625a950b210e7 + Date: Fri May 13 08:12:17 2022 +0200 + + tdf#148965 PPTX import: fix internal hyperlinks on shapes + + Change-Id: I920cbbb5544cbe9d76f37b3d524c9ccebd426132 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135682 + Tested-by: Caolán McNamara + Reviewed-by: Caolán McNamara + (cherry picked from commit 48de2ac37366d5671aabc64364660311431d3235) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139570 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + +2022-09-08 Eike Rathke [555d0dca78a261af8c18a9ab66e2456f272dff73] + + crashtesting: prevent nullptr access + + There's a xlsx export crash on *2nd* export with data pilot data + of forum-en-38962.ods. We export without crash this .ods to xlsx + *once*, but on saving again to xlsx it crashes. It also crashes with an + export to .xls and then an export to .xlsx. Repeated exports to xls are + crash free. + + Already on the first export there are loads of warning messages of + + ScDPMember::GetItemData: what data? nDim 0, mnDataId # + ScNameToIndexAccess getByIndex failed com.sun.star.container.NoSuchElementException message: "at sc/source/core/data/dptabsrc.cxx:2267 + + The pivot tables are broken on both exports. + + This smells like some sort of data pilot cache + corruption/insufficiency during .xlsx export but the root cause is + yet unknown. This only fixes the crash symptom. + + Change-Id: Ie479f7f0abc4af284e61f6aa5a69943ccdd72eab + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139611 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 5aa3f046f934092fbfd7cc92b93d79b4f548cc13) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139565 + Reviewed-by: Xisco Fauli + +2022-09-08 Xisco Fauli [938d17969cd0fd29cf4edd1e0365dd784ca59d8b] + + tdf#150832: Revert "tdf#150034 very slow opening pathological chart" + + This reverts commit 613f6e75fbfcc024fc9c3732261cbf2cda6f4ad8. + + Reason for revert: it seems all charts in XLS files are affected. + At least I could reproduce it with all the XLS files I tested it with. + + Change-Id: I68d13d6f609521ce6af759cf25249656176b66cd + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139562 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + Reviewed-by: Xisco Fauli + +2022-09-07 Taichi Haradaguchi <20001722@ymail.ne.jp> [26d2a8d9a70255f2211f4256f27286653fbfba44] + + python3: upgrade to release 3.8.13 + + Remove some code in external/python3/darwin.patch.0 as it was fixed upstream(https://bugs.python.org/issue45405). + + Change-Id: Ie6bfb2456f96a63adbf0dbcb9c902dc56f1151ee + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139501 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + +2022-09-07 Eike Rathke [75eb756e25bfe78fd0bc3f92c53fe93a4a87c80c] + + A ColRowName (label) is a QuotedLabel is a SingleQuoted + + This is a combination of 2 commits. + + A ColRowName (label) is a QuotedLabel is a SingleQuoted + + Hence a ' is not escaped by \' but by '' doubling it. + + See also ODFF 5.10 Quoted Label + https://docs.oasis-open.org/office/OpenDocument/v1.3/os/part4-formula/OpenDocument-v1.3-os-part4-formula.html#__RefHeading__1017950_715980110 + + Apparently this was always wrong and even stored in files and + never correctly read/compiled back. + + Change-Id: I94bdb7d1fdffe9bbd77cf443883dd76637be981b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139491 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 64f673238cf9b645a751e8f8137ca14e595a779a) + + Conflicts: + sc/source/core/tool/compiler.cxx + + Always enquote ColRowName (label) as SingleQuoted + + It's anyway required by ODFF and also in UI prevents confusion + between defined names and labels of the same name. + + Change-Id: Iba03f15f1f778132696101507e61cc0ef8de6c6e + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139533 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 55e7de171b666a87f29f072e0a4787480946c066) + + Conflicts: + sc/source/core/tool/compiler.cxx + + Change-Id: I94bdb7d1fdffe9bbd77cf443883dd76637be981b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139548 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + +2022-09-07 Xisco Fauli [5f8b4b4023f32edf78ab1ba87e11dc063d85b48f] + + tdf#142031: sc: Add UItest + + Change-Id: Icfe8229a0079bbe5be8394883299b2f959a74efd + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139489 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + (cherry picked from commit 3169bb4de48e8a63082e49201083455a29411445) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139503 + +2022-09-07 Caolán McNamara [5b11d10f6687ea42b8452a5bb21c4af0b0c095ba] + + check impress/calc IFrame "FrameURL" target + + similar to + + commit c7450d0b9d02c64ae3da467d329040787039767e + Date: Tue Aug 30 17:01:08 2022 +0100 + + check IFrame "FrameURL" target + + Change-Id: Ibf28c29acb4476830431d02772f3ecd4b23a6a27 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139494 + Tested-by: Jenkins + Reviewed-by: Stephan Bergmann + +2022-09-07 Heiko Tietze [695dc7484afd2af9c88b3d1032a6a4bbadecaefa] + + Resolves tdf#145159 - Use display colors in Header/Footer dialog + + Change-Id: Ia19babe3603f653fa631f3d138b43103a553e944 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138998 + Reviewed-by: Heiko Tietze + Tested-by: Caolán McNamara + Reviewed-by: Caolán McNamara + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139412 + Tested-by: Jenkins + +2022-09-07 Eike Rathke [4f1670950e230eaaea7e3533134cb60fd7785195] + + Resolves: tdf#150829 Broadcast missing ScAreasChanged hint on sheet copy Undo + + Change-Id: I354b1e395079067cd4cc9299501b3936dea00cd8 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139538 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 922b79a0f5a9151a6870ba395abcac5b54055275) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139511 + Reviewed-by: Xisco Fauli + +2022-09-07 Eike Rathke [e677adf304f7a02d741eb6892e1d102538164ebc] + + Related: tdf#150307 Use SfxHintId::ScAreasChanged, tdf#137577 follow-up + + ... instead of ScTablesRenamed, as ScAreasChanged (confusingly + named) was meant exactly for this and also updates the Navigator. + + Change-Id: I6d90b82e6d5121e69c1a40af369be36544ad1b3b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139453 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 540a312af2f02108ea90f5d2a9f3bf573db622e5) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139431 + Reviewed-by: Xisco Fauli + +2022-09-07 Andreas Heinisch [bbd08d1dcdbb2dd8c30f590b2a8b785b64d01564] + + tdf#142031 - Collect all the characters for the formula suggestion auto input + + This is a combination of 5 commits. + + tdf#142031 - Collect all the characters for the formula suggestion auto input + + Change-Id: Idec350b09279f42f2ca42a1c02082d8e9e4207b8 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138702 + Tested-by: Jenkins + Reviewed-by: Eike Rathke + Signed-off-by: Xisco Fauli + + Do not gather function data over and over again for each formula input + + The function list changes only if switched to/from English + function names or if reset for AddIn config and only then needs to + be rebuilt. In all other cases simply reuse a once obtained data + set and only append the dynamic document content. + + Change-Id: I5b1d14205e2933010a1b4382c985594d75802742 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138890 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + Signed-off-by: Xisco Fauli + + Move input handler function names to ScGlobal static + + ... as there is only one function list and + InputHandlerFunctionNames can be shared instead of each + ScInputHandler holding their own copy. + + Change-Id: Id82b2020f8846456ce7464daa83feb6915792aa2 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139012 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + Signed-off-by: Xisco Fauli + + Use ScFunctionList::IsEnglishFunctionNames() + + Change-Id: I21a7bf18c2117187b2e8c770b9367f46323b2c2d + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139054 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + Signed-off-by: Xisco Fauli + + Make static ScCompiler::GetCharClassLocalized() public as well + + ... and mutex guard it. + + Change-Id: Ief9c6deaf7974ac43c7ae439a0fb73c29eced283 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138733 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139443 + +2022-09-07 Caolán McNamara [efaf44a8d4dc41086ae24b847a86c7b0b66106d3] + + tdf#150688 return atk_noop_object_wrapper_new() instead of null on failure + + Change-Id: I20fd190a36649193ee2a1e536f520344c5f6c89a + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138993 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + +2022-09-07 Miklos Vajna [10fe7327fd6e922bacf0ad4e1110ce4d9fab347d] + + sw HTML import: fix height of OLE objs when it is missing and width is relative + + In case an OLE object's fallback bitmap had a width=100% size but no + explicit height, we used to set the OLE object's size to a fixed value, + based on the bitmap's pixel size. + + Falling back to the pixel size based on the current DPI is sensible if + there is no height specified, but browsers keep the aspect ratio when + only width or height is specified and we didn't. + + Fix the problem by explicitly checking for the "one axis has percent + size, the other is unset" scenario in SwHTMLParser::InsertEmbed() and + then handling the new SwFormatFrameSize::SYNCED value in + SwHTMLParser::SetFixSize(). + + Note that SetFixSize() is not used for bitmaps (only for OLE objects), + so that codepath may still need a similar fix. + + Change-Id: I9f70307edbfbb06e228494fb5c04e7381ed8e5cc + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139526 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + (cherry picked from commit 456abae730a787693c3ad98f7e57eba5f6163a76) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139513 + Reviewed-by: Xisco Fauli + +2022-09-07 Caolán McNamara [588879ceafcb4bdbeef3cb8c1770265da3c8917e] + + cid#1500594 Explicit null dereferenced + + since + + commit 5480d9237af1cf25ac464bf49ba364a757fcf6f5 + Date: Sun Jan 24 22:17:49 2021 -0900 + + tdf#114567 tdf#138934 Hyperlink-Target in Doc Headings expand/collapse + + lets make a copy of the iterator + + Change-Id: I855c58377871d7fb55ea676ebac48c0abc67e98c + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139502 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + +2022-09-06 Olivier Hallot [76188a3f89f71d72411798621b4033c9149ab2c4] + + Update git submodules + + * Update helpcontent2 from branch 'libreoffice-7-4' + to c2225b7c607a6718b0fbdd9da082fb9bf2921e68 + - tdf#150689 Fix Calc contents tree + + Change-Id: If23ba66db8806ff88e67dc0485c5cf6376ccd0e7 + Reviewed-on: https://gerrit.libreoffice.org/c/help/+/139227 + Tested-by: Jenkins + Reviewed-by: Olivier Hallot + (cherry picked from commit f3d6949e4747508d6355fa280017df45d6250488) + Reviewed-on: https://gerrit.libreoffice.org/c/help/+/139180 + Reviewed-by: Rafael Lima + +2022-09-06 Eike Rathke [662fdaadfeaa2a8d3fe1f78cf54332056956e351] + + Resolves: tdf#150307 Broadcast missing ScAreasChanged hint on sheet deletion + + ... and Undo. + + Change-Id: I59413d5470294c415c51e7d7ada9134f4173c872 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139450 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit d4411be66c199f379723dab5052b054f029ff3d0) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139430 + Reviewed-by: Caolán McNamara + +2022-09-06 Taichi Haradaguchi <20001722@ymail.ne.jp> [27704f6d425ccc6414ea8a28e19c06b5eaf278c6] + + upgrade openssl-1.1.1q + + Change-Id: I2317e734f074cf7301a6081cf3d2221beeaf5ad1 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139497 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + +2022-09-06 Miklos Vajna [9c4f681844843ed6b479711ef3575d2f4037ac67] + + crashtesting: fix DOCX export of forum-mso-en-11199.docx + + This went wrong in a4432eb0946c0bc775b3d30b634bef5d66544f8d (tdf#104823: + support for sdt plain text fields, 2021-11-24), when we started to turn + cell SDTs into a field containing the cell text, which now needs to work + with redlining, even if the original DOCX file had no fields. + + The root cause was introduced earlier, in + 0c84c60f48cf681daf467c0678a768711f22e5c3 (tdf#77419 DOCX table import: + ignore right white space, 2020-01-21), which assumed that goRight(2, + select=false) is the opposite of goLeft(1, false) + goLeft(1, true), + which is not true for input fields where an input field with 2 chars + will select 5 chars (not 1) when you do goLeft(1, true) with a cursor at + the right edge of the field (2 chars of content + + CH_TXT_ATR_INPUTFIELDSTART + CH_TXT_ATR_INPUTFIELDEND + the field's + dummy character itself), as "going left" selects the entire field, not + just 1 character. + + Fix the problem by replacing goRight() with re-positioning the cursor + the way it was positioned before trimming whitespace a few lines above. + + Change-Id: Iaae8878e9801df95d3bc7465d3e8ad12c724a888 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139469 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + (cherry picked from commit cfc851da557214286685cde26baaac6be70d8624) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139429 + Reviewed-by: Xisco Fauli + +2022-09-06 Miklos Vajna [ec9c2b473c61041ffa0cb09f7c6f01d400d75ac9] + + sw XHTML import: fix lost empty paragraphs + + Plain HTML import ignores empty paragraph, because browsers ignore such + paragraphs as well. + + This has the benefit of layout compatibility, but it breaks the + semantics of documents when roundtripping them from Writer's document + model to XHTML and back. + + Fix the problem by disabling this tweak for XHTML: the idea is that when + it comes to paragraph / line breaks, XHTML is meant to preserve the + semantics of the original document model, even if that results in slight + differences in HTML rendering. So in case Writer/ODT doesn't collapse + multiple line breaks and browsers/HTML does that, we apply workarounds + in the HTML case, but not in the XHTML case. + + Change-Id: I55de8880503ee2d48fbd7a6af3891f2754f0d172 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139439 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139465 + +2022-09-06 Caolán McNamara [d75c6adcdb4c09c1379f22793135def71b8040a7] + + tdf#150507 like skia, even when subpixel rendering pixel snap y + + Change-Id: Iaf064b483d65d25251f733cc6a67d9f1863bb64c + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139437 + Tested-by: Jenkins + Reviewed-by: Adolfo Jayme Barrientos + +2022-09-05 Chenxiong Qi [20c7fbad7d929df335b0610a748b6e1d694dafaf] + + tdf#73845 restore Empty and NonEmpty query filter after FILEOPEN + + Signed-off-by: Chenxiong Qi + Change-Id: I659e0d97c44bf189f457ca04eb49248121278c10 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138919 + Tested-by: Jenkins + Reviewed-by: Hossein + (cherry picked from commit 26e3bfa02c4d582fd430171d509fa570ca364d35) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139427 + Reviewed-by: Xisco Fauli + +2022-09-05 Sarper Akdemir [74348eb94e8d940f276274e83ecd41060fc615b1] + + tdf#144092 pptx export: export endParaRPr for empty shape & cells + + Alters ShapeExport::WriteTextBox so that when it is called with an empty + text (on PPTX export) an attempt to export empty text's char properties + (stored in the Shape or Cell's properties directly) made on + ShapeExport::WriteText. + + These properties are exported into endParaRPr. + + Implementing this caused some tests that contain connector shapes fail + with XML schema validation errors, therefore disabled export of txBody + inside cxnSp tags. + + Also adds a unit test that checks roundtrip of empty shape or cell's + endParaRPr. + + Change-Id: I3e3feda802f42560fa7fecc9c0b1afe73a900a84 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138960 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + (cherry picked from commit aebd3c4a7def4476f34e171fce395d6ba70e3e1e) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139220 + Reviewed-by: Xisco Fauli + +2022-09-05 Miklos Vajna [4ab41c7e420ebba3a95457c0900eac41707e61f5] + + sw reqif/xhtml export: fix invalid pixel formats of graphics exported as OLE + + When exporting a Writer document to reqif-xhtml in ExportImagesAsOLE + mode with something like: + + soffice.bin --convert-to 'xhtml:HTML (StarWriter):{"XhtmlNs":{"type":"string","value":"reqif-xhtml"},"ExportImagesAsOLE":{"type":"boolean","value":"true"}}' test.odt + + images are exported as ms paint ole objects instead of plain images. + + This happens in WrapGraphicInRtf(), using GraphicConverter::Export() + where we just specify we want a BMP output. This usually works, but not + when the bitmap format is something exotic where we try to keep that + format in BMP, but ms paint can't handle it. When this happens, we get + an RPC_E_SERVERFAULT error from OleRun() in OleComponent::RunObject(), + which doesn't say much, except that ms paint failed to read the byte + array we handed out. + + Fix the problem by ensuring that if a graphic is exported as OLE data, + then it always has the 24bit pixel format. + + Interestingly a 8bit BMP can be opened in ms paint manually, but not + when embedding it as OLE object. + + Change-Id: I2285bf67c4528cde208ae9fba42ece56822f5403 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139044 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + (cherry picked from commit 13219c632b7ec154ba882a715cf890b54f10b146) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139422 + Reviewed-by: Xisco Fauli + +2022-09-05 Sarper Akdemir [de325e4b603d6b57fa6b46021a1b4c83e2d44e82] + + tdf#149670 fix color change api and adjust tolerance for ooxml + + It appears at the start of Graphic::colorChange aBmpColorFrom & + aBmpColorTo gets initialized with wrong colors. Instead of {R,G,B}, + they get initialized with {B,G,R}. + + Instead of bitshifting use the ::Color constructor so that it is + initialized correctly. + + For ooxml import adapt tolerance values of the image format in an + attempt to get similar results on how the results appear in + PowerPoint. + + Change-Id: I1fa901691512de82936dba0e47158b7e0ca2223e + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139203 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + (cherry picked from commit 2b902b6203a87bdca7856e17a9c0fcc403de4264) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139421 + Reviewed-by: Xisco Fauli + +2022-09-05 Caolán McNamara [0854ae596afa863ab4db592fa484f8b0799b37da] + + glyph cache considered artificial italic the same as regular + + The "true" font metrics are the same so it matches, though the + result when rendered is different. Do the same with artificial + emboldening too. + + seen with Bahnschrift font from tdf#103596 and tdf#108497 + + Change-Id: I5fb77b5abe55fea9a09091e350c58866725c9b3d + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139129 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + +2022-09-05 Eike Rathke [ad15930e60b1e175d127022fd99fe71f140cbd88] + + Resolves: tdf#142293 Implement the temporariness of GetOpCodeMap() + + This is a combination of 5 commits. + + Related: tdf#142293 Introduce a protected FormulaCompiler::GetFinalOpCodeMap() + + ... to prepare having GetOpCodeMap() return a temporary if a final + doesn't exist yet. Currently just an alias. + + xChange-Id: I6fc100ae6223010e149e4af01fc7c17630930de7 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139162 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 603f9ce4f39a59bd84b5c08e3d725e0ee664991f) + + Related: tdf#142293 Use FormulaCompiler::GetFinalOpCodeMap() in ScCompiler + + xChange-Id: I65bf11fca11acfbc372c99a5210e0f79b61f2be4 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139171 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit b8a83c5c63873faf1a63205b8aad634f351d1a9f) + + Resolves: tdf#142293 Implement the temporariness of GetOpCodeMap() + + xChange-Id: I7c587a68dbdeab9a8c8ed324ecae2eb5dd75b9df + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139201 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 5aaa0cda74de4170972b7988d8fca16a560b8500) + + Related: tdf#142293 Remove temporariness now implemented at GetOpCodeMap() + + xChange-Id: Ic61f45b1da286e2f4890bbc81dc5cd18c0d5bbe5 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139202 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 15acaddb54c3e14a49b0d26d879c4436d34933e1) + + Related: tdf#142293 Have ScCompiler::GetOpCodeMap() overwrite + + ... FormulaCompiler::GetOpCodeMap() forwarding to + GetFinalOpCodeMap() as that is what we want from ScCompiler (and + always had), eliminating the now possible temporariness of + FormulaCompiler::GetOpCodeMap(). + + xChange-Id: Ia87fb0e911e4f7995bfb5df07dcd1fde3713d006 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139205 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 033e98dbe6aafd6719eb83ea4d2fc68110e195c9) + + Change-Id: I7c587a68dbdeab9a8c8ed324ecae2eb5dd75b9df + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139230 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + +2022-09-05 Eike Rathke [32019fae7730fc8d94f14d47ebaccbdc6775340a] + + Resolves: tdf#135993 Create ScFunctionList and ScFuncDesc with English names + + This is a combination of 4 commits. + + Related: tdf#135993 Destroy temporary OpCodeMap when reading config + + Initialized at FormulaCompiler base class instance it lacks AddIn + mapping and a still existing OpCodeMap prevents necessary + reinitialization from derived ScCompiler instance later. + + xChange-Id: I0c2db41dd45829abfb8460730264f097ab76ab2e + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137881 + Tested-by: Jenkins + Reviewed-by: Eike Rathke + (cherry picked from commit 28c4c72a4e81821d9e567757725937f74a6d114f) + + Related: tdf#135993 Use ScCompiler to create English OpCodeMap with AddIns + + ... instead of formula::FormulaCompiler base class that doesn't + know anything about AddIns, and copy AddIns along to new resulting + native map. + + xChange-Id: I9e4ece2f7450a561ac502ca1dbddaa5a697fa2fe + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137882 + Tested-by: Eike Rathke + Reviewed-by: Eike Rathke + (cherry picked from commit 0a78f11fdd13d914d5f063007b2df9796e6dce9d) + + Resolves: tdf#135993 Create ScFunctionList and ScFuncDesc with English names + + Used in Function Wizard and formula tooltips. Without, no matching + name is found for AddIn English name and no + tooltip/description/arguments are displayed. + + xChange-Id: Ib0cf419c476dae495467c444f1ee1f84a55633a7 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137883 + Tested-by: Jenkins + Reviewed-by: Eike Rathke + (cherry picked from commit d778c6fd5c2ba8e27df46ec9e183a61ad29e30d5) + + Use CharClass::uppercase() for AddIns' English UI names, tdf#135993 follow-up + + ... instead of OUString::toAsciiUpperCase(). English names should + consist of ASCII alphanumeric only, but we don't know what an + AddIn's author comes up with. Lookup in ScCompiler is done with + CharClass as well. + + For this, use the static ScCompiler::GetCharClassEnglish() + instance made public and guard creation with a mutex. + + xChange-Id: Icb79d49d4c7339c8d01b141de2a34715d794dd92 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138004 + Reviewed-by: Eike Rathke + Tested-by: Jenkins + (cherry picked from commit 33c8c9d0dc8e76bc7dacb92175047a89f7d39a3c) + + Change-Id: Ib0cf419c476dae495467c444f1ee1f84a55633a7 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139229 + Tested-by: Jenkins + Reviewed-by: Xisco Fauli + +2022-09-05 Caolán McNamara [0cd1a953d1191de1d5c9eb09e31ca5f672c29837] + + its not ideal to wait until Paint to set the bg color + + set it at construction time + + Change-Id: I8923ea8f79c4bf18054fc697e2b35caad1b12486 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139024 + Tested-by: Jenkins + Reviewed-by: Caolán McNamara + Signed-off-by: Xisco Fauli + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139413 + +2022-09-05 Miklos Vajna [4d0252ad7a7b59b514cd0f514047b9a9538ccf02] + + tdf#150474 RTF import: fix missing char props for in-table newline characters + + I forgot about this in b9508dd55f82d35f09a58021dc001cf79b390e08 + (fdo#50665 rtftok: don't ignore character properties of text fields, + 2012-06-06), which handled the plain body text case, but not the + buffered case. + + Change-Id: I5c5ebb58becc44a6cf1e0bb8984b2b8c212c3c2b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139143 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + (cherry picked from commit 2a403bcbbe0f45cd14a74ae76c4647096463e8ca) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139418 + Reviewed-by: Xisco Fauli + +2022-09-05 Vasily Melenchuk [8a3c37ad5d39fb48e259edb13dc2934d5ae4986c] + + tdf#127806: RTF import: use shape dimensions for pib picture + + If RTF shape contains pib (embedded picture) we should override + any picture sizes by values from shape. Values provided inside + \pict are ignored by MS Word; only shape values matter. + + To achieve this we need to know shape dimensions so it's + calculation is moved to earlier step before internal picture + eval. + + Change-Id: I99c1af7ba62c343b64b3db734b837ff101483ad8 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139043 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + (cherry picked from commit 57d9cc81b058757421cd082e5dbe32a919716807) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139417 + Reviewed-by: Xisco Fauli + +2022-09-05 Sarper Akdemir [bc9f9f4cbb3c867809750a6db51ff945bf03f195] + + tdf#144092 tdf#139511: revert parts of tdf#91762 tdf#137949 tdf#139511 + + Reverts parts that have wrong assumptions wrt layouting a table in svx. + + The problems reverted commits solved previously, were refixed by commits: + - tdf#144092 pptx import: correct table height during import + (a5126a21351c87138ff86a6636326eb6cd6a0f8c) + - tdf#144092 pptx import: fix import of empty cell and shape text properties + (57f9b4b7d1ad164c56af12009ef1dafbc1be8369) + + So hopefully, reverting these now won't cause many regressions. + + Change-Id: Ie96293810b033dc86e41c200f10cf63326511cea + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138653 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + (cherry picked from commit 1a0ceb76e2fe12cdfff7cabf06ef43cfba296a34) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139219 + Reviewed-by: Sarper Akdemir + +2022-09-05 Sarper Akdemir [d29f1ffc03ac0ea2c5eb77ef6272259fe25e05c4] + + tdf#144092 pptx import: correct table height during import + + It appears PowerPoint can export rows of a table with row heights that + is less than the minimum height (for that row). And also export the + total table height wrong with it. + + If PowerPoint imports such a table, those rows are individually + expanded to the minimum height. (Also increasing the table's total + height) + + In Impress import we calculate table height by adding up individual + row heights. Table layouting code depends on the table height being + correct. This is why rows with less than minimum height lead to + layouting problems. + + To compensate for this, while importing tables, layouting is skipped + until the table height is updated with the corrected height. + + The correct height is calculated by layouting the table without + fitting to an area (i.e with bFit = false). + + Change-Id: I79187882470a4e285b45bca1eabb469a084067f5 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138652 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + (cherry picked from commit a5126a21351c87138ff86a6636326eb6cd6a0f8c) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139218 + Reviewed-by: Sarper Akdemir + +2022-09-05 Sarper Akdemir [515deea2c028a417b4193916a975a38e1842d267] + + tdf#144092 pptx import: fix import of empty cell and shape text properties + + For table cells and shapes without any text, text properties weren't + correctly imported. Both the master styles and properties defined in + the endParaRPr were ignored. + + It appears the current implementation does attempt to import those in + TextParagraph::insertAt(...), after the attempt they end up in the + TextRange('s nodes) but they are ignored. + + This commit implements a fix by: If the cell or shape has no text, the + text properties are also pushed into the shape or cell's propset + directly + + Change-Id: Ie425b3e9a73937a2503e47322e25f37ed9a2a6be + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138651 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna + (cherry picked from commit 57f9b4b7d1ad164c56af12009ef1dafbc1be8369) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139177 + Reviewed-by: Sarper Akdemir + +2022-09-05 Miklos Vajna [e1aad6d8fcb17fe893e9270ff42378aed450faa3] + + crashtesting: fix DOCX export of forum-mso-de-102317.docx + + This went wrong in b2bc4ea8ddae6b01f344469d988e21fed3143c42 (DOCX + import: handle SDT around citation field, 2014-07-16), the problem is + that a run/inline SDT is pending, but we wrote a header stream in the + meantime, so the invariant that Start/EndParagraph() in + DocxAttributeOutput is called in pairs doesn't help, which results in + not-well-formed XML, which is an assertion failure in debug build. + + Fix the problem similar to 5f3af56b2c0ef6c628a7cfe5ce6e86f8e1765f5f (sw: + refactoring for docx sdt blocks output, 2021-11-16), which already did + the same for paragraph/block SDTs. + + Change-Id: I5e7273b839bb5c1f841c0fab9b68b4ca239cca18 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139089 + Reviewed-by: Miklos Vajna + Tested-by: Jenkins + (cherry picked from commit 8431cde61432893dd5ba75d8244457306a9f177b) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139420 + Reviewed-by: Xisco Fauli + +2022-09-05 Miklos Vajna [8e70b8e64a1a5bdd231b0c41c93aaac18f5d0e66] + + Related: tdf#149969 PPTX export: add loop from the animation of a media shape + + The PPTX import maps media nodes to XAudio nodes, but the export side in + PPTXAnimationExport::WriteAnimationNodeAudio() only handled audio, not + video. + + This is fine, that code was added for audio narration purposes, but the + same animation handles looping for videos, so this needs extending. + + Fix the problem by exporting conditionally and write video + markup (especially info about repeat count) when the content of the + media shape is video, not audio. + + (cherry picked from commit 38671e21d7dbcd5019912b9468305018de0c922e) + + Change-Id: Iba6bb4901b984c4363023f05232efc06ff069022 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139265 + Tested-by: Jenkins + Reviewed-by: Sarper Akdemir + +2022-09-05 Miklos Vajna [c0565975c47e212e093ca9f2663b94decc8b6636] + + tdf#149969 slideshow: handle loop from the animation of a media shape + + Impress supported video looping on media shapes, while PowerPoint + supports this as part of the animation tree for the slide. To be more + specific, it seems in case there is play command, then it looks up if + there is a media node of the timing tree that has the current shape as + its target, and checks if the looping is enabled for this shape in this + media node. + + The PPTX import already creates an (audio) node for the media shape and + we have UNO API to set/get a RepatCount attribute on this. + + Rather than tweaking the PPTX import to create a different doc model, + just extend the rendering so in case the shape doesn't enable looping we + can also notice that an animation requested looping. + + The PPTX export doesn't write a media node for videos at the moment, so + that still needs work. + + (cherry picked from commit d0176d65de40b1ea53b4fcbc0f607911fa64d8e5) + + Change-Id: Ifc6600be760a954230243fd8151736656958a429 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139264 + Tested-by: Jenkins + Reviewed-by: Sarper Akdemir + +2022-09-02 Stephan Bergmann [06c2ac36aae6c65e5dd06ae711c6145985e6b5ae] + + Filter out unwanted command URIs + + Change-Id: I0b7e5329af8cc053d14d5c60ec14fe7f364ef993 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139225 + Tested-by: Jenkins + Reviewed-by: Stephan Bergmann + (cherry picked from commit 21229c2f45f96a8ee3060acb3296be77be3a9f1a) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139183 + Reviewed-by: Caolán McNamara + +2022-09-02 Caolán McNamara [ff6a1a9e41914c4a9dfd00f986342277f9c669df] + + crash inserting odt as embedded ole object + + Change-Id: I6bf8e2913fc677efe9904507ef8e4edddb9ef3ff + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138982 + Tested-by: Jenkins + Reviewed-by: Eike Rathke + +2022-09-02 Caolán McNamara [5caa07ee4e77dfabb6fb48fd755ed2d18ddb2867] + + cid#1509247 reserve here can't be right + + the assumption is that m_aSvXMLElementExportList[m_nDepth] can be + written to here, so it should at least be resize not reserve + + Change-Id: I2bb6074ca9dd2f71e17f5b9ec955e4d6d65edaa9 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138983 + Tested-by: Jenkins + Reviewed-by: Eike Rathke + +2022-09-02 Julien Nabet [ab436b8cd80e100314832ffc2ef54a91d843859f] + + tdf#150712: Format->Conditional->Condition 100% CPU (2nd try) + + Change-Id: I5f7fe01141ecd057840c01a9080ff7fd2b941049 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139226 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + (cherry picked from commit d8326fc81f7225047178e1b8a7605d32109fa08c) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139184 + +2022-09-01 Luboš Luňák [89b7f3b1e72aa5bc3cf7c6af499e9e6d00cac831] - cid#1509247 reserve here can't be right + fix limiting drawing of softedge effect (tdf#141981) - the assumption is that m_aSvXMLElementExportList[m_nDepth] can be - written to here, so it should at least be resize not reserve + Apparently an empty viewport actually means everything should be drawn. - Change-Id: I2bb6074ca9dd2f71e17f5b9ec955e4d6d65edaa9 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138983 + Change-Id: I55ae453a8f264d48222ade48a2953ab7d97c7f79 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139126 Tested-by: Jenkins - Reviewed-by: Eike Rathke - (cherry picked from commit 5caa07ee4e77dfabb6fb48fd755ed2d18ddb2867) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139415 - Reviewed-by: Xisco Fauli - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier + Reviewed-by: Caolán McNamara -2022-09-09 Luboš Luňák [276037edb6f98ec1fa64e8740958668a1b30cef2] +2022-09-01 Luboš Luňák [e20d52afe5a33ae9490e238e7b5833d3df68f004] fix undoing range reducing to apply only to COUNTIFS (tdf#150618) @@ -183,44 +2689,48 @@ (cherry picked from commit 5367616819e232e7ef2405c614bbfa3ca0d2aecf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138974 Reviewed-by: Caolán McNamara - (cherry picked from commit e20d52afe5a33ae9490e238e7b5833d3df68f004) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139416 - Reviewed-by: Xisco Fauli - Reviewed-by: Eike Rathke - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier -2022-09-09 Xisco Fauli [99704bf14dae2e5ed7fd1bcf382921b46867c380] +2022-09-01 Maxim Monastirsky [3e39f667590355843336edda9b2f8f7676bbc870] - tdf#150832: Revert "tdf#150034 very slow opening pathological chart" - - This reverts commit 613f6e75fbfcc024fc9c3732261cbf2cda6f4ad8. + tdf#150506 Execution parameter confused with slot state - Reason for revert: it seems all charts in XLS files are affected. - At least I could reproduce it with all the XLS files I tested it with. + Regression of a6eddceda5d376cd73922123a3bb3a5683307c41 + ("rename some SID to FN_PARAM"). - Change-Id: I68d13d6f609521ce6af759cf25249656176b66cd - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139563 - Reviewed-by: Noel Grandin - Reviewed-by: Xisco Fauli - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier + Change-Id: I5bcafdcec16cc91b1b77f7a3affd630a2f6cc556 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139121 + Tested-by: Jenkins + Reviewed-by: Maxim Monastirsky + (cherry picked from commit a72861e3be5b89544ae943c0c5cc6d43e8e70a7d) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138992 + Reviewed-by: Caolán McNamara -2022-09-09 Caolán McNamara [524a56fb1aa682a0907a925865340730da523636] +2022-08-31 Caolán McNamara [3d9da8ce1e18feefc7ed2549bfe56b0dfb625da3] - crash inserting odt as embedded ole object + check IFrame "FrameURL" target - Change-Id: I6bf8e2913fc677efe9904507ef8e4edddb9ef3ff - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138982 + similiar to + + commit b3edf85e0fe6ca03dc26e1bf531be82193bc9627 + Date: Wed Aug 7 17:37:11 2019 +0100 + + warn on load when a document binds an event to a macro + + Change-Id: Iea888b1c083d2dc69ec322309ac9ae8c5e5eb315 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139059 Tested-by: Jenkins - Reviewed-by: Eike Rathke - (cherry picked from commit ff6a1a9e41914c4a9dfd00f986342277f9c669df) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139414 - Reviewed-by: Xisco Fauli - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier + Reviewed-by: Stephan Bergmann + (cherry picked from commit c7450d0b9d02c64ae3da467d329040787039767e) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138987 + +2022-08-31 Christian Lohmaier [5923f98cfa1c5251c3676b91b5b34770745e7f5b] + + update credits + + Change-Id: Ie408cedd6e71deb241e3e059c364c75ce0f1d308 + (cherry picked from commit 2ab1136594baf0393d84d2c04d21561847498ac9) -2022-09-09 Stephan Bergmann [83b83530ee701bcc23e11282e255a9e8009dc8b7] +2022-08-31 Stephan Bergmann [a2c6a8613c52d9061e97afff3bb069c684986ecd] These commands are always URLs already @@ -232,98 +2742,212 @@ (cherry picked from commit eddd37280aa69da82cde91c9b9cc8139c6ec8cdc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138981 Reviewed-by: Caolán McNamara - (cherry picked from commit a2c6a8613c52d9061e97afff3bb069c684986ecd) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138985 - Reviewed-by: Xisco Fauli - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier -2022-09-09 Stephan Bergmann [f303511f61f495b900680ac49a190fcaf92f794f] +2022-08-31 Miklos Vajna [245124406bad17e3ca6526d472f97971e2095832] - Filter out unwanted command URIs + avmedia: implement video crop support in the ODP filter - Change-Id: I0b7e5329af8cc053d14d5c60ec14fe7f364ef993 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139225 + And also import/export the video preview as well. The naming follows the + style used for table shape previews. + + The preview is important, since the cropping is relative to the bitmap's + preferred logic size. + + (cherry picked from commit cbc6e67d3c88fb6ae39c304604a98eaa504f19cc) + + Conflicts: + xmloff/source/draw/shapeexport.cxx + + Change-Id: I6115284c1f4cf342b3296cd0ac3beb70a809fd1b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138972 Tested-by: Jenkins - Reviewed-by: Stephan Bergmann - (cherry picked from commit 21229c2f45f96a8ee3060acb3296be77be3a9f1a) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139183 - Reviewed-by: Caolán McNamara - (cherry picked from commit 06c2ac36aae6c65e5dd06ae711c6145985e6b5ae) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139188 - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier + Reviewed-by: Sarper Akdemir -2022-09-09 Taichi Haradaguchi <20001722@ymail.ne.jp> [61800cd513f81f3b7c0600cb309057c668450aa8] +2022-08-31 Miklos Vajna [99ee5b4a9e6516ca47789150eb92b780e917cddd] - upgrade openssl-1.1.1q + tdf#149971 avmedia: implement video crop support in the gsteamer backend - Change-Id: I2317e734f074cf7301a6081cf3d2221beeaf5ad1 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139497 + If a media shape had cropping defined, we already took that into account + when presenting a preview for it, but not during video playback. + + The reason for this is that the preview may be set by a file importer + (e.g. PPTX) explicitly, in which case the preview is a bitmap we get + without any video processing. + + As a start, implement video crop for the gstreamer backend (used on + Linux), and also pass in the media item (containing crop and other + properties) both during the edit view (MediaWindowImpl) and presenting + (ViewMediaShape). We pass in the whole media item, so in case later + other filters (e.g. black-and-white) are wanted, we have all that info + in the backends already. + + Other backends (avmediaMacAVF and avmediawin) are untouched so far. + svx/qa/unit/data/video-snapshot.pptx is modified to have a yellow border + when cropping is unimplemented, which is now not visible with the + gtreamer backend, matching PowerPoint behavior. PPTX export was working + out of the box already. + + (cherry picked from commit 916848d877a788d02e2e7c980872314839101798) + + Conflicts: + avmedia/source/viewer/mediawindow_impl.cxx + + Change-Id: If26b7a4391bcffe9cbddd9933e1bab69be52924e + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138964 Tested-by: Jenkins - Reviewed-by: Caolán McNamara - (cherry picked from commit 27704f6d425ccc6414ea8a28e19c06b5eaf278c6) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139500 - Reviewed-by: Xisco Fauli - Reviewed-by: Eike Rathke - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier + Reviewed-by: Sarper Akdemir -2022-09-09 Taichi Haradaguchi <20001722@ymail.ne.jp> [478c8ddbd847ccac0528de09842b07b011d78c50] +2022-08-31 Miklos Vajna [c7577330e806858f99b8c78f63e734fdb2c06b6e] - python3: upgrade to release 3.8.13 + Related: tdf#149971 avmedia: add doc model and render for crop of media objects - Remove some code in external/python3/darwin.patch.0 as it was fixed upstream(https://bugs.python.org/issue45405). + It is possible to provide an explicit preview of media objects since + commit 8fa1d453c94cdbb03dac646fb8db2ebd1a0e84bd (Related: tdf#149971 + svx: support explicitly provided snapshots for media shapes, + 2022-08-24), however they can't be cropped. - Change-Id: Ie6bfb2456f96a63adbf0dbcb9c902dc56f1151ee - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139501 + This means that media shapes from PPTX with cropping show unexpected + content and can also have a buggy aspect ratio. + + Extend avmedia::MediaItem to store cropping and take it into account + when returning the preview bitmap in SdrMediaObj::getSnapshot(). PPTX + import works out of the box, as oox/ already tried to set a cropping + property on the media shape. + + This is just the preview, the cropping of the video itself is not yet + implemented. + + (cherry picked from commit b6f0fd6a2f459ead2268e07bfd86db7e303b323f) + + Conflicts: + svx/source/unodraw/unoprov.cxx + + Change-Id: I8db3e0dcf252613d56eb0e6139adf097e53b15cc + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138963 Tested-by: Jenkins - Reviewed-by: Caolán McNamara - (cherry picked from commit 26d2a8d9a70255f2211f4256f27286653fbfba44) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139567 - Reviewed-by: Xisco Fauli - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier + Reviewed-by: Sarper Akdemir -2022-09-09 Caolán McNamara [bd95fc3733d87918e107193677ea52412be549a7] +2022-08-31 Vasily Melenchuk [184a9eec62058dcbe185d74cfd40a3772d3b801d] - check impress/calc IFrame "FrameURL" target + tdf#114769: sw html export: better handling for relative URLs - similar to + Usage of INetURLObject makes sense only in case of full URLs, + but once relative one is provided it will contain invalid data. - commit c7450d0b9d02c64ae3da467d329040787039767e - Date: Tue Aug 30 17:01:08 2022 +0100 + Change-Id: Icc5e191e2337a3dd9a76c660b1c7709551099a1a + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138875 + Tested-by: Jenkins + Reviewed-by: Thorsten Behrens + (cherry picked from commit 599da3fa69805ebf8dee4517855fd8706e19d11d) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138979 + +2022-08-30 Caolán McNamara [5b7ceed80f2943cd85bb70d19bc482fd2e712386] + + Resolves: tdf#150629 the window was destroyed from the fadetimer callback - check IFrame "FrameURL" target + which is how it could be possible that SwPageBreakWin::dispose() could + be both called, stopping the timer, but the timer callback could access + the disposed SwPageBreakWin - Change-Id: Ibf28c29acb4476830431d02772f3ecd4b23a6a27 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139496 - Reviewed-by: Stephan Bergmann - Reviewed-by: Xisco Fauli - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier + Change-Id: If29ffb45fbde607d35c12064b05e4b5d25c2f009 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138975 + Tested-by: Jenkins + Reviewed-by: Miklos Vajna -2022-09-09 Caolán McNamara [8d37652d49687b8ec92f90d638890e34aeaa12f7] +2022-08-29 Miklos Vajna [4daac4a6b18be593550e87f97e304d5475d7e6d7] - check IFrame "FrameURL" target + Related: tdf#149971 svx: support explicitly provided snapshots for media shapes - similiar to + Snapshots / previews for media objects are used when the shape's video + is not playing. This is generated by seeking to the 3rd second in the + video, probably to avoid initial black frames. - commit b3edf85e0fe6ca03dc26e1bf531be82193bc9627 - Date: Wed Aug 7 17:37:11 2019 +0100 + The trouble is that PowerPoint takes the initial frame (at least in case + of the bugdoc), so our snapshot doesn't match the reference. - warn on load when a document binds an event to a macro + We already import a bitmap snapshot from PPTX files since commit + e2d46da076f43a7c0d56fc486b9f15339243f7c9 (avmedia: add doc model for + bitmap fill of slide narrations, 2021-01-21), fix the problem by + changing the snapshot generation to prefer this bitmap over generating + one from the video. - Change-Id: Iea888b1c083d2dc69ec322309ac9ae8c5e5eb315 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139059 + The crop properties of this bitmap / the video are still not yet handled + from PPTX. + + (cherry picked from commit 8fa1d453c94cdbb03dac646fb8db2ebd1a0e84bd) + + Change-Id: Id985eaaaad5e4222d9a98203d054e08a0f97a0f7 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138962 Tested-by: Jenkins - Reviewed-by: Stephan Bergmann - (cherry picked from commit c7450d0b9d02c64ae3da467d329040787039767e) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138988 - Tested-by: Christian Lohmaier - Reviewed-by: Christian Lohmaier + Reviewed-by: Caolán McNamara + +2022-08-28 Aron Budea [ea179bb6f914cb426d1282f2556a72cb3732ebc8] + + Update git submodules + + * Update dictionaries from branch 'libreoffice-7-4' + to 7b1ade6e7803cc6c96a08889ed97a0695f82b09c + - tdf#149980 updated Ukrainian dictionaries to 5.8.0 + + Change-Id: I7f71818a3055dd46f5d2cb572f940455fe21b586 + Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138914 + Tested-by: Aron Budea + Reviewed-by: Aron Budea + (cherry picked from commit 0e829e3b7a46a4206927a0f3d3c1c7c51836469e) + Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138900 + Reviewed-by: Adolfo Jayme Barrientos + Tested-by: Adolfo Jayme Barrientos + +2022-08-27 Aron Budea [5135c153abd0a7a108978d66996fce8c8ba8220e] + + Update git submodules + + * Update dictionaries from branch 'libreoffice-7-4' + to 6ce073a2403b0c381e06d5de89d6e909facffe10 + - tdf#142152 replace keywords in Spanish dictionary description + + Change-Id: I806c1d8acdacd450454dde13fc507d15edd19e58 + Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138915 + Tested-by: Aron Budea + Reviewed-by: Aron Budea + (cherry picked from commit 53a0fe4fc6751fdfd0ad17222aa3c13eb8f2c8d0) + Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138899 + Tested-by: Adolfo Jayme Barrientos + Reviewed-by: Adolfo Jayme Barrientos + +2022-08-27 Noel Grandin [2824cb9511265876694db8255aa56942a9911e7e] + + regression in SvxShape::Notify + + from + commit 526f0fce45fb014b09057403ae37c125e5a18655 + Author: Noel Grandin + Date: Fri Apr 9 12:05:16 2021 +0200 + tdf#130326 speed up opening XLSX + + which resulted in things staying alive too long, affecting an upcoming + patch of mine + + Change-Id: I52a0b35c9be55a554885a39d9e0710379304766b + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138811 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + (cherry picked from commit 4dd4b8c6535340eec1e94bca9d9635243cdf51d8) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138819 + +2022-08-27 Andreas Heinisch [5f03dc914d67725b4d8e949d4e2198c4e9b537ec] + + tdf#150594 - Prevent crash while searching for the next outline node + + Change-Id: Ia83968b26f0053815c0da9910aa00f9dde577246 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138850 + Tested-by: Jenkins + Reviewed-by: Andreas Heinisch + (cherry picked from commit 33c6dcfaab35a70f8794a67d31fbec636cb485d5) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138898 + Reviewed-by: Ilmari Lauhakangas -2022-09-08 Caolán McNamara [25da21a0472428ae276de369e2979b11754cc6ab] +2022-08-26 Caolán McNamara [3895d4c574ac1b6bf02c493494a034bdc5d0a42e] crashtesting: empty brace init of o3tl::enumarray doesn't zero each element @@ -342,13 +2966,36 @@ Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138827 Tested-by: Jenkins Reviewed-by: Xisco Fauli - (cherry picked from commit 695cbbc03a14c5dc5b666d5d0a6128cc72a6f609) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138895 - Reviewed-by: Caolán McNamara - Reviewed-by: Eike Rathke - Tested-by: Xisco Fauli -2022-09-08 Mike Kaganski [8417736e27b71a3d291f7e316c08c1c18852ff03] +2022-08-26 Julien Nabet [41d1e848677891d1451b2120763c7c069006b4a5] + + tdf#150575: REPORTBUILDER: Crash when closing report when used report navigator + + 0 0x00007fe062bdda64 in comphelper::OSelectionChangeMultiplexer::disposing(com::sun::star::lang::EventObject const&) (this=0x55fe72b7b680, _rSource=...) at comphelper/source/misc/SelectionMultiplex.cxx:82 + 1 0x00007fdf90a97a6b in comphelper::OInterfaceContainerHelper3::disposeAndClear(com::sun::star::lang::EventObject const&) (this=0x55fe6c94b6d0, rEvt=...) + at include/comphelper/interfacecontainer3.hxx:362 + 2 0x00007fdf90a6ace4 in rptui::OReportController::disposing() (this=0x55fe6c94b200) at reportdesign/source/ui/report/ReportController.cxx:341 + 3 0x00007fe062539b5d in cppu::WeakComponentImplHelperBase::dispose() (this=0x55fe6c94b200) at cppuhelper/source/implbase.cxx:104 + 4 0x00007fe0393b76e5 in cppu::PartialWeakComponentImplHelper::dispose() (this=0x55fe6c94b200) at include/cppuhelper/compbase.hxx:90 + 5 0x00007fe0393af9d3 in dbaui::OGenericUnoController::dispose() (this=0x55fe6c94b200) at dbaccess/source/ui/browser/genericcontroller.cxx:1207 + + See full bt here: + https://bugs.documentfoundation.org/attachment.cgi?id=181994 + + "addSelectionChangeListener" is called when "OSelectionChangeMultiplexer" is instantiated in "NavigatorTree" ctr + 225 m_pSelectionListener = new OSelectionChangeMultiplexer(this,&m_rController); + + but "removeSelectionChangeListener" was never called so add the mechanism to call it. + + Change-Id: I157b147f7a17244dbbfa7d12743fc7d48e7d5f7d + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138773 + Reviewed-by: Julien Nabet + (cherry picked from commit fb8c86d95a7d1c68b6dc0f5bb2e00db2f40f58ab) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138551 + Tested-by: Jenkins + Reviewed-by: Noel Grandin + +2022-08-26 Mike Kaganski [9fc6b68a075201b52ba1b70f60e04e6200dcf35b] tdf#150577: Revert "Micro-optim in FormController::approveRowChange" @@ -367,57 +3014,43 @@ (cherry picked from commit 59f30175bfc557aa7c752ab0b45af9d34215d4dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138821 Reviewed-by: Caolán McNamara - (cherry picked from commit 9fc6b68a075201b52ba1b70f60e04e6200dcf35b) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138833 - Reviewed-by: Xisco Fauli - Reviewed-by: Eike Rathke - Tested-by: Xisco Fauli -2022-09-07 Olivier Hallot [09e3c0c1bf8a05d8f47aa9577d67d971b66f8384] +2022-08-26 Caolán McNamara [ed95bc0d2f0d8ee8f04ac84bcb4e41d780878501] - Update git submodules + tdf#150507 reenable slight hinting for cairo with ResolutionIndependentLayout - * Update helpcontent2 from branch 'libreoffice-7-4-1' - to 5a5ac0ed2441a8da70770aad65051f48fcd78ce2 - - tdf#150689 Fix Calc contents tree - - Change-Id: If23ba66db8806ff88e67dc0485c5cf6376ccd0e7 - Reviewed-on: https://gerrit.libreoffice.org/c/help/+/139227 - Tested-by: Jenkins - Reviewed-by: Olivier Hallot - (cherry picked from commit f3d6949e4747508d6355fa280017df45d6250488) - Reviewed-on: https://gerrit.libreoffice.org/c/help/+/139180 - Reviewed-by: Rafael Lima - (cherry picked from commit 854f32428a475b3f436629509c7fe86a1d86480e) - Reviewed-on: https://gerrit.libreoffice.org/c/help/+/139504 - Reviewed-by: Xisco Fauli - Tested-by: Adolfo Jayme Barrientos - Reviewed-by: Adolfo Jayme Barrientos - -2022-09-05 Caolán McNamara [3d98211d5eeb2476770f2b17b0ebedf72bd52ffb] - - Resolves: tdf#150629 the window was destroyed from the fadetimer callback + it was disabled because of: + tdf#150145 text appears to have a row of pixels cropped out + which seems to be the same issue as + https://gitlab.freedesktop.org/cairo/cairo/-/issues/390 - which is how it could be possible that SwPageBreakWin::dispose() could - be both called, stopping the timer, but the timer callback could access - the disposed SwPageBreakWin + reenable, drop CAIRO_HINT_METRICS_OFF and emulate a proposed solution of + https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/235 by + hacking in a route to disable CAIRO_ROUND_GLYPH_POS_ON - Change-Id: If29ffb45fbde607d35c12064b05e4b5d25c2f009 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138978 + Change-Id: I3c9f982c9737b84fe0ee6b645f507e1226807d60 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138817 + Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos - Reviewed-by: Xisco Fauli - Tested-by: Caolán McNamara - Reviewed-by: Caolán McNamara -2022-08-31 Christian Lohmaier [0fd7c3d15cbd9829c1f94b0a81029de04d04e6dc] +2022-08-25 Luboš Luňák [d8eba60009afce4d9cca1488b4ce70e221642865] - update credits + try harder to ensure InterpretCellsIfNeeded() interprets (tdf#150499) - Change-Id: Ie408cedd6e71deb241e3e059c364c75ce0f1d308 - (cherry picked from commit 2ab1136594baf0393d84d2c04d21561847498ac9) - (cherry picked from commit 5923f98cfa1c5251c3676b91b5b34770745e7f5b) + ScFormulaCell::Interpret() tries to interpret the whole formula group + (or the given range of it), but it's not guaranteed, and possibly + just the called cell will be interpreted. So if a specific range + really needs to be interpreted, handle that case. + + Change-Id: I7fb563ae471eefd49e5bb6c92b6aff98c42a440e + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138741 + Tested-by: Jenkins + Reviewed-by: Luboš Luňák + (cherry picked from commit e1f02b8d00272be9cbf17cb8c351445a08a4c5f4) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138814 + Reviewed-by: Xisco Fauli -2022-08-29 Eike Rathke [5ceb0695169e6087ae546687fb22800eaf0da67d] +2022-08-25 Eike Rathke [5b6b1f230529070259d81193a78d38b00fb8aec3] Resolves: tdf#150599 Move obtaining data into loop again @@ -435,44 +3068,95 @@ Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138805 Reviewed-by: Eike Rathke Tested-by: Jenkins - (cherry picked from commit 9c3c564659320fb24d2a9c230464f06cf855a136) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138816 - Reviewed-by: Mike Kaganski + (cherry picked from commit b5629341edecf10c18087811c77708b01dd15a15) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138815 Reviewed-by: Xisco Fauli - Tested-by: Adolfo Jayme Barrientos - Reviewed-by: Adolfo Jayme Barrientos -2022-08-27 Andreas Heinisch [716f3e73fcedc4c4c107527a49aaec604a7e2c63] +2022-08-25 László Németh [6b86e529fb6681bbd8207ee7f3d9e57cb2e55502] - tdf#150594 - Prevent crash while searching for the next outline node + tdf#150576 sw: fix cursor pos deleting at rows deleted already - Change-Id: Ia83968b26f0053815c0da9910aa00f9dde577246 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138850 + Instead of jumping in the start of the document, set cursor + after (or deleting the last row, before) the rows deleted + already in Hide Changes mode with enabled change tracking. + + Regression from commit a74c51025fa4519caaf461492e4ed8e68bd34885 + "tdf#146962 sw: hide deleted row at deletion in Hide Changes". + + Follow-up to commit 189aa05c6ea17a8e823b4eab18ea0d1131d9d73e + "tdf#148849 sw: fix cursor pos at tracked DeleteRow in Hide Changes". + + Conflicts: + sw/qa/extras/uiwriter/uiwriter3.cxx + + Change-Id: Ifc2a7f41a57f413d27d9b464a0e464643d15f404 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138772 Tested-by: Jenkins - Reviewed-by: Andreas Heinisch - (cherry picked from commit 33c6dcfaab35a70f8794a67d31fbec636cb485d5) - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138897 - Reviewed-by: Julien Nabet - Tested-by: Ilmari Lauhakangas - Reviewed-by: Ilmari Lauhakangas + Reviewed-by: László Németh + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138786 + Tested-by: László Németh -2022-08-24 Christian Lohmaier [4b760d15067d96591dd351d1a8b3dd59251e1aa8] +2022-08-25 László Németh [16c705ec0d1ab4b4428577ccb0ea3fc14ee0fc88] - bump product version to 7.4.1.1.0+ + tdf#148849 sw: fix cursor pos at tracked DeleteRow in Hide Changes + + In Hide Changes mode, the text cursor jumped to the start of the + document after tracked deletion of a table row, instead of + remaining in the table in the next table row. + + Regression from commit a74c51025fa4519caaf461492e4ed8e68bd34885 + "tdf#146962 sw: hide deleted row at deletion in Hide Changes". + + Conflicts: + sw/source/core/frmedt/fetab.cxx + sw/qa/extras/uiwriter/uiwriter3.cxx - Change-Id: I405c97c02a3b1c77756dbbfec6743a327f5a0f7d + Change-Id: Iff959c9a9940db013827e1c827bcb92c07b4b26a + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138683 + Tested-by: Jenkins + Reviewed-by: László Németh + (cherry picked from commit 189aa05c6ea17a8e823b4eab18ea0d1131d9d73e) + + Change-Id: I17e11862cf144f150e64082e7c8b22c3877fbc2e + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138785 + Tested-by: Jenkins + Tested-by: László Németh + Reviewed-by: László Németh -2022-08-24 Christian Lohmaier [b5a5ab2a5f8cc928ca7f597836e3845fa804abab] +2022-08-25 Rene Engelhard [aa0b2b756c17d43d2e8c828a909ee2815e332377] - Branch libreoffice-7-4-1 + Make configure work with gpgme >= 1.18 - This is 'libreoffice-7-4-1' - the stable branch for the 7.4.1 release. - Only very safe changes, reviewed by three people are allowed. + Sam James wrote: + > gpgme-1.18.0 dropped a bunch of internal symbols, + > including progress_callback (see e.g. callbacks.h + > which has a comment at the top saying it's internal). - If you want to commit more complicated fix for the next 7.4.x release, - please use the 'libreoffice-7-4' branch. + Plausibly the workaround to not link against older KDE-specific distro + packages is not needed anymore. - If you want to build something cool, unstable, and risky, use master. + Check for main as a workaround as we do for other C++ libraries, too. + + Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4 + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667 + Tested-by: Jenkins + Reviewed-by: Sam James + Reviewed-by: René Engelhard + (cherry picked from commit b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b) + Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138553 + Tested-by: René Engelhard + +2022-08-24 Christian Lohmaier [8845009d81c50bd34947a84b6508a2f9065a299b] + + correctly bump product version to 7.4.2.0.0+ + + Change-Id: Ib09ad097b321963de4f68a73fc962f3df89dce4d + +2022-08-24 Christian Lohmaier [ef616ff471d867ec9e411f81d57c762998a1ff4c] + + bump product version to 7.4.1.1.0+ + + Change-Id: Ifec4e22a9b03bf588199f2d3c4a1672ceb9677cf 2022-08-24 Rafael Lima [271711523e5f0d1191012009de311cc15b2096c2] diff -Nru libreoffice-7.4.1~rc2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx libreoffice-7.4.2~rc3/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx --- libreoffice-7.4.1~rc2/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1114,8 +1114,7 @@ private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - mutable Any m_aOuterValue; - mutable bool m_bDetectedRangeSegmentation { false }; + mutable Any m_aOuterValue; }; } @@ -1169,19 +1168,15 @@ bool bHasCategories = true; uno::Sequence< sal_Int32 > aSequenceMapping; - if (!m_bDetectedRangeSegmentation) + if( DataSourceHelper::detectRangeSegmentation( + m_spChart2ModelContact->getDocumentModel(), aRangeString, aSequenceMapping, bUseColumns + , bFirstCellAsLabel, bHasCategories ) ) { - if( DataSourceHelper::detectRangeSegmentation( - m_spChart2ModelContact->getDocumentModel(), aRangeString, aSequenceMapping, bUseColumns - , bFirstCellAsLabel, bHasCategories ) ) - { - css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS; - if(bUseColumns) - eChartDataRowSource = css::chart::ChartDataRowSource_COLUMNS; + css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS; + if(bUseColumns) + eChartDataRowSource = css::chart::ChartDataRowSource_COLUMNS; - m_aOuterValue <<= eChartDataRowSource; - } - m_bDetectedRangeSegmentation = true; + m_aOuterValue <<= eChartDataRowSource; } return m_aOuterValue; diff -Nru libreoffice-7.4.1~rc2/comphelper/source/misc/SelectionMultiplex.cxx libreoffice-7.4.2~rc3/comphelper/source/misc/SelectionMultiplex.cxx --- libreoffice-7.4.1~rc2/comphelper/source/misc/SelectionMultiplex.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/comphelper/source/misc/SelectionMultiplex.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -95,7 +95,16 @@ m_pListener->_selectionChanged(_rEvent); } +void OSelectionChangeMultiplexer::dispose() +{ + osl_atomic_increment(&m_refCount); + { + Reference< XSelectionChangeListener> xPreventDelete(this); + m_xSet->removeSelectionChangeListener(xPreventDelete); + } + osl_atomic_decrement(&m_refCount); } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-7.4.1~rc2/compilerplugins/clang/unusedenumconstants.untouched.results libreoffice-7.4.2~rc3/compilerplugins/clang/unusedenumconstants.untouched.results --- libreoffice-7.4.1~rc2/compilerplugins/clang/unusedenumconstants.untouched.results 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/compilerplugins/clang/unusedenumconstants.untouched.results 2022-10-10 10:15:14.000000000 +0000 @@ -139,9 +139,9 @@ include/vcl/toolkit/treelistbox.hxx:154 enum DragDropMode ALL include/vcl/vclenum.hxx:310 - enum vcl::WindowState Rollup + enum WindowStateState Rollup include/vcl/vclenum.hxx:313 - enum vcl::WindowState FullScreen + enum WindowStateState FullScreen include/vcl/vclenum.hxx:408 enum TrackingEventFlags Focus libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:70 diff -Nru libreoffice-7.4.1~rc2/compilerplugins/clang/unusedenumconstants.writeonly.results libreoffice-7.4.2~rc3/compilerplugins/clang/unusedenumconstants.writeonly.results --- libreoffice-7.4.1~rc2/compilerplugins/clang/unusedenumconstants.writeonly.results 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/compilerplugins/clang/unusedenumconstants.writeonly.results 2022-10-10 10:15:14.000000000 +0000 @@ -3047,7 +3047,7 @@ include/vcl/vclenum.hxx:143 enum TimeFormat Hour24 include/vcl/vclenum.hxx:314 - enum vcl::WindowState SystemMask + enum WindowStateState SystemMask include/vcl/vclenum.hxx:331 enum vcl::ImageType Small include/vcl/vclenum.hxx:353 diff -Nru libreoffice-7.4.1~rc2/configure libreoffice-7.4.2~rc3/configure --- libreoffice-7.4.1~rc2/configure 2022-09-09 18:50:10.000000000 +0000 +++ libreoffice-7.4.2~rc3/configure 2022-10-10 11:10:51.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.70 for LibreOffice 7.4.1.2. +# Generated by GNU Autoconf 2.69 for LibreOffice 7.4.2.3. # # -# Copyright (C) 1992-1996, 1998-2017, 2020 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -14,16 +14,14 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +31,46 @@ fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,6 +79,13 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -89,12 +94,8 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -106,10 +107,30 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -131,22 +152,20 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop +else case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -166,53 +185,42 @@ as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ) -then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -else \$as_nop +else exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 -blah=\$(echo \$(echo blah)) -test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null -then : + if (eval "$as_required") 2>/dev/null; then : as_have_required=yes -else $as_nop +else as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null -then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -else $as_nop +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir$as_base + as_shell=$as_dir/$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : CONFIG_SHELL=$as_shell as_have_required=yes - if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null -then : + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : break 2 fi fi @@ -220,21 +228,14 @@ esac as_found=false done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : CONFIG_SHELL=$SHELL as_have_required=yes -fi -fi +fi; } +IFS=$as_save_IFS - if test "x$CONFIG_SHELL" != x -then : + if test "x$CONFIG_SHELL" != x; then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -252,19 +253,18 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno -then : - printf "%s\n" "$0: This script requires a shell more modern than all" - printf "%s\n" "$0: the shells that I found on your system." - if test ${ZSH_VERSION+y} ; then - printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" - printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -291,7 +291,6 @@ } as_unset=as_fn_unset - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -309,14 +308,6 @@ as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -331,7 +322,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -340,7 +331,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -379,13 +370,12 @@ # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -397,27 +387,18 @@ # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -429,9 +410,9 @@ as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -458,7 +439,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -502,7 +483,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -516,10 +497,6 @@ exit } - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -533,13 +510,6 @@ ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -607,43 +577,47 @@ # Identity of this package. PACKAGE_NAME='LibreOffice' PACKAGE_TARNAME='libreoffice' -PACKAGE_VERSION='7.4.1.2' -PACKAGE_STRING='LibreOffice 7.4.1.2' +PACKAGE_VERSION='7.4.2.3' +PACKAGE_STRING='LibreOffice 7.4.2.3' PACKAGE_BUGREPORT='' PACKAGE_URL='http://documentfoundation.org/' # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_STDIO_H -# include +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include #endif -#ifdef HAVE_STDLIB_H +#ifdef STDC_HEADERS # include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif #endif #ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif #ifdef HAVE_UNISTD_H # include #endif" -ac_header_c_list= ac_subst_vars='LTLIBOBJS LIBOBJS LO_ELFCHECK_ALLOWLIST @@ -1273,7 +1247,6 @@ ENABLE_JUMBO_SHEETS SIZEOF_SIZE_T LFS_CFLAGS -CPP BOOST_CXXFLAGS CXXCPP ac_ct_CXX @@ -1442,6 +1415,7 @@ BACKTRACE_CFLAGS UNIX_DLAPI_LIBS ENDIANNESS +CPP OBJEXT EXEEXT ac_ct_CC @@ -1834,6 +1808,7 @@ LDFLAGS LIBS CPPFLAGS +CPP BACKTRACE_CFLAGS BACKTRACE_LIBS PKG_CONFIG @@ -1845,7 +1820,6 @@ CXXFLAGS CCC CXXCPP -CPP LIBCMIS_CFLAGS LIBCMIS_LIBS CLUCENE_CFLAGS @@ -2026,7 +2000,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='/run' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -2056,6 +2030,8 @@ *) ac_optarg=yes ;; esac + # Accept the important Cygnus configure options, so we can diagnose typos. + case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -2096,9 +2072,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -2122,9 +2098,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -2335,9 +2311,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -2351,9 +2327,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -2397,9 +2373,9 @@ *) # FIXME: should be removed in autoconf 3.0. - printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -2415,7 +2391,7 @@ case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -2479,7 +2455,7 @@ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_myself" | +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -2536,7 +2512,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LibreOffice 7.4.1.2 to adapt to many kinds of systems. +\`configure' configures LibreOffice 7.4.2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2576,7 +2552,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [/run] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2606,7 +2582,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibreOffice 7.4.1.2:";; + short | recursive ) echo "Configuration of LibreOffice 7.4.2.3:";; esac cat <<\_ACEOF @@ -3014,7 +2990,7 @@ Define the product name. Default is LibreOffice. --with-package-version='3.1.4.5' Define the package version. Default is - 7.4.1.2. Use only if you distribute an + 7.4.2.3. Use only if you distribute an own build for macOS. --with-gcc-home Specify the location of gcc/g++ manually. This can be used in conjunction with --enable-icecream when @@ -3498,6 +3474,7 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + CPP C preprocessor BACKTRACE_CFLAGS Compiler flags needed to use backtrace(3) BACKTRACE_LIBS @@ -3514,7 +3491,6 @@ CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor - CPP C preprocessor LIBCMIS_CFLAGS C compiler flags for LIBCMIS, overriding pkg-config LIBCMIS_LIBS @@ -3767,9 +3743,9 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -3797,8 +3773,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for configure.gnu first; this name is used for a wrapper for - # Metaconfig's "Configure" on case-insensitive file systems. + # Check for guested configure. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -3806,7 +3781,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -3815,10 +3790,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibreOffice configure 7.4.1.2 -generated by GNU Autoconf 2.70 +LibreOffice configure 7.4.2.3 +generated by GNU Autoconf 2.69 -Copyright (C) 2020 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -3835,14 +3810,14 @@ ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3850,15 +3825,14 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3870,8 +3844,8 @@ # ac_fn_c_try_run LINENO # ---------------------- -# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that -# executables *can* be run. +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. ac_fn_c_try_run () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack @@ -3881,26 +3855,25 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: program exited with status $ac_status" >&5 - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status @@ -3911,6 +3884,43 @@ } # ac_fn_c_try_run +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -3918,28 +3928,26 @@ ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -3950,14 +3958,14 @@ ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + rm -f conftest.$ac_objext conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3965,18 +3973,17 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3991,18 +3998,104 @@ } # ac_fn_c_try_link +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -4010,9 +4103,16 @@ #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif -#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -4030,25 +4130,24 @@ #endif int -main (void) +main () { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -4059,14 +4158,14 @@ ac_fn_cxx_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4074,15 +4173,14 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -4104,7 +4202,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4112,15 +4210,14 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -4130,44 +4227,6 @@ } # ac_fn_cxx_try_cpp -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - } -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -4182,7 +4241,7 @@ /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) >= 0)]; test_array [0] = 0; @@ -4192,15 +4251,14 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_lo=0 ac_mid=0 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -4210,10 +4268,9 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_hi=$ac_mid; break -else $as_nop +else as_fn_arith $ac_mid + 1 && ac_lo=$as_val if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= @@ -4221,14 +4278,14 @@ fi as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) < 0)]; test_array [0] = 0; @@ -4238,15 +4295,14 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_hi=-1 ac_mid=-1 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; test_array [0] = 0; @@ -4256,10 +4312,9 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_lo=$ac_mid; break -else $as_nop +else as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= @@ -4267,14 +4322,14 @@ fi as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done -else $as_nop +else ac_lo= ac_hi= fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val @@ -4282,7 +4337,7 @@ /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -4292,13 +4347,12 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_hi=$ac_mid -else $as_nop +else as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in #(( ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; @@ -4308,12 +4362,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 -static long int longval (void) { return $2; } -static unsigned long int ulongval (void) { return $2; } +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } #include #include int -main (void) +main () { FILE *f = fopen ("conftest.val", "w"); @@ -4341,10 +4395,9 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : echo >>conftest.val; read $3 &5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4378,18 +4431,17 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -4406,8 +4458,8 @@ # ac_fn_cxx_try_run LINENO # ------------------------ -# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that -# executables *can* be run. +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. ac_fn_cxx_try_run () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack @@ -4417,26 +4469,25 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: program exited with status $ac_status" >&5 - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status @@ -4447,6 +4498,93 @@ } # ac_fn_cxx_try_run +# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES +# --------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_cxx_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_cxx_check_header_mongrel + # ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES # --------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -4454,28 +4592,26 @@ ac_fn_cxx_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_header_compile @@ -4487,17 +4623,16 @@ ac_fn_c_check_member () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -printf %s "checking for $2.$3... " >&6; } -if eval test \${$4+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main (void) +main () { static $2 ac_aggr; if (ac_aggr.$3) @@ -4506,15 +4641,14 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$4=yes" -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main (void) +main () { static $2 ac_aggr; if (sizeof ac_aggr.$3) @@ -4523,50 +4657,29 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$4=yes" -else $as_nop +else eval "$4=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$4 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member -ac_configure_args_raw= -for ac_arg -do - case $ac_arg in - *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_configure_args_raw " '$ac_arg'" -done - -case $ac_configure_args_raw in - *$as_nl*) - ac_safe_unquote= ;; - *) - ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. - ac_unsafe_a="$ac_unsafe_z#~" - ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" - ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; -esac - cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibreOffice $as_me 7.4.1.2, which was -generated by GNU Autoconf 2.70. Invocation command line was +It was created by LibreOffice $as_me 7.4.2.3, which was +generated by GNU Autoconf 2.69. Invocation command line was - $ $0$ac_configure_args_raw + $ $0 $@ _ACEOF exec 5>>config.log @@ -4599,12 +4712,8 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - printf "%s\n" "PATH: $as_dir" + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -4639,7 +4748,7 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -4674,13 +4783,11 @@ # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? - # Sanitize IFS. - IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - printf "%s\n" "## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -4691,8 +4798,8 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -4716,7 +4823,7 @@ ) echo - printf "%s\n" "## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -4724,14 +4831,14 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - printf "%s\n" "## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -4739,15 +4846,15 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - printf "%s\n" "## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -4755,8 +4862,8 @@ echo fi test "$ac_signal" != 0 && - printf "%s\n" "$as_me: caught signal $ac_signal" - printf "%s\n" "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -4770,48 +4877,63 @@ # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -printf "%s\n" "/* confdefs.h */" > confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF -printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF -printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_files="$CONFIG_SITE" + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then - ac_site_files="$prefix/share/config.site $prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi - -for ac_site_file in $ac_site_files +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - case $ac_site_file in #( - */*) : - ;; #( - *) : - ac_site_file=./$ac_site_file ;; -esac - if test -f "$ac_site_file" && test -r "$ac_site_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -4821,650 +4943,19 @@ # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Test code for whether the C compiler supports C89 (global declarations) -ac_c_conftest_c89_globals=' -/* Does the compiler advertise C89 conformance? - Do not test the value of __STDC__, because some compilers set it to 0 - while being otherwise adequately conformant. */ -#if !defined __STDC__ -# error "Compiler does not advertise C89 conformance" -#endif - -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ -struct buf { int x; }; -struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not \xHH hex character constants. - These do not provoke an error unfortunately, instead are silently treated - as an "x". The following induces an error, until -std is added to get - proper ANSI mode. Curiously \x00 != x always comes out true, for an - array size at least. It is necessary to write \x00 == 0 to get something - that is true only with -std. */ -int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) '\''x'\'' -int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), - int, int);' - -# Test code for whether the C compiler supports C89 (body of main). -ac_c_conftest_c89_main=' -ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); -' - -# Test code for whether the C compiler supports C99 (global declarations) -ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L -# error "Compiler does not advertise C99 conformance" -#endif - -#include -extern int puts (const char *); -extern int printf (const char *, ...); -extern int dprintf (int, const char *, ...); -extern void *malloc (size_t); - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -// dprintf is used instead of fprintf to avoid needing to declare -// FILE and stderr. -#define debug(...) dprintf (2, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - #error "your preprocessor is broken" -#endif -#if BIG_OK -#else - #error "your preprocessor is broken" -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static bool -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str = ""; - int number = 0; - float fnumber = 0; - - while (*format) - { - switch (*format++) - { - case '\''s'\'': // string - str = va_arg (args_copy, const char *); - break; - case '\''d'\'': // int - number = va_arg (args_copy, int); - break; - case '\''f'\'': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); - - return *str && number && fnumber; -} -' - -# Test code for whether the C compiler supports C99 (body of main). -ac_c_conftest_c99_main=' - // Check bool. - _Bool success = false; - success |= (argc != 0); - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[0] = argv[0][0]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' - || dynamic_array[ni.number - 1] != 543); -' - -# Test code for whether the C compiler supports C11 (global declarations) -ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L -# error "Compiler does not advertise C11 conformance" -#endif - -// Check _Alignas. -char _Alignas (double) aligned_as_double; -char _Alignas (0) no_special_alignment; -extern char aligned_as_int; -char _Alignas (0) _Alignas (int) aligned_as_int; - -// Check _Alignof. -enum -{ - int_alignment = _Alignof (int), - int_array_alignment = _Alignof (int[100]), - char_alignment = _Alignof (char) -}; -_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); - -// Check _Noreturn. -int _Noreturn does_not_return (void) { for (;;) continue; } - -// Check _Static_assert. -struct test_static_assert -{ - int x; - _Static_assert (sizeof (int) <= sizeof (long int), - "_Static_assert does not work in struct"); - long int y; -}; - -// Check UTF-8 literals. -#define u8 syntax error! -char const utf8_literal[] = u8"happens to be ASCII" "another string"; - -// Check duplicate typedefs. -typedef long *long_ptr; -typedef long int *long_ptr; -typedef long_ptr long_ptr; - -// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. -struct anonymous -{ - union { - struct { int i; int j; }; - struct { int k; long int l; } w; - }; - int m; -} v1; -' - -# Test code for whether the C compiler supports C11 (body of main). -ac_c_conftest_c11_main=' - _Static_assert ((offsetof (struct anonymous, i) - == offsetof (struct anonymous, w.k)), - "Anonymous union alignment botch"); - v1.i = 2; - v1.w.k = 5; - ok |= v1.i != 5; -' - -# Test code for whether the C compiler supports C11 (complete). -ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} -${ac_c_conftest_c11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - ${ac_c_conftest_c11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C99 (complete). -ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - return ok; -} -" - -# Test code for whether the C compiler supports C89 (complete). -ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - return ok; -} -" - -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" -as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" -as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" -as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" -as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" -as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" -as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" -as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" -as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" -# Test code for whether the C++ compiler supports C++98 (global declarations) -ac_cxx_conftest_cxx98_globals=' -// Does the compiler advertise C++98 conformance? -#if !defined __cplusplus || __cplusplus < 199711L -# error "Compiler does not advertise C++98 conformance" -#endif - -// These inclusions are to reject old compilers that -// lack the unsuffixed header files. -#include -#include - -// and are *not* freestanding headers in C++98. -extern void assert (int); -namespace std { - extern int strcmp (const char *, const char *); -} - -// Namespaces, exceptions, and templates were all added after "C++ 2.0". -using std::exception; -using std::strcmp; - -namespace { - -void test_exception_syntax() -{ - try { - throw "test"; - } catch (const char *s) { - // Extra parentheses suppress a warning when building autoconf itself, - // due to lint rules shared with more typical C programs. - assert (!(strcmp) (s, "test")); - } -} - -template struct test_template -{ - T const val; - explicit test_template(T t) : val(t) {} - template T add(U u) { return static_cast(u) + val; } -}; - -} // anonymous namespace -' - -# Test code for whether the C++ compiler supports C++98 (body of main) -ac_cxx_conftest_cxx98_main=' - assert (argc); - assert (! argv[0]); -{ - test_exception_syntax (); - test_template tt (2.0); - assert (tt.add (4) == 6.0); - assert (true && !false); -} -' - -# Test code for whether the C++ compiler supports C++11 (global declarations) -ac_cxx_conftest_cxx11_globals=' -// Does the compiler advertise C++ 2011 conformance? -#if !defined __cplusplus || __cplusplus < 201103L -# error "Compiler does not advertise C++11 conformance" -#endif - -namespace cxx11test -{ - constexpr int get_val() { return 20; } - - struct testinit - { - int i; - double d; - }; - - class delegate - { - public: - delegate(int n) : n(n) {} - delegate(): delegate(2354) {} - - virtual int getval() { return this->n; }; - protected: - int n; - }; - - class overridden : public delegate - { - public: - overridden(int n): delegate(n) {} - virtual int getval() override final { return this->n * 2; } - }; - - class nocopy - { - public: - nocopy(int i): i(i) {} - nocopy() = default; - nocopy(const nocopy&) = delete; - nocopy & operator=(const nocopy&) = delete; - private: - int i; - }; - - // for testing lambda expressions - template Ret eval(Fn f, Ret v) - { - return f(v); - } - - // for testing variadic templates and trailing return types - template auto sum(V first) -> V - { - return first; - } - template auto sum(V first, Args... rest) -> V - { - return first + sum(rest...); - } -} -' - -# Test code for whether the C++ compiler supports C++11 (body of main) -ac_cxx_conftest_cxx11_main=' -{ - // Test auto and decltype - auto a1 = 6538; - auto a2 = 48573953.4; - auto a3 = "String literal"; - - int total = 0; - for (auto i = a3; *i; ++i) { total += *i; } - - decltype(a2) a4 = 34895.034; -} -{ - // Test constexpr - short sa[cxx11test::get_val()] = { 0 }; -} -{ - // Test initializer lists - cxx11test::testinit il = { 4323, 435234.23544 }; -} -{ - // Test range-based for - int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, - 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; - for (auto &x : array) { x += 23; } -} -{ - // Test lambda expressions - using cxx11test::eval; - assert (eval ([](int x) { return x*2; }, 21) == 42); - double d = 2.0; - assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); - assert (d == 5.0); - assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); - assert (d == 5.0); -} -{ - // Test use of variadic templates - using cxx11test::sum; - auto a = sum(1); - auto b = sum(1, 2); - auto c = sum(1.0, 2.0, 3.0); -} -{ - // Test constructor delegation - cxx11test::delegate d1; - cxx11test::delegate d2(); - cxx11test::delegate d3(45); -} -{ - // Test override and final - cxx11test::overridden o1(55464); -} -{ - // Test nullptr - char *c = nullptr; -} -{ - // Test template brackets - test_template<::test_template> v(test_template(12)); -} -{ - // Unicode literals - char const *utf8 = u8"UTF-8 string \u2500"; - char16_t const *utf16 = u"UTF-8 string \u2500"; - char32_t const *utf32 = U"UTF-32 string \u2500"; -} -' - -# Test code for whether the C compiler supports C++11 (complete). -ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} -${ac_cxx_conftest_cxx11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - ${ac_cxx_conftest_cxx11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C++98 (complete). -ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - return ok; -} -" - - -# Auxiliary files required by this configure script. -ac_aux_files="config.guess config.sub" - -# Locations in which to look for auxiliary files. -ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." - -# Search for a directory containing all of the required auxiliary files, -# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. -# If we don't find one directory that contains all the files we need, -# we report the set of missing files from the *first* directory in -# $ac_aux_dir_candidates and give up. -ac_missing_aux_files="" -ac_first_candidate=: -printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in $ac_aux_dir_candidates -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - as_found=: - - printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 - ac_aux_dir_found=yes - ac_install_sh= - for ac_aux in $ac_aux_files - do - # As a special case, if "install-sh" is required, that requirement - # can be satisfied by any of "install-sh", "install.sh", or "shtool", - # and $ac_install_sh is set appropriately for whichever one is found. - if test x"$ac_aux" = x"install-sh" - then - if test -f "${as_dir}install-sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 - ac_install_sh="${as_dir}install-sh -c" - elif test -f "${as_dir}install.sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 - ac_install_sh="${as_dir}install.sh -c" - elif test -f "${as_dir}shtool"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 - ac_install_sh="${as_dir}shtool install -c" - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} install-sh" - else - break - fi - fi - else - if test -f "${as_dir}${ac_aux}"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" - else - break - fi - fi - fi - done - if test "$ac_aux_dir_found" = yes; then - ac_aux_dir="$as_dir" - break - fi - ac_first_candidate=false - - as_found=false -done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 -fi - - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -if test -f "${ac_aux_dir}config.guess"; then - ac_config_guess="$SHELL ${ac_aux_dir}config.guess" -fi -if test -f "${ac_aux_dir}config.sub"; then - ac_config_sub="$SHELL ${ac_aux_dir}config.sub" -fi -if test -f "$ac_aux_dir/configure"; then - ac_configure="$SHELL ${ac_aux_dir}configure" -fi - # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -5475,12 +4966,12 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -5489,24 +4980,24 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -5516,12 +5007,11 @@ fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' - and start over" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -5655,8 +5145,8 @@ if test "$fp_count_colon" = "0"; then new_formatted_path=`realpath "$formatted_path"` if test $? -ne 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: realpath failed for \"$formatted_path\", not necessarily a problem." >&5 -printf "%s\n" "$as_me: WARNING: realpath failed for \"$formatted_path\", not necessarily a problem." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: realpath failed for \"$formatted_path\", not necessarily a problem." >&5 +$as_echo "$as_me: WARNING: realpath failed for \"$formatted_path\", not necessarily a problem." >&2;} else formatted_path="$new_formatted_path" fi @@ -5902,30 +5392,55 @@ fi fi +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - # Make sure we can run config.sub. -$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -printf %s "checking build system type... " >&6; } -if test ${ac_cv_build+y} -then : - printf %s "(cached) " >&6 -else $as_nop +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -printf "%s\n" "$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -5944,22 +5459,21 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -printf %s "checking host system type... " >&6; } -if test ${ac_cv_host+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -printf "%s\n" "$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -5997,8 +5511,8 @@ exit 0 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for product name" >&5 -printf %s "checking for product name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for product name" >&5 +$as_echo_n "checking for product name... " >&6; } PRODUCTNAME="LibreOffice" if test -n "$with_product_name" -a "$with_product_name" != no; then PRODUCTNAME="$with_product_name" @@ -6006,20 +5520,20 @@ if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then PRODUCTNAME="${PRODUCTNAME}Dev" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PRODUCTNAME" >&5 -printf "%s\n" "$PRODUCTNAME" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRODUCTNAME" >&5 +$as_echo "$PRODUCTNAME" >&6; } PRODUCTNAME_WITHOUT_SPACES=$(printf %s "$PRODUCTNAME" | sed 's/ //g') -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for package version" >&5 -printf %s "checking for package version... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for package version" >&5 +$as_echo_n "checking for package version... " >&6; } if test -n "$with_package_version" -a "$with_package_version" != no; then PACKAGE_VERSION="$with_package_version" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_VERSION" >&5 -printf "%s\n" "$PACKAGE_VERSION" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_VERSION" >&5 +$as_echo "$PACKAGE_VERSION" >&6; } set `echo "$PACKAGE_VERSION" | sed "s/\./ /g"` @@ -6066,32 +5580,41 @@ -printf "%s\n" "#define LIBO_VERSION_MAJOR $LIBO_VERSION_MAJOR" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_VERSION_MAJOR $LIBO_VERSION_MAJOR +_ACEOF -printf "%s\n" "#define LIBO_VERSION_MINOR $LIBO_VERSION_MINOR" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_VERSION_MINOR $LIBO_VERSION_MINOR +_ACEOF -printf "%s\n" "#define LIBO_VERSION_MICRO $LIBO_VERSION_MICRO" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_VERSION_MICRO $LIBO_VERSION_MICRO +_ACEOF -printf "%s\n" "#define LIBO_VERSION_PATCH $LIBO_VERSION_PATCH" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_VERSION_PATCH $LIBO_VERSION_PATCH +_ACEOF LIBO_THIS_YEAR=`date +%Y` -printf "%s\n" "#define LIBO_THIS_YEAR $LIBO_THIS_YEAR" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_THIS_YEAR $LIBO_THIS_YEAR +_ACEOF -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for product version" >&5 -printf %s "checking for product version... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for product version" >&5 +$as_echo_n "checking for product version... " >&6; } PRODUCTVERSION="$LIBO_VERSION_MAJOR.$LIBO_VERSION_MINOR" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PRODUCTVERSION" >&5 -printf "%s\n" "$PRODUCTVERSION" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRODUCTVERSION" >&5 +$as_echo "$PRODUCTVERSION" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -printf %s "checking for grep that handles long lines and -e... " >&6; } -if test ${ac_cv_path_GREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -6099,15 +5622,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in grep ggrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP @@ -6116,13 +5634,13 @@ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -6150,17 +5668,16 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf "%s\n" "$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -printf %s "checking for egrep... " >&6; } -if test ${ac_cv_path_EGREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else @@ -6171,15 +5688,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in egrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP @@ -6188,13 +5700,13 @@ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -6223,20 +5735,19 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf "%s\n" "$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" # AC_PROG_EGREP doesn't set GREP on all systems as well # Extract the first word of "grep", so it can be a program name with args. set dummy grep; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else case $GREP in [\\/]* | ?:[\\/]*) ac_cv_path_GREP="$GREP" # Let the user override the test with a path. @@ -6246,15 +5757,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GREP="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6266,11 +5773,11 @@ fi GREP=$ac_cv_path_GREP if test -n "$GREP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GREP" >&5 -printf "%s\n" "$GREP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GREP" >&5 +$as_echo "$GREP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6283,8 +5790,8 @@ INTROSPECTION_REQUIRED_VERSION=1.32.0 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU Make" >&5 -printf %s "checking for GNU Make... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Make" >&5 +$as_echo_n "checking for GNU Make... " >&6; } # try to use our own make if it is available and GNUMAKE was not already defined if test -z "$GNUMAKE"; then @@ -6314,14 +5821,14 @@ fi fi done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE" >&5 -printf "%s\n" "$GNUMAKE" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE" >&5 +$as_echo "$GNUMAKE" >&6; } if test -z "$GNUMAKE"; then as_fn_error $? "not found. install GNU Make." "$LINENO" 5 else if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using a native Win32 GNU Make version." >&5 -printf "%s\n" "$as_me: Using a native Win32 GNU Make version." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Using a native Win32 GNU Make version." >&5 +$as_echo "$as_me: Using a native Win32 GNU Make version." >&6;} fi fi @@ -6342,24 +5849,30 @@ PathFormat "$BUILDDIR" BUILDDIR="$formatted_path" x_Cygwin= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit COMSPEC" >&5 -printf %s "checking for explicit COMSPEC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit COMSPEC" >&5 +$as_echo_n "checking for explicit COMSPEC... " >&6; } if test -z "$COMSPEC"; then as_fn_error $? "COMSPEC not set in environment, please set it and rerun" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found: $COMSPEC" >&5 -printf "%s\n" "found: $COMSPEC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found: $COMSPEC" >&5 +$as_echo "found: $COMSPEC" >&6; } fi fi -printf "%s\n" "#define SRCDIR \"$SRC_ROOT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SRCDIR "$SRC_ROOT" +_ACEOF -printf "%s\n" "#define SRC_ROOT \"$SRC_ROOT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SRC_ROOT "$SRC_ROOT" +_ACEOF -printf "%s\n" "#define BUILDDIR \"$BUILDDIR\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define BUILDDIR "$BUILDDIR" +_ACEOF if test "z$EUID" = "z0" -a "`uname -o 2>/dev/null`" = "Cygwin"; then @@ -6371,12 +5884,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_SED+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else case $SED in [\\/]* | ?:[\\/]*) ac_cv_path_SED="$SED" # Let the user override the test with a path. @@ -6386,15 +5898,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_SED="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6406,11 +5914,11 @@ fi SED=$ac_cv_path_SED if test -n "$SED"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 -printf "%s\n" "$SED" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 +$as_echo "$SED" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6423,22 +5931,21 @@ # Set the ENABLE_LTO variable # =================================================================== -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use link-time optimization" >&5 -printf %s "checking whether to use link-time optimization... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use link-time optimization" >&5 +$as_echo_n "checking whether to use link-time optimization... " >&6; } if test -n "$enable_lto" -a "$enable_lto" != "no"; then ENABLE_LTO="TRUE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else ENABLE_LTO="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --enable-fuzz-options was given. -if test ${enable_fuzz_options+y} -then : +if test "${enable_fuzz_options+set}" = set; then : enableval=$enable_fuzz_options; fi @@ -6446,34 +5953,30 @@ # Check whether --with-android-ndk was given. -if test ${with_android_ndk+y} -then : +if test "${with_android_ndk+set}" = set; then : withval=$with_android_ndk; fi # Check whether --with-android-ndk-toolchain-version was given. -if test ${with_android_ndk_toolchain_version+y} -then : +if test "${with_android_ndk_toolchain_version+set}" = set; then : withval=$with_android_ndk_toolchain_version; -else $as_nop +else with_android_ndk_toolchain_version=clang5.0 fi # Check whether --with-android-sdk was given. -if test ${with_android_sdk+y} -then : +if test "${with_android_sdk+set}" = set; then : withval=$with_android_sdk; fi # Check whether --with-android-api-level was given. -if test ${with_android_api_level+y} -then : +if test "${with_android_api_level+set}" = set; then : withval=$with_android_api_level; fi @@ -6508,8 +6011,8 @@ 16.*|17.*|18.*|19.*|20.*) ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Untested Android NDK version $ANDROID_NDK_VERSION, only versions 16.* til 20.* have been used successfully. Proceed at your own risk." >&5 -printf "%s\n" "$as_me: WARNING: Untested Android NDK version $ANDROID_NDK_VERSION, only versions 16.* til 20.* have been used successfully. Proceed at your own risk." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Untested Android NDK version $ANDROID_NDK_VERSION, only versions 16.* til 20.* have been used successfully. Proceed at your own risk." >&5 +$as_echo "$as_me: WARNING: Untested Android NDK version $ANDROID_NDK_VERSION, only versions 16.* til 20.* have been used successfully. Proceed at your own risk." >&2;} add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only versions 16.* til 20.* have been used successfully. Proceed at your own risk." ;; esac @@ -6560,8 +6063,8 @@ as_fn_error $? "Unrecognized value for the --with-android-ndk-toolchain-version option. Building for Android is only supported with Clang 5.*" "$LINENO" 5 esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using the Android API level... $ANDROID_API_LEVEL" >&5 -printf "%s\n" "$as_me: using the Android API level... $ANDROID_API_LEVEL" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: using the Android API level... $ANDROID_API_LEVEL" >&5 +$as_echo "$as_me: using the Android API level... $ANDROID_API_LEVEL" >&6;} # NDK 15 or later toolchain is 64bit-only, except for Windows that we don't support. Using a 64-bit # linker is required if you compile large parts of the code with -g. A 32-bit linker just won't @@ -6626,8 +6129,7 @@ # Check whether --enable-android-lok was given. -if test ${enable_android_lok+y} -then : +if test "${enable_android_lok+set}" = set; then : enableval=$enable_android_lok; fi @@ -6635,31 +6137,30 @@ if test -n "$ANDROID_NDK_DIR" ; then if test "$enable_android_lok" = yes; then ENABLE_ANDROID_LOK=TRUE - printf "%s\n" "#define HAVE_FEATURE_ANDROID_LOK 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_ANDROID_LOK 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: building the Android version... for the Online-based Android app" >&5 -printf "%s\n" "$as_me: building the Android version... for the Online-based Android app" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: building the Android version... for the Online-based Android app" >&5 +$as_echo "$as_me: building the Android version... for the Online-based Android app" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: building the Android version... for the app from the android/ subdir" >&5 -printf "%s\n" "$as_me: building the Android version... for the app from the android/ subdir" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: building the Android version... for the app from the android/ subdir" >&5 +$as_echo "$as_me: building the Android version... for the app from the android/ subdir" >&6;} fi fi # Check whether --enable-android-editing was given. -if test ${enable_android_editing+y} -then : +if test "${enable_android_editing+set}" = set; then : enableval=$enable_android_editing; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_android_editing=yes else enable_android_editing=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-android-editing=$enable_android_editing" >&5 -printf "%s\n" "$as_me: Randomly set --enable-android-editing=$enable_android_editing" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-android-editing=$enable_android_editing" >&5 +$as_echo "$as_me: Randomly set --enable-android-editing=$enable_android_editing" >&6;} libo_fuzzed_enable_android_editing=yes libo_fuzz_list="$libo_fuzz_list --enable-android-editing="'$enable_android_editing' fi @@ -6731,21 +6232,21 @@ build_skia=yes _os=SunOS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the Solaris operating system release" >&5 -printf %s "checking the Solaris operating system release... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Solaris operating system release" >&5 +$as_echo_n "checking the Solaris operating system release... " >&6; } _os_release=`echo $host_os | $SED -e s/solaris2\.//` if test "$_os_release" -lt "10"; then as_fn_error $? "use Solaris >= 10 to build LibreOffice" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok ($_os_release)" >&5 -printf "%s\n" "ok ($_os_release)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($_os_release)" >&5 +$as_echo "ok ($_os_release)" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the processor type" >&5 -printf %s "checking the processor type... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the processor type" >&5 +$as_echo_n "checking the processor type... " >&6; } if test "$host_cpu" = "sparc" -o "$host_cpu" = "i386"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok ($host_cpu)" >&5 -printf "%s\n" "ok ($host_cpu)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($host_cpu)" >&5 +$as_echo "ok ($host_cpu)" >&6; } else as_fn_error $? "only SPARC and i386 processors are supported" "$LINENO" 5 fi @@ -6809,8 +6310,8 @@ test_eot=no if test -n "$LODE_HOME" ; then mac_sanitize_path - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: sanitized the PATH to $PATH" >&5 -printf "%s\n" "$as_me: sanitized the PATH to $PATH" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: sanitized the PATH to $PATH" >&5 +$as_echo "$as_me: sanitized the PATH to $PATH" >&6;} fi _os=Darwin INSTROOTBASESUFFIX=/$PRODUCTNAME_WITHOUT_SPACES.app @@ -6842,8 +6343,8 @@ test_webdav=no if test -n "$LODE_HOME" ; then mac_sanitize_path - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: sanitized the PATH to $PATH" >&5 -printf "%s\n" "$as_me: sanitized the PATH to $PATH" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: sanitized the PATH to $PATH" >&5 +$as_echo "$as_me: sanitized the PATH to $PATH" >&6;} fi enable_gpgmepp=no _os=iOS @@ -6881,17 +6382,17 @@ using_freetype_fontconfig=yes using_x11=yes build_skia=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the FreeBSD operating system release" >&5 -printf %s "checking the FreeBSD operating system release... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the FreeBSD operating system release" >&5 +$as_echo_n "checking the FreeBSD operating system release... " >&6; } if test -n "$with_os_version"; then OSVERSION="$with_os_version" else OSVERSION=`/sbin/sysctl -n kern.osreldate` fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found OSVERSION=$OSVERSION" >&5 -printf "%s\n" "found OSVERSION=$OSVERSION" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which thread library to use" >&5 -printf %s "checking which thread library to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found OSVERSION=$OSVERSION" >&5 +$as_echo "found OSVERSION=$OSVERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which thread library to use" >&5 +$as_echo_n "checking which thread library to use... " >&6; } if test "$OSVERSION" -lt "500016"; then PTHREAD_CFLAGS="-D_THREAD_SAFE" PTHREAD_LIBS="-pthread" @@ -6902,8 +6403,8 @@ PTHREAD_CFLAGS="" PTHREAD_LIBS="-pthread" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_LIBS" >&5 -printf "%s\n" "$PTHREAD_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_LIBS" >&5 +$as_echo "$PTHREAD_LIBS" >&6; } _os=FreeBSD ;; @@ -7059,7 +6560,7 @@ if test "$using_freetype_fontconfig" = yes; then USE_HEADLESS_CODE=TRUE if test "$using_headless_plugin" = yes; then - printf "%s\n" "#define ENABLE_HEADLESS 1" >>confdefs.h + $as_echo "#define ENABLE_HEADLESS 1" >>confdefs.h ENABLE_HEADLESS=TRUE fi @@ -7071,14 +6572,14 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: VCL platform has a usable dynamic loading API: $usable_dlapi" >&5 -printf "%s\n" "$as_me: VCL platform has a usable dynamic loading API: $usable_dlapi" >&6;} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: VCL platform uses freetype+fontconfig: $using_freetype_fontconfig" >&5 -printf "%s\n" "$as_me: VCL platform uses freetype+fontconfig: $using_freetype_fontconfig" >&6;} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: VCL platform uses headless plugin: $using_headless_plugin" >&5 -printf "%s\n" "$as_me: VCL platform uses headless plugin: $using_headless_plugin" >&6;} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: VCL platform uses X11: $using_x11" >&5 -printf "%s\n" "$as_me: VCL platform uses X11: $using_x11" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: VCL platform has a usable dynamic loading API: $usable_dlapi" >&5 +$as_echo "$as_me: VCL platform has a usable dynamic loading API: $usable_dlapi" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: VCL platform uses freetype+fontconfig: $using_freetype_fontconfig" >&5 +$as_echo "$as_me: VCL platform uses freetype+fontconfig: $using_freetype_fontconfig" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: VCL platform uses headless plugin: $using_headless_plugin" >&5 +$as_echo "$as_me: VCL platform uses headless plugin: $using_headless_plugin" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: VCL platform uses X11: $using_x11" >&5 +$as_echo "$as_me: VCL platform uses X11: $using_x11" >&6;} # =================================================================== # @@ -7104,12 +6605,11 @@ if test "$_os" = "AIX"; then # Extract the first word of "gawk", so it can be a program name with args. set dummy gawk; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GAWK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GAWK+:} false; then : + $as_echo_n "(cached) " >&6 +else case $GAWK in [\\/]* | ?:[\\/]*) ac_cv_path_GAWK="$GAWK" # Let the user override the test with a path. @@ -7119,15 +6619,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GAWK="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GAWK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7139,11 +6635,11 @@ fi GAWK=$ac_cv_path_GAWK if test -n "$GAWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GAWK" >&5 -printf "%s\n" "$GAWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GAWK" >&5 +$as_echo "$GAWK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7160,70 +6656,70 @@ # Check for explicit A/C/CXX/OBJC/OBJCXX/LDFLAGS. # By default use the ones specified by our build system, # but explicit override is possible. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit AFLAGS" >&5 -printf %s "checking for explicit AFLAGS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit AFLAGS" >&5 +$as_echo_n "checking for explicit AFLAGS... " >&6; } if test -n "$AFLAGS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AFLAGS" >&5 -printf "%s\n" "$AFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AFLAGS" >&5 +$as_echo "$AFLAGS" >&6; } x_AFLAGS= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } x_AFLAGS=\# fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit CFLAGS" >&5 -printf %s "checking for explicit CFLAGS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit CFLAGS" >&5 +$as_echo_n "checking for explicit CFLAGS... " >&6; } if test -n "$CFLAGS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CFLAGS" >&5 -printf "%s\n" "$CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CFLAGS" >&5 +$as_echo "$CFLAGS" >&6; } x_CFLAGS= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } x_CFLAGS=\# fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit CXXFLAGS" >&5 -printf %s "checking for explicit CXXFLAGS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit CXXFLAGS" >&5 +$as_echo_n "checking for explicit CXXFLAGS... " >&6; } if test -n "$CXXFLAGS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXFLAGS" >&5 -printf "%s\n" "$CXXFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXFLAGS" >&5 +$as_echo "$CXXFLAGS" >&6; } x_CXXFLAGS= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } x_CXXFLAGS=\# fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit OBJCFLAGS" >&5 -printf %s "checking for explicit OBJCFLAGS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit OBJCFLAGS" >&5 +$as_echo_n "checking for explicit OBJCFLAGS... " >&6; } if test -n "$OBJCFLAGS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJCFLAGS" >&5 -printf "%s\n" "$OBJCFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCFLAGS" >&5 +$as_echo "$OBJCFLAGS" >&6; } x_OBJCFLAGS= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } x_OBJCFLAGS=\# fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit OBJCXXFLAGS" >&5 -printf %s "checking for explicit OBJCXXFLAGS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit OBJCXXFLAGS" >&5 +$as_echo_n "checking for explicit OBJCXXFLAGS... " >&6; } if test -n "$OBJCXXFLAGS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJCXXFLAGS" >&5 -printf "%s\n" "$OBJCXXFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCXXFLAGS" >&5 +$as_echo "$OBJCXXFLAGS" >&6; } x_OBJCXXFLAGS= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } x_OBJCXXFLAGS=\# fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit LDFLAGS" >&5 -printf %s "checking for explicit LDFLAGS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit LDFLAGS" >&5 +$as_echo_n "checking for explicit LDFLAGS... " >&6; } if test -n "$LDFLAGS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDFLAGS" >&5 -printf "%s\n" "$LDFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDFLAGS" >&5 +$as_echo "$LDFLAGS" >&6; } x_LDFLAGS= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } x_LDFLAGS=\# fi @@ -7246,16 +6742,7 @@ if test "$_os" != "WINNT"; then # AC_PROG_CC sets CFLAGS to -g -O2 if not set, avoid that save_CFLAGS=$CFLAGS - - - - - - - - - -ac_ext=c + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -7263,12 +6750,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -7276,15 +6762,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7295,11 +6777,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7308,12 +6790,11 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -7321,15 +6802,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7340,11 +6817,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -7352,8 +6829,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -7366,12 +6843,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -7379,15 +6855,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7398,11 +6870,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7411,12 +6883,11 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -7425,19 +6896,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7453,18 +6920,18 @@ # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7475,12 +6942,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -7488,15 +6954,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7507,11 +6969,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7524,12 +6986,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -7537,15 +6998,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7556,11 +7013,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7572,8 +7029,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -7581,129 +7038,25 @@ fi fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. -set dummy ${ac_tool_prefix}clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "clang", so it can be a program name with args. -set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi -fi - -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion -version; do +for ac_option in --version -v -V -qversion; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -7713,7 +7066,7 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -7721,7 +7074,7 @@ /* end confdefs.h. */ int -main (void) +main () { ; @@ -7733,9 +7086,9 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -printf %s "checking whether the C compiler works... " >&6; } -ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -7756,12 +7109,11 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -7778,7 +7130,7 @@ # certainly right. break;; *.* ) - if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -7794,46 +7146,44 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop +else ac_file='' fi -if test -z "$ac_file" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -printf "%s\n" "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -printf %s "checking for C compiler default output file name... " >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -printf "%s\n" "$ac_file" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -printf %s "checking for suffix of executables... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -7847,15 +7197,15 @@ * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -printf "%s\n" "$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -7864,7 +7214,7 @@ /* end confdefs.h. */ #include int -main (void) +main () { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -7876,8 +7226,8 @@ ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -7885,10 +7235,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -7896,40 +7246,39 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot run C compiled programs. + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -printf %s "checking for suffix of object files... " >&6; } -if test ${ac_cv_objext+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -7943,12 +7292,11 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -7957,32 +7305,31 @@ break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -printf "%s\n" "$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 -printf %s "checking whether the compiler supports GNU C... " >&6; } -if test ${ac_cv_c_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -7992,33 +7339,29 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+y} +ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -printf %s "checking whether $CC accepts -g... " >&6; } -if test ${ac_cv_prog_cc_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -8027,60 +7370,57 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else $as_nop +else CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -printf "%s\n" "$ac_cv_prog_cc_g" >&6; } -if test $ac_test_CFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -8095,144 +7435,239 @@ CFLAGS= fi fi -ac_prog_cc_stdc=no -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 -printf %s "checking for $CC option to enable C11 features... " >&6; } -if test ${ac_cv_prog_cc_c11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c11_program +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -for ac_arg in '' -std=gnu11 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c11=$ac_arg + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c11" != "xno" && break +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC + fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : -if test "x$ac_cv_prog_cc_c11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 -printf %s "checking for $CC option to enable C99 features... " >&6; } -if test ${ac_cv_prog_cc_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + CFLAGS=$save_CFLAGS + if test -z "$CC_BASE"; then + CC_BASE=`first_arg_basename "$CC"` + fi +fi + +if test "$_os" != "WINNT"; then + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c99_program +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue fi +rm -f conftest.err conftest.i conftest.$ac_ext -if test "x$ac_cv_prog_cc_c99" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 -printf %s "checking for $CC option to enable C89 features... " >&6; } -if test ${ac_cv_prog_cc_c89+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c89_program +#include _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c89=$ac_arg +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c89" != "xno" && break +rm -f conftest.err conftest.i conftest.$ac_ext + done -rm -f conftest.$ac_ext -CC=$ac_save_CC +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break fi -if test "x$ac_cv_prog_cc_c89" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + done + ac_cv_prog_CPP=$CPP + fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -8241,49 +7676,141 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - CFLAGS=$save_CFLAGS - if test -z "$CC_BASE"; then - CC_BASE=`first_arg_basename "$CC"` - fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test "$_os" != "WINNT"; then +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : +else + ac_cv_header_stdc=no +fi +rm -f conftest* +fi +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then +$as_echo "#define STDC_HEADERS 1" >>confdefs.h -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : +fi -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -printf %s "checking whether byte ordering is bigendian... " >&6; } -if test ${ac_cv_c_bigendian+y} -then : - printf %s "(cached) " >&6 -else $as_nop + +done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8294,8 +7821,7 @@ typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless # there are at least two -arch flags with different values. @@ -8319,7 +7845,7 @@ fi done fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8328,7 +7854,7 @@ #include int -main (void) +main () { #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ @@ -8340,8 +7866,7 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8349,7 +7874,7 @@ #include int -main (void) +main () { #if BYTE_ORDER != BIG_ENDIAN not big endian @@ -8359,15 +7884,14 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes -else $as_nop +else ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). @@ -8376,7 +7900,7 @@ #include int -main (void) +main () { #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) bogus endian macros @@ -8386,15 +7910,14 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { #ifndef _BIG_ENDIAN not big endian @@ -8404,33 +7927,31 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes -else $as_nop +else ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -unsigned short int ascii_mm[] = +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - unsigned short int ascii_ii[] = + short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; int use_ascii (int i) { return ascii_mm[i] + ascii_ii[i]; } - unsigned short int ebcdic_ii[] = + short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - unsigned short int ebcdic_mm[] = + short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; @@ -8438,15 +7959,14 @@ extern int foo; int -main (void) +main () { return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -8459,13 +7979,13 @@ fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else $as_nop +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main (void) +main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -8481,10 +8001,9 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian=no -else $as_nop +else ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -8493,8 +8012,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -printf "%s\n" "$ac_cv_c_bigendian" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) ENDIANNESS=big;; #( @@ -8502,7 +8021,7 @@ ENDIANNESS=little ;; #( universal) -printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) @@ -8516,16 +8035,15 @@ if test "$usable_dlapi" != no; then - printf "%s\n" "#define HAVE_DLAPI 1" >>confdefs.h + $as_echo "#define HAVE_DLAPI 1" >>confdefs.h if test "$test_unix_dlapi" != no; then save_LIBS="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5 -printf %s "checking for library containing dlsym... " >&6; } -if test ${ac_cv_search_dlsym+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5 +$as_echo_n "checking for library containing dlsym... " >&6; } +if ${ac_cv_search_dlsym+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8533,56 +8051,54 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlsym (); int -main (void) +main () { return dlsym (); ; return 0; } _ACEOF -for ac_lib in '' dl -do +for ac_lib in '' dl; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_dlsym=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_dlsym+y} -then : + if ${ac_cv_search_dlsym+:} false; then : break fi done -if test ${ac_cv_search_dlsym+y} -then : +if ${ac_cv_search_dlsym+:} false; then : -else $as_nop +else ac_cv_search_dlsym=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlsym" >&5 -printf "%s\n" "$ac_cv_search_dlsym" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlsym" >&5 +$as_echo "$ac_cv_search_dlsym" >&6; } ac_res=$ac_cv_search_dlsym -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" case "$ac_cv_search_dlsym" in -l*) UNIX_DLAPI_LIBS="$ac_cv_search_dlsym";; esac -else $as_nop +else as_fn_error $? "dlsym not found in either libc nor libdl" "$LINENO" 5 fi LIBS="$save_LIBS" - printf "%s\n" "#define HAVE_UNIX_DLAPI 1" >>confdefs.h + $as_echo "#define HAVE_UNIX_DLAPI 1" >>confdefs.h fi fi @@ -8602,12 +8118,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -8617,15 +8132,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8637,11 +8148,11 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -printf "%s\n" "$PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8650,12 +8161,11 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -8665,15 +8175,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8685,11 +8191,11 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -8697,8 +8203,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -8710,27 +8216,25 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } PKG_CONFIG="" fi fi -if test "x$BACKTRACE_LIBS$BACKTRACE_CFLAGS" = x -then : +if test "x$BACKTRACE_LIBS$BACKTRACE_CFLAGS" = x; then : save_LIBS="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5 -printf %s "checking for library containing backtrace... " >&6; } -if test ${ac_cv_search_backtrace+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5 +$as_echo_n "checking for library containing backtrace... " >&6; } +if ${ac_cv_search_backtrace+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8738,64 +8242,62 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char backtrace (); int -main (void) +main () { return backtrace (); ; return 0; } _ACEOF -for ac_lib in '' libexecinfo -do +for ac_lib in '' libexecinfo; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_backtrace=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_backtrace+y} -then : + if ${ac_cv_search_backtrace+:} false; then : break fi done -if test ${ac_cv_search_backtrace+y} -then : +if ${ac_cv_search_backtrace+:} false; then : -else $as_nop +else ac_cv_search_backtrace=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5 -printf "%s\n" "$ac_cv_search_backtrace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5 +$as_echo "$ac_cv_search_backtrace" >&6; } ac_res=$ac_cv_search_backtrace -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" case "$ac_cv_search_backtrace" in -l*) BACKTRACE_LIBS="$ac_cv_search_backtrace";; esac -else $as_nop +else pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BACKTRACE" >&5 -printf %s "checking for BACKTRACE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexecinfo" >&5 +$as_echo_n "checking for libexecinfo... " >&6; } if test -n "$BACKTRACE_CFLAGS"; then pkg_cv_BACKTRACE_CFLAGS="$BACKTRACE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexecinfo\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexecinfo\""; } >&5 ($PKG_CONFIG --exists --print-errors "libexecinfo") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BACKTRACE_CFLAGS=`$PKG_CONFIG --cflags "libexecinfo" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -8809,10 +8311,10 @@ pkg_cv_BACKTRACE_LIBS="$BACKTRACE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexecinfo\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexecinfo\""; } >&5 ($PKG_CONFIG --exists --print-errors "libexecinfo") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BACKTRACE_LIBS=`$PKG_CONFIG --libs "libexecinfo" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -8826,8 +8328,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -8844,14 +8346,14 @@ : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } : else BACKTRACE_CFLAGS=$pkg_cv_BACKTRACE_CFLAGS BACKTRACE_LIBS=$pkg_cv_BACKTRACE_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_cv_search_backtrace= fi fi @@ -8859,10 +8361,9 @@ LIBS="$save_LIBS" fi -if test "x$ac_cv_search_backtrace" != xno -then : +if test "x$ac_cv_search_backtrace" != xno ; then : - printf "%s\n" "#define HAVE_FEATURE_BACKTRACE 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_BACKTRACE 1" >>confdefs.h fi @@ -8874,8 +8375,8 @@ EMSCRIPTEN_MIN_VERSION="${EMSCRIPTEN_MIN_MAJOR}.${EMSCRIPTEN_MIN_MINOR}.${EMSCRIPTEN_MIN_TINY}" if test "$_os" = "Emscripten"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Emscripten is at least $EMSCRIPTEN_MIN_VERSION" >&5 -printf %s "checking if Emscripten is at least $EMSCRIPTEN_MIN_VERSION... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Emscripten is at least $EMSCRIPTEN_MIN_VERSION" >&5 +$as_echo_n "checking if Emscripten is at least $EMSCRIPTEN_MIN_VERSION... " >&6; } EMSCRIPTEN_DEFINES=$(echo | emcc -dM -E - | $GREP __EMSCRIPTEN_) EMSCRIPTEN_MAJOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p') EMSCRIPTEN_MINOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 's/.*__EMSCRIPTEN_minor__ //p') @@ -8884,27 +8385,27 @@ check_semantic_version_three_prefixed EMSCRIPTEN MIN if test $? -eq 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($EMSCRIPTEN_VERSION)" >&5 -printf "%s\n" "yes ($EMSCRIPTEN_VERSION)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($EMSCRIPTEN_VERSION)" >&5 +$as_echo "yes ($EMSCRIPTEN_VERSION)" >&6; } else as_fn_error $? "no, found $EMSCRIPTEN_VERSION" "$LINENO" 5 fi EMSCRIPTEN_ERROR=0 if ! which emconfigure >/dev/null 2>&1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: emconfigure must be in your \$PATH" >&5 -printf "%s\n" "$as_me: WARNING: emconfigure must be in your \$PATH" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: emconfigure must be in your \$PATH" >&5 +$as_echo "$as_me: WARNING: emconfigure must be in your \$PATH" >&2;} EMSCRIPTEN_ERROR=1 fi if test -z "$EMMAKEN_JUST_CONFIGURE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"\$EMMAKEN_JUST_CONFIGURE wasn't set by emconfigure. Prefix configure or use autogen.sh" >&5 -printf "%s\n" "$as_me: WARNING: \"\$EMMAKEN_JUST_CONFIGURE wasn't set by emconfigure. Prefix configure or use autogen.sh" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"\$EMMAKEN_JUST_CONFIGURE wasn't set by emconfigure. Prefix configure or use autogen.sh" >&5 +$as_echo "$as_me: WARNING: \"\$EMMAKEN_JUST_CONFIGURE wasn't set by emconfigure. Prefix configure or use autogen.sh" >&2;} EMSCRIPTEN_ERROR=1 fi EMSDK_FILE_PACKAGER="$(em-config EMSCRIPTEN_ROOT)"/tools/file_packager if ! test -x "$EMSDK_FILE_PACKAGER"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No file_packager found in $(em-config EMSCRIPTEN_ROOT)/tools/file_packager." >&5 -printf "%s\n" "$as_me: WARNING: No file_packager found in $(em-config EMSCRIPTEN_ROOT)/tools/file_packager." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No file_packager found in $(em-config EMSCRIPTEN_ROOT)/tools/file_packager." >&5 +$as_echo "$as_me: WARNING: No file_packager found in $(em-config EMSCRIPTEN_ROOT)/tools/file_packager." >&2;} EMSCRIPTEN_ERROR=1 fi if test $EMSCRIPTEN_ERROR -ne 0; then @@ -8927,26 +8428,24 @@ # case? # Check whether --enable-ios-simulator was given. -if test ${enable_ios_simulator+y} -then : +if test "${enable_ios_simulator+set}" = set; then : enableval=$enable_ios_simulator; fi # Check whether --enable-extension-integration was given. -if test ${enable_extension_integration+y} -then : +if test "${enable_extension_integration+set}" = set; then : enableval=$enable_extension_integration; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_extension_integration=yes else enable_extension_integration=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-extension-integration=$enable_extension_integration" >&5 -printf "%s\n" "$as_me: Randomly set --enable-extension-integration=$enable_extension_integration" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-extension-integration=$enable_extension_integration" >&5 +$as_echo "$as_me: Randomly set --enable-extension-integration=$enable_extension_integration" >&6;} libo_fuzzed_enable_extension_integration=yes libo_fuzz_list="$libo_fuzz_list --enable-extension-integration="'$enable_extension_integration' fi @@ -8956,17 +8455,15 @@ # Check whether --enable-avmedia was given. -if test ${enable_avmedia+y} -then : +if test "${enable_avmedia+set}" = set; then : enableval=$enable_avmedia; -else $as_nop +else test "${enable_avmedia+set}" = set || enable_avmedia=yes fi # Check whether --enable-database-connectivity was given. -if test ${enable_database_connectivity+y} -then : +if test "${enable_database_connectivity+set}" = set; then : enableval=$enable_database_connectivity; fi @@ -8977,18 +8474,17 @@ # any extension mechanism at all # Check whether --enable-extensions was given. -if test ${enable_extensions+y} -then : +if test "${enable_extensions+set}" = set; then : enableval=$enable_extensions; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_extensions=yes else enable_extensions=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-extensions=$enable_extensions" >&5 -printf "%s\n" "$as_me: Randomly set --enable-extensions=$enable_extensions" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-extensions=$enable_extensions" >&5 +$as_echo "$as_me: Randomly set --enable-extensions=$enable_extensions" >&6;} libo_fuzzed_enable_extensions=yes libo_fuzz_list="$libo_fuzz_list --enable-extensions="'$enable_extensions' fi @@ -8998,10 +8494,9 @@ # Check whether --enable-scripting was given. -if test ${enable_scripting+y} -then : +if test "${enable_scripting+set}" = set; then : enableval=$enable_scripting; -else $as_nop +else test "${enable_scripting+set}" = set || enable_scripting=yes fi @@ -9010,26 +8505,24 @@ # special case otherwise, too, so factored out as a separate setting # Check whether --enable-dynamic-loading was given. -if test ${enable_dynamic_loading+y} -then : +if test "${enable_dynamic_loading+set}" = set; then : enableval=$enable_dynamic_loading; fi # Check whether --enable-report-builder was given. -if test ${enable_report_builder+y} -then : +if test "${enable_report_builder+set}" = set; then : enableval=$enable_report_builder; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_report_builder=yes else enable_report_builder=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-report-builder=$enable_report_builder" >&5 -printf "%s\n" "$as_me: Randomly set --enable-report-builder=$enable_report_builder" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-report-builder=$enable_report_builder" >&5 +$as_echo "$as_me: Randomly set --enable-report-builder=$enable_report_builder" >&6;} libo_fuzzed_enable_report_builder=yes libo_fuzz_list="$libo_fuzz_list --enable-report-builder="'$enable_report_builder' fi @@ -9040,18 +8533,17 @@ # Check whether --enable-ext-wiki-publisher was given. -if test ${enable_ext_wiki_publisher+y} -then : +if test "${enable_ext_wiki_publisher+set}" = set; then : enableval=$enable_ext_wiki_publisher; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_ext_wiki_publisher=yes else enable_ext_wiki_publisher=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-ext-wiki-publisher=$enable_ext_wiki_publisher" >&5 -printf "%s\n" "$as_me: Randomly set --enable-ext-wiki-publisher=$enable_ext_wiki_publisher" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-ext-wiki-publisher=$enable_ext_wiki_publisher" >&5 +$as_echo "$as_me: Randomly set --enable-ext-wiki-publisher=$enable_ext_wiki_publisher" >&6;} libo_fuzzed_enable_ext_wiki_publisher=yes libo_fuzz_list="$libo_fuzz_list --enable-ext-wiki-publisher="'$enable_ext_wiki_publisher' fi @@ -9062,18 +8554,17 @@ # Check whether --enable-lpsolve was given. -if test ${enable_lpsolve+y} -then : +if test "${enable_lpsolve+set}" = set; then : enableval=$enable_lpsolve; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_lpsolve=yes else enable_lpsolve=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-lpsolve=$enable_lpsolve" >&5 -printf "%s\n" "$as_me: Randomly set --enable-lpsolve=$enable_lpsolve" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-lpsolve=$enable_lpsolve" >&5 +$as_echo "$as_me: Randomly set --enable-lpsolve=$enable_lpsolve" >&6;} libo_fuzzed_enable_lpsolve=yes libo_fuzz_list="$libo_fuzz_list --enable-lpsolve="'$enable_lpsolve' fi @@ -9083,18 +8574,17 @@ # Check whether --enable-coinmp was given. -if test ${enable_coinmp+y} -then : +if test "${enable_coinmp+set}" = set; then : enableval=$enable_coinmp; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_coinmp=yes else enable_coinmp=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-coinmp=$enable_coinmp" >&5 -printf "%s\n" "$as_me: Randomly set --enable-coinmp=$enable_coinmp" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-coinmp=$enable_coinmp" >&5 +$as_echo "$as_me: Randomly set --enable-coinmp=$enable_coinmp" >&6;} libo_fuzzed_enable_coinmp=yes libo_fuzz_list="$libo_fuzz_list --enable-coinmp="'$enable_coinmp' fi @@ -9105,18 +8595,17 @@ # Check whether --enable-pdfimport was given. -if test ${enable_pdfimport+y} -then : +if test "${enable_pdfimport+set}" = set; then : enableval=$enable_pdfimport; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_pdfimport=yes else enable_pdfimport=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-pdfimport=$enable_pdfimport" >&5 -printf "%s\n" "$as_me: Randomly set --enable-pdfimport=$enable_pdfimport" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-pdfimport=$enable_pdfimport" >&5 +$as_echo "$as_me: Randomly set --enable-pdfimport=$enable_pdfimport" >&6;} libo_fuzzed_enable_pdfimport=yes libo_fuzz_list="$libo_fuzz_list --enable-pdfimport="'$enable_pdfimport' fi @@ -9127,18 +8616,17 @@ # Check whether --enable-pdfium was given. -if test ${enable_pdfium+y} -then : +if test "${enable_pdfium+set}" = set; then : enableval=$enable_pdfium; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_pdfium=yes else enable_pdfium=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-pdfium=$enable_pdfium" >&5 -printf "%s\n" "$as_me: Randomly set --enable-pdfium=$enable_pdfium" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-pdfium=$enable_pdfium" >&5 +$as_echo "$as_me: Randomly set --enable-pdfium=$enable_pdfium" >&6;} libo_fuzzed_enable_pdfium=yes libo_fuzz_list="$libo_fuzz_list --enable-pdfium="'$enable_pdfium' fi @@ -9149,18 +8637,17 @@ # Check whether --enable-skia was given. -if test ${enable_skia+y} -then : +if test "${enable_skia+set}" = set; then : enableval=$enable_skia; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_skia=yes else enable_skia=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-skia=$enable_skia" >&5 -printf "%s\n" "$as_me: Randomly set --enable-skia=$enable_skia" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-skia=$enable_skia" >&5 +$as_echo "$as_me: Randomly set --enable-skia=$enable_skia" >&6;} libo_fuzzed_enable_skia=yes libo_fuzz_list="$libo_fuzz_list --enable-skia="'$enable_skia' fi @@ -9174,18 +8661,17 @@ # Check whether --enable-mergelibs was given. -if test ${enable_mergelibs+y} -then : +if test "${enable_mergelibs+set}" = set; then : enableval=$enable_mergelibs; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_mergelibs=yes else enable_mergelibs=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-mergelibs=$enable_mergelibs" >&5 -printf "%s\n" "$as_me: Randomly set --enable-mergelibs=$enable_mergelibs" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-mergelibs=$enable_mergelibs" >&5 +$as_echo "$as_me: Randomly set --enable-mergelibs=$enable_mergelibs" >&6;} libo_fuzzed_enable_mergelibs=yes libo_fuzz_list="$libo_fuzz_list --enable-mergelibs="'$enable_mergelibs' fi @@ -9196,18 +8682,17 @@ # Check whether --enable-breakpad was given. -if test ${enable_breakpad+y} -then : +if test "${enable_breakpad+set}" = set; then : enableval=$enable_breakpad; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_breakpad=yes else enable_breakpad=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-breakpad=$enable_breakpad" >&5 -printf "%s\n" "$as_me: Randomly set --enable-breakpad=$enable_breakpad" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-breakpad=$enable_breakpad" >&5 +$as_echo "$as_me: Randomly set --enable-breakpad=$enable_breakpad" >&6;} libo_fuzzed_enable_breakpad=yes libo_fuzz_list="$libo_fuzz_list --enable-breakpad="'$enable_breakpad' fi @@ -9218,18 +8703,17 @@ # Check whether --enable-crashdump was given. -if test ${enable_crashdump+y} -then : +if test "${enable_crashdump+set}" = set; then : enableval=$enable_crashdump; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_crashdump=yes else enable_crashdump=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-crashdump=$enable_crashdump" >&5 -printf "%s\n" "$as_me: Randomly set --enable-crashdump=$enable_crashdump" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-crashdump=$enable_crashdump" >&5 +$as_echo "$as_me: Randomly set --enable-crashdump=$enable_crashdump" >&6;} libo_fuzzed_enable_crashdump=yes libo_fuzz_list="$libo_fuzz_list --enable-crashdump="'$enable_crashdump' fi @@ -9239,33 +8723,30 @@ # Check whether --enable-fetch-external was given. -if test ${enable_fetch_external+y} -then : +if test "${enable_fetch_external+set}" = set; then : enableval=$enable_fetch_external; fi # Check whether --enable-fuzzers was given. -if test ${enable_fuzzers+y} -then : +if test "${enable_fuzzers+set}" = set; then : enableval=$enable_fuzzers; fi # Check whether --enable-pch was given. -if test ${enable_pch+y} -then : +if test "${enable_pch+set}" = set; then : enableval=$enable_pch; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_pch=yes else enable_pch=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-pch=$enable_pch" >&5 -printf "%s\n" "$as_me: Randomly set --enable-pch=$enable_pch" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-pch=$enable_pch" >&5 +$as_echo "$as_me: Randomly set --enable-pch=$enable_pch" >&6;} libo_fuzzed_enable_pch=yes libo_fuzz_list="$libo_fuzz_list --enable-pch="'$enable_pch' fi @@ -9276,18 +8757,17 @@ # Check whether --enable-epm was given. -if test ${enable_epm+y} -then : +if test "${enable_epm+set}" = set; then : enableval=$enable_epm; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_epm=yes else enable_epm=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-epm=$enable_epm" >&5 -printf "%s\n" "$as_me: Randomly set --enable-epm=$enable_epm" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-epm=$enable_epm" >&5 +$as_echo "$as_me: Randomly set --enable-epm=$enable_epm" >&6;} libo_fuzzed_enable_epm=yes libo_fuzz_list="$libo_fuzz_list --enable-epm="'$enable_epm' fi @@ -9298,18 +8778,17 @@ # Check whether --enable-odk was given. -if test ${enable_odk+y} -then : +if test "${enable_odk+set}" = set; then : enableval=$enable_odk; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_odk=yes else enable_odk=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-odk=$enable_odk" >&5 -printf "%s\n" "$as_me: Randomly set --enable-odk=$enable_odk" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-odk=$enable_odk" >&5 +$as_echo "$as_me: Randomly set --enable-odk=$enable_odk" >&6;} libo_fuzzed_enable_odk=yes libo_fuzz_list="$libo_fuzz_list --enable-odk="'$enable_odk' fi @@ -9319,26 +8798,24 @@ # Check whether --enable-mpl-subset was given. -if test ${enable_mpl_subset+y} -then : +if test "${enable_mpl_subset+set}" = set; then : enableval=$enable_mpl_subset; fi # Check whether --enable-evolution2 was given. -if test ${enable_evolution2+y} -then : +if test "${enable_evolution2+set}" = set; then : enableval=$enable_evolution2; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_evolution2=yes else enable_evolution2=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-evolution2=$enable_evolution2" >&5 -printf "%s\n" "$as_me: Randomly set --enable-evolution2=$enable_evolution2" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-evolution2=$enable_evolution2" >&5 +$as_echo "$as_me: Randomly set --enable-evolution2=$enable_evolution2" >&6;} libo_fuzzed_enable_evolution2=yes libo_fuzz_list="$libo_fuzz_list --enable-evolution2="'$enable_evolution2' fi @@ -9348,26 +8825,24 @@ # Check whether --enable-avahi was given. -if test ${enable_avahi+y} -then : +if test "${enable_avahi+set}" = set; then : enableval=$enable_avahi; fi # Check whether --enable-werror was given. -if test ${enable_werror+y} -then : +if test "${enable_werror+set}" = set; then : enableval=$enable_werror; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_werror=yes else enable_werror=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-werror=$enable_werror" >&5 -printf "%s\n" "$as_me: Randomly set --enable-werror=$enable_werror" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-werror=$enable_werror" >&5 +$as_echo "$as_me: Randomly set --enable-werror=$enable_werror" >&6;} libo_fuzzed_enable_werror=yes libo_fuzz_list="$libo_fuzz_list --enable-werror="'$enable_werror' fi @@ -9378,18 +8853,17 @@ # Check whether --enable-assert-always-abort was given. -if test ${enable_assert_always_abort+y} -then : +if test "${enable_assert_always_abort+set}" = set; then : enableval=$enable_assert_always_abort; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_assert_always_abort=yes else enable_assert_always_abort=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-assert-always-abort=$enable_assert_always_abort" >&5 -printf "%s\n" "$as_me: Randomly set --enable-assert-always-abort=$enable_assert_always_abort" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-assert-always-abort=$enable_assert_always_abort" >&5 +$as_echo "$as_me: Randomly set --enable-assert-always-abort=$enable_assert_always_abort" >&6;} libo_fuzzed_enable_assert_always_abort=yes libo_fuzz_list="$libo_fuzz_list --enable-assert-always-abort="'$enable_assert_always_abort' fi @@ -9400,18 +8874,17 @@ # Check whether --enable-dbgutil was given. -if test ${enable_dbgutil+y} -then : +if test "${enable_dbgutil+set}" = set; then : enableval=$enable_dbgutil; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_dbgutil=yes else enable_dbgutil=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-dbgutil=$enable_dbgutil" >&5 -printf "%s\n" "$as_me: Randomly set --enable-dbgutil=$enable_dbgutil" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-dbgutil=$enable_dbgutil" >&5 +$as_echo "$as_me: Randomly set --enable-dbgutil=$enable_dbgutil" >&6;} libo_fuzzed_enable_dbgutil=yes libo_fuzz_list="$libo_fuzz_list --enable-dbgutil="'$enable_dbgutil' fi @@ -9422,18 +8895,17 @@ # Check whether --enable-debug was given. -if test ${enable_debug+y} -then : +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_debug=yes else enable_debug=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-debug=$enable_debug" >&5 -printf "%s\n" "$as_me: Randomly set --enable-debug=$enable_debug" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-debug=$enable_debug" >&5 +$as_echo "$as_me: Randomly set --enable-debug=$enable_debug" >&6;} libo_fuzzed_enable_debug=yes libo_fuzz_list="$libo_fuzz_list --enable-debug="'$enable_debug' fi @@ -9444,18 +8916,17 @@ # Check whether --enable-split-debug was given. -if test ${enable_split_debug+y} -then : +if test "${enable_split_debug+set}" = set; then : enableval=$enable_split_debug; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_split_debug=yes else enable_split_debug=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-split-debug=$enable_split_debug" >&5 -printf "%s\n" "$as_me: Randomly set --enable-split-debug=$enable_split_debug" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-split-debug=$enable_split_debug" >&5 +$as_echo "$as_me: Randomly set --enable-split-debug=$enable_split_debug" >&6;} libo_fuzzed_enable_split_debug=yes libo_fuzz_list="$libo_fuzz_list --enable-split-debug="'$enable_split_debug' fi @@ -9466,18 +8937,17 @@ # Check whether --enable-gdb-index was given. -if test ${enable_gdb_index+y} -then : +if test "${enable_gdb_index+set}" = set; then : enableval=$enable_gdb_index; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_gdb_index=yes else enable_gdb_index=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gdb-index=$enable_gdb_index" >&5 -printf "%s\n" "$as_me: Randomly set --enable-gdb-index=$enable_gdb_index" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gdb-index=$enable_gdb_index" >&5 +$as_echo "$as_me: Randomly set --enable-gdb-index=$enable_gdb_index" >&6;} libo_fuzzed_enable_gdb_index=yes libo_fuzz_list="$libo_fuzz_list --enable-gdb-index="'$enable_gdb_index' fi @@ -9488,18 +8958,17 @@ # Check whether --enable-sal-log was given. -if test ${enable_sal_log+y} -then : +if test "${enable_sal_log+set}" = set; then : enableval=$enable_sal_log; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_sal_log=yes else enable_sal_log=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-sal-log=$enable_sal_log" >&5 -printf "%s\n" "$as_me: Randomly set --enable-sal-log=$enable_sal_log" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-sal-log=$enable_sal_log" >&5 +$as_echo "$as_me: Randomly set --enable-sal-log=$enable_sal_log" >&6;} libo_fuzzed_enable_sal_log=yes libo_fuzz_list="$libo_fuzz_list --enable-sal-log="'$enable_sal_log' fi @@ -9510,18 +8979,17 @@ # Check whether --enable-symbols was given. -if test ${enable_symbols+y} -then : +if test "${enable_symbols+set}" = set; then : enableval=$enable_symbols; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_symbols=yes else enable_symbols=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-symbols=$enable_symbols" >&5 -printf "%s\n" "$as_me: Randomly set --enable-symbols=$enable_symbols" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-symbols=$enable_symbols" >&5 +$as_echo "$as_me: Randomly set --enable-symbols=$enable_symbols" >&6;} libo_fuzzed_enable_symbols=yes libo_fuzz_list="$libo_fuzz_list --enable-symbols="'$enable_symbols' fi @@ -9532,18 +9000,17 @@ # Check whether --enable-optimized was given. -if test ${enable_optimized+y} -then : +if test "${enable_optimized+set}" = set; then : enableval=$enable_optimized; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_optimized=yes else enable_optimized=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-optimized=$enable_optimized" >&5 -printf "%s\n" "$as_me: Randomly set --enable-optimized=$enable_optimized" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-optimized=$enable_optimized" >&5 +$as_echo "$as_me: Randomly set --enable-optimized=$enable_optimized" >&6;} libo_fuzzed_enable_optimized=yes libo_fuzz_list="$libo_fuzz_list --enable-optimized="'$enable_optimized' fi @@ -9554,18 +9021,17 @@ # Check whether --enable-runtime-optimizations was given. -if test ${enable_runtime_optimizations+y} -then : +if test "${enable_runtime_optimizations+set}" = set; then : enableval=$enable_runtime_optimizations; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_runtime_optimizations=yes else enable_runtime_optimizations=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-runtime-optimizations=$enable_runtime_optimizations" >&5 -printf "%s\n" "$as_me: Randomly set --enable-runtime-optimizations=$enable_runtime_optimizations" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-runtime-optimizations=$enable_runtime_optimizations" >&5 +$as_echo "$as_me: Randomly set --enable-runtime-optimizations=$enable_runtime_optimizations" >&6;} libo_fuzzed_enable_runtime_optimizations=yes libo_fuzz_list="$libo_fuzz_list --enable-runtime-optimizations="'$enable_runtime_optimizations' fi @@ -9576,26 +9042,24 @@ # Check whether --with-valgrind was given. -if test ${with_valgrind+y} -then : +if test "${with_valgrind+set}" = set; then : withval=$with_valgrind; fi # Check whether --enable-compiler-plugins was given. -if test ${enable_compiler_plugins+y} -then : +if test "${enable_compiler_plugins+set}" = set; then : enableval=$enable_compiler_plugins; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_compiler_plugins=yes else enable_compiler_plugins=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-compiler-plugins=$enable_compiler_plugins" >&5 -printf "%s\n" "$as_me: Randomly set --enable-compiler-plugins=$enable_compiler_plugins" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-compiler-plugins=$enable_compiler_plugins" >&5 +$as_echo "$as_me: Randomly set --enable-compiler-plugins=$enable_compiler_plugins" >&6;} libo_fuzzed_enable_compiler_plugins=yes libo_fuzz_list="$libo_fuzz_list --enable-compiler-plugins="'$enable_compiler_plugins' fi @@ -9611,18 +9075,17 @@ # Check whether --enable-compiler-plugins-analyzer-pch was given. -if test ${enable_compiler_plugins_analyzer_pch+y} -then : +if test "${enable_compiler_plugins_analyzer_pch+set}" = set; then : enableval=$enable_compiler_plugins_analyzer_pch; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_compiler_plugins_analyzer_pch=yes else enable_compiler_plugins_analyzer_pch=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-compiler-plugins-analyzer-pch=$enable_compiler_plugins_analyzer_pch" >&5 -printf "%s\n" "$as_me: Randomly set --enable-compiler-plugins-analyzer-pch=$enable_compiler_plugins_analyzer_pch" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-compiler-plugins-analyzer-pch=$enable_compiler_plugins_analyzer_pch" >&5 +$as_echo "$as_me: Randomly set --enable-compiler-plugins-analyzer-pch=$enable_compiler_plugins_analyzer_pch" >&6;} libo_fuzzed_enable_compiler_plugins_analyzer_pch=yes libo_fuzz_list="$libo_fuzz_list --enable-compiler-plugins-analyzer-pch="'$enable_compiler_plugins_analyzer_pch' fi @@ -9633,18 +9096,17 @@ # Check whether --enable-ooenv was given. -if test ${enable_ooenv+y} -then : +if test "${enable_ooenv+set}" = set; then : enableval=$enable_ooenv; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_ooenv=yes else enable_ooenv=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-ooenv=$enable_ooenv" >&5 -printf "%s\n" "$as_me: Randomly set --enable-ooenv=$enable_ooenv" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-ooenv=$enable_ooenv" >&5 +$as_echo "$as_me: Randomly set --enable-ooenv=$enable_ooenv" >&6;} libo_fuzzed_enable_ooenv=yes libo_fuzz_list="$libo_fuzz_list --enable-ooenv="'$enable_ooenv' fi @@ -9654,33 +9116,30 @@ # Check whether --enable-lto was given. -if test ${enable_lto+y} -then : +if test "${enable_lto+set}" = set; then : enableval=$enable_lto; fi # Check whether --enable-python was given. -if test ${enable_python+y} -then : +if test "${enable_python+set}" = set; then : enableval=$enable_python; fi # Check whether --enable-gtk3 was given. -if test ${enable_gtk3+y} -then : +if test "${enable_gtk3+set}" = set; then : enableval=$enable_gtk3; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_gtk3=yes else enable_gtk3=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gtk3=$enable_gtk3" >&5 -printf "%s\n" "$as_me: Randomly set --enable-gtk3=$enable_gtk3" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gtk3=$enable_gtk3" >&5 +$as_echo "$as_me: Randomly set --enable-gtk3=$enable_gtk3" >&6;} libo_fuzzed_enable_gtk3=yes libo_fuzz_list="$libo_fuzz_list --enable-gtk3="'$enable_gtk3' fi @@ -9690,47 +9149,42 @@ # Check whether --enable-gtk4 was given. -if test ${enable_gtk4+y} -then : +if test "${enable_gtk4+set}" = set; then : enableval=$enable_gtk4; fi # Check whether --enable-introspection was given. -if test ${enable_introspection+y} -then : +if test "${enable_introspection+set}" = set; then : enableval=$enable_introspection; fi # Check whether --enable-split-app-modules was given. -if test ${enable_split_app_modules+y} -then : +if test "${enable_split_app_modules+set}" = set; then : enableval=$enable_split_app_modules; fi # Check whether --enable-split-opt-features was given. -if test ${enable_split_opt_features+y} -then : +if test "${enable_split_opt_features+set}" = set; then : enableval=$enable_split_opt_features; fi # Check whether --enable-cairo-canvas was given. -if test ${enable_cairo_canvas+y} -then : +if test "${enable_cairo_canvas+set}" = set; then : enableval=$enable_cairo_canvas; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_cairo_canvas=yes else enable_cairo_canvas=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-cairo-canvas=$enable_cairo_canvas" >&5 -printf "%s\n" "$as_me: Randomly set --enable-cairo-canvas=$enable_cairo_canvas" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-cairo-canvas=$enable_cairo_canvas" >&5 +$as_echo "$as_me: Randomly set --enable-cairo-canvas=$enable_cairo_canvas" >&6;} libo_fuzzed_enable_cairo_canvas=yes libo_fuzz_list="$libo_fuzz_list --enable-cairo-canvas="'$enable_cairo_canvas' fi @@ -9741,18 +9195,17 @@ # Check whether --enable-dbus was given. -if test ${enable_dbus+y} -then : +if test "${enable_dbus+set}" = set; then : enableval=$enable_dbus; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_dbus=yes else enable_dbus=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-dbus=$enable_dbus" >&5 -printf "%s\n" "$as_me: Randomly set --enable-dbus=$enable_dbus" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-dbus=$enable_dbus" >&5 +$as_echo "$as_me: Randomly set --enable-dbus=$enable_dbus" >&6;} libo_fuzzed_enable_dbus=yes libo_fuzz_list="$libo_fuzz_list --enable-dbus="'$enable_dbus' fi @@ -9763,18 +9216,17 @@ # Check whether --enable-sdremote was given. -if test ${enable_sdremote+y} -then : +if test "${enable_sdremote+set}" = set; then : enableval=$enable_sdremote; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_sdremote=yes else enable_sdremote=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-sdremote=$enable_sdremote" >&5 -printf "%s\n" "$as_me: Randomly set --enable-sdremote=$enable_sdremote" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-sdremote=$enable_sdremote" >&5 +$as_echo "$as_me: Randomly set --enable-sdremote=$enable_sdremote" >&6;} libo_fuzzed_enable_sdremote=yes libo_fuzz_list="$libo_fuzz_list --enable-sdremote="'$enable_sdremote' fi @@ -9785,18 +9237,17 @@ # Check whether --enable-sdremote-bluetooth was given. -if test ${enable_sdremote_bluetooth+y} -then : +if test "${enable_sdremote_bluetooth+set}" = set; then : enableval=$enable_sdremote_bluetooth; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_sdremote_bluetooth=yes else enable_sdremote_bluetooth=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-sdremote-bluetooth=$enable_sdremote_bluetooth" >&5 -printf "%s\n" "$as_me: Randomly set --enable-sdremote-bluetooth=$enable_sdremote_bluetooth" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-sdremote-bluetooth=$enable_sdremote_bluetooth" >&5 +$as_echo "$as_me: Randomly set --enable-sdremote-bluetooth=$enable_sdremote_bluetooth" >&6;} libo_fuzzed_enable_sdremote_bluetooth=yes libo_fuzz_list="$libo_fuzz_list --enable-sdremote-bluetooth="'$enable_sdremote_bluetooth' fi @@ -9807,18 +9258,17 @@ # Check whether --enable-gio was given. -if test ${enable_gio+y} -then : +if test "${enable_gio+set}" = set; then : enableval=$enable_gio; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_gio=yes else enable_gio=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gio=$enable_gio" >&5 -printf "%s\n" "$as_me: Randomly set --enable-gio=$enable_gio" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gio=$enable_gio" >&5 +$as_echo "$as_me: Randomly set --enable-gio=$enable_gio" >&6;} libo_fuzzed_enable_gio=yes libo_fuzz_list="$libo_fuzz_list --enable-gio="'$enable_gio' fi @@ -9828,65 +9278,58 @@ # Check whether --enable-qt5 was given. -if test ${enable_qt5+y} -then : +if test "${enable_qt5+set}" = set; then : enableval=$enable_qt5; fi # Check whether --enable-qt6 was given. -if test ${enable_qt6+y} -then : +if test "${enable_qt6+set}" = set; then : enableval=$enable_qt6; fi # Check whether --enable-kf5 was given. -if test ${enable_kf5+y} -then : +if test "${enable_kf5+set}" = set; then : enableval=$enable_kf5; fi # Check whether --enable-gtk3_kde5 was given. -if test ${enable_gtk3_kde5+y} -then : +if test "${enable_gtk3_kde5+set}" = set; then : enableval=$enable_gtk3_kde5; fi # Check whether --enable-gen was given. -if test ${enable_gen+y} -then : +if test "${enable_gen+set}" = set; then : enableval=$enable_gen; -else $as_nop +else test "${test_gen}" = no -o "${enable_gen+set}" = set || enable_gen=yes fi # Check whether --enable-gui was given. -if test ${enable_gui+y} -then : +if test "${enable_gui+set}" = set; then : enableval=$enable_gui; -else $as_nop +else enable_gui=yes fi # Check whether --enable-randr was given. -if test ${enable_randr+y} -then : +if test "${enable_randr+set}" = set; then : enableval=$enable_randr; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_randr=yes else enable_randr=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-randr=$enable_randr" >&5 -printf "%s\n" "$as_me: Randomly set --enable-randr=$enable_randr" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-randr=$enable_randr" >&5 +$as_echo "$as_me: Randomly set --enable-randr=$enable_randr" >&6;} libo_fuzzed_enable_randr=yes libo_fuzz_list="$libo_fuzz_list --enable-randr="'$enable_randr' fi @@ -9897,18 +9340,17 @@ # Check whether --enable-gstreamer-1-0 was given. -if test ${enable_gstreamer_1_0+y} -then : +if test "${enable_gstreamer_1_0+set}" = set; then : enableval=$enable_gstreamer_1_0; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_gstreamer_1_0=yes else enable_gstreamer_1_0=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gstreamer-1-0=$enable_gstreamer_1_0" >&5 -printf "%s\n" "$as_me: Randomly set --enable-gstreamer-1-0=$enable_gstreamer_1_0" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gstreamer-1-0=$enable_gstreamer_1_0" >&5 +$as_echo "$as_me: Randomly set --enable-gstreamer-1-0=$enable_gstreamer_1_0" >&6;} libo_fuzzed_enable_gstreamer_1_0=yes libo_fuzz_list="$libo_fuzz_list --enable-gstreamer-1-0="'$enable_gstreamer_1_0' fi @@ -9919,18 +9361,17 @@ # Check whether --enable-cve-tests was given. -if test ${enable_cve_tests+y} -then : +if test "${enable_cve_tests+set}" = set; then : enableval=$enable_cve_tests; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_cve_tests=yes else enable_cve_tests=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-cve-tests=$enable_cve_tests" >&5 -printf "%s\n" "$as_me: Randomly set --enable-cve-tests=$enable_cve_tests" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-cve-tests=$enable_cve_tests" >&5 +$as_echo "$as_me: Randomly set --enable-cve-tests=$enable_cve_tests" >&6;} libo_fuzzed_enable_cve_tests=yes libo_fuzz_list="$libo_fuzz_list --enable-cve-tests="'$enable_cve_tests' fi @@ -9941,18 +9382,17 @@ # Check whether --enable-chart-tests was given. -if test ${enable_chart_tests+y} -then : +if test "${enable_chart_tests+set}" = set; then : enableval=$enable_chart_tests; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_chart_tests=yes else enable_chart_tests=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-chart-tests=$enable_chart_tests" >&5 -printf "%s\n" "$as_me: Randomly set --enable-chart-tests=$enable_chart_tests" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-chart-tests=$enable_chart_tests" >&5 +$as_echo "$as_me: Randomly set --enable-chart-tests=$enable_chart_tests" >&6;} libo_fuzzed_enable_chart_tests=yes libo_fuzz_list="$libo_fuzz_list --enable-chart-tests="'$enable_chart_tests' fi @@ -9962,47 +9402,42 @@ # Check whether --enable-build-opensymbol was given. -if test ${enable_build_opensymbol+y} -then : +if test "${enable_build_opensymbol+set}" = set; then : enableval=$enable_build_opensymbol; fi # Check whether --enable-dependency-tracking was given. -if test ${enable_dependency_tracking+y} -then : +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi # Check whether --enable-icecream was given. -if test ${enable_icecream+y} -then : +if test "${enable_icecream+set}" = set; then : enableval=$enable_icecream; fi # Check whether --enable-ld was given. -if test ${enable_ld+y} -then : +if test "${enable_ld+set}" = set; then : enableval=$enable_ld; fi # Check whether --enable-cups was given. -if test ${enable_cups+y} -then : +if test "${enable_cups+set}" = set; then : enableval=$enable_cups; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_cups=yes else enable_cups=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-cups=$enable_cups" >&5 -printf "%s\n" "$as_me: Randomly set --enable-cups=$enable_cups" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-cups=$enable_cups" >&5 +$as_echo "$as_me: Randomly set --enable-cups=$enable_cups" >&6;} libo_fuzzed_enable_cups=yes libo_fuzz_list="$libo_fuzz_list --enable-cups="'$enable_cups' fi @@ -10012,33 +9447,30 @@ # Check whether --enable-ccache was given. -if test ${enable_ccache+y} -then : +if test "${enable_ccache+set}" = set; then : enableval=$enable_ccache; fi # Check whether --enable-z7-debug was given. -if test ${enable_z7_debug+y} -then : +if test "${enable_z7_debug+set}" = set; then : enableval=$enable_z7_debug; fi # Check whether --enable-online-update was given. -if test ${enable_online_update+y} -then : +if test "${enable_online_update+set}" = set; then : enableval=$enable_online_update; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_online_update=yes else enable_online_update=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-online-update=$enable_online_update" >&5 -printf "%s\n" "$as_me: Randomly set --enable-online-update=$enable_online_update" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-online-update=$enable_online_update" >&5 +$as_echo "$as_me: Randomly set --enable-online-update=$enable_online_update" >&6;} libo_fuzzed_enable_online_update=yes libo_fuzz_list="$libo_fuzz_list --enable-online-update="'$enable_online_update' fi @@ -10049,26 +9481,24 @@ # Check whether --with-update-config was given. -if test ${with_update_config+y} -then : +if test "${with_update_config+set}" = set; then : withval=$with_update_config; fi # Check whether --enable-extension-update was given. -if test ${enable_extension_update+y} -then : +if test "${enable_extension_update+set}" = set; then : enableval=$enable_extension_update; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_extension_update=yes else enable_extension_update=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-extension-update=$enable_extension_update" >&5 -printf "%s\n" "$as_me: Randomly set --enable-extension-update=$enable_extension_update" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-extension-update=$enable_extension_update" >&5 +$as_echo "$as_me: Randomly set --enable-extension-update=$enable_extension_update" >&6;} libo_fuzzed_enable_extension_update=yes libo_fuzz_list="$libo_fuzz_list --enable-extension-update="'$enable_extension_update' fi @@ -10079,18 +9509,17 @@ # Check whether --enable-release-build was given. -if test ${enable_release_build+y} -then : +if test "${enable_release_build+set}" = set; then : enableval=$enable_release_build; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_release_build=yes else enable_release_build=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-release-build=$enable_release_build" >&5 -printf "%s\n" "$as_me: Randomly set --enable-release-build=$enable_release_build" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-release-build=$enable_release_build" >&5 +$as_echo "$as_me: Randomly set --enable-release-build=$enable_release_build" >&6;} libo_fuzzed_enable_release_build=yes libo_fuzz_list="$libo_fuzz_list --enable-release-build="'$enable_release_build' fi @@ -10100,82 +9529,73 @@ # Check whether --enable-windows-build-signing was given. -if test ${enable_windows_build_signing+y} -then : +if test "${enable_windows_build_signing+set}" = set; then : enableval=$enable_windows_build_signing; fi # Check whether --enable-silent-msi was given. -if test ${enable_silent_msi+y} -then : +if test "${enable_silent_msi+set}" = set; then : enableval=$enable_silent_msi; fi # Check whether --enable-macosx-code-signing was given. -if test ${enable_macosx_code_signing+y} -then : +if test "${enable_macosx_code_signing+set}" = set; then : enableval=$enable_macosx_code_signing; fi # Check whether --enable-macosx-package-signing was given. -if test ${enable_macosx_package_signing+y} -then : +if test "${enable_macosx_package_signing+set}" = set; then : enableval=$enable_macosx_package_signing; fi # Check whether --enable-macosx-sandbox was given. -if test ${enable_macosx_sandbox+y} -then : +if test "${enable_macosx_sandbox+set}" = set; then : enableval=$enable_macosx_sandbox; fi # Check whether --with-macosx-bundle-identifier was given. -if test ${with_macosx_bundle_identifier+y} -then : +if test "${with_macosx_bundle_identifier+set}" = set; then : withval=$with_macosx_bundle_identifier; -else $as_nop +else with_macosx_bundle_identifier=org.libreoffice.script fi # Check whether --with-macosx-provisioning-profile was given. -if test ${with_macosx_provisioning_profile+y} -then : +if test "${with_macosx_provisioning_profile+set}" = set; then : withval=$with_macosx_provisioning_profile; fi # Check whether --with-product-name was given. -if test ${with_product_name+y} -then : +if test "${with_product_name+set}" = set; then : withval=$with_product_name; -else $as_nop +else with_product_name=$PRODUCTNAME fi # Check whether --enable-community-flavor was given. -if test ${enable_community_flavor+y} -then : +if test "${enable_community_flavor+set}" = set; then : enableval=$enable_community_flavor; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_community_flavor=yes else enable_community_flavor=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-community-flavor=$enable_community_flavor" >&5 -printf "%s\n" "$as_me: Randomly set --enable-community-flavor=$enable_community_flavor" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-community-flavor=$enable_community_flavor" >&5 +$as_echo "$as_me: Randomly set --enable-community-flavor=$enable_community_flavor" >&6;} libo_fuzzed_enable_community_flavor=yes libo_fuzz_list="$libo_fuzz_list --enable-community-flavor="'$enable_community_flavor' fi @@ -10186,26 +9606,24 @@ # Check whether --with-package-version was given. -if test ${with_package_version+y} -then : +if test "${with_package_version+set}" = set; then : withval=$with_package_version; fi # Check whether --enable-readonly-installset was given. -if test ${enable_readonly_installset+y} -then : +if test "${enable_readonly_installset+set}" = set; then : enableval=$enable_readonly_installset; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_readonly_installset=yes else enable_readonly_installset=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-readonly-installset=$enable_readonly_installset" >&5 -printf "%s\n" "$as_me: Randomly set --enable-readonly-installset=$enable_readonly_installset" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-readonly-installset=$enable_readonly_installset" >&5 +$as_echo "$as_me: Randomly set --enable-readonly-installset=$enable_readonly_installset" >&6;} libo_fuzzed_enable_readonly_installset=yes libo_fuzz_list="$libo_fuzz_list --enable-readonly-installset="'$enable_readonly_installset' fi @@ -10216,18 +9634,17 @@ # Check whether --enable-mariadb-sdbc was given. -if test ${enable_mariadb_sdbc+y} -then : +if test "${enable_mariadb_sdbc+set}" = set; then : enableval=$enable_mariadb_sdbc; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_mariadb_sdbc=yes else enable_mariadb_sdbc=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-mariadb-sdbc=$enable_mariadb_sdbc" >&5 -printf "%s\n" "$as_me: Randomly set --enable-mariadb-sdbc=$enable_mariadb_sdbc" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-mariadb-sdbc=$enable_mariadb_sdbc" >&5 +$as_echo "$as_me: Randomly set --enable-mariadb-sdbc=$enable_mariadb_sdbc" >&6;} libo_fuzzed_enable_mariadb_sdbc=yes libo_fuzz_list="$libo_fuzz_list --enable-mariadb-sdbc="'$enable_mariadb_sdbc' fi @@ -10238,18 +9655,17 @@ # Check whether --enable-postgresql-sdbc was given. -if test ${enable_postgresql_sdbc+y} -then : +if test "${enable_postgresql_sdbc+set}" = set; then : enableval=$enable_postgresql_sdbc; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_postgresql_sdbc=yes else enable_postgresql_sdbc=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-postgresql-sdbc=$enable_postgresql_sdbc" >&5 -printf "%s\n" "$as_me: Randomly set --enable-postgresql-sdbc=$enable_postgresql_sdbc" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-postgresql-sdbc=$enable_postgresql_sdbc" >&5 +$as_echo "$as_me: Randomly set --enable-postgresql-sdbc=$enable_postgresql_sdbc" >&6;} libo_fuzzed_enable_postgresql_sdbc=yes libo_fuzz_list="$libo_fuzz_list --enable-postgresql-sdbc="'$enable_postgresql_sdbc' fi @@ -10260,18 +9676,17 @@ # Check whether --enable-lotuswordpro was given. -if test ${enable_lotuswordpro+y} -then : +if test "${enable_lotuswordpro+set}" = set; then : enableval=$enable_lotuswordpro; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_lotuswordpro=yes else enable_lotuswordpro=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-lotuswordpro=$enable_lotuswordpro" >&5 -printf "%s\n" "$as_me: Randomly set --enable-lotuswordpro=$enable_lotuswordpro" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-lotuswordpro=$enable_lotuswordpro" >&5 +$as_echo "$as_me: Randomly set --enable-lotuswordpro=$enable_lotuswordpro" >&6;} libo_fuzzed_enable_lotuswordpro=yes libo_fuzz_list="$libo_fuzz_list --enable-lotuswordpro="'$enable_lotuswordpro' fi @@ -10282,18 +9697,17 @@ # Check whether --enable-firebird-sdbc was given. -if test ${enable_firebird_sdbc+y} -then : +if test "${enable_firebird_sdbc+set}" = set; then : enableval=$enable_firebird_sdbc; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_firebird_sdbc=yes else enable_firebird_sdbc=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-firebird-sdbc=$enable_firebird_sdbc" >&5 -printf "%s\n" "$as_me: Randomly set --enable-firebird-sdbc=$enable_firebird_sdbc" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-firebird-sdbc=$enable_firebird_sdbc" >&5 +$as_echo "$as_me: Randomly set --enable-firebird-sdbc=$enable_firebird_sdbc" >&6;} libo_fuzzed_enable_firebird_sdbc=yes libo_fuzz_list="$libo_fuzz_list --enable-firebird-sdbc="'$enable_firebird_sdbc' fi @@ -10303,35 +9717,32 @@ # Check whether --enable-bogus-pkg-config was given. -if test ${enable_bogus_pkg_config+y} -then : +if test "${enable_bogus_pkg_config+set}" = set; then : enableval=$enable_bogus_pkg_config; fi # Check whether --enable-openssl was given. -if test ${enable_openssl+y} -then : +if test "${enable_openssl+set}" = set; then : enableval=$enable_openssl; -else $as_nop +else enable_openssl=yes fi # Check whether --enable-cipher-openssl-backend was given. -if test ${enable_cipher_openssl_backend+y} -then : +if test "${enable_cipher_openssl_backend+set}" = set; then : enableval=$enable_cipher_openssl_backend; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_cipher_openssl_backend=yes else enable_cipher_openssl_backend=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-cipher-openssl-backend=$enable_cipher_openssl_backend" >&5 -printf "%s\n" "$as_me: Randomly set --enable-cipher-openssl-backend=$enable_cipher_openssl_backend" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-cipher-openssl-backend=$enable_cipher_openssl_backend" >&5 +$as_echo "$as_me: Randomly set --enable-cipher-openssl-backend=$enable_cipher_openssl_backend" >&6;} libo_fuzzed_enable_cipher_openssl_backend=yes libo_fuzz_list="$libo_fuzz_list --enable-cipher-openssl-backend="'$enable_cipher_openssl_backend' fi @@ -10341,42 +9752,38 @@ # Check whether --enable-nss was given. -if test ${enable_nss+y} -then : +if test "${enable_nss+set}" = set; then : enableval=$enable_nss; -else $as_nop +else enable_nss=yes fi # Check whether --enable-library-bin-tar was given. -if test ${enable_library_bin_tar+y} -then : +if test "${enable_library_bin_tar+set}" = set; then : enableval=$enable_library_bin_tar; fi # Check whether --enable-dconf was given. -if test ${enable_dconf+y} -then : +if test "${enable_dconf+set}" = set; then : enableval=$enable_dconf; fi # Check whether --enable-formula-logger was given. -if test ${enable_formula_logger+y} -then : +if test "${enable_formula_logger+set}" = set; then : enableval=$enable_formula_logger; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_formula_logger=yes else enable_formula_logger=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-formula-logger=$enable_formula_logger" >&5 -printf "%s\n" "$as_me: Randomly set --enable-formula-logger=$enable_formula_logger" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-formula-logger=$enable_formula_logger" >&5 +$as_echo "$as_me: Randomly set --enable-formula-logger=$enable_formula_logger" >&6;} libo_fuzzed_enable_formula_logger=yes libo_fuzz_list="$libo_fuzz_list --enable-formula-logger="'$enable_formula_logger' fi @@ -10386,37 +9793,34 @@ # Check whether --enable-ldap was given. -if test ${enable_ldap+y} -then : +if test "${enable_ldap+set}" = set; then : enableval=$enable_ldap; -else $as_nop +else enable_ldap=yes fi # Check whether --enable-opencl was given. -if test ${enable_opencl+y} -then : +if test "${enable_opencl+set}" = set; then : enableval=$enable_opencl; -else $as_nop +else enable_opencl=yes fi # Check whether --enable-librelogo was given. -if test ${enable_librelogo+y} -then : +if test "${enable_librelogo+set}" = set; then : enableval=$enable_librelogo; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_librelogo=yes else enable_librelogo=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-librelogo=$enable_librelogo" >&5 -printf "%s\n" "$as_me: Randomly set --enable-librelogo=$enable_librelogo" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-librelogo=$enable_librelogo" >&5 +$as_echo "$as_me: Randomly set --enable-librelogo=$enable_librelogo" >&6;} libo_fuzzed_enable_librelogo=yes libo_fuzz_list="$libo_fuzz_list --enable-librelogo="'$enable_librelogo' fi @@ -10426,31 +9830,27 @@ # Check whether --enable-wasm-strip was given. -if test ${enable_wasm_strip+y} -then : +if test "${enable_wasm_strip+set}" = set; then : enableval=$enable_wasm_strip; fi # Check whether --enable-wasm-exceptions was given. -if test ${enable_wasm_exceptions+y} -then : +if test "${enable_wasm_exceptions+set}" = set; then : enableval=$enable_wasm_exceptions; fi # Check whether --enable-xmlhelp was given. -if test ${enable_xmlhelp+y} -then : +if test "${enable_xmlhelp+set}" = set; then : enableval=$enable_xmlhelp; -else $as_nop +else enable_xmlhelp=yes fi # Check whether --enable-customtarget-components was given. -if test ${enable_customtarget_components+y} -then : +if test "${enable_customtarget_components+set}" = set; then : enableval=$enable_customtarget_components; fi @@ -10458,72 +9858,63 @@ # Check whether --with-gcc-home was given. -if test ${with_gcc_home+y} -then : +if test "${with_gcc_home+set}" = set; then : withval=$with_gcc_home; fi # Check whether --with-gnu-patch was given. -if test ${with_gnu_patch+y} -then : +if test "${with_gnu_patch+set}" = set; then : withval=$with_gnu_patch; fi # Check whether --with-build-platform-configure-options was given. -if test ${with_build_platform_configure_options+y} -then : +if test "${with_build_platform_configure_options+set}" = set; then : withval=$with_build_platform_configure_options; fi # Check whether --with-gnu-cp was given. -if test ${with_gnu_cp+y} -then : +if test "${with_gnu_cp+set}" = set; then : withval=$with_gnu_cp; fi # Check whether --with-external-tar was given. -if test ${with_external_tar+y} -then : +if test "${with_external_tar+set}" = set; then : withval=$with_external_tar; TARFILE_LOCATION=$withval fi # Check whether --with-referenced-git was given. -if test ${with_referenced_git+y} -then : +if test "${with_referenced_git+set}" = set; then : withval=$with_referenced_git; GIT_REFERENCE_SRC=$withval fi # Check whether --with-linked-git was given. -if test ${with_linked_git+y} -then : +if test "${with_linked_git+set}" = set; then : withval=$with_linked_git; GIT_LINK_SRC=$withval fi # Check whether --with-galleries was given. -if test ${with_galleries+y} -then : +if test "${with_galleries+set}" = set; then : withval=$with_galleries; fi # Check whether --with-theme was given. -if test ${with_theme+y} -then : +if test "${with_theme+set}" = set; then : withval=$with_theme; fi @@ -10531,18 +9922,17 @@ # Check whether --with-helppack-integration was given. -if test ${with_helppack_integration+y} -then : +if test "${with_helppack_integration+set}" = set; then : withval=$with_helppack_integration; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then with_helppack_integration=yes else with_helppack_integration=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-helppack-integration=$with_helppack_integration" >&5 -printf "%s\n" "$as_me: Randomly set --with-helppack-integration=$with_helppack_integration" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --with-helppack-integration=$with_helppack_integration" >&5 +$as_echo "$as_me: Randomly set --with-helppack-integration=$with_helppack_integration" >&6;} libo_fuzzed_with_helppack_integration=yes libo_fuzz_list="$libo_fuzz_list --with-helppack-integration="'$with_helppack_integration' fi @@ -10555,18 +9945,17 @@ # Check whether --with-fonts was given. -if test ${with_fonts+y} -then : +if test "${with_fonts+set}" = set; then : withval=$with_fonts; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then with_fonts=yes else with_fonts=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-fonts=$with_fonts" >&5 -printf "%s\n" "$as_me: Randomly set --with-fonts=$with_fonts" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --with-fonts=$with_fonts" >&5 +$as_echo "$as_me: Randomly set --with-fonts=$with_fonts" >&6;} libo_fuzzed_with_fonts=yes libo_fuzz_list="$libo_fuzz_list --with-fonts="'$with_fonts' fi @@ -10578,196 +9967,175 @@ # Check whether --with-epm was given. -if test ${with_epm+y} -then : +if test "${with_epm+set}" = set; then : withval=$with_epm; fi # Check whether --with-package-format was given. -if test ${with_package_format+y} -then : +if test "${with_package_format+set}" = set; then : withval=$with_package_format; fi # Check whether --with-tls was given. -if test ${with_tls+y} -then : +if test "${with_tls+set}" = set; then : withval=$with_tls; fi # Check whether --with-system-libs was given. -if test ${with_system_libs+y} -then : +if test "${with_system_libs+set}" = set; then : withval=$with_system_libs; fi # Check whether --with-system-bzip2 was given. -if test ${with_system_bzip2+y} -then : +if test "${with_system_bzip2+set}" = set; then : withval=$with_system_bzip2; -else $as_nop +else with_system_bzip2="$with_system_libs" fi # Check whether --with-system-headers was given. -if test ${with_system_headers+y} -then : +if test "${with_system_headers+set}" = set; then : withval=$with_system_headers; -else $as_nop +else with_system_headers="$with_system_libs" fi # Check whether --with-system-jars was given. -if test ${with_system_jars+y} -then : +if test "${with_system_jars+set}" = set; then : withval=$with_system_jars; -else $as_nop +else with_system_jars="$with_system_libs" fi # Check whether --with-system-cairo was given. -if test ${with_system_cairo+y} -then : +if test "${with_system_cairo+set}" = set; then : withval=$with_system_cairo; fi # Check whether --with-system-epoxy was given. -if test ${with_system_epoxy+y} -then : +if test "${with_system_epoxy+set}" = set; then : withval=$with_system_epoxy; -else $as_nop +else with_system_epoxy="$with_system_libs" fi # Check whether --with-myspell-dicts was given. -if test ${with_myspell_dicts+y} -then : +if test "${with_myspell_dicts+set}" = set; then : withval=$with_myspell_dicts; fi # Check whether --with-system-dicts was given. -if test ${with_system_dicts+y} -then : +if test "${with_system_dicts+set}" = set; then : withval=$with_system_dicts; fi # Check whether --with-external-dict-dir was given. -if test ${with_external_dict_dir+y} -then : +if test "${with_external_dict_dir+set}" = set; then : withval=$with_external_dict_dir; fi # Check whether --with-external-hyph-dir was given. -if test ${with_external_hyph_dir+y} -then : +if test "${with_external_hyph_dir+set}" = set; then : withval=$with_external_hyph_dir; fi # Check whether --with-external-thes-dir was given. -if test ${with_external_thes_dir+y} -then : +if test "${with_external_thes_dir+set}" = set; then : withval=$with_external_thes_dir; fi # Check whether --with-system-zlib was given. -if test ${with_system_zlib+y} -then : +if test "${with_system_zlib+set}" = set; then : withval=$with_system_zlib; -else $as_nop +else with_system_zlib=auto fi # Check whether --with-system-jpeg was given. -if test ${with_system_jpeg+y} -then : +if test "${with_system_jpeg+set}" = set; then : withval=$with_system_jpeg; -else $as_nop +else with_system_jpeg="$with_system_libs" fi # Check whether --with-system-expat was given. -if test ${with_system_expat+y} -then : +if test "${with_system_expat+set}" = set; then : withval=$with_system_expat; -else $as_nop +else with_system_expat="$with_system_libs" fi # Check whether --with-system-libxml was given. -if test ${with_system_libxml+y} -then : +if test "${with_system_libxml+set}" = set; then : withval=$with_system_libxml; -else $as_nop +else with_system_libxml=auto fi # Check whether --with-system-ucpp was given. -if test ${with_system_ucpp+y} -then : +if test "${with_system_ucpp+set}" = set; then : withval=$with_system_ucpp; fi # Check whether --with-system-openldap was given. -if test ${with_system_openldap+y} -then : +if test "${with_system_openldap+set}" = set; then : withval=$with_system_openldap; -else $as_nop +else with_system_openldap="$with_system_libs" fi # Check whether --enable-poppler was given. -if test ${enable_poppler+y} -then : +if test "${enable_poppler+set}" = set; then : enableval=$enable_poppler; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_poppler=yes else enable_poppler=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-poppler=$enable_poppler" >&5 -printf "%s\n" "$as_me: Randomly set --enable-poppler=$enable_poppler" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-poppler=$enable_poppler" >&5 +$as_echo "$as_me: Randomly set --enable-poppler=$enable_poppler" >&6;} libo_fuzzed_enable_poppler=yes libo_fuzz_list="$libo_fuzz_list --enable-poppler="'$enable_poppler' fi @@ -10778,48 +10146,44 @@ # Check whether --with-system-poppler was given. -if test ${with_system_poppler+y} -then : +if test "${with_system_poppler+set}" = set; then : withval=$with_system_poppler; -else $as_nop +else with_system_poppler="$with_system_libs" fi # Check whether --with-system-abseil was given. -if test ${with_system_abseil+y} -then : +if test "${with_system_abseil+set}" = set; then : withval=$with_system_abseil; -else $as_nop +else with_system_abseil="$with_system_libs" fi # Check whether --with-system-openjpeg was given. -if test ${with_system_openjpeg+y} -then : +if test "${with_system_openjpeg+set}" = set; then : withval=$with_system_openjpeg; -else $as_nop +else with_system_openjpeg="$with_system_libs" fi # Check whether --enable-gpgmepp was given. -if test ${enable_gpgmepp+y} -then : +if test "${enable_gpgmepp+set}" = set; then : enableval=$enable_gpgmepp; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_gpgmepp=yes else enable_gpgmepp=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gpgmepp=$enable_gpgmepp" >&5 -printf "%s\n" "$as_me: Randomly set --enable-gpgmepp=$enable_gpgmepp" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-gpgmepp=$enable_gpgmepp" >&5 +$as_echo "$as_me: Randomly set --enable-gpgmepp=$enable_gpgmepp" >&6;} libo_fuzzed_enable_gpgmepp=yes libo_fuzz_list="$libo_fuzz_list --enable-gpgmepp="'$enable_gpgmepp' fi @@ -10830,99 +10194,89 @@ # Check whether --with-system-gpgmepp was given. -if test ${with_system_gpgmepp+y} -then : +if test "${with_system_gpgmepp+set}" = set; then : withval=$with_system_gpgmepp; -else $as_nop +else with_system_gpgmepp="$with_system_libs" fi # Check whether --with-system-mariadb was given. -if test ${with_system_mariadb+y} -then : +if test "${with_system_mariadb+set}" = set; then : withval=$with_system_mariadb; -else $as_nop +else with_system_mariadb="$with_system_libs" fi # Check whether --enable-bundle-mariadb was given. -if test ${enable_bundle_mariadb+y} -then : +if test "${enable_bundle_mariadb+set}" = set; then : enableval=$enable_bundle_mariadb; fi # Check whether --with-system-postgresql was given. -if test ${with_system_postgresql+y} -then : +if test "${with_system_postgresql+set}" = set; then : withval=$with_system_postgresql; -else $as_nop +else with_system_postgresql="$with_system_libs" fi # Check whether --with-libpq-path was given. -if test ${with_libpq_path+y} -then : +if test "${with_libpq_path+set}" = set; then : withval=$with_libpq_path; fi # Check whether --with-system-firebird was given. -if test ${with_system_firebird+y} -then : +if test "${with_system_firebird+set}" = set; then : withval=$with_system_firebird; -else $as_nop +else with_system_firebird="$with_system_libs" fi # Check whether --with-system-libtommath was given. -if test ${with_system_libtommath+y} -then : +if test "${with_system_libtommath+set}" = set; then : withval=$with_system_libtommath; -else $as_nop +else with_system_libtommath="$with_system_libs" fi # Check whether --with-system-hsqldb was given. -if test ${with_system_hsqldb+y} -then : +if test "${with_system_hsqldb+set}" = set; then : withval=$with_system_hsqldb; fi # Check whether --with-hsqldb-jar was given. -if test ${with_hsqldb_jar+y} -then : +if test "${with_hsqldb_jar+set}" = set; then : withval=$with_hsqldb_jar; HSQLDB_JAR=$withval fi # Check whether --enable-scripting-beanshell was given. -if test ${enable_scripting_beanshell+y} -then : +if test "${enable_scripting_beanshell+set}" = set; then : enableval=$enable_scripting_beanshell; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_scripting_beanshell=yes else enable_scripting_beanshell=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-scripting-beanshell=$enable_scripting_beanshell" >&5 -printf "%s\n" "$as_me: Randomly set --enable-scripting-beanshell=$enable_scripting_beanshell" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-scripting-beanshell=$enable_scripting_beanshell" >&5 +$as_echo "$as_me: Randomly set --enable-scripting-beanshell=$enable_scripting_beanshell" >&6;} libo_fuzzed_enable_scripting_beanshell=yes libo_fuzz_list="$libo_fuzz_list --enable-scripting-beanshell="'$enable_scripting_beanshell' fi @@ -10933,36 +10287,33 @@ # Check whether --with-system-beanshell was given. -if test ${with_system_beanshell+y} -then : +if test "${with_system_beanshell+set}" = set; then : withval=$with_system_beanshell; -else $as_nop +else with_system_beanshell="$with_system_jars" fi # Check whether --with-beanshell-jar was given. -if test ${with_beanshell_jar+y} -then : +if test "${with_beanshell_jar+set}" = set; then : withval=$with_beanshell_jar; BSH_JAR=$withval fi # Check whether --enable-scripting-javascript was given. -if test ${enable_scripting_javascript+y} -then : +if test "${enable_scripting_javascript+set}" = set; then : enableval=$enable_scripting_javascript; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_scripting_javascript=yes else enable_scripting_javascript=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-scripting-javascript=$enable_scripting_javascript" >&5 -printf "%s\n" "$as_me: Randomly set --enable-scripting-javascript=$enable_scripting_javascript" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-scripting-javascript=$enable_scripting_javascript" >&5 +$as_echo "$as_me: Randomly set --enable-scripting-javascript=$enable_scripting_javascript" >&6;} libo_fuzzed_enable_scripting_javascript=yes libo_fuzz_list="$libo_fuzz_list --enable-scripting-javascript="'$enable_scripting_javascript' fi @@ -10973,8 +10324,7 @@ # Check whether --with-system-rhino was given. -if test ${with_system_rhino+y} -then : +if test "${with_system_rhino+set}" = set; then : withval=$with_system_rhino; fi @@ -10985,204 +10335,182 @@ # Check whether --with-rhino-jar was given. -if test ${with_rhino_jar+y} -then : +if test "${with_rhino_jar+set}" = set; then : withval=$with_rhino_jar; RHINO_JAR=$withval fi # Check whether --with-system-jfreereport was given. -if test ${with_system_jfreereport+y} -then : +if test "${with_system_jfreereport+set}" = set; then : withval=$with_system_jfreereport; -else $as_nop +else with_system_jfreereport="$with_system_jars" fi # Check whether --with-sac-jar was given. -if test ${with_sac_jar+y} -then : +if test "${with_sac_jar+set}" = set; then : withval=$with_sac_jar; SAC_JAR=$withval fi # Check whether --with-libxml-jar was given. -if test ${with_libxml_jar+y} -then : +if test "${with_libxml_jar+set}" = set; then : withval=$with_libxml_jar; LIBXML_JAR=$withval fi # Check whether --with-flute-jar was given. -if test ${with_flute_jar+y} -then : +if test "${with_flute_jar+set}" = set; then : withval=$with_flute_jar; FLUTE_JAR=$withval fi # Check whether --with-jfreereport-jar was given. -if test ${with_jfreereport_jar+y} -then : +if test "${with_jfreereport_jar+set}" = set; then : withval=$with_jfreereport_jar; JFREEREPORT_JAR=$withval fi # Check whether --with-liblayout-jar was given. -if test ${with_liblayout_jar+y} -then : +if test "${with_liblayout_jar+set}" = set; then : withval=$with_liblayout_jar; LIBLAYOUT_JAR=$withval fi # Check whether --with-libloader-jar was given. -if test ${with_libloader_jar+y} -then : +if test "${with_libloader_jar+set}" = set; then : withval=$with_libloader_jar; LIBLOADER_JAR=$withval fi # Check whether --with-libformula-jar was given. -if test ${with_libformula_jar+y} -then : +if test "${with_libformula_jar+set}" = set; then : withval=$with_libformula_jar; LIBFORMULA_JAR=$withval fi # Check whether --with-librepository-jar was given. -if test ${with_librepository_jar+y} -then : +if test "${with_librepository_jar+set}" = set; then : withval=$with_librepository_jar; LIBREPOSITORY_JAR=$withval fi # Check whether --with-libfonts-jar was given. -if test ${with_libfonts_jar+y} -then : +if test "${with_libfonts_jar+set}" = set; then : withval=$with_libfonts_jar; LIBFONTS_JAR=$withval fi # Check whether --with-libserializer-jar was given. -if test ${with_libserializer_jar+y} -then : +if test "${with_libserializer_jar+set}" = set; then : withval=$with_libserializer_jar; LIBSERIALIZER_JAR=$withval fi # Check whether --with-libbase-jar was given. -if test ${with_libbase_jar+y} -then : +if test "${with_libbase_jar+set}" = set; then : withval=$with_libbase_jar; LIBBASE_JAR=$withval fi # Check whether --with-system-odbc was given. -if test ${with_system_odbc+y} -then : +if test "${with_system_odbc+set}" = set; then : withval=$with_system_odbc; -else $as_nop +else with_system_odbc="auto" fi # Check whether --with-system-sane was given. -if test ${with_system_sane+y} -then : +if test "${with_system_sane+set}" = set; then : withval=$with_system_sane; -else $as_nop +else with_system_sane="$with_system_headers" fi # Check whether --with-system-bluez was given. -if test ${with_system_bluez+y} -then : +if test "${with_system_bluez+set}" = set; then : withval=$with_system_bluez; -else $as_nop +else with_system_bluez="$with_system_headers" fi # Check whether --with-system-boost was given. -if test ${with_system_boost+y} -then : +if test "${with_system_boost+set}" = set; then : withval=$with_system_boost; -else $as_nop +else with_system_boost="$with_system_headers" fi # Check whether --with-system-dragonbox was given. -if test ${with_system_dragonbox+y} -then : +if test "${with_system_dragonbox+set}" = set; then : withval=$with_system_dragonbox; -else $as_nop +else with_system_dragonbox="$with_system_headers" fi # Check whether --with-system-libfixmath was given. -if test ${with_system_libfixmath+y} -then : +if test "${with_system_libfixmath+set}" = set; then : withval=$with_system_libfixmath; -else $as_nop +else with_system_libfixmath="$with_system_libs" fi # Check whether --with-system-glm was given. -if test ${with_system_glm+y} -then : +if test "${with_system_glm+set}" = set; then : withval=$with_system_glm; -else $as_nop +else with_system_glm="$with_system_headers" fi # Check whether --with-system-hunspell was given. -if test ${with_system_hunspell+y} -then : +if test "${with_system_hunspell+set}" = set; then : withval=$with_system_hunspell; -else $as_nop +else with_system_hunspell="$with_system_libs" fi # Check whether --enable-zxing was given. -if test ${enable_zxing+y} -then : +if test "${enable_zxing+set}" = set; then : enableval=$enable_zxing; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then enable_zxing=yes else enable_zxing=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --enable-zxing=$enable_zxing" >&5 -printf "%s\n" "$as_me: Randomly set --enable-zxing=$enable_zxing" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --enable-zxing=$enable_zxing" >&5 +$as_echo "$as_me: Randomly set --enable-zxing=$enable_zxing" >&6;} libo_fuzzed_enable_zxing=yes libo_fuzz_list="$libo_fuzz_list --enable-zxing="'$enable_zxing' fi @@ -11193,118 +10521,105 @@ # Check whether --with-system-zxing was given. -if test ${with_system_zxing+y} -then : +if test "${with_system_zxing+set}" = set; then : withval=$with_system_zxing; -else $as_nop +else with_system_zxing="$with_system_libs" fi # Check whether --with-system-box2d was given. -if test ${with_system_box2d+y} -then : +if test "${with_system_box2d+set}" = set; then : withval=$with_system_box2d; -else $as_nop +else with_system_box2d="$with_system_libs" fi # Check whether --with-system-mythes was given. -if test ${with_system_mythes+y} -then : +if test "${with_system_mythes+set}" = set; then : withval=$with_system_mythes; -else $as_nop +else with_system_mythes="$with_system_libs" fi # Check whether --with-system-altlinuxhyph was given. -if test ${with_system_altlinuxhyph+y} -then : +if test "${with_system_altlinuxhyph+set}" = set; then : withval=$with_system_altlinuxhyph; -else $as_nop +else with_system_altlinuxhyph="$with_system_libs" fi # Check whether --with-system-lpsolve was given. -if test ${with_system_lpsolve+y} -then : +if test "${with_system_lpsolve+set}" = set; then : withval=$with_system_lpsolve; -else $as_nop +else with_system_lpsolve="$with_system_libs" fi # Check whether --with-system-coinmp was given. -if test ${with_system_coinmp+y} -then : +if test "${with_system_coinmp+set}" = set; then : withval=$with_system_coinmp; -else $as_nop +else with_system_coinmp="$with_system_libs" fi # Check whether --with-system-liblangtag was given. -if test ${with_system_liblangtag+y} -then : +if test "${with_system_liblangtag+set}" = set; then : withval=$with_system_liblangtag; -else $as_nop +else with_system_liblangtag="$with_system_libs" fi # Check whether --with-system-lockfile was given. -if test ${with_system_lockfile+y} -then : +if test "${with_system_lockfile+set}" = set; then : withval=$with_system_lockfile; fi # Check whether --with-webdav was given. -if test ${with_webdav+y} -then : +if test "${with_webdav+set}" = set; then : withval=$with_webdav; fi # Check whether --with-linker-hash-style was given. -if test ${with_linker_hash_style+y} -then : +if test "${with_linker_hash_style+set}" = set; then : withval=$with_linker_hash_style; fi # Check whether --with-jdk-home was given. -if test ${with_jdk_home+y} -then : +if test "${with_jdk_home+set}" = set; then : withval=$with_jdk_home; fi # Check whether --with-help was given. -if test ${with_help+y} -then : +if test "${with_help+set}" = set; then : withval=$with_help; fi # Check whether --with-omindex was given. -if test ${with_omindex+y} -then : +if test "${with_omindex+set}" = set; then : withval=$with_omindex; fi @@ -11312,18 +10627,17 @@ # Check whether --with-java was given. -if test ${with_java+y} -then : +if test "${with_java+set}" = set; then : withval=$with_java; test -z "$with_java" -o "$with_java" = "yes" && with_java=java -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then with_java=yes else with_java=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-java=$with_java" >&5 -printf "%s\n" "$as_me: Randomly set --with-java=$with_java" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --with-java=$with_java" >&5 +$as_echo "$as_me: Randomly set --with-java=$with_java" >&6;} libo_fuzzed_with_java=yes libo_fuzz_list="$libo_fuzz_list --with-java="'$with_java' fi @@ -11336,46 +10650,41 @@ # Check whether --with-jvm-path was given. -if test ${with_jvm_path+y} -then : +if test "${with_jvm_path+set}" = set; then : withval=$with_jvm_path; fi # Check whether --with-ant-home was given. -if test ${with_ant_home+y} -then : +if test "${with_ant_home+set}" = set; then : withval=$with_ant_home; fi # Check whether --with-symbol-config was given. -if test ${with_symbol_config+y} -then : +if test "${with_symbol_config+set}" = set; then : withval=$with_symbol_config; -else $as_nop +else with_symbol_config=no fi # Check whether --with-export-validation was given. -if test ${with_export_validation+y} -then : +if test "${with_export_validation+set}" = set; then : withval=$with_export_validation; -else $as_nop +else with_export_validation=auto fi # Check whether --with-bffvalidator was given. -if test ${with_bffvalidator+y} -then : +if test "${with_bffvalidator+set}" = set; then : withval=$with_bffvalidator; -else $as_nop +else with_bffvalidator=no fi @@ -11383,18 +10692,17 @@ # Check whether --with-junit was given. -if test ${with_junit+y} -then : +if test "${with_junit+set}" = set; then : withval=$with_junit; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then with_junit=yes else with_junit=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-junit=$with_junit" >&5 -printf "%s\n" "$as_me: Randomly set --with-junit=$with_junit" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --with-junit=$with_junit" >&5 +$as_echo "$as_me: Randomly set --with-junit=$with_junit" >&6;} libo_fuzzed_with_junit=yes libo_fuzz_list="$libo_fuzz_list --with-junit="'$with_junit' fi @@ -11406,18 +10714,16 @@ # Check whether --with-hamcrest was given. -if test ${with_hamcrest+y} -then : +if test "${with_hamcrest+set}" = set; then : withval=$with_hamcrest; -else $as_nop +else with_hamcrest=yes fi # Check whether --with-perl-home was given. -if test ${with_perl_home+y} -then : +if test "${with_perl_home+set}" = set; then : withval=$with_perl_home; fi @@ -11425,18 +10731,17 @@ # Check whether --with-doxygen was given. -if test ${with_doxygen+y} -then : +if test "${with_doxygen+set}" = set; then : withval=$with_doxygen; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then with_doxygen=yes else with_doxygen=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-doxygen=$with_doxygen" >&5 -printf "%s\n" "$as_me: Randomly set --with-doxygen=$with_doxygen" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --with-doxygen=$with_doxygen" >&5 +$as_echo "$as_me: Randomly set --with-doxygen=$with_doxygen" >&6;} libo_fuzzed_with_doxygen=yes libo_fuzz_list="$libo_fuzz_list --with-doxygen="'$with_doxygen' fi @@ -11448,32 +10753,28 @@ # Check whether --with-visual-studio was given. -if test ${with_visual_studio+y} -then : +if test "${with_visual_studio+set}" = set; then : withval=$with_visual_studio; fi # Check whether --with-windows-sdk was given. -if test ${with_windows_sdk+y} -then : +if test "${with_windows_sdk+set}" = set; then : withval=$with_windows_sdk; fi # Check whether --with-lang was given. -if test ${with_lang+y} -then : +if test "${with_lang+set}" = set; then : withval=$with_lang; fi # Check whether --with-locales was given. -if test ${with_locales+y} -then : +if test "${with_locales+set}" = set; then : withval=$with_locales; fi @@ -11482,18 +10783,17 @@ # Check whether --with-krb5 was given. -if test ${with_krb5+y} -then : +if test "${with_krb5+set}" = set; then : withval=$with_krb5; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then with_krb5=yes else with_krb5=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-krb5=$with_krb5" >&5 -printf "%s\n" "$as_me: Randomly set --with-krb5=$with_krb5" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --with-krb5=$with_krb5" >&5 +$as_echo "$as_me: Randomly set --with-krb5=$with_krb5" >&6;} libo_fuzzed_with_krb5=yes libo_fuzz_list="$libo_fuzz_list --with-krb5="'$with_krb5' fi @@ -11506,18 +10806,17 @@ # Check whether --with-gssapi was given. -if test ${with_gssapi+y} -then : +if test "${with_gssapi+set}" = set; then : withval=$with_gssapi; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then with_gssapi=yes else with_gssapi=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-gssapi=$with_gssapi" >&5 -printf "%s\n" "$as_me: Randomly set --with-gssapi=$with_gssapi" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --with-gssapi=$with_gssapi" >&5 +$as_echo "$as_me: Randomly set --with-gssapi=$with_gssapi" >&6;} libo_fuzzed_with_gssapi=yes libo_fuzz_list="$libo_fuzz_list --with-gssapi="'$with_gssapi' fi @@ -11530,18 +10829,17 @@ # Check whether --with-lxml was given. -if test ${with_lxml+y} -then : +if test "${with_lxml+set}" = set; then : withval=$with_lxml; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then with_lxml=yes else with_lxml=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-lxml=$with_lxml" >&5 -printf "%s\n" "$as_me: Randomly set --with-lxml=$with_lxml" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --with-lxml=$with_lxml" >&5 +$as_echo "$as_me: Randomly set --with-lxml=$with_lxml" >&6;} libo_fuzzed_with_lxml=yes libo_fuzz_list="$libo_fuzz_list --with-lxml="'$with_lxml' fi @@ -11554,18 +10852,17 @@ # Check whether --with-latest-c++ was given. -if test ${with_latest_c__+y} -then : +if test "${with_latest_c__+set}" = set; then : withval=$with_latest_c__; -else $as_nop +else if test "$enable_fuzz_options" = yes; then if test `expr $RANDOM % 2` = 1; then with_latest_c__=yes else with_latest_c__=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Randomly set --with-latest-c++=$with_latest_c__" >&5 -printf "%s\n" "$as_me: Randomly set --with-latest-c++=$with_latest_c__" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Randomly set --with-latest-c++=$with_latest_c__" >&5 +$as_echo "$as_me: Randomly set --with-latest-c++=$with_latest_c__" >&6;} libo_fuzzed_with_latest_c__=yes libo_fuzz_list="$libo_fuzz_list --with-latest-c++="'$with_latest_c__' fi @@ -11578,8 +10875,7 @@ # Check whether --with-branding was given. -if test ${with_branding+y} -then : +if test "${with_branding+set}" = set; then : withval=$with_branding; fi @@ -11587,8 +10883,7 @@ # Check whether --with-extra-buildid was given. -if test ${with_extra_buildid+y} -then : +if test "${with_extra_buildid+set}" = set; then : withval=$with_extra_buildid; fi @@ -11596,122 +10891,108 @@ # Check whether --with-vendor was given. -if test ${with_vendor+y} -then : +if test "${with_vendor+set}" = set; then : withval=$with_vendor; fi # Check whether --with-privacy-policy-url was given. -if test ${with_privacy_policy_url+y} -then : +if test "${with_privacy_policy_url+set}" = set; then : withval=$with_privacy_policy_url; if test "x$with_privacy_policy_url" = "xyes"; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "you need to specify an argument when using --with-privacy-policy-url See \`config.log' for more details" "$LINENO" 5; } elif test "x$with_privacy_policy_url" = "xno"; then with_privacy_policy_url="undefined" fi -else $as_nop +else with_privacy_policy_url="undefined" fi # Check whether --with-android-package-name was given. -if test ${with_android_package_name+y} -then : +if test "${with_android_package_name+set}" = set; then : withval=$with_android_package_name; fi # Check whether --with-compat-oowrappers was given. -if test ${with_compat_oowrappers+y} -then : +if test "${with_compat_oowrappers+set}" = set; then : withval=$with_compat_oowrappers; fi # Check whether --with-os-version was given. -if test ${with_os_version+y} -then : +if test "${with_os_version+set}" = set; then : withval=$with_os_version; fi # Check whether --with-idlc-cpp was given. -if test ${with_idlc_cpp+y} -then : +if test "${with_idlc_cpp+set}" = set; then : withval=$with_idlc_cpp; fi # Check whether --with-parallelism was given. -if test ${with_parallelism+y} -then : +if test "${with_parallelism+set}" = set; then : withval=$with_parallelism; fi # Check whether --with-all-tarballs was given. -if test ${with_all_tarballs+y} -then : +if test "${with_all_tarballs+set}" = set; then : withval=$with_all_tarballs; fi # Check whether --with-gdrive-client-id was given. -if test ${with_gdrive_client_id+y} -then : +if test "${with_gdrive_client_id+set}" = set; then : withval=$with_gdrive_client_id; fi # Check whether --with-gdrive-client-secret was given. -if test ${with_gdrive_client_secret+y} -then : +if test "${with_gdrive_client_secret+set}" = set; then : withval=$with_gdrive_client_secret; fi # Check whether --with-alfresco-cloud-client-id was given. -if test ${with_alfresco_cloud_client_id+y} -then : +if test "${with_alfresco_cloud_client_id+set}" = set; then : withval=$with_alfresco_cloud_client_id; fi # Check whether --with-alfresco-cloud-client-secret was given. -if test ${with_alfresco_cloud_client_secret+y} -then : +if test "${with_alfresco_cloud_client_secret+set}" = set; then : withval=$with_alfresco_cloud_client_secret; fi # Check whether --with-onedrive-client-id was given. -if test ${with_onedrive_client_id+y} -then : +if test "${with_onedrive_client_id+set}" = set; then : withval=$with_onedrive_client_id; fi # Check whether --with-onedrive-client-secret was given. -if test ${with_onedrive_client_secret+y} -then : +if test "${with_onedrive_client_secret+set}" = set; then : withval=$with_onedrive_client_secret; fi @@ -11723,46 +11004,46 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build target is Release Build" >&5 -printf %s "checking whether build target is Release Build... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build target is Release Build" >&5 +$as_echo_n "checking whether build target is Release Build... " >&6; } if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_RELEASE_BUILD= GET_TASK_ALLOW_ENTITLEMENT=' com.apple.security.get-task-allow ' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_RELEASE_BUILD=TRUE GET_TASK_ALLOW_ENTITLEMENT='' fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build a Community flavor" >&5 -printf %s "checking whether to build a Community flavor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build a Community flavor" >&5 +$as_echo_n "checking whether to build a Community flavor... " >&6; } if test -z "$enable_community_flavor" -o "$enable_community_flavor" = "yes"; then - printf "%s\n" "#define HAVE_FEATURE_COMMUNITY_FLAVOR 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_COMMUNITY_FLAVOR 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to sign windows build" >&5 -printf %s "checking whether to sign windows build... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to sign windows build" >&5 +$as_echo_n "checking whether to sign windows build... " >&6; } if test "$enable_windows_build_signing" = "yes" -a "$_os" = "WINNT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } WINDOWS_BUILD_SIGNING="TRUE" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } WINDOWS_BUILD_SIGNING="FALSE" fi @@ -11770,8 +11051,7 @@ # Check whether --with-macosx-version-min-required was given. -if test ${with_macosx_version_min_required+y} -then : +if test "${with_macosx_version_min_required+set}" = set; then : withval=$with_macosx_version_min_required; fi @@ -11779,8 +11059,8 @@ if test "$libo_fuzzed_enable_dbus" = yes -a "$libo_fuzzed_enable_avahi" -a \ "$enable_dbus" != "$enable_avahi"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Resetting --enable-avahi=$enable_dbus" >&5 -printf "%s\n" "$as_me: Resetting --enable-avahi=$enable_dbus" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Resetting --enable-avahi=$enable_dbus" >&5 +$as_echo "$as_me: Resetting --enable-avahi=$enable_dbus" >&6;} enable_avahi=$enable_dbus fi @@ -11832,12 +11112,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AWK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -11845,15 +11124,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11864,11 +11139,11 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf "%s\n" "$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11877,12 +11152,11 @@ # Extract the first word of "$AWK", so it can be a program name with args. set dummy $AWK; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_AWK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else case $AWK in [\\/]* | ?:[\\/]*) ac_cv_path_AWK="$AWK" # Let the user override the test with a path. @@ -11892,15 +11166,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_AWK="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11912,11 +11182,11 @@ fi AWK=$ac_cv_path_AWK if test -n "$AWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf "%s\n" "$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11926,12 +11196,11 @@ # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_BASH+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_BASH+:} false; then : + $as_echo_n "(cached) " >&6 +else case $BASH in [\\/]* | ?:[\\/]*) ac_cv_path_BASH="$BASH" # Let the user override the test with a path. @@ -11941,15 +11210,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_BASH="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11961,11 +11226,11 @@ fi BASH=$ac_cv_path_BASH if test -n "$BASH"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5 -printf "%s\n" "$BASH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5 +$as_echo "$BASH" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11977,12 +11242,11 @@ # prefer parallel compression tools, if available # Extract the first word of "pigz", so it can be a program name with args. set dummy pigz; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_COMPRESSIONTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_COMPRESSIONTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else case $COMPRESSIONTOOL in [\\/]* | ?:[\\/]*) ac_cv_path_COMPRESSIONTOOL="$COMPRESSIONTOOL" # Let the user override the test with a path. @@ -11992,15 +11256,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_COMPRESSIONTOOL="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_COMPRESSIONTOOL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12012,23 +11272,22 @@ fi COMPRESSIONTOOL=$ac_cv_path_COMPRESSIONTOOL if test -n "$COMPRESSIONTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $COMPRESSIONTOOL" >&5 -printf "%s\n" "$COMPRESSIONTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPRESSIONTOOL" >&5 +$as_echo "$COMPRESSIONTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$COMPRESSIONTOOL"; then # Extract the first word of "gzip", so it can be a program name with args. set dummy gzip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_COMPRESSIONTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_COMPRESSIONTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else case $COMPRESSIONTOOL in [\\/]* | ?:[\\/]*) ac_cv_path_COMPRESSIONTOOL="$COMPRESSIONTOOL" # Let the user override the test with a path. @@ -12038,15 +11297,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_COMPRESSIONTOOL="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_COMPRESSIONTOOL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12058,11 +11313,11 @@ fi COMPRESSIONTOOL=$ac_cv_path_COMPRESSIONTOOL if test -n "$COMPRESSIONTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $COMPRESSIONTOOL" >&5 -printf "%s\n" "$COMPRESSIONTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPRESSIONTOOL" >&5 +$as_echo "$COMPRESSIONTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12075,12 +11330,11 @@ # use GNU parallel for packaging, if available # Extract the first word of "parallel", so it can be a program name with args. set dummy parallel; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GNUPARALLEL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GNUPARALLEL+:} false; then : + $as_echo_n "(cached) " >&6 +else case $GNUPARALLEL in [\\/]* | ?:[\\/]*) ac_cv_path_GNUPARALLEL="$GNUPARALLEL" # Let the user override the test with a path. @@ -12090,15 +11344,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GNUPARALLEL="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GNUPARALLEL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12110,18 +11360,18 @@ fi GNUPARALLEL=$ac_cv_path_GNUPARALLEL if test -n "$GNUPARALLEL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUPARALLEL" >&5 -printf "%s\n" "$GNUPARALLEL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUPARALLEL" >&5 +$as_echo "$GNUPARALLEL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU or BSD tar" >&5 -printf %s "checking for GNU or BSD tar... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU or BSD tar" >&5 +$as_echo_n "checking for GNU or BSD tar... " >&6; } for a in $GNUTAR gtar gnutar tar bsdtar /usr/sfw/bin/gtar; do $a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null if test $? -eq 0; then @@ -12129,15 +11379,15 @@ break fi done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5 -printf "%s\n" "$GNUTAR" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5 +$as_echo "$GNUTAR" >&6; } if test -z "$GNUTAR"; then as_fn_error $? "not found. install GNU or BSD tar." "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tar's option to strip components" >&5 -printf %s "checking for tar's option to strip components... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tar's option to strip components" >&5 +$as_echo_n "checking for tar's option to strip components... " >&6; } $GNUTAR --help 2> /dev/null | egrep "bsdtar|strip-components" 2>&1 >/dev/null if test $? -eq 0; then STRIP_COMPONENTS="--strip-components" @@ -12149,8 +11399,8 @@ STRIP_COMPONENTS="unsupported" fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP_COMPONENTS" >&5 -printf "%s\n" "$STRIP_COMPONENTS" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP_COMPONENTS" >&5 +$as_echo "$STRIP_COMPONENTS" >&6; } if test x$STRIP_COMPONENTS = xunsupported; then as_fn_error $? "you need a tar that is able to strip components." "$LINENO" 5 fi @@ -12161,10 +11411,10 @@ if test $_os != iOS -a $_os != Android -a "$enable_fuzzers" != "yes"; then BUILD_TYPE="$BUILD_TYPE DESKTOP" - printf "%s\n" "#define HAVE_FEATURE_DESKTOP 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_DESKTOP 1" >>confdefs.h if test "$_os" != Emscripten; then - printf "%s\n" "#define HAVE_FEATURE_MULTIUSER_ENVIRONMENT 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_MULTIUSER_ENVIRONMENT 1" >>confdefs.h fi fi @@ -12219,31 +11469,31 @@ test "${with_fonts+set}" = set || with_fonts=yes test "${with_locales+set}" = set || with_locales=en - printf "%s\n" "#define ENABLE_WASM_STRIP_ACCESSIBILITY 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_ACCESSIBILITY 1" >>confdefs.h - printf "%s\n" "#define ENABLE_WASM_STRIP_CANVAS 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_CANVAS 1" >>confdefs.h # AC_DEFINE(ENABLE_WASM_STRIP_CHART) - printf "%s\n" "#define ENABLE_WASM_STRIP_DBACCESS 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_DBACCESS 1" >>confdefs.h - printf "%s\n" "#define ENABLE_WASM_STRIP_EPUB 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_EPUB 1" >>confdefs.h - printf "%s\n" "#define ENABLE_WASM_STRIP_EXTRA 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_EXTRA 1" >>confdefs.h - printf "%s\n" "#define ENABLE_WASM_STRIP_GUESSLANG 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_GUESSLANG 1" >>confdefs.h # AC_DEFINE(ENABLE_WASM_STRIP_HUNSPELL) - printf "%s\n" "#define ENABLE_WASM_STRIP_PINGUSER 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_PINGUSER 1" >>confdefs.h - printf "%s\n" "#define ENABLE_WASM_STRIP_PREMULTIPLY 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_PREMULTIPLY 1" >>confdefs.h - printf "%s\n" "#define ENABLE_WASM_STRIP_RECENT 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_RECENT 1" >>confdefs.h - printf "%s\n" "#define ENABLE_WASM_STRIP_RECOVERYUI 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_RECOVERYUI 1" >>confdefs.h - printf "%s\n" "#define ENABLE_WASM_STRIP_SPLASH 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_SPLASH 1" >>confdefs.h - printf "%s\n" "#define ENABLE_WASM_STRIP_SWEXPORTS 1" >>confdefs.h + $as_echo "#define ENABLE_WASM_STRIP_SWEXPORTS 1" >>confdefs.h fi @@ -12253,14 +11503,14 @@ EMSCRIPTEN_NEH_VERSION="${EMSCRIPTEN_NEH_MAJOR}.${EMSCRIPTEN_NEH_MINOR}.${EMSCRIPTEN_NEH_TINY}" if test "$enable_wasm_exceptions" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Emscripten version is at least $EMSCRIPTEN_NEH_VERSION for SjLj + native EH" >&5 -printf %s "checking if Emscripten version is at least $EMSCRIPTEN_NEH_VERSION for SjLj + native EH... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Emscripten version is at least $EMSCRIPTEN_NEH_VERSION for SjLj + native EH" >&5 +$as_echo_n "checking if Emscripten version is at least $EMSCRIPTEN_NEH_VERSION for SjLj + native EH... " >&6; } check_semantic_version_three_prefixed EMSCRIPTEN NEH if test $? -ne 0; then as_fn_error $? "no, found $EMSCRIPTEN_VERSION" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($EMSCRIPTEN_VERSION)" >&5 -printf "%s\n" "yes ($EMSCRIPTEN_VERSION)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($EMSCRIPTEN_VERSION)" >&5 +$as_echo "yes ($EMSCRIPTEN_VERSION)" >&6; } fi ENABLE_WASM_EXCEPTIONS=TRUE fi @@ -12270,7 +11520,7 @@ if test "$enable_avmedia" = yes; then BUILD_TYPE="$BUILD_TYPE AVMEDIA" - printf "%s\n" "#define HAVE_FEATURE_AVMEDIA 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_AVMEDIA 1" >>confdefs.h else test_gstreamer_1_0=no @@ -12279,7 +11529,7 @@ # Decide whether to build database connectivity stuff (including Base) or not. if test "$enable_database_connectivity" != no; then BUILD_TYPE="$BUILD_TYPE DBCONNECTIVITY" - printf "%s\n" "#define HAVE_FEATURE_DBCONNECTIVITY 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_DBCONNECTIVITY 1" >>confdefs.h else if test "$_os" = iOS; then @@ -12298,7 +11548,7 @@ DISABLE_SCRIPTING='' if test "$enable_scripting" = yes; then BUILD_TYPE="$BUILD_TYPE SCRIPTING" - printf "%s\n" "#define HAVE_FEATURE_SCRIPTING 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_SCRIPTING 1" >>confdefs.h else DISABLE_SCRIPTING='TRUE' @@ -12340,7 +11590,7 @@ if test "$enable_extensions" = yes; then BUILD_TYPE="$BUILD_TYPE EXTENSIONS" - printf "%s\n" "#define HAVE_FEATURE_EXTENSIONS 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_EXTENSIONS 1" >>confdefs.h else enable_extension_integration=no @@ -12351,30 +11601,30 @@ WITH_GALLERY_BUILD=TRUE -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to build and package galleries" >&5 -printf %s "checking how to build and package galleries... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build and package galleries" >&5 +$as_echo_n "checking how to build and package galleries... " >&6; } if test -n "${with_galleries}"; then if test "$with_galleries" = "build"; then if test "$enable_database_connectivity" = no; then as_fn_error $? "DB connectivity is needed for gengal / svx" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: build from source images internally" >&5 -printf "%s\n" "build from source images internally" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: build from source images internally" >&5 +$as_echo "build from source images internally" >&6; } elif test "$with_galleries" = "no"; then WITH_GALLERY_BUILD= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disable non-internal gallery build" >&5 -printf "%s\n" "disable non-internal gallery build" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disable non-internal gallery build" >&5 +$as_echo "disable non-internal gallery build" >&6; } else as_fn_error $? "unknown value --with-galleries=$with_galleries" "$LINENO" 5 fi else if test $_os != iOS -a $_os != Android; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal src images for desktop" >&5 -printf "%s\n" "internal src images for desktop" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal src images for desktop" >&5 +$as_echo "internal src images for desktop" >&6; } else WITH_GALLERY_BUILD= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disable src image build" >&5 -printf "%s\n" "disable src image build" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disable src image build" >&5 +$as_echo "disable src image build" >&6; } fi fi @@ -12387,8 +11637,8 @@ # If $CC and/or $CXX already contain "ccache" (possibly suffixed with some version number etc), # assume that's good then *%ccache[-_' ']*|*/ccache[-_' ']*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ccache seems to be included in a pre-defined CC and/or CXX" >&5 -printf "%s\n" "$as_me: ccache seems to be included in a pre-defined CC and/or CXX" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ccache seems to be included in a pre-defined CC and/or CXX" >&5 +$as_echo "$as_me: ccache seems to be included in a pre-defined CC and/or CXX" >&6;} CCACHE_DEPEND_MODE=1 ;; *) @@ -12405,12 +11655,11 @@ fi # Extract the first word of "ccache", so it can be a program name with args. set dummy ccache; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_CCACHE+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CCACHE+:} false; then : + $as_echo_n "(cached) " >&6 +else case $CCACHE in [\\/]* | ?:[\\/]*) ac_cv_path_CCACHE="$CCACHE" # Let the user override the test with a path. @@ -12420,15 +11669,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_CCACHE="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12441,11 +11686,11 @@ fi CCACHE=$ac_cv_path_CCACHE if test -n "$CCACHE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5 -printf "%s\n" "$CCACHE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5 +$as_echo "$CCACHE" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12453,15 +11698,15 @@ CCACHE=`win_short_path_for_make "$CCACHE"` # check that it has MSVC support (it should recognize it in CCACHE_COMPILERTYPE) rm -f conftest.txt - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CCACHE has MSVC support" >&5 -printf %s "checking whether $CCACHE has MSVC support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CCACHE has MSVC support" >&5 +$as_echo_n "checking whether $CCACHE has MSVC support... " >&6; } CCACHE_COMPILERTYPE=cl CCACHE_LOGFILE=conftest.txt $CCACHE echo >/dev/null 2>/dev/null if grep -q 'Config: (environment) compiler_type = cl' conftest.txt; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } CCACHE="not found" fi rm -f conftest.txt @@ -12472,8 +11717,8 @@ # If $CC and/or $CXX already contain "sccache" (possibly suffixed with some version number etc), # assume that's good then *%sccache[-_' ']*|*/sccache[-_' ']*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: sccache seems to be included in a pre-defined CC and/or CXX" >&5 -printf "%s\n" "$as_me: sccache seems to be included in a pre-defined CC and/or CXX" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: sccache seems to be included in a pre-defined CC and/or CXX" >&5 +$as_echo "$as_me: sccache seems to be included in a pre-defined CC and/or CXX" >&6;} CCACHE_DEPEND_MODE=1 SCCACHE=1 ;; @@ -12481,12 +11726,11 @@ # for sharing code below, reuse CCACHE env var # Extract the first word of "sccache", so it can be a program name with args. set dummy sccache; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_CCACHE+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CCACHE+:} false; then : + $as_echo_n "(cached) " >&6 +else case $CCACHE in [\\/]* | ?:[\\/]*) ac_cv_path_CCACHE="$CCACHE" # Let the user override the test with a path. @@ -12496,15 +11740,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_CCACHE="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12517,11 +11757,11 @@ fi CCACHE=$ac_cv_path_CCACHE if test -n "$CCACHE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5 -printf "%s\n" "$CCACHE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5 +$as_echo "$CCACHE" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12542,16 +11782,16 @@ # caching of the results (like "-x objective-c++" for Mac) if test $_os = Darwin -o $_os = iOS; then # Check ccache version - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether version of ccache is suitable" >&5 -printf %s "checking whether version of ccache is suitable... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether version of ccache is suitable" >&5 +$as_echo_n "checking whether version of ccache is suitable... " >&6; } CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'` CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" -ge "030100"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, $CCACHE_VERSION" >&5 -printf "%s\n" "yes, $CCACHE_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $CCACHE_VERSION" >&5 +$as_echo "yes, $CCACHE_VERSION" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, $CCACHE_VERSION" >&5 -printf "%s\n" "no, $CCACHE_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, $CCACHE_VERSION" >&5 +$as_echo "no, $CCACHE_VERSION" >&6; } CCACHE="" CCACHE_DEPEND_MODE= fi @@ -12581,20 +11821,20 @@ # we could not determine the size or it was less than 1GB -> disable auto-ccache if test $ccache_size -lt 1024; then CCACHE="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ccache's cache size is less than 1GB using it is counter-productive: Disabling auto-ccache detection" >&5 -printf "%s\n" "$as_me: WARNING: ccache's cache size is less than 1GB using it is counter-productive: Disabling auto-ccache detection" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ccache's cache size is less than 1GB using it is counter-productive: Disabling auto-ccache detection" >&5 +$as_echo "$as_me: WARNING: ccache's cache size is less than 1GB using it is counter-productive: Disabling auto-ccache detection" >&2;} add_warning "ccache's cache size is less than 1GB using it is counter-productive: auto-ccache detection disabled" else # warn that ccache may be too small for debug build - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" >&5 -printf "%s\n" "$as_me: WARNING: ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" >&5 +$as_echo "$as_me: WARNING: ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" >&2;} add_warning "ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" fi else if test $ccache_size -lt 5; then #warn that ccache may be too small for debug build - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" >&5 -printf "%s\n" "$as_me: WARNING: ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" >&5 +$as_echo "$as_me: WARNING: ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" >&2;} add_warning "ccache's cache size is less than 5GB using it may be counter-productive for debug or symbol-enabled build" fi fi @@ -12606,16 +11846,16 @@ ENABLE_Z7_DEBUG=TRUE fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ccache will not work with --disable-z7-debug" >&5 -printf "%s\n" "$as_me: WARNING: ccache will not work with --disable-z7-debug" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ccache will not work with --disable-z7-debug" >&5 +$as_echo "$as_me: WARNING: ccache will not work with --disable-z7-debug" >&2;} add_warning "ccache will not work with --disable-z7-debug" fi if test "$_os" != "WINNT"; then GCC_HOME_SET="true" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gcc home" >&5 -printf %s "checking gcc home... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc home" >&5 +$as_echo_n "checking gcc home... " >&6; } if test -z "$with_gcc_home"; then if test "$enable_icecream" = "yes"; then if test -d "/usr/lib/icecc/bin"; then @@ -12635,8 +11875,8 @@ else GCC_HOME="$with_gcc_home" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GCC_HOME" >&5 -printf "%s\n" "$GCC_HOME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_HOME" >&5 +$as_echo "$GCC_HOME" >&6; } if test "$GCC_HOME_SET" = "true"; then @@ -12657,12 +11897,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_COMPATH+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_COMPATH+:} false; then : + $as_echo_n "(cached) " >&6 +else case $COMPATH in [\\/]* | ?:[\\/]*) ac_cv_path_COMPATH="$COMPATH" # Let the user override the test with a path. @@ -12672,15 +11911,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_COMPATH="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_COMPATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12692,11 +11927,11 @@ fi COMPATH=$ac_cv_path_COMPATH if test -n "$COMPATH"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $COMPATH" >&5 -printf "%s\n" "$COMPATH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPATH" >&5 +$as_echo "$COMPATH" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12707,24 +11942,24 @@ fi COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with Java support" >&5 -printf %s "checking whether to build with Java support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with Java support" >&5 +$as_echo_n "checking whether to build with Java support... " >&6; } if test "$with_java" != "no"; then if test "$DISABLE_SCRIPTING" = TRUE; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, overridden by --disable-scripting" >&5 -printf "%s\n" "no, overridden by --disable-scripting" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, overridden by --disable-scripting" >&5 +$as_echo "no, overridden by --disable-scripting" >&6; } ENABLE_JAVA="" with_java=no else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_JAVA="TRUE" - printf "%s\n" "#define HAVE_FEATURE_JAVA 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_JAVA 1" >>confdefs.h fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_JAVA="" fi @@ -12737,8 +11972,8 @@ # The SDK in the currently selected Xcode should be found. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what macOS SDK to use" >&5 -printf %s "checking what macOS SDK to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what macOS SDK to use" >&5 +$as_echo_n "checking what macOS SDK to use... " >&6; } for macosx_sdk in 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2> /dev/null` if test -d "$MACOSX_SDK_PATH"; then @@ -12754,8 +11989,8 @@ as_fn_error $? "Could not find an appropriate macOS SDK" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: macOS SDK $macosx_sdk at $MACOSX_SDK_PATH" >&5 -printf "%s\n" "macOS SDK $macosx_sdk at $MACOSX_SDK_PATH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: macOS SDK $macosx_sdk at $MACOSX_SDK_PATH" >&5 +$as_echo "macOS SDK $macosx_sdk at $MACOSX_SDK_PATH" >&6; } case $macosx_sdk in 10.13) @@ -12809,14 +12044,14 @@ FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks" MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Xcode is new enough" >&5 -printf %s "checking whether Xcode is new enough... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xcode is new enough" >&5 +$as_echo_n "checking whether Xcode is new enough... " >&6; } my_xcode_ver1=$(xcrun xcodebuild -version | head -n 1) my_xcode_ver2=${my_xcode_ver1#Xcode } my_xcode_ver3=$(printf %s "$my_xcode_ver2" | $AWK -F. '{ print $1*100+($2<100?$2:99) }') if test "$my_xcode_ver3" -ge 1205; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($my_xcode_ver2)" >&5 -printf "%s\n" "yes ($my_xcode_ver2)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($my_xcode_ver2)" >&5 +$as_echo "yes ($my_xcode_ver2)" >&6; } else as_fn_error $? "\"$my_xcode_ver1\" is too old or unrecognized, must be at least Xcode 12.5" "$LINENO" 5 fi @@ -12862,8 +12097,8 @@ if test -z "$save_CC"; then stdlib=-stdlib=libc++ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what C compiler to use" >&5 -printf %s "checking what C compiler to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what C compiler to use" >&5 +$as_echo_n "checking what C compiler to use... " >&6; } CC="`xcrun -find clang`" CC_BASE=`first_arg_basename "$CC"` if test "$host_cpu" = x86_64; then @@ -12872,11 +12107,11 @@ CC+=" -target arm64-apple-macos" fi CC+=" -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what C++ compiler to use" >&5 -printf %s "checking what C++ compiler to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what C++ compiler to use" >&5 +$as_echo_n "checking what C++ compiler to use... " >&6; } CXX="`xcrun -find clang++`" CXX_BASE=`first_arg_basename "$CXX"` if test "$host_cpu" = x86_64; then @@ -12885,8 +12120,8 @@ CXX+=" -target arm64-apple-macos" fi CXX+=" $stdlib -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf "%s\n" "$CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } INSTALL_NAME_TOOL=`xcrun -find install_name_tool` AR=`xcrun -find ar` @@ -12896,23 +12131,23 @@ RANLIB=`xcrun -find ranlib` fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that macosx-version-min-required is coherent with macos-with-sdk" >&5 -printf %s "checking that macosx-version-min-required is coherent with macos-with-sdk... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking that macosx-version-min-required is coherent with macos-with-sdk" >&5 +$as_echo_n "checking that macosx-version-min-required is coherent with macos-with-sdk... " >&6; } if test $MAC_OS_X_VERSION_MIN_REQUIRED -gt $MACOSX_SDK_VERSION; then as_fn_error $? "the version minimum required cannot be greater than the sdk level" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf "%s\n" "ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: MAC_OS_X_VERSION_MIN_REQUIRED=$MAC_OS_X_VERSION_MIN_REQUIRED" >&5 -printf "%s\n" "$as_me: MAC_OS_X_VERSION_MIN_REQUIRED=$MAC_OS_X_VERSION_MIN_REQUIRED" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: MAC_OS_X_VERSION_MIN_REQUIRED=$MAC_OS_X_VERSION_MIN_REQUIRED" >&5 +$as_echo "$as_me: MAC_OS_X_VERSION_MIN_REQUIRED=$MAC_OS_X_VERSION_MIN_REQUIRED" >&6;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to do code signing" >&5 -printf %s "checking whether to do code signing... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to do code signing" >&5 +$as_echo_n "checking whether to do code signing... " >&6; } if test -z "$enable_macosx_code_signing" -o "$enable_macosx_code_signing" == "no" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else if test "$enable_macosx_code_signing" = yes; then # By default use the first suitable certificate (?). @@ -12930,19 +12165,19 @@ if test -n "$identity"; then MACOSX_CODESIGNING_IDENTITY=$identity pretty_name=`security find-identity -p codesigning -v | grep "$MACOSX_CODESIGNING_IDENTITY" | sed -e 's/^[^"]*"//' -e 's/"//'` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, using the identity $MACOSX_CODESIGNING_IDENTITY for $pretty_name" >&5 -printf "%s\n" "yes, using the identity $MACOSX_CODESIGNING_IDENTITY for $pretty_name" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using the identity $MACOSX_CODESIGNING_IDENTITY for $pretty_name" >&5 +$as_echo "yes, using the identity $MACOSX_CODESIGNING_IDENTITY for $pretty_name" >&6; } else as_fn_error $? "cannot determine identity to use" "$LINENO" 5 fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to create a Mac App Store package" >&5 -printf %s "checking whether to create a Mac App Store package... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to create a Mac App Store package" >&5 +$as_echo_n "checking whether to create a Mac App Store package... " >&6; } if test -z "$enable_macosx_package_signing" || test "$enable_macosx_package_signing" == no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } elif test -z "$MACOSX_CODESIGNING_IDENTITY"; then as_fn_error $? "You forgot --enable-macosx-code-signing" "$LINENO" 5 else @@ -12957,8 +12192,8 @@ if test -n "$identity"; then MACOSX_PACKAGE_SIGNING_IDENTITY=$identity pretty_name=`security find-identity -v | grep "$MACOSX_PACKAGE_SIGNING_IDENTITY" | sed -e 's/^[^"]*"//' -e 's/"//'` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, using the identity $MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name" >&5 -printf "%s\n" "yes, using the identity $MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using the identity $MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name" >&5 +$as_echo "yes, using the identity $MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name" >&6; } else as_fn_error $? "Could not find any suitable '3rd Party Mac Developer Installer' certificate" "$LINENO" 5 fi @@ -12968,27 +12203,27 @@ as_fn_error $? "You should not use the same identity for code and package signing" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to sandbox the application" >&5 -printf %s "checking whether to sandbox the application... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to sandbox the application" >&5 +$as_echo_n "checking whether to sandbox the application... " >&6; } if test -n "$ENABLE_JAVA" -a "$enable_macosx_sandbox" = yes; then as_fn_error $? "macOS sandboxing (actually App Store rules) disallows use of Java" "$LINENO" 5 elif test "$enable_macosx_sandbox" = yes; then ENABLE_MACOSX_SANDBOX=TRUE - printf "%s\n" "#define HAVE_FEATURE_MACOSX_SANDBOX 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_MACOSX_SANDBOX 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what macOS app bundle identifier to use" >&5 -printf %s "checking what macOS app bundle identifier to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what macOS app bundle identifier to use" >&5 +$as_echo_n "checking what macOS app bundle identifier to use... " >&6; } MACOSX_BUNDLE_IDENTIFIER=$with_macosx_bundle_identifier - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACOSX_BUNDLE_IDENTIFIER" >&5 -printf "%s\n" "$MACOSX_BUNDLE_IDENTIFIER" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACOSX_BUNDLE_IDENTIFIER" >&5 +$as_echo "$MACOSX_BUNDLE_IDENTIFIER" >&6; } if test -n "$with_macosx_provisioning_profile" ; then if test ! -f "$with_macosx_provisioning_profile"; then @@ -13016,8 +12251,8 @@ if test $_os = iOS; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what iOS SDK to use" >&5 -printf %s "checking what iOS SDK to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what iOS SDK to use" >&5 +$as_echo_n "checking what iOS SDK to use... " >&6; } current_sdk_ver=15.5 older_sdk_vers="15.4 15.2 15.0 14.5" if test "$enable_ios_simulator" = "yes"; then @@ -13041,26 +12276,26 @@ as_fn_error $? "Could not find iOS SDK, expected something like $xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${current_sdk_ver}.sdk" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $sysroot" >&5 -printf "%s\n" "$sysroot" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sysroot" >&5 +$as_echo "$sysroot" >&6; } stdlib="-stdlib=libc++" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what C compiler to use" >&5 -printf %s "checking what C compiler to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what C compiler to use" >&5 +$as_echo_n "checking what C compiler to use... " >&6; } CC="`xcrun -find clang`" CC_BASE=`first_arg_basename "$CC"` CC+=" -arch $host_cpu_for_clang -isysroot $sysroot $versionmin" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what C++ compiler to use" >&5 -printf %s "checking what C++ compiler to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what C++ compiler to use" >&5 +$as_echo_n "checking what C++ compiler to use... " >&6; } CXX="`xcrun -find clang++`" CXX_BASE=`first_arg_basename "$CXX"` CXX+=" -arch $host_cpu_for_clang $stdlib -isysroot $sysroot $versionmin" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf "%s\n" "$CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } INSTALL_NAME_TOOL=`xcrun -find install_name_tool` AR=`xcrun -find ar` @@ -13070,8 +12305,8 @@ RANLIB=`xcrun -find ranlib` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to treat the installation as read-only" >&5 -printf %s "checking whether to treat the installation as read-only... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to treat the installation as read-only" >&5 +$as_echo_n "checking whether to treat the installation as read-only... " >&6; } if test $_os = Darwin; then enable_readonly_installset=yes @@ -13079,13 +12314,13 @@ enable_readonly_installset=yes fi if test "$enable_readonly_installset" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - printf "%s\n" "#define HAVE_FEATURE_READONLY_INSTALLSET 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_FEATURE_READONLY_INSTALLSET 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -13148,37 +12383,69 @@ LIBO_URE_MISC_FOLDER=program LIBO_URE_SHARE_JAVA_FOLDER=program/classes fi -printf "%s\n" "#define LIBO_BIN_FOLDER \"$LIBO_BIN_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_BIN_FOLDER "$LIBO_BIN_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_ETC_FOLDER \"$LIBO_ETC_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_ETC_FOLDER "$LIBO_ETC_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_LIBEXEC_FOLDER \"$LIBO_LIBEXEC_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_LIBEXEC_FOLDER "$LIBO_LIBEXEC_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_LIB_FOLDER \"$LIBO_LIB_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_LIB_FOLDER "$LIBO_LIB_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_LIB_PYUNO_FOLDER \"$LIBO_LIB_PYUNO_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_LIB_PYUNO_FOLDER "$LIBO_LIB_PYUNO_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_SHARE_FOLDER \"$LIBO_SHARE_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_SHARE_FOLDER "$LIBO_SHARE_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_SHARE_HELP_FOLDER \"$LIBO_SHARE_HELP_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_SHARE_HELP_FOLDER "$LIBO_SHARE_HELP_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_SHARE_JAVA_FOLDER \"$LIBO_SHARE_JAVA_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_SHARE_JAVA_FOLDER "$LIBO_SHARE_JAVA_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_SHARE_PRESETS_FOLDER \"$LIBO_SHARE_PRESETS_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_SHARE_PRESETS_FOLDER "$LIBO_SHARE_PRESETS_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_SHARE_RESOURCE_FOLDER \"$LIBO_SHARE_RESOURCE_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_SHARE_RESOURCE_FOLDER "$LIBO_SHARE_RESOURCE_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_SHARE_SHELL_FOLDER \"$LIBO_SHARE_SHELL_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_SHARE_SHELL_FOLDER "$LIBO_SHARE_SHELL_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_URE_BIN_FOLDER \"$LIBO_URE_BIN_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_URE_BIN_FOLDER "$LIBO_URE_BIN_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_URE_ETC_FOLDER \"$LIBO_URE_ETC_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_URE_ETC_FOLDER "$LIBO_URE_ETC_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_URE_LIB_FOLDER \"$LIBO_URE_LIB_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_URE_LIB_FOLDER "$LIBO_URE_LIB_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_URE_MISC_FOLDER \"$LIBO_URE_MISC_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_URE_MISC_FOLDER "$LIBO_URE_MISC_FOLDER" +_ACEOF -printf "%s\n" "#define LIBO_URE_SHARE_JAVA_FOLDER \"$LIBO_URE_SHARE_JAVA_FOLDER\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBO_URE_SHARE_JAVA_FOLDER "$LIBO_URE_SHARE_JAVA_FOLDER" +_ACEOF # Not all of them needed in config_host.mk, add more if need arises @@ -13319,33 +12586,32 @@ # NOTE: must _not_ be used for bundled external libraries! ISYSTEM= if test "$GCC" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -isystem " >&5 -printf %s "checking for -isystem ... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -isystem " >&5 +$as_echo_n "checking for -isystem ... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -isystem /usr/include -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ISYSTEM="-isystem " fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS if test -n "$ISYSTEM"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test -z "$ISYSTEM"; then @@ -13462,8 +12728,8 @@ fi # Fall back to all MS products (this includes VC++ Build Tools) if ! test -n "$vswhereoutput"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking VC++ Build Tools and similar" >&5 -printf %s "checking VC++ Build Tools and similar... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking VC++ Build Tools and similar" >&5 +$as_echo_n "checking VC++ Build Tools and similar... " >&6; } vswhereoutput=`$vswhere -products \* -version "[ $ver , $(expr $ver + 1) )" -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath | head -1` fi if test -n "$vswhereoutput"; then @@ -13492,15 +12758,15 @@ test_cl_exe() { - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $1 compiler" >&5 -printf %s "checking $1 compiler... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $1 compiler" >&5 +$as_echo_n "checking $1 compiler... " >&6; } CL_EXE_PATH="$2/cl.exe" if test ! -f "$CL_EXE_PATH"; then if test "$1" = "multi-arch"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no compiler (cl.exe) in $2" >&5 -printf "%s\n" "$as_me: WARNING: no compiler (cl.exe) in $2" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no compiler (cl.exe) in $2" >&5 +$as_echo "$as_me: WARNING: no compiler (cl.exe) in $2" >&2;} return 1 else as_fn_error $? "no compiler (cl.exe) in $2" "$LINENO" 5 @@ -13526,16 +12792,16 @@ PATH="$OLD_PATH" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CL_EXE_PATH" >&5 -printf "%s\n" "$CL_EXE_PATH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CL_EXE_PATH" >&5 +$as_echo "$CL_EXE_PATH" >&6; } } SOLARINC= MSBUILD_PATH= DEVENV= if test "$_os" = "WINNT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Visual C++" >&5 -printf %s "checking Visual C++... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Visual C++" >&5 +$as_echo_n "checking Visual C++... " >&6; } find_msvc "$with_visual_studio" if test -z "$vctest"; then if test -n "$with_visual_studio"; then @@ -13544,8 +12810,8 @@ as_fn_error $? "no Visual Studio installation found" "$LINENO" 5 fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf "%s\n" "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } VC_PRODUCT_DIR="$vctest/VC" COMPATH="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber" @@ -13572,21 +12838,21 @@ MSVC_HOST_PATH="$MSVC_BUILD_PATH" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for short pathname of VC product directory" >&5 -printf %s "checking for short pathname of VC product directory... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for short pathname of VC product directory" >&5 +$as_echo_n "checking for short pathname of VC product directory... " >&6; } VC_PRODUCT_DIR=`win_short_path_for_make "$VC_PRODUCT_DIR"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VC_PRODUCT_DIR" >&5 -printf "%s\n" "$VC_PRODUCT_DIR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VC_PRODUCT_DIR" >&5 +$as_echo "$VC_PRODUCT_DIR" >&6; } UCRTSDKDIR= UCRTVERSION= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UCRT location" >&5 -printf %s "checking for UCRT location... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UCRT location" >&5 +$as_echo_n "checking for UCRT location... " >&6; } find_ucrt # find_ucrt errors out if it doesn't find it - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UCRTSDKDIR ($UCRTVERSION)" >&5 -printf "%s\n" "$UCRTSDKDIR ($UCRTVERSION)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UCRTSDKDIR ($UCRTVERSION)" >&5 +$as_echo "$UCRTSDKDIR ($UCRTVERSION)" >&6; } PathFormat "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt" ucrtincpath_formatted=$formatted_path # SOLARINC is used for external modules and must be set too. @@ -13600,8 +12866,8 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MSBuild.exe location for: $vcnumwithdot" >&5 -printf %s "checking for MSBuild.exe location for: $vcnumwithdot... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSBuild.exe location for: $vcnumwithdot" >&5 +$as_echo_n "checking for MSBuild.exe location for: $vcnumwithdot... " >&6; } # Find the proper version of MSBuild.exe to use based on the VS version reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MSBuild/$vcnumwithdot/MSBuildOverrideTasksPath if test -z "$regvalue" ; then @@ -13613,8 +12879,8 @@ fi if test -d "$regvalue" ; then MSBUILD_PATH=`win_short_path_for_make "$regvalue"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $regvalue" >&5 -printf "%s\n" "$regvalue" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $regvalue" >&5 +$as_echo "$regvalue" >&6; } else as_fn_error $? "MSBuild.exe location not found" "$LINENO" 5 fi @@ -13624,8 +12890,8 @@ DEVENV=$(cygpath -lm "$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe") DEVENV_unix=$(cygpath -u "$DEVENV") if test ! -e "$DEVENV_unix"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No devenv.exe found - this is expected for VC++ Build Tools" >&5 -printf "%s\n" "$as_me: WARNING: No devenv.exe found - this is expected for VC++ Build Tools" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No devenv.exe found - this is expected for VC++ Build Tools" >&5 +$as_echo "$as_me: WARNING: No devenv.exe found - this is expected for VC++ Build Tools" >&2;} fi if test -z "$MSVC_CXX"; then @@ -13644,8 +12910,8 @@ if test -n "$CC"; then # Remove /cl.exe from CC case insensitive - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: found Visual C++ $vcyear" >&5 -printf "%s\n" "$as_me: found Visual C++ $vcyear" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: found Visual C++ $vcyear" >&5 +$as_echo "$as_me: found Visual C++ $vcyear" >&6;} main_include_dir=`cygpath -d -m "$COMPATH/Include"` CPPFLAGS="$CPPFLAGS -I$main_include_dir" @@ -13686,8 +12952,8 @@ fi # ERROR if VS version < 16.5 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $CC_BASE is at least Visual Studio 2019 version 16.5" >&5 -printf %s "checking $CC_BASE is at least Visual Studio 2019 version 16.5... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $CC_BASE is at least Visual Studio 2019 version 16.5" >&5 +$as_echo_n "checking $CC_BASE is at least Visual Studio 2019 version 16.5... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13698,18 +12964,17 @@ #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else $as_nop +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else as_fn_error $? "no" "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # WARN if VS version < 16.10 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $CC_BASE is at least Visual Studio 2019 version 16.10" >&5 -printf %s "checking $CC_BASE is at least Visual Studio 2019 version 16.10... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $CC_BASE is at least Visual Studio 2019 version 16.10" >&5 +$as_echo_n "checking $CC_BASE is at least Visual Studio 2019 version 16.10... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13718,20 +12983,19 @@ #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : vs2019_recommended_version=yes -else $as_nop +else vs2019_recommended_version=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $vs2019_recommended_version = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no" >&5 -printf "%s\n" "$as_me: WARNING: no" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no" >&5 +$as_echo "$as_me: WARNING: no" >&2;} add_warning "You should have at least Visual Studio 2019 version 16.10 to avoid build problems. Otherwise, you may face problems with the build of some modules including dragonbox." fi @@ -13746,20 +13010,20 @@ CXX_X64_BINARY= if test "$WIN_HOST_ARCH" = "x86" -a -n "$WIN_OTHER_ARCH"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the libraries to build the 64-bit Explorer extensions" >&5 -printf %s "checking for the libraries to build the 64-bit Explorer extensions... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the libraries to build the 64-bit Explorer extensions" >&5 +$as_echo_n "checking for the libraries to build the 64-bit Explorer extensions... " >&6; } if test -f "$COMPATH/atlmfc/lib/x64/atls.lib" -o \ -f "$COMPATH/atlmfc/lib/spectre/x64/atls.lib" then BUILD_X64=TRUE CXX_X64_BINARY=`win_short_path_for_make "$MSVC_MULTI_PATH/cl.exe"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 -printf "%s\n" "found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf "%s\n" "not found" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Installation set will not contain 64-bit Explorer extensions" >&5 -printf "%s\n" "$as_me: WARNING: Installation set will not contain 64-bit Explorer extensions" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Installation set will not contain 64-bit Explorer extensions" >&5 +$as_echo "$as_me: WARNING: Installation set will not contain 64-bit Explorer extensions" >&2;} fi elif test "$WIN_HOST_ARCH" = "x64"; then CXX_X64_BINARY=$CXX @@ -13774,22 +13038,22 @@ case "$WIN_HOST_ARCH" in x64) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a x86 compiler and libraries for 32-bit binaries required for TWAIN support" >&5 -printf %s "checking for a x86 compiler and libraries for 32-bit binaries required for TWAIN support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a x86 compiler and libraries for 32-bit binaries required for TWAIN support" >&5 +$as_echo_n "checking for a x86 compiler and libraries for 32-bit binaries required for TWAIN support... " >&6; } if test -n "$CXX_X86_BINARY"; then BUILD_X86=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: preset" >&5 -printf "%s\n" "preset" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: preset" >&5 +$as_echo "preset" >&6; } elif test -n "$WIN_MULTI_ARCH"; then BUILD_X86=TRUE CXX_X86_BINARY=`win_short_path_for_make "$MSVC_MULTI_PATH/cl.exe"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 -printf "%s\n" "found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf "%s\n" "not found" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Installation set will not contain 32-bit binaries required for TWAIN support" >&5 -printf "%s\n" "$as_me: WARNING: Installation set will not contain 32-bit binaries required for TWAIN support" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Installation set will not contain 32-bit binaries required for TWAIN support" >&5 +$as_echo "$as_me: WARNING: Installation set will not contain 32-bit binaries required for TWAIN support" >&2;} fi ;; x86) @@ -13806,8 +13070,8 @@ COM_IS_CLANG= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler is actually Clang" >&5 -printf %s "checking whether the compiler is actually Clang... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is actually Clang" >&5 +$as_echo_n "checking whether the compiler is actually Clang... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13817,22 +13081,21 @@ int foo=42; _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } COM_IS_CLANG=TRUE -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CLANGVER= if test "$COM_IS_CLANG" = TRUE; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Clang is new enough" >&5 -printf %s "checking whether Clang is new enough... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Clang is new enough" >&5 +$as_echo_n "checking whether Clang is new enough... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13841,19 +13104,18 @@ #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : my_apple_clang=yes -else $as_nop +else my_apple_clang= fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$my_apple_clang" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: assumed yes (Apple Clang)" >&5 -printf "%s\n" "assumed yes (Apple Clang)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: assumed yes (Apple Clang)" >&5 +$as_echo "assumed yes (Apple Clang)" >&6; } elif test "$_os" = Emscripten; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: assumed yes (Emscripten Clang)" >&5 -printf "%s\n" "assumed yes (Emscripten Clang)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: assumed yes (Emscripten Clang)" >&5 +$as_echo "assumed yes (Emscripten Clang)" >&6; } else if test "$_os" = WINNT; then my_args="/EP /TC" @@ -13865,22 +13127,26 @@ CLANGVER=`echo $clang_version \ | $AWK -F. '{ print \$1*10000+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'` if test "$CLANGVER" -ge 80001; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($clang_version)" >&5 -printf "%s\n" "yes ($clang_version)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($clang_version)" >&5 +$as_echo "yes ($clang_version)" >&6; } else as_fn_error $? "\"$CLANG_FULL_VERSION\" is too old or unrecognized, must be at least Clang 8.0.1" "$LINENO" 5 fi - printf "%s\n" "#define CLANG_VERSION $CLANGVER" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define CLANG_VERSION $CLANGVER +_ACEOF - printf "%s\n" "#define CLANG_FULL_VERSION $CLANG_FULL_VERSION" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define CLANG_FULL_VERSION $CLANG_FULL_VERSION +_ACEOF fi fi SHOWINCLUDES_PREFIX= if test "$_os" = WINNT; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the dependency generation prefix (cl.exe -showIncludes)" >&5 -printf %s "checking the dependency generation prefix (cl.exe -showIncludes)... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the dependency generation prefix (cl.exe -showIncludes)" >&5 +$as_echo_n "checking the dependency generation prefix (cl.exe -showIncludes)... " >&6; } echo "#include " > conftest.c SHOWINCLUDES_PREFIX=`$CC $CFLAGS -c -showIncludes conftest.c 2>/dev/null | \ grep 'stdlib\.h' | head -n1 | sed 's/ [[:alpha:]]:.*//'` @@ -13888,8 +13154,8 @@ if test -z "$SHOWINCLUDES_PREFIX"; then as_fn_error $? "cannot determine the -showIncludes prefix" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$SHOWINCLUDES_PREFIX\"" >&5 -printf "%s\n" "\"$SHOWINCLUDES_PREFIX\"" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$SHOWINCLUDES_PREFIX\"" >&5 +$as_echo "\"$SHOWINCLUDES_PREFIX\"" >&6; } fi fi @@ -13898,8 +13164,8 @@ # prefix C with ccache if needed # if test "$CCACHE" != ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE is already ccached" >&5 -printf %s "checking whether $CC_BASE is already ccached... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE is already ccached" >&5 +$as_echo_n "checking whether $CC_BASE is already ccached... " >&6; } ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -13919,30 +13185,29 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : use_ccache=yes -else $as_nop +else use_ccache=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS ac_c_werror_flag=$save_ac_c_werror_flag if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else CC="$CCACHE $CC" CC_BASE="ccache $CC_BASE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -13960,62 +13225,60 @@ HAVE_GCC_GGDB2= if test "$GCC" = "yes" -a "$_os" != "Emscripten"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -ggdb2" >&5 -printf %s "checking whether $CC_BASE supports -ggdb2... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -ggdb2" >&5 +$as_echo_n "checking whether $CC_BASE supports -ggdb2... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -ggdb2" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : HAVE_GCC_GGDB2=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_GCC_GGDB2" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$host_cpu" = "m68k"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -mlong-jump-table-offsets" >&5 -printf %s "checking whether $CC_BASE supports -mlong-jump-table-offsets... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -mlong-jump-table-offsets" >&5 +$as_echo_n "checking whether $CC_BASE supports -mlong-jump-table-offsets... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -mlong-jump-table-offsets" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : HAVE_GCC_LONG_JUMP_TABLE_OFFSETS=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_GCC_LONG_JUMP_TABLE_OFFSETS" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else as_fn_error $? "no" "$LINENO" 5 fi @@ -14024,15 +13287,15 @@ if test "$GCC" = "yes" -a -z "$COM_IS_CLANG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the GCC version" >&5 -printf %s "checking the GCC version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GCC version" >&5 +$as_echo_n "checking the GCC version... " >&6; } _gcc_version=`$CC -dumpfullversion` gcc_full_version=$(printf '%s' "$_gcc_version" | \ $AWK -F. '{ print $1*10000+$2*100+(NF<3?1:$3) }') GCC_VERSION=`echo $_gcc_version | $AWK -F. '{ print \$1*100+\$2 }'` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gcc $_gcc_version ($gcc_full_version)" >&5 -printf "%s\n" "gcc $_gcc_version ($gcc_full_version)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gcc $_gcc_version ($gcc_full_version)" >&5 +$as_echo "gcc $_gcc_version ($gcc_full_version)" >&6; } if test "$gcc_full_version" -lt 70000; then as_fn_error $? "GCC $_gcc_version is too old, must be at least GCC 7.0.0" "$LINENO" 5 @@ -14046,16 +13309,16 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with additional debug utilities" >&5 -printf %s "checking whether to build with additional debug utilities... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with additional debug utilities" >&5 +$as_echo_n "checking whether to build with additional debug utilities... " >&6; } if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then ENABLE_DBGUTIL="TRUE" # this is an extra var so it can have different default on different MSVC # versions (in case there are version specific problems with it) MSVC_USE_DEBUG_RUNTIME="TRUE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } # cppunit and graphite expose STL in public headers if test "$with_system_cppunit" = "yes"; then as_fn_error $? "--with-system-cppunit conflicts with --enable-dbgutil" "$LINENO" 5 @@ -14105,8 +13368,8 @@ else ENABLE_DBGUTIL="" MSVC_USE_DEBUG_RUNTIME="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -14118,27 +13381,27 @@ if test -z "$libo_fuzzed_enable_debug"; then as_fn_error $? "--disable-debug cannot be used with --enable-dbgutil" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Resetting --enable-debug=yes" >&5 -printf "%s\n" "$as_me: Resetting --enable-debug=yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Resetting --enable-debug=yes" >&5 +$as_echo "$as_me: Resetting --enable-debug=yes" >&6;} enable_debug=yes fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to do a debug build" >&5 -printf %s "checking whether to do a debug build... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to do a debug build" >&5 +$as_echo_n "checking whether to do a debug build... " >&6; } if test -n "$ENABLE_DBGUTIL" -o \( -n "$enable_debug" -a "$enable_debug" != "no" \) ; then ENABLE_DEBUG="TRUE" if test -n "$ENABLE_DBGUTIL" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (dbgutil)" >&5 -printf "%s\n" "yes (dbgutil)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (dbgutil)" >&5 +$as_echo "yes (dbgutil)" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi else ENABLE_DEBUG="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -14163,8 +13426,8 @@ fi use_ld_fail_if_error=$2 use_ld_ok= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $use_ld linker support" >&5 -printf %s "checking for $use_ld linker support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $use_ld linker support" >&5 +$as_echo_n "checking for $use_ld linker support... " >&6; } use_ld_ldflags_save="$LDFLAGS" LDFLAGS="$LDFLAGS $use_ld" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14173,7 +13436,7 @@ #include int -main (void) +main () { printf ("hello world\n"); @@ -14182,22 +13445,21 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : USE_LD=$use_ld fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -n "$USE_LD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes " >&5 -printf "%s\n" "yes " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes " >&5 +$as_echo "yes " >&6; } use_ld_ok=yes else if test -n "$use_ld_fail_if_error"; then as_fn_error $? "no " "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no " >&5 -printf "%s\n" "no " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no " >&5 +$as_echo "no " >&6; } fi fi if test -n "$use_ld_ok"; then @@ -14237,14 +13499,14 @@ if test -z "$ld_used"; then ld_used="unknown" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for linker that is used" >&5 -printf %s "checking for linker that is used... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_used" >&5 -printf "%s\n" "$ld_used" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that is used" >&5 +$as_echo_n "checking for linker that is used... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_used" >&5 +$as_echo "$ld_used" >&6; } if test -n "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then if echo "$ld_used" | grep -q "^GNU ld"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The default GNU linker is slow, consider using LLD, mold or the GNU gold linker." >&5 -printf "%s\n" "$as_me: WARNING: The default GNU linker is slow, consider using LLD, mold or the GNU gold linker." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The default GNU linker is slow, consider using LLD, mold or the GNU gold linker." >&5 +$as_echo "$as_me: WARNING: The default GNU linker is slow, consider using LLD, mold or the GNU gold linker." >&2;} add_warning "The default GNU linker is slow, consider using LLD, mold or the GNU gold linker." fi fi @@ -14259,8 +13521,8 @@ HAVE_LD_BSYMBOLIC_FUNCTIONS= if test "$GCC" = "yes" -a "$_os" != Emscripten ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Bsymbolic-functions linker support" >&5 -printf %s "checking for -Bsymbolic-functions linker support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Bsymbolic-functions linker support" >&5 +$as_echo_n "checking for -Bsymbolic-functions linker support... " >&6; } bsymbolic_functions_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14269,7 +13531,7 @@ #include int -main (void) +main () { printf ("hello world\n"); @@ -14278,18 +13540,17 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test "$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found " >&5 -printf "%s\n" "found " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5 +$as_echo "found " >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found " >&5 -printf "%s\n" "not found " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5 +$as_echo "not found " >&6; } fi LDFLAGS=$bsymbolic_functions_ldflags_save fi @@ -14298,8 +13559,8 @@ LD_GC_SECTIONS= if test "$GCC" = "yes"; then for flag in "--gc-sections" "-dead_strip"; do - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $flag linker support" >&5 -printf %s "checking for $flag linker support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $flag linker support" >&5 +$as_echo_n "checking for $flag linker support... " >&6; } ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,$flag" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14308,7 +13569,7 @@ #include int -main (void) +main () { printf ("hello world\n"); @@ -14317,20 +13578,19 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : LD_GC_SECTIONS="-Wl,$flag" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found " >&5 -printf "%s\n" "found " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5 +$as_echo "found " >&6; } -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found " >&5 -printf "%s\n" "not found " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5 +$as_echo "not found " >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$ldflags_save if test -n "$LD_GC_SECTIONS"; then @@ -14356,85 +13616,83 @@ else TEST_CC_FLAG=-gsplit-dwarf fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports $TEST_CC_FLAG" >&5 -printf %s "checking whether $CC_BASE supports $TEST_CC_FLAG... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports $TEST_CC_FLAG" >&5 +$as_echo_n "checking whether $CC_BASE supports $TEST_CC_FLAG... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror $TEST_CC_FLAG" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : HAVE_EXTERNAL_DWARF=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_EXTERNAL_DWARF" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else if test "$enable_split_debug" = yes; then as_fn_error $? "no" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi fi if test -z "$HAVE_EXTERNAL_DWARF" -a "$test_split_debug" = "yes" -a -n "$use_split_debug"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Compiler is not capable of creating split debug info, linking will require more time and disk space." >&5 -printf "%s\n" "$as_me: WARNING: Compiler is not capable of creating split debug info, linking will require more time and disk space." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiler is not capable of creating split debug info, linking will require more time and disk space." >&5 +$as_echo "$as_me: WARNING: Compiler is not capable of creating split debug info, linking will require more time and disk space." >&2;} add_warning "Compiler is not capable of creating split debug info, linking will require more time and disk space." fi fi HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -Xclang -debug-info-kind=constructor" >&5 -printf %s "checking whether $CC_BASE supports -Xclang -debug-info-kind=constructor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -Xclang -debug-info-kind=constructor" >&5 +$as_echo_n "checking whether $CC_BASE supports -Xclang -debug-info-kind=constructor... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -Xclang -debug-info-kind=constructor" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ENABLE_GDB_INDEX= if test "$enable_gdb_index" != "no"; then if test "$enable_gdb_index" = yes -o \( "$test_gdb_index" = "yes" -a -n "$ENABLE_DEBUG$ENABLE_DBGUTIL" \); then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -ggnu-pubnames" >&5 -printf %s "checking whether $CC_BASE supports -ggnu-pubnames... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -ggnu-pubnames" >&5 +$as_echo_n "checking whether $CC_BASE supports -ggnu-pubnames... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -g -ggnu-pubnames" have_ggnu_pubnames= @@ -14442,33 +13700,32 @@ /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : have_ggnu_pubnames=TRUE -else $as_nop +else have_ggnu_pubnames= fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test "$have_ggnu_pubnames" != "TRUE"; then if test "$enable_gdb_index" = "yes"; then as_fn_error $? "no, --enable-gdb-index not supported" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no " >&5 -printf "%s\n" "no " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no " >&5 +$as_echo "no " >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes " >&5 -printf "%s\n" "yes " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -Wl,--gdb-index" >&5 -printf %s "checking whether $CC_BASE supports -Wl,--gdb-index... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes " >&5 +$as_echo "yes " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -Wl,--gdb-index" >&5 +$as_echo_n "checking whether $CC_BASE supports -Wl,--gdb-index... " >&6; } ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,--gdb-index" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14477,7 +13734,7 @@ #include int -main (void) +main () { printf ("hello world\n"); @@ -14486,21 +13743,20 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ENABLE_GDB_INDEX=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test "$ENABLE_GDB_INDEX" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes " >&5 -printf "%s\n" "yes " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes " >&5 +$as_echo "yes " >&6; } else if test "$enable_gdb_index" = "yes"; then as_fn_error $? "no " "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no " >&5 -printf "%s\n" "no " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no " >&5 +$as_echo "no " >&6; } fi fi LDFLAGS=$ldflags_save @@ -14508,8 +13764,8 @@ CFLAGS=$save_CFLAGS fi if test -z "$ENABLE_GDB_INDEX" -a "$test_gdb_index" = "yes" -a -n "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Linker is not capable of creating gdb index, debugger startup will be slow." >&5 -printf "%s\n" "$as_me: WARNING: Linker is not capable of creating gdb index, debugger startup will be slow." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Linker is not capable of creating gdb index, debugger startup will be slow." >&5 +$as_echo "$as_me: WARNING: Linker is not capable of creating gdb index, debugger startup will be slow." >&2;} add_warning "Linker is not capable of creating gdb index, debugger startup will be slow." fi fi @@ -14523,8 +13779,8 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to generate debug information" >&5 -printf %s "checking whether to generate debug information... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to generate debug information" >&5 +$as_echo_n "checking whether to generate debug information... " >&6; } if test -z "$enable_symbols"; then if test -n "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then enable_symbols=yes @@ -14534,38 +13790,38 @@ fi if test "$enable_symbols" = yes; then ENABLE_SYMBOLS_FOR=all - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } elif test "$enable_symbols" = no; then ENABLE_SYMBOLS_FOR= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else # Selective debuginfo. ENABLE_SYMBOLS_FOR="$enable_symbols" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: for \"$enable_symbols\"" >&5 -printf "%s\n" "for \"$enable_symbols\"" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: for \"$enable_symbols\"" >&5 +$as_echo "for \"$enable_symbols\"" >&6; } fi if test -n "$with_android_ndk" -a \( -n "$ENABLE_SYMBOLS" -o -n "$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \) -a "$ENABLE_DEBUGINFO_FOR" = "all"; then # Building on Android with full symbols: without enough memory the linker never finishes currently. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether enough memory is available for linking" >&5 -printf %s "checking whether enough memory is available for linking... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether enough memory is available for linking" >&5 +$as_echo_n "checking whether enough memory is available for linking... " >&6; } mem_size=$(grep -o 'MemTotal: *.\+ kB' /proc/meminfo | sed 's/MemTotal: *\(.\+\) kB/\1/') # Check for 15GB, as Linux reports a bit less than the physical memory size. if test -n "$mem_size" -a $mem_size -lt 15728640; then as_fn_error $? "building with full symbols and less than 16GB of memory is not supported" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi fi ENABLE_OPTIMIZED= ENABLE_OPTIMIZED_DEBUG= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to compile with optimization flags" >&5 -printf %s "checking whether to compile with optimization flags... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile with optimization flags" >&5 +$as_echo_n "checking whether to compile with optimization flags... " >&6; } if test -z "$enable_optimized"; then if test -n "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then enable_optimized=no @@ -14575,50 +13831,49 @@ fi if test "$enable_optimized" = yes; then ENABLE_OPTIMIZED=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } elif test "$enable_optimized" = debug; then ENABLE_OPTIMIZED_DEBUG=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (debug)" >&5 -printf "%s\n" "yes (debug)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (debug)" >&5 +$as_echo "yes (debug)" >&6; } HAVE_GCC_OG= if test "$GCC" = "yes" -a "$_os" != "Emscripten"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -Og" >&5 -printf %s "checking whether $CC_BASE supports -Og... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -Og" >&5 +$as_echo_n "checking whether $CC_BASE supports -Og... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -Og" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : HAVE_GCC_OG=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_GCC_OG" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test -z "$HAVE_GCC_OG" -a "$_os" != "Emscripten"; then as_fn_error $? "The compiler does not support optimizations suitable for debugging." "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -15076,7 +14331,7 @@ DISABLE_GUI=TRUE test_epoxy=no else - printf "%s\n" "#define HAVE_FEATURE_UI 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_UI 1" >>confdefs.h fi @@ -15091,7 +14346,7 @@ if test "$using_x11" = yes; then if test "$USING_X11" = TRUE; then - printf "%s\n" "#define USING_X11 1" >>confdefs.h + $as_echo "#define USING_X11 1" >>confdefs.h else disable_x11_tests @@ -15123,9 +14378,13 @@ -printf "%s\n" "#define SDKDIR \"$INSTDIR/$SDKDIRNAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SDKDIR "$INSTDIR/$SDKDIRNAME" +_ACEOF -printf "%s\n" "#define WORKDIR \"$WORKDIR\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define WORKDIR "$WORKDIR" +_ACEOF if test "$OS" = WNT -a "$COM" = MSC; then @@ -15142,8 +14401,8 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which package format to use" >&5 -printf %s "checking which package format to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which package format to use" >&5 +$as_echo_n "checking which package format to use... " >&6; } if test -n "$with_package_format" -a "$with_package_format" != no; then for i in $with_package_format; do case "$i" in @@ -15171,12 +14430,11 @@ if test "$OS" = "LINUX" || test "$OS" = "SOLARIS"; then # Extract the first word of "fakeroot", so it can be a program name with args. set dummy fakeroot; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_FAKEROOT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_FAKEROOT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $FAKEROOT in [\\/]* | ?:[\\/]*) ac_cv_path_FAKEROOT="$FAKEROOT" # Let the user override the test with a path. @@ -15186,15 +14444,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_FAKEROOT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_FAKEROOT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15207,11 +14461,11 @@ fi FAKEROOT=$ac_cv_path_FAKEROOT if test -n "$FAKEROOT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FAKEROOT" >&5 -printf "%s\n" "$FAKEROOT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FAKEROOT" >&5 +$as_echo "$FAKEROOT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -15220,12 +14474,12 @@ fi fi PKGFORMAT="$with_package_format" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGFORMAT" >&5 -printf "%s\n" "$PKGFORMAT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGFORMAT" >&5 +$as_echo "$PKGFORMAT" >&6; } else PKGFORMAT= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi @@ -15235,8 +14489,8 @@ HELP_ONLINE= WITH_HELPPACKS= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which help to build" >&5 -printf %s "checking which help to build... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which help to build" >&5 +$as_echo_n "checking which help to build... " >&6; } if test -n "$with_help" -a "$with_help" != "no"; then GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES" BUILD_TYPE="$BUILD_TYPE HELP" @@ -15245,44 +14499,44 @@ ENABLE_HTMLHELP=TRUE WITH_HELPPACKS=TRUE SCPDEFS="$SCPDEFS -DWITH_HELPPACKS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HTML (local)" >&5 -printf "%s\n" "HTML (local)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: HTML (local)" >&5 +$as_echo "HTML (local)" >&6; } ;; "online") ENABLE_HTMLHELP=TRUE HELP_ONLINE=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HTML (online)" >&5 -printf "%s\n" "HTML (online)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: HTML (online)" >&5 +$as_echo "HTML (online)" >&6; } ;; yes) WITH_HELPPACKS=TRUE SCPDEFS="$SCPDEFS -DWITH_HELPPACKS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: XML (local)" >&5 -printf "%s\n" "XML (local)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: XML (local)" >&5 +$as_echo "XML (local)" >&6; } ;; *) as_fn_error $? "Unknown --with-help=$with_help" "$LINENO" 5 ;; esac else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we need to build the help index tooling" >&5 -printf %s "checking if we need to build the help index tooling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to build the help index tooling" >&5 +$as_echo_n "checking if we need to build the help index tooling... " >&6; } if test \( "$with_help" = yes -o "$enable_extension_integration" != no \) -a -z "$DISABLE_DYNLOADING"; then BUILD_TYPE="$BUILD_TYPE HELPTOOLS" test_clucene=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable xapian-omega support for online help" >&5 -printf %s "checking whether to enable xapian-omega support for online help... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable xapian-omega support for online help" >&5 +$as_echo_n "checking whether to enable xapian-omega support for online help... " >&6; } if test -n "$with_omindex" -a "$with_omindex" != "no"; then if test "$HELP_ONLINE" != TRUE; then as_fn_error $? "Can't build xapian-omega index without --help=online" "$LINENO" 5 @@ -15290,48 +14544,48 @@ case "$with_omindex" in "server") HELP_OMINDEX_PAGE=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SERVER" >&5 -printf "%s\n" "SERVER" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: SERVER" >&5 +$as_echo "SERVER" >&6; } ;; "noxap") - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: NOXAP" >&5 -printf "%s\n" "NOXAP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: NOXAP" >&5 +$as_echo "NOXAP" >&6; } ;; *) as_fn_error $? "Unknown --with-omindex=$with_omindex" "$LINENO" 5 ;; esac else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include the XML-help support" >&5 -printf %s "checking whether to include the XML-help support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include the XML-help support" >&5 +$as_echo_n "checking whether to include the XML-help support... " >&6; } if test "$enable_xmlhelp" = yes; then BUILD_TYPE="$BUILD_TYPE XMLHELP" test_clucene=yes - printf "%s\n" "#define HAVE_FEATURE_XMLHELP 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_XMLHELP 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else if test "$with_help" = yes; then add_warning "Building the XML help, but LO with disabled xmlhelp support. Generated help can't be accessed from this LO build!" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for helppack integration" >&5 -printf %s "checking for helppack integration... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for helppack integration" >&5 +$as_echo_n "checking for helppack integration... " >&6; } if test -z "$WITH_HELPPACKS" -o "$with_helppack_integration" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no integration" >&5 -printf "%s\n" "no integration" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no integration" >&5 +$as_echo "no integration" >&6; } else SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: integration" >&5 -printf "%s\n" "integration" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: integration" >&5 +$as_echo "integration" >&6; } fi @@ -15343,8 +14597,8 @@ if test "$cross_compiling" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BUILD platform configuration" >&5 -printf %s "checking for BUILD platform configuration... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD platform configuration" >&5 +$as_echo_n "checking for BUILD platform configuration... " >&6; } echo rm -rf CONF-FOR-BUILD config_build.mk mkdir CONF-FOR-BUILD @@ -15614,8 +14868,8 @@ eval `cat CONF-FOR-BUILD/build-config` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for BUILD platform configuration... done" >&5 -printf "%s\n" "checking for BUILD platform configuration... done" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for BUILD platform configuration... done" >&5 +$as_echo "checking for BUILD platform configuration... done" >&6; } rm -rf CONF-FOR-BUILD else @@ -15648,22 +14902,21 @@ if test -z "$CROSS_COMPILING"; then test -n "$LOCKFILE" -a "${with_system_lockfile+set}" != set && with_system_lockfile="$LOCKFILE" test "${with_system_lockfile+set}" = set || with_system_lockfile=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which lockfile binary to use" >&5 -printf %s "checking which lockfile binary to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lockfile binary to use" >&5 +$as_echo_n "checking which lockfile binary to use... " >&6; } case "$with_system_lockfile" in yes) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } for ac_prog in dotlockfile lockfile do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_LOCKFILE+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LOCKFILE+:} false; then : + $as_echo_n "(cached) " >&6 +else case $LOCKFILE in [\\/]* | ?:[\\/]*) ac_cv_path_LOCKFILE="$LOCKFILE" # Let the user override the test with a path. @@ -15673,15 +14926,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_LOCKFILE="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LOCKFILE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15693,11 +14942,11 @@ fi LOCKFILE=$ac_cv_path_LOCKFILE if test -n "$LOCKFILE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCKFILE" >&5 -printf "%s\n" "$LOCKFILE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKFILE" >&5 +$as_echo "$LOCKFILE" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -15706,8 +14955,8 @@ ;; no) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } ;; *) if test -x "$with_system_lockfile"; then @@ -15715,81 +14964,74 @@ else as_fn_error $? "'$with_system_lockfile' is not executable." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_system_lockfile" >&5 -printf "%s\n" "$with_system_lockfile" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_system_lockfile" >&5 +$as_echo "$with_system_lockfile" >&6; } ;; esac fi if test -n "$LOCKFILE" -a "$DISABLE_DYNLOADING" = TRUE; then - add_warning "The default system lockfile has increasing poll intervals up to 60s, so linking executables may be delayed." -fi - -ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" -if test "x$ac_cv_header_getopt_h" = xyes -then : - printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h - + add_warning "The default system lockfile has increasing poll intervals up to 60s, so linking executables may be delayed." fi -ac_fn_c_check_header_compile "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default" -if test "x$ac_cv_header_paths_h" = xyes -then : - printf "%s\n" "#define HAVE_PATHS_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_param_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h +for ac_header in getopt.h paths.h sys/param.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime" -if test "x$ac_cv_func_utime" = xyes -then : - printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h +done -fi -ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes" -if test "x$ac_cv_func_utimes" = xyes -then : - printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h +for ac_func in utime utimes +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi +done -ac_fn_c_check_header_compile "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default" -if test "x$ac_cv_header_syslog_h" = xyes -then : - printf "%s\n" "#define HAVE_SYSLOG_H 1" >>confdefs.h +ac_fn_c_check_header_mongrel "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default" +if test "x$ac_cv_header_syslog_h" = xyes; then : + $as_echo "#define HAVE_SYSLOG_H 1" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to turn warnings to errors" >&5 -printf %s "checking whether to turn warnings to errors... " >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to turn warnings to errors" >&5 +$as_echo_n "checking whether to turn warnings to errors... " >&6; } if test -n "$enable_werror" -a "$enable_werror" != "no"; then ENABLE_WERROR="TRUE" PYTHONWARNINGS="error" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else if test -n "$LODE_HOME" -a -z "$enable_werror"; then ENABLE_WERROR="TRUE" PYTHONWARNINGS="error" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to have assert() failures abort even without --enable-debug" >&5 -printf %s "checking whether to have assert() failures abort even without --enable-debug... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to have assert() failures abort even without --enable-debug" >&5 +$as_echo_n "checking whether to have assert() failures abort even without --enable-debug... " >&6; } if test -z "$enable_assert_always_abort"; then if test "$ENABLE_DEBUG" = TRUE; then enable_assert_always_abort=yes @@ -15799,20 +15041,20 @@ fi if test "$enable_assert_always_abort" = "yes"; then ASSERT_ALWAYS_ABORT="TRUE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else ASSERT_ALWAYS_ABORT="FALSE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Determine whether to use ooenv for the instdir installation # =================================================================== if test $_os != "WINNT" -a $_os != "Darwin"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use ooenv for the instdir installation" >&5 -printf %s "checking whether to use ooenv for the instdir installation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ooenv for the instdir installation" >&5 +$as_echo_n "checking whether to use ooenv for the instdir installation... " >&6; } if test -z "$enable_ooenv"; then if test -n "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then enable_ooenv=yes @@ -15821,12 +15063,12 @@ fi fi if test "$enable_ooenv" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else ENABLE_OOENV="TRUE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi fi @@ -15839,36 +15081,35 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build the pagein binaries for oosplash" >&5 -printf %s "checking whether to build the pagein binaries for oosplash... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the pagein binaries for oosplash" >&5 +$as_echo_n "checking whether to build the pagein binaries for oosplash... " >&6; } if test "${enable_pagein}" != no -a -z "$DISABLE_DYNLOADING"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_PAGEIN=TRUE - printf "%s\n" "#define HAVE_FEATURE_PAGEIN 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_PAGEIN 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable CUPS support" >&5 -printf %s "checking whether to enable CUPS support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable CUPS support" >&5 +$as_echo_n "checking whether to enable CUPS support... " >&6; } if test "$test_cups" = yes -a "$enable_cups" != no; then ENABLE_CUPS=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether cups support is present" >&5 -printf %s "checking whether cups support is present... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cupsPrintFiles in -lcups" >&5 -printf %s "checking for cupsPrintFiles in -lcups... " >&6; } -if test ${ac_cv_lib_cups_cupsPrintFiles+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cups support is present" >&5 +$as_echo_n "checking whether cups support is present... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cupsPrintFiles in -lcups" >&5 +$as_echo_n "checking for cupsPrintFiles in -lcups... " >&6; } +if ${ac_cv_lib_cups_cupsPrintFiles+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lcups $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15877,45 +15118,46 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char cupsPrintFiles (); int -main (void) +main () { return cupsPrintFiles (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cups_cupsPrintFiles=yes -else $as_nop +else ac_cv_lib_cups_cupsPrintFiles=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cups_cupsPrintFiles" >&5 -printf "%s\n" "$ac_cv_lib_cups_cupsPrintFiles" >&6; } -if test "x$ac_cv_lib_cups_cupsPrintFiles" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cups_cupsPrintFiles" >&5 +$as_echo "$ac_cv_lib_cups_cupsPrintFiles" >&6; } +if test "x$ac_cv_lib_cups_cupsPrintFiles" = xyes; then : : fi - ac_fn_c_check_header_compile "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default" -if test "x$ac_cv_header_cups_cups_h" = xyes -then : - printf "%s\n" "#define HAVE_CUPS_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default" +if test "x$ac_cv_header_cups_cups_h" = xyes; then : + $as_echo "#define HAVE_CUPS_H 1" >>confdefs.h fi + if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -o "$ac_cv_header_cups_cups_h" != "yes"; then as_fn_error $? "Could not find CUPS. Install libcups2-dev or cups-devel." "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -15939,10 +15181,9 @@ # Check whether --with-system-fontconfig was given. -if test ${with_system_fontconfig+y} -then : +if test "${with_system_fontconfig+set}" = set; then : withval=$with_system_fontconfig; -else $as_nop +else if test "${with_system_fontconfig+set}" != set -a "${with_system_libs+set}" = set -a "TRUE" != TRUE; then with_system_fontconfig="$with_system_libs"; @@ -15954,27 +15195,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which fontconfig to use" >&5 -printf %s "checking which fontconfig to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which fontconfig to use" >&5 +$as_echo_n "checking which fontconfig to use... " >&6; } if test "$test_fontconfig" != no -a "$found_fontconfig" != yes -a "$enable_fontconfig" != no; then ENABLE_FONTCONFIG=TRUE if test "$with_system_fontconfig" = yes -a "$test_system_fontconfig" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_FONTCONFIG=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5 -printf %s "checking for FONTCONFIG... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig >= 2.4.1" >&5 +$as_echo_n "checking for fontconfig >= 2.4.1... " >&6; } if test -n "$FONTCONFIG_CFLAGS"; then pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.4.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.4.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.4.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.4.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -15988,10 +15229,10 @@ pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.4.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.4.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.4.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.4.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -16005,8 +15246,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -16032,10 +15273,10 @@ and FONTCONFIG_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -16049,16 +15290,16 @@ else FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi FONTCONFIG_CFLAGS=$(printf '%s' "${FONTCONFIG_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${FONTCONFIG_LIBS}" FONTCONFIG_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_FONTCONFIG= FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS_internal}" FONTCONFIG_LIBS="${FONTCONFIG_LIBS_internal}" @@ -16066,8 +15307,8 @@ fi else if test "$found_fontconfig" = yes -a "$enable_fontconfig" != no -a "$with_system_fontconfig" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_FONTCONFIG=TRUE SYSTEM_FONTCONFIG=TRUE else @@ -16076,11 +15317,11 @@ FONTCONFIG_CFLAGS= FONTCONFIG_LIBS= if test "$test_fontconfig" != no -a "$enable_fontconfig" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -16110,36 +15351,36 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we want to fetch tarballs" >&5 -printf %s "checking whether we want to fetch tarballs... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we want to fetch tarballs" >&5 +$as_echo_n "checking whether we want to fetch tarballs... " >&6; } if test "$enable_fetch_external" != "no"; then if test "$with_all_tarballs" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, all of them" >&5 -printf "%s\n" "yes, all of them" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, all of them" >&5 +$as_echo "yes, all of them" >&6; } DO_FETCH_TARBALLS="ALL" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, if we use them" >&5 -printf "%s\n" "yes, if we use them" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, if we use them" >&5 +$as_echo "yes, if we use them" >&6; } DO_FETCH_TARBALLS="TRUE" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } DO_FETCH_TARBALLS= fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include MySpell dictionaries" >&5 -printf %s "checking whether to include MySpell dictionaries... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include MySpell dictionaries" >&5 +$as_echo_n "checking whether to include MySpell dictionaries... " >&6; } if test "$with_myspell_dicts" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } WITH_MYSPELL_DICTS=TRUE BUILD_TYPE="$BUILD_TYPE DICTIONARIES" GIT_NEEDED_SUBMODULES="dictionaries $GIT_NEEDED_SUBMODULES" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } WITH_MYSPELL_DICTS= fi @@ -16152,14 +15393,14 @@ with_system_dicts=no fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use dicts from external paths" >&5 -printf %s "checking whether to use dicts from external paths... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dicts from external paths" >&5 +$as_echo_n "checking whether to use dicts from external paths... " >&6; } if test -z "$with_system_dicts" -o "$with_system_dicts" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SYSTEM_DICTS=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for spelling dictionary directory" >&5 -printf %s "checking for spelling dictionary directory... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spelling dictionary directory" >&5 +$as_echo_n "checking for spelling dictionary directory... " >&6; } if test -n "$with_external_dict_dir"; then DICT_SYSTEM_DIR=file://$with_external_dict_dir else @@ -16168,29 +15409,29 @@ DICT_SYSTEM_DIR=file:///usr/share/myspell fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DICT_SYSTEM_DIR" >&5 -printf "%s\n" "$DICT_SYSTEM_DIR" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hyphenation patterns directory" >&5 -printf %s "checking for hyphenation patterns directory... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DICT_SYSTEM_DIR" >&5 +$as_echo "$DICT_SYSTEM_DIR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hyphenation patterns directory" >&5 +$as_echo_n "checking for hyphenation patterns directory... " >&6; } if test -n "$with_external_hyph_dir"; then HYPH_SYSTEM_DIR=file://$with_external_hyph_dir else HYPH_SYSTEM_DIR=file:///usr/share/hyphen fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HYPH_SYSTEM_DIR" >&5 -printf "%s\n" "$HYPH_SYSTEM_DIR" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for thesaurus directory" >&5 -printf %s "checking for thesaurus directory... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HYPH_SYSTEM_DIR" >&5 +$as_echo "$HYPH_SYSTEM_DIR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thesaurus directory" >&5 +$as_echo_n "checking for thesaurus directory... " >&6; } if test -n "$with_external_thes_dir"; then THES_SYSTEM_DIR=file://$with_external_thes_dir else THES_SYSTEM_DIR=file:///usr/share/mythes fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THES_SYSTEM_DIR" >&5 -printf "%s\n" "$THES_SYSTEM_DIR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THES_SYSTEM_DIR" >&5 +$as_echo "$THES_SYSTEM_DIR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SYSTEM_DICTS= fi @@ -16199,8 +15440,8 @@ ENABLE_PCH="" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable pch feature" >&5 -printf %s "checking whether to enable pch feature... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pch feature" >&5 +$as_echo_n "checking whether to enable pch feature... " >&6; } if test -z "$enable_pch"; then if test "$_os" = "WINNT"; then # Enabled by default on Windows. @@ -16221,38 +15462,38 @@ fi if test "$enable_pch" = "system"; then ENABLE_PCH="1" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (system headers)" >&5 -printf "%s\n" "yes (system headers)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (system headers)" >&5 +$as_echo "yes (system headers)" >&6; } elif test "$enable_pch" = "base"; then ENABLE_PCH="2" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (system and base headers)" >&5 -printf "%s\n" "yes (system and base headers)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (system and base headers)" >&5 +$as_echo "yes (system and base headers)" >&6; } elif test "$enable_pch" = "normal"; then ENABLE_PCH="3" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (normal)" >&5 -printf "%s\n" "yes (normal)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (normal)" >&5 +$as_echo "yes (normal)" >&6; } elif test "$enable_pch" = "full"; then ENABLE_PCH="4" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (full)" >&5 -printf "%s\n" "yes (full)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (full)" >&5 +$as_echo "yes (full)" >&6; } elif test "$enable_pch" = "yes"; then # Pick a suitable default. if test "$GCC" = "yes"; then # With Clang and GCC higher levels do not seem to make a noticeable improvement, # while making the PCHs larger and rebuilds more likely. ENABLE_PCH="2" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (system and base headers)" >&5 -printf "%s\n" "yes (system and base headers)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (system and base headers)" >&5 +$as_echo "yes (system and base headers)" >&6; } else # With MSVC the highest level makes a significant difference, # and it was the default when there used to be no PCH levels. ENABLE_PCH="4" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (full)" >&5 -printf "%s\n" "yes (full)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (full)" >&5 +$as_echo "yes (full)" >&6; } fi elif test "$enable_pch" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else as_fn_error $? "Unknown value for --enable-pch" "$LINENO" 5 fi @@ -16261,12 +15502,11 @@ if test -n "$ENABLE_PCH" -a -n "$CCACHE_DEPEND_MODE" -a "$GCC" = "yes" -a "$COM_IS_CLANG" != "TRUE"; then # Extract the first word of "ccache", so it can be a program name with args. set dummy ccache; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_CCACHE_BIN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CCACHE_BIN+:} false; then : + $as_echo_n "(cached) " >&6 +else case $CCACHE_BIN in [\\/]* | ?:[\\/]*) ac_cv_path_CCACHE_BIN="$CCACHE_BIN" # Let the user override the test with a path. @@ -16276,15 +15516,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_CCACHE_BIN="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CCACHE_BIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16297,29 +15533,29 @@ fi CCACHE_BIN=$ac_cv_path_CCACHE_BIN if test -n "$CCACHE_BIN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CCACHE_BIN" >&5 -printf "%s\n" "$CCACHE_BIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE_BIN" >&5 +$as_echo "$CCACHE_BIN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$CCACHE_BIN" != "not found"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ccache version" >&5 -printf %s "checking ccache version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking ccache version" >&5 +$as_echo_n "checking ccache version... " >&6; } CCACHE_VERSION=`"$CCACHE_BIN" -V | "$AWK" '/^ccache version/{print $3}'` CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CCACHE_VERSION" >&5 -printf "%s\n" "$CCACHE_VERSION" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ccache depend mode works properly with GCC PCH" >&5 -printf %s "checking whether ccache depend mode works properly with GCC PCH... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE_VERSION" >&5 +$as_echo "$CCACHE_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ccache depend mode works properly with GCC PCH" >&5 +$as_echo_n "checking whether ccache depend mode works properly with GCC PCH... " >&6; } if test "$CCACHE_NUMVER" -gt "030701"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (not newer than 3.7.1)" >&5 -printf "%s\n" "no (not newer than 3.7.1)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (not newer than 3.7.1)" >&5 +$as_echo "no (not newer than 3.7.1)" >&6; } CCACHE_DEPEND_MODE= fi fi @@ -16327,66 +15563,64 @@ PCH_INSTANTIATE_TEMPLATES= if test -n "$ENABLE_PCH"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fpch-instantiate-templates" >&5 -printf %s "checking whether $CC supports -fpch-instantiate-templates... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fpch-instantiate-templates" >&5 +$as_echo_n "checking whether $CC supports -fpch-instantiate-templates... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -fpch-instantiate-templates" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : PCH_INSTANTIATE_TEMPLATES="-fpch-instantiate-templates" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS if test -n "$PCH_INSTANTIATE_TEMPLATES"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi BUILDING_PCH_WITH_OBJ= if test -n "$ENABLE_PCH"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Xclang -building-pch-with-obj" >&5 -printf %s "checking whether $CC supports -Xclang -building-pch-with-obj... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Xclang -building-pch-with-obj" >&5 +$as_echo_n "checking whether $CC supports -Xclang -building-pch-with-obj... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -Xclang -building-pch-with-obj" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : BUILDING_PCH_WITH_OBJ="-Xclang -building-pch-with-obj" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS if test -n "$BUILDING_PCH_WITH_OBJ"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -16398,104 +15632,101 @@ fpch_prefix="-Xclang " fi if test -n "$BUILDING_PCH_WITH_OBJ"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports ${fpch_prefix}-fpch-codegen" >&5 -printf %s "checking whether $CC supports ${fpch_prefix}-fpch-codegen... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports ${fpch_prefix}-fpch-codegen" >&5 +$as_echo_n "checking whether $CC supports ${fpch_prefix}-fpch-codegen... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror ${fpch_prefix}-fpch-codegen" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : PCH_CODEGEN="${fpch_prefix}-fpch-codegen" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS CFLAGS="$CFLAGS -Werror ${fpch_prefix}-fno-pch-codegen" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : PCH_NO_CODEGEN="${fpch_prefix}-fno-pch-codegen" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS if test -n "$PCH_CODEGEN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi PCH_DEBUGINFO= if test -n "$BUILDING_PCH_WITH_OBJ"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports ${fpch_prefix}-fpch-debuginfo" >&5 -printf %s "checking whether $CC supports ${fpch_prefix}-fpch-debuginfo... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports ${fpch_prefix}-fpch-debuginfo" >&5 +$as_echo_n "checking whether $CC supports ${fpch_prefix}-fpch-debuginfo... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror ${fpch_prefix}-fpch-debuginfo" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : PCH_DEBUGINFO="${fpch_prefix}-fpch-debuginfo" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS if test -n "$PCH_DEBUGINFO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi TAB=`printf '\t'` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the GNU Make version" >&5 -printf %s "checking the GNU Make version... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU Make version" >&5 +$as_echo_n "checking the GNU Make version... " >&6; } _make_version=`$GNUMAKE --version | grep GNU | $GREP -v GPL | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'` _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_make_longver" -ge "038200"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5 -printf "%s\n" "$GNUMAKE $_make_version" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5 +$as_echo "$GNUMAKE $_make_version" >&6; } else as_fn_error $? "failed ($GNUMAKE version >= 3.82 needed" "$LINENO" 5 fi # find if gnumake support file function -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GNU Make supports the 'file' function" >&5 -printf %s "checking whether GNU Make supports the 'file' function... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GNU Make supports the 'file' function" >&5 +$as_echo_n "checking whether GNU Make supports the 'file' function... " >&6; } TESTGMAKEFILEFUNC="`mktemp -d -t tst.XXXXXX`" if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then TESTGMAKEFILEFUNC=`cygpath -m $TESTGMAKEFILEFUNC` @@ -16511,11 +15742,11 @@ $GNUMAKE -C $TESTGMAKEFILEFUNC 2>/dev/null 1>&2 if test -f $TESTGMAKEFILEFUNC/test.txt; then HAVE_GNUMAKE_FILE_FUNC=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -rf $TESTGMAKEFILEFUNC @@ -16528,8 +15759,8 @@ HAVE_LD_HASH_STYLE=FALSE WITH_LINKER_HASH_STYLE= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --hash-style gcc linker support" >&5 -printf %s "checking for --hash-style gcc linker support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style gcc linker support" >&5 +$as_echo_n "checking for --hash-style gcc linker support... " >&6; } if test "$GCC" = "yes"; then if test -z "$with_linker_hash_style" -o "$with_linker_hash_style" = "yes"; then hash_styles="gnu sysv" @@ -16544,17 +15775,16 @@ hash_style_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,--hash-style=$hash_style" - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : HAVE_LD_HASH_STYLE=FALSE -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { printf (""); @@ -16563,13 +15793,12 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : HAVE_LD_HASH_STYLE=TRUE WITH_LINKER_HASH_STYLE=$hash_style -else $as_nop +else HAVE_LD_HASH_STYLE=FALSE fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -16580,16 +15809,16 @@ done if test "$HAVE_LD_HASH_STYLE" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WITH_LINKER_HASH_STYLE " >&5 -printf "%s\n" "$WITH_LINKER_HASH_STYLE " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_LINKER_HASH_STYLE " >&5 +$as_echo "$WITH_LINKER_HASH_STYLE " >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no " >&5 -printf "%s\n" "no " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no " >&5 +$as_echo "no " >&6; } fi LDFLAGS=$hash_style_ldflags_save else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no " >&5 -printf "%s\n" "no " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no " >&5 +$as_echo "no " >&6; } fi @@ -16597,12 +15826,11 @@ if test -z "$with_perl_home"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PERL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PERL+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PERL in [\\/]* | ?:[\\/]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. @@ -16612,15 +15840,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16632,11 +15856,11 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -printf "%s\n" "$PERL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +$as_echo "$PERL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -16651,22 +15875,22 @@ fi if test "$PERL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the Perl version" >&5 -printf %s "checking the Perl version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Perl version" >&5 +$as_echo_n "checking the Perl version... " >&6; } ${PERL} -e "exit($]);" _perl_version=$? if test "$_perl_version" -lt 5; then as_fn_error $? "found Perl $_perl_version, use Perl 5" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Perl $_perl_version" >&5 -printf "%s\n" "Perl $_perl_version" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Perl $_perl_version" >&5 +$as_echo "Perl $_perl_version" >&6; } else as_fn_error $? "Perl not found, install Perl 5" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for required Perl modules" >&5 -printf %s "checking for required Perl modules... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for required Perl modules" >&5 +$as_echo_n "checking for required Perl modules... " >&6; } perl_use_string="use Cwd ; use Digest::MD5" if test "$_os" = "WINNT"; then if test -n "$PKGFORMAT"; then @@ -16688,11 +15912,11 @@ perl_use_string="$perl_use_string ; use FindBin" fi if $PERL -e "$perl_use_string">/dev/null 2>&1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: all modules found" >&5 -printf "%s\n" "all modules found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: all modules found" >&5 +$as_echo "all modules found" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed to find some modules" >&5 -printf "%s\n" "failed to find some modules" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed to find some modules" >&5 +$as_echo "failed to find some modules" >&6; } # Find out which modules are missing. for i in $perl_use_string; do if test "$i" != "use" -a "$i" != ";"; then @@ -16718,12 +15942,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -16733,15 +15956,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16753,11 +15972,11 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -printf "%s\n" "$PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -16766,12 +15985,11 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -16781,15 +15999,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16801,11 +16015,11 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -16813,8 +16027,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -16826,14 +16040,14 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } PKG_CONFIG="" fi fi @@ -16857,12 +16071,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -16870,15 +16083,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16889,11 +16098,11 @@ fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -printf "%s\n" "$AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -16906,12 +16115,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -16919,15 +16127,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16938,11 +16142,11 @@ fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -printf "%s\n" "$ac_ct_AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -16954,8 +16158,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -16967,12 +16171,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_NM+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$NM"; then ac_cv_prog_NM="$NM" # Let the user override the test. else @@ -16980,15 +16183,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NM="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16999,11 +16198,11 @@ fi NM=$ac_cv_prog_NM if test -n "$NM"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 -printf "%s\n" "$NM" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 +$as_echo "$NM" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17016,12 +16215,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_NM+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_NM"; then ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test. else @@ -17029,15 +16227,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NM="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17048,11 +16242,11 @@ fi ac_ct_NM=$ac_cv_prog_ac_ct_NM if test -n "$ac_ct_NM"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 -printf "%s\n" "$ac_ct_NM" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 +$as_echo "$ac_ct_NM" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17064,8 +16258,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NM=$ac_ct_NM @@ -17077,12 +16271,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -17090,15 +16283,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17109,11 +16298,11 @@ fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -printf "%s\n" "$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17126,12 +16315,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -17139,15 +16327,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17158,11 +16342,11 @@ fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -printf "%s\n" "$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17174,8 +16358,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -17187,12 +16371,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -17200,15 +16383,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17219,11 +16398,11 @@ fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -printf "%s\n" "$OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17236,12 +16415,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -17249,15 +16427,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17268,11 +16442,11 @@ fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -printf "%s\n" "$ac_ct_OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17284,8 +16458,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -17297,12 +16471,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_READELF+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_READELF+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$READELF"; then ac_cv_prog_READELF="$READELF" # Let the user override the test. else @@ -17310,15 +16483,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_READELF="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17329,11 +16498,11 @@ fi READELF=$ac_cv_prog_READELF if test -n "$READELF"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5 -printf "%s\n" "$READELF" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5 +$as_echo "$READELF" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17346,12 +16515,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_READELF+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_READELF+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_READELF"; then ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test. else @@ -17359,15 +16527,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_READELF="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17378,11 +16542,11 @@ fi ac_ct_READELF=$ac_cv_prog_ac_ct_READELF if test -n "$ac_ct_READELF"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5 -printf "%s\n" "$ac_ct_READELF" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5 +$as_echo "$ac_ct_READELF" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17394,8 +16558,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac READELF=$ac_ct_READELF @@ -17407,12 +16571,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -17420,15 +16583,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17439,11 +16598,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf "%s\n" "$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17456,12 +16615,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -17469,15 +16627,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17488,11 +16642,11 @@ fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf "%s\n" "$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17504,8 +16658,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -17522,22 +16676,22 @@ if test $_os = Darwin; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bogus pkg-config" >&5 -printf %s "checking for bogus pkg-config... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bogus pkg-config" >&5 +$as_echo_n "checking for bogus pkg-config... " >&6; } if test -n "$PKG_CONFIG"; then if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | $GREP -q Mono.framework; then as_fn_error $? "yes, from Mono. This *will* break the build. Please remove or hide $PKG_CONFIG" "$LINENO" 5 else if test "$enable_bogus_pkg_config" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, user-approved from unknown origin." >&5 -printf "%s\n" "yes, user-approved from unknown origin." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user-approved from unknown origin." >&5 +$as_echo "yes, user-approved from unknown origin." >&6; } else as_fn_error $? "yes, from unknown origin. This *will* break the build. Please modify your PATH variable so that $PKG_CONFIG is no longer found by configure scripts." "$LINENO" 5 fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, good" >&5 -printf "%s\n" "no, good" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, good" >&5 +$as_echo "no, good" >&6; } fi fi @@ -17660,8 +16814,8 @@ { # Return value: $msmdir - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MSVC merge modules directory" >&5 -printf %s "checking for MSVC merge modules directory... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSVC merge modules directory" >&5 +$as_echo_n "checking for MSVC merge modules directory... " >&6; } local my_msm_files local my_msm_dir @@ -17692,17 +16846,17 @@ if test -n "$msmdir"; then msmdir=`cygpath -m "$msmdir"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $msmdir" >&5 -printf "%s\n" "$msmdir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msmdir" >&5 +$as_echo "$msmdir" >&6; } else if test "$ENABLE_RELEASE_BUILD" = "TRUE" ; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "not found See \`config.log' for more details" "$LINENO" 5; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: not found (check config.log)" >&5 -printf "%s\n" "$as_me: WARNING: not found (check config.log)" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: not found (check config.log)" >&5 +$as_echo "$as_me: WARNING: not found (check config.log)" >&2;} add_warning "MSM none of ${my_msm_files} found" fi fi @@ -17712,8 +16866,8 @@ { # Return value: $msvcdllpath, $msvcdlls - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MSVC x64 DLL path" >&5 -printf %s "checking for MSVC x64 DLL path... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSVC x64 DLL path" >&5 +$as_echo_n "checking for MSVC x64 DLL path... " >&6; } msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT" @@ -17729,26 +16883,26 @@ done ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $msvcdllpath" >&5 -printf "%s\n" "$msvcdllpath" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MSVC x64 DLLs" >&5 -printf %s "checking for MSVC x64 DLLs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msvcdllpath" >&5 +$as_echo "$msvcdllpath" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSVC x64 DLLs" >&5 +$as_echo_n "checking for MSVC x64 DLLs... " >&6; } msvcdlls="msvcp140.dll vcruntime140.dll" for dll in $msvcdlls; do if ! test -f "$msvcdllpath/$dll"; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "missing $dll See \`config.log' for more details" "$LINENO" 5; } fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found all ($msvcdlls)" >&5 -printf "%s\n" "found all ($msvcdlls)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found all ($msvcdlls)" >&5 +$as_echo "found all ($msvcdlls)" >&6; } } if test "$_os" = "WINNT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Windows SDK" >&5 -printf %s "checking for Windows SDK... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Windows SDK" >&5 +$as_echo_n "checking for Windows SDK... " >&6; } if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then find_winsdk WINDOWS_SDK_HOME=$winsdktest @@ -17797,20 +16951,20 @@ fi if test -z "$WINDOWS_SDK_HOME"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, hoping the necessary headers and libraries will be found anyway!?" >&5 -printf "%s\n" "no, hoping the necessary headers and libraries will be found anyway!?" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, hoping the necessary headers and libraries will be found anyway!?" >&5 +$as_echo "no, hoping the necessary headers and libraries will be found anyway!?" >&6; } elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then WINDOWS_SDK_VERSION=80 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found Windows SDK 8.0 ($WINDOWS_SDK_HOME)" >&5 -printf "%s\n" "found Windows SDK 8.0 ($WINDOWS_SDK_HOME)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found Windows SDK 8.0 ($WINDOWS_SDK_HOME)" >&5 +$as_echo "found Windows SDK 8.0 ($WINDOWS_SDK_HOME)" >&6; } elif echo $WINDOWS_SDK_HOME | grep "8.1" >/dev/null 2>/dev/null; then WINDOWS_SDK_VERSION=81 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found Windows SDK 8.1 ($WINDOWS_SDK_HOME)" >&5 -printf "%s\n" "found Windows SDK 8.1 ($WINDOWS_SDK_HOME)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found Windows SDK 8.1 ($WINDOWS_SDK_HOME)" >&5 +$as_echo "found Windows SDK 8.1 ($WINDOWS_SDK_HOME)" >&6; } elif echo $WINDOWS_SDK_HOME | grep "/10" >/dev/null 2>/dev/null; then WINDOWS_SDK_VERSION=10 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found Windows SDK 10.0 ($WINDOWS_SDK_HOME)" >&5 -printf "%s\n" "found Windows SDK 10.0 ($WINDOWS_SDK_HOME)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found Windows SDK 10.0 ($WINDOWS_SDK_HOME)" >&5 +$as_echo "found Windows SDK 10.0 ($WINDOWS_SDK_HOME)" >&6; } else as_fn_error $? "Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)" "$LINENO" 5 fi @@ -17860,8 +17014,8 @@ if test "$build_os" = "cygwin"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for midl.exe" >&5 -printf %s "checking for midl.exe... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for midl.exe" >&5 +$as_echo_n "checking for midl.exe... " >&6; } find_winsdk if test -n "$winsdkbinsubdir" \ @@ -17879,8 +17033,8 @@ if test ! -f "$MIDL_PATH/midl.exe"; then as_fn_error $? "midl.exe not found in $winsdktest/Bin/$WIN_BUILD_ARCH, Windows SDK installation broken?" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MIDL_PATH/midl.exe" >&5 -printf "%s\n" "$MIDL_PATH/midl.exe" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MIDL_PATH/midl.exe" >&5 +$as_echo "$MIDL_PATH/midl.exe" >&6; } fi # Convert to posix path with 8.3 filename restrictions ( No spaces ) @@ -17902,8 +17056,8 @@ as_fn_error $? "Some (all?) Windows Installer tools in the Windows SDK are missing, please install." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for csc.exe" >&5 -printf %s "checking for csc.exe... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for csc.exe" >&5 +$as_echo_n "checking for csc.exe... " >&6; } find_csc if test -f "$csctest/csc.exe"; then CSC_PATH="$csctest" @@ -17911,14 +17065,14 @@ if test ! -f "$CSC_PATH/csc.exe"; then as_fn_error $? "csc.exe not found as $CSC_PATH/csc.exe" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CSC_PATH/csc.exe" >&5 -printf "%s\n" "$CSC_PATH/csc.exe" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CSC_PATH/csc.exe" >&5 +$as_echo "$CSC_PATH/csc.exe" >&6; } fi CSC_PATH=`win_short_path_for_make "$CSC_PATH"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for al.exe" >&5 -printf %s "checking for al.exe... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for al.exe" >&5 +$as_echo_n "checking for al.exe... " >&6; } find_winsdk if test -n "$winsdkbinsubdir" \ -a -f "$winsdktest/Bin/$winsdkbinsubdir/$WIN_BUILD_ARCH/al.exe" @@ -17941,14 +17095,14 @@ if test ! -f "$AL_PATH/al.exe"; then as_fn_error $? "al.exe not found as $AL_PATH/al.exe" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AL_PATH/al.exe" >&5 -printf "%s\n" "$AL_PATH/al.exe" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AL_PATH/al.exe" >&5 +$as_echo "$AL_PATH/al.exe" >&6; } fi AL_PATH=`win_short_path_for_make "$AL_PATH"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking .NET Framework" >&5 -printf %s "checking .NET Framework... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking .NET Framework" >&5 +$as_echo_n "checking .NET Framework... " >&6; } find_dotnetsdk46 PathFormat "$frametest" frametest="$formatted_path" @@ -17963,8 +17117,8 @@ if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib" -a ! -f "$DOTNET_FRAMEWORK_HOME/lib/$winsdklibsubdir/um/$WIN_BUILD_ARCH/mscoree.lib" -a ! -f "$DOTNET_FRAMEWORK_HOME/Lib/um/$WIN_BUILD_ARCH/mscoree.lib"; then as_fn_error $? "mscoree.lib not found" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found: $DOTNET_FRAMEWORK_HOME" >&5 -printf "%s\n" "found: $DOTNET_FRAMEWORK_HOME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found: $DOTNET_FRAMEWORK_HOME" >&5 +$as_echo "found: $DOTNET_FRAMEWORK_HOME" >&6; } PathFormat "$MIDL_PATH" MIDL_PATH="$formatted_path" @@ -17983,13 +17137,7 @@ if test "$_os" != "WINNT"; then # AC_PROG_CXX sets CXXFLAGS to -g -O2 if not set, avoid that save_CXXFLAGS=$CXXFLAGS - - - - - - -ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -17999,16 +17147,15 @@ CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else @@ -18016,15 +17163,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18035,11 +17178,11 @@ fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf "%s\n" "$CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -18048,16 +17191,15 @@ fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else @@ -18065,15 +17207,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18084,11 +17222,11 @@ fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -printf "%s\n" "$ac_ct_CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -18100,8 +17238,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -18111,7 +17249,7 @@ fi fi # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -18121,7 +17259,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -18131,21 +17269,20 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 -printf %s "checking whether the compiler supports GNU C++... " >&6; } -if test ${ac_cv_cxx_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -18155,33 +17292,29 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi -ac_test_CXXFLAGS=${CXXFLAGS+y} +ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -printf %s "checking whether $CXX accepts -g... " >&6; } -if test ${ac_cv_prog_cxx_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -18190,60 +17323,57 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else $as_nop +else CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : -else $as_nop +else ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } -if test $ac_test_CXXFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then @@ -18258,100 +17388,6 @@ CXXFLAGS= fi fi -ac_prog_cxx_stdcxx=no -if test x$ac_prog_cxx_stdcxx = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 -printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_11=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx11_program -_ACEOF -for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx11" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx11" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_prog_cxx_stdcxx=cxx11 -fi -fi -if test x$ac_prog_cxx_stdcxx = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 -printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_98=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx98_program -_ACEOF -for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx98=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx98" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx98" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx98" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx98" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 - ac_prog_cxx_stdcxx=cxx98 -fi -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18365,8 +17401,8 @@ fi if test "$GXX" = "yes" -a -z "$COM_IS_CLANG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the GNU C++ compiler version" >&5 -printf %s "checking the GNU C++ compiler version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU C++ compiler version" >&5 +$as_echo_n "checking the GNU C++ compiler version... " >&6; } _gpp_version=`$CXX -dumpversion` _gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'` @@ -18374,8 +17410,8 @@ if test "$_gpp_majmin" -lt "700"; then as_fn_error $? "You need to use GNU C++ compiler version >= 7.0 to build LibreOffice, you have $_gpp_version." "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok (g++ $_gpp_version)" >&5 -printf "%s\n" "ok (g++ $_gpp_version)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (g++ $_gpp_version)" >&5 +$as_echo "ok (g++ $_gpp_version)" >&6; } fi glibcxx_threads=no @@ -18391,32 +17427,36 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -printf %s "checking how to run the C++ preprocessor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if test ${ac_cv_prog_CXXCPP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - # Double quotes because $CXX needs to be expanded - for CXXCPP in "$CXX -E" cpp /lib/cpp + if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" do ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -18428,11 +17468,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -18442,8 +17481,7 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : break fi @@ -18455,24 +17493,29 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -printf "%s\n" "$CXXCPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -18484,11 +17527,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -18498,12 +17540,11 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -18516,14 +17557,14 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE is broken with boost.thread" >&5 -printf %s "checking whether $CXX_BASE is broken with boost.thread... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE is broken with boost.thread" >&5 +$as_echo_n "checking whether $CXX_BASE is broken with boost.thread... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { #if !defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ @@ -18536,14 +17577,13 @@ return 0; } _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if ac_fn_cxx_try_cpp "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } glibcxx_threads=yes -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f conftest.err conftest.i conftest.$ac_ext ac_ext=c @@ -18562,8 +17602,8 @@ # prefx CXX with ccache if needed # if test "$CCACHE" != ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE is already ccached" >&5 -printf %s "checking whether $CXX_BASE is already ccached... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE is already ccached" >&5 +$as_echo_n "checking whether $CXX_BASE is already ccached... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18582,28 +17622,27 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : use_ccache=yes -else $as_nop +else use_ccache=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else CXX="$CCACHE $CXX" CXX_BASE="ccache $CXX_BASE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi CXXFLAGS=$save_CXXFLAGS ac_cxx_werror_flag=$save_ac_cxx_werror_flag @@ -18622,32 +17661,36 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -printf %s "checking how to run the C++ preprocessor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if test ${ac_cv_prog_CXXCPP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - # Double quotes because $CXX needs to be expanded - for CXXCPP in "$CXX -E" cpp /lib/cpp + if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" do ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -18659,11 +17702,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -18673,8 +17715,7 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : break fi @@ -18686,24 +17727,29 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -printf "%s\n" "$CXXCPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -18715,11 +17761,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -18729,12 +17774,11 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -18751,36 +17795,40 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -printf %s "checking how to run the C preprocessor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test ${ac_cv_prog_CPP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - # Double quotes because $CC needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" do ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -18792,11 +17840,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -18806,8 +17853,7 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : break fi @@ -18819,24 +17865,29 @@ else ac_cv_prog_CPP=$CPP fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -printf "%s\n" "$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -18848,11 +17899,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -18862,12 +17912,11 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -18888,19 +17937,17 @@ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -printf %s "checking size of long... " >&6; } -if test ${ac_cv_sizeof_long+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if ${ac_cv_sizeof_long+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : -else $as_nop +else if test "$ac_cv_type_long" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long) See \`config.log' for more details" "$LINENO" 5; } else @@ -18909,31 +17956,31 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -printf "%s\n" "$ac_cv_sizeof_long" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +$as_echo "$ac_cv_sizeof_long" >&6; } -printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG $ac_cv_sizeof_long +_ACEOF # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 -printf %s "checking size of short... " >&6; } -if test ${ac_cv_sizeof_short+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 +$as_echo_n "checking size of short... " >&6; } +if ${ac_cv_sizeof_short+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : -else $as_nop +else if test "$ac_cv_type_short" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (short) See \`config.log' for more details" "$LINENO" 5; } else @@ -18942,31 +17989,31 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -printf "%s\n" "$ac_cv_sizeof_short" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 +$as_echo "$ac_cv_sizeof_short" >&6; } -printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SHORT $ac_cv_sizeof_short +_ACEOF # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -printf %s "checking size of int... " >&6; } -if test ${ac_cv_sizeof_int+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if ${ac_cv_sizeof_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : -else $as_nop +else if test "$ac_cv_type_int" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (int) See \`config.log' for more details" "$LINENO" 5; } else @@ -18975,31 +18022,31 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -printf "%s\n" "$ac_cv_sizeof_int" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +$as_echo "$ac_cv_sizeof_int" >&6; } -printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SIZEOF_INT $ac_cv_sizeof_int +_ACEOF # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 -printf %s "checking size of long long... " >&6; } -if test ${ac_cv_sizeof_long_long+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 +$as_echo_n "checking size of long long... " >&6; } +if ${ac_cv_sizeof_long_long+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : -else $as_nop +else if test "$ac_cv_type_long_long" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long long) See \`config.log' for more details" "$LINENO" 5; } else @@ -19008,31 +18055,31 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 +$as_echo "$ac_cv_sizeof_long_long" >&6; } -printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long +_ACEOF # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 -printf %s "checking size of double... " >&6; } -if test ${ac_cv_sizeof_double+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 +$as_echo_n "checking size of double... " >&6; } +if ${ac_cv_sizeof_double+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then : -else $as_nop +else if test "$ac_cv_type_double" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (double) See \`config.log' for more details" "$LINENO" 5; } else @@ -19041,31 +18088,31 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5 -printf "%s\n" "$ac_cv_sizeof_double" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5 +$as_echo "$ac_cv_sizeof_double" >&6; } -printf "%s\n" "#define SIZEOF_DOUBLE $ac_cv_sizeof_double" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SIZEOF_DOUBLE $ac_cv_sizeof_double +_ACEOF # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5 -printf %s "checking size of void*... " >&6; } -if test ${ac_cv_sizeof_voidp+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5 +$as_echo_n "checking size of void*... " >&6; } +if ${ac_cv_sizeof_voidp+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then : -else $as_nop +else if test "$ac_cv_type_voidp" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (void*) See \`config.log' for more details" "$LINENO" 5; } else @@ -19074,31 +18121,31 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5 -printf "%s\n" "$ac_cv_sizeof_voidp" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5 +$as_echo "$ac_cv_sizeof_voidp" >&6; } -printf "%s\n" "#define SIZEOF_VOIDP $ac_cv_sizeof_voidp" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SIZEOF_VOIDP $ac_cv_sizeof_voidp +_ACEOF # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 -printf %s "checking size of size_t... " >&6; } -if test ${ac_cv_sizeof_size_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 +$as_echo_n "checking size of size_t... " >&6; } +if ${ac_cv_sizeof_size_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : -else $as_nop +else if test "$ac_cv_type_size_t" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (size_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -19107,12 +18154,14 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 -printf "%s\n" "$ac_cv_sizeof_size_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 +$as_echo "$ac_cv_sizeof_size_t" >&6; } -printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t +_ACEOF @@ -19127,21 +18176,22 @@ # The cast to long int works around a bug in the HP C Compiler, # see AC_CHECK_SIZEOF for more information. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of short" >&5 -printf %s "checking alignment of short... " >&6; } -if test ${ac_cv_alignof_short+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of short" >&5 +$as_echo_n "checking alignment of short... " >&6; } +if ${ac_cv_alignof_short+:} false; then : + $as_echo_n "(cached) " >&6 +else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_short" "#include -typedef struct { char x; short y; } ac__type_alignof_;" -then : +#ifndef offsetof +# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) +#endif +typedef struct { char x; short y; } ac__type_alignof_;"; then : -else $as_nop +else if test "$ac_cv_type_short" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute alignment of short See \`config.log' for more details" "$LINENO" 5; } else @@ -19150,31 +18200,34 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_short" >&5 -printf "%s\n" "$ac_cv_alignof_short" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_short" >&5 +$as_echo "$ac_cv_alignof_short" >&6; } -printf "%s\n" "#define ALIGNOF_SHORT $ac_cv_alignof_short" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define ALIGNOF_SHORT $ac_cv_alignof_short +_ACEOF # The cast to long int works around a bug in the HP C Compiler, # see AC_CHECK_SIZEOF for more information. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of int" >&5 -printf %s "checking alignment of int... " >&6; } -if test ${ac_cv_alignof_int+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of int" >&5 +$as_echo_n "checking alignment of int... " >&6; } +if ${ac_cv_alignof_int+:} false; then : + $as_echo_n "(cached) " >&6 +else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_int" "#include -typedef struct { char x; int y; } ac__type_alignof_;" -then : +#ifndef offsetof +# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) +#endif +typedef struct { char x; int y; } ac__type_alignof_;"; then : -else $as_nop +else if test "$ac_cv_type_int" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute alignment of int See \`config.log' for more details" "$LINENO" 5; } else @@ -19183,31 +18236,34 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_int" >&5 -printf "%s\n" "$ac_cv_alignof_int" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_int" >&5 +$as_echo "$ac_cv_alignof_int" >&6; } -printf "%s\n" "#define ALIGNOF_INT $ac_cv_alignof_int" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define ALIGNOF_INT $ac_cv_alignof_int +_ACEOF # The cast to long int works around a bug in the HP C Compiler, # see AC_CHECK_SIZEOF for more information. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of long" >&5 -printf %s "checking alignment of long... " >&6; } -if test ${ac_cv_alignof_long+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of long" >&5 +$as_echo_n "checking alignment of long... " >&6; } +if ${ac_cv_alignof_long+:} false; then : + $as_echo_n "(cached) " >&6 +else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_long" "#include -typedef struct { char x; long y; } ac__type_alignof_;" -then : +#ifndef offsetof +# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) +#endif +typedef struct { char x; long y; } ac__type_alignof_;"; then : -else $as_nop +else if test "$ac_cv_type_long" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute alignment of long See \`config.log' for more details" "$LINENO" 5; } else @@ -19216,31 +18272,34 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_long" >&5 -printf "%s\n" "$ac_cv_alignof_long" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_long" >&5 +$as_echo "$ac_cv_alignof_long" >&6; } -printf "%s\n" "#define ALIGNOF_LONG $ac_cv_alignof_long" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define ALIGNOF_LONG $ac_cv_alignof_long +_ACEOF # The cast to long int works around a bug in the HP C Compiler, # see AC_CHECK_SIZEOF for more information. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of double" >&5 -printf %s "checking alignment of double... " >&6; } -if test ${ac_cv_alignof_double+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of double" >&5 +$as_echo_n "checking alignment of double... " >&6; } +if ${ac_cv_alignof_double+:} false; then : + $as_echo_n "(cached) " >&6 +else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_double" "#include -typedef struct { char x; double y; } ac__type_alignof_;" -then : +#ifndef offsetof +# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) +#endif +typedef struct { char x; double y; } ac__type_alignof_;"; then : -else $as_nop +else if test "$ac_cv_type_double" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute alignment of double See \`config.log' for more details" "$LINENO" 5; } else @@ -19249,12 +18308,14 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_double" >&5 -printf "%s\n" "$ac_cv_alignof_double" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_double" >&5 +$as_echo "$ac_cv_alignof_double" >&6; } -printf "%s\n" "#define ALIGNOF_DOUBLE $ac_cv_alignof_double" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define ALIGNOF_DOUBLE $ac_cv_alignof_double +_ACEOF @@ -19270,19 +18331,17 @@ fi # Check whether --enable-largefile was given. -if test ${enable_largefile+y} -then : +if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -printf %s "checking for special C compiler options needed for large files... " >&6; } -if test ${ac_cv_sys_largefile_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if ${ac_cv_sys_largefile_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC @@ -19296,47 +18355,44 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO" -then : + if ac_fn_c_try_compile "$LINENO"; then : break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam +rm -f core conftest.err conftest.$ac_objext CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO" -then : + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam +rm -f core conftest.err conftest.$ac_objext break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test ${ac_cv_sys_file_offset_bits+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if ${ac_cv_sys_file_offset_bits+:} false; then : + $as_echo_n "(cached) " >&6 +else while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19345,23 +18401,22 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 @@ -19370,43 +18425,43 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=64; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF ;; esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } -if test ${ac_cv_sys_large_files+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if ${ac_cv_sys_large_files+:} false; then : + $as_echo_n "(cached) " >&6 +else while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19415,23 +18470,22 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 @@ -19440,37 +18494,40 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -printf "%s\n" "$ac_cv_sys_large_files" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF ;; esac rm -rf conftest* fi + + fi if test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then @@ -19500,54 +18557,70 @@ -printf "%s\n" "#define SAL_TYPES_SIZEOFSHORT $SAL_TYPES_SIZEOFSHORT" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SAL_TYPES_SIZEOFSHORT $SAL_TYPES_SIZEOFSHORT +_ACEOF -printf "%s\n" "#define SAL_TYPES_SIZEOFINT $SAL_TYPES_SIZEOFINT" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SAL_TYPES_SIZEOFINT $SAL_TYPES_SIZEOFINT +_ACEOF -printf "%s\n" "#define SAL_TYPES_SIZEOFLONG $SAL_TYPES_SIZEOFLONG" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SAL_TYPES_SIZEOFLONG $SAL_TYPES_SIZEOFLONG +_ACEOF -printf "%s\n" "#define SAL_TYPES_SIZEOFLONGLONG $SAL_TYPES_SIZEOFLONGLONG" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SAL_TYPES_SIZEOFLONGLONG $SAL_TYPES_SIZEOFLONGLONG +_ACEOF -printf "%s\n" "#define SAL_TYPES_SIZEOFPOINTER $SAL_TYPES_SIZEOFPOINTER" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SAL_TYPES_SIZEOFPOINTER $SAL_TYPES_SIZEOFPOINTER +_ACEOF -printf "%s\n" "#define SAL_TYPES_ALIGNMENT2 $SAL_TYPES_ALIGNMENT2" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SAL_TYPES_ALIGNMENT2 $SAL_TYPES_ALIGNMENT2 +_ACEOF -printf "%s\n" "#define SAL_TYPES_ALIGNMENT4 $SAL_TYPES_ALIGNMENT4" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SAL_TYPES_ALIGNMENT4 $SAL_TYPES_ALIGNMENT4 +_ACEOF -printf "%s\n" "#define SAL_TYPES_ALIGNMENT8 $SAL_TYPES_ALIGNMENT8" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SAL_TYPES_ALIGNMENT8 $SAL_TYPES_ALIGNMENT8 +_ACEOF -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether jumbo sheets are supported" >&5 -printf %s "checking whether jumbo sheets are supported... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether jumbo sheets are supported" >&5 +$as_echo_n "checking whether jumbo sheets are supported... " >&6; } if test "$_os" != "WINNT"; then if test $SAL_TYPES_SIZEOFLONG -gt 4; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_JUMBO_SHEETS=TRUE - printf "%s\n" "#define HAVE_FEATURE_JUMBO_SHEETS 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_JUMBO_SHEETS 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else if test $WIN_HOST_BITS -gt 32; then # 64bit windows is special-cased for tools::Long because long is 32bit - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_JUMBO_SHEETS=TRUE - printf "%s\n" "#define HAVE_FEATURE_JUMBO_SHEETS 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_JUMBO_SHEETS 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi ENABLE_RUNTIME_OPTIMIZATIONS= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable runtime optimizations" >&5 -printf %s "checking whether to enable runtime optimizations... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable runtime optimizations" >&5 +$as_echo_n "checking whether to enable runtime optimizations... " >&6; } if test -z "$enable_runtime_optimizations"; then for i in $CC; do case $i in @@ -19560,13 +18633,13 @@ fi if test "$enable_runtime_optimizations" != no; then ENABLE_RUNTIME_OPTIMIZATIONS=TRUE - printf "%s\n" "#define ENABLE_RUNTIME_OPTIMIZATIONS 1" >>confdefs.h + $as_echo "#define ENABLE_RUNTIME_OPTIMIZATIONS 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -19576,12 +18649,12 @@ # Is VALGRIND_CFLAGS something one is supposed to have in the environment, # or where does it come from? CPPFLAGS="$CPPFLAGS $VALGRIND_CFLAGS" - ac_fn_c_check_header_compile "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default" -if test "x$ac_cv_header_valgrind_valgrind_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default" +if test "x$ac_cv_header_valgrind_valgrind_h" = xyes; then : ENABLE_VALGRIND=TRUE fi + CPPFLAGS=$prev_cppflags fi @@ -19596,19 +18669,19 @@ # We need at least the sys/sdt.h include header. -ac_fn_c_check_header_compile "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sdt_h" = xyes -then : +ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sdt_h" = xyes; then : SDT_H_FOUND='TRUE' -else $as_nop +else SDT_H_FOUND='FALSE' fi + if test "$SDT_H_FOUND" = "TRUE"; then # Found sys/sdt.h header, now make sure the c++ compiler works. # Old g++ versions had problems with probes in constructors/destructors. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking working sys/sdt.h and c++ support" >&5 -printf %s "checking working sys/sdt.h and c++ support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking working sys/sdt.h and c++ support" >&5 +$as_echo_n "checking working sys/sdt.h and c++ support... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19644,7 +18717,7 @@ }; int -main (void) +main () { int i = 64; @@ -19656,16 +18729,15 @@ return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; }; printf "%s\n" "#define USE_SDT_PROBES 1" >>confdefs.h - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, sdt.h or c++ compiler too old" >&5 -printf "%s\n" "no, sdt.h or c++ compiler too old" >&6; } +if ac_fn_cxx_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; }; $as_echo "#define USE_SDT_PROBES 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, sdt.h or c++ compiler too old" >&5 +$as_echo "no, sdt.h or c++ compiler too old" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -19679,70 +18751,68 @@ HAVE_GCC_STACK_CLASH_PROTECTION= if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -fstack-clash-protection" >&5 -printf %s "checking whether $CC_BASE supports -fstack-clash-protection... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -fstack-clash-protection" >&5 +$as_echo_n "checking whether $CC_BASE supports -fstack-clash-protection... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -fstack-clash-protection" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; }; HAVE_GCC_STACK_CLASH_PROTECTION=TRUE -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; }; HAVE_GCC_STACK_CLASH_PROTECTION=TRUE +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -mno-avx" >&5 -printf %s "checking whether $CC_BASE supports -mno-avx... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports -mno-avx" >&5 +$as_echo_n "checking whether $CC_BASE supports -mno-avx... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -mno-avx" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : HAVE_GCC_AVX=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_GCC_AVX" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports atomic functions" >&5 -printf %s "checking whether $CC_BASE supports atomic functions... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_BASE supports atomic functions" >&5 +$as_echo_n "checking whether $CC_BASE supports atomic functions... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { int v = 0; @@ -19759,24 +18829,23 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : HAVE_GCC_BUILTIN_ATOMIC=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test "$HAVE_GCC_BUILTIN_ATOMIC" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - printf "%s\n" "#define HAVE_GCC_BUILTIN_ATOMIC 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_GCC_BUILTIN_ATOMIC 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __base_class_type_info in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE defines __base_class_type_info in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __base_class_type_info in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE defines __base_class_type_info in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19791,19 +18860,18 @@ std::size_t f() { return sizeof(__cxxabiv1::__base_class_type_info); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_BASE_CLASS_TYPE_INFO 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_BASE_CLASS_TYPE_INFO 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19811,8 +18879,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __class_type_info in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE defines __class_type_info in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __class_type_info in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE defines __class_type_info in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19827,19 +18895,18 @@ std::size_t f() { return sizeof(__cxxabiv1::__class_type_info); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_CLASS_TYPE_INFO 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_CLASS_TYPE_INFO 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19847,8 +18914,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE declares __cxa_allocate_exception in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE declares __cxa_allocate_exception in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE declares __cxa_allocate_exception in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE declares __cxa_allocate_exception in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19862,19 +18929,18 @@ void * f() { return __cxxabiv1::__cxa_allocate_exception(0); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19882,8 +18948,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __cxa_eh_globals in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE defines __cxa_eh_globals in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __cxa_eh_globals in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE defines __cxa_eh_globals in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19898,19 +18964,18 @@ std::size_t f() { return sizeof(__cxxabiv1::__cxa_eh_globals); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_CXA_EH_GLOBALS 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_CXA_EH_GLOBALS 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19918,8 +18983,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __cxa_exception in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE defines __cxa_exception in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __cxa_exception in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE defines __cxa_exception in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19934,19 +18999,18 @@ std::size_t f() { return sizeof(__cxxabiv1::__cxa_exception); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_CXA_EXCEPTION 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_CXA_EXCEPTION 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19954,8 +19018,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE declares __cxa_get_globals in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE declares __cxa_get_globals in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE declares __cxa_get_globals in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE declares __cxa_get_globals in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19969,19 +19033,18 @@ void * f() { return __cxxabiv1::__cxa_get_globals(); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_CXA_GET_GLOBALS 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_CXA_GET_GLOBALS 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19989,8 +19052,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE declares __cxa_current_exception_type in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE declares __cxa_current_exception_type in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE declares __cxa_current_exception_type in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE declares __cxa_current_exception_type in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20004,19 +19067,18 @@ void * f() { return __cxxabiv1::__cxa_current_exception_type(); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_CXA_CURRENT_EXCEPTION_TYPE 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_CXA_CURRENT_EXCEPTION_TYPE 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20024,8 +19086,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE declares __cxa_throw in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE declares __cxa_throw in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE declares __cxa_throw in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE declares __cxa_throw in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20039,19 +19101,18 @@ void f() { __cxxabiv1::__cxa_throw(0, 0, 0); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_CXA_THROW 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_CXA_THROW 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20059,8 +19120,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __si_class_type_info in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE defines __si_class_type_info in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __si_class_type_info in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE defines __si_class_type_info in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20075,19 +19136,18 @@ std::size_t f() { return sizeof(__cxxabiv1::__si_class_type_info); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_SI_CLASS_TYPE_INFO 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_SI_CLASS_TYPE_INFO 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20095,8 +19155,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __vmi_class_type_info in cxxabi.h" >&5 -printf %s "checking whether $CXX_BASE defines __vmi_class_type_info in cxxabi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE defines __vmi_class_type_info in cxxabi.h" >&5 +$as_echo_n "checking whether $CXX_BASE defines __vmi_class_type_info in cxxabi.h... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20111,19 +19171,18 @@ std::size_t f() { return sizeof(__cxxabiv1::__vmi_class_type_info); } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CXXABI_H_VMI_CLASS_TYPE_INFO 1" >>confdefs.h + $as_echo "#define HAVE_CXXABI_H_VMI_CLASS_TYPE_INFO 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20137,8 +19196,8 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what the C++ library is" >&5 -printf %s "checking what the C++ library is... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what the C++ library is" >&5 +$as_echo_n "checking what the C++ library is... " >&6; } HAVE_LIBSTDCPP= HAVE_LIBCPP= ac_ext=cpp @@ -20156,20 +19215,19 @@ #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : CPP_LIBRARY=GLIBCXX cpp_library_name="GNU libstdc++" HAVE_LIBSTDCPP=TRUE -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20179,22 +19237,21 @@ #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : CPP_LIBRARY=LIBCPP cpp_library_name="LLVM libc++" - printf "%s\n" "#define HAVE_LIBCPP 1" >>confdefs.h + $as_echo "#define HAVE_LIBCPP 1" >>confdefs.h HAVE_LIBCPP=TRUE -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20204,28 +19261,27 @@ #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : CPP_LIBRARY=MSVCRT cpp_library_name="Microsoft" -else $as_nop +else as_fn_error $? "Could not figure out what C++ library this is" "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cpp_library_name" >&5 -printf "%s\n" "$cpp_library_name" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cpp_library_name" >&5 +$as_echo "$cpp_library_name" >&6; } ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20246,8 +19302,8 @@ # Moreover std::to_string() has a bug (https://reviews.llvm.org/D125184). # So check if debug mode can be used and disable or downgrade it to assertions # if needed. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libc++ has a usable debug mode" >&5 -printf %s "checking if libc++ has a usable debug mode... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc++ has a usable debug mode" >&5 +$as_echo_n "checking if libc++ has a usable debug mode... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20268,21 +19324,19 @@ } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : libcpp_debug_links=1 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -n "$libcpp_debug_links"; then # we can use at least assertions, check if debug mode works - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20299,15 +19353,14 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if ac_fn_cxx_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } LIBCPP_DEBUG=-D_LIBCPP_DEBUG=1 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } LIBCPP_DEBUG=-D_LIBCPP_DEBUG=0 @@ -20317,8 +19370,8 @@ fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -20331,12 +19384,11 @@ # Extract the first word of "gperf", so it can be a program name with args. set dummy gperf; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GPERF+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GPERF+:} false; then : + $as_echo_n "(cached) " >&6 +else case $GPERF in [\\/]* | ?:[\\/]*) ac_cv_path_GPERF="$GPERF" # Let the user override the test with a path. @@ -20346,15 +19398,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GPERF="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GPERF="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20366,11 +19414,11 @@ fi GPERF=$ac_cv_path_GPERF if test -n "$GPERF"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5 -printf "%s\n" "$GPERF" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5 +$as_echo "$GPERF" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -20380,14 +19428,14 @@ if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then GPERF=`cygpath -m $GPERF` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gperf is new enough" >&5 -printf %s "checking whether gperf is new enough... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gperf is new enough" >&5 +$as_echo_n "checking whether gperf is new enough... " >&6; } my_gperf_ver1=$($GPERF --version | head -n 1) my_gperf_ver2=${my_gperf_ver1#GNU gperf } my_gperf_ver3=$(printf %s "$my_gperf_ver2" | $AWK -F. '{ print $1*100+($2<100?$2:99) }') if test "$my_gperf_ver3" -ge 301; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($my_gperf_ver2)" >&5 -printf "%s\n" "yes ($my_gperf_ver2)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($my_gperf_ver2)" >&5 +$as_echo "yes ($my_gperf_ver2)" >&6; } else as_fn_error $? "\"$my_gperf_ver1\" is too old or unrecognized, must be at least gperf 3.1" "$LINENO" 5 fi @@ -20407,10 +19455,9 @@ # Check whether --enable-libcmis was given. -if test ${enable_libcmis+y} -then : +if test "${enable_libcmis+set}" = set; then : enableval=$enable_libcmis; -else $as_nop +else enable_libcmis="yes" fi @@ -20419,10 +19466,9 @@ # Check whether --with-system-libcmis was given. -if test ${with_system_libcmis+y} -then : +if test "${with_system_libcmis+set}" = set; then : withval=$with_system_libcmis; -else $as_nop +else if test "${with_system_libcmis+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libcmis="$with_system_libs"; @@ -20434,27 +19480,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libcmis to use" >&5 -printf %s "checking which libcmis to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libcmis to use" >&5 +$as_echo_n "checking which libcmis to use... " >&6; } if test "$test_libcmis" != no -a "$found_libcmis" != yes -a "$enable_libcmis" != no; then ENABLE_LIBCMIS=TRUE if test "$with_system_libcmis" = yes -a "$test_system_libcmis" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBCMIS=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCMIS" >&5 -printf %s "checking for LIBCMIS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcmis-0.5 >= 0.5.2" >&5 +$as_echo_n "checking for libcmis-0.5 >= 0.5.2... " >&6; } if test -n "$LIBCMIS_CFLAGS"; then pkg_cv_LIBCMIS_CFLAGS="$LIBCMIS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmis-0.5 >= 0.5.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmis-0.5 >= 0.5.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcmis-0.5 >= 0.5.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBCMIS_CFLAGS=`$PKG_CONFIG --cflags "libcmis-0.5 >= 0.5.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20468,10 +19514,10 @@ pkg_cv_LIBCMIS_LIBS="$LIBCMIS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmis-0.5 >= 0.5.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmis-0.5 >= 0.5.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcmis-0.5 >= 0.5.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBCMIS_LIBS=`$PKG_CONFIG --libs "libcmis-0.5 >= 0.5.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20485,8 +19531,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20512,10 +19558,10 @@ and LIBCMIS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -20529,16 +19575,16 @@ else LIBCMIS_CFLAGS=$pkg_cv_LIBCMIS_CFLAGS LIBCMIS_LIBS=$pkg_cv_LIBCMIS_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBCMIS_CFLAGS=$(printf '%s' "${LIBCMIS_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LIBCMIS_LIBS}" LIBCMIS_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBCMIS= LIBCMIS_CFLAGS="${LIBCMIS_CFLAGS_internal}" LIBCMIS_LIBS="${LIBCMIS_LIBS_internal}" @@ -20546,8 +19592,8 @@ fi else if test "$found_libcmis" = yes -a "$enable_libcmis" != no -a "$with_system_libcmis" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_LIBCMIS=TRUE SYSTEM_LIBCMIS=TRUE else @@ -20556,11 +19602,11 @@ LIBCMIS_CFLAGS= LIBCMIS_LIBS= if test "$test_libcmis" != no -a "$enable_libcmis" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -20571,8 +19617,8 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++17" >&5 -printf %s "checking whether $CXX_BASE supports C++17... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++17" >&5 +$as_echo_n "checking whether $CXX_BASE supports C++17... " >&6; } CXXFLAGS_CXX11= if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then if test "$with_latest_c__" = yes; then @@ -20626,18 +19672,17 @@ } int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : CXXFLAGS_CXX11=$flag fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20651,8 +19696,8 @@ done fi if test -n "$CXXFLAGS_CXX11"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($CXXFLAGS_CXX11)" >&5 -printf "%s\n" "yes ($CXXFLAGS_CXX11)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($CXXFLAGS_CXX11)" >&5 +$as_echo "yes ($CXXFLAGS_CXX11)" >&6; } else as_fn_error $? "no" "$LINENO" 5 fi @@ -20670,8 +19715,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether std::atomic can be used without link library" >&5 -printf %s "checking whether std::atomic can be used without link library... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether std::atomic can be used without link library" >&5 +$as_echo_n "checking whether std::atomic can be used without link library... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20688,19 +19733,18 @@ } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } LIBS="$LIBS -latomic" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether std::atomic needs -latomic" >&5 -printf %s "checking whether std::atomic needs -latomic... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether std::atomic needs -latomic" >&5 +$as_echo_n "checking whether std::atomic needs -latomic... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20716,28 +19760,27 @@ } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ATOMIC_LIB=-latomic -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot figure our how to use std::atomic See \`config.log' for more details" "$LINENO" 5; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c @@ -20751,8 +19794,8 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++11 without Language Defect 757" >&5 -printf %s "checking whether $CXX_BASE supports C++11 without Language Defect 757... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++11 without Language Defect 757" >&5 +$as_echo_n "checking whether $CXX_BASE supports C++11 without Language Defect 757... " >&6; } save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" ac_ext=cpp @@ -20779,7 +19822,7 @@ } int -main (void) +main () { struct a @@ -20798,14 +19841,13 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else $as_nop +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else as_fn_error $? "no" "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20816,8 +19858,8 @@ HAVE_GCC_FNO_SIZED_DEALLOCATION= if test "$GCC" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports -fno-sized-deallocation" >&5 -printf %s "checking whether $CXX_BASE supports -fno-sized-deallocation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports -fno-sized-deallocation" >&5 +$as_echo_n "checking whether $CXX_BASE supports -fno-sized-deallocation... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20830,18 +19872,17 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : HAVE_GCC_FNO_SIZED_DEALLOCATION=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c @@ -20851,17 +19892,17 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$HAVE_GCC_FNO_SIZED_DEALLOCATION" = TRUE; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++2a constinit sorted vectors" >&5 -printf %s "checking whether $CXX_BASE supports C++2a constinit sorted vectors... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++2a constinit sorted vectors" >&5 +$as_echo_n "checking whether $CXX_BASE supports C++2a constinit sorted vectors... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20885,19 +19926,18 @@ constinit S s{3, 2, 1}; _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CPP_CONSTINIT_SORTED_VECTOR 1" >>confdefs.h + $as_echo "#define HAVE_CPP_CONSTINIT_SORTED_VECTOR 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -20906,8 +19946,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++2a with unsigned size_type" >&5 -printf %s "checking whether $CXX_BASE supports C++2a with unsigned size_type... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++2a with unsigned size_type" >&5 +$as_echo_n "checking whether $CXX_BASE supports C++2a with unsigned size_type... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20925,19 +19965,18 @@ void f(std::span s) { static_assert(std::is_unsigned_v); }; _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_CPP_SPAN 1" >>confdefs.h + $as_echo "#define HAVE_CPP_SPAN 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -20946,8 +19985,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE implements C++ DR P1155R3" >&5 -printf %s "checking whether $CXX_BASE implements C++ DR P1155R3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE implements C++ DR P1155R3" >&5 +$as_echo_n "checking whether $CXX_BASE implements C++ DR P1155R3... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20964,19 +20003,18 @@ S1 f(S2 s) { return s; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - printf "%s\n" "#define HAVE_P1155R3 1" >>confdefs.h + $as_echo "#define HAVE_P1155R3 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -20985,8 +20023,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++20 std::atomic_ref" >&5 -printf %s "checking whether $CXX_BASE supports C++20 std::atomic_ref... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports C++20 std::atomic_ref" >&5 +$as_echo_n "checking whether $CXX_BASE supports C++20 std::atomic_ref... " >&6; } HAVE_CXX20_ATOMIC_REF= ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -21004,18 +20042,17 @@ std::atomic_ref y(x); _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : HAVE_CXX20_ATOMIC_REF=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -21027,8 +20064,8 @@ HAVE_WDEPRECATED_COPY_DTOR= if test "$GCC" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports -Wdeprecated-copy-dtor" >&5 -printf %s "checking whether $CXX_BASE supports -Wdeprecated-copy-dtor... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports -Wdeprecated-copy-dtor" >&5 +$as_echo_n "checking whether $CXX_BASE supports -Wdeprecated-copy-dtor... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21041,18 +20078,17 @@ /* end confdefs.h. */ _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : HAVE_WDEPRECATED_COPY_DTOR=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -21065,8 +20101,8 @@ HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED= if test "$GCC" = yes && test "$COM_IS_CLANG" != TRUE; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE might report false -Werror=maybe-uninitialized" >&5 -printf %s "checking whether $CXX_BASE might report false -Werror=maybe-uninitialized... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE might report false -Werror=maybe-uninitialized" >&5 +$as_echo_n "checking whether $CXX_BASE might report false -Werror=maybe-uninitialized... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21108,18 +20144,17 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -else $as_nop +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -21132,8 +20167,8 @@ HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW= if test "$GCC" = yes && test "$COM_IS_CLANG" != TRUE; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE might report false -Werror=stringop-overflow=" >&5 -printf %s "checking whether $CXX_BASE might report false -Werror=stringop-overflow=... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE might report false -Werror=stringop-overflow=" >&5 +$as_echo_n "checking whether $CXX_BASE might report false -Werror=stringop-overflow=... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21161,18 +20196,17 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -else $as_nop +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -21185,8 +20219,8 @@ HAVE_DLLEXPORTINLINES= if test "$_os" = "WINNT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports -Zc:dllexportInlines-" >&5 -printf %s "checking whether $CXX_BASE supports -Zc:dllexportInlines-... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports -Zc:dllexportInlines-" >&5 +$as_echo_n "checking whether $CXX_BASE supports -Zc:dllexportInlines-... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21199,18 +20233,17 @@ /* end confdefs.h. */ _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : HAVE_DLLEXPORTINLINES=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -21269,8 +20302,8 @@ flag_fma="$flag_sse2" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE2 intrinsics" >&5 -printf %s "checking whether $CXX can compile SSE2 intrinsics... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE2 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile SSE2 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21290,13 +20323,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_sse2=yes -else $as_nop +else can_compile_sse2=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21304,14 +20336,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse2}" >&5 -printf "%s\n" "${can_compile_sse2}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse2}" >&5 +$as_echo "${can_compile_sse2}" >&6; } if test "${can_compile_sse2}" = "yes" ; then CXXFLAGS_INTRINSICS_SSE2="$flag_sse2" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSSE3 intrinsics" >&5 -printf %s "checking whether $CXX can compile SSSE3 intrinsics... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSSE3 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile SSSE3 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21331,13 +20363,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_ssse3=yes -else $as_nop +else can_compile_ssse3=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21345,14 +20376,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_ssse3}" >&5 -printf "%s\n" "${can_compile_ssse3}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_ssse3}" >&5 +$as_echo "${can_compile_ssse3}" >&6; } if test "${can_compile_ssse3}" = "yes" ; then CXXFLAGS_INTRINSICS_SSSE3="$flag_ssse3" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE4.1 intrinsics" >&5 -printf %s "checking whether $CXX can compile SSE4.1 intrinsics... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE4.1 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile SSE4.1 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21372,13 +20403,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_sse41=yes -else $as_nop +else can_compile_sse41=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21386,14 +20416,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse41}" >&5 -printf "%s\n" "${can_compile_sse41}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse41}" >&5 +$as_echo "${can_compile_sse41}" >&6; } if test "${can_compile_sse41}" = "yes" ; then CXXFLAGS_INTRINSICS_SSE41="$flag_sse41" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE4.2 intrinsics" >&5 -printf %s "checking whether $CXX can compile SSE4.2 intrinsics... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE4.2 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile SSE4.2 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21413,13 +20443,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_sse42=yes -else $as_nop +else can_compile_sse42=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21427,14 +20456,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse42}" >&5 -printf "%s\n" "${can_compile_sse42}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse42}" >&5 +$as_echo "${can_compile_sse42}" >&6; } if test "${can_compile_sse42}" = "yes" ; then CXXFLAGS_INTRINSICS_SSE42="$flag_sse42" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX intrinsics" >&5 -printf %s "checking whether $CXX can compile AVX intrinsics... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile AVX intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21454,13 +20483,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_avx=yes -else $as_nop +else can_compile_avx=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21468,14 +20496,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx}" >&5 -printf "%s\n" "${can_compile_avx}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx}" >&5 +$as_echo "${can_compile_avx}" >&6; } if test "${can_compile_avx}" = "yes" ; then CXXFLAGS_INTRINSICS_AVX="$flag_avx" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX2 intrinsics" >&5 -printf %s "checking whether $CXX can compile AVX2 intrinsics... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX2 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile AVX2 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21495,13 +20523,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_avx2=yes -else $as_nop +else can_compile_avx2=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21509,14 +20536,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx2}" >&5 -printf "%s\n" "${can_compile_avx2}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx2}" >&5 +$as_echo "${can_compile_avx2}" >&6; } if test "${can_compile_avx2}" = "yes" ; then CXXFLAGS_INTRINSICS_AVX2="$flag_avx2" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX512 intrinsics" >&5 -printf %s "checking whether $CXX can compile AVX512 intrinsics... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX512 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile AVX512 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21538,13 +20565,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_avx512=yes -else $as_nop +else can_compile_avx512=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21552,15 +20578,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx512}" >&5 -printf "%s\n" "${can_compile_avx512}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx512}" >&5 +$as_echo "${can_compile_avx512}" >&6; } if test "${can_compile_avx512}" = "yes" ; then CXXFLAGS_INTRINSICS_AVX512="$flag_avx512" CXXFLAGS_INTRINSICS_AVX512F="$flag_avx512f" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile F16C intrinsics" >&5 -printf %s "checking whether $CXX can compile F16C intrinsics... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile F16C intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile F16C intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21581,13 +20607,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_f16c=yes -else $as_nop +else can_compile_f16c=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21595,14 +20620,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_f16c}" >&5 -printf "%s\n" "${can_compile_f16c}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_f16c}" >&5 +$as_echo "${can_compile_f16c}" >&6; } if test "${can_compile_f16c}" = "yes" ; then CXXFLAGS_INTRINSICS_F16C="$flag_f16c" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile FMA intrinsics" >&5 -printf %s "checking whether $CXX can compile FMA intrinsics... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile FMA intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile FMA intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21622,13 +20647,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_fma=yes -else $as_nop +else can_compile_fma=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21636,8 +20660,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_fma}" >&5 -printf "%s\n" "${can_compile_fma}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_fma}" >&5 +$as_echo "${can_compile_fma}" >&6; } if test "${can_compile_fma}" = "yes" ; then CXXFLAGS_INTRINSICS_FMA="$flag_fma" fi @@ -21670,24 +20694,23 @@ # Assume visibility is not broken with libc++. The below test is very much designed for libstdc++ # only. if test "$CPP_LIBRARY" = GLIBCXX; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if STL headers are visibility safe (GCC bug 22482)" >&5 -printf %s "checking if STL headers are visibility safe (GCC bug 22482)... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if STL headers are visibility safe (GCC bug 22482)" >&5 +$as_echo_n "checking if STL headers are visibility safe (GCC bug 22482)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "visibility push" >/dev/null 2>&1 -then : + $EGREP "visibility push" >/dev/null 2>&1; then : stlvisok=yes -else $as_nop +else stlvisok=no fi -rm -rf conftest* +rm -f conftest* - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $stlvisok" >&5 -printf "%s\n" "$stlvisok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $stlvisok" >&5 +$as_echo "$stlvisok" >&6; } if test "$stlvisok" = "no"; then as_fn_error $? "Your libstdc++ headers are not visibility safe. This is no longer supported." "$LINENO" 5 fi @@ -21696,8 +20719,8 @@ # As the below test checks things when linking self-compiled dynamic libraries, it presumably is irrelevant # when we don't make any dynamic libraries? if test "$DISABLE_DYNLOADING" = ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CXX_BASE is -fvisibility-inlines-hidden safe (Clang bug 11250)" >&5 -printf %s "checking if $CXX_BASE is -fvisibility-inlines-hidden safe (Clang bug 11250)... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX_BASE is -fvisibility-inlines-hidden safe (Clang bug 11250)" >&5 +$as_echo_n "checking if $CXX_BASE is -fvisibility-inlines-hidden safe (Clang bug 11250)... " >&6; } cat > conftestlib1.cc <<_ACEOF template struct S1 { virtual ~S1() {} virtual void f() {} }; struct S2: S1 { virtual ~S2(); }; @@ -21729,15 +20752,15 @@ fi rm -fr libconftest* - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gccvisinlineshiddenok" >&5 -printf "%s\n" "$gccvisinlineshiddenok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisinlineshiddenok" >&5 +$as_echo "$gccvisinlineshiddenok" >&6; } if test "$gccvisinlineshiddenok" = "no"; then as_fn_error $? "Your gcc/clang is not -fvisibility-inlines-hidden safe. This is no longer supported." "$LINENO" 5 fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CXX_BASE has a visibility bug with class-level attributes (GCC bug 26905)" >&5 -printf %s "checking if $CXX_BASE has a visibility bug with class-level attributes (GCC bug 26905)... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX_BASE has a visibility bug with class-level attributes (GCC bug 26905)" >&5 +$as_echo_n "checking if $CXX_BASE has a visibility bug with class-level attributes (GCC bug 26905)... " >&6; } cat >visibility.cxx <<_ACEOF #pragma GCC visibility push(hidden) struct __attribute__ ((visibility ("default"))) TestStruct { @@ -21769,27 +20792,27 @@ fi rm -f visibility.s visibility.cxx - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gccvisbroken" >&5 -printf "%s\n" "$gccvisbroken" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisbroken" >&5 +$as_echo "$gccvisbroken" >&6; } if test "$gccvisbroken" = "yes"; then as_fn_error $? "Your gcc is not -fvisibility=hidden safe. This is no longer supported." "$LINENO" 5 fi CPPFLAGS="$save_CPPFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if CET endbranch is recognized" >&5 -printf %s "checking if CET endbranch is recognized... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CET endbranch is recognized" >&5 +$as_echo_n "checking if CET endbranch is recognized... " >&6; } cat > endbr.s <<_ACEOF endbr32 _ACEOF HAVE_ASM_END_BRANCH_INS_SUPPORT= if $CXX -c endbr.s -o endbr.o >/dev/null 2>&5; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } HAVE_ASM_END_BRANCH_INS_SUPPORT=TRUE else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f endbr.s endbr.o @@ -21805,8 +20828,8 @@ HAVE_GCC_FNO_ENFORCE_EH_SPECS= if test "$GCC" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports -fno-enforce-eh-specs" >&5 -printf %s "checking whether $CXX_BASE supports -fno-enforce-eh-specs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports -fno-enforce-eh-specs" >&5 +$as_echo_n "checking whether $CXX_BASE supports -fno-enforce-eh-specs... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21819,18 +20842,17 @@ /* end confdefs.h. */ int -main (void) +main () { return 0; ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : HAVE_GCC_FNO_ENFORCE_EH_SPECS=TRUE fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c @@ -21840,11 +20862,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$HAVE_GCC_FNO_ENFORCE_EH_SPECS" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -21855,8 +20877,8 @@ if test "$COM_IS_CLANG" != "TRUE"; then if test "$libo_fuzzed_enable_compiler_plugins" = yes -a "$enable_compiler_plugins" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Resetting --enable-compiler-plugins=no" >&5 -printf "%s\n" "$as_me: Resetting --enable-compiler-plugins=no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Resetting --enable-compiler-plugins=no" >&5 +$as_echo "$as_me: Resetting --enable-compiler-plugins=no" >&6;} enable_compiler_plugins=no fi fi @@ -21893,12 +20915,11 @@ fi # Extract the first word of "llvm-config", so it can be a program name with args. set dummy llvm-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_LLVM_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LLVM_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $LLVM_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_LLVM_CONFIG="$LLVM_CONFIG" # Let the user override the test with a path. @@ -21908,15 +20929,11 @@ for as_dir in "$clangbindir" $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_LLVM_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LLVM_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21928,11 +20945,11 @@ fi LLVM_CONFIG=$ac_cv_path_LLVM_CONFIG if test -n "$LLVM_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LLVM_CONFIG" >&5 -printf "%s\n" "$LLVM_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_CONFIG" >&5 +$as_echo "$LLVM_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -21954,8 +20971,8 @@ COMPILER_PLUGINS_CXXFLAGS="$COMPILER_PLUGINS_CXXFLAGS -I$clangobjdir/tools/clang/include" fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: compiler plugins compile flags: $COMPILER_PLUGINS_CXXFLAGS" >&5 -printf "%s\n" "$as_me: compiler plugins compile flags: $COMPILER_PLUGINS_CXXFLAGS" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: compiler plugins compile flags: $COMPILER_PLUGINS_CXXFLAGS" >&5 +$as_echo "$as_me: compiler plugins compile flags: $COMPILER_PLUGINS_CXXFLAGS" >&6;} ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21972,26 +20989,26 @@ CXXCPP="$COMPILER_PLUGINS_CXX -E" CPPFLAGS="$COMPILER_PLUGINS_CXXFLAGS" CXXFLAGS="$COMPILER_PLUGINS_CXXFLAGS" - ac_fn_cxx_check_header_compile "$LINENO" "clang/Basic/SourceLocation.h" "ac_cv_header_clang_Basic_SourceLocation_h" "$ac_includes_default" -if test "x$ac_cv_header_clang_Basic_SourceLocation_h" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "clang/Basic/SourceLocation.h" "ac_cv_header_clang_Basic_SourceLocation_h" "$ac_includes_default" +if test "x$ac_cv_header_clang_Basic_SourceLocation_h" = xyes; then : COMPILER_PLUGINS=TRUE -else $as_nop +else if test "$compiler_plugins" = "yes"; then as_fn_error $? "Cannot find Clang headers to build compiler plugins." "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find Clang headers to build compiler plugins, plugins disabled" >&5 -printf "%s\n" "$as_me: WARNING: Cannot find Clang headers to build compiler plugins, plugins disabled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find Clang headers to build compiler plugins, plugins disabled" >&5 +$as_echo "$as_me: WARNING: Cannot find Clang headers to build compiler plugins, plugins disabled" >&2;} add_warning "Cannot find Clang headers to build compiler plugins, plugins disabled." fi fi + if test -n "$COMPILER_PLUGINS" && test "$_os" != "WINNT"; then LDFLAGS="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang libraries to use" >&5 -printf %s "checking for clang libraries to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang libraries to use" >&5 +$as_echo_n "checking for clang libraries to use... " >&6; } if test -z "$CLANGTOOLLIBS"; then LIBS="-lclangTooling -lclangFrontend -lclangDriver -lclangParse -lclangSema -lclangEdit \ -lclangAnalysis -lclangAST -lclangLex -lclangSerialization -lclangBasic $COMPILER_PLUGINS_LINKFLAGS" @@ -22000,7 +21017,7 @@ #include "clang/Basic/SourceLocation.h" int -main (void) +main () { clang::FullSourceLoc().dump(); ; @@ -22008,11 +21025,10 @@ } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : CLANGTOOLLIBS="$LIBS" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi if test -z "$CLANGTOOLLIBS"; then @@ -22022,7 +21038,7 @@ #include "clang/Basic/SourceLocation.h" int -main (void) +main () { clang::FullSourceLoc().dump(); ; @@ -22030,21 +21046,20 @@ } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : CLANGTOOLLIBS="$LIBS" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CLANGTOOLLIBS" >&5 -printf "%s\n" "$CLANGTOOLLIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANGTOOLLIBS" >&5 +$as_echo "$CLANGTOOLLIBS" >&6; } if test -z "$CLANGTOOLLIBS"; then if test "$compiler_plugins" = "yes"; then as_fn_error $? "Cannot find Clang libraries to build compiler plugins." "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find Clang libraries to build compiler plugins, plugins disabled" >&5 -printf "%s\n" "$as_me: WARNING: Cannot find Clang libraries to build compiler plugins, plugins disabled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find Clang libraries to build compiler plugins, plugins disabled" >&5 +$as_echo "$as_me: WARNING: Cannot find Clang libraries to build compiler plugins, plugins disabled" >&2;} add_warning "Cannot find Clang libraries to build compiler plugins, plugins disabled." fi COMPILER_PLUGINS= @@ -22071,8 +21086,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler for building compilerplugins is actually Clang" >&5 -printf %s "checking whether the compiler for building compilerplugins is actually Clang... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler for building compilerplugins is actually Clang" >&5 +$as_echo_n "checking whether the compiler for building compilerplugins is actually Clang... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22082,16 +21097,15 @@ int foo=42; _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } COMPILER_PLUGINS_COM_IS_CLANG=TRUE -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi else @@ -22121,21 +21135,21 @@ # This makes --enable-lto build with clang work. - - for ac_func in posix_fallocate +for ac_func in posix_fallocate do : ac_fn_c_check_func "$LINENO" "posix_fallocate" "ac_cv_func_posix_fallocate" -if test "x$ac_cv_func_posix_fallocate" = xyes -then : - printf "%s\n" "#define HAVE_POSIX_FALLOCATE 1" >>confdefs.h +if test "x$ac_cv_func_posix_fallocate" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_POSIX_FALLOCATE 1 +_ACEOF HAVE_POSIX_FALLOCATE=YES -else $as_nop +else HAVE_POSIX_FALLOCATE=NO fi - done + JITC_PROCESSOR_TYPE="" if test "$_os" = "Linux" -a "$host_cpu" = "powerpc"; then # IBMs JDK needs this... @@ -22147,8 +21161,7 @@ # Misc Windows Stuff # Check whether --with-ucrt-dir was given. -if test ${with_ucrt_dir+y} -then : +if test "${with_ucrt_dir+set}" = set; then : withval=$with_ucrt_dir; fi @@ -22190,8 +21203,8 @@ for i in $PKGFORMAT; do case "$i" in msi) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --without-ucrt-dir not specified or MSUs not found - installer will have runtime dependency" >&5 -printf "%s\n" "$as_me: WARNING: --without-ucrt-dir not specified or MSUs not found - installer will have runtime dependency" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --without-ucrt-dir not specified or MSUs not found - installer will have runtime dependency" >&5 +$as_echo "$as_me: WARNING: --without-ucrt-dir not specified or MSUs not found - installer will have runtime dependency" >&2;} add_warning "--without-ucrt-dir not specified or MSUs not found - installer will have runtime dependency" ;; esac @@ -22239,12 +21252,11 @@ if test -z "$with_jdk_home"; then # Extract the first word of "$with_java", so it can be a program name with args. set dummy $with_java; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_JAVAINTERPRETER+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_JAVAINTERPRETER+:} false; then : + $as_echo_n "(cached) " >&6 +else case $JAVAINTERPRETER in [\\/]* | ?:[\\/]*) ac_cv_path_JAVAINTERPRETER="$JAVAINTERPRETER" # Let the user override the test with a path. @@ -22254,15 +21266,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_JAVAINTERPRETER="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_JAVAINTERPRETER="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22274,11 +21282,11 @@ fi JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER if test -n "$JAVAINTERPRETER"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $JAVAINTERPRETER" >&5 -printf "%s\n" "$JAVAINTERPRETER" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAINTERPRETER" >&5 +$as_echo "$JAVAINTERPRETER" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22294,12 +21302,12 @@ if test "$build_os" = "cygwin" -a "$cross_compiling" != "yes"; then shortjdkhome=`cygpath -d "$with_jdk_home"` if test $WIN_HOST_BITS -eq 64 -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You are building 64-bit binaries but the JDK $howfound is 32-bit" >&5 -printf "%s\n" "$as_me: WARNING: You are building 64-bit binaries but the JDK $howfound is 32-bit" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are building 64-bit binaries but the JDK $howfound is 32-bit" >&5 +$as_echo "$as_me: WARNING: You are building 64-bit binaries but the JDK $howfound is 32-bit" >&2;} as_fn_error $? "You should pass the --with-jdk-home option pointing to a 64-bit JDK" "$LINENO" 5 elif test $WIN_HOST_BITS -eq 32 -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | $GREP -i 64-bit`" != "" >/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You are building 32-bit binaries but the JDK $howfound is 64-bit" >&5 -printf "%s\n" "$as_me: WARNING: You are building 32-bit binaries but the JDK $howfound is 64-bit" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are building 32-bit binaries but the JDK $howfound is 64-bit" >&5 +$as_echo "$as_me: WARNING: You are building 32-bit binaries but the JDK $howfound is 64-bit" >&2;} as_fn_error $? "You should pass the --with-jdk-home option pointing to a (32-bit) JDK" "$LINENO" 5 fi @@ -22311,15 +21319,15 @@ case $CPUNAME in AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|GODSON64) if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You are building 64-bit binaries but the JDK $JAVAINTERPRETER is 32-bit" >&5 -printf "%s\n" "$as_me: WARNING: You are building 64-bit binaries but the JDK $JAVAINTERPRETER is 32-bit" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are building 64-bit binaries but the JDK $JAVAINTERPRETER is 32-bit" >&5 +$as_echo "$as_me: WARNING: You are building 64-bit binaries but the JDK $JAVAINTERPRETER is 32-bit" >&2;} as_fn_error $? "You should pass the --with-jdk-home option pointing to a 64-bit JDK" "$LINENO" 5 fi ;; *) # assumption: everything else 32-bit if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" != "" >/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You are building 32-bit binaries but the JDK $howfound is 64-bit" >&5 -printf "%s\n" "$as_me: WARNING: You are building 32-bit binaries but the JDK $howfound is 64-bit" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are building 32-bit binaries but the JDK $howfound is 64-bit" >&5 +$as_echo "$as_me: WARNING: You are building 32-bit binaries but the JDK $howfound is 64-bit" >&2;} as_fn_error $? "You should pass the --with-jdk-home option pointing to a (32-bit) JDK" "$LINENO" 5 fi ;; @@ -22333,8 +21341,8 @@ JDK_SECURITYMANAGER_DISALLOWED= if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then _gij_longver=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the installed JDK" >&5 -printf %s "checking the installed JDK... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the installed JDK" >&5 +$as_echo_n "checking the installed JDK... " >&6; } if test -n "$JAVAINTERPRETER"; then if test `$JAVAINTERPRETER -version 2>&1 | $GREP -c "Kaffe"` -gt 0; then as_fn_error $? "No valid check available. Please check the block for your desired java in configure.ac" "$LINENO" 5 @@ -22364,8 +21372,8 @@ if test "$_os" = "WINNT"; then JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"` fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found $JAVA_HOME (JDK $_jdk)" >&5 -printf "%s\n" "found $JAVA_HOME (JDK $_jdk)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $JAVA_HOME (JDK $_jdk)" >&5 +$as_echo "found $JAVA_HOME (JDK $_jdk)" >&6; } # set to limit VM usage for JunitTests JAVAIFLAGS=-Xmx64M @@ -22393,12 +21401,11 @@ if test -z "$with_jdk_home"; then # Extract the first word of "$javacompiler", so it can be a program name with args. set dummy $javacompiler; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_JAVACOMPILER+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_JAVACOMPILER+:} false; then : + $as_echo_n "(cached) " >&6 +else case $JAVACOMPILER in [\\/]* | ?:[\\/]*) ac_cv_path_JAVACOMPILER="$JAVACOMPILER" # Let the user override the test with a path. @@ -22408,15 +21415,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_JAVACOMPILER="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_JAVACOMPILER="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22428,11 +21431,11 @@ fi JAVACOMPILER=$ac_cv_path_JAVACOMPILER if test -n "$JAVACOMPILER"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $JAVACOMPILER" >&5 -printf "%s\n" "$JAVACOMPILER" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVACOMPILER" >&5 +$as_echo "$JAVACOMPILER" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22457,12 +21460,11 @@ if test -z "$with_jdk_home"; then # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_JAVADOC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_JAVADOC+:} false; then : + $as_echo_n "(cached) " >&6 +else case $JAVADOC in [\\/]* | ?:[\\/]*) ac_cv_path_JAVADOC="$JAVADOC" # Let the user override the test with a path. @@ -22472,15 +21474,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_JAVADOC="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22492,11 +21490,11 @@ fi JAVADOC=$ac_cv_path_JAVADOC if test -n "$JAVADOC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5 -printf "%s\n" "$JAVADOC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5 +$as_echo "$JAVADOC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22507,12 +21505,11 @@ else # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_JAVADOC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_JAVADOC+:} false; then : + $as_echo_n "(cached) " >&6 +else case $JAVADOC in [\\/]* | ?:[\\/]*) ac_cv_path_JAVADOC="$JAVADOC" # Let the user override the test with a path. @@ -22522,15 +21519,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_JAVADOC="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22542,11 +21535,11 @@ fi JAVADOC=$ac_cv_path_JAVADOC if test -n "$JAVADOC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5 -printf "%s\n" "$JAVADOC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5 +$as_echo "$JAVADOC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22587,10 +21580,10 @@ fi else # else warn - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5 -printf "%s\n" "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5 -printf "%s\n" "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5 +$as_echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5 +$as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;} add_warning "JAVA_HOME is set to /usr - this is very likely to be incorrect" add_warning "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" fi @@ -22623,28 +21616,28 @@ } } _ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if javac works" >&5 -printf %s "checking if javac works... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if javac works" >&5 +$as_echo_n "checking if javac works... " >&6; } javac_cmd="$JAVACOMPILER findhome.java 1>&2" { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$javac_cmd\""; } >&5 (eval $javac_cmd) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test $? = 0 -a -f ./findhome.class; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: javac works" >&5 -printf "%s\n" "javac works" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: javac works" >&5 +$as_echo "javac works" >&6; } else echo "configure: javac test failed" >&5 cat findhome.java >&5 as_fn_error $? "javac does not work - java projects will not build!" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gij knows its java.home" >&5 -printf %s "checking if gij knows its java.home... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gij knows its java.home" >&5 +$as_echo_n "checking if gij knows its java.home... " >&6; } JAVA_HOME=`$JAVAINTERPRETER findhome` if test $? = 0 -a "$JAVA_HOME" != ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $JAVA_HOME" >&5 -printf "%s\n" "$JAVA_HOME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA_HOME" >&5 +$as_echo "$JAVA_HOME" >&6; } else echo "configure: java test failed" >&5 cat findhome.java >&5 @@ -22660,12 +21653,12 @@ # now check if $JAVA_HOME is really valid if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5 -printf "%s\n" "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5 -printf "%s\n" "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: in case JAVA_HOME is incorrectly set, some projects will not be built correctly" >&5 -printf "%s\n" "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects will not be built correctly" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5 +$as_echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5 +$as_echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: in case JAVA_HOME is incorrectly set, some projects will not be built correctly" >&5 +$as_echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects will not be built correctly" >&2;} add_warning "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" add_warning "attempted to find JAVA_HOME automatically, but apparently it failed" add_warning "in case JAVA_HOME is incorrectly set, some projects will not be built correctly" @@ -22678,18 +21671,17 @@ if test -z "$JAWTLIB" -a -n "$ENABLE_JAVA" -a "$_os" != Android -a \ "$_os" != Darwin then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JAWT lib" >&5 -printf %s "checking for JAWT lib... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT lib" >&5 +$as_echo_n "checking for JAWT lib... " >&6; } if test "$_os" = WINNT; then # The path to $JAVA_HOME/lib/$JAWTLIB is part of $ILIB: JAWTLIB=jawt.lib else case "$host_cpu" in arm*) - if test -e "$JAVA_HOME/jre/lib/aarch32/libjawt.so" -then : + if test -e "$JAVA_HOME/jre/lib/aarch32/libjawt.so"; then : my_java_arch=aarch32 -else $as_nop +else my_java_arch=arm fi JAVA_ARCH=$my_java_arch @@ -22707,10 +21699,9 @@ my_java_arch=ppc64 ;; powerpc64le) - if test -e "$JAVA_HOME/jre/lib/ppc64le/libjawt.so" -then : + if test -e "$JAVA_HOME/jre/lib/ppc64le/libjawt.so"; then : my_java_arch=ppc64le -else $as_nop +else my_java_arch=ppc64 fi JAVA_ARCH=$my_java_arch @@ -22731,14 +21722,15 @@ else JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt" fi - if test "$JAVA_ARCH" != "" -then : - printf "%s\n" "#define JAVA_ARCH \"$JAVA_ARCH\"" >>confdefs.h + if test "$JAVA_ARCH" != ""; then : + cat >>confdefs.h <<_ACEOF +#define JAVA_ARCH "$JAVA_ARCH" +_ACEOF fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $JAWTLIB" >&5 -printf "%s\n" "$JAWTLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAWTLIB" >&5 +$as_echo "$JAWTLIB" >&6; } fi @@ -22832,39 +21824,38 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable export file validation" >&5 -printf %s "checking whether to enable export file validation... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable export file validation" >&5 +$as_echo_n "checking whether to enable export file validation... " >&6; } if test "$with_export_validation" != "no"; then if test -z "$ENABLE_JAVA"; then if test "$with_export_validation" = "yes"; then as_fn_error $? "requested, but Java is disabled" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, as Java is disabled" >&5 -printf "%s\n" "no, as Java is disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, as Java is disabled" >&5 +$as_echo "no, as Java is disabled" >&6; } fi elif ! test -d "${SRC_ROOT}/schema"; then if test "$with_export_validation" = "yes"; then as_fn_error $? "requested, but schema directory is missing (it is excluded from tarballs)" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, schema directory is missing (it is excluded from tarballs)" >&5 -printf "%s\n" "no, schema directory is missing (it is excluded from tarballs)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, schema directory is missing (it is excluded from tarballs)" >&5 +$as_echo "no, schema directory is missing (it is excluded from tarballs)" >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - printf "%s\n" "#define HAVE_EXPORT_VALIDATION 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_EXPORT_VALIDATION 1" >>confdefs.h for ac_prog in odfvalidator do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_ODFVALIDATOR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ODFVALIDATOR+:} false; then : + $as_echo_n "(cached) " >&6 +else case $ODFVALIDATOR in [\\/]* | ?:[\\/]*) ac_cv_path_ODFVALIDATOR="$ODFVALIDATOR" # Let the user override the test with a path. @@ -22874,15 +21865,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_ODFVALIDATOR="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ODFVALIDATOR="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22894,11 +21881,11 @@ fi ODFVALIDATOR=$ac_cv_path_ODFVALIDATOR if test -n "$ODFVALIDATOR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ODFVALIDATOR" >&5 -printf "%s\n" "$ODFVALIDATOR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ODFVALIDATOR" >&5 +$as_echo "$ODFVALIDATOR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22907,8 +21894,8 @@ if test -z "$ODFVALIDATOR"; then # remember to download the ODF toolkit with validator later - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: no odfvalidator found, will download it" >&5 -printf "%s\n" "$as_me: no odfvalidator found, will download it" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: no odfvalidator found, will download it" >&5 +$as_echo "$as_me: no odfvalidator found, will download it" >&6;} BUILD_TYPE="$BUILD_TYPE ODFVALIDATOR" ODFVALIDATOR="$BUILDDIR/bin/odfvalidator.sh" @@ -22936,12 +21923,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_OFFICEOTRON+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_OFFICEOTRON+:} false; then : + $as_echo_n "(cached) " >&6 +else case $OFFICEOTRON in [\\/]* | ?:[\\/]*) ac_cv_path_OFFICEOTRON="$OFFICEOTRON" # Let the user override the test with a path. @@ -22951,15 +21937,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_OFFICEOTRON="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_OFFICEOTRON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22971,11 +21953,11 @@ fi OFFICEOTRON=$ac_cv_path_OFFICEOTRON if test -n "$OFFICEOTRON"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OFFICEOTRON" >&5 -printf "%s\n" "$OFFICEOTRON" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OFFICEOTRON" >&5 +$as_echo "$OFFICEOTRON" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22984,8 +21966,8 @@ if test -z "$OFFICEOTRON"; then # remember to download the officeotron with validator later - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: no officeotron found, will download it" >&5 -printf "%s\n" "$as_me: no officeotron found, will download it" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: no officeotron found, will download it" >&5 +$as_echo "$as_me: no officeotron found, will download it" >&6;} BUILD_TYPE="$BUILD_TYPE OFFICEOTRON" OFFICEOTRON="$BUILDDIR/bin/officeotron.sh" @@ -23015,14 +21997,14 @@ fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Microsoft Binary File Format Validator" >&5 -printf %s "checking for Microsoft Binary File Format Validator... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Microsoft Binary File Format Validator" >&5 +$as_echo_n "checking for Microsoft Binary File Format Validator... " >&6; } if test "$with_bffvalidator" != "no"; then - printf "%s\n" "#define HAVE_BFFVALIDATOR 1" >>confdefs.h + $as_echo "#define HAVE_BFFVALIDATOR 1" >>confdefs.h if test "$with_export_validation" = "no"; then @@ -23037,8 +22019,8 @@ if test "$build_os" = "cygwin"; then if test -n "$BFFVALIDATOR" -a -e "`cygpath $BFFVALIDATOR`"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BFFVALIDATOR" >&5 -printf "%s\n" "$BFFVALIDATOR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BFFVALIDATOR" >&5 +$as_echo "$BFFVALIDATOR" >&6; } else as_fn_error $? "bffvalidator not found, but required by --with-bffvalidator" "$LINENO" 5 fi @@ -23048,12 +22030,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_WINE+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_WINE+:} false; then : + $as_echo_n "(cached) " >&6 +else case $WINE in [\\/]* | ?:[\\/]*) ac_cv_path_WINE="$WINE" # Let the user override the test with a path. @@ -23063,15 +22044,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_WINE="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_WINE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -23083,11 +22060,11 @@ fi WINE=$ac_cv_path_WINE if test -n "$WINE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINE" >&5 -printf "%s\n" "$WINE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINE" >&5 +$as_echo "$WINE" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -23099,31 +22076,30 @@ BFFVALIDATOR_EXE="$BFFVALIDATOR" BFFVALIDATOR="sh $BUILDDIR/bin/bffvalidator.sh" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BFFVALIDATOR" >&5 -printf "%s\n" "$BFFVALIDATOR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BFFVALIDATOR" >&5 +$as_echo "$BFFVALIDATOR" >&6; } else as_fn_error $? "bffvalidator not found, but required by --with-bffvalidator" "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which C preprocessor to use in idlc" >&5 -printf %s "checking which C preprocessor to use in idlc... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which C preprocessor to use in idlc" >&5 +$as_echo_n "checking which C preprocessor to use in idlc... " >&6; } SYSTEM_UCPP_IS_GCC= if test -n "$with_idlc_cpp"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_idlc_cpp" >&5 -printf "%s\n" "$with_idlc_cpp" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_idlc_cpp" >&5 +$as_echo "$with_idlc_cpp" >&6; } # Extract the first word of "$with_idlc_cpp", so it can be a program name with args. set dummy $with_idlc_cpp; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_SYSTEM_UCPP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SYSTEM_UCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else case $SYSTEM_UCPP in [\\/]* | ?:[\\/]*) ac_cv_path_SYSTEM_UCPP="$SYSTEM_UCPP" # Let the user override the test with a path. @@ -23133,15 +22109,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_SYSTEM_UCPP="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SYSTEM_UCPP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -23153,16 +22125,16 @@ fi SYSTEM_UCPP=$ac_cv_path_SYSTEM_UCPP if test -n "$SYSTEM_UCPP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_UCPP" >&5 -printf "%s\n" "$SYSTEM_UCPP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_UCPP" >&5 +$as_echo "$SYSTEM_UCPP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $with_idlc_cpp is GCC CPP" >&5 -printf %s "checking if $with_idlc_cpp is GCC CPP... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $with_idlc_cpp is GCC CPP" >&5 +$as_echo_n "checking if $with_idlc_cpp is GCC CPP... " >&6; } # ucpp will accept -v (to output version), warn about the others as unknown # and return 1 (due to -v) # gcc will accept -v (as verbose), --version (to output version) and -nostdinc @@ -23170,28 +22142,27 @@ $SYSTEM_UCPP -v --version -nostdinc >/dev/null 2>/dev/null if test $? -eq 0; then SYSTEM_UCPP_IS_GCC=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ucpp" >&5 -printf "%s\n" "ucpp" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which ucpp to use" >&5 -printf %s "checking which ucpp to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ucpp" >&5 +$as_echo "ucpp" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which ucpp to use" >&5 +$as_echo_n "checking which ucpp to use... " >&6; } if test -n "$with_system_ucpp" -a "$with_system_ucpp" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } # Extract the first word of "ucpp", so it can be a program name with args. set dummy ucpp; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_SYSTEM_UCPP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SYSTEM_UCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else case $SYSTEM_UCPP in [\\/]* | ?:[\\/]*) ac_cv_path_SYSTEM_UCPP="$SYSTEM_UCPP" # Let the user override the test with a path. @@ -23201,15 +22172,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_SYSTEM_UCPP="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SYSTEM_UCPP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -23221,28 +22188,28 @@ fi SYSTEM_UCPP=$ac_cv_path_SYSTEM_UCPP if test -n "$SYSTEM_UCPP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_UCPP" >&5 -printf "%s\n" "$SYSTEM_UCPP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_UCPP" >&5 +$as_echo "$SYSTEM_UCPP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE UCPP" fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable EPM for packing" >&5 -printf %s "checking whether to enable EPM for packing... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EPM for packing" >&5 +$as_echo_n "checking whether to enable EPM for packing... " >&6; } if test "$enable_epm" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } if test "$_os" != "WINNT"; then if test $_os = Darwin; then EPM=internal @@ -23251,12 +22218,11 @@ else # Extract the first word of "epm", so it can be a program name with args. set dummy epm; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_EPM+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_EPM+:} false; then : + $as_echo_n "(cached) " >&6 +else case $EPM in [\\/]* | ?:[\\/]*) ac_cv_path_EPM="$EPM" # Let the user override the test with a path. @@ -23266,15 +22232,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_EPM="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_EPM="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -23287,48 +22249,48 @@ fi EPM=$ac_cv_path_EPM if test -n "$EPM"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EPM" >&5 -printf "%s\n" "$EPM" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPM" >&5 +$as_echo "$EPM" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$EPM" = "no" -o "$EPM" = "internal"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: EPM will be built." >&5 -printf "%s\n" "$as_me: EPM will be built." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: EPM will be built." >&5 +$as_echo "$as_me: EPM will be built." >&6;} BUILD_TYPE="$BUILD_TYPE EPM" EPM=${WORKDIR}/UnpackedTarball/epm/epm else # Gentoo has some epm which is something different... - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the found epm is the right epm" >&5 -printf %s "checking whether the found epm is the right epm... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the found epm is the right epm" >&5 +$as_echo_n "checking whether the found epm is the right epm... " >&6; } if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else as_fn_error $? "no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking epm version" >&5 -printf %s "checking epm version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking epm version" >&5 +$as_echo_n "checking epm version... " >&6; } EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//` if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \ test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK, >= 3.7" >&5 -printf "%s\n" "OK, >= 3.7" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 3.7" >&5 +$as_echo "OK, >= 3.7" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: too old. epm >= 3.7 is required." >&5 -printf "%s\n" "too old. epm >= 3.7 is required." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old. epm >= 3.7 is required." >&5 +$as_echo "too old. epm >= 3.7 is required." >&6; } as_fn_error $? "Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm" "$LINENO" 5 fi fi fi if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rpm" >&5 -printf %s "checking for rpm... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpm" >&5 +$as_echo_n "checking for rpm... " >&6; } for a in "$RPM" rpmbuild rpm; do $a --usage >/dev/null 2> /dev/null if test $? -eq 0; then @@ -23346,8 +22308,8 @@ as_fn_error $? "not found" "$LINENO" 5 elif "$RPM" --help 2>&1 | $EGREP buildroot >/dev/null; then RPM_PATH=`which $RPM` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RPM_PATH" >&5 -printf "%s\n" "$RPM_PATH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPM_PATH" >&5 +$as_echo "$RPM_PATH" >&6; } SCPDEFS="$SCPDEFS -DWITH_RPM" else as_fn_error $? "cannot build packages. Try installing rpmbuild." "$LINENO" 5 @@ -23356,12 +22318,11 @@ if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then # Extract the first word of "dpkg", so it can be a program name with args. set dummy dpkg; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_DPKG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DPKG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $DPKG in [\\/]* | ?:[\\/]*) ac_cv_path_DPKG="$DPKG" # Let the user override the test with a path. @@ -23371,15 +22332,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_DPKG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DPKG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -23392,11 +22349,11 @@ fi DPKG=$ac_cv_path_DPKG if test -n "$DPKG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DPKG" >&5 -printf "%s\n" "$DPKG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DPKG" >&5 +$as_echo "$DPKG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -23408,30 +22365,30 @@ echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then if test "$with_epm" = "no" -a "$_os" != "Darwin"; then if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether epm is patched for LibreOffice's needs" >&5 -printf %s "checking whether epm is patched for LibreOffice's needs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether epm is patched for LibreOffice's needs" >&5 +$as_echo_n "checking whether epm is patched for LibreOffice's needs... " >&6; } if grep "Patched for .*Office" $EPM >/dev/null 2>/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if echo "$PKGFORMAT" | $GREP -q rpm; then _pt="rpm" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: the rpms will need to be installed with --nodeps" >&5 -printf "%s\n" "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the rpms will need to be installed with --nodeps" >&5 +$as_echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;} add_warning "the rpms will need to be installed with --nodeps" else _pt="pkg" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: the ${_pt}s will not be relocatable" >&5 -printf "%s\n" "$as_me: WARNING: the ${_pt}s will not be relocatable" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the ${_pt}s will not be relocatable" >&5 +$as_echo "$as_me: WARNING: the ${_pt}s will not be relocatable" >&2;} add_warning "the ${_pt}s will not be relocatable" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: if you want to make sure installation without --nodeps and + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: if you want to make sure installation without --nodeps and relocation will work, you need to patch your epm with the patch in epm/epm-3.7.patch or build with --with-epm=internal which will build a suitable epm" >&5 -printf "%s\n" "$as_me: WARNING: if you want to make sure installation without --nodeps and +$as_echo "$as_me: WARNING: if you want to make sure installation without --nodeps and relocation will work, you need to patch your epm with the patch in epm/epm-3.7.patch or build with --with-epm=internal which will build a suitable epm" >&2;} @@ -23442,12 +22399,11 @@ if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then # Extract the first word of "pkgmk", so it can be a program name with args. set dummy pkgmk; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PKGMK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKGMK+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PKGMK in [\\/]* | ?:[\\/]*) ac_cv_path_PKGMK="$PKGMK" # Let the user override the test with a path. @@ -23457,15 +22413,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PKGMK="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKGMK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -23478,11 +22430,11 @@ fi PKGMK=$ac_cv_path_PKGMK if test -n "$PKGMK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGMK" >&5 -printf "%s\n" "$PKGMK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGMK" >&5 +$as_echo "$PKGMK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -23501,8 +22453,8 @@ ;; esac done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } EPM=NO fi @@ -23513,39 +22465,38 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build the ODK" >&5 -printf %s "checking whether to build the ODK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the ODK" >&5 +$as_echo_n "checking whether to build the ODK... " >&6; } if test "$enable_odk" = yes; then if test "$DISABLE_DYNLOADING" = TRUE; then as_fn_error $? "can't build ODK for --disable-dynamic-loading builds" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } BUILD_TYPE="$BUILD_TYPE ODK" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$enable_odk" != yes; then unset DOXYGEN else if test "$with_doxygen" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for doxygen" >&5 -printf %s "checking for doxygen... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for doxygen" >&5 +$as_echo_n "checking for doxygen... " >&6; } unset DOXYGEN - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else if test "$with_doxygen" = yes; then # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_DOXYGEN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DOXYGEN+:} false; then : + $as_echo_n "(cached) " >&6 +else case $DOXYGEN in [\\/]* | ?:[\\/]*) ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. @@ -23555,15 +22506,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_DOXYGEN="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -23575,11 +22522,11 @@ fi DOXYGEN=$ac_cv_path_DOXYGEN if test -n "$DOXYGEN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 -printf "%s\n" "$DOXYGEN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 +$as_echo "$DOXYGEN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -23592,11 +22539,11 @@ fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for doxygen" >&5 -printf %s "checking for doxygen... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for doxygen" >&5 +$as_echo_n "checking for doxygen... " >&6; } DOXYGEN=$with_doxygen - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 -printf "%s\n" "$DOXYGEN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 +$as_echo "$DOXYGEN" >&6; } fi if test -n "$DOXYGEN"; then DOXYGEN_VERSION=`$DOXYGEN --version 2>/dev/null` @@ -23609,21 +22556,21 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable fuzzers" >&5 -printf %s "checking whether to enable fuzzers... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable fuzzers" >&5 +$as_echo_n "checking whether to enable fuzzers... " >&6; } if test "$enable_fuzzers" != yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else if test -z $LIB_FUZZING_ENGINE; then as_fn_error $? "'LIB_FUZZING_ENGINE' must be set when using --enable-fuzzers. Examples include '-fsanitize=fuzzer'." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_FUZZERS="TRUE" - printf "%s\n" "#define ENABLE_FUZZERS 1" >>confdefs.h + $as_echo "#define ENABLE_FUZZERS 1" >>confdefs.h - printf "%s\n" "#define VCL_FLOAT_DEVICE_PIXEL 1" >>confdefs.h + $as_echo "#define VCL_FLOAT_DEVICE_PIXEL 1" >>confdefs.h BUILD_TYPE="$BUILD_TYPE FUZZERS" fi @@ -23644,26 +22591,25 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which zlib to use" >&5 -printf %s "checking which zlib to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which zlib to use" >&5 +$as_echo_n "checking which zlib to use... " >&6; } if test "$with_system_zlib" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ZLIB=TRUE - ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = xyes; then : -else $as_nop +else as_fn_error $? "zlib.h not found. install zlib" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 -printf %s "checking for deflate in -lz... " >&6; } -if test ${ac_cv_lib_z_deflate+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 +$as_echo_n "checking for deflate in -lz... " >&6; } +if ${ac_cv_lib_z_deflate+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -23672,37 +22618,38 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char deflate (); int -main (void) +main () { return deflate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_z_deflate=yes -else $as_nop +else ac_cv_lib_z_deflate=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 -printf "%s\n" "$ac_cv_lib_z_deflate" >&6; } -if test "x$ac_cv_lib_z_deflate" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 +$as_echo "$ac_cv_lib_z_deflate" >&6; } +if test "x$ac_cv_lib_z_deflate" = xyes; then : ZLIB_LIBS=-lz -else $as_nop +else as_fn_error $? "zlib not found or functional" "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ZLIB= BUILD_TYPE="$BUILD_TYPE ZLIB" ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib" @@ -23716,26 +22663,25 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libjpeg to use" >&5 -printf %s "checking which libjpeg to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libjpeg to use" >&5 +$as_echo_n "checking which libjpeg to use... " >&6; } if test "$with_system_jpeg" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBJPEG=TRUE - ac_fn_c_check_header_compile "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" -if test "x$ac_cv_header_jpeglib_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" +if test "x$ac_cv_header_jpeglib_h" = xyes; then : LIBJPEG_CFLAGS= -else $as_nop +else as_fn_error $? "jpeg.h not found. install libjpeg" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jpeg_resync_to_restart in -ljpeg" >&5 -printf %s "checking for jpeg_resync_to_restart in -ljpeg... " >&6; } -if test ${ac_cv_lib_jpeg_jpeg_resync_to_restart+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_resync_to_restart in -ljpeg" >&5 +$as_echo_n "checking for jpeg_resync_to_restart in -ljpeg... " >&6; } +if ${ac_cv_lib_jpeg_jpeg_resync_to_restart+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -23744,38 +22690,39 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char jpeg_resync_to_restart (); int -main (void) +main () { return jpeg_resync_to_restart (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_jpeg_jpeg_resync_to_restart=yes -else $as_nop +else ac_cv_lib_jpeg_jpeg_resync_to_restart=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5 -printf "%s\n" "$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_resync_to_restart" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5 +$as_echo "$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; } +if test "x$ac_cv_lib_jpeg_jpeg_resync_to_restart" = xyes; then : LIBJPEG_LIBS="-ljpeg" -else $as_nop +else as_fn_error $? "jpeg library not found or functional" "$LINENO" 5 fi else SYSTEM_LIBJPEG= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal, libjpeg-turbo" >&5 -printf "%s\n" "internal, libjpeg-turbo" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal, libjpeg-turbo" >&5 +$as_echo "internal, libjpeg-turbo" >&6; } BUILD_TYPE="$BUILD_TYPE LIBJPEG_TURBO" case "$host_cpu" in @@ -23784,12 +22731,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_NASM+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NASM+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$NASM"; then ac_cv_prog_NASM="$NASM" # Let the user override the test. else @@ -23797,15 +22743,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NASM="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -23816,11 +22758,11 @@ fi NASM=$ac_cv_prog_NASM if test -n "$NASM"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NASM" >&5 -printf "%s\n" "$NASM" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NASM" >&5 +$as_echo "$NASM" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -23836,8 +22778,8 @@ fi if test -n "$NASM"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for object file format of host system" >&5 -printf %s "checking for object file format of host system... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for object file format of host system" >&5 +$as_echo_n "checking for object file format of host system... " >&6; } case "$host_os" in cygwin* | mingw* | pw32* | wsl*) case "$host_cpu" in @@ -23910,16 +22852,16 @@ ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $objfmt" >&5 -printf "%s\n" "$objfmt" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $objfmt" >&5 +$as_echo "$objfmt" >&6; } if test "$objfmt" = 'ELF ?'; then objfmt='ELF' - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unexpected host system. assumed that the format is $objfmt." >&5 -printf "%s\n" "$as_me: WARNING: unexpected host system. assumed that the format is $objfmt." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unexpected host system. assumed that the format is $objfmt." >&5 +$as_echo "$as_me: WARNING: unexpected host system. assumed that the format is $objfmt." >&2;} fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for object file format specifier (NAFLAGS) " >&5 -printf %s "checking for object file format specifier (NAFLAGS) ... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for object file format specifier (NAFLAGS) " >&5 +$as_echo_n "checking for object file format specifier (NAFLAGS) ... " >&6; } case "$objfmt" in MSOMF) NAFLAGS='-fobj -DOBJ32 -DPIC';; Win32-COFF) NAFLAGS='-fwin32 -DWIN32 -DPIC';; @@ -23933,13 +22875,13 @@ Mach-O) NAFLAGS='-fmacho -DMACHO -DPIC';; Mach-O64) NAFLAGS='-fmacho64 -DMACHO -D__x86_64__ -DPIC';; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NAFLAGS" >&5 -printf "%s\n" "$NAFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NAFLAGS" >&5 +$as_echo "$NAFLAGS" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the assembler ($NASM $NAFLAGS) works" >&5 -printf %s "checking whether the assembler ($NASM $NAFLAGS) works... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the assembler ($NASM $NAFLAGS) works" >&5 +$as_echo_n "checking whether the assembler ($NASM $NAFLAGS) works... " >&6; } cat > conftest.asm << EOF - %line 23942 "configure" + %line 22884 "configure" section .text global _main,main _main: @@ -23951,18 +22893,18 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$try_nasm\""; } >&5 (eval $try_nasm) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest.o; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else echo "configure: failed program was:" >&5 cat conftest.asm >&5 rm -rf conftest* - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: installation or configuration problem: assembler cannot create object files." >&5 -printf "%s\n" "$as_me: WARNING: installation or configuration problem: assembler cannot create object files." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: installation or configuration problem: assembler cannot create object files." >&5 +$as_echo "$as_me: WARNING: installation or configuration problem: assembler cannot create object files." >&2;} NASM="" fi @@ -23998,8 +22940,8 @@ _EOS fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no suitable nasm (Netwide Assembler) found" >&5 -printf "%s\n" "$as_me: WARNING: no suitable nasm (Netwide Assembler) found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no suitable nasm (Netwide Assembler) found" >&5 +$as_echo "$as_me: WARNING: no suitable nasm (Netwide Assembler) found" >&2;} add_warning "no suitable nasm (Netwide Assembler) found for internal libjpeg-turbo" fi ;; @@ -24032,10 +22974,9 @@ # Check whether --with-system-clucene was given. -if test ${with_system_clucene+y} -then : +if test "${with_system_clucene+set}" = set; then : withval=$with_system_clucene; -else $as_nop +else if test "${with_system_clucene+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_clucene="$with_system_libs"; @@ -24047,27 +22988,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which clucene to use" >&5 -printf %s "checking which clucene to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which clucene to use" >&5 +$as_echo_n "checking which clucene to use... " >&6; } if test "$test_clucene" != no -a "$found_clucene" != yes -a "$enable_clucene" != no; then ENABLE_CLUCENE=TRUE if test "$with_system_clucene" = yes -a "$test_system_clucene" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_CLUCENE=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CLUCENE" >&5 -printf %s "checking for CLUCENE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libclucene-core" >&5 +$as_echo_n "checking for libclucene-core... " >&6; } if test -n "$CLUCENE_CFLAGS"; then pkg_cv_CLUCENE_CFLAGS="$CLUCENE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libclucene-core\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libclucene-core\""; } >&5 ($PKG_CONFIG --exists --print-errors "libclucene-core") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CLUCENE_CFLAGS=`$PKG_CONFIG --cflags "libclucene-core" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24081,10 +23022,10 @@ pkg_cv_CLUCENE_LIBS="$CLUCENE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libclucene-core\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libclucene-core\""; } >&5 ($PKG_CONFIG --exists --print-errors "libclucene-core") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CLUCENE_LIBS=`$PKG_CONFIG --libs "libclucene-core" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24098,8 +23039,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24125,10 +23066,10 @@ and CLUCENE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -24142,16 +23083,16 @@ else CLUCENE_CFLAGS=$pkg_cv_CLUCENE_CFLAGS CLUCENE_LIBS=$pkg_cv_CLUCENE_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi CLUCENE_CFLAGS=$(printf '%s' "${CLUCENE_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${CLUCENE_LIBS}" CLUCENE_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_CLUCENE= CLUCENE_CFLAGS="${CLUCENE_CFLAGS_internal}" CLUCENE_LIBS="${CLUCENE_LIBS_internal}" @@ -24159,8 +23100,8 @@ fi else if test "$found_clucene" = yes -a "$enable_clucene" != no -a "$with_system_clucene" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_CLUCENE=TRUE SYSTEM_CLUCENE=TRUE else @@ -24169,11 +23110,11 @@ CLUCENE_CFLAGS= CLUCENE_LIBS= if test "$test_clucene" != no -a "$enable_clucene" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -24195,13 +23136,13 @@ CPPFLAGS="$CPPFLAGS $CLUCENE_CFLAGS" ac_fn_cxx_check_header_compile "$LINENO" "CLucene/analysis/cjk/CJKAnalyzer.h" "ac_cv_header_CLucene_analysis_cjk_CJKAnalyzer_h" "#include " -if test "x$ac_cv_header_CLucene_analysis_cjk_CJKAnalyzer_h" = xyes -then : +if test "x$ac_cv_header_CLucene_analysis_cjk_CJKAnalyzer_h" = xyes; then : -else $as_nop +else as_fn_error $? "Your version of libclucene has contribs-lib missing." "$LINENO" 5 fi + CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS ac_ext=c @@ -24233,10 +23174,9 @@ # Check whether --with-system-expat was given. -if test ${with_system_expat+y} -then : +if test "${with_system_expat+set}" = set; then : withval=$with_system_expat; -else $as_nop +else if test "${with_system_expat+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_expat="$with_system_libs"; @@ -24248,27 +23188,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which expat to use" >&5 -printf %s "checking which expat to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which expat to use" >&5 +$as_echo_n "checking which expat to use... " >&6; } if test "$test_expat" != no -a "$found_expat" != yes -a "$enable_expat" != no; then ENABLE_EXPAT=TRUE if test "$with_system_expat" = yes -a "$test_system_expat" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_EXPAT=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EXPAT" >&5 -printf %s "checking for EXPAT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for expat" >&5 +$as_echo_n "checking for expat... " >&6; } if test -n "$EXPAT_CFLAGS"; then pkg_cv_EXPAT_CFLAGS="$EXPAT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5 ($PKG_CONFIG --exists --print-errors "expat") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EXPAT_CFLAGS=`$PKG_CONFIG --cflags "expat" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24282,10 +23222,10 @@ pkg_cv_EXPAT_LIBS="$EXPAT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5 ($PKG_CONFIG --exists --print-errors "expat") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EXPAT_LIBS=`$PKG_CONFIG --libs "expat" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24299,8 +23239,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24326,10 +23266,10 @@ and EXPAT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -24343,16 +23283,16 @@ else EXPAT_CFLAGS=$pkg_cv_EXPAT_CFLAGS EXPAT_LIBS=$pkg_cv_EXPAT_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi EXPAT_CFLAGS=$(printf '%s' "${EXPAT_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${EXPAT_LIBS}" EXPAT_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_EXPAT= EXPAT_CFLAGS="${EXPAT_CFLAGS_internal}" EXPAT_LIBS="${EXPAT_LIBS_internal}" @@ -24360,8 +23300,8 @@ fi else if test "$found_expat" = yes -a "$enable_expat" != no -a "$with_system_expat" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_EXPAT=TRUE SYSTEM_EXPAT=TRUE else @@ -24370,11 +23310,11 @@ EXPAT_CFLAGS= EXPAT_LIBS= if test "$test_expat" != no -a "$enable_expat" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -24404,10 +23344,9 @@ # Check whether --with-system-xmlsec was given. -if test ${with_system_xmlsec+y} -then : +if test "${with_system_xmlsec+set}" = set; then : withval=$with_system_xmlsec; -else $as_nop +else if test "${with_system_xmlsec+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_xmlsec="$with_system_libs"; @@ -24419,27 +23358,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which xmlsec to use" >&5 -printf %s "checking which xmlsec to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which xmlsec to use" >&5 +$as_echo_n "checking which xmlsec to use... " >&6; } if test "$test_xmlsec" != no -a "$found_xmlsec" != yes -a "$enable_xmlsec" != no; then ENABLE_XMLSEC=TRUE if test "$with_system_xmlsec" = yes -a "$test_system_xmlsec" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_XMLSEC=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XMLSEC" >&5 -printf %s "checking for XMLSEC... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlsec1-nss >= 1.2.28" >&5 +$as_echo_n "checking for xmlsec1-nss >= 1.2.28... " >&6; } if test -n "$XMLSEC_CFLAGS"; then pkg_cv_XMLSEC_CFLAGS="$XMLSEC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmlsec1-nss >= 1.2.28\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmlsec1-nss >= 1.2.28\""; } >&5 ($PKG_CONFIG --exists --print-errors "xmlsec1-nss >= 1.2.28") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XMLSEC_CFLAGS=`$PKG_CONFIG --cflags "xmlsec1-nss >= 1.2.28" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24453,10 +23392,10 @@ pkg_cv_XMLSEC_LIBS="$XMLSEC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmlsec1-nss >= 1.2.28\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmlsec1-nss >= 1.2.28\""; } >&5 ($PKG_CONFIG --exists --print-errors "xmlsec1-nss >= 1.2.28") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XMLSEC_LIBS=`$PKG_CONFIG --libs "xmlsec1-nss >= 1.2.28" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24470,8 +23409,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24497,10 +23436,10 @@ and XMLSEC_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -24514,16 +23453,16 @@ else XMLSEC_CFLAGS=$pkg_cv_XMLSEC_CFLAGS XMLSEC_LIBS=$pkg_cv_XMLSEC_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi XMLSEC_CFLAGS=$(printf '%s' "${XMLSEC_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${XMLSEC_LIBS}" XMLSEC_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_XMLSEC= XMLSEC_CFLAGS="${XMLSEC_CFLAGS_internal}" XMLSEC_LIBS="${XMLSEC_LIBS_internal}" @@ -24531,8 +23470,8 @@ fi else if test "$found_xmlsec" = yes -a "$enable_xmlsec" != no -a "$with_system_xmlsec" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_XMLSEC=TRUE SYSTEM_XMLSEC=TRUE else @@ -24541,11 +23480,11 @@ XMLSEC_CFLAGS= XMLSEC_LIBS= if test "$test_xmlsec" != no -a "$enable_xmlsec" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -24569,10 +23508,9 @@ # Check whether --enable-eot was given. -if test ${enable_eot+y} -then : +if test "${enable_eot+set}" = set; then : enableval=$enable_eot; -else $as_nop +else enable_eot="no" fi @@ -24581,10 +23519,9 @@ # Check whether --with-system-eot was given. -if test ${with_system_eot+y} -then : +if test "${with_system_eot+set}" = set; then : withval=$with_system_eot; -else $as_nop +else if test "${with_system_eot+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_eot="$with_system_libs"; @@ -24596,27 +23533,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which eot to use" >&5 -printf %s "checking which eot to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which eot to use" >&5 +$as_echo_n "checking which eot to use... " >&6; } if test "$test_eot" != no -a "$found_eot" != yes -a "$enable_eot" != no; then ENABLE_LIBEOT=TRUE if test "$with_system_eot" = yes -a "$test_system_eot" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBEOT=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBEOT" >&5 -printf %s "checking for LIBEOT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libeot >= 0.01" >&5 +$as_echo_n "checking for libeot >= 0.01... " >&6; } if test -n "$LIBEOT_CFLAGS"; then pkg_cv_LIBEOT_CFLAGS="$LIBEOT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libeot >= 0.01\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libeot >= 0.01\""; } >&5 ($PKG_CONFIG --exists --print-errors "libeot >= 0.01") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBEOT_CFLAGS=`$PKG_CONFIG --cflags "libeot >= 0.01" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24630,10 +23567,10 @@ pkg_cv_LIBEOT_LIBS="$LIBEOT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libeot >= 0.01\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libeot >= 0.01\""; } >&5 ($PKG_CONFIG --exists --print-errors "libeot >= 0.01") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBEOT_LIBS=`$PKG_CONFIG --libs "libeot >= 0.01" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24647,8 +23584,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24674,10 +23611,10 @@ and LIBEOT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -24691,16 +23628,16 @@ else LIBEOT_CFLAGS=$pkg_cv_LIBEOT_CFLAGS LIBEOT_LIBS=$pkg_cv_LIBEOT_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBEOT_CFLAGS=$(printf '%s' "${LIBEOT_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LIBEOT_LIBS}" LIBEOT_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBEOT= LIBEOT_CFLAGS="${LIBEOT_CFLAGS_internal}" LIBEOT_LIBS="${LIBEOT_LIBS_internal}" @@ -24708,8 +23645,8 @@ fi else if test "$found_eot" = yes -a "$enable_eot" != no -a "$with_system_eot" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_LIBEOT=TRUE SYSTEM_LIBEOT=TRUE else @@ -24718,11 +23655,11 @@ LIBEOT_CFLAGS= LIBEOT_LIBS= if test "$test_eot" != no -a "$enable_eot" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -24733,10 +23670,9 @@ REVENGE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/librevenge/inc" -if test "$COM" = "MSC" -then : +if test "$COM" = "MSC"; then : librevenge_libdir="${WORKDIR}/LinkTarget/Library" -else $as_nop +else librevenge_libdir="${WORKDIR}/UnpackedTarball/librevenge/src/lib/.libs" fi @@ -24761,10 +23697,9 @@ # Check whether --with-system-librevenge was given. -if test ${with_system_librevenge+y} -then : +if test "${with_system_librevenge+set}" = set; then : withval=$with_system_librevenge; -else $as_nop +else if test "${with_system_librevenge+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_librevenge="$with_system_libs"; @@ -24776,27 +23711,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which librevenge to use" >&5 -printf %s "checking which librevenge to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which librevenge to use" >&5 +$as_echo_n "checking which librevenge to use... " >&6; } if test "$test_librevenge" != no -a "$found_librevenge" != yes -a "$enable_librevenge" != no; then ENABLE_REVENGE=TRUE if test "$with_system_librevenge" = yes -a "$test_system_librevenge" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_REVENGE=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for REVENGE" >&5 -printf %s "checking for REVENGE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for librevenge-0.0 >= 0.0.1" >&5 +$as_echo_n "checking for librevenge-0.0 >= 0.0.1... " >&6; } if test -n "$REVENGE_CFLAGS"; then pkg_cv_REVENGE_CFLAGS="$REVENGE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librevenge-0.0 >= 0.0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librevenge-0.0 >= 0.0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "librevenge-0.0 >= 0.0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_REVENGE_CFLAGS=`$PKG_CONFIG --cflags "librevenge-0.0 >= 0.0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24810,10 +23745,10 @@ pkg_cv_REVENGE_LIBS="$REVENGE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librevenge-0.0 >= 0.0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librevenge-0.0 >= 0.0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "librevenge-0.0 >= 0.0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_REVENGE_LIBS=`$PKG_CONFIG --libs "librevenge-0.0 >= 0.0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24827,8 +23762,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24854,10 +23789,10 @@ and REVENGE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -24871,16 +23806,16 @@ else REVENGE_CFLAGS=$pkg_cv_REVENGE_CFLAGS REVENGE_LIBS=$pkg_cv_REVENGE_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi REVENGE_CFLAGS=$(printf '%s' "${REVENGE_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${REVENGE_LIBS}" REVENGE_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_REVENGE= REVENGE_CFLAGS="${REVENGE_CFLAGS_internal}" REVENGE_LIBS="${REVENGE_LIBS_internal}" @@ -24888,8 +23823,8 @@ fi else if test "$found_librevenge" = yes -a "$enable_librevenge" != no -a "$with_system_librevenge" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_REVENGE=TRUE SYSTEM_REVENGE=TRUE else @@ -24898,11 +23833,11 @@ REVENGE_CFLAGS= REVENGE_LIBS= if test "$test_librevenge" != no -a "$enable_librevenge" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -24932,10 +23867,9 @@ # Check whether --with-system-libodfgen was given. -if test ${with_system_libodfgen+y} -then : +if test "${with_system_libodfgen+set}" = set; then : withval=$with_system_libodfgen; -else $as_nop +else if test "${with_system_libodfgen+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libodfgen="$with_system_libs"; @@ -24947,27 +23881,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libodfgen to use" >&5 -printf %s "checking which libodfgen to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libodfgen to use" >&5 +$as_echo_n "checking which libodfgen to use... " >&6; } if test "$test_libodfgen" != no -a "$found_libodfgen" != yes -a "$enable_libodfgen" != no; then ENABLE_ODFGEN=TRUE if test "$with_system_libodfgen" = yes -a "$test_system_libodfgen" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ODFGEN=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ODFGEN" >&5 -printf %s "checking for ODFGEN... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libodfgen-0.1" >&5 +$as_echo_n "checking for libodfgen-0.1... " >&6; } if test -n "$ODFGEN_CFLAGS"; then pkg_cv_ODFGEN_CFLAGS="$ODFGEN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libodfgen-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libodfgen-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libodfgen-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ODFGEN_CFLAGS=`$PKG_CONFIG --cflags "libodfgen-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24981,10 +23915,10 @@ pkg_cv_ODFGEN_LIBS="$ODFGEN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libodfgen-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libodfgen-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libodfgen-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ODFGEN_LIBS=`$PKG_CONFIG --libs "libodfgen-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24998,8 +23932,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25025,10 +23959,10 @@ and ODFGEN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -25042,16 +23976,16 @@ else ODFGEN_CFLAGS=$pkg_cv_ODFGEN_CFLAGS ODFGEN_LIBS=$pkg_cv_ODFGEN_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi ODFGEN_CFLAGS=$(printf '%s' "${ODFGEN_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${ODFGEN_LIBS}" ODFGEN_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ODFGEN= ODFGEN_CFLAGS="${ODFGEN_CFLAGS_internal}" ODFGEN_LIBS="${ODFGEN_LIBS_internal}" @@ -25059,8 +23993,8 @@ fi else if test "$found_libodfgen" = yes -a "$enable_libodfgen" != no -a "$with_system_libodfgen" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_ODFGEN=TRUE SYSTEM_ODFGEN=TRUE else @@ -25069,11 +24003,11 @@ ODFGEN_CFLAGS= ODFGEN_LIBS= if test "$test_libodfgen" != no -a "$enable_libodfgen" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -25103,10 +24037,9 @@ # Check whether --with-system-libepubgen was given. -if test ${with_system_libepubgen+y} -then : +if test "${with_system_libepubgen+set}" = set; then : withval=$with_system_libepubgen; -else $as_nop +else if test "${with_system_libepubgen+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libepubgen="$with_system_libs"; @@ -25118,27 +24051,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libepubgen to use" >&5 -printf %s "checking which libepubgen to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libepubgen to use" >&5 +$as_echo_n "checking which libepubgen to use... " >&6; } if test "$test_libepubgen" != no -a "$found_libepubgen" != yes -a "$enable_libepubgen" != no; then ENABLE_EPUBGEN=TRUE if test "$with_system_libepubgen" = yes -a "$test_system_libepubgen" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_EPUBGEN=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EPUBGEN" >&5 -printf %s "checking for EPUBGEN... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libepubgen-0.1" >&5 +$as_echo_n "checking for libepubgen-0.1... " >&6; } if test -n "$EPUBGEN_CFLAGS"; then pkg_cv_EPUBGEN_CFLAGS="$EPUBGEN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepubgen-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepubgen-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libepubgen-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EPUBGEN_CFLAGS=`$PKG_CONFIG --cflags "libepubgen-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25152,10 +24085,10 @@ pkg_cv_EPUBGEN_LIBS="$EPUBGEN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepubgen-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepubgen-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libepubgen-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EPUBGEN_LIBS=`$PKG_CONFIG --libs "libepubgen-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25169,8 +24102,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25196,10 +24129,10 @@ and EPUBGEN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -25213,16 +24146,16 @@ else EPUBGEN_CFLAGS=$pkg_cv_EPUBGEN_CFLAGS EPUBGEN_LIBS=$pkg_cv_EPUBGEN_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi EPUBGEN_CFLAGS=$(printf '%s' "${EPUBGEN_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${EPUBGEN_LIBS}" EPUBGEN_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_EPUBGEN= EPUBGEN_CFLAGS="${EPUBGEN_CFLAGS_internal}" EPUBGEN_LIBS="${EPUBGEN_LIBS_internal}" @@ -25230,8 +24163,8 @@ fi else if test "$found_libepubgen" = yes -a "$enable_libepubgen" != no -a "$with_system_libepubgen" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_EPUBGEN=TRUE SYSTEM_EPUBGEN=TRUE else @@ -25240,11 +24173,11 @@ EPUBGEN_CFLAGS= EPUBGEN_LIBS= if test "$test_libepubgen" != no -a "$enable_libepubgen" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -25255,10 +24188,9 @@ WPD_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/libwpd/inc" -if test "$COM" = "MSC" -then : +if test "$COM" = "MSC"; then : libwpd_libdir="${WORKDIR}/LinkTarget/Library" -else $as_nop +else libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs" fi @@ -25283,10 +24215,9 @@ # Check whether --with-system-libwpd was given. -if test ${with_system_libwpd+y} -then : +if test "${with_system_libwpd+set}" = set; then : withval=$with_system_libwpd; -else $as_nop +else if test "${with_system_libwpd+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libwpd="$with_system_libs"; @@ -25298,27 +24229,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libwpd to use" >&5 -printf %s "checking which libwpd to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libwpd to use" >&5 +$as_echo_n "checking which libwpd to use... " >&6; } if test "$test_libwpd" != no -a "$found_libwpd" != yes -a "$enable_libwpd" != no; then ENABLE_WPD=TRUE if test "$with_system_libwpd" = yes -a "$test_system_libwpd" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_WPD=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WPD" >&5 -printf %s "checking for WPD... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwpd-0.10" >&5 +$as_echo_n "checking for libwpd-0.10... " >&6; } if test -n "$WPD_CFLAGS"; then pkg_cv_WPD_CFLAGS="$WPD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpd-0.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpd-0.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwpd-0.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25332,10 +24263,10 @@ pkg_cv_WPD_LIBS="$WPD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpd-0.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpd-0.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwpd-0.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25349,8 +24280,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25376,10 +24307,10 @@ and WPD_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -25393,16 +24324,16 @@ else WPD_CFLAGS=$pkg_cv_WPD_CFLAGS WPD_LIBS=$pkg_cv_WPD_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi WPD_CFLAGS=$(printf '%s' "${WPD_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${WPD_LIBS}" WPD_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_WPD= WPD_CFLAGS="${WPD_CFLAGS_internal}" WPD_LIBS="${WPD_LIBS_internal}" @@ -25410,8 +24341,8 @@ fi else if test "$found_libwpd" = yes -a "$enable_libwpd" != no -a "$with_system_libwpd" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_WPD=TRUE SYSTEM_WPD=TRUE else @@ -25420,11 +24351,11 @@ WPD_CFLAGS= WPD_LIBS= if test "$test_libwpd" != no -a "$enable_libwpd" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -25454,10 +24385,9 @@ # Check whether --with-system-libwpg was given. -if test ${with_system_libwpg+y} -then : +if test "${with_system_libwpg+set}" = set; then : withval=$with_system_libwpg; -else $as_nop +else if test "${with_system_libwpg+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libwpg="$with_system_libs"; @@ -25469,27 +24399,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libwpg to use" >&5 -printf %s "checking which libwpg to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libwpg to use" >&5 +$as_echo_n "checking which libwpg to use... " >&6; } if test "$test_libwpg" != no -a "$found_libwpg" != yes -a "$enable_libwpg" != no; then ENABLE_WPG=TRUE if test "$with_system_libwpg" = yes -a "$test_system_libwpg" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_WPG=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WPG" >&5 -printf %s "checking for WPG... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwpg-0.3" >&5 +$as_echo_n "checking for libwpg-0.3... " >&6; } if test -n "$WPG_CFLAGS"; then pkg_cv_WPG_CFLAGS="$WPG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwpg-0.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25503,10 +24433,10 @@ pkg_cv_WPG_LIBS="$WPG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwpg-0.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25520,8 +24450,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25547,10 +24477,10 @@ and WPG_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -25564,16 +24494,16 @@ else WPG_CFLAGS=$pkg_cv_WPG_CFLAGS WPG_LIBS=$pkg_cv_WPG_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi WPG_CFLAGS=$(printf '%s' "${WPG_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${WPG_LIBS}" WPG_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_WPG= WPG_CFLAGS="${WPG_CFLAGS_internal}" WPG_LIBS="${WPG_LIBS_internal}" @@ -25581,8 +24511,8 @@ fi else if test "$found_libwpg" = yes -a "$enable_libwpg" != no -a "$with_system_libwpg" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_WPG=TRUE SYSTEM_WPG=TRUE else @@ -25591,11 +24521,11 @@ WPG_CFLAGS= WPG_LIBS= if test "$test_libwpg" != no -a "$enable_libwpg" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -25625,10 +24555,9 @@ # Check whether --with-system-libwps was given. -if test ${with_system_libwps+y} -then : +if test "${with_system_libwps+set}" = set; then : withval=$with_system_libwps; -else $as_nop +else if test "${with_system_libwps+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libwps="$with_system_libs"; @@ -25640,27 +24569,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libwps to use" >&5 -printf %s "checking which libwps to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libwps to use" >&5 +$as_echo_n "checking which libwps to use... " >&6; } if test "$test_libwps" != no -a "$found_libwps" != yes -a "$enable_libwps" != no; then ENABLE_WPS=TRUE if test "$with_system_libwps" = yes -a "$test_system_libwps" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_WPS=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WPS" >&5 -printf %s "checking for WPS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwps-0.4" >&5 +$as_echo_n "checking for libwps-0.4... " >&6; } if test -n "$WPS_CFLAGS"; then pkg_cv_WPS_CFLAGS="$WPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwps-0.4\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwps-0.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwps-0.4") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WPS_CFLAGS=`$PKG_CONFIG --cflags "libwps-0.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25674,10 +24603,10 @@ pkg_cv_WPS_LIBS="$WPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwps-0.4\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwps-0.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwps-0.4") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WPS_LIBS=`$PKG_CONFIG --libs "libwps-0.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25691,8 +24620,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25718,10 +24647,10 @@ and WPS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -25735,16 +24664,16 @@ else WPS_CFLAGS=$pkg_cv_WPS_CFLAGS WPS_LIBS=$pkg_cv_WPS_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi WPS_CFLAGS=$(printf '%s' "${WPS_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${WPS_LIBS}" WPS_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_WPS= WPS_CFLAGS="${WPS_CFLAGS_internal}" WPS_LIBS="${WPS_LIBS_internal}" @@ -25752,8 +24681,8 @@ fi else if test "$found_libwps" = yes -a "$enable_libwps" != no -a "$with_system_libwps" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_WPS=TRUE SYSTEM_WPS=TRUE else @@ -25762,11 +24691,11 @@ WPS_CFLAGS= WPS_LIBS= if test "$test_libwps" != no -a "$enable_libwps" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -25776,55 +24705,58 @@ - if test -n "$SYSTEM_WPS" -then : + if test -n "$SYSTEM_WPS"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WPS version" >&5 -printf %s "checking for WPS version... " >&6; } - if test -n "$PKG_CONFIG" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WPS version" >&5 +$as_echo_n "checking for WPS version... " >&6; } + if test -n "$PKG_CONFIG"; then : ver=`$PKG_CONFIG --modversion "libwps-0.4"` - if test -n "$ver" -then : + if test -n "$ver"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 -printf "%s\n" "$ver" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 +$as_echo "$ver" >&6; } save_IFS="$IFS" IFS=. echo "$ver" | while read major minor micro; do - printf "%s\n" "#define WPS_VERSION_MAJOR $major" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define WPS_VERSION_MAJOR $major +_ACEOF - printf "%s\n" "#define WPS_VERSION_MINOR $minor" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define WPS_VERSION_MINOR $minor +_ACEOF - printf "%s\n" "#define WPS_VERSION_MICRO $micro" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define WPS_VERSION_MICRO $micro +_ACEOF done IFS="$save_IFS" -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else - printf "%s\n" "#define WPS_VERSION_MAJOR 0" >>confdefs.h + $as_echo "#define WPS_VERSION_MAJOR 0" >>confdefs.h - printf "%s\n" "#define WPS_VERSION_MINOR 4" >>confdefs.h + $as_echo "#define WPS_VERSION_MINOR 4" >>confdefs.h - printf "%s\n" "#define WPS_VERSION_MICRO 12" >>confdefs.h + $as_echo "#define WPS_VERSION_MICRO 12" >>confdefs.h @@ -25851,10 +24783,9 @@ # Check whether --with-system-libvisio was given. -if test ${with_system_libvisio+y} -then : +if test "${with_system_libvisio+set}" = set; then : withval=$with_system_libvisio; -else $as_nop +else if test "${with_system_libvisio+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libvisio="$with_system_libs"; @@ -25866,27 +24797,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libvisio to use" >&5 -printf %s "checking which libvisio to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libvisio to use" >&5 +$as_echo_n "checking which libvisio to use... " >&6; } if test "$test_libvisio" != no -a "$found_libvisio" != yes -a "$enable_libvisio" != no; then ENABLE_VISIO=TRUE if test "$with_system_libvisio" = yes -a "$test_system_libvisio" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_VISIO=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for VISIO" >&5 -printf %s "checking for VISIO... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libvisio-0.1" >&5 +$as_echo_n "checking for libvisio-0.1... " >&6; } if test -n "$VISIO_CFLAGS"; then pkg_cv_VISIO_CFLAGS="$VISIO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvisio-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvisio-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvisio-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VISIO_CFLAGS=`$PKG_CONFIG --cflags "libvisio-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25900,10 +24831,10 @@ pkg_cv_VISIO_LIBS="$VISIO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvisio-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvisio-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvisio-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VISIO_LIBS=`$PKG_CONFIG --libs "libvisio-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25917,8 +24848,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25944,10 +24875,10 @@ and VISIO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -25961,16 +24892,16 @@ else VISIO_CFLAGS=$pkg_cv_VISIO_CFLAGS VISIO_LIBS=$pkg_cv_VISIO_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi VISIO_CFLAGS=$(printf '%s' "${VISIO_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${VISIO_LIBS}" VISIO_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_VISIO= VISIO_CFLAGS="${VISIO_CFLAGS_internal}" VISIO_LIBS="${VISIO_LIBS_internal}" @@ -25978,8 +24909,8 @@ fi else if test "$found_libvisio" = yes -a "$enable_libvisio" != no -a "$with_system_libvisio" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_VISIO=TRUE SYSTEM_VISIO=TRUE else @@ -25988,11 +24919,11 @@ VISIO_CFLAGS= VISIO_LIBS= if test "$test_libvisio" != no -a "$enable_libvisio" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -26022,10 +24953,9 @@ # Check whether --with-system-libcdr was given. -if test ${with_system_libcdr+y} -then : +if test "${with_system_libcdr+set}" = set; then : withval=$with_system_libcdr; -else $as_nop +else if test "${with_system_libcdr+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libcdr="$with_system_libs"; @@ -26037,27 +24967,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libcdr to use" >&5 -printf %s "checking which libcdr to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libcdr to use" >&5 +$as_echo_n "checking which libcdr to use... " >&6; } if test "$test_libcdr" != no -a "$found_libcdr" != yes -a "$enable_libcdr" != no; then ENABLE_CDR=TRUE if test "$with_system_libcdr" = yes -a "$test_system_libcdr" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_CDR=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CDR" >&5 -printf %s "checking for CDR... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcdr-0.1" >&5 +$as_echo_n "checking for libcdr-0.1... " >&6; } if test -n "$CDR_CFLAGS"; then pkg_cv_CDR_CFLAGS="$CDR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdr-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdr-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcdr-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CDR_CFLAGS=`$PKG_CONFIG --cflags "libcdr-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26071,10 +25001,10 @@ pkg_cv_CDR_LIBS="$CDR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdr-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdr-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcdr-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CDR_LIBS=`$PKG_CONFIG --libs "libcdr-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26088,8 +25018,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26115,10 +25045,10 @@ and CDR_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26132,16 +25062,16 @@ else CDR_CFLAGS=$pkg_cv_CDR_CFLAGS CDR_LIBS=$pkg_cv_CDR_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi CDR_CFLAGS=$(printf '%s' "${CDR_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${CDR_LIBS}" CDR_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_CDR= CDR_CFLAGS="${CDR_CFLAGS_internal}" CDR_LIBS="${CDR_LIBS_internal}" @@ -26149,8 +25079,8 @@ fi else if test "$found_libcdr" = yes -a "$enable_libcdr" != no -a "$with_system_libcdr" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_CDR=TRUE SYSTEM_CDR=TRUE else @@ -26159,11 +25089,11 @@ CDR_CFLAGS= CDR_LIBS= if test "$test_libcdr" != no -a "$enable_libcdr" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -26193,10 +25123,9 @@ # Check whether --with-system-libmspub was given. -if test ${with_system_libmspub+y} -then : +if test "${with_system_libmspub+set}" = set; then : withval=$with_system_libmspub; -else $as_nop +else if test "${with_system_libmspub+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libmspub="$with_system_libs"; @@ -26208,27 +25137,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libmspub to use" >&5 -printf %s "checking which libmspub to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libmspub to use" >&5 +$as_echo_n "checking which libmspub to use... " >&6; } if test "$test_libmspub" != no -a "$found_libmspub" != yes -a "$enable_libmspub" != no; then ENABLE_MSPUB=TRUE if test "$with_system_libmspub" = yes -a "$test_system_libmspub" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_MSPUB=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MSPUB" >&5 -printf %s "checking for MSPUB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmspub-0.1" >&5 +$as_echo_n "checking for libmspub-0.1... " >&6; } if test -n "$MSPUB_CFLAGS"; then pkg_cv_MSPUB_CFLAGS="$MSPUB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmspub-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmspub-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmspub-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MSPUB_CFLAGS=`$PKG_CONFIG --cflags "libmspub-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26242,10 +25171,10 @@ pkg_cv_MSPUB_LIBS="$MSPUB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmspub-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmspub-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmspub-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MSPUB_LIBS=`$PKG_CONFIG --libs "libmspub-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26259,8 +25188,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26286,10 +25215,10 @@ and MSPUB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26303,16 +25232,16 @@ else MSPUB_CFLAGS=$pkg_cv_MSPUB_CFLAGS MSPUB_LIBS=$pkg_cv_MSPUB_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi MSPUB_CFLAGS=$(printf '%s' "${MSPUB_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${MSPUB_LIBS}" MSPUB_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_MSPUB= MSPUB_CFLAGS="${MSPUB_CFLAGS_internal}" MSPUB_LIBS="${MSPUB_LIBS_internal}" @@ -26320,8 +25249,8 @@ fi else if test "$found_libmspub" = yes -a "$enable_libmspub" != no -a "$with_system_libmspub" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_MSPUB=TRUE SYSTEM_MSPUB=TRUE else @@ -26330,11 +25259,11 @@ MSPUB_CFLAGS= MSPUB_LIBS= if test "$test_libmspub" != no -a "$enable_libmspub" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -26364,10 +25293,9 @@ # Check whether --with-system-libmwaw was given. -if test ${with_system_libmwaw+y} -then : +if test "${with_system_libmwaw+set}" = set; then : withval=$with_system_libmwaw; -else $as_nop +else if test "${with_system_libmwaw+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libmwaw="$with_system_libs"; @@ -26379,27 +25307,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libmwaw to use" >&5 -printf %s "checking which libmwaw to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libmwaw to use" >&5 +$as_echo_n "checking which libmwaw to use... " >&6; } if test "$test_libmwaw" != no -a "$found_libmwaw" != yes -a "$enable_libmwaw" != no; then ENABLE_MWAW=TRUE if test "$with_system_libmwaw" = yes -a "$test_system_libmwaw" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_MWAW=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MWAW" >&5 -printf %s "checking for MWAW... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmwaw-0.3 >= 0.3.21" >&5 +$as_echo_n "checking for libmwaw-0.3 >= 0.3.21... " >&6; } if test -n "$MWAW_CFLAGS"; then pkg_cv_MWAW_CFLAGS="$MWAW_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmwaw-0.3 >= 0.3.21\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmwaw-0.3 >= 0.3.21\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmwaw-0.3 >= 0.3.21") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MWAW_CFLAGS=`$PKG_CONFIG --cflags "libmwaw-0.3 >= 0.3.21" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26413,10 +25341,10 @@ pkg_cv_MWAW_LIBS="$MWAW_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmwaw-0.3 >= 0.3.21\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmwaw-0.3 >= 0.3.21\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmwaw-0.3 >= 0.3.21") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MWAW_LIBS=`$PKG_CONFIG --libs "libmwaw-0.3 >= 0.3.21" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26430,8 +25358,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26457,10 +25385,10 @@ and MWAW_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26474,16 +25402,16 @@ else MWAW_CFLAGS=$pkg_cv_MWAW_CFLAGS MWAW_LIBS=$pkg_cv_MWAW_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi MWAW_CFLAGS=$(printf '%s' "${MWAW_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${MWAW_LIBS}" MWAW_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_MWAW= MWAW_CFLAGS="${MWAW_CFLAGS_internal}" MWAW_LIBS="${MWAW_LIBS_internal}" @@ -26491,8 +25419,8 @@ fi else if test "$found_libmwaw" = yes -a "$enable_libmwaw" != no -a "$with_system_libmwaw" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_MWAW=TRUE SYSTEM_MWAW=TRUE else @@ -26501,11 +25429,11 @@ MWAW_CFLAGS= MWAW_LIBS= if test "$test_libmwaw" != no -a "$enable_libmwaw" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -26515,55 +25443,58 @@ - if test -n "$SYSTEM_MWAW" -then : + if test -n "$SYSTEM_MWAW"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MWAW version" >&5 -printf %s "checking for MWAW version... " >&6; } - if test -n "$PKG_CONFIG" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MWAW version" >&5 +$as_echo_n "checking for MWAW version... " >&6; } + if test -n "$PKG_CONFIG"; then : ver=`$PKG_CONFIG --modversion "libmwaw-0.3"` - if test -n "$ver" -then : + if test -n "$ver"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 -printf "%s\n" "$ver" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 +$as_echo "$ver" >&6; } save_IFS="$IFS" IFS=. echo "$ver" | while read major minor micro; do - printf "%s\n" "#define MWAW_VERSION_MAJOR $major" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define MWAW_VERSION_MAJOR $major +_ACEOF - printf "%s\n" "#define MWAW_VERSION_MINOR $minor" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define MWAW_VERSION_MINOR $minor +_ACEOF - printf "%s\n" "#define MWAW_VERSION_MICRO $micro" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define MWAW_VERSION_MICRO $micro +_ACEOF done IFS="$save_IFS" -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else - printf "%s\n" "#define MWAW_VERSION_MAJOR 0" >>confdefs.h + $as_echo "#define MWAW_VERSION_MAJOR 0" >>confdefs.h - printf "%s\n" "#define MWAW_VERSION_MINOR 3" >>confdefs.h + $as_echo "#define MWAW_VERSION_MINOR 3" >>confdefs.h - printf "%s\n" "#define MWAW_VERSION_MICRO 21" >>confdefs.h + $as_echo "#define MWAW_VERSION_MICRO 21" >>confdefs.h @@ -26590,10 +25521,9 @@ # Check whether --with-system-libetonyek was given. -if test ${with_system_libetonyek+y} -then : +if test "${with_system_libetonyek+set}" = set; then : withval=$with_system_libetonyek; -else $as_nop +else if test "${with_system_libetonyek+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libetonyek="$with_system_libs"; @@ -26605,27 +25535,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libetonyek to use" >&5 -printf %s "checking which libetonyek to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libetonyek to use" >&5 +$as_echo_n "checking which libetonyek to use... " >&6; } if test "$test_libetonyek" != no -a "$found_libetonyek" != yes -a "$enable_libetonyek" != no; then ENABLE_ETONYEK=TRUE if test "$with_system_libetonyek" = yes -a "$test_system_libetonyek" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ETONYEK=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ETONYEK" >&5 -printf %s "checking for ETONYEK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libetonyek-0.1" >&5 +$as_echo_n "checking for libetonyek-0.1... " >&6; } if test -n "$ETONYEK_CFLAGS"; then pkg_cv_ETONYEK_CFLAGS="$ETONYEK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libetonyek-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libetonyek-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libetonyek-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ETONYEK_CFLAGS=`$PKG_CONFIG --cflags "libetonyek-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26639,10 +25569,10 @@ pkg_cv_ETONYEK_LIBS="$ETONYEK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libetonyek-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libetonyek-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libetonyek-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ETONYEK_LIBS=`$PKG_CONFIG --libs "libetonyek-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26656,8 +25586,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26683,10 +25613,10 @@ and ETONYEK_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26700,16 +25630,16 @@ else ETONYEK_CFLAGS=$pkg_cv_ETONYEK_CFLAGS ETONYEK_LIBS=$pkg_cv_ETONYEK_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi ETONYEK_CFLAGS=$(printf '%s' "${ETONYEK_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${ETONYEK_LIBS}" ETONYEK_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ETONYEK= ETONYEK_CFLAGS="${ETONYEK_CFLAGS_internal}" ETONYEK_LIBS="${ETONYEK_LIBS_internal}" @@ -26717,8 +25647,8 @@ fi else if test "$found_libetonyek" = yes -a "$enable_libetonyek" != no -a "$with_system_libetonyek" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_ETONYEK=TRUE SYSTEM_ETONYEK=TRUE else @@ -26727,11 +25657,11 @@ ETONYEK_CFLAGS= ETONYEK_LIBS= if test "$test_libetonyek" != no -a "$enable_libetonyek" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -26741,55 +25671,58 @@ - if test -n "$SYSTEM_ETONYEK" -then : + if test -n "$SYSTEM_ETONYEK"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ETONYEK version" >&5 -printf %s "checking for ETONYEK version... " >&6; } - if test -n "$PKG_CONFIG" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ETONYEK version" >&5 +$as_echo_n "checking for ETONYEK version... " >&6; } + if test -n "$PKG_CONFIG"; then : ver=`$PKG_CONFIG --modversion "libetonyek-0.1"` - if test -n "$ver" -then : + if test -n "$ver"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 -printf "%s\n" "$ver" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 +$as_echo "$ver" >&6; } save_IFS="$IFS" IFS=. echo "$ver" | while read major minor micro; do - printf "%s\n" "#define ETONYEK_VERSION_MAJOR $major" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define ETONYEK_VERSION_MAJOR $major +_ACEOF - printf "%s\n" "#define ETONYEK_VERSION_MINOR $minor" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define ETONYEK_VERSION_MINOR $minor +_ACEOF - printf "%s\n" "#define ETONYEK_VERSION_MICRO $micro" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define ETONYEK_VERSION_MICRO $micro +_ACEOF done IFS="$save_IFS" -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else - printf "%s\n" "#define ETONYEK_VERSION_MAJOR 0" >>confdefs.h + $as_echo "#define ETONYEK_VERSION_MAJOR 0" >>confdefs.h - printf "%s\n" "#define ETONYEK_VERSION_MINOR 1" >>confdefs.h + $as_echo "#define ETONYEK_VERSION_MINOR 1" >>confdefs.h - printf "%s\n" "#define ETONYEK_VERSION_MICRO 10" >>confdefs.h + $as_echo "#define ETONYEK_VERSION_MICRO 10" >>confdefs.h @@ -26816,10 +25749,9 @@ # Check whether --with-system-libfreehand was given. -if test ${with_system_libfreehand+y} -then : +if test "${with_system_libfreehand+set}" = set; then : withval=$with_system_libfreehand; -else $as_nop +else if test "${with_system_libfreehand+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libfreehand="$with_system_libs"; @@ -26831,27 +25763,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libfreehand to use" >&5 -printf %s "checking which libfreehand to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libfreehand to use" >&5 +$as_echo_n "checking which libfreehand to use... " >&6; } if test "$test_libfreehand" != no -a "$found_libfreehand" != yes -a "$enable_libfreehand" != no; then ENABLE_FREEHAND=TRUE if test "$with_system_libfreehand" = yes -a "$test_system_libfreehand" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_FREEHAND=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FREEHAND" >&5 -printf %s "checking for FREEHAND... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfreehand-0.1" >&5 +$as_echo_n "checking for libfreehand-0.1... " >&6; } if test -n "$FREEHAND_CFLAGS"; then pkg_cv_FREEHAND_CFLAGS="$FREEHAND_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfreehand-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfreehand-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libfreehand-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREEHAND_CFLAGS=`$PKG_CONFIG --cflags "libfreehand-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26865,10 +25797,10 @@ pkg_cv_FREEHAND_LIBS="$FREEHAND_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfreehand-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfreehand-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libfreehand-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREEHAND_LIBS=`$PKG_CONFIG --libs "libfreehand-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26882,8 +25814,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26909,10 +25841,10 @@ and FREEHAND_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26926,16 +25858,16 @@ else FREEHAND_CFLAGS=$pkg_cv_FREEHAND_CFLAGS FREEHAND_LIBS=$pkg_cv_FREEHAND_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi FREEHAND_CFLAGS=$(printf '%s' "${FREEHAND_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${FREEHAND_LIBS}" FREEHAND_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_FREEHAND= FREEHAND_CFLAGS="${FREEHAND_CFLAGS_internal}" FREEHAND_LIBS="${FREEHAND_LIBS_internal}" @@ -26943,8 +25875,8 @@ fi else if test "$found_libfreehand" = yes -a "$enable_libfreehand" != no -a "$with_system_libfreehand" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_FREEHAND=TRUE SYSTEM_FREEHAND=TRUE else @@ -26953,11 +25885,11 @@ FREEHAND_CFLAGS= FREEHAND_LIBS= if test "$test_libfreehand" != no -a "$enable_libfreehand" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -26987,10 +25919,9 @@ # Check whether --with-system-libebook was given. -if test ${with_system_libebook+y} -then : +if test "${with_system_libebook+set}" = set; then : withval=$with_system_libebook; -else $as_nop +else if test "${with_system_libebook+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libebook="$with_system_libs"; @@ -27002,27 +25933,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libebook to use" >&5 -printf %s "checking which libebook to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libebook to use" >&5 +$as_echo_n "checking which libebook to use... " >&6; } if test "$test_libebook" != no -a "$found_libebook" != yes -a "$enable_libebook" != no; then ENABLE_EBOOK=TRUE if test "$with_system_libebook" = yes -a "$test_system_libebook" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_EBOOK=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EBOOK" >&5 -printf %s "checking for EBOOK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libe-book-0.1" >&5 +$as_echo_n "checking for libe-book-0.1... " >&6; } if test -n "$EBOOK_CFLAGS"; then pkg_cv_EBOOK_CFLAGS="$EBOOK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libe-book-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libe-book-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libe-book-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EBOOK_CFLAGS=`$PKG_CONFIG --cflags "libe-book-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27036,10 +25967,10 @@ pkg_cv_EBOOK_LIBS="$EBOOK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libe-book-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libe-book-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libe-book-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EBOOK_LIBS=`$PKG_CONFIG --libs "libe-book-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27053,8 +25984,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27080,10 +26011,10 @@ and EBOOK_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27097,16 +26028,16 @@ else EBOOK_CFLAGS=$pkg_cv_EBOOK_CFLAGS EBOOK_LIBS=$pkg_cv_EBOOK_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi EBOOK_CFLAGS=$(printf '%s' "${EBOOK_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${EBOOK_LIBS}" EBOOK_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_EBOOK= EBOOK_CFLAGS="${EBOOK_CFLAGS_internal}" EBOOK_LIBS="${EBOOK_LIBS_internal}" @@ -27114,8 +26045,8 @@ fi else if test "$found_libebook" = yes -a "$enable_libebook" != no -a "$with_system_libebook" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_EBOOK=TRUE SYSTEM_EBOOK=TRUE else @@ -27124,11 +26055,11 @@ EBOOK_CFLAGS= EBOOK_LIBS= if test "$test_libebook" != no -a "$enable_libebook" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -27138,55 +26069,58 @@ - if test -n "$SYSTEM_EBOOK" -then : + if test -n "$SYSTEM_EBOOK"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EBOOK version" >&5 -printf %s "checking for EBOOK version... " >&6; } - if test -n "$PKG_CONFIG" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EBOOK version" >&5 +$as_echo_n "checking for EBOOK version... " >&6; } + if test -n "$PKG_CONFIG"; then : ver=`$PKG_CONFIG --modversion "libe-book-0.1"` - if test -n "$ver" -then : + if test -n "$ver"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 -printf "%s\n" "$ver" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 +$as_echo "$ver" >&6; } save_IFS="$IFS" IFS=. echo "$ver" | while read major minor micro; do - printf "%s\n" "#define EBOOK_VERSION_MAJOR $major" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define EBOOK_VERSION_MAJOR $major +_ACEOF - printf "%s\n" "#define EBOOK_VERSION_MINOR $minor" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define EBOOK_VERSION_MINOR $minor +_ACEOF - printf "%s\n" "#define EBOOK_VERSION_MICRO $micro" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define EBOOK_VERSION_MICRO $micro +_ACEOF done IFS="$save_IFS" -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else - printf "%s\n" "#define EBOOK_VERSION_MAJOR 0" >>confdefs.h + $as_echo "#define EBOOK_VERSION_MAJOR 0" >>confdefs.h - printf "%s\n" "#define EBOOK_VERSION_MINOR 1" >>confdefs.h + $as_echo "#define EBOOK_VERSION_MINOR 1" >>confdefs.h - printf "%s\n" "#define EBOOK_VERSION_MICRO 2" >>confdefs.h + $as_echo "#define EBOOK_VERSION_MICRO 2" >>confdefs.h @@ -27213,10 +26147,9 @@ # Check whether --with-system-libabw was given. -if test ${with_system_libabw+y} -then : +if test "${with_system_libabw+set}" = set; then : withval=$with_system_libabw; -else $as_nop +else if test "${with_system_libabw+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libabw="$with_system_libs"; @@ -27228,27 +26161,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libabw to use" >&5 -printf %s "checking which libabw to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libabw to use" >&5 +$as_echo_n "checking which libabw to use... " >&6; } if test "$test_libabw" != no -a "$found_libabw" != yes -a "$enable_libabw" != no; then ENABLE_ABW=TRUE if test "$with_system_libabw" = yes -a "$test_system_libabw" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ABW=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ABW" >&5 -printf %s "checking for ABW... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libabw-0.1" >&5 +$as_echo_n "checking for libabw-0.1... " >&6; } if test -n "$ABW_CFLAGS"; then pkg_cv_ABW_CFLAGS="$ABW_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libabw-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libabw-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libabw-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ABW_CFLAGS=`$PKG_CONFIG --cflags "libabw-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27262,10 +26195,10 @@ pkg_cv_ABW_LIBS="$ABW_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libabw-0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libabw-0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libabw-0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ABW_LIBS=`$PKG_CONFIG --libs "libabw-0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27279,8 +26212,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27306,10 +26239,10 @@ and ABW_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27323,16 +26256,16 @@ else ABW_CFLAGS=$pkg_cv_ABW_CFLAGS ABW_LIBS=$pkg_cv_ABW_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi ABW_CFLAGS=$(printf '%s' "${ABW_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${ABW_LIBS}" ABW_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ABW= ABW_CFLAGS="${ABW_CFLAGS_internal}" ABW_LIBS="${ABW_LIBS_internal}" @@ -27340,8 +26273,8 @@ fi else if test "$found_libabw" = yes -a "$enable_libabw" != no -a "$with_system_libabw" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_ABW=TRUE SYSTEM_ABW=TRUE else @@ -27350,11 +26283,11 @@ ABW_CFLAGS= ABW_LIBS= if test "$test_libabw" != no -a "$enable_libabw" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -27384,10 +26317,9 @@ # Check whether --with-system-libpagemaker was given. -if test ${with_system_libpagemaker+y} -then : +if test "${with_system_libpagemaker+set}" = set; then : withval=$with_system_libpagemaker; -else $as_nop +else if test "${with_system_libpagemaker+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libpagemaker="$with_system_libs"; @@ -27399,27 +26331,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libpagemaker to use" >&5 -printf %s "checking which libpagemaker to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libpagemaker to use" >&5 +$as_echo_n "checking which libpagemaker to use... " >&6; } if test "$test_libpagemaker" != no -a "$found_libpagemaker" != yes -a "$enable_libpagemaker" != no; then ENABLE_PAGEMAKER=TRUE if test "$with_system_libpagemaker" = yes -a "$test_system_libpagemaker" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_PAGEMAKER=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PAGEMAKER" >&5 -printf %s "checking for PAGEMAKER... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpagemaker-0.0" >&5 +$as_echo_n "checking for libpagemaker-0.0... " >&6; } if test -n "$PAGEMAKER_CFLAGS"; then pkg_cv_PAGEMAKER_CFLAGS="$PAGEMAKER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpagemaker-0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpagemaker-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpagemaker-0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PAGEMAKER_CFLAGS=`$PKG_CONFIG --cflags "libpagemaker-0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27433,10 +26365,10 @@ pkg_cv_PAGEMAKER_LIBS="$PAGEMAKER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpagemaker-0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpagemaker-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpagemaker-0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PAGEMAKER_LIBS=`$PKG_CONFIG --libs "libpagemaker-0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27450,8 +26382,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27477,10 +26409,10 @@ and PAGEMAKER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27494,16 +26426,16 @@ else PAGEMAKER_CFLAGS=$pkg_cv_PAGEMAKER_CFLAGS PAGEMAKER_LIBS=$pkg_cv_PAGEMAKER_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi PAGEMAKER_CFLAGS=$(printf '%s' "${PAGEMAKER_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${PAGEMAKER_LIBS}" PAGEMAKER_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_PAGEMAKER= PAGEMAKER_CFLAGS="${PAGEMAKER_CFLAGS_internal}" PAGEMAKER_LIBS="${PAGEMAKER_LIBS_internal}" @@ -27511,8 +26443,8 @@ fi else if test "$found_libpagemaker" = yes -a "$enable_libpagemaker" != no -a "$with_system_libpagemaker" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_PAGEMAKER=TRUE SYSTEM_PAGEMAKER=TRUE else @@ -27521,11 +26453,11 @@ PAGEMAKER_CFLAGS= PAGEMAKER_LIBS= if test "$test_libpagemaker" != no -a "$enable_libpagemaker" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -27555,10 +26487,9 @@ # Check whether --with-system-libqxp was given. -if test ${with_system_libqxp+y} -then : +if test "${with_system_libqxp+set}" = set; then : withval=$with_system_libqxp; -else $as_nop +else if test "${with_system_libqxp+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libqxp="$with_system_libs"; @@ -27570,27 +26501,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libqxp to use" >&5 -printf %s "checking which libqxp to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libqxp to use" >&5 +$as_echo_n "checking which libqxp to use... " >&6; } if test "$test_libqxp" != no -a "$found_libqxp" != yes -a "$enable_libqxp" != no; then ENABLE_QXP=TRUE if test "$with_system_libqxp" = yes -a "$test_system_libqxp" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_QXP=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QXP" >&5 -printf %s "checking for QXP... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libqxp-0.0" >&5 +$as_echo_n "checking for libqxp-0.0... " >&6; } if test -n "$QXP_CFLAGS"; then pkg_cv_QXP_CFLAGS="$QXP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libqxp-0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libqxp-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libqxp-0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QXP_CFLAGS=`$PKG_CONFIG --cflags "libqxp-0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27604,10 +26535,10 @@ pkg_cv_QXP_LIBS="$QXP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libqxp-0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libqxp-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libqxp-0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QXP_LIBS=`$PKG_CONFIG --libs "libqxp-0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27621,8 +26552,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27648,10 +26579,10 @@ and QXP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27665,16 +26596,16 @@ else QXP_CFLAGS=$pkg_cv_QXP_CFLAGS QXP_LIBS=$pkg_cv_QXP_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi QXP_CFLAGS=$(printf '%s' "${QXP_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${QXP_LIBS}" QXP_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_QXP= QXP_CFLAGS="${QXP_CFLAGS_internal}" QXP_LIBS="${QXP_LIBS_internal}" @@ -27682,8 +26613,8 @@ fi else if test "$found_libqxp" = yes -a "$enable_libqxp" != no -a "$with_system_libqxp" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_QXP=TRUE SYSTEM_QXP=TRUE else @@ -27692,11 +26623,11 @@ QXP_CFLAGS= QXP_LIBS= if test "$test_libqxp" != no -a "$enable_libqxp" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -27726,10 +26657,9 @@ # Check whether --with-system-libzmf was given. -if test ${with_system_libzmf+y} -then : +if test "${with_system_libzmf+set}" = set; then : withval=$with_system_libzmf; -else $as_nop +else if test "${with_system_libzmf+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libzmf="$with_system_libs"; @@ -27741,27 +26671,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libzmf to use" >&5 -printf %s "checking which libzmf to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libzmf to use" >&5 +$as_echo_n "checking which libzmf to use... " >&6; } if test "$test_libzmf" != no -a "$found_libzmf" != yes -a "$enable_libzmf" != no; then ENABLE_ZMF=TRUE if test "$with_system_libzmf" = yes -a "$test_system_libzmf" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ZMF=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZMF" >&5 -printf %s "checking for ZMF... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzmf-0.0" >&5 +$as_echo_n "checking for libzmf-0.0... " >&6; } if test -n "$ZMF_CFLAGS"; then pkg_cv_ZMF_CFLAGS="$ZMF_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzmf-0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzmf-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libzmf-0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZMF_CFLAGS=`$PKG_CONFIG --cflags "libzmf-0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27775,10 +26705,10 @@ pkg_cv_ZMF_LIBS="$ZMF_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzmf-0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzmf-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libzmf-0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZMF_LIBS=`$PKG_CONFIG --libs "libzmf-0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27792,8 +26722,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27819,10 +26749,10 @@ and ZMF_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27836,16 +26766,16 @@ else ZMF_CFLAGS=$pkg_cv_ZMF_CFLAGS ZMF_LIBS=$pkg_cv_ZMF_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi ZMF_CFLAGS=$(printf '%s' "${ZMF_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${ZMF_LIBS}" ZMF_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ZMF= ZMF_CFLAGS="${ZMF_CFLAGS_internal}" ZMF_LIBS="${ZMF_LIBS_internal}" @@ -27853,8 +26783,8 @@ fi else if test "$found_libzmf" = yes -a "$enable_libzmf" != no -a "$with_system_libzmf" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_ZMF=TRUE SYSTEM_ZMF=TRUE else @@ -27863,11 +26793,11 @@ ZMF_CFLAGS= ZMF_LIBS= if test "$test_libzmf" != no -a "$enable_libzmf" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -27897,10 +26827,9 @@ # Check whether --with-system-libstaroffice was given. -if test ${with_system_libstaroffice+y} -then : +if test "${with_system_libstaroffice+set}" = set; then : withval=$with_system_libstaroffice; -else $as_nop +else if test "${with_system_libstaroffice+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libstaroffice="$with_system_libs"; @@ -27912,27 +26841,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libstaroffice to use" >&5 -printf %s "checking which libstaroffice to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libstaroffice to use" >&5 +$as_echo_n "checking which libstaroffice to use... " >&6; } if test "$test_libstaroffice" != no -a "$found_libstaroffice" != yes -a "$enable_libstaroffice" != no; then ENABLE_STAROFFICE=TRUE if test "$with_system_libstaroffice" = yes -a "$test_system_libstaroffice" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_STAROFFICE=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for STAROFFICE" >&5 -printf %s "checking for STAROFFICE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstaroffice-0.0" >&5 +$as_echo_n "checking for libstaroffice-0.0... " >&6; } if test -n "$STAROFFICE_CFLAGS"; then pkg_cv_STAROFFICE_CFLAGS="$STAROFFICE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstaroffice-0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstaroffice-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libstaroffice-0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_STAROFFICE_CFLAGS=`$PKG_CONFIG --cflags "libstaroffice-0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27946,10 +26875,10 @@ pkg_cv_STAROFFICE_LIBS="$STAROFFICE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstaroffice-0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstaroffice-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libstaroffice-0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_STAROFFICE_LIBS=`$PKG_CONFIG --libs "libstaroffice-0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27963,8 +26892,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27990,10 +26919,10 @@ and STAROFFICE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28007,16 +26936,16 @@ else STAROFFICE_CFLAGS=$pkg_cv_STAROFFICE_CFLAGS STAROFFICE_LIBS=$pkg_cv_STAROFFICE_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi STAROFFICE_CFLAGS=$(printf '%s' "${STAROFFICE_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${STAROFFICE_LIBS}" STAROFFICE_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_STAROFFICE= STAROFFICE_CFLAGS="${STAROFFICE_CFLAGS_internal}" STAROFFICE_LIBS="${STAROFFICE_LIBS_internal}" @@ -28024,8 +26953,8 @@ fi else if test "$found_libstaroffice" = yes -a "$enable_libstaroffice" != no -a "$with_system_libstaroffice" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_STAROFFICE=TRUE SYSTEM_STAROFFICE=TRUE else @@ -28034,11 +26963,11 @@ STAROFFICE_CFLAGS= STAROFFICE_LIBS= if test "$test_libstaroffice" != no -a "$enable_libstaroffice" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -28048,55 +26977,58 @@ - if test -n "$SYSTEM_STAROFFICE" -then : + if test -n "$SYSTEM_STAROFFICE"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for STAROFFICE version" >&5 -printf %s "checking for STAROFFICE version... " >&6; } - if test -n "$PKG_CONFIG" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STAROFFICE version" >&5 +$as_echo_n "checking for STAROFFICE version... " >&6; } + if test -n "$PKG_CONFIG"; then : ver=`$PKG_CONFIG --modversion "libstaroffice-0.0"` - if test -n "$ver" -then : + if test -n "$ver"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 -printf "%s\n" "$ver" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 +$as_echo "$ver" >&6; } save_IFS="$IFS" IFS=. echo "$ver" | while read major minor micro; do - printf "%s\n" "#define STAROFFICE_VERSION_MAJOR $major" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define STAROFFICE_VERSION_MAJOR $major +_ACEOF - printf "%s\n" "#define STAROFFICE_VERSION_MINOR $minor" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define STAROFFICE_VERSION_MINOR $minor +_ACEOF - printf "%s\n" "#define STAROFFICE_VERSION_MICRO $micro" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define STAROFFICE_VERSION_MICRO $micro +_ACEOF done IFS="$save_IFS" -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else as_fn_error $? "not found" "$LINENO" 5 fi -else $as_nop +else - printf "%s\n" "#define STAROFFICE_VERSION_MAJOR 0" >>confdefs.h + $as_echo "#define STAROFFICE_VERSION_MAJOR 0" >>confdefs.h - printf "%s\n" "#define STAROFFICE_VERSION_MINOR 0" >>confdefs.h + $as_echo "#define STAROFFICE_VERSION_MINOR 0" >>confdefs.h - printf "%s\n" "#define STAROFFICE_VERSION_MICRO 7" >>confdefs.h + $as_echo "#define STAROFFICE_VERSION_MICRO 7" >>confdefs.h @@ -28128,10 +27060,9 @@ # Check whether --with-system-lcms2 was given. -if test ${with_system_lcms2+y} -then : +if test "${with_system_lcms2+set}" = set; then : withval=$with_system_lcms2; -else $as_nop +else if test "${with_system_lcms2+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_lcms2="$with_system_libs"; @@ -28143,27 +27074,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which lcms2 to use" >&5 -printf %s "checking which lcms2 to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which lcms2 to use" >&5 +$as_echo_n "checking which lcms2 to use... " >&6; } if test "$test_lcms2" != no -a "$found_lcms2" != yes -a "$enable_lcms2" != no; then ENABLE_LCMS2=TRUE if test "$with_system_lcms2" = yes -a "$test_system_lcms2" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LCMS2=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LCMS2" >&5 -printf %s "checking for LCMS2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcms2" >&5 +$as_echo_n "checking for lcms2... " >&6; } if test -n "$LCMS2_CFLAGS"; then pkg_cv_LCMS2_CFLAGS="$LCMS2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5 ($PKG_CONFIG --exists --print-errors "lcms2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LCMS2_CFLAGS=`$PKG_CONFIG --cflags "lcms2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28177,10 +27108,10 @@ pkg_cv_LCMS2_LIBS="$LCMS2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5 ($PKG_CONFIG --exists --print-errors "lcms2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LCMS2_LIBS=`$PKG_CONFIG --libs "lcms2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28194,8 +27125,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28221,10 +27152,10 @@ and LCMS2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28238,16 +27169,16 @@ else LCMS2_CFLAGS=$pkg_cv_LCMS2_CFLAGS LCMS2_LIBS=$pkg_cv_LCMS2_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LCMS2_CFLAGS=$(printf '%s' "${LCMS2_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LCMS2_LIBS}" LCMS2_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LCMS2= LCMS2_CFLAGS="${LCMS2_CFLAGS_internal}" LCMS2_LIBS="${LCMS2_LIBS_internal}" @@ -28255,8 +27186,8 @@ fi else if test "$found_lcms2" = yes -a "$enable_lcms2" != no -a "$with_system_lcms2" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_LCMS2=TRUE SYSTEM_LCMS2=TRUE else @@ -28265,11 +27196,11 @@ LCMS2_CFLAGS= LCMS2_LIBS= if test "$test_lcms2" != no -a "$enable_lcms2" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -28306,10 +27237,9 @@ # Check whether --with-system-cppunit was given. -if test ${with_system_cppunit+y} -then : +if test "${with_system_cppunit+set}" = set; then : withval=$with_system_cppunit; -else $as_nop +else if test "${with_system_cppunit+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_cppunit="$with_system_libs"; @@ -28321,27 +27251,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which cppunit to use" >&5 -printf %s "checking which cppunit to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which cppunit to use" >&5 +$as_echo_n "checking which cppunit to use... " >&6; } if test "$test_cppunit" != no -a "$found_cppunit" != yes -a "$enable_cppunit" != no; then ENABLE_CPPUNIT=TRUE if test "$with_system_cppunit" = yes -a "$test_system_cppunit" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_CPPUNIT=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CPPUNIT" >&5 -printf %s "checking for CPPUNIT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cppunit >= 1.14.0" >&5 +$as_echo_n "checking for cppunit >= 1.14.0... " >&6; } if test -n "$CPPUNIT_CFLAGS"; then pkg_cv_CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.14.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.14.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "cppunit >= 1.14.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.14.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28355,10 +27285,10 @@ pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.14.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.14.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "cppunit >= 1.14.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.14.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28372,8 +27302,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28399,10 +27329,10 @@ and CPPUNIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28416,16 +27346,16 @@ else CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi CPPUNIT_CFLAGS=$(printf '%s' "${CPPUNIT_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${CPPUNIT_LIBS}" CPPUNIT_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_CPPUNIT= CPPUNIT_CFLAGS="${CPPUNIT_CFLAGS_internal}" CPPUNIT_LIBS="${CPPUNIT_LIBS_internal}" @@ -28433,8 +27363,8 @@ fi else if test "$found_cppunit" = yes -a "$enable_cppunit" != no -a "$with_system_cppunit" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_CPPUNIT=TRUE SYSTEM_CPPUNIT=TRUE else @@ -28443,11 +27373,11 @@ CPPUNIT_CFLAGS= CPPUNIT_LIBS= if test "$test_cppunit" != no -a "$enable_cppunit" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -28483,10 +27413,9 @@ # Check whether --with-system-freetype was given. -if test ${with_system_freetype+y} -then : +if test "${with_system_freetype+set}" = set; then : withval=$with_system_freetype; -else $as_nop +else if test "${with_system_freetype+set}" != set -a "${with_system_libs+set}" = set -a "TRUE" != TRUE; then with_system_freetype="$with_system_libs"; @@ -28498,27 +27427,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which freetype to use" >&5 -printf %s "checking which freetype to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which freetype to use" >&5 +$as_echo_n "checking which freetype to use... " >&6; } if test "$test_freetype" != no -a "$found_freetype" != yes -a "$enable_freetype" != no; then ENABLE_FREETYPE=TRUE if test "$with_system_freetype" = yes -a "$test_system_freetype" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_FREETYPE=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5 -printf %s "checking for FREETYPE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2 >= 9.9.3" >&5 +$as_echo_n "checking for freetype2 >= 9.9.3... " >&6; } if test -n "$FREETYPE_CFLAGS"; then pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 9.9.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 9.9.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "freetype2 >= 9.9.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 9.9.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28532,10 +27461,10 @@ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 9.9.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 9.9.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "freetype2 >= 9.9.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 9.9.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28549,8 +27478,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28576,10 +27505,10 @@ and FREETYPE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28593,16 +27522,16 @@ else FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi FREETYPE_CFLAGS=$(printf '%s' "${FREETYPE_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${FREETYPE_LIBS}" FREETYPE_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_FREETYPE= FREETYPE_CFLAGS="${FREETYPE_CFLAGS_internal}" FREETYPE_LIBS="${FREETYPE_LIBS_internal}" @@ -28610,8 +27539,8 @@ fi else if test "$found_freetype" = yes -a "$enable_freetype" != no -a "$with_system_freetype" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_FREETYPE=TRUE SYSTEM_FREETYPE=TRUE else @@ -28620,11 +27549,11 @@ FREETYPE_CFLAGS= FREETYPE_LIBS= if test "$test_freetype" != no -a "$enable_freetype" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -28657,11 +27586,11 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libxslt to use" >&5 -printf %s "checking which libxslt to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxslt to use" >&5 +$as_echo_n "checking which libxslt to use... " >&6; } if test "$with_system_libxml" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBXSLT=TRUE if test "$_os" = "Darwin"; then LIBXSLT_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2" @@ -28671,17 +27600,17 @@ else pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBXSLT" >&5 -printf %s "checking for LIBXSLT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt" >&5 +$as_echo_n "checking for libxslt... " >&6; } if test -n "$LIBXSLT_CFLAGS"; then pkg_cv_LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxslt") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28695,10 +27624,10 @@ pkg_cv_LIBXSLT_LIBS="$LIBXSLT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxslt") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28712,8 +27641,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28739,10 +27668,10 @@ and LIBXSLT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28756,8 +27685,8 @@ else LIBXSLT_CFLAGS=$pkg_cv_LIBXSLT_CFLAGS LIBXSLT_LIBS=$pkg_cv_LIBXSLT_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBXSLT_CFLAGS=$(printf '%s' "$LIBXSLT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") @@ -28765,17 +27694,17 @@ LIBXSLT_LIBS="${filteredlibs}" pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBEXSLT" >&5 -printf %s "checking for LIBEXSLT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexslt" >&5 +$as_echo_n "checking for libexslt... " >&6; } if test -n "$LIBEXSLT_CFLAGS"; then pkg_cv_LIBEXSLT_CFLAGS="$LIBEXSLT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5 ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBEXSLT_CFLAGS=`$PKG_CONFIG --cflags "libexslt" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28789,10 +27718,10 @@ pkg_cv_LIBEXSLT_LIBS="$LIBEXSLT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5 ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBEXSLT_LIBS=`$PKG_CONFIG --libs "libexslt" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28806,8 +27735,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28833,10 +27762,10 @@ and LIBEXSLT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28850,8 +27779,8 @@ else LIBEXSLT_CFLAGS=$pkg_cv_LIBEXSLT_CFLAGS LIBEXSLT_LIBS=$pkg_cv_LIBEXSLT_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBEXSLT_CFLAGS=$(printf '%s' "$LIBEXSLT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") @@ -28861,12 +27790,11 @@ # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_XSLTPROC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XSLTPROC+:} false; then : + $as_echo_n "(cached) " >&6 +else case $XSLTPROC in [\\/]* | ?:[\\/]*) ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. @@ -28876,15 +27804,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_XSLTPROC="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28897,11 +27821,11 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -printf "%s\n" "$XSLTPROC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +$as_echo "$XSLTPROC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -28909,8 +27833,8 @@ as_fn_error $? "xsltproc is required" "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBXSLT= BUILD_TYPE="$BUILD_TYPE LIBXSLT" fi @@ -28929,11 +27853,11 @@ # =================================================================== # Check for system libxml # =================================================================== -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libxml to use" >&5 -printf %s "checking which libxml to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxml to use" >&5 +$as_echo_n "checking which libxml to use... " >&6; } if test "$with_system_libxml" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBXML=TRUE if test "$_os" = "Darwin"; then LIBXML_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2" @@ -28945,17 +27869,17 @@ else pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBXML" >&5 -printf %s "checking for LIBXML... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.0" >&5 +$as_echo_n "checking for libxml-2.0 >= 2.0... " >&6; } if test -n "$LIBXML_CFLAGS"; then pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28969,10 +27893,10 @@ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28986,8 +27910,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -29013,10 +27937,10 @@ and LIBXML_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -29030,8 +27954,8 @@ else LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS LIBXML_LIBS=$pkg_cv_LIBXML_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBXML_CFLAGS=$(printf '%s' "$LIBXML_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") @@ -29041,12 +27965,11 @@ # Extract the first word of "xmllint", so it can be a program name with args. set dummy xmllint; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_XMLLINT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XMLLINT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $XMLLINT in [\\/]* | ?:[\\/]*) ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path. @@ -29056,15 +27979,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_XMLLINT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29077,11 +27996,11 @@ fi XMLLINT=$ac_cv_path_XMLLINT if test -n "$XMLLINT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5 -printf "%s\n" "$XMLLINT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5 +$as_echo "$XMLLINT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -29089,8 +28008,8 @@ as_fn_error $? "xmllint is required" "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBXML= LIBXML_CFLAGS="-I${WORKDIR}/UnpackedTarball/libxml2/include" if test "$COM" = "MSC"; then @@ -29138,8 +28057,8 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.3" >&5 -printf %s "checking whether $PYTHON version is >= 3.3... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.3" >&5 +$as_echo_n "checking whether $PYTHON version is >= 3.3... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -29153,25 +28072,23 @@ ($PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + (exit $ac_status); }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } as_fn_error $? "Python interpreter is too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.3" >&5 -printf %s "checking for a Python interpreter with version >= 3.3... " >&6; } -if test ${am_cv_pathless_PYTHON+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.3" >&5 +$as_echo_n "checking for a Python interpreter with version >= 3.3... " >&6; } +if ${am_cv_pathless_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break @@ -29188,26 +28105,24 @@ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -then : + (exit $ac_status); }; then : break fi done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 -printf "%s\n" "$am_cv_pathless_PYTHON" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 +$as_echo "$am_cv_pathless_PYTHON" >&6; } # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then PYTHON=: else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PYTHON+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PYTHON in [\\/]* | ?:[\\/]*) ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. @@ -29217,15 +28132,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29237,11 +28148,11 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -printf "%s\n" "$PYTHON" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -29255,16 +28166,15 @@ else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 -printf %s "checking for $am_display_PYTHON version... " >&6; } -if test ${am_cv_python_version+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[:2])"` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -printf "%s\n" "$am_cv_python_version" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version @@ -29275,16 +28185,15 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 -printf %s "checking for $am_display_PYTHON platform... " >&6; } -if test ${am_cv_python_platform+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +if ${am_cv_python_platform+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 -printf "%s\n" "$am_cv_python_platform" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform @@ -29309,12 +28218,11 @@ pass" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 -printf %s "checking for $am_display_PYTHON script directory... " >&6; } -if test ${am_cv_python_pythondir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +if ${am_cv_python_pythondir+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$prefix" = xNONE then am_py_prefix=$ac_default_prefix @@ -29345,8 +28253,8 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 -printf "%s\n" "$am_cv_python_pythondir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +$as_echo "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir @@ -29354,12 +28262,11 @@ pkgpythondir=\${pythondir}/$PACKAGE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 -printf %s "checking for $am_display_PYTHON extension module directory... " >&6; } -if test ${am_cv_python_pyexecdir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +if ${am_cv_python_pyexecdir+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$exec_prefix" = xNONE then am_py_exec_prefix=$am_py_prefix @@ -29390,8 +28297,8 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 -printf "%s\n" "$am_cv_python_pyexecdir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +$as_echo "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir @@ -29412,8 +28319,8 @@ fi # Checks for Python to use for Pyuno -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which Python to use for Pyuno" >&5 -printf %s "checking which Python to use for Pyuno... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which Python to use for Pyuno" >&5 +$as_echo_n "checking which Python to use for Pyuno... " >&6; } case "$enable_python" in no|disable) if test -z "$PYTHON_FOR_BUILD" -a "$cross_compiling" != yes; then @@ -29423,30 +28330,30 @@ as_fn_error $? "Python is required at build time." "$LINENO" 5 fi enable_python=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } ;; ""|yes|auto) if test "$DISABLE_SCRIPTING" = TRUE; then if test -z "$PYTHON_FOR_BUILD" -a "$cross_compiling" != yes; then as_fn_error $? "Python support can't be disabled without cross-compiling or a system python." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none, overridden by --disable-scripting" >&5 -printf "%s\n" "none, overridden by --disable-scripting" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none, overridden by --disable-scripting" >&5 +$as_echo "none, overridden by --disable-scripting" >&6; } enable_python=no elif test $build_os = cygwin; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: fully internal" >&5 -printf "%s\n" "fully internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: fully internal" >&5 +$as_echo "fully internal" >&6; } enable_python=internal elif test "$cross_compiling" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: system" >&5 -printf "%s\n" "system" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5 +$as_echo "system" >&6; } enable_python=system else # Unset variables set by the above AM_PATH_PYTHON so that # we actually do check anew. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf "%s\n" "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir @@ -29456,8 +28363,8 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.3" >&5 -printf %s "checking whether $PYTHON version is >= 3.3... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.3" >&5 +$as_echo_n "checking whether $PYTHON version is >= 3.3... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -29471,25 +28378,23 @@ ($PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + (exit $ac_status); }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } as_fn_error $? "Python interpreter is too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.3" >&5 -printf %s "checking for a Python interpreter with version >= 3.3... " >&6; } -if test ${am_cv_pathless_PYTHON+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.3" >&5 +$as_echo_n "checking for a Python interpreter with version >= 3.3... " >&6; } +if ${am_cv_pathless_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break @@ -29506,26 +28411,24 @@ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -then : + (exit $ac_status); }; then : break fi done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 -printf "%s\n" "$am_cv_pathless_PYTHON" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 +$as_echo "$am_cv_pathless_PYTHON" >&6; } # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then PYTHON=: else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PYTHON+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PYTHON in [\\/]* | ?:[\\/]*) ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. @@ -29535,15 +28438,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29555,11 +28454,11 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -printf "%s\n" "$PYTHON" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -29573,16 +28472,15 @@ else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 -printf %s "checking for $am_display_PYTHON version... " >&6; } -if test ${am_cv_python_version+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[:2])"` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -printf "%s\n" "$am_cv_python_version" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version @@ -29593,16 +28491,15 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 -printf %s "checking for $am_display_PYTHON platform... " >&6; } -if test ${am_cv_python_platform+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +if ${am_cv_python_platform+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 -printf "%s\n" "$am_cv_python_platform" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform @@ -29627,12 +28524,11 @@ pass" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 -printf %s "checking for $am_display_PYTHON script directory... " >&6; } -if test ${am_cv_python_pythondir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +if ${am_cv_python_pythondir+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$prefix" = xNONE then am_py_prefix=$ac_default_prefix @@ -29663,8 +28559,8 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 -printf "%s\n" "$am_cv_python_pythondir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +$as_echo "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir @@ -29672,12 +28568,11 @@ pkgpythondir=\${pythondir}/$PACKAGE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 -printf %s "checking for $am_display_PYTHON extension module directory... " >&6; } -if test ${am_cv_python_pyexecdir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +if ${am_cv_python_pyexecdir+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$exec_prefix" = xNONE then am_py_exec_prefix=$am_py_prefix @@ -29708,8 +28603,8 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 -printf "%s\n" "$am_cv_python_pyexecdir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +$as_echo "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir @@ -29721,36 +28616,36 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which Python to use for Pyuno" >&5 -printf %s "checking which Python to use for Pyuno... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Python to use for Pyuno" >&5 +$as_echo_n "checking which Python to use for Pyuno... " >&6; } if test "$PYTHON" = ":"; then if test -z "$PYTHON_FOR_BUILD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: fully internal" >&5 -printf "%s\n" "fully internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: fully internal" >&5 +$as_echo "fully internal" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } fi enable_python=internal else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: system" >&5 -printf "%s\n" "system" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5 +$as_echo "system" >&6; } enable_python=system fi fi ;; internal) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } ;; fully-internal) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: fully internal" >&5 -printf "%s\n" "fully internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: fully internal" >&5 +$as_echo "fully internal" >&6; } enable_python=internal ;; system) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: system" >&5 -printf "%s\n" "system" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5 +$as_echo "system" >&6; } if test "$_os" = Darwin -a -z "$PYTHON"; then as_fn_error $? "--enable-python=system doesn't work on macOS because the version provided is obsolete" "$LINENO" 5 fi @@ -29782,8 +28677,8 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.3" >&5 -printf %s "checking whether $PYTHON version is >= 3.3... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.3" >&5 +$as_echo_n "checking whether $PYTHON version is >= 3.3... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -29797,25 +28692,23 @@ ($PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + (exit $ac_status); }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } as_fn_error $? "Python interpreter is too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.3" >&5 -printf %s "checking for a Python interpreter with version >= 3.3... " >&6; } -if test ${am_cv_pathless_PYTHON+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.3" >&5 +$as_echo_n "checking for a Python interpreter with version >= 3.3... " >&6; } +if ${am_cv_pathless_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break @@ -29832,26 +28725,24 @@ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -then : + (exit $ac_status); }; then : break fi done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 -printf "%s\n" "$am_cv_pathless_PYTHON" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 +$as_echo "$am_cv_pathless_PYTHON" >&6; } # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then PYTHON=: else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PYTHON+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PYTHON in [\\/]* | ?:[\\/]*) ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. @@ -29861,15 +28752,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29881,11 +28768,11 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -printf "%s\n" "$PYTHON" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -29899,16 +28786,15 @@ else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 -printf %s "checking for $am_display_PYTHON version... " >&6; } -if test ${am_cv_python_version+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[:2])"` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -printf "%s\n" "$am_cv_python_version" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version @@ -29919,16 +28805,15 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 -printf %s "checking for $am_display_PYTHON platform... " >&6; } -if test ${am_cv_python_platform+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +if ${am_cv_python_platform+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 -printf "%s\n" "$am_cv_python_platform" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform @@ -29953,12 +28838,11 @@ pass" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 -printf %s "checking for $am_display_PYTHON script directory... " >&6; } -if test ${am_cv_python_pythondir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +if ${am_cv_python_pythondir+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$prefix" = xNONE then am_py_prefix=$ac_default_prefix @@ -29989,8 +28873,8 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 -printf "%s\n" "$am_cv_python_pythondir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +$as_echo "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir @@ -29998,12 +28882,11 @@ pkgpythondir=\${pythondir}/$PACKAGE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 -printf %s "checking for $am_display_PYTHON extension module directory... " >&6; } -if test ${am_cv_python_pyexecdir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +if ${am_cv_python_pyexecdir+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$exec_prefix" = xNONE then am_py_exec_prefix=$am_py_prefix @@ -30034,8 +28917,8 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 -printf "%s\n" "$am_cv_python_pyexecdir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +$as_echo "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir @@ -30067,15 +28950,14 @@ FilterLibs "${PYTHON_LIBS}" PYTHON_LIBS="${filteredlibs}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python version" >&5 -printf %s "checking for python version... " >&6; } - if test -n "$PYTHON_VERSION" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_VERSION" >&5 -printf "%s\n" "$PYTHON_VERSION" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf "%s\n" "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python version" >&5 +$as_echo_n "checking for python version... " >&6; } + if test -n "$PYTHON_VERSION"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_VERSION" >&5 +$as_echo "$PYTHON_VERSION" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } as_fn_error $? "no usable python found" "$LINENO" 5 fi test -n "$PYTHON_CFLAGS" && break @@ -30083,12 +28965,12 @@ save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" - ac_fn_c_check_header_compile "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default" -if test "x$ac_cv_header_Python_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default" +if test "x$ac_cv_header_Python_h" = xyes; then : fi + CPPFLAGS="$save_CPPFLAGS" # let the PYTHON_FOR_BUILD match the same python installation that @@ -30101,8 +28983,8 @@ if test -z "$PYTHON_FOR_BUILD"; then case $build_os in cygwin) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No system-provided python lxml, gla11y will only report widget classes and ids" >&5 -printf "%s\n" "$as_me: WARNING: No system-provided python lxml, gla11y will only report widget classes and ids" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No system-provided python lxml, gla11y will only report widget classes and ids" >&5 +$as_echo "$as_me: WARNING: No system-provided python lxml, gla11y will only report widget classes and ids" >&2;} ;; *) if test "$cross_compiling" != yes ; then @@ -30111,30 +28993,30 @@ ;; esac else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python lxml" >&5 -printf %s "checking for python lxml... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python lxml" >&5 +$as_echo_n "checking for python lxml... " >&6; } if $PYTHON_FOR_BUILD -c "import lxml.etree as ET" 2> /dev/null ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else case $build_os in cygwin) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, gla11y will only report widget classes and ids" >&5 -printf "%s\n" "no, gla11y will only report widget classes and ids" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, gla11y will only report widget classes and ids" >&5 +$as_echo "no, gla11y will only report widget classes and ids" >&6; } ;; *) if test "$cross_compiling" != yes -a "x$ac_cv_header_Python_h" = "xyes"; then if test -n ${SYSTEM_LIBXSLT} -o -n ${SYSTEM_LIBXML}; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, and no system libxml/libxslt, gla11y will only report widget classes and ids" >&5 -printf "%s\n" "no, and no system libxml/libxslt, gla11y will only report widget classes and ids" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, and no system libxml/libxslt, gla11y will only report widget classes and ids" >&5 +$as_echo "no, and no system libxml/libxslt, gla11y will only report widget classes and ids" >&6; } else BUILD_TYPE="$BUILD_TYPE LXML" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using internal lxml" >&5 -printf "%s\n" "no, using internal lxml" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using internal lxml" >&5 +$as_echo "no, using internal lxml" >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, and system does not provide python development headers, gla11y will only report widget classes and ids" >&5 -printf "%s\n" "no, and system does not provide python development headers, gla11y will only report widget classes and ids" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, and system does not provide python development headers, gla11y will only report widget classes and ids" >&5 +$as_echo "no, and system does not provide python development headers, gla11y will only report widget classes and ids" >&6; } fi ;; esac @@ -30146,11 +29028,13 @@ SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=8 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.13 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.14 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then as_fn_error $? "PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst" "$LINENO" 5 fi - printf "%s\n" "#define PYTHON_VERSION_STRING L\"${PYTHON_VERSION}\"" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define PYTHON_VERSION_STRING L"${PYTHON_VERSION}" +_ACEOF # Embedded Python dies without Home set @@ -30174,13 +29058,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CFLAGS="$CFLAGS $PYTHON_CFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for correct python library version" >&5 -printf %s "checking for correct python library version... " >&6; } - if test "$cross_compiling" = yes -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped; cross-compiling" >&5 -printf "%s\n" "skipped; cross-compiling" >&6; } -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct python library version" >&5 +$as_echo_n "checking for correct python library version... " >&6; } + if test "$cross_compiling" = yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped; cross-compiling" >&5 +$as_echo "skipped; cross-compiling" >&6; } +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30192,11 +29075,10 @@ } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf "%s\n" "ok" >&6; } -else $as_nop +if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +else as_fn_error $? "Python >= 3.3 is needed when building with Python 3" "$LINENO" 5 fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -30236,22 +29118,22 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build LibreLogo" >&5 -printf %s "checking whether to build LibreLogo... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build LibreLogo" >&5 +$as_echo_n "checking whether to build LibreLogo... " >&6; } case "$enable_python" in no|disable) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no; Python disabled" >&5 -printf "%s\n" "no; Python disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; Python disabled" >&5 +$as_echo "no; Python disabled" >&6; } ;; *) if test "${enable_librelogo}" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } BUILD_TYPE="${BUILD_TYPE} LIBRELOGO" - printf "%s\n" "#define ENABLE_LIBRELOGO 1" >>confdefs.h + $as_echo "#define ENABLE_LIBRELOGO 1" >>confdefs.h fi ;; @@ -30262,16 +29144,16 @@ MARIADBC_MAJOR=1 MARIADBC_MINOR=0 MARIADBC_MICRO=2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build the MariaDB/MySQL SDBC driver" >&5 -printf %s "checking whether to build the MariaDB/MySQL SDBC driver... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the MariaDB/MySQL SDBC driver" >&5 +$as_echo_n "checking whether to build the MariaDB/MySQL SDBC driver... " >&6; } if test "x$enable_mariadb_sdbc" != "xno" -a "$enable_mpl_subset" != "yes"; then ENABLE_MARIADBC=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } BUILD_TYPE="$BUILD_TYPE MARIADBC" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -30279,22 +29161,21 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which MariaDB to use" >&5 -printf %s "checking which MariaDB to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which MariaDB to use" >&5 +$as_echo_n "checking which MariaDB to use... " >&6; } if test "$with_system_mariadb" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_MARIADB_CONNECTOR_C=TRUE #AC_PATH_PROG(MARIADBCONFIG, [mariadb_config]) if test -z "$MARIADBCONFIG"; then # Extract the first word of "mysql_config", so it can be a program name with args. set dummy mysql_config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_MARIADBCONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MARIADBCONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MARIADBCONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_MARIADBCONFIG="$MARIADBCONFIG" # Let the user override the test with a path. @@ -30304,15 +29185,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_MARIADBCONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MARIADBCONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -30324,11 +29201,11 @@ fi MARIADBCONFIG=$ac_cv_path_MARIADBCONFIG if test -n "$MARIADBCONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MARIADBCONFIG" >&5 -printf "%s\n" "$MARIADBCONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MARIADBCONFIG" >&5 +$as_echo "$MARIADBCONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -30337,18 +29214,18 @@ #AC_MSG_ERROR([mariadb_config and mysql_config are missing. Install MariaDB or MySQL client library development package.]) fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking MariaDB version" >&5 -printf %s "checking MariaDB version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking MariaDB version" >&5 +$as_echo_n "checking MariaDB version... " >&6; } MARIADB_VERSION=`$MARIADBCONFIG --version` MARIADB_MAJOR=`$MARIADBCONFIG --version | cut -d"." -f1` if test "$MARIADB_MAJOR" -ge "5"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -printf "%s\n" "OK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +$as_echo "OK" >&6; } else as_fn_error $? "too old, use 5.0.x or later" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MariaDB Client library" >&5 -printf %s "checking for MariaDB Client library... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MariaDB Client library" >&5 +$as_echo_n "checking for MariaDB Client library... " >&6; } MARIADB_CFLAGS=`$MARIADBCONFIG --cflags` if test "$COM_IS_CLANG" = TRUE; then MARIADB_CFLAGS=$(printf '%s' "$MARIADB_CFLAGS" | sed -e s/-fstack-protector-strong//) @@ -30361,13 +29238,13 @@ fi FilterLibs "${MARIADB_LIBS}" MARIADB_LIBS="${filteredlibs}" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS'" >&5 -printf "%s\n" "includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS'" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to bundle the MySQL/MariaDB client library" >&5 -printf %s "checking whether to bundle the MySQL/MariaDB client library... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS'" >&5 +$as_echo "includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS'" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to bundle the MySQL/MariaDB client library" >&5 +$as_echo_n "checking whether to bundle the MySQL/MariaDB client library... " >&6; } if test "$enable_bundle_mariadb" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } BUNDLE_MARIADB_CONNECTOR_C=TRUE LIBMARIADB=lib$(echo "${MARIADB_LIBS}" | sed -e 's/[[:space:]]\{1,\}-l\([^[:space:]]\{1,\}\)/\ \1\ @@ -30382,24 +29259,24 @@ LIBMARIADB=${LIBMARIADB}.so fi LIBMARIADB_PATH=$($MARIADBCONFIG --variable=pkglibdir) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBMARIADB in $LIBMARIADB_PATH" >&5 -printf %s "checking for $LIBMARIADB in $LIBMARIADB_PATH... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBMARIADB in $LIBMARIADB_PATH" >&5 +$as_echo_n "checking for $LIBMARIADB in $LIBMARIADB_PATH... " >&6; } if test -e "$LIBMARIADB_PATH/$LIBMARIADB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found." >&5 -printf "%s\n" "found." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5 +$as_echo "found." >&6; } PathFormat "$LIBMARIADB_PATH" LIBMARIADB_PATH="$formatted_path" else as_fn_error $? "not found." "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } BUNDLE_MARIADB_CONNECTOR_C= fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_MARIADB_CONNECTOR_C= MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb-connector-c/include" MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadb-connector-c" @@ -30415,11 +29292,11 @@ fi if test "$with_java" != "no" -a "$cross_compiling" != "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which hsqldb to use" >&5 -printf %s "checking which hsqldb to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which hsqldb to use" >&5 +$as_echo_n "checking which hsqldb to use... " >&6; } if test "$with_system_hsqldb" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_HSQLDB=TRUE if test -z $HSQLDB_JAR; then HSQLDB_JAR=/usr/share/java/hsqldb.jar @@ -30427,8 +29304,8 @@ if ! test -f $HSQLDB_JAR; then as_fn_error $? "hsqldb.jar not found." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether hsqldb is 1.8.0.x" >&5 -printf %s "checking whether hsqldb is 1.8.0.x... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether hsqldb is 1.8.0.x" >&5 +$as_echo_n "checking whether hsqldb is 1.8.0.x... " >&6; } export HSQLDB_JAR if $PERL -e \ 'use Archive::Zip; @@ -30460,14 +29337,14 @@ { exit 1; }'; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else as_fn_error $? "no, you need hsqldb >= 1.8.0.9 but < 1.8.1" "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_HSQLDB= BUILD_TYPE="$BUILD_TYPE HSQLDB" NEED_ANT=TRUE @@ -30480,11 +29357,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build the PostgreSQL SDBC driver" >&5 -printf %s "checking whether to build the PostgreSQL SDBC driver... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the PostgreSQL SDBC driver" >&5 +$as_echo_n "checking whether to build the PostgreSQL SDBC driver... " >&6; } if test "x$enable_postgresql_sdbc" != "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC" if test "$with_krb5" = "yes" -a "$enable_openssl" = "no"; then @@ -30506,12 +29383,11 @@ fi # Extract the first word of "pg_config", so it can be a program name with args. set dummy pg_config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PGCONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PGCONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PGCONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PGCONFIG="$PGCONFIG" # Let the user override the test with a path. @@ -30521,15 +29397,11 @@ for as_dir in $PATH$pg_supp_path do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PGCONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PGCONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -30541,11 +29413,11 @@ fi PGCONFIG=$ac_cv_path_PGCONFIG if test -n "$PGCONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PGCONFIG" >&5 -printf "%s\n" "$PGCONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PGCONFIG" >&5 +$as_echo "$PGCONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -30555,17 +29427,17 @@ else pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POSTGRESQL" >&5 -printf %s "checking for POSTGRESQL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq" >&5 +$as_echo_n "checking for libpq... " >&6; } if test -n "$POSTGRESQL_CFLAGS"; then pkg_cv_POSTGRESQL_CFLAGS="$POSTGRESQL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpq") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POSTGRESQL_CFLAGS=`$PKG_CONFIG --cflags "libpq" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -30579,10 +29451,10 @@ pkg_cv_POSTGRESQL_LIBS="$POSTGRESQL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpq") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POSTGRESQL_LIBS=`$PKG_CONFIG --libs "libpq" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -30596,8 +29468,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -30616,16 +29488,16 @@ as_fn_error $? "pg_config or 'pkg-config libpq' needed; set PGCONFIG if not in PATH" "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } as_fn_error $? "pg_config or 'pkg-config libpq' needed; set PGCONFIG if not in PATH" "$LINENO" 5 else POSTGRESQL_CFLAGS=$pkg_cv_POSTGRESQL_CFLAGS POSTGRESQL_LIBS=$pkg_cv_POSTGRESQL_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } POSTGRESQL_INC=$POSTGRESQL_CFLAGS POSTGRESQL_LIB=$POSTGRESQL_LIBS @@ -30647,12 +29519,11 @@ save_LIBS=$LIBS # Not sure whether it makes any sense here to search multiple potential libraries; it is not likely # that the libraries where these functions are located on macOS will change, is it? - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing com_err" >&5 -printf %s "checking for library containing com_err... " >&6; } -if test ${ac_cv_search_com_err+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing com_err" >&5 +$as_echo_n "checking for library containing com_err... " >&6; } +if ${ac_cv_search_com_err+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30660,62 +29531,59 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char com_err (); int -main (void) +main () { return com_err (); ; return 0; } _ACEOF -for ac_lib in '' com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' -do +for ac_lib in '' com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_com_err=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_com_err+y} -then : + if ${ac_cv_search_com_err+:} false; then : break fi done -if test ${ac_cv_search_com_err+y} -then : +if ${ac_cv_search_com_err+:} false; then : -else $as_nop +else ac_cv_search_com_err=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_com_err" >&5 -printf "%s\n" "$ac_cv_search_com_err" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_com_err" >&5 +$as_echo "$ac_cv_search_com_err" >&6; } ac_res=$ac_cv_search_com_err -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else as_fn_error $? "could not find function 'com_err' required for Kerberos 5" "$LINENO" 5 fi KRB5_LIBS=$LIBS LIBS=$save_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing krb5_sendauth" >&5 -printf %s "checking for library containing krb5_sendauth... " >&6; } -if test ${ac_cv_search_krb5_sendauth+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing krb5_sendauth" >&5 +$as_echo_n "checking for library containing krb5_sendauth... " >&6; } +if ${ac_cv_search_krb5_sendauth+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30723,51 +29591,49 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char krb5_sendauth (); int -main (void) +main () { return krb5_sendauth (); ; return 0; } _ACEOF -for ac_lib in '' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' -do +for ac_lib in '' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_krb5_sendauth=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_krb5_sendauth+y} -then : + if ${ac_cv_search_krb5_sendauth+:} false; then : break fi done -if test ${ac_cv_search_krb5_sendauth+y} -then : +if ${ac_cv_search_krb5_sendauth+:} false; then : -else $as_nop +else ac_cv_search_krb5_sendauth=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_krb5_sendauth" >&5 -printf "%s\n" "$ac_cv_search_krb5_sendauth" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_krb5_sendauth" >&5 +$as_echo "$ac_cv_search_krb5_sendauth" >&6; } ac_res=$ac_cv_search_krb5_sendauth -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else as_fn_error $? "could not find function 'krb5_sendauth' required for Kerberos 5" "$LINENO" 5 fi @@ -30777,12 +29643,11 @@ if test "$with_gssapi" != "no"; then WITH_GSSAPI=TRUE save_LIBS=$LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 -printf %s "checking for library containing gss_init_sec_context... " >&6; } -if test ${ac_cv_search_gss_init_sec_context+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 +$as_echo_n "checking for library containing gss_init_sec_context... " >&6; } +if ${ac_cv_search_gss_init_sec_context+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30790,51 +29655,49 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char gss_init_sec_context (); int -main (void) +main () { return gss_init_sec_context (); ; return 0; } _ACEOF -for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto' -do +for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_gss_init_sec_context=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_gss_init_sec_context+y} -then : + if ${ac_cv_search_gss_init_sec_context+:} false; then : break fi done -if test ${ac_cv_search_gss_init_sec_context+y} -then : +if ${ac_cv_search_gss_init_sec_context+:} false; then : -else $as_nop +else ac_cv_search_gss_init_sec_context=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gss_init_sec_context" >&5 -printf "%s\n" "$ac_cv_search_gss_init_sec_context" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gss_init_sec_context" >&5 +$as_echo "$ac_cv_search_gss_init_sec_context" >&6; } ac_res=$ac_cv_search_gss_init_sec_context -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else as_fn_error $? "could not find function 'gss_init_sec_context' required for GSSAPI" "$LINENO" 5 fi @@ -30851,12 +29714,11 @@ if test "$with_krb5" != "no"; then WITH_KRB5=TRUE save_LIBS=$LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing com_err" >&5 -printf %s "checking for library containing com_err... " >&6; } -if test ${ac_cv_search_com_err+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing com_err" >&5 +$as_echo_n "checking for library containing com_err... " >&6; } +if ${ac_cv_search_com_err+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30864,62 +29726,59 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char com_err (); int -main (void) +main () { return com_err (); ; return 0; } _ACEOF -for ac_lib in '' com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' -do +for ac_lib in '' com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_com_err=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_com_err+y} -then : + if ${ac_cv_search_com_err+:} false; then : break fi done -if test ${ac_cv_search_com_err+y} -then : +if ${ac_cv_search_com_err+:} false; then : -else $as_nop +else ac_cv_search_com_err=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_com_err" >&5 -printf "%s\n" "$ac_cv_search_com_err" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_com_err" >&5 +$as_echo "$ac_cv_search_com_err" >&6; } ac_res=$ac_cv_search_com_err -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else as_fn_error $? "could not find function 'com_err' required for Kerberos 5" "$LINENO" 5 fi KRB5_LIBS=$LIBS LIBS=$save_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing krb5_sendauth" >&5 -printf %s "checking for library containing krb5_sendauth... " >&6; } -if test ${ac_cv_search_krb5_sendauth+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing krb5_sendauth" >&5 +$as_echo_n "checking for library containing krb5_sendauth... " >&6; } +if ${ac_cv_search_krb5_sendauth+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30927,51 +29786,49 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char krb5_sendauth (); int -main (void) +main () { return krb5_sendauth (); ; return 0; } _ACEOF -for ac_lib in '' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' -do +for ac_lib in '' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_krb5_sendauth=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_krb5_sendauth+y} -then : + if ${ac_cv_search_krb5_sendauth+:} false; then : break fi done -if test ${ac_cv_search_krb5_sendauth+y} -then : +if ${ac_cv_search_krb5_sendauth+:} false; then : -else $as_nop +else ac_cv_search_krb5_sendauth=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_krb5_sendauth" >&5 -printf "%s\n" "$ac_cv_search_krb5_sendauth" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_krb5_sendauth" >&5 +$as_echo "$ac_cv_search_krb5_sendauth" >&6; } ac_res=$ac_cv_search_krb5_sendauth -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else as_fn_error $? "could not find function 'krb5_sendauth' required for Kerberos 5" "$LINENO" 5 fi @@ -30981,12 +29838,11 @@ if test "$with_gssapi" != "no"; then WITH_GSSAPI=TRUE save_LIBS=$LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 -printf %s "checking for library containing gss_init_sec_context... " >&6; } -if test ${ac_cv_search_gss_init_sec_context+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 +$as_echo_n "checking for library containing gss_init_sec_context... " >&6; } +if ${ac_cv_search_gss_init_sec_context+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30994,51 +29850,49 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char gss_init_sec_context (); int -main (void) +main () { return gss_init_sec_context (); ; return 0; } _ACEOF -for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto' -do +for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_gss_init_sec_context=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_gss_init_sec_context+y} -then : + if ${ac_cv_search_gss_init_sec_context+:} false; then : break fi done -if test ${ac_cv_search_gss_init_sec_context+y} -then : +if ${ac_cv_search_gss_init_sec_context+:} false; then : -else $as_nop +else ac_cv_search_gss_init_sec_context=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gss_init_sec_context" >&5 -printf "%s\n" "$ac_cv_search_gss_init_sec_context" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gss_init_sec_context" >&5 +$as_echo "$ac_cv_search_gss_init_sec_context" >&6; } ac_res=$ac_cv_search_gss_init_sec_context -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else as_fn_error $? "could not find function 'gss_init_sec_context' required for GSSAPI" "$LINENO" 5 fi @@ -31050,12 +29904,11 @@ if test "$with_krb5" = "yes"; then WITH_KRB5=TRUE save_LIBS=$LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing com_err" >&5 -printf %s "checking for library containing com_err... " >&6; } -if test ${ac_cv_search_com_err+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing com_err" >&5 +$as_echo_n "checking for library containing com_err... " >&6; } +if ${ac_cv_search_com_err+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31063,62 +29916,59 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char com_err (); int -main (void) +main () { return com_err (); ; return 0; } _ACEOF -for ac_lib in '' com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' -do +for ac_lib in '' com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_com_err=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_com_err+y} -then : + if ${ac_cv_search_com_err+:} false; then : break fi done -if test ${ac_cv_search_com_err+y} -then : +if ${ac_cv_search_com_err+:} false; then : -else $as_nop +else ac_cv_search_com_err=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_com_err" >&5 -printf "%s\n" "$ac_cv_search_com_err" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_com_err" >&5 +$as_echo "$ac_cv_search_com_err" >&6; } ac_res=$ac_cv_search_com_err -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else as_fn_error $? "could not find function 'com_err' required for Kerberos 5" "$LINENO" 5 fi KRB5_LIBS=$LIBS LIBS=$save_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing krb5_sendauth" >&5 -printf %s "checking for library containing krb5_sendauth... " >&6; } -if test ${ac_cv_search_krb5_sendauth+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing krb5_sendauth" >&5 +$as_echo_n "checking for library containing krb5_sendauth... " >&6; } +if ${ac_cv_search_krb5_sendauth+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31126,51 +29976,49 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char krb5_sendauth (); int -main (void) +main () { return krb5_sendauth (); ; return 0; } _ACEOF -for ac_lib in '' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' -do +for ac_lib in '' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_krb5_sendauth=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_krb5_sendauth+y} -then : + if ${ac_cv_search_krb5_sendauth+:} false; then : break fi done -if test ${ac_cv_search_krb5_sendauth+y} -then : +if ${ac_cv_search_krb5_sendauth+:} false; then : -else $as_nop +else ac_cv_search_krb5_sendauth=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_krb5_sendauth" >&5 -printf "%s\n" "$ac_cv_search_krb5_sendauth" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_krb5_sendauth" >&5 +$as_echo "$ac_cv_search_krb5_sendauth" >&6; } ac_res=$ac_cv_search_krb5_sendauth -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else as_fn_error $? "could not find function 'krb5_sendauth' required for Kerberos 5" "$LINENO" 5 fi @@ -31180,12 +30028,11 @@ if test "$with_gssapi" = "yes"; then WITH_GSSAPI=TRUE save_LIBS=$LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 -printf %s "checking for library containing gss_init_sec_context... " >&6; } -if test ${ac_cv_search_gss_init_sec_context+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 +$as_echo_n "checking for library containing gss_init_sec_context... " >&6; } +if ${ac_cv_search_gss_init_sec_context+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31193,51 +30040,49 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char gss_init_sec_context (); int -main (void) +main () { return gss_init_sec_context (); ; return 0; } _ACEOF -for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto' -do +for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_gss_init_sec_context=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_gss_init_sec_context+y} -then : + if ${ac_cv_search_gss_init_sec_context+:} false; then : break fi done -if test ${ac_cv_search_gss_init_sec_context+y} -then : +if ${ac_cv_search_gss_init_sec_context+:} false; then : -else $as_nop +else ac_cv_search_gss_init_sec_context=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gss_init_sec_context" >&5 -printf "%s\n" "$ac_cv_search_gss_init_sec_context" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gss_init_sec_context" >&5 +$as_echo "$ac_cv_search_gss_init_sec_context" >&6; } ac_res=$ac_cv_search_gss_init_sec_context -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else as_fn_error $? "could not find function 'gss_init_sec_context' required for GSSAPI" "$LINENO" 5 fi @@ -31260,33 +30105,32 @@ fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PostgreSQL C interface" >&5 -printf %s "checking PostgreSQL C interface... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $postgres_interface" >&5 -printf "%s\n" "$postgres_interface" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking PostgreSQL C interface" >&5 +$as_echo_n "checking PostgreSQL C interface... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $postgres_interface" >&5 +$as_echo "$postgres_interface" >&6; } if test "${SYSTEM_POSTGRESQL}" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking system PostgreSQL prerequisites" >&5 -printf "%s\n" "$as_me: checking system PostgreSQL prerequisites" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking system PostgreSQL prerequisites" >&5 +$as_echo "$as_me: checking system PostgreSQL prerequisites" >&6;} save_CFLAGS=$CFLAGS save_CPPFLAGS=$CPPFLAGS save_LIBS=$LIBS CPPFLAGS="${CPPFLAGS} ${POSTGRESQL_INC}" LIBS="${LIBS} ${POSTGRESQL_LIB}" - ac_fn_c_check_header_compile "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default" -if test "x$ac_cv_header_libpq_fe_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default" +if test "x$ac_cv_header_libpq_fe_h" = xyes; then : -else $as_nop +else as_fn_error $? "libpq-fe.h is needed" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQconnectdbParams in -lpq" >&5 -printf %s "checking for PQconnectdbParams in -lpq... " >&6; } -if test ${ac_cv_lib_pq_PQconnectdbParams+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdbParams in -lpq" >&5 +$as_echo_n "checking for PQconnectdbParams in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQconnectdbParams+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -31295,31 +30139,32 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char PQconnectdbParams (); int -main (void) +main () { return PQconnectdbParams (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pq_PQconnectdbParams=yes -else $as_nop +else ac_cv_lib_pq_PQconnectdbParams=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdbParams" >&5 -printf "%s\n" "$ac_cv_lib_pq_PQconnectdbParams" >&6; } -if test "x$ac_cv_lib_pq_PQconnectdbParams" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdbParams" >&5 +$as_echo "$ac_cv_lib_pq_PQconnectdbParams" >&6; } +if test "x$ac_cv_lib_pq_PQconnectdbParams" = xyes; then : : -else $as_nop +else as_fn_error $? "libpq not found or too old. Need >= 9.0" "$LINENO" 5 fi @@ -31329,8 +30174,8 @@ fi BUILD_POSTGRESQL_SDBC=TRUE else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -31345,20 +30190,19 @@ if test "$enable_firebird_sdbc" = "yes" ; then SCPDEFS="$SCPDEFS -DWITH_FIREBIRD_SDBC" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which Firebird to use" >&5 -printf %s "checking which Firebird to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Firebird to use" >&5 +$as_echo_n "checking which Firebird to use... " >&6; } if test "$with_system_firebird" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_FIREBIRD=TRUE # Extract the first word of "fb_config", so it can be a program name with args. set dummy fb_config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_FIREBIRDCONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_FIREBIRDCONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $FIREBIRDCONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_FIREBIRDCONFIG="$FIREBIRDCONFIG" # Let the user override the test with a path. @@ -31368,15 +30212,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_FIREBIRDCONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_FIREBIRDCONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -31388,30 +30228,30 @@ fi FIREBIRDCONFIG=$ac_cv_path_FIREBIRDCONFIG if test -n "$FIREBIRDCONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FIREBIRDCONFIG" >&5 -printf "%s\n" "$FIREBIRDCONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIREBIRDCONFIG" >&5 +$as_echo "$FIREBIRDCONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$FIREBIRDCONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No fb_config -- using pkg-config" >&5 -printf "%s\n" "$as_me: No fb_config -- using pkg-config" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: No fb_config -- using pkg-config" >&5 +$as_echo "$as_me: No fb_config -- using pkg-config" >&6;} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FIREBIRD" >&5 -printf %s "checking for FIREBIRD... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fbclient >= 3" >&5 +$as_echo_n "checking for fbclient >= 3... " >&6; } if test -n "$FIREBIRD_CFLAGS"; then pkg_cv_FIREBIRD_CFLAGS="$FIREBIRD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbclient >= 3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbclient >= 3\""; } >&5 ($PKG_CONFIG --exists --print-errors "fbclient >= 3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FIREBIRD_CFLAGS=`$PKG_CONFIG --cflags "fbclient >= 3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31425,10 +30265,10 @@ pkg_cv_FIREBIRD_LIBS="$FIREBIRD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbclient >= 3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbclient >= 3\""; } >&5 ($PKG_CONFIG --exists --print-errors "fbclient >= 3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FIREBIRD_LIBS=`$PKG_CONFIG --libs "fbclient >= 3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31442,8 +30282,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -31461,17 +30301,17 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FIREBIRD" >&5 -printf %s "checking for FIREBIRD... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fbembed" >&5 +$as_echo_n "checking for fbembed... " >&6; } if test -n "$FIREBIRD_CFLAGS"; then pkg_cv_FIREBIRD_CFLAGS="$FIREBIRD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbembed\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbembed\""; } >&5 ($PKG_CONFIG --exists --print-errors "fbembed") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FIREBIRD_CFLAGS=`$PKG_CONFIG --cflags "fbembed" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31485,10 +30325,10 @@ pkg_cv_FIREBIRD_LIBS="$FIREBIRD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbembed\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbembed\""; } >&5 ($PKG_CONFIG --exists --print-errors "fbembed") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FIREBIRD_LIBS=`$PKG_CONFIG --libs "fbembed" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31502,8 +30342,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -31529,10 +30369,10 @@ and FIREBIRD_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -31546,28 +30386,28 @@ else FIREBIRD_CFLAGS=$pkg_cv_FIREBIRD_CFLAGS FIREBIRD_LIBS=$pkg_cv_FIREBIRD_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } FIREBIRD_PKGNAME=fbembed fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FIREBIRD" >&5 -printf %s "checking for FIREBIRD... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fbembed" >&5 +$as_echo_n "checking for fbembed... " >&6; } if test -n "$FIREBIRD_CFLAGS"; then pkg_cv_FIREBIRD_CFLAGS="$FIREBIRD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbembed\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbembed\""; } >&5 ($PKG_CONFIG --exists --print-errors "fbembed") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FIREBIRD_CFLAGS=`$PKG_CONFIG --cflags "fbembed" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31581,10 +30421,10 @@ pkg_cv_FIREBIRD_LIBS="$FIREBIRD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbembed\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fbembed\""; } >&5 ($PKG_CONFIG --exists --print-errors "fbembed") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FIREBIRD_LIBS=`$PKG_CONFIG --libs "fbembed" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31598,8 +30438,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -31625,10 +30465,10 @@ and FIREBIRD_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -31642,39 +30482,39 @@ else FIREBIRD_CFLAGS=$pkg_cv_FIREBIRD_CFLAGS FIREBIRD_LIBS=$pkg_cv_FIREBIRD_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } FIREBIRD_PKGNAME=fbembed fi else FIREBIRD_CFLAGS=$pkg_cv_FIREBIRD_CFLAGS FIREBIRD_LIBS=$pkg_cv_FIREBIRD_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } FIREBIRD_PKGNAME=fbclient fi FIREBIRD_VERSION=`pkg-config --modversion "$FIREBIRD_PKGNAME"` else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: fb_config found" >&5 -printf "%s\n" "$as_me: fb_config found" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: fb_config found" >&5 +$as_echo "$as_me: fb_config found" >&6;} FIREBIRD_VERSION=`$FIREBIRDCONFIG --version` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Firebird Client library" >&5 -printf %s "checking for Firebird Client library... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Firebird Client library" >&5 +$as_echo_n "checking for Firebird Client library... " >&6; } FIREBIRD_CFLAGS=`$FIREBIRDCONFIG --cflags` FIREBIRD_LIBS=`$FIREBIRDCONFIG --embedlibs` FilterLibs "${FIREBIRD_LIBS}" FIREBIRD_LIBS="${filteredlibs}" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: includes \`$FIREBIRD_CFLAGS', libraries \`$FIREBIRD_LIBS'" >&5 -printf "%s\n" "includes \`$FIREBIRD_CFLAGS', libraries \`$FIREBIRD_LIBS'" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Firebird version" >&5 -printf %s "checking Firebird version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: includes \`$FIREBIRD_CFLAGS', libraries \`$FIREBIRD_LIBS'" >&5 +$as_echo "includes \`$FIREBIRD_CFLAGS', libraries \`$FIREBIRD_LIBS'" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Firebird version" >&5 +$as_echo_n "checking Firebird version... " >&6; } if test -n "${FIREBIRD_VERSION}"; then FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1` if test "$FIREBIRD_MAJOR" -ge "3"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -printf "%s\n" "OK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +$as_echo "OK" >&6; } else as_fn_error $? "Ensure firebird >= 3 is installed" "$LINENO" 5 fi @@ -31690,25 +30530,24 @@ #error "Wrong Firebird API version" #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -printf "%s\n" "OK" >&6; } -else $as_nop +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +$as_echo "OK" >&6; } +else as_fn_error $? "Ensure firebird 3.0.x is installed" "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" fi ENABLE_FIREBIRD_SDBC=TRUE - printf "%s\n" "#define ENABLE_FIREBIRD_SDBC 1" >>confdefs.h + $as_echo "#define ENABLE_FIREBIRD_SDBC 1" >>confdefs.h elif test "$enable_database_connectivity" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } elif test "$cross_compiling" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } else if test "${CPUNAME}" != INTEL -a "${CPUNAME}" != X86_64; then @@ -31731,10 +30570,9 @@ # Check whether --with-system-libatomic_ops was given. -if test ${with_system_libatomic_ops+y} -then : +if test "${with_system_libatomic_ops+set}" = set; then : withval=$with_system_libatomic_ops; -else $as_nop +else if test "${with_system_libatomic_ops+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libatomic_ops="$with_system_libs"; @@ -31746,27 +30584,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libatomic_ops to use" >&5 -printf %s "checking which libatomic_ops to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libatomic_ops to use" >&5 +$as_echo_n "checking which libatomic_ops to use... " >&6; } if test "$test_libatomic_ops" != no -a "$found_libatomic_ops" != yes -a "$enable_libatomic_ops" != no; then ENABLE_LIBATOMIC_OPS=TRUE if test "$with_system_libatomic_ops" = yes -a "$test_system_libatomic_ops" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBATOMIC_OPS=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBATOMIC_OPS" >&5 -printf %s "checking for LIBATOMIC_OPS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic_ops >= 0.7.2" >&5 +$as_echo_n "checking for atomic_ops >= 0.7.2... " >&6; } if test -n "$LIBATOMIC_OPS_CFLAGS"; then pkg_cv_LIBATOMIC_OPS_CFLAGS="$LIBATOMIC_OPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"atomic_ops >= 0.7.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"atomic_ops >= 0.7.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "atomic_ops >= 0.7.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBATOMIC_OPS_CFLAGS=`$PKG_CONFIG --cflags "atomic_ops >= 0.7.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31780,10 +30618,10 @@ pkg_cv_LIBATOMIC_OPS_LIBS="$LIBATOMIC_OPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"atomic_ops >= 0.7.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"atomic_ops >= 0.7.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "atomic_ops >= 0.7.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBATOMIC_OPS_LIBS=`$PKG_CONFIG --libs "atomic_ops >= 0.7.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31797,8 +30635,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -31824,10 +30662,10 @@ and LIBATOMIC_OPS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -31841,16 +30679,16 @@ else LIBATOMIC_OPS_CFLAGS=$pkg_cv_LIBATOMIC_OPS_CFLAGS LIBATOMIC_OPS_LIBS=$pkg_cv_LIBATOMIC_OPS_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBATOMIC_OPS_CFLAGS=$(printf '%s' "${LIBATOMIC_OPS_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LIBATOMIC_OPS_LIBS}" LIBATOMIC_OPS_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBATOMIC_OPS= LIBATOMIC_OPS_CFLAGS="${LIBATOMIC_OPS_CFLAGS_internal}" LIBATOMIC_OPS_LIBS="${LIBATOMIC_OPS_LIBS_internal}" @@ -31858,8 +30696,8 @@ fi else if test "$found_libatomic_ops" = yes -a "$enable_libatomic_ops" != no -a "$with_system_libatomic_ops" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_LIBATOMIC_OPS=TRUE SYSTEM_LIBATOMIC_OPS=TRUE else @@ -31868,11 +30706,11 @@ LIBATOMIC_OPS_CFLAGS= LIBATOMIC_OPS_LIBS= if test "$test_libatomic_ops" != no -a "$enable_libatomic_ops" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -31883,18 +30721,20 @@ if test "$with_system_libatomic_ops" = "yes"; then SYSTEM_LIBATOMIC_OPS=TRUE - for ac_header in atomic_ops.h + for ac_header in atomic_ops.h do : - ac_fn_c_check_header_compile "$LINENO" "atomic_ops.h" "ac_cv_header_atomic_ops_h" "$ac_includes_default" -if test "x$ac_cv_header_atomic_ops_h" = xyes -then : - printf "%s\n" "#define HAVE_ATOMIC_OPS_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "atomic_ops.h" "ac_cv_header_atomic_ops_h" "$ac_includes_default" +if test "x$ac_cv_header_atomic_ops_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ATOMIC_OPS_H 1 +_ACEOF -else $as_nop +else as_fn_error $? "atomic_ops.h not found. install libatomic_ops" "$LINENO" 5 fi done + else SYSTEM_LIBATOMIC_OPS= LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include" @@ -31903,8 +30743,8 @@ fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_FIREBIRD= FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/gen/Release/firebird/include" FIREBIRD_LIBS="-lfbclient" @@ -31912,20 +30752,19 @@ if test "$with_system_libtommath" = "yes"; then SYSTEM_LIBTOMMATH=TRUE save_LIBS=$LIBS - ac_fn_c_check_header_compile "$LINENO" "tommath.h" "ac_cv_header_tommath_h" "$ac_includes_default" -if test "x$ac_cv_header_tommath_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "tommath.h" "ac_cv_header_tommath_h" "$ac_includes_default" +if test "x$ac_cv_header_tommath_h" = xyes; then : -else $as_nop +else as_fn_error $? "Include file for tommath not found - please install development tommath package" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mp_init in -ltommath" >&5 -printf %s "checking for mp_init in -ltommath... " >&6; } -if test ${ac_cv_lib_tommath_mp_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mp_init in -ltommath" >&5 +$as_echo_n "checking for mp_init in -ltommath... " >&6; } +if ${ac_cv_lib_tommath_mp_init+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ltommath $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -31934,31 +30773,32 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char mp_init (); int -main (void) +main () { return mp_init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_tommath_mp_init=yes -else $as_nop +else ac_cv_lib_tommath_mp_init=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tommath_mp_init" >&5 -printf "%s\n" "$ac_cv_lib_tommath_mp_init" >&6; } -if test "x$ac_cv_lib_tommath_mp_init" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tommath_mp_init" >&5 +$as_echo "$ac_cv_lib_tommath_mp_init" >&6; } +if test "x$ac_cv_lib_tommath_mp_init" = xyes; then : LIBTOMMATH_LIBS=-ltommath -else $as_nop +else as_fn_error $? "Library tommath not found - please install development tommath package" "$LINENO" 5 fi @@ -31972,7 +30812,7 @@ BUILD_TYPE="$BUILD_TYPE FIREBIRD" ENABLE_FIREBIRD_SDBC=TRUE - printf "%s\n" "#define ENABLE_FIREBIRD_SDBC 1" >>confdefs.h + $as_echo "#define ENABLE_FIREBIRD_SDBC 1" >>confdefs.h fi fi @@ -32001,10 +30841,9 @@ # Check whether --enable-curl was given. -if test ${enable_curl+y} -then : +if test "${enable_curl+set}" = set; then : enableval=$enable_curl; -else $as_nop +else enable_curl="yes" fi @@ -32013,10 +30852,9 @@ # Check whether --with-system-curl was given. -if test ${with_system_curl+y} -then : +if test "${with_system_curl+set}" = set; then : withval=$with_system_curl; -else $as_nop +else if test "${with_system_curl+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_curl="$with_system_libs"; @@ -32028,27 +30866,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which curl to use" >&5 -printf %s "checking which curl to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which curl to use" >&5 +$as_echo_n "checking which curl to use... " >&6; } if test "$test_curl" != no -a "$found_curl" != yes -a "$enable_curl" != no; then ENABLE_CURL=TRUE if test "$with_system_curl" = yes -a "$test_system_curl" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_CURL=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5 -printf %s "checking for CURL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.68.0" >&5 +$as_echo_n "checking for libcurl >= 7.68.0... " >&6; } if test -n "$CURL_CFLAGS"; then pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.68.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.68.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.68.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.68.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32062,10 +30900,10 @@ pkg_cv_CURL_LIBS="$CURL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.68.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.68.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.68.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.68.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32079,8 +30917,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -32106,10 +30944,10 @@ and CURL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -32123,16 +30961,16 @@ else CURL_CFLAGS=$pkg_cv_CURL_CFLAGS CURL_LIBS=$pkg_cv_CURL_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi CURL_CFLAGS=$(printf '%s' "${CURL_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${CURL_LIBS}" CURL_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_CURL= CURL_CFLAGS="${CURL_CFLAGS_internal}" CURL_LIBS="${CURL_LIBS_internal}" @@ -32140,8 +30978,8 @@ fi else if test "$found_curl" = yes -a "$enable_curl" != no -a "$with_system_curl" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_CURL=TRUE SYSTEM_CURL=TRUE else @@ -32150,11 +30988,11 @@ CURL_CFLAGS= CURL_LIBS= if test "$test_curl" != no -a "$enable_curl" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -32164,17 +31002,16 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which boost to use" >&5 -printf %s "checking which boost to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which boost to use" >&5 +$as_echo_n "checking which boost to use... " >&6; } if test "$with_system_boost" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_BOOST=TRUE # Check whether --with-boost was given. -if test ${with_boost+y} -then : +if test "${with_boost+set}" = set; then : withval=$with_boost; if test "$withval" = "no"; then want_boost="no" @@ -32186,7 +31023,7 @@ ac_boost_path="$withval" fi -else $as_nop +else want_boost="yes" fi @@ -32194,8 +31031,7 @@ # Check whether --with-boost-libdir was given. -if test ${with_boost_libdir+y} -then : +if test "${with_boost_libdir+set}" = set; then : withval=$with_boost_libdir; if test -d "$withval" then @@ -32204,7 +31040,7 @@ as_fn_error $? "--with-boost-libdir expected directory name" "$LINENO" 5 fi -else $as_nop +else ac_boost_lib_path="" fi @@ -32220,8 +31056,8 @@ boost_lib_version_req_sub_minor="0" fi WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for boostlib >= $boost_lib_version_req" >&5 -printf %s "checking for boostlib >= $boost_lib_version_req... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= $boost_lib_version_req" >&5 +$as_echo_n "checking for boostlib >= $boost_lib_version_req... " >&6; } succeeded=no libsubdirs="lib" @@ -32281,7 +31117,7 @@ #include int -main (void) +main () { #if BOOST_VERSION >= $WANT_BOOST_VERSION @@ -32294,16 +31130,15 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes found_system=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -32365,8 +31200,8 @@ stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'` V_CHECK=`expr $stage_version_shorten \>\= $_version` if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: We will use a staged boost library from $BOOST_ROOT" >&5 -printf "%s\n" "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: We will use a staged boost library from $BOOST_ROOT" >&5 +$as_echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} BOOST_CPPFLAGS="-I$BOOST_ROOT" BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir" fi @@ -32391,7 +31226,7 @@ #include int -main (void) +main () { #if BOOST_VERSION >= $WANT_BOOST_VERSION @@ -32404,16 +31239,15 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes found_system=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -32424,11 +31258,11 @@ if test "$succeeded" != "yes" ; then if test "$_version" = "0" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 -printf "%s\n" "$as_me: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 +$as_echo "$as_me: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Your boost libraries seems to old (version $_version)." >&5 -printf "%s\n" "$as_me: Your boost libraries seems to old (version $_version)." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Your boost libraries seems to old (version $_version)." >&5 +$as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;} fi # execute ACTION-IF-NOT-FOUND (if present): as_fn_error $? "no suitable Boost found" "$LINENO" 5 @@ -32436,7 +31270,7 @@ -printf "%s\n" "#define HAVE_BOOST /**/" >>confdefs.h +$as_echo "#define HAVE_BOOST /**/" >>confdefs.h # execute ACTION-IF-FOUND (if present): : @@ -32450,8 +31284,7 @@ # Check whether --with-boost-date-time was given. -if test ${with_boost_date_time+y} -then : +if test "${with_boost_date_time+set}" = set; then : withval=$with_boost_date_time; if test "$withval" = "no"; then want_boost="no" @@ -32463,7 +31296,7 @@ ax_boost_user_date_time_lib="$withval" fi -else $as_nop +else want_boost="yes" fi @@ -32479,12 +31312,11 @@ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" export LDFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Date_Time library is available" >&5 -printf %s "checking whether the Boost::Date_Time library is available... " >&6; } -if test ${ax_cv_boost_date_time+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Date_Time library is available" >&5 +$as_echo_n "checking whether the Boost::Date_Time library is available... " >&6; } +if ${ax_cv_boost_date_time+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -32495,7 +31327,7 @@ /* end confdefs.h. */ #include int -main (void) +main () { using namespace boost::gregorian; date d(2002,Jan,10); return 0; @@ -32504,13 +31336,12 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_boost_date_time=yes -else $as_nop +else ax_cv_boost_date_time=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -32519,23 +31350,22 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_date_time" >&5 -printf "%s\n" "$ax_cv_boost_date_time" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_date_time" >&5 +$as_echo "$ax_cv_boost_date_time" >&6; } if test "x$ax_cv_boost_date_time" = "xyes"; then -printf "%s\n" "#define HAVE_BOOST_DATE_TIME /**/" >>confdefs.h +$as_echo "#define HAVE_BOOST_DATE_TIME /**/" >>confdefs.h BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` if test "x$ax_boost_user_date_time_lib" = "x"; then for libextension in `ls $BOOSTLIBDIR/libboost_date_time*.so* $BOOSTLIBDIR/libboost_date_time*.dylib* $BOOSTLIBDIR/libboost_date_time*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_date_time.*\)\.so.*$;\1;' -e 's;^lib\(boost_date_time.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_date_time.*\)\.a*$;\1;'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32544,32 +31374,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_DATE_TIME_LIB="-l$ax_lib"; link_date_time="yes"; break -else $as_nop +else link_date_time="no" fi @@ -32577,13 +31408,12 @@ if test "x$link_date_time" != "xyes"; then for libextension in `ls $BOOSTLIBDIR/boost_date_time*.dll* $BOOSTLIBDIR/boost_date_time*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_date_time.*\)\.dll.*$;\1;' -e 's;^\(boost_date_time.*\)\.a.*$;\1;'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32592,32 +31422,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_DATE_TIME_LIB="-l$ax_lib"; link_date_time="yes"; break -else $as_nop +else link_date_time="no" fi @@ -32626,13 +31457,12 @@ else for ax_lib in $ax_boost_user_date_time_lib boost_date_time-$ax_boost_user_date_time_lib; do - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_main" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 -printf %s "checking for main in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32640,30 +31470,28 @@ int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_DATE_TIME_LIB="-l$ax_lib"; link_date_time="yes"; break -else $as_nop +else link_date_time="no" fi @@ -32685,8 +31513,7 @@ # Check whether --with-boost-filesystem was given. -if test ${with_boost_filesystem+y} -then : +if test "${with_boost_filesystem+set}" = set; then : withval=$with_boost_filesystem; if test "$withval" = "no"; then want_boost="no" @@ -32698,7 +31525,7 @@ ax_boost_user_filesystem_lib="$withval" fi -else $as_nop +else want_boost="yes" fi @@ -32718,12 +31545,11 @@ LIBS="$LIBS $BOOST_SYSTEM_LIB" export LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Filesystem library is available" >&5 -printf %s "checking whether the Boost::Filesystem library is available... " >&6; } -if test ${ax_cv_boost_filesystem+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Filesystem library is available" >&5 +$as_echo_n "checking whether the Boost::Filesystem library is available... " >&6; } +if ${ax_cv_boost_filesystem+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -32734,7 +31560,7 @@ /* end confdefs.h. */ #include int -main (void) +main () { using namespace boost::filesystem; path my_path( "foo/bar/data.txt" ); @@ -32743,13 +31569,12 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_boost_filesystem=yes -else $as_nop +else ax_cv_boost_filesystem=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -32758,23 +31583,22 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_filesystem" >&5 -printf "%s\n" "$ax_cv_boost_filesystem" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_filesystem" >&5 +$as_echo "$ax_cv_boost_filesystem" >&6; } if test "x$ax_cv_boost_filesystem" = "xyes"; then -printf "%s\n" "#define HAVE_BOOST_FILESYSTEM /**/" >>confdefs.h +$as_echo "#define HAVE_BOOST_FILESYSTEM /**/" >>confdefs.h BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` if test "x$ax_boost_user_filesystem_lib" = "x"; then for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32783,32 +31607,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_FILESYSTEM_LIB="-l$ax_lib"; link_filesystem="yes"; break -else $as_nop +else link_filesystem="no" fi @@ -32816,13 +31641,12 @@ if test "x$link_filesystem" != "xyes"; then for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32831,32 +31655,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_FILESYSTEM_LIB="-l$ax_lib"; link_filesystem="yes"; break -else $as_nop +else link_filesystem="no" fi @@ -32864,13 +31689,12 @@ fi else for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32879,32 +31703,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_FILESYSTEM_LIB="-l$ax_lib"; link_filesystem="yes"; break -else $as_nop +else link_filesystem="no" fi @@ -32927,8 +31752,7 @@ # Check whether --with-boost-iostreams was given. -if test ${with_boost_iostreams+y} -then : +if test "${with_boost_iostreams+set}" = set; then : withval=$with_boost_iostreams; if test "$withval" = "no"; then want_boost="no" @@ -32940,7 +31764,7 @@ ax_boost_user_iostreams_lib="$withval" fi -else $as_nop +else want_boost="yes" fi @@ -32956,12 +31780,11 @@ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" export LDFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Boost::IOStreams library is available" >&5 -printf %s "checking whether the Boost::IOStreams library is available... " >&6; } -if test ${ax_cv_boost_iostreams+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::IOStreams library is available" >&5 +$as_echo_n "checking whether the Boost::IOStreams library is available... " >&6; } +if ${ax_cv_boost_iostreams+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -32974,7 +31797,7 @@ #include int -main (void) +main () { std::string input = "Hello World!"; namespace io = boost::iostreams; @@ -32985,13 +31808,12 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_boost_iostreams=yes -else $as_nop +else ax_cv_boost_iostreams=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -33000,23 +31822,22 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_iostreams" >&5 -printf "%s\n" "$ax_cv_boost_iostreams" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_iostreams" >&5 +$as_echo "$ax_cv_boost_iostreams" >&6; } if test "x$ax_cv_boost_iostreams" = "xyes"; then -printf "%s\n" "#define HAVE_BOOST_IOSTREAMS /**/" >>confdefs.h +$as_echo "#define HAVE_BOOST_IOSTREAMS /**/" >>confdefs.h BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` if test "x$ax_boost_user_iostreams_lib" = "x"; then for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.so* $BOOSTLIBDIR/libboost_iostream*.dylib* $BOOSTLIBDIR/libboost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_iostreams.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostream.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_iostreams.*\)\.a.*$;\1;'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33025,32 +31846,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_IOSTREAMS_LIB="-l$ax_lib"; link_iostreams="yes"; break -else $as_nop +else link_iostreams="no" fi @@ -33058,13 +31880,12 @@ if test "x$link_iostreams" != "xyes"; then for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.dll* $BOOSTLIBDIR/boost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e 's;^\(boost_iostreams.*\)\.a.*$;\1;'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33073,32 +31894,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_IOSTREAMS_LIB="-l$ax_lib"; link_iostreams="yes"; break -else $as_nop +else link_iostreams="no" fi @@ -33107,13 +31929,12 @@ else for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_main" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 -printf %s "checking for main in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33121,30 +31942,28 @@ int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_IOSTREAMS_LIB="-l$ax_lib"; link_iostreams="yes"; break -else $as_nop +else link_iostreams="no" fi @@ -33166,8 +31985,7 @@ # Check whether --with-boost-locale was given. -if test ${with_boost_locale+y} -then : +if test "${with_boost_locale+set}" = set; then : withval=$with_boost_locale; if test "$withval" = "no"; then want_boost="no" @@ -33179,7 +31997,7 @@ ax_boost_user_locale_lib="$withval" fi -else $as_nop +else want_boost="yes" fi @@ -33196,12 +32014,11 @@ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" export LDFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Locale library is available" >&5 -printf %s "checking whether the Boost::Locale library is available... " >&6; } -if test ${ax_cv_boost_locale+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Locale library is available" >&5 +$as_echo_n "checking whether the Boost::Locale library is available... " >&6; } +if ${ax_cv_boost_locale+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -33214,7 +32031,7 @@ /* end confdefs.h. */ #include int -main (void) +main () { boost::locale::generator gen; std::locale::global(gen("")); @@ -33222,13 +32039,12 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_boost_locale=yes -else $as_nop +else ax_cv_boost_locale=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$CXXFLAGS_SAVE ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -33238,13 +32054,13 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_locale" >&5 -printf "%s\n" "$ax_cv_boost_locale" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_locale" >&5 +$as_echo "$ax_cv_boost_locale" >&6; } if test "x$ax_cv_boost_locale" = "xyes"; then -printf "%s\n" "#define HAVE_BOOST_LOCALE /**/" >>confdefs.h +$as_echo "#define HAVE_BOOST_LOCALE /**/" >>confdefs.h BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` @@ -33252,13 +32068,12 @@ if test "x$ax_boost_user_locale_lib" = "x"; then for libextension in `ls $BOOSTLIBDIR/libboost_locale*.so* $BOOSTLIBDIR/libboost_locale*.dylib* $BOOSTLIBDIR/libboost_locale*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_locale.*\)\.so.*$;\1;' -e 's;^lib\(boost_locale.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_locale.*\)\.a.*$;\1;'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33267,32 +32082,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_LOCALE_LIB="-l$ax_lib"; link_locale="yes"; break -else $as_nop +else link_locale="no" fi @@ -33300,13 +32116,12 @@ if test "x$link_locale" != "xyes"; then for libextension in `ls $BOOSTLIBDIR/boost_locale*.dll* $BOOSTLIBDIR/boost_locale*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_locale.*\)\.dll.*$;\1;' -e 's;^\(boost_locale.*\)\.a.*$;\1;'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33315,32 +32130,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_LOCALE_LIB="-l$ax_lib"; link_locale="yes"; break -else $as_nop +else link_locale="no" fi @@ -33349,13 +32165,12 @@ else for ax_lib in $ax_boost_user_locale_lib boost_locale-$ax_boost_user_locale_lib; do - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33364,32 +32179,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_LOCALE_LIB="-l$ax_lib"; link_locale="yes"; break -else $as_nop +else link_locale="no" fi @@ -33416,22 +32232,22 @@ save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $BOOST_CPPFLAGS $CXXFLAGS_CXX11" - ac_fn_cxx_check_header_compile "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default" -if test "x$ac_cv_header_boost_shared_ptr_hpp" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default" +if test "x$ac_cv_header_boost_shared_ptr_hpp" = xyes; then : -else $as_nop +else as_fn_error $? "boost/shared_ptr.hpp not found. install boost" "$LINENO" 5 fi - ac_fn_cxx_check_header_compile "$LINENO" "boost/spirit/include/classic_core.hpp" "ac_cv_header_boost_spirit_include_classic_core_hpp" "$ac_includes_default" -if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = xyes -then : -else $as_nop + ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/classic_core.hpp" "ac_cv_header_boost_spirit_include_classic_core_hpp" "$ac_includes_default" +if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = xyes; then : + +else as_fn_error $? "boost/spirit/include/classic_core.hpp not found. install boost >= 1.36" "$LINENO" 5 fi + CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -33443,8 +32259,8 @@ FilterLibs "${BOOST_LDFLAGS}" BOOST_LDFLAGS="${filteredlibs}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE BOOST" SYSTEM_BOOST= if test "${COM}" = "GCC" -o "${COM_IS_CLANG}" = "TRUE"; then @@ -33477,10 +32293,9 @@ # Check whether --with-system-mdds was given. -if test ${with_system_mdds+y} -then : +if test "${with_system_mdds+set}" = set; then : withval=$with_system_mdds; -else $as_nop +else if test "${with_system_mdds+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_mdds="$with_system_libs"; @@ -33492,27 +32307,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which mdds to use" >&5 -printf %s "checking which mdds to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mdds to use" >&5 +$as_echo_n "checking which mdds to use... " >&6; } if test "$test_mdds" != no -a "$found_mdds" != yes -a "$enable_mdds" != no; then ENABLE_MDDS=TRUE if test "$with_system_mdds" = yes -a "$test_system_mdds" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_MDDS=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MDDS" >&5 -printf %s "checking for MDDS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdds-2.0 >= 2.0.0" >&5 +$as_echo_n "checking for mdds-2.0 >= 2.0.0... " >&6; } if test -n "$MDDS_CFLAGS"; then pkg_cv_MDDS_CFLAGS="$MDDS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-2.0 >= 2.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-2.0 >= 2.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "mdds-2.0 >= 2.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds-2.0 >= 2.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33526,10 +32341,10 @@ pkg_cv_MDDS_LIBS="$MDDS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-2.0 >= 2.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-2.0 >= 2.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "mdds-2.0 >= 2.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds-2.0 >= 2.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33543,8 +32358,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -33570,10 +32385,10 @@ and MDDS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -33587,16 +32402,16 @@ else MDDS_CFLAGS=$pkg_cv_MDDS_CFLAGS MDDS_LIBS=$pkg_cv_MDDS_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi MDDS_CFLAGS=$(printf '%s' "${MDDS_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${MDDS_LIBS}" MDDS_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_MDDS= MDDS_CFLAGS="${MDDS_CFLAGS_internal}" MDDS_LIBS="${MDDS_LIBS_internal}" @@ -33604,8 +32419,8 @@ fi else if test "$found_mdds" = yes -a "$enable_mdds" != no -a "$with_system_mdds" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_MDDS=TRUE SYSTEM_MDDS=TRUE else @@ -33614,11 +32429,11 @@ MDDS_CFLAGS= MDDS_LIBS= if test "$test_mdds" != no -a "$enable_mdds" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -33628,11 +32443,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which dragonbox to use" >&5 -printf %s "checking which dragonbox to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which dragonbox to use" >&5 +$as_echo_n "checking which dragonbox to use... " >&6; } if test "$with_system_dragonbox" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_DRAGONBOX=TRUE ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -33644,14 +32459,14 @@ # This is where upstream installs to, unfortunately no .pc or so... DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.0.0 CPPFLAGS="$CPPFLAGS $DRAGONBOX_CFLAGS" - ac_fn_cxx_check_header_compile "$LINENO" "dragonbox/dragonbox.h" "ac_cv_header_dragonbox_dragonbox_h" "$ac_includes_default" -if test "x$ac_cv_header_dragonbox_dragonbox_h" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "dragonbox/dragonbox.h" "ac_cv_header_dragonbox_dragonbox_h" "$ac_includes_default" +if test "x$ac_cv_header_dragonbox_dragonbox_h" = xyes; then : -else $as_nop +else as_fn_error $? "dragonbox/dragonbox.h not found. install dragonbox" "$LINENO" 5 fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -33660,19 +32475,19 @@ CPPFLAGS=$save_CPPFLAGS else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE DRAGONBOX" SYSTEM_DRAGONBOX= fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libfixmath to use" >&5 -printf %s "checking which libfixmath to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libfixmath to use" >&5 +$as_echo_n "checking which libfixmath to use... " >&6; } if test "$with_system_libfixmath" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBFIXMATH=TRUE ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -33680,52 +32495,53 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_fn_cxx_check_header_compile "$LINENO" "libfixmath/fix16.hpp" "ac_cv_header_libfixmath_fix16_hpp" "$ac_includes_default" -if test "x$ac_cv_header_libfixmath_fix16_hpp" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "libfixmath/fix16.hpp" "ac_cv_header_libfixmath_fix16_hpp" "$ac_includes_default" +if test "x$ac_cv_header_libfixmath_fix16_hpp" = xyes; then : -else $as_nop +else as_fn_error $? "libfixmath/fix16.hpp not found. install libfixmath" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fix16_mul in -llibfixmath" >&5 -printf %s "checking for fix16_mul in -llibfixmath... " >&6; } -if test ${ac_cv_lib_libfixmath_fix16_mul+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fix16_mul in -llibfixmath" >&5 +$as_echo_n "checking for fix16_mul in -llibfixmath... " >&6; } +if ${ac_cv_lib_libfixmath_fix16_mul+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llibfixmath $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int fix16_mul (); -} +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fix16_mul (); int -main (void) +main () { -return conftest::fix16_mul (); +return fix16_mul (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_libfixmath_fix16_mul=yes -else $as_nop +else ac_cv_lib_libfixmath_fix16_mul=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_libfixmath_fix16_mul" >&5 -printf "%s\n" "$ac_cv_lib_libfixmath_fix16_mul" >&6; } -if test "x$ac_cv_lib_libfixmath_fix16_mul" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_libfixmath_fix16_mul" >&5 +$as_echo "$ac_cv_lib_libfixmath_fix16_mul" >&6; } +if test "x$ac_cv_lib_libfixmath_fix16_mul" = xyes; then : : -else $as_nop +else as_fn_error $? "libfixmath lib not found or functional" "$LINENO" 5 fi @@ -33736,17 +32552,17 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBFIXMATH= fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which glm to use" >&5 -printf %s "checking which glm to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which glm to use" >&5 +$as_echo_n "checking which glm to use... " >&6; } if test "$with_system_glm" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_GLM=TRUE ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -33754,14 +32570,14 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_fn_cxx_check_header_compile "$LINENO" "glm/glm.hpp" "ac_cv_header_glm_glm_hpp" "$ac_includes_default" -if test "x$ac_cv_header_glm_glm_hpp" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "glm/glm.hpp" "ac_cv_header_glm_glm_hpp" "$ac_includes_default" +if test "x$ac_cv_header_glm_glm_hpp" = xyes; then : -else $as_nop +else as_fn_error $? "glm/glm.hpp not found. install glm" "$LINENO" 5 fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -33769,8 +32585,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE GLM" SYSTEM_GLM= GLM_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/glm" @@ -33778,11 +32594,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which odbc headers to use" >&5 -printf %s "checking which odbc headers to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which odbc headers to use" >&5 +$as_echo_n "checking which odbc headers to use... " >&6; } if test "$with_system_odbc" = "yes" -o '(' "$with_system_headers" = "yes" -a "$with_system_odbc" = "auto" ')' -o '(' "$_os" = "WINNT" -a "$with_system_odbc" != "no" ')'; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ODBC_HEADERS=TRUE if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then @@ -33792,30 +32608,30 @@ CPPFLAGS="$CPPFLAGS -I$formatted_path/include/um -I$formatted_path/Include/$winsdklibsubdir/um -I$formatted_path/include -I$formatted_path/include/shared -I$formatted_path/include/$winsdklibsubdir/shared" ac_fn_c_check_header_compile "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "#include " -if test "x$ac_cv_header_sqlext_h" = xyes -then : +if test "x$ac_cv_header_sqlext_h" = xyes; then : -else $as_nop +else as_fn_error $? "odbc not found. install odbc" "$LINENO" 5 fi + CPPFLAGS=$save_CPPFLAGS else - ac_fn_c_check_header_compile "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default" -if test "x$ac_cv_header_sqlext_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default" +if test "x$ac_cv_header_sqlext_h" = xyes; then : -else $as_nop +else as_fn_error $? "odbc not found. install odbc" "$LINENO" 5 fi + fi elif test "$enable_database_connectivity" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ODBC_HEADERS= fi @@ -33840,10 +32656,9 @@ # Check whether --with-system-nss was given. -if test ${with_system_nss+y} -then : +if test "${with_system_nss+set}" = set; then : withval=$with_system_nss; -else $as_nop +else case "$_os" in Linux) with_system_nss=yes @@ -33856,27 +32671,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which nss to use" >&5 -printf %s "checking which nss to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which nss to use" >&5 +$as_echo_n "checking which nss to use... " >&6; } if test "$test_nss" != no -a "$found_nss" != yes -a "$enable_nss" != no; then ENABLE_NSS=TRUE if test "$with_system_nss" = yes -a "$test_system_nss" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_NSS=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5 -printf %s "checking for NSS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss >= 3.9.3 nspr >= 4.8" >&5 +$as_echo_n "checking for nss >= 3.9.3 nspr >= 4.8... " >&6; } if test -n "$NSS_CFLAGS"; then pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss >= 3.9.3 nspr >= 4.8\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss >= 3.9.3 nspr >= 4.8\""; } >&5 ($PKG_CONFIG --exists --print-errors "nss >= 3.9.3 nspr >= 4.8") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss >= 3.9.3 nspr >= 4.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33890,10 +32705,10 @@ pkg_cv_NSS_LIBS="$NSS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss >= 3.9.3 nspr >= 4.8\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss >= 3.9.3 nspr >= 4.8\""; } >&5 ($PKG_CONFIG --exists --print-errors "nss >= 3.9.3 nspr >= 4.8") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss >= 3.9.3 nspr >= 4.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33907,8 +32722,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -33934,10 +32749,10 @@ and NSS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -33951,16 +32766,16 @@ else NSS_CFLAGS=$pkg_cv_NSS_CFLAGS NSS_LIBS=$pkg_cv_NSS_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi NSS_CFLAGS=$(printf '%s' "${NSS_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${NSS_LIBS}" NSS_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_NSS= NSS_CFLAGS="${NSS_CFLAGS_internal}" NSS_LIBS="${NSS_LIBS_internal}" @@ -33968,8 +32783,8 @@ fi else if test "$found_nss" = yes -a "$enable_nss" != no -a "$with_system_nss" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_NSS=TRUE SYSTEM_NSS=TRUE else @@ -33978,11 +32793,11 @@ NSS_CFLAGS= NSS_LIBS= if test "$test_nss" != no -a "$enable_nss" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -33991,7 +32806,7 @@ - printf "%s\n" "#define HAVE_FEATURE_NSS 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_NSS 1" >>confdefs.h ENABLE_NSS=TRUE elif test $_os != iOS ; then @@ -34001,48 +32816,49 @@ if test "$test_openldap" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable LDAP support" >&5 -printf %s "checking whether to enable LDAP support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable LDAP support" >&5 +$as_echo_n "checking whether to enable LDAP support... " >&6; } if test "$enable_ldap" = yes -a \( "$ENABLE_NSS" = TRUE -o "$with_system_openldap" = yes \); then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_LDAP=TRUE else if test "$enable_ldap" != "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (needs NSS or system openldap)" >&5 -printf "%s\n" "no (needs NSS or system openldap)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (needs NSS or system openldap)" >&5 +$as_echo "no (needs NSS or system openldap)" >&6; } fi fi if test "$ENABLE_LDAP" = TRUE; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which openldap library to use" >&5 -printf %s "checking which openldap library to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which openldap library to use" >&5 +$as_echo_n "checking which openldap library to use... " >&6; } if test "$with_system_openldap" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_OPENLDAP=TRUE - for ac_header in ldap.h + for ac_header in ldap.h do : - ac_fn_c_check_header_compile "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" -if test "x$ac_cv_header_ldap_h" = xyes -then : - printf "%s\n" "#define HAVE_LDAP_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" +if test "x$ac_cv_header_ldap_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LDAP_H 1 +_ACEOF -else $as_nop +else as_fn_error $? "ldap.h not found. install openldap libs" "$LINENO" 5 fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ldap_simple_bind_s in -lldap" >&5 -printf %s "checking for ldap_simple_bind_s in -lldap... " >&6; } -if test ${ac_cv_lib_ldap_ldap_simple_bind_s+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_simple_bind_s in -lldap" >&5 +$as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; } +if ${ac_cv_lib_ldap_ldap_simple_bind_s+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -34051,40 +32867,40 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char ldap_simple_bind_s (); int -main (void) +main () { return ldap_simple_bind_s (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ldap_ldap_simple_bind_s=yes -else $as_nop +else ac_cv_lib_ldap_ldap_simple_bind_s=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5 -printf "%s\n" "$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; } -if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5 +$as_echo "$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; } +if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = xyes; then : : -else $as_nop +else as_fn_error $? "openldap lib not found or functional" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ldap_set_option in -lldap" >&5 -printf %s "checking for ldap_set_option in -lldap... " >&6; } -if test ${ac_cv_lib_ldap_ldap_set_option+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_set_option in -lldap" >&5 +$as_echo_n "checking for ldap_set_option in -lldap... " >&6; } +if ${ac_cv_lib_ldap_ldap_set_option+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -34093,37 +32909,38 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char ldap_set_option (); int -main (void) +main () { return ldap_set_option (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ldap_ldap_set_option=yes -else $as_nop +else ac_cv_lib_ldap_ldap_set_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_set_option" >&5 -printf "%s\n" "$ac_cv_lib_ldap_ldap_set_option" >&6; } -if test "x$ac_cv_lib_ldap_ldap_set_option" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_set_option" >&5 +$as_echo "$ac_cv_lib_ldap_ldap_set_option" >&6; } +if test "x$ac_cv_lib_ldap_ldap_set_option" = xyes; then : : -else $as_nop +else as_fn_error $? "openldap lib not found or functional" "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE OPENLDAP" fi fi @@ -34132,42 +32949,42 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which TLS/SSL and cryptographic implementation to use" >&5 -printf %s "checking which TLS/SSL and cryptographic implementation to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which TLS/SSL and cryptographic implementation to use" >&5 +$as_echo_n "checking which TLS/SSL and cryptographic implementation to use... " >&6; } if test -n "$with_tls"; then case $with_tls in openssl) - printf "%s\n" "#define USE_TLS_OPENSSL 1" >>confdefs.h + $as_echo "#define USE_TLS_OPENSSL 1" >>confdefs.h TLS=OPENSSL - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TLS" >&5 -printf "%s\n" "$TLS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TLS" >&5 +$as_echo "$TLS" >&6; } if test "$enable_openssl" != "yes"; then as_fn_error $? "\"Disabling OpenSSL was requested, but the requested TLS to use is actually OpenSSL.\"" "$LINENO" 5 fi # warn that OpenSSL has been selected but not all TLS code has this option - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: TLS/SSL implementation to use is OpenSSL but some code may still depend on NSS" >&5 -printf "%s\n" "$as_me: WARNING: TLS/SSL implementation to use is OpenSSL but some code may still depend on NSS" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS/SSL implementation to use is OpenSSL but some code may still depend on NSS" >&5 +$as_echo "$as_me: WARNING: TLS/SSL implementation to use is OpenSSL but some code may still depend on NSS" >&2;} add_warning "TLS/SSL implementation to use is OpenSSL but some code may still depend on NSS" ;; nss) - printf "%s\n" "#define USE_TLS_NSS 1" >>confdefs.h + $as_echo "#define USE_TLS_NSS 1" >>confdefs.h TLS=NSS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TLS" >&5 -printf "%s\n" "$TLS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TLS" >&5 +$as_echo "$TLS" >&6; } ;; no) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping TLS/SSL" >&5 -printf "%s\n" "$as_me: WARNING: Skipping TLS/SSL" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping TLS/SSL" >&5 +$as_echo "$as_me: WARNING: Skipping TLS/SSL" >&2;} ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf "%s\n" "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } as_fn_error $? "unsupported implementation $with_tls. Supported are: openssl - OpenSSL nss - Mozilla's Network Security Services (NSS) @@ -34176,30 +32993,30 @@ esac else # default to using NSS, it results in smaller oox lib - printf "%s\n" "#define USE_TLS_NSS 1" >>confdefs.h + $as_echo "#define USE_TLS_NSS 1" >>confdefs.h TLS=NSS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TLS" >&5 -printf "%s\n" "$TLS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TLS" >&5 +$as_echo "$TLS" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which sane header to use" >&5 -printf %s "checking which sane header to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which sane header to use" >&5 +$as_echo_n "checking which sane header to use... " >&6; } if test "$with_system_sane" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } - ac_fn_c_check_header_compile "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default" -if test "x$ac_cv_header_sane_sane_h" = xyes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } + ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default" +if test "x$ac_cv_header_sane_sane_h" = xyes; then : -else $as_nop +else as_fn_error $? "sane not found. install sane" "$LINENO" 5 fi + else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE SANE" fi @@ -34230,10 +33047,9 @@ # Check whether --with-system-icu was given. -if test ${with_system_icu+y} -then : +if test "${with_system_icu+set}" = set; then : withval=$with_system_icu; -else $as_nop +else if test "${with_system_icu+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_icu="$with_system_libs"; @@ -34245,27 +33061,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which icu to use" >&5 -printf %s "checking which icu to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which icu to use" >&5 +$as_echo_n "checking which icu to use... " >&6; } if test "$test_icu" != no -a "$found_icu" != yes -a "$enable_icu" != no; then ENABLE_ICU=TRUE if test "$with_system_icu" = yes -a "$test_system_icu" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ICU=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ICU" >&5 -printf %s "checking for ICU... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icu-i18n >= 4.6" >&5 +$as_echo_n "checking for icu-i18n >= 4.6... " >&6; } if test -n "$ICU_CFLAGS"; then pkg_cv_ICU_CFLAGS="$ICU_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n >= 4.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n >= 4.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "icu-i18n >= 4.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 4.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34279,10 +33095,10 @@ pkg_cv_ICU_LIBS="$ICU_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n >= 4.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n >= 4.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "icu-i18n >= 4.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n >= 4.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34296,8 +33112,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -34323,10 +33139,10 @@ and ICU_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -34340,16 +33156,16 @@ else ICU_CFLAGS=$pkg_cv_ICU_CFLAGS ICU_LIBS=$pkg_cv_ICU_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi ICU_CFLAGS=$(printf '%s' "${ICU_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${ICU_LIBS}" ICU_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ICU= ICU_CFLAGS="${ICU_CFLAGS_internal}" ICU_LIBS="${ICU_LIBS_internal}" @@ -34357,8 +33173,8 @@ fi else if test "$found_icu" = yes -a "$enable_icu" != no -a "$with_system_icu" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_ICU=TRUE SYSTEM_ICU=TRUE else @@ -34367,11 +33183,11 @@ ICU_CFLAGS= ICU_LIBS= if test "$test_icu" != no -a "$enable_icu" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -34387,17 +33203,16 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unicode/rbbi.h" >&5 -printf %s "checking for unicode/rbbi.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unicode/rbbi.h" >&5 +$as_echo_n "checking for unicode/rbbi.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ unicode/rbbi.h _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else $as_nop +if ac_fn_cxx_try_cpp "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else as_fn_error $? "icu headers not found" "$LINENO" 5 fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -34413,8 +33228,8 @@ ICU_MINOR=`echo $ICU_VERSION | cut -d"." -f2` if test "$ICU_MAJOR" -ge 50; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Ignore ICU_MINOR as obviously the libraries don't include the minor version in their names any more" >&5 -printf "%s\n" "$as_me: Ignore ICU_MINOR as obviously the libraries don't include the minor version in their names any more" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Ignore ICU_MINOR as obviously the libraries don't include the minor version in their names any more" >&5 +$as_echo "$as_me: Ignore ICU_MINOR as obviously the libraries don't include the minor version in their names any more" >&6;} ICU_MINOR= fi @@ -34423,12 +33238,11 @@ # ones from the build environment when cross-compiling # Extract the first word of "genbrk", so it can be a program name with args. set dummy genbrk; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_SYSTEM_GENBRK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SYSTEM_GENBRK+:} false; then : + $as_echo_n "(cached) " >&6 +else case $SYSTEM_GENBRK in [\\/]* | ?:[\\/]*) ac_cv_path_SYSTEM_GENBRK="$SYSTEM_GENBRK" # Let the user override the test with a path. @@ -34439,15 +33253,11 @@ for as_dir in $as_dummy do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_SYSTEM_GENBRK="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SYSTEM_GENBRK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -34459,11 +33269,11 @@ fi SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK if test -n "$SYSTEM_GENBRK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENBRK" >&5 -printf "%s\n" "$SYSTEM_GENBRK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENBRK" >&5 +$as_echo "$SYSTEM_GENBRK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -34472,12 +33282,11 @@ fi # Extract the first word of "genccode", so it can be a program name with args. set dummy genccode; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_SYSTEM_GENCCODE+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SYSTEM_GENCCODE+:} false; then : + $as_echo_n "(cached) " >&6 +else case $SYSTEM_GENCCODE in [\\/]* | ?:[\\/]*) ac_cv_path_SYSTEM_GENCCODE="$SYSTEM_GENCCODE" # Let the user override the test with a path. @@ -34488,15 +33297,11 @@ for as_dir in $as_dummy do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_SYSTEM_GENCCODE="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SYSTEM_GENCCODE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -34508,11 +33313,11 @@ fi SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE if test -n "$SYSTEM_GENCCODE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCCODE" >&5 -printf "%s\n" "$SYSTEM_GENCCODE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCCODE" >&5 +$as_echo "$SYSTEM_GENCCODE" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -34521,12 +33326,11 @@ fi # Extract the first word of "gencmn", so it can be a program name with args. set dummy gencmn; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_SYSTEM_GENCMN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SYSTEM_GENCMN+:} false; then : + $as_echo_n "(cached) " >&6 +else case $SYSTEM_GENCMN in [\\/]* | ?:[\\/]*) ac_cv_path_SYSTEM_GENCMN="$SYSTEM_GENCMN" # Let the user override the test with a path. @@ -34537,15 +33341,11 @@ for as_dir in $as_dummy do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_SYSTEM_GENCMN="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SYSTEM_GENCMN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -34557,11 +33357,11 @@ fi SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN if test -n "$SYSTEM_GENCMN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCMN" >&5 -printf "%s\n" "$SYSTEM_GENCMN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCMN" >&5 +$as_echo "$SYSTEM_GENCMN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -34595,44 +33395,44 @@ DEFAULT_CRASHDUMP_VALUE="true" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable breakpad" >&5 -printf %s "checking whether to enable breakpad... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable breakpad" >&5 +$as_echo_n "checking whether to enable breakpad... " >&6; } if test "$enable_breakpad" != yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_BREAKPAD="TRUE" - printf "%s\n" "#define ENABLE_BREAKPAD 1" >>confdefs.h + $as_echo "#define ENABLE_BREAKPAD 1" >>confdefs.h - printf "%s\n" "#define HAVE_FEATURE_BREAKPAD 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_BREAKPAD 1" >>confdefs.h BUILD_TYPE="$BUILD_TYPE BREAKPAD" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for disable crash dump" >&5 -printf %s "checking for disable crash dump... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for disable crash dump" >&5 +$as_echo_n "checking for disable crash dump... " >&6; } if test "$enable_crashdump" = no; then DEFAULT_CRASHDUMP_VALUE="false" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crashreport config" >&5 -printf %s "checking for crashreport config... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crashreport config" >&5 +$as_echo_n "checking for crashreport config... " >&6; } if test "$with_symbol_config" = "no"; then BREAKPAD_SYMBOL_CONFIG="invalid" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else BREAKPAD_SYMBOL_CONFIG="$with_symbol_config" - printf "%s\n" "#define BREAKPAD_SYMBOL_CONFIG 1" >>confdefs.h + $as_echo "#define BREAKPAD_SYMBOL_CONFIG 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi fi @@ -34659,10 +33459,9 @@ # Check whether --with-system-orcus was given. -if test ${with_system_orcus+y} -then : +if test "${with_system_orcus+set}" = set; then : withval=$with_system_orcus; -else $as_nop +else if test "${with_system_orcus+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_orcus="$with_system_libs"; @@ -34674,27 +33473,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which orcus to use" >&5 -printf %s "checking which orcus to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which orcus to use" >&5 +$as_echo_n "checking which orcus to use... " >&6; } if test "$test_orcus" != no -a "$found_orcus" != yes -a "$enable_orcus" != no; then ENABLE_ORCUS=TRUE if test "$with_system_orcus" = yes -a "$test_system_orcus" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ORCUS=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ORCUS" >&5 -printf %s "checking for ORCUS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liborcus-0.17 >= 0.17.2" >&5 +$as_echo_n "checking for liborcus-0.17 >= 0.17.2... " >&6; } if test -n "$ORCUS_CFLAGS"; then pkg_cv_ORCUS_CFLAGS="$ORCUS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.17 >= 0.17.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.17 >= 0.17.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "liborcus-0.17 >= 0.17.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.17 >= 0.17.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34708,10 +33507,10 @@ pkg_cv_ORCUS_LIBS="$ORCUS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.17 >= 0.17.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.17 >= 0.17.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "liborcus-0.17 >= 0.17.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.17 >= 0.17.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34725,8 +33524,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -34752,10 +33551,10 @@ and ORCUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -34769,16 +33568,16 @@ else ORCUS_CFLAGS=$pkg_cv_ORCUS_CFLAGS ORCUS_LIBS=$pkg_cv_ORCUS_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi ORCUS_CFLAGS=$(printf '%s' "${ORCUS_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${ORCUS_LIBS}" ORCUS_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ORCUS= ORCUS_CFLAGS="${ORCUS_CFLAGS_internal}" ORCUS_LIBS="${ORCUS_LIBS_internal}" @@ -34786,8 +33585,8 @@ fi else if test "$found_orcus" = yes -a "$enable_orcus" != no -a "$with_system_orcus" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_ORCUS=TRUE SYSTEM_ORCUS=TRUE else @@ -34796,11 +33595,11 @@ ORCUS_CFLAGS= ORCUS_LIBS= if test "$test_orcus" != no -a "$enable_orcus" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -34814,8 +33613,7 @@ # Check whether --with-boost-system was given. -if test ${with_boost_system+y} -then : +if test "${with_boost_system+set}" = set; then : withval=$with_boost_system; if test "$withval" = "no"; then want_boost="no" @@ -34827,7 +33625,7 @@ ax_boost_user_system_lib="$withval" fi -else $as_nop +else want_boost="yes" fi @@ -34844,12 +33642,11 @@ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" export LDFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5 -printf %s "checking whether the Boost::System library is available... " >&6; } -if test ${ax_cv_boost_system+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5 +$as_echo_n "checking whether the Boost::System library is available... " >&6; } +if ${ax_cv_boost_system+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -34863,20 +33660,19 @@ /* end confdefs.h. */ #include int -main (void) +main () { boost::system::error_category *a = 0; ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_boost_system=yes -else $as_nop +else ax_cv_boost_system=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$CXXFLAGS_SAVE ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -34886,13 +33682,13 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_system" >&5 -printf "%s\n" "$ax_cv_boost_system" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_system" >&5 +$as_echo "$ax_cv_boost_system" >&6; } if test "x$ax_cv_boost_system" = "xyes"; then -printf "%s\n" "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h +$as_echo "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` @@ -34900,13 +33696,12 @@ if test "x$ax_boost_user_system_lib" = "x"; then for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -34915,32 +33710,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break -else $as_nop +else link_system="no" fi @@ -34948,13 +33744,12 @@ if test "x$link_system" != "xyes"; then for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do ax_lib=${libextension} - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -34963,32 +33758,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break -else $as_nop +else link_system="no" fi @@ -34997,13 +33793,12 @@ else for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ax_lib""_exit" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -printf %s "checking for exit in -l$ax_lib... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -35012,32 +33807,33 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char exit (); int -main (void) +main () { return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break -else $as_nop +else link_system="no" fi @@ -35085,10 +33881,9 @@ # Check whether --with-system-graphite was given. -if test ${with_system_graphite+y} -then : +if test "${with_system_graphite+set}" = set; then : withval=$with_system_graphite; -else $as_nop +else if test "${with_system_graphite+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_graphite="$with_system_libs"; @@ -35100,27 +33895,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which graphite to use" >&5 -printf %s "checking which graphite to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which graphite to use" >&5 +$as_echo_n "checking which graphite to use... " >&6; } if test "$test_graphite" != no -a "$found_graphite" != yes -a "$enable_graphite" != no; then ENABLE_GRAPHITE=TRUE if test "$with_system_graphite" = yes -a "$test_system_graphite" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_GRAPHITE=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GRAPHITE" >&5 -printf %s "checking for GRAPHITE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for graphite2 >= 0.9.3" >&5 +$as_echo_n "checking for graphite2 >= 0.9.3... " >&6; } if test -n "$GRAPHITE_CFLAGS"; then pkg_cv_GRAPHITE_CFLAGS="$GRAPHITE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"graphite2 >= 0.9.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"graphite2 >= 0.9.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "graphite2 >= 0.9.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GRAPHITE_CFLAGS=`$PKG_CONFIG --cflags "graphite2 >= 0.9.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35134,10 +33929,10 @@ pkg_cv_GRAPHITE_LIBS="$GRAPHITE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"graphite2 >= 0.9.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"graphite2 >= 0.9.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "graphite2 >= 0.9.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GRAPHITE_LIBS=`$PKG_CONFIG --libs "graphite2 >= 0.9.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35151,8 +33946,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35178,10 +33973,10 @@ and GRAPHITE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -35195,16 +33990,16 @@ else GRAPHITE_CFLAGS=$pkg_cv_GRAPHITE_CFLAGS GRAPHITE_LIBS=$pkg_cv_GRAPHITE_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi GRAPHITE_CFLAGS=$(printf '%s' "${GRAPHITE_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${GRAPHITE_LIBS}" GRAPHITE_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_GRAPHITE= GRAPHITE_CFLAGS="${GRAPHITE_CFLAGS_internal}" GRAPHITE_LIBS="${GRAPHITE_LIBS_internal}" @@ -35212,8 +34007,8 @@ fi else if test "$found_graphite" = yes -a "$enable_graphite" != no -a "$with_system_graphite" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_GRAPHITE=TRUE SYSTEM_GRAPHITE=TRUE else @@ -35222,11 +34017,11 @@ GRAPHITE_CFLAGS= GRAPHITE_LIBS= if test "$test_graphite" != no -a "$enable_graphite" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -35258,10 +34053,9 @@ # Check whether --with-system-harfbuzz was given. -if test ${with_system_harfbuzz+y} -then : +if test "${with_system_harfbuzz+set}" = set; then : withval=$with_system_harfbuzz; -else $as_nop +else if test "${with_system_harfbuzz+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_harfbuzz="$with_system_libs"; @@ -35273,29 +34067,29 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which harfbuzz to use" >&5 -printf %s "checking which harfbuzz to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which harfbuzz to use" >&5 +$as_echo_n "checking which harfbuzz to use... " >&6; } if test "$test_harfbuzz" != no -a "$found_harfbuzz" != yes -a "$enable_harfbuzz" != no; then ENABLE_HARFBUZZ=TRUE if test "$with_system_harfbuzz" = yes -a "$test_system_harfbuzz" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_HARFBUZZ=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HARFBUZZ" >&5 -printf %s "checking for HARFBUZZ... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for harfbuzz-icu >= 2.1.0" >&5 +$as_echo_n "checking for harfbuzz-icu >= 2.1.0... " >&6; } if test -n "$HARFBUZZ_CFLAGS"; then pkg_cv_HARFBUZZ_CFLAGS="$HARFBUZZ_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"harfbuzz-icu >= 0.9.42\""; } >&5 - ($PKG_CONFIG --exists --print-errors "harfbuzz-icu >= 0.9.42") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"harfbuzz-icu >= 2.1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "harfbuzz-icu >= 2.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_HARFBUZZ_CFLAGS=`$PKG_CONFIG --cflags "harfbuzz-icu >= 0.9.42" 2>/dev/null` + pkg_cv_HARFBUZZ_CFLAGS=`$PKG_CONFIG --cflags "harfbuzz-icu >= 2.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -35307,12 +34101,12 @@ pkg_cv_HARFBUZZ_LIBS="$HARFBUZZ_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"harfbuzz-icu >= 0.9.42\""; } >&5 - ($PKG_CONFIG --exists --print-errors "harfbuzz-icu >= 0.9.42") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"harfbuzz-icu >= 2.1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "harfbuzz-icu >= 2.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_HARFBUZZ_LIBS=`$PKG_CONFIG --libs "harfbuzz-icu >= 0.9.42" 2>/dev/null` + pkg_cv_HARFBUZZ_LIBS=`$PKG_CONFIG --libs "harfbuzz-icu >= 2.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -35324,8 +34118,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35333,14 +34127,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "harfbuzz-icu >= 0.9.42" 2>&1` + HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "harfbuzz-icu >= 2.1.0" 2>&1` else - HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "harfbuzz-icu >= 0.9.42" 2>&1` + HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "harfbuzz-icu >= 2.1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$HARFBUZZ_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (harfbuzz-icu >= 0.9.42) were not met: + as_fn_error $? "Package requirements (harfbuzz-icu >= 2.1.0) were not met: $HARFBUZZ_PKG_ERRORS @@ -35351,10 +34145,10 @@ and HARFBUZZ_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -35368,16 +34162,16 @@ else HARFBUZZ_CFLAGS=$pkg_cv_HARFBUZZ_CFLAGS HARFBUZZ_LIBS=$pkg_cv_HARFBUZZ_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi HARFBUZZ_CFLAGS=$(printf '%s' "${HARFBUZZ_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${HARFBUZZ_LIBS}" HARFBUZZ_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_HARFBUZZ= HARFBUZZ_CFLAGS="${HARFBUZZ_CFLAGS_internal}" HARFBUZZ_LIBS="${HARFBUZZ_LIBS_internal}" @@ -35385,8 +34179,8 @@ fi else if test "$found_harfbuzz" = yes -a "$enable_harfbuzz" != no -a "$with_system_harfbuzz" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_HARFBUZZ=TRUE SYSTEM_HARFBUZZ=TRUE else @@ -35395,11 +34189,11 @@ HARFBUZZ_CFLAGS= HARFBUZZ_LIBS= if test "$test_harfbuzz" != no -a "$enable_harfbuzz" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -35418,17 +34212,16 @@ if test "$with_system_graphite" = "no"; then as_fn_error $? "--with-system-graphite must be used when --with-system-harfbuzz is used" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether system Harfbuzz is built with Graphite support" >&5 -printf %s "checking whether system Harfbuzz is built with Graphite support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system Harfbuzz is built with Graphite support" >&5 +$as_echo_n "checking whether system Harfbuzz is built with Graphite support... " >&6; } save_LIBS="$LIBS" save_CFLAGS="$CFLAGS" LIBS="$LIBS $HARFBUZZ_LIBS" CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS" ac_fn_c_check_func "$LINENO" "hb_graphite2_face_get_gr_face" "ac_cv_func_hb_graphite2_face_get_gr_face" -if test "x$ac_cv_func_hb_graphite2_face_get_gr_face" = xyes -then : +if test "x$ac_cv_func_hb_graphite2_face_get_gr_face" = xyes; then : -else $as_nop +else as_fn_error $? "Harfbuzz needs to be built with Graphite support." "$LINENO" 5 fi @@ -35441,14 +34234,12 @@ fi if test "$USING_X11" = TRUE; then - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -printf %s "checking for X... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 +$as_echo_n "checking for X... " >&6; } # Check whether --with-x was given. -if test ${with_x+y} -then : +if test "${with_x+set}" = set; then : withval=$with_x; fi @@ -35459,41 +34250,12 @@ else case $x_includes,$x_libraries in #( *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if test ${ac_cv_have_x+y} -then : - printf %s "(cached) " >&6 -else $as_nop + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : + $as_echo_n "(cached) " >&6 +else # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no -ac_x_libraries=no -# Do we need to do anything special at all? -ac_save_LIBS=$LIBS -LIBS="-lX11 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - # We can compile and link X programs with no special options. - ac_x_includes= - ac_x_libraries= -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS="$ac_save_LIBS" -# If that didn't work, only try xmkmf and file system searches -# for native compilation. -if test x"$ac_x_includes" = xno && test "$cross_compiling" = no -then : - rm -f -r conftest.dir +ac_x_includes=no ac_x_libraries=no +rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir cat >Imakefile <<'_ACEOF' @@ -35532,7 +34294,7 @@ rm -f -r conftest.dir fi - # Standard set of common directories for X headers. +# Standard set of common directories for X headers. # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include @@ -35559,8 +34321,6 @@ /usr/local/include/X11R5 /usr/local/include/X11R4 -/opt/X11/include - /usr/X386/include /usr/x386/include /usr/XFree86/include/X11 @@ -35582,11 +34342,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : # We can compile using X headers with no special include directory. ac_x_includes= -else $as_nop +else for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir @@ -35607,21 +34366,20 @@ /* end confdefs.h. */ #include int -main (void) +main () { XrmInitialize () ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= -else $as_nop +else LIBS=$ac_save_LIBS -for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl dylib la dll; do @@ -35632,21 +34390,19 @@ done done fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -fi -# Record the results. case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) : + no,* | *,no | *\'*) # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no" ;; #( - *) : + ac_cv_have_x="have_x=no";; #( + *) # Record where we found X for the cache. ac_cv_have_x="have_x=yes\ ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" ;; + ac_x_libraries='$ac_x_libraries'" esac fi ;; #( @@ -35656,8 +34412,8 @@ fi # $with_x != no if test "$have_x" != yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -printf "%s\n" "$have_x" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 +$as_echo "$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -35667,14 +34423,14 @@ ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 +$as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. -printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h +$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -35687,8 +34443,8 @@ X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -printf %s "checking whether -R must be followed by a space... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 +$as_echo_n "checking whether -R must be followed by a space... " >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -35696,44 +34452,42 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" -else $as_nop +else LIBS="$ac_xsave_LIBS -R $x_libraries" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -printf "%s\n" "neither works" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 +$as_echo "neither works" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag LIBS=$ac_xsave_LIBS @@ -35756,25 +34510,26 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char XOpenDisplay (); int -main (void) +main () { return XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -printf %s "checking for dnet_ntoa in -ldnet... " >&6; } -if test ${ac_cv_lib_dnet_dnet_ntoa+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -35783,39 +34538,39 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dnet_ntoa (); int -main (void) +main () { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_dnet_ntoa=yes -else $as_nop +else ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -printf "%s\n" "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -printf %s "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if test ${ac_cv_lib_dnet_stub_dnet_ntoa+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -35824,35 +34579,36 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dnet_ntoa (); int -main (void) +main () { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_stub_dnet_ntoa=yes -else $as_nop +else ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -35865,18 +34621,16 @@ # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes -then : +if test "x$ac_cv_func_gethostbyname" = xyes; then : fi if test $ac_cv_func_gethostbyname = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -printf %s "checking for gethostbyname in -lnsl... " >&6; } -if test ${ac_cv_lib_nsl_gethostbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -35885,39 +34639,39 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char gethostbyname (); int -main (void) +main () { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_nsl_gethostbyname=yes -else $as_nop +else ac_cv_lib_nsl_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -printf %s "checking for gethostbyname in -lbsd... " >&6; } -if test ${ac_cv_lib_bsd_gethostbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 +$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +if ${ac_cv_lib_bsd_gethostbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -35926,29 +34680,30 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char gethostbyname (); int -main (void) +main () { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bsd_gethostbyname=yes -else $as_nop +else ac_cv_lib_bsd_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -printf "%s\n" "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 +$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -35963,18 +34718,16 @@ # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = xyes -then : +if test "x$ac_cv_func_connect" = xyes; then : fi if test $ac_cv_func_connect = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -printf %s "checking for connect in -lsocket... " >&6; } -if test ${ac_cv_lib_socket_connect+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +$as_echo_n "checking for connect in -lsocket... " >&6; } +if ${ac_cv_lib_socket_connect+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -35983,29 +34736,30 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char connect (); int -main (void) +main () { return connect (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_connect=yes -else $as_nop +else ac_cv_lib_socket_connect=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -printf "%s\n" "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +$as_echo "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = xyes; then : X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -36013,18 +34767,16 @@ # Guillermo Gomez says -lposix is necessary on A/UX. ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = xyes -then : +if test "x$ac_cv_func_remove" = xyes; then : fi if test $ac_cv_func_remove = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -printf %s "checking for remove in -lposix... " >&6; } -if test ${ac_cv_lib_posix_remove+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 +$as_echo_n "checking for remove in -lposix... " >&6; } +if ${ac_cv_lib_posix_remove+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36033,29 +34785,30 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char remove (); int -main (void) +main () { return remove (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_posix_remove=yes -else $as_nop +else ac_cv_lib_posix_remove=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -printf "%s\n" "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 +$as_echo "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -36063,18 +34816,16 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = xyes -then : +if test "x$ac_cv_func_shmat" = xyes; then : fi if test $ac_cv_func_shmat = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -printf %s "checking for shmat in -lipc... " >&6; } -if test ${ac_cv_lib_ipc_shmat+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 +$as_echo_n "checking for shmat in -lipc... " >&6; } +if ${ac_cv_lib_ipc_shmat+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36083,29 +34834,30 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char shmat (); int -main (void) +main () { return shmat (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ipc_shmat=yes -else $as_nop +else ac_cv_lib_ipc_shmat=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -printf "%s\n" "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 +$as_echo "$ac_cv_lib_ipc_shmat" >&6; } +if test "x$ac_cv_lib_ipc_shmat" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -36121,12 +34873,11 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -printf %s "checking for IceConnectionNumber in -lICE... " >&6; } -if test ${ac_cv_lib_ICE_IceConnectionNumber+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 +$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36135,29 +34886,30 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char IceConnectionNumber (); int -main (void) +main () { return IceConnectionNumber (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ICE_IceConnectionNumber=yes -else $as_nop +else ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -36175,12 +34927,11 @@ fi CFLAGS="$CFLAGS $X_CFLAGS" LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5 -printf %s "checking for XOpenDisplay in -lX11... " >&6; } -if test ${ac_cv_lib_X11_XOpenDisplay+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5 +$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; } +if ${ac_cv_lib_X11_XOpenDisplay+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36189,31 +34940,32 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char XOpenDisplay (); int -main (void) +main () { return XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_X11_XOpenDisplay=yes -else $as_nop +else ac_cv_lib_X11_XOpenDisplay=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5 -printf "%s\n" "$ac_cv_lib_X11_XOpenDisplay" >&6; } -if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; } +if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then : x_libs="-lX11 $X_EXTRA_LIBS" -else $as_nop +else as_fn_error $? "X Development libraries not found" "$LINENO" 5 fi @@ -36223,39 +34975,42 @@ fi if test "$USING_X11" = TRUE; then - for ac_header in X11/extensions/shape.h + for ac_header in X11/extensions/shape.h do : ac_fn_c_check_header_compile "$LINENO" "X11/extensions/shape.h" "ac_cv_header_X11_extensions_shape_h" "#include " -if test "x$ac_cv_header_X11_extensions_shape_h" = xyes -then : - printf "%s\n" "#define HAVE_X11_EXTENSIONS_SHAPE_H 1" >>confdefs.h +if test "x$ac_cv_header_X11_extensions_shape_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_X11_EXTENSIONS_SHAPE_H 1 +_ACEOF -else $as_nop +else as_fn_error $? "libXext headers not found" "$LINENO" 5 fi done + # vcl needs ICE and SM - for ac_header in X11/ICE/ICElib.h + for ac_header in X11/ICE/ICElib.h do : - ac_fn_c_check_header_compile "$LINENO" "X11/ICE/ICElib.h" "ac_cv_header_X11_ICE_ICElib_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_ICE_ICElib_h" = xyes -then : - printf "%s\n" "#define HAVE_X11_ICE_ICELIB_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "X11/ICE/ICElib.h" "ac_cv_header_X11_ICE_ICElib_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_ICE_ICElib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_X11_ICE_ICELIB_H 1 +_ACEOF -else $as_nop +else as_fn_error $? "libICE headers not found" "$LINENO" 5 fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -printf %s "checking for IceConnectionNumber in -lICE... " >&6; } -if test ${ac_cv_lib_ICE_IceConnectionNumber+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 +$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36264,52 +35019,54 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char IceConnectionNumber (); int -main (void) +main () { return IceConnectionNumber (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ICE_IceConnectionNumber=yes -else $as_nop +else ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : : -else $as_nop +else as_fn_error $? "ICE library not found" "$LINENO" 5 fi - for ac_header in X11/SM/SMlib.h + for ac_header in X11/SM/SMlib.h do : - ac_fn_c_check_header_compile "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes -then : - printf "%s\n" "#define HAVE_X11_SM_SMLIB_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_X11_SM_SMLIB_H 1 +_ACEOF -else $as_nop +else as_fn_error $? "libSM headers not found" "$LINENO" 5 fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 -printf %s "checking for SmcOpenConnection in -lSM... " >&6; } -if test ${ac_cv_lib_SM_SmcOpenConnection+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 +$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } +if ${ac_cv_lib_SM_SmcOpenConnection+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lSM $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36318,31 +35075,32 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char SmcOpenConnection (); int -main (void) +main () { return SmcOpenConnection (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_SM_SmcOpenConnection=yes -else $as_nop +else ac_cv_lib_SM_SmcOpenConnection=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 -printf "%s\n" "$ac_cv_lib_SM_SmcOpenConnection" >&6; } -if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 +$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } +if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes; then : : -else $as_nop +else as_fn_error $? "SM library not found" "$LINENO" 5 fi @@ -36350,38 +35108,40 @@ if test "$USING_X11" = TRUE -a "$ENABLE_JAVA" != ""; then # bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c needs Xt - for ac_header in X11/Intrinsic.h + for ac_header in X11/Intrinsic.h do : - ac_fn_c_check_header_compile "$LINENO" "X11/Intrinsic.h" "ac_cv_header_X11_Intrinsic_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_Intrinsic_h" = xyes -then : - printf "%s\n" "#define HAVE_X11_INTRINSIC_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "X11/Intrinsic.h" "ac_cv_header_X11_Intrinsic_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_Intrinsic_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_X11_INTRINSIC_H 1 +_ACEOF -else $as_nop +else as_fn_error $? "libXt headers not found" "$LINENO" 5 fi done + fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use Xrender" >&5 -printf %s "checking whether to use Xrender... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Xrender" >&5 +$as_echo_n "checking whether to use Xrender... " >&6; } if test "$USING_X11" = TRUE -a "$test_xrender" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XRENDER" >&5 -printf %s "checking for XRENDER... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrender" >&5 +$as_echo_n "checking for xrender... " >&6; } if test -n "$XRENDER_CFLAGS"; then pkg_cv_XRENDER_CFLAGS="$XRENDER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5 ($PKG_CONFIG --exists --print-errors "xrender") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "xrender" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36395,10 +35155,10 @@ pkg_cv_XRENDER_LIBS="$XRENDER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5 ($PKG_CONFIG --exists --print-errors "xrender") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XRENDER_LIBS=`$PKG_CONFIG --libs "xrender" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36412,8 +35172,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36439,10 +35199,10 @@ and XRENDER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -36456,19 +35216,18 @@ else XRENDER_CFLAGS=$pkg_cv_XRENDER_CFLAGS XRENDER_LIBS=$pkg_cv_XRENDER_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi XRENDER_CFLAGS=$(printf '%s' "$XRENDER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${XRENDER_LIBS}" XRENDER_LIBS="${filteredlibs}" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryVersion in -lXrender" >&5 -printf %s "checking for XRenderQueryVersion in -lXrender... " >&6; } -if test ${ac_cv_lib_Xrender_XRenderQueryVersion+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryVersion in -lXrender" >&5 +$as_echo_n "checking for XRenderQueryVersion in -lXrender... " >&6; } +if ${ac_cv_lib_Xrender_XRenderQueryVersion+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrender $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36477,67 +35236,68 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char XRenderQueryVersion (); int -main (void) +main () { return XRenderQueryVersion (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xrender_XRenderQueryVersion=yes -else $as_nop +else ac_cv_lib_Xrender_XRenderQueryVersion=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 -printf "%s\n" "$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; } -if test "x$ac_cv_lib_Xrender_XRenderQueryVersion" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 +$as_echo "$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; } +if test "x$ac_cv_lib_Xrender_XRenderQueryVersion" = xyes; then : : -else $as_nop +else as_fn_error $? "libXrender not found or functional" "$LINENO" 5 fi - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_extensions_Xrender_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_extensions_Xrender_h" = xyes; then : -else $as_nop +else as_fn_error $? "Xrender not found. install X" "$LINENO" 5 fi + else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable RandR support" >&5 -printf %s "checking whether to enable RandR support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable RandR support" >&5 +$as_echo_n "checking whether to enable RandR support... " >&6; } if test "$USING_X11" = TRUE -a "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \); then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XRANDR" >&5 -printf %s "checking for XRANDR... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrandr >= 1.2" >&5 +$as_echo_n "checking for xrandr >= 1.2... " >&6; } if test -n "$XRANDR_CFLAGS"; then pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "xrandr >= 1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36551,10 +35311,10 @@ pkg_cv_XRANDR_LIBS="$XRANDR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "xrandr >= 1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36568,8 +35328,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36586,32 +35346,31 @@ ENABLE_RANDR="" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_RANDR="" else XRANDR_CFLAGS=$pkg_cv_XRANDR_CFLAGS XRANDR_LIBS=$pkg_cv_XRANDR_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_RANDR="TRUE" fi if test "$ENABLE_RANDR" != "TRUE"; then - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_extensions_Xrandr_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_extensions_Xrandr_h" = xyes; then : -else $as_nop +else as_fn_error $? "X11/extensions/Xrandr.h could not be found. X11 dev missing?" "$LINENO" 5 fi + XRANDR_CFLAGS=" " - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XRRQueryExtension in -lXrandr" >&5 -printf %s "checking for XRRQueryExtension in -lXrandr... " >&6; } -if test ${ac_cv_lib_Xrandr_XRRQueryExtension+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRRQueryExtension in -lXrandr" >&5 +$as_echo_n "checking for XRRQueryExtension in -lXrandr... " >&6; } +if ${ac_cv_lib_Xrandr_XRRQueryExtension+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrandr $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36620,31 +35379,32 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char XRRQueryExtension (); int -main (void) +main () { return XRRQueryExtension (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xrandr_XRRQueryExtension=yes -else $as_nop +else ac_cv_lib_Xrandr_XRRQueryExtension=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 -printf "%s\n" "$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; } -if test "x$ac_cv_lib_Xrandr_XRRQueryExtension" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 +$as_echo "$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; } +if test "x$ac_cv_lib_Xrandr_XRRQueryExtension" = xyes; then : : -else $as_nop +else as_fn_error $? "libXrandr not found or functional" "$LINENO" 5 fi @@ -36656,8 +35416,8 @@ XRANDR_LIBS="${filteredlibs}" else ENABLE_RANDR="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -36667,17 +35427,17 @@ with_webdav=$test_webdav fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WebDAV support" >&5 -printf %s "checking for WebDAV support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WebDAV support" >&5 +$as_echo_n "checking for WebDAV support... " >&6; } case "$with_webdav" in no) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } WITH_WEBDAV="" ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } # curl is already mandatory (almost) and checked elsewhere if test "$enable_curl" = "no"; then as_fn_error $? "\"--with-webdav conflicts with --disable-curl\"" "$LINENO" 5 @@ -36687,8 +35447,8 @@ esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to execute CVE tests" >&5 -printf %s "checking whether to execute CVE tests... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to execute CVE tests" >&5 +$as_echo_n "checking whether to execute CVE tests... " >&6; } # If not explicitly enabled or disabled, default if test -z "$enable_cve_tests"; then case "$OS" in @@ -36704,33 +35464,33 @@ esac fi if test "$enable_cve_tests" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } DISABLE_CVE_TESTS=TRUE else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to execute chart XShape tests" >&5 -printf %s "checking whether to execute chart XShape tests... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to execute chart XShape tests" >&5 +$as_echo_n "checking whether to execute chart XShape tests... " >&6; } if test "$enable_chart_tests" = "yes" -o '(' "$_os" = "WINNT" -a "$enable_chart_tests" != "no" ')'; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_CHART_TESTS=TRUE else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ENABLE_OPENSSL= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to disable OpenSSL usage" >&5 -printf %s "checking whether to disable OpenSSL usage... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable OpenSSL usage" >&5 +$as_echo_n "checking whether to disable OpenSSL usage... " >&6; } if test "$enable_openssl" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_OPENSSL=TRUE if test "$_os" = Darwin ; then # OpenSSL is deprecated when building for 10.7 or later. @@ -36759,10 +35519,9 @@ # Check whether --with-system-openssl was given. -if test ${with_system_openssl+y} -then : +if test "${with_system_openssl+set}" = set; then : withval=$with_system_openssl; -else $as_nop +else if test "${with_system_openssl+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_openssl="$with_system_libs"; @@ -36774,27 +35533,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which openssl to use" >&5 -printf %s "checking which openssl to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which openssl to use" >&5 +$as_echo_n "checking which openssl to use... " >&6; } if test "$test_openssl" != no -a "$found_openssl" != yes -a "$enable_openssl" != no; then ENABLE_OPENSSL=TRUE if test "$with_system_openssl" = yes -a "$test_system_openssl" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_OPENSSL=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5 -printf %s "checking for OPENSSL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 +$as_echo_n "checking for openssl... " >&6; } if test -n "$OPENSSL_CFLAGS"; then pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36808,10 +35567,10 @@ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36825,8 +35584,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36852,10 +35611,10 @@ and OPENSSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -36869,16 +35628,16 @@ else OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi OPENSSL_CFLAGS=$(printf '%s' "${OPENSSL_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${OPENSSL_LIBS}" OPENSSL_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_OPENSSL= OPENSSL_CFLAGS="${OPENSSL_CFLAGS_internal}" OPENSSL_LIBS="${OPENSSL_LIBS_internal}" @@ -36886,8 +35645,8 @@ fi else if test "$found_openssl" = yes -a "$enable_openssl" != no -a "$with_system_openssl" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_OPENSSL=TRUE SYSTEM_OPENSSL=TRUE else @@ -36896,11 +35655,11 @@ OPENSSL_CFLAGS= OPENSSL_LIBS= if test "$test_openssl" != no -a "$enable_openssl" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -36936,10 +35695,9 @@ # Check whether --with-system-openssl was given. -if test ${with_system_openssl+y} -then : +if test "${with_system_openssl+set}" = set; then : withval=$with_system_openssl; -else $as_nop +else if test "${with_system_openssl+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_openssl="$with_system_libs"; @@ -36951,27 +35709,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which openssl to use" >&5 -printf %s "checking which openssl to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which openssl to use" >&5 +$as_echo_n "checking which openssl to use... " >&6; } if test "$test_openssl" != no -a "$found_openssl" != yes -a "$enable_openssl" != no; then ENABLE_OPENSSL=TRUE if test "$with_system_openssl" = yes -a "$test_system_openssl" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_OPENSSL=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5 -printf %s "checking for OPENSSL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 +$as_echo_n "checking for openssl... " >&6; } if test -n "$OPENSSL_CFLAGS"; then pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36985,10 +35743,10 @@ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37002,8 +35760,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37029,10 +35787,10 @@ and OPENSSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -37046,16 +35804,16 @@ else OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi OPENSSL_CFLAGS=$(printf '%s' "${OPENSSL_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${OPENSSL_LIBS}" OPENSSL_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_OPENSSL= OPENSSL_CFLAGS="${OPENSSL_CFLAGS_internal}" OPENSSL_LIBS="${OPENSSL_LIBS_internal}" @@ -37063,8 +35821,8 @@ fi else if test "$found_openssl" = yes -a "$enable_openssl" != no -a "$with_system_openssl" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_OPENSSL=TRUE SYSTEM_OPENSSL=TRUE else @@ -37073,11 +35831,11 @@ OPENSSL_CFLAGS= OPENSSL_LIBS= if test "$test_openssl" != no -a "$enable_openssl" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -37088,8 +35846,8 @@ fi if test "$with_system_openssl" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl supports SHA512" >&5 -printf %s "checking whether openssl supports SHA512... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether openssl supports SHA512" >&5 +$as_echo_n "checking whether openssl supports SHA512... " >&6; } ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -37100,7 +35858,7 @@ /* end confdefs.h. */ #include int -main (void) +main () { SHA512_CTX context; @@ -37109,14 +35867,13 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else $as_nop +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else as_fn_error $? "no, openssl too old. Need >= 0.9.8." "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -37125,12 +35882,12 @@ fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } # warn that although OpenSSL is disabled, system libraries may depend on it - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL has been disabled. No code compiled here will make use of it but system libraries may create indirect dependencies" >&5 -printf "%s\n" "$as_me: WARNING: OpenSSL has been disabled. No code compiled here will make use of it but system libraries may create indirect dependencies" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL has been disabled. No code compiled here will make use of it but system libraries may create indirect dependencies" >&5 +$as_echo "$as_me: WARNING: OpenSSL has been disabled. No code compiled here will make use of it but system libraries may create indirect dependencies" >&2;} add_warning "OpenSSL has been disabled. No code compiled here will make use of it but system libraries may create indirect dependencies" fi @@ -37138,23 +35895,23 @@ if test "$enable_cipher_openssl_backend" = yes && test "$ENABLE_OPENSSL" != TRUE; then if test "$libo_fuzzed_enable_cipher_openssl_backend" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Resetting --enable-cipher-openssl-backend=no" >&5 -printf "%s\n" "$as_me: Resetting --enable-cipher-openssl-backend=no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Resetting --enable-cipher-openssl-backend=no" >&5 +$as_echo "$as_me: Resetting --enable-cipher-openssl-backend=no" >&6;} enable_cipher_openssl_backend=no else as_fn_error $? "--enable-cipher-openssl-backend needs OpenSSL, but --disable-openssl was given." "$LINENO" 5 fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable the OpenSSL backend for rtl/cipher.h" >&5 -printf %s "checking whether to enable the OpenSSL backend for rtl/cipher.h... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the OpenSSL backend for rtl/cipher.h" >&5 +$as_echo_n "checking whether to enable the OpenSSL backend for rtl/cipher.h... " >&6; } ENABLE_CIPHER_OPENSSL_BACKEND= if test "$enable_cipher_openssl_backend" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_CIPHER_OPENSSL_BACKEND=TRUE else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -37162,11 +35919,11 @@ if test "$build_crypto" = yes; then if test "$OS" = WNT; then BUILD_TYPE="$BUILD_TYPE CRYPTO_MSCAPI" - printf "%s\n" "#define USE_CRYPTO_MSCAPI 1" >>confdefs.h + $as_echo "#define USE_CRYPTO_MSCAPI 1" >>confdefs.h elif test "$ENABLE_NSS" = TRUE; then BUILD_TYPE="$BUILD_TYPE CRYPTO_NSS" - printf "%s\n" "#define USE_CRYPTO_NSS 1" >>confdefs.h + $as_echo "#define USE_CRYPTO_NSS 1" >>confdefs.h fi fi @@ -37191,10 +35948,9 @@ # Check whether --with-system-redland was given. -if test ${with_system_redland+y} -then : +if test "${with_system_redland+set}" = set; then : withval=$with_system_redland; -else $as_nop +else if test "${with_system_redland+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_redland="$with_system_libs"; @@ -37206,27 +35962,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which redland to use" >&5 -printf %s "checking which redland to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which redland to use" >&5 +$as_echo_n "checking which redland to use... " >&6; } if test "$test_redland" != no -a "$found_redland" != yes -a "$enable_redland" != no; then ENABLE_REDLAND=TRUE if test "$with_system_redland" = yes -a "$test_system_redland" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_REDLAND=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for REDLAND" >&5 -printf %s "checking for REDLAND... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for redland >= 1.0.8 raptor2 >= 2.0.7" >&5 +$as_echo_n "checking for redland >= 1.0.8 raptor2 >= 2.0.7... " >&6; } if test -n "$REDLAND_CFLAGS"; then pkg_cv_REDLAND_CFLAGS="$REDLAND_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"redland >= 1.0.8 raptor2 >= 2.0.7\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"redland >= 1.0.8 raptor2 >= 2.0.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "redland >= 1.0.8 raptor2 >= 2.0.7") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland >= 1.0.8 raptor2 >= 2.0.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37240,10 +35996,10 @@ pkg_cv_REDLAND_LIBS="$REDLAND_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"redland >= 1.0.8 raptor2 >= 2.0.7\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"redland >= 1.0.8 raptor2 >= 2.0.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "redland >= 1.0.8 raptor2 >= 2.0.7") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_REDLAND_LIBS=`$PKG_CONFIG --libs "redland >= 1.0.8 raptor2 >= 2.0.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37257,8 +36013,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37284,10 +36040,10 @@ and REDLAND_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -37301,16 +36057,16 @@ else REDLAND_CFLAGS=$pkg_cv_REDLAND_CFLAGS REDLAND_LIBS=$pkg_cv_REDLAND_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi REDLAND_CFLAGS=$(printf '%s' "${REDLAND_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${REDLAND_LIBS}" REDLAND_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_REDLAND= REDLAND_CFLAGS="${REDLAND_CFLAGS_internal}" REDLAND_LIBS="${REDLAND_LIBS_internal}" @@ -37318,8 +36074,8 @@ fi else if test "$found_redland" = yes -a "$enable_redland" != no -a "$with_system_redland" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_REDLAND=TRUE SYSTEM_REDLAND=TRUE else @@ -37328,11 +36084,11 @@ REDLAND_CFLAGS= REDLAND_LIBS= if test "$test_redland" != no -a "$enable_redland" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -37342,12 +36098,11 @@ if test "$with_system_redland" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for librdf_world_set_raptor_init_handler in -lrdf" >&5 -printf %s "checking for librdf_world_set_raptor_init_handler in -lrdf... " >&6; } -if test ${ac_cv_lib_rdf_librdf_world_set_raptor_init_handler+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for librdf_world_set_raptor_init_handler in -lrdf" >&5 +$as_echo_n "checking for librdf_world_set_raptor_init_handler in -lrdf... " >&6; } +if ${ac_cv_lib_rdf_librdf_world_set_raptor_init_handler+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lrdf $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -37356,31 +36111,32 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char librdf_world_set_raptor_init_handler (); int -main (void) +main () { return librdf_world_set_raptor_init_handler (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_rdf_librdf_world_set_raptor_init_handler=yes -else $as_nop +else ac_cv_lib_rdf_librdf_world_set_raptor_init_handler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rdf_librdf_world_set_raptor_init_handler" >&5 -printf "%s\n" "$ac_cv_lib_rdf_librdf_world_set_raptor_init_handler" >&6; } -if test "x$ac_cv_lib_rdf_librdf_world_set_raptor_init_handler" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rdf_librdf_world_set_raptor_init_handler" >&5 +$as_echo "$ac_cv_lib_rdf_librdf_world_set_raptor_init_handler" >&6; } +if test "x$ac_cv_lib_rdf_librdf_world_set_raptor_init_handler" = xyes; then : : -else $as_nop +else as_fn_error $? "librdf too old. Need >= 1.0.16" "$LINENO" 5 fi @@ -37393,11 +36149,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libhunspell to use" >&5 -printf %s "checking which libhunspell to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libhunspell to use" >&5 +$as_echo_n "checking which libhunspell to use... " >&6; } if test "$with_system_hunspell" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_HUNSPELL=TRUE ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -37407,17 +36163,17 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HUNSPELL" >&5 -printf %s "checking for HUNSPELL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hunspell" >&5 +$as_echo_n "checking for hunspell... " >&6; } if test -n "$HUNSPELL_CFLAGS"; then pkg_cv_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5 ($PKG_CONFIG --exists --print-errors "hunspell") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37431,10 +36187,10 @@ pkg_cv_HUNSPELL_LIBS="$HUNSPELL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5 ($PKG_CONFIG --exists --print-errors "hunspell") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37448,8 +36204,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37466,72 +36222,67 @@ HUNSPELL_PC="" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } HUNSPELL_PC="" else HUNSPELL_CFLAGS=$pkg_cv_HUNSPELL_CFLAGS HUNSPELL_LIBS=$pkg_cv_HUNSPELL_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } HUNSPELL_PC="TRUE" fi if test "$HUNSPELL_PC" != "TRUE"; then - ac_fn_cxx_check_header_compile "$LINENO" "hunspell.hxx" "ac_cv_header_hunspell_hxx" "$ac_includes_default" -if test "x$ac_cv_header_hunspell_hxx" = xyes -then : - -else $as_nop - - ac_fn_cxx_check_header_compile "$LINENO" "hunspell/hunspell.hxx" "ac_cv_header_hunspell_hunspell_hxx" "$ac_includes_default" -if test "x$ac_cv_header_hunspell_hunspell_hxx" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "hunspell.hxx" "ac_cv_header_hunspell_hxx" "$ac_includes_default" +if test "x$ac_cv_header_hunspell_hxx" = xyes; then : + +else + + ac_fn_cxx_check_header_mongrel "$LINENO" "hunspell/hunspell.hxx" "ac_cv_header_hunspell_hunspell_hxx" "$ac_includes_default" +if test "x$ac_cv_header_hunspell_hunspell_hxx" = xyes; then : HUNSPELL_CFLAGS=-I/usr/include/hunspell -else $as_nop +else as_fn_error $? "hunspell headers not found." "$LINENO" 5 fi + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lhunspell" >&5 -printf %s "checking for main in -lhunspell... " >&6; } -if test ${ac_cv_lib_hunspell_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhunspell" >&5 +$as_echo_n "checking for main in -lhunspell... " >&6; } +if ${ac_cv_lib_hunspell_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lhunspell $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_hunspell_main=yes -else $as_nop +else ac_cv_lib_hunspell_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hunspell_main" >&5 -printf "%s\n" "$ac_cv_lib_hunspell_main" >&6; } -if test "x$ac_cv_lib_hunspell_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hunspell_main" >&5 +$as_echo "$ac_cv_lib_hunspell_main" >&6; } +if test "x$ac_cv_lib_hunspell_main" = xyes; then : : -else $as_nop +else as_fn_error $? "hunspell library not found." "$LINENO" 5 fi @@ -37547,8 +36298,8 @@ FilterLibs "${HUNSPELL_LIBS}" HUNSPELL_LIBS="${filteredlibs}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_HUNSPELL= HUNSPELL_CFLAGS="-I${WORKDIR}/UnpackedTarball/hunspell/src/hunspell" if test "$COM" = "MSC"; then @@ -37562,22 +36313,22 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use zxing" >&5 -printf %s "checking whether to use zxing... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use zxing" >&5 +$as_echo_n "checking whether to use zxing... " >&6; } if test "$enable_zxing" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_ZXING= SYSTEM_ZXING= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_ZXING=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libzxing to use" >&5 -printf %s "checking which libzxing to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which libzxing to use" >&5 +$as_echo_n "checking which libzxing to use... " >&6; } if test "$with_system_zxing" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ZXING=TRUE ZXING_CFLAGS= ac_ext=cpp @@ -37597,94 +36348,84 @@ CXXFLAGS="$save_CXXFLAGS -I$i/ZXing" ac_fn_cxx_check_header_compile "$LINENO" "MultiFormatWriter.h" "ac_cv_header_MultiFormatWriter_h" "#include " -if test "x$ac_cv_header_MultiFormatWriter_h" = xyes -then : +if test "x$ac_cv_header_MultiFormatWriter_h" = xyes; then : ZXING_CFLAGS=-I$i/ZXing; break -else $as_nop +else unset ac_cv_header_MultiFormatWriter_h fi + done CXXFLAGS=$save_CXXFLAGS if test -z "$ZXING_CFLAGS"; then as_fn_error $? "zxing headers not found." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lZXing" >&5 -printf %s "checking for main in -lZXing... " >&6; } -if test ${ac_cv_lib_ZXing_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lZXing" >&5 +$as_echo_n "checking for main in -lZXing... " >&6; } +if ${ac_cv_lib_ZXing_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lZXing $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_ZXing_main=yes -else $as_nop +else ac_cv_lib_ZXing_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ZXing_main" >&5 -printf "%s\n" "$ac_cv_lib_ZXing_main" >&6; } -if test "x$ac_cv_lib_ZXing_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ZXing_main" >&5 +$as_echo "$ac_cv_lib_ZXing_main" >&6; } +if test "x$ac_cv_lib_ZXing_main" = xyes; then : ZXING_LIBS=-lZXing -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lZXingCore" >&5 -printf %s "checking for main in -lZXingCore... " >&6; } -if test ${ac_cv_lib_ZXingCore_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lZXingCore" >&5 +$as_echo_n "checking for main in -lZXingCore... " >&6; } +if ${ac_cv_lib_ZXingCore_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lZXingCore $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_ZXingCore_main=yes -else $as_nop +else ac_cv_lib_ZXingCore_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ZXingCore_main" >&5 -printf "%s\n" "$ac_cv_lib_ZXingCore_main" >&6; } -if test "x$ac_cv_lib_ZXingCore_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ZXingCore_main" >&5 +$as_echo "$ac_cv_lib_ZXingCore_main" >&6; } +if test "x$ac_cv_lib_ZXingCore_main" = xyes; then : ZXING_LIBS=-lZXingCore -else $as_nop +else as_fn_error $? "zxing C++ library not found." "$LINENO" 5 fi @@ -37700,13 +36441,13 @@ FilterLibs "${ZXING_LIBS}" ZXING_LIBS="${filteredlibs}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ZXING= BUILD_TYPE="$BUILD_TYPE ZXING" fi if test "$ENABLE_ZXING" = TRUE; then - printf "%s\n" "#define ENABLE_ZXING 1" >>confdefs.h + $as_echo "#define ENABLE_ZXING 1" >>confdefs.h fi fi @@ -37715,11 +36456,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which box2d to use" >&5 -printf %s "checking which box2d to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which box2d to use" >&5 +$as_echo_n "checking which box2d to use... " >&6; } if test "$with_system_box2d" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_BOX2D=TRUE ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -37727,72 +36468,67 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_fn_cxx_check_header_compile "$LINENO" "box2d/box2d.h" "ac_cv_header_box2d_box2d_h" "$ac_includes_default" -if test "x$ac_cv_header_box2d_box2d_h" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "box2d/box2d.h" "ac_cv_header_box2d_box2d_h" "$ac_includes_default" +if test "x$ac_cv_header_box2d_box2d_h" = xyes; then : BOX2D_H_FOUND='TRUE' -else $as_nop +else BOX2D_H_FOUND='FALSE' fi + if test "$BOX2D_H_FOUND" = "TRUE"; then # 2.4.0+ _BOX2D_LIB=box2d - printf "%s\n" "#define BOX2D_HEADER " >>confdefs.h + $as_echo "#define BOX2D_HEADER " >>confdefs.h else # fail this. there's no other alternative to check when we are here. - ac_fn_cxx_check_header_compile "$LINENO" "Box2D/Box2D.h" "ac_cv_header_Box2D_Box2D_h" "$ac_includes_default" -if test "x$ac_cv_header_Box2D_Box2D_h" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "Box2D/Box2D.h" "ac_cv_header_Box2D_Box2D_h" "$ac_includes_default" +if test "x$ac_cv_header_Box2D_Box2D_h" = xyes; then : -else $as_nop +else as_fn_error $? "box2d headers not found." "$LINENO" 5 fi + _BOX2D_LIB=Box2D - printf "%s\n" "#define BOX2D_HEADER " >>confdefs.h + $as_echo "#define BOX2D_HEADER " >>confdefs.h fi - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$_BOX2D_LIB""_main" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -l$_BOX2D_LIB" >&5 -printf %s "checking for main in -l$_BOX2D_LIB... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_Lib=`$as_echo "ac_cv_lib_$_BOX2D_LIB''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$_BOX2D_LIB" >&5 +$as_echo_n "checking for main in -l$_BOX2D_LIB... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-l$_BOX2D_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : : -else $as_nop +else as_fn_error $? "box2d library not found." "$LINENO" 5 fi @@ -37807,8 +36543,8 @@ FilterLibs "${BOX2D_LIBS}" BOX2D_LIBS="${filteredlibs}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_BOX2D= BUILD_TYPE="$BUILD_TYPE BOX2D" fi @@ -37816,35 +36552,33 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which altlinuxhyph to use" >&5 -printf %s "checking which altlinuxhyph to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which altlinuxhyph to use" >&5 +$as_echo_n "checking which altlinuxhyph to use... " >&6; } if test "$with_system_altlinuxhyph" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_HYPH=TRUE - ac_fn_c_check_header_compile "$LINENO" "hyphen.h" "ac_cv_header_hyphen_h" "$ac_includes_default" -if test "x$ac_cv_header_hyphen_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "hyphen.h" "ac_cv_header_hyphen_h" "$ac_includes_default" +if test "x$ac_cv_header_hyphen_h" = xyes; then : -else $as_nop +else as_fn_error $? "altlinuxhyph headers not found." "$LINENO" 5 fi + ac_fn_c_check_member "$LINENO" "struct _HyphenDict" "cset" "ac_cv_member_struct__HyphenDict_cset" "#include " -if test "x$ac_cv_member_struct__HyphenDict_cset" = xyes -then : +if test "x$ac_cv_member_struct__HyphenDict_cset" = xyes; then : -else $as_nop +else as_fn_error $? "no. You are sure you have altlinuyhyph headers?" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 -printf %s "checking for hnj_hyphen_hyphenate2 in -lhyphen... " >&6; } -if test ${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 +$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyphen... " >&6; } +if ${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyphen $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -37853,41 +36587,41 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char hnj_hyphen_hyphenate2 (); int -main (void) +main () { return hnj_hyphen_hyphenate2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=yes -else $as_nop +else ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 -printf "%s\n" "$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; } -if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 +$as_echo "$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; } +if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = xyes; then : HYPHEN_LIB=-lhyphen -else $as_nop +else as_fn_error $? "altlinuxhyph library not found or too old." "$LINENO" 5 fi if test -z "$HYPHEN_LIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 -printf %s "checking for hnj_hyphen_hyphenate2 in -lhyph... " >&6; } -if test ${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 +$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyph... " >&6; } +if ${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyph $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -37896,42 +36630,42 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char hnj_hyphen_hyphenate2 (); int -main (void) +main () { return hnj_hyphen_hyphenate2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_hyph_hnj_hyphen_hyphenate2=yes -else $as_nop +else ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 -printf "%s\n" "$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; } -if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 +$as_echo "$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; } +if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = xyes; then : HYPHEN_LIB=-lhyph -else $as_nop +else as_fn_error $? "altlinuxhyph library not found or too old." "$LINENO" 5 fi fi if test -z "$HYPHEN_LIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 -printf %s "checking for hnj_hyphen_hyphenate2 in -lhnj... " >&6; } -if test ${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 +$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhnj... " >&6; } +if ${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lhnj $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -37940,38 +36674,39 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char hnj_hyphen_hyphenate2 (); int -main (void) +main () { return hnj_hyphen_hyphenate2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_hnj_hnj_hyphen_hyphenate2=yes -else $as_nop +else ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 -printf "%s\n" "$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; } -if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 +$as_echo "$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; } +if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = xyes; then : HYPHEN_LIB=-lhnj -else $as_nop +else as_fn_error $? "altlinuxhyph library not found or too old." "$LINENO" 5 fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_HYPH= BUILD_TYPE="$BUILD_TYPE HYPHEN" if test "$COM" = "MSC"; then @@ -37983,11 +36718,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which mythes to use" >&5 -printf %s "checking which mythes to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mythes to use" >&5 +$as_echo_n "checking which mythes to use... " >&6; } if test "$with_system_mythes" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_MYTHES=TRUE ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -37997,17 +36732,17 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MYTHES" >&5 -printf %s "checking for MYTHES... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mythes" >&5 +$as_echo_n "checking for mythes... " >&6; } if test -n "$MYTHES_CFLAGS"; then pkg_cv_MYTHES_CFLAGS="$MYTHES_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mythes\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mythes\""; } >&5 ($PKG_CONFIG --exists --print-errors "mythes") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MYTHES_CFLAGS=`$PKG_CONFIG --cflags "mythes" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38021,10 +36756,10 @@ pkg_cv_MYTHES_LIBS="$MYTHES_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mythes\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mythes\""; } >&5 ($PKG_CONFIG --exists --print-errors "mythes") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MYTHES_LIBS=`$PKG_CONFIG --libs "mythes" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38038,8 +36773,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38056,105 +36791,95 @@ MYTHES_PKGCONFIG=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } MYTHES_PKGCONFIG=no else MYTHES_CFLAGS=$pkg_cv_MYTHES_CFLAGS MYTHES_LIBS=$pkg_cv_MYTHES_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } MYTHES_PKGCONFIG=yes fi if test "$MYTHES_PKGCONFIG" = "no"; then - ac_fn_cxx_check_header_compile "$LINENO" "mythes.hxx" "ac_cv_header_mythes_hxx" "$ac_includes_default" -if test "x$ac_cv_header_mythes_hxx" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "mythes.hxx" "ac_cv_header_mythes_hxx" "$ac_includes_default" +if test "x$ac_cv_header_mythes_hxx" = xyes; then : -else $as_nop +else as_fn_error $? "mythes.hxx headers not found." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes-1.2" >&5 -printf %s "checking for main in -lmythes-1.2... " >&6; } -if test ${ac_cv_lib_mythes_1_2_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes-1.2" >&5 +$as_echo_n "checking for main in -lmythes-1.2... " >&6; } +if ${ac_cv_lib_mythes_1_2_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lmythes-1.2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_mythes_1_2_main=yes -else $as_nop +else ac_cv_lib_mythes_1_2_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mythes_1_2_main" >&5 -printf "%s\n" "$ac_cv_lib_mythes_1_2_main" >&6; } -if test "x$ac_cv_lib_mythes_1_2_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mythes_1_2_main" >&5 +$as_echo "$ac_cv_lib_mythes_1_2_main" >&6; } +if test "x$ac_cv_lib_mythes_1_2_main" = xyes; then : : -else $as_nop +else MYTHES_FOUND=no fi if test "$MYTHES_FOUND" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes" >&5 -printf %s "checking for main in -lmythes... " >&6; } -if test ${ac_cv_lib_mythes_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes" >&5 +$as_echo_n "checking for main in -lmythes... " >&6; } +if ${ac_cv_lib_mythes_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lmythes $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_mythes_main=yes -else $as_nop +else ac_cv_lib_mythes_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mythes_main" >&5 -printf "%s\n" "$ac_cv_lib_mythes_main" >&6; } -if test "x$ac_cv_lib_mythes_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mythes_main" >&5 +$as_echo "$ac_cv_lib_mythes_main" >&6; } +if test "x$ac_cv_lib_mythes_main" = xyes; then : MYTHES_FOUND=yes -else $as_nop +else MYTHES_FOUND=no fi @@ -38173,8 +36898,8 @@ FilterLibs "${MYTHES_LIBS}" MYTHES_LIBS="${filteredlibs}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_MYTHES= BUILD_TYPE="$BUILD_TYPE MYTHES" if test "$COM" = "MSC"; then @@ -38189,27 +36914,27 @@ ENABLE_COINMP= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with CoinMP" >&5 -printf %s "checking whether to build with CoinMP... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with CoinMP" >&5 +$as_echo_n "checking whether to build with CoinMP... " >&6; } if test "$enable_coinmp" != "no"; then ENABLE_COINMP=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } if test "$with_system_coinmp" = "yes"; then SYSTEM_COINMP=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for COINMP" >&5 -printf %s "checking for COINMP... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for coinmp coinutils" >&5 +$as_echo_n "checking for coinmp coinutils... " >&6; } if test -n "$COINMP_CFLAGS"; then pkg_cv_COINMP_CFLAGS="$COINMP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"coinmp coinutils\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"coinmp coinutils\""; } >&5 ($PKG_CONFIG --exists --print-errors "coinmp coinutils") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_COINMP_CFLAGS=`$PKG_CONFIG --cflags "coinmp coinutils" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38223,10 +36948,10 @@ pkg_cv_COINMP_LIBS="$COINMP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"coinmp coinutils\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"coinmp coinutils\""; } >&5 ($PKG_CONFIG --exists --print-errors "coinmp coinutils") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_COINMP_LIBS=`$PKG_CONFIG --libs "coinmp coinutils" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38240,8 +36965,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38267,10 +36992,10 @@ and COINMP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -38284,8 +37009,8 @@ else COINMP_CFLAGS=$pkg_cv_COINMP_CFLAGS COINMP_LIBS=$pkg_cv_COINMP_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi FilterLibs "${COINMP_LIBS}" @@ -38294,8 +37019,8 @@ BUILD_TYPE="$BUILD_TYPE COINMP" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -38303,41 +37028,40 @@ ENABLE_LPSOLVE= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with lpsolve" >&5 -printf %s "checking whether to build with lpsolve... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with lpsolve" >&5 +$as_echo_n "checking whether to build with lpsolve... " >&6; } if test "$enable_lpsolve" != "no"; then ENABLE_LPSOLVE=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$ENABLE_LPSOLVE" = TRUE; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which lpsolve to use" >&5 -printf %s "checking which lpsolve to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lpsolve to use" >&5 +$as_echo_n "checking which lpsolve to use... " >&6; } if test "$with_system_lpsolve" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LPSOLVE=TRUE - ac_fn_c_check_header_compile "$LINENO" "lpsolve/lp_lib.h" "ac_cv_header_lpsolve_lp_lib_h" "$ac_includes_default" -if test "x$ac_cv_header_lpsolve_lp_lib_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "lpsolve/lp_lib.h" "ac_cv_header_lpsolve_lp_lib_h" "$ac_includes_default" +if test "x$ac_cv_header_lpsolve_lp_lib_h" = xyes; then : -else $as_nop +else as_fn_error $? "lpsolve headers not found." "$LINENO" 5 fi + save_LIBS=$LIBS # some systems need this. Like Ubuntu... - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 -printf %s "checking for floor in -lm... " >&6; } -if test ${ac_cv_lib_m_floor+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 +$as_echo_n "checking for floor in -lm... " >&6; } +if ${ac_cv_lib_m_floor+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -38346,41 +37070,43 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char floor (); int -main (void) +main () { return floor (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_floor=yes -else $as_nop +else ac_cv_lib_m_floor=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 -printf "%s\n" "$ac_cv_lib_m_floor" >&6; } -if test "x$ac_cv_lib_m_floor" = xyes -then : - printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 +$as_echo "$ac_cv_lib_m_floor" >&6; } +if test "x$ac_cv_lib_m_floor" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF LIBS="-lm $LIBS" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -printf %s "checking for dlopen in -ldl... " >&6; } -if test ${ac_cv_lib_dl_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -38389,41 +37115,43 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes -else $as_nop +else ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes -then : - printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDL 1 +_ACEOF LIBS="-ldl $LIBS" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for make_lp in -llpsolve55" >&5 -printf %s "checking for make_lp in -llpsolve55... " >&6; } -if test ${ac_cv_lib_lpsolve55_make_lp+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for make_lp in -llpsolve55" >&5 +$as_echo_n "checking for make_lp in -llpsolve55... " >&6; } +if ${ac_cv_lib_lpsolve55_make_lp+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llpsolve55 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -38432,38 +37160,39 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char make_lp (); int -main (void) +main () { return make_lp (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_lpsolve55_make_lp=yes -else $as_nop +else ac_cv_lib_lpsolve55_make_lp=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lpsolve55_make_lp" >&5 -printf "%s\n" "$ac_cv_lib_lpsolve55_make_lp" >&6; } -if test "x$ac_cv_lib_lpsolve55_make_lp" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lpsolve55_make_lp" >&5 +$as_echo "$ac_cv_lib_lpsolve55_make_lp" >&6; } +if test "x$ac_cv_lib_lpsolve55_make_lp" = xyes; then : : -else $as_nop +else as_fn_error $? "lpsolve library not found or too old." "$LINENO" 5 fi LIBS=$save_LIBS else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LPSOLVE= BUILD_TYPE="$BUILD_TYPE LPSOLVE" fi @@ -38490,10 +37219,9 @@ # Check whether --with-system-libexttextcat was given. -if test ${with_system_libexttextcat+y} -then : +if test "${with_system_libexttextcat+set}" = set; then : withval=$with_system_libexttextcat; -else $as_nop +else if test "${with_system_libexttextcat+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libexttextcat="$with_system_libs"; @@ -38505,27 +37233,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libexttextcat to use" >&5 -printf %s "checking which libexttextcat to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libexttextcat to use" >&5 +$as_echo_n "checking which libexttextcat to use... " >&6; } if test "$test_libexttextcat" != no -a "$found_libexttextcat" != yes -a "$enable_libexttextcat" != no; then ENABLE_LIBEXTTEXTCAT=TRUE if test "$with_system_libexttextcat" = yes -a "$test_system_libexttextcat" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBEXTTEXTCAT=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBEXTTEXTCAT" >&5 -printf %s "checking for LIBEXTTEXTCAT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexttextcat >= 3.4.1" >&5 +$as_echo_n "checking for libexttextcat >= 3.4.1... " >&6; } if test -n "$LIBEXTTEXTCAT_CFLAGS"; then pkg_cv_LIBEXTTEXTCAT_CFLAGS="$LIBEXTTEXTCAT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexttextcat >= 3.4.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexttextcat >= 3.4.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libexttextcat >= 3.4.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBEXTTEXTCAT_CFLAGS=`$PKG_CONFIG --cflags "libexttextcat >= 3.4.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38539,10 +37267,10 @@ pkg_cv_LIBEXTTEXTCAT_LIBS="$LIBEXTTEXTCAT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexttextcat >= 3.4.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexttextcat >= 3.4.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libexttextcat >= 3.4.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBEXTTEXTCAT_LIBS=`$PKG_CONFIG --libs "libexttextcat >= 3.4.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38556,8 +37284,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38583,10 +37311,10 @@ and LIBEXTTEXTCAT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -38600,16 +37328,16 @@ else LIBEXTTEXTCAT_CFLAGS=$pkg_cv_LIBEXTTEXTCAT_CFLAGS LIBEXTTEXTCAT_LIBS=$pkg_cv_LIBEXTTEXTCAT_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBEXTTEXTCAT_CFLAGS=$(printf '%s' "${LIBEXTTEXTCAT_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LIBEXTTEXTCAT_LIBS}" LIBEXTTEXTCAT_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBEXTTEXTCAT= LIBEXTTEXTCAT_CFLAGS="${LIBEXTTEXTCAT_CFLAGS_internal}" LIBEXTTEXTCAT_LIBS="${LIBEXTTEXTCAT_LIBS_internal}" @@ -38617,8 +37345,8 @@ fi else if test "$found_libexttextcat" = yes -a "$enable_libexttextcat" != no -a "$with_system_libexttextcat" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_LIBEXTTEXTCAT=TRUE SYSTEM_LIBEXTTEXTCAT=TRUE else @@ -38627,11 +37355,11 @@ LIBEXTTEXTCAT_CFLAGS= LIBEXTTEXTCAT_LIBS= if test "$test_libexttextcat" != no -a "$enable_libexttextcat" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -38665,10 +37393,9 @@ # Check whether --with-system-libnumbertext was given. -if test ${with_system_libnumbertext+y} -then : +if test "${with_system_libnumbertext+set}" = set; then : withval=$with_system_libnumbertext; -else $as_nop +else if test "${with_system_libnumbertext+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libnumbertext="$with_system_libs"; @@ -38680,27 +37407,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libnumbertext to use" >&5 -printf %s "checking which libnumbertext to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libnumbertext to use" >&5 +$as_echo_n "checking which libnumbertext to use... " >&6; } if test "$test_libnumbertext" != no -a "$found_libnumbertext" != yes -a "$enable_libnumbertext" != no; then ENABLE_LIBNUMBERTEXT=TRUE if test "$with_system_libnumbertext" = yes -a "$test_system_libnumbertext" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBNUMBERTEXT=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBNUMBERTEXT" >&5 -printf %s "checking for LIBNUMBERTEXT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnumbertext >= 1.0.6" >&5 +$as_echo_n "checking for libnumbertext >= 1.0.6... " >&6; } if test -n "$LIBNUMBERTEXT_CFLAGS"; then pkg_cv_LIBNUMBERTEXT_CFLAGS="$LIBNUMBERTEXT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnumbertext >= 1.0.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnumbertext >= 1.0.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnumbertext >= 1.0.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNUMBERTEXT_CFLAGS=`$PKG_CONFIG --cflags "libnumbertext >= 1.0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38714,10 +37441,10 @@ pkg_cv_LIBNUMBERTEXT_LIBS="$LIBNUMBERTEXT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnumbertext >= 1.0.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnumbertext >= 1.0.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnumbertext >= 1.0.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNUMBERTEXT_LIBS=`$PKG_CONFIG --libs "libnumbertext >= 1.0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38731,8 +37458,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38758,10 +37485,10 @@ and LIBNUMBERTEXT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -38775,16 +37502,16 @@ else LIBNUMBERTEXT_CFLAGS=$pkg_cv_LIBNUMBERTEXT_CFLAGS LIBNUMBERTEXT_LIBS=$pkg_cv_LIBNUMBERTEXT_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBNUMBERTEXT_CFLAGS=$(printf '%s' "${LIBNUMBERTEXT_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LIBNUMBERTEXT_LIBS}" LIBNUMBERTEXT_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBNUMBERTEXT= LIBNUMBERTEXT_CFLAGS="${LIBNUMBERTEXT_CFLAGS_internal}" LIBNUMBERTEXT_LIBS="${LIBNUMBERTEXT_LIBS_internal}" @@ -38792,8 +37519,8 @@ fi else if test "$found_libnumbertext" = yes -a "$enable_libnumbertext" != no -a "$with_system_libnumbertext" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_LIBNUMBERTEXT=TRUE SYSTEM_LIBNUMBERTEXT=TRUE else @@ -38802,11 +37529,11 @@ LIBNUMBERTEXT_CFLAGS= LIBNUMBERTEXT_LIBS= if test "$test_libnumbertext" != no -a "$enable_libnumbertext" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -38825,8 +37552,8 @@ if test "$_os" = "Linux"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the libc is recent enough" >&5 -printf %s "checking whether the libc is recent enough... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the libc is recent enough" >&5 +$as_echo_n "checking whether the libc is recent enough... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38836,21 +37563,20 @@ #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test "$_os" = "WINNT"; then @@ -38861,12 +37587,11 @@ else # Extract the first word of "uuidgen", so it can be a program name with args. set dummy uuidgen; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_UUIDGEN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_UUIDGEN+:} false; then : + $as_echo_n "(cached) " >&6 +else case $UUIDGEN in [\\/]* | ?:[\\/]*) ac_cv_path_UUIDGEN="$UUIDGEN" # Let the user override the test with a path. @@ -38876,15 +37601,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_UUIDGEN="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_UUIDGEN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -38896,28 +37617,27 @@ fi UUIDGEN=$ac_cv_path_UUIDGEN if test -n "$UUIDGEN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UUIDGEN" >&5 -printf "%s\n" "$UUIDGEN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UUIDGEN" >&5 +$as_echo "$UUIDGEN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$UUIDGEN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: uuid is needed for building installation sets" >&5 -printf "%s\n" "$as_me: WARNING: uuid is needed for building installation sets" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: uuid is needed for building installation sets" >&5 +$as_echo "$as_me: WARNING: uuid is needed for building installation sets" >&2;} fi fi # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_BISON+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_BISON+:} false; then : + $as_echo_n "(cached) " >&6 +else case $BISON in [\\/]* | ?:[\\/]*) ac_cv_path_BISON="$BISON" # Let the user override the test with a path. @@ -38927,15 +37647,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_BISON="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -38947,19 +37663,19 @@ fi BISON=$ac_cv_path_BISON if test -n "$BISON"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 -printf "%s\n" "$BISON" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 +$as_echo "$BISON" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$BISON"; then as_fn_error $? "no bison found in \$PATH, install it" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the bison version" >&5 -printf %s "checking the bison version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the bison version" >&5 +$as_echo_n "checking the bison version... " >&6; } _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'` _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'` if test "$COMPILER_PLUGINS" = TRUE; then @@ -38976,12 +37692,11 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_FLEX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_FLEX+:} false; then : + $as_echo_n "(cached) " >&6 +else case $FLEX in [\\/]* | ?:[\\/]*) ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path. @@ -38991,15 +37706,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_FLEX="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -39011,11 +37722,11 @@ fi FLEX=$ac_cv_path_FLEX if test -n "$FLEX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5 -printf "%s\n" "$FLEX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5 +$as_echo "$FLEX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -39025,8 +37736,8 @@ if test -z "$FLEX"; then as_fn_error $? "no flex found in \$PATH, install it" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the flex version" >&5 -printf %s "checking the flex version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the flex version" >&5 +$as_echo_n "checking the flex version... " >&6; } _flex_version=$($FLEX --version | $SED -e 's/^.*\([[:digit:]]\{1,\}\.[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}\).*$/\1/') if test $(echo $_flex_version | $AWK -F. '{printf("%d%03d%03d", $1, $2, $3)}') -lt 2006000; then as_fn_error $? "failed ($FLEX $_flex_version found, but need at least 2.6.0)" "$LINENO" 5 @@ -39036,12 +37747,11 @@ # Extract the first word of "diff", so it can be a program name with args. set dummy diff; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_DIFF+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DIFF+:} false; then : + $as_echo_n "(cached) " >&6 +else case $DIFF in [\\/]* | ?:[\\/]*) ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path. @@ -39051,15 +37761,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_DIFF="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -39071,11 +37777,11 @@ fi DIFF=$ac_cv_path_DIFF if test -n "$DIFF"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DIFF" >&5 -printf "%s\n" "$DIFF" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFF" >&5 +$as_echo "$DIFF" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -39086,12 +37792,11 @@ # Extract the first word of "uniq", so it can be a program name with args. set dummy uniq; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_UNIQ+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_UNIQ+:} false; then : + $as_echo_n "(cached) " >&6 +else case $UNIQ in [\\/]* | ?:[\\/]*) ac_cv_path_UNIQ="$UNIQ" # Let the user override the test with a path. @@ -39101,15 +37806,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_UNIQ="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_UNIQ="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -39121,11 +37822,11 @@ fi UNIQ=$ac_cv_path_UNIQ if test -n "$UNIQ"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UNIQ" >&5 -printf "%s\n" "$UNIQ" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIQ" >&5 +$as_echo "$UNIQ" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -39136,12 +37837,11 @@ # Extract the first word of "patch", so it can be a program name with args. set dummy patch; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATCH+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATCH+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATCH in [\\/]* | ?:[\\/]*) ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path. @@ -39151,15 +37851,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATCH="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -39171,11 +37867,11 @@ fi PATCH=$ac_cv_path_PATCH if test -n "$PATCH"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5 -printf "%s\n" "$PATCH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5 +$as_echo "$PATCH" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -39194,11 +37890,11 @@ fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $GNUPATCH is GNU patch" >&5 -printf %s "checking whether $GNUPATCH is GNU patch... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUPATCH is GNU patch" >&5 +$as_echo_n "checking whether $GNUPATCH is GNU patch... " >&6; } if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else as_fn_error $? "no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" "$LINENO" 5 fi @@ -39220,12 +37916,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GNUCP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GNUCP+:} false; then : + $as_echo_n "(cached) " >&6 +else case $GNUCP in [\\/]* | ?:[\\/]*) ac_cv_path_GNUCP="$GNUCP" # Let the user override the test with a path. @@ -39235,15 +37930,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GNUCP="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GNUCP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -39255,11 +37946,11 @@ fi GNUCP=$ac_cv_path_GNUCP if test -n "$GNUCP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUCP" >&5 -printf "%s\n" "$GNUCP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUCP" >&5 +$as_echo "$GNUCP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -39282,21 +37973,21 @@ GNUCP=`cygpath -m $GNUCP` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $GNUCP is GNU cp from coreutils with preserve= support" >&5 -printf %s "checking whether $GNUCP is GNU cp from coreutils with preserve= support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUCP is GNU cp from coreutils with preserve= support" >&5 +$as_echo_n "checking whether $GNUCP is GNU cp from coreutils with preserve= support... " >&6; } if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } elif $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else case "$build_os" in darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*) x_GNUCP=\# GNUCP='' - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no gnucp found - using the system's cp command" >&5 -printf "%s\n" "no gnucp found - using the system's cp command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no gnucp found - using the system's cp command" >&5 +$as_echo "no gnucp found - using the system's cp command" >&6; } ;; *) as_fn_error $? "no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" "$LINENO" 5 @@ -39316,12 +38007,12 @@ arm64) assembler=armasm64.exe ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the MSVC assembler ($assembler)" >&5 -printf %s "checking for the MSVC assembler ($assembler)... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the MSVC assembler ($assembler)" >&5 +$as_echo_n "checking for the MSVC assembler ($assembler)... " >&6; } if test -f "$MSVC_HOST_PATH/$assembler"; then ML_EXE=`win_short_path_for_make "$MSVC_HOST_PATH/$assembler"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ML_EXE" >&5 -printf "%s\n" "$ML_EXE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ML_EXE" >&5 +$as_echo "$ML_EXE" >&6; } else as_fn_error $? "not found in $MSVC_HOST_PATH" "$LINENO" 5 fi @@ -39331,12 +38022,11 @@ # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_ZIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ZIP+:} false; then : + $as_echo_n "(cached) " >&6 +else case $ZIP in [\\/]* | ?:[\\/]*) ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path. @@ -39346,15 +38036,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_ZIP="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -39366,11 +38052,11 @@ fi ZIP=$ac_cv_path_ZIP if test -n "$ZIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5 -printf "%s\n" "$ZIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5 +$as_echo "$ZIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -39381,12 +38067,11 @@ # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_UNZIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_UNZIP+:} false; then : + $as_echo_n "(cached) " >&6 +else case $UNZIP in [\\/]* | ?:[\\/]*) ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path. @@ -39396,15 +38081,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_UNZIP="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -39416,11 +38097,11 @@ fi UNZIP=$ac_cv_path_UNZIP if test -n "$UNZIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5 -printf "%s\n" "$UNZIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5 +$as_echo "$UNZIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -39434,12 +38115,11 @@ # Extract the first word of "touch", so it can be a program name with args. set dummy touch; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_TOUCH+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_TOUCH+:} false; then : + $as_echo_n "(cached) " >&6 +else case $TOUCH in [\\/]* | ?:[\\/]*) ac_cv_path_TOUCH="$TOUCH" # Let the user override the test with a path. @@ -39449,15 +38129,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_TOUCH="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -39469,11 +38145,11 @@ fi TOUCH=$ac_cv_path_TOUCH if test -n "$TOUCH"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TOUCH" >&5 -printf "%s\n" "$TOUCH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOUCH" >&5 +$as_echo "$TOUCH" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -39504,10 +38180,9 @@ # Check whether --with-system-epoxy was given. -if test ${with_system_epoxy+y} -then : +if test "${with_system_epoxy+set}" = set; then : withval=$with_system_epoxy; -else $as_nop +else if test "${with_system_epoxy+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_epoxy="$with_system_libs"; @@ -39519,27 +38194,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which epoxy to use" >&5 -printf %s "checking which epoxy to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which epoxy to use" >&5 +$as_echo_n "checking which epoxy to use... " >&6; } if test "$test_epoxy" != no -a "$found_epoxy" != yes -a "$enable_epoxy" != no; then ENABLE_EPOXY=TRUE if test "$with_system_epoxy" = yes -a "$test_system_epoxy" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_EPOXY=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EPOXY" >&5 -printf %s "checking for EPOXY... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoxy >= 1.2" >&5 +$as_echo_n "checking for epoxy >= 1.2... " >&6; } if test -n "$EPOXY_CFLAGS"; then pkg_cv_EPOXY_CFLAGS="$EPOXY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy >= 1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy >= 1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "epoxy >= 1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EPOXY_CFLAGS=`$PKG_CONFIG --cflags "epoxy >= 1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39553,10 +38228,10 @@ pkg_cv_EPOXY_LIBS="$EPOXY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy >= 1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy >= 1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "epoxy >= 1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EPOXY_LIBS=`$PKG_CONFIG --libs "epoxy >= 1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39570,8 +38245,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39597,10 +38272,10 @@ and EPOXY_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -39614,16 +38289,16 @@ else EPOXY_CFLAGS=$pkg_cv_EPOXY_CFLAGS EPOXY_LIBS=$pkg_cv_EPOXY_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi EPOXY_CFLAGS=$(printf '%s' "${EPOXY_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${EPOXY_LIBS}" EPOXY_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_EPOXY= EPOXY_CFLAGS="${EPOXY_CFLAGS_internal}" EPOXY_LIBS="${EPOXY_LIBS_internal}" @@ -39631,8 +38306,8 @@ fi else if test "$found_epoxy" = yes -a "$enable_epoxy" != no -a "$with_system_epoxy" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_EPOXY=TRUE SYSTEM_EPOXY=TRUE else @@ -39641,11 +38316,11 @@ EPOXY_CFLAGS= EPOXY_LIBS= if test "$test_epoxy" != no -a "$enable_epoxy" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -39666,7 +38341,7 @@ ENABLE_GEN= if test "$test_gen" != no -a "$enable_gen" = yes; then ENABLE_GEN=TRUE - printf "%s\n" "#define ENABLE_GEN 1" >>confdefs.h + $as_echo "#define ENABLE_GEN 1" >>confdefs.h R="$R gen" fi @@ -39682,7 +38357,7 @@ ENABLE_GTK3= if test "$test_gtk3" != no -a "$enable_gtk3" = yes; then ENABLE_GTK3=TRUE - printf "%s\n" "#define ENABLE_GTK3 1" >>confdefs.h + $as_echo "#define ENABLE_GTK3 1" >>confdefs.h R="$R gtk3" fi @@ -39698,7 +38373,7 @@ ENABLE_GTK3_KDE5= if test "$test_gtk3_kde5" != no -a "$enable_gtk3_kde5" = yes; then ENABLE_GTK3_KDE5=TRUE - printf "%s\n" "#define ENABLE_GTK3_KDE5 1" >>confdefs.h + $as_echo "#define ENABLE_GTK3_KDE5 1" >>confdefs.h R="$R gtk3_kde5" fi @@ -39714,7 +38389,7 @@ ENABLE_GTK4= if test "$test_gtk4" != no -a "$enable_gtk4" = yes; then ENABLE_GTK4=TRUE - printf "%s\n" "#define ENABLE_GTK4 1" >>confdefs.h + $as_echo "#define ENABLE_GTK4 1" >>confdefs.h R="$R gtk4" fi @@ -39730,7 +38405,7 @@ ENABLE_KF5= if test "$test_kf5" != no -a "$enable_kf5" = yes; then ENABLE_KF5=TRUE - printf "%s\n" "#define ENABLE_KF5 1" >>confdefs.h + $as_echo "#define ENABLE_KF5 1" >>confdefs.h R="$R kf5" fi @@ -39746,7 +38421,7 @@ ENABLE_QT5= if test "$test_qt5" != no -a "$enable_qt5" = yes; then ENABLE_QT5=TRUE - printf "%s\n" "#define ENABLE_QT5 1" >>confdefs.h + $as_echo "#define ENABLE_QT5 1" >>confdefs.h R="$R qt5" fi @@ -39762,7 +38437,7 @@ ENABLE_QT6= if test "$test_qt6" != no -a "$enable_qt6" = yes; then ENABLE_QT6=TRUE - printf "%s\n" "#define ENABLE_QT6 1" >>confdefs.h + $as_echo "#define ENABLE_QT6 1" >>confdefs.h R="$R qt6" fi @@ -39786,8 +38461,8 @@ if test -z "$build_vcl_plugins"; then build_vcl_plugins=" none" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: VCLplugs to be built:${build_vcl_plugins}" >&5 -printf "%s\n" "$as_me: VCLplugs to be built:${build_vcl_plugins}" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: VCLplugs to be built:${build_vcl_plugins}" >&5 +$as_echo "$as_me: VCLplugs to be built:${build_vcl_plugins}" >&6;} VCL_PLUGIN_INFO=$R @@ -39805,17 +38480,17 @@ : ${with_system_cairo:=yes} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK3" >&5 -printf %s "checking for GTK3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo" >&5 +$as_echo_n "checking for gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo... " >&6; } if test -n "$GTK3_CFLAGS"; then pkg_cv_GTK3_CFLAGS="$GTK3_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK3_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39829,10 +38504,10 @@ pkg_cv_GTK3_LIBS="$GTK3_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK3_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39846,8 +38521,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39873,10 +38548,10 @@ and GTK3_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -39890,8 +38565,8 @@ else GTK3_CFLAGS=$pkg_cv_GTK3_CFLAGS GTK3_LIBS=$pkg_cv_GTK3_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") @@ -39900,12 +38575,11 @@ GTK3_LIBS="${filteredlibs}" if test "$with_system_epoxy" != "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for eglMakeCurrent in -lEGL" >&5 -printf %s "checking for eglMakeCurrent in -lEGL... " >&6; } -if test ${ac_cv_lib_EGL_eglMakeCurrent+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglMakeCurrent in -lEGL" >&5 +$as_echo_n "checking for eglMakeCurrent in -lEGL... " >&6; } +if ${ac_cv_lib_EGL_eglMakeCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lEGL $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -39914,42 +38588,43 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char eglMakeCurrent (); int -main (void) +main () { return eglMakeCurrent (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_EGL_eglMakeCurrent=yes -else $as_nop +else ac_cv_lib_EGL_eglMakeCurrent=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglMakeCurrent" >&5 -printf "%s\n" "$ac_cv_lib_EGL_eglMakeCurrent" >&6; } -if test "x$ac_cv_lib_EGL_eglMakeCurrent" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglMakeCurrent" >&5 +$as_echo "$ac_cv_lib_EGL_eglMakeCurrent" >&6; } +if test "x$ac_cv_lib_EGL_eglMakeCurrent" = xyes; then : : -else $as_nop +else as_fn_error $? "libEGL required." "$LINENO" 5 fi - ac_fn_c_check_header_compile "$LINENO" "EGL/eglplatform.h" "ac_cv_header_EGL_eglplatform_h" "$ac_includes_default" -if test "x$ac_cv_header_EGL_eglplatform_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "EGL/eglplatform.h" "ac_cv_header_EGL_eglplatform_h" "$ac_includes_default" +if test "x$ac_cv_header_EGL_eglplatform_h" = xyes; then : -else $as_nop +else as_fn_error $? "EGL headers not found. install mesa-libEGL-devel" "$LINENO" 5 fi + fi fi @@ -39964,17 +38639,17 @@ : ${with_system_cairo:=yes} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK4" >&5 -printf %s "checking for GTK4... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk" >&5 +$as_echo_n "checking for gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk... " >&6; } if test -n "$GTK4_CFLAGS"; then pkg_cv_GTK4_CFLAGS="$GTK4_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK4_CFLAGS=`$PKG_CONFIG --cflags "gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39988,10 +38663,10 @@ pkg_cv_GTK4_LIBS="$GTK4_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK4_LIBS=`$PKG_CONFIG --libs "gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40005,8 +38680,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40032,10 +38707,10 @@ and GTK4_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -40049,8 +38724,8 @@ else GTK4_CFLAGS=$pkg_cv_GTK4_CFLAGS GTK4_LIBS=$pkg_cv_GTK4_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi GTK4_CFLAGS=$(printf '%s' "$GTK4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") @@ -40059,12 +38734,11 @@ GTK4_LIBS="${filteredlibs}" if test "$with_system_epoxy" != "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for eglMakeCurrent in -lEGL" >&5 -printf %s "checking for eglMakeCurrent in -lEGL... " >&6; } -if test ${ac_cv_lib_EGL_eglMakeCurrent+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglMakeCurrent in -lEGL" >&5 +$as_echo_n "checking for eglMakeCurrent in -lEGL... " >&6; } +if ${ac_cv_lib_EGL_eglMakeCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lEGL $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -40073,42 +38747,43 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char eglMakeCurrent (); int -main (void) +main () { return eglMakeCurrent (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_EGL_eglMakeCurrent=yes -else $as_nop +else ac_cv_lib_EGL_eglMakeCurrent=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglMakeCurrent" >&5 -printf "%s\n" "$ac_cv_lib_EGL_eglMakeCurrent" >&6; } -if test "x$ac_cv_lib_EGL_eglMakeCurrent" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglMakeCurrent" >&5 +$as_echo "$ac_cv_lib_EGL_eglMakeCurrent" >&6; } +if test "x$ac_cv_lib_EGL_eglMakeCurrent" = xyes; then : : -else $as_nop +else as_fn_error $? "libEGL required." "$LINENO" 5 fi - ac_fn_c_check_header_compile "$LINENO" "EGL/eglplatform.h" "ac_cv_header_EGL_eglplatform_h" "$ac_includes_default" -if test "x$ac_cv_header_EGL_eglplatform_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "EGL/eglplatform.h" "ac_cv_header_EGL_eglplatform_h" "$ac_includes_default" +if test "x$ac_cv_header_EGL_eglplatform_h" = xyes; then : -else $as_nop +else as_fn_error $? "EGL headers not found. install mesa-libEGL-devel" "$LINENO" 5 fi + fi fi @@ -40121,8 +38796,8 @@ enable_introspection=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5 -printf %s "checking for gobject-introspection... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5 +$as_echo_n "checking for gobject-introspection... " >&6; } case $enable_introspection in #( no) : @@ -40130,20 +38805,20 @@ ;; #( yes) : if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then : else as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5 fi if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= INTROSPECTION_REQUIRED_VERSION\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= INTROSPECTION_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= INTROSPECTION_REQUIRED_VERSION") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then found_introspection=yes else @@ -40152,10 +38827,10 @@ ;; #( auto) : if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= INTROSPECTION_REQUIRED_VERSION\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= INTROSPECTION_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= INTROSPECTION_REQUIRED_VERSION") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then found_introspection=yes else @@ -40167,8 +38842,8 @@ as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 -printf "%s\n" "$found_introspection" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 +$as_echo "$found_introspection" >&6; } INTROSPECTION_SCANNER= INTROSPECTION_COMPILER= @@ -40211,25 +38886,25 @@ test_dbus=no fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DBUS support" >&5 -printf %s "checking whether to enable DBUS support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DBUS support" >&5 +$as_echo_n "checking whether to enable DBUS support... " >&6; } if test "$test_dbus" = "yes"; then ENABLE_DBUS="TRUE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 -printf %s "checking for DBUS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1 >= 0.60" >&5 +$as_echo_n "checking for dbus-1 >= 0.60... " >&6; } if test -n "$DBUS_CFLAGS"; then pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.60" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40243,10 +38918,10 @@ pkg_cv_DBUS_LIBS="$DBUS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.60" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40260,8 +38935,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40287,10 +38962,10 @@ and DBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -40304,11 +38979,11 @@ else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - printf "%s\n" "#define ENABLE_DBUS 1" >>confdefs.h + $as_echo "#define ENABLE_DBUS 1" >>confdefs.h DBUS_CFLAGS=$(printf '%s' "$DBUS_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${DBUS_LIBS}" @@ -40318,17 +38993,17 @@ # Sets also DBUS_GLIB_CFLAGS/DBUS_GLIB_LIBS if successful. pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBUS_GLIB" >&5 -printf %s "checking for DBUS_GLIB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.4" >&5 +$as_echo_n "checking for glib-2.0 >= 2.4... " >&6; } if test -n "$DBUS_GLIB_CFLAGS"; then pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40342,10 +39017,10 @@ pkg_cv_DBUS_GLIB_LIBS="$DBUS_GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40359,8 +39034,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40375,29 +39050,29 @@ # Put the nasty error message in config.log where it belongs echo "$DBUS_GLIB_PKG_ERRORS" >&5 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No Glib found, Bluetooth support will be disabled" >&5 -printf "%s\n" "$as_me: WARNING: No Glib found, Bluetooth support will be disabled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Glib found, Bluetooth support will be disabled" >&5 +$as_echo "$as_me: WARNING: No Glib found, Bluetooth support will be disabled" >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No Glib found, Bluetooth support will be disabled" >&5 -printf "%s\n" "$as_me: WARNING: No Glib found, Bluetooth support will be disabled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Glib found, Bluetooth support will be disabled" >&5 +$as_echo "$as_me: WARNING: No Glib found, Bluetooth support will be disabled" >&2;} else DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } DBUS_HAVE_GLIB="TRUE" - printf "%s\n" "#define DBUS_HAVE_GLIB 1" >>confdefs.h + $as_echo "#define DBUS_HAVE_GLIB 1" >>confdefs.h fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -40407,16 +39082,16 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Impress remote control" >&5 -printf %s "checking whether to enable Impress remote control... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Impress remote control" >&5 +$as_echo_n "checking whether to enable Impress remote control... " >&6; } if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_SDREMOTE=TRUE SDREMOTE_ENTITLEMENT=" com.apple.security.network.server " - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Bluetooth support in Impress remote control" >&5 -printf %s "checking whether to enable Bluetooth support in Impress remote control... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Bluetooth support in Impress remote control" >&5 +$as_echo_n "checking whether to enable Bluetooth support in Impress remote control... " >&6; } if test $OS = MACOSX && test "$MACOSX_SDK_VERSION" -ge 101500; then # The Bluetooth code doesn't compile with macOS SDK 10.15 @@ -40444,37 +39119,37 @@ if test "$enable_sdremote_bluetooth" != "no"; then if test "$OS" = "LINUX"; then if test "$ENABLE_DBUS" = "TRUE" -a "$DBUS_HAVE_GLIB" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_SDREMOTE_BLUETOOTH=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which Bluetooth header to use" >&5 -printf %s "checking which Bluetooth header to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Bluetooth header to use" >&5 +$as_echo_n "checking which Bluetooth header to use... " >&6; } if test "$with_system_bluez" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } - ac_fn_c_check_header_compile "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default" -if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } + ac_fn_c_check_header_mongrel "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default" +if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes; then : -else $as_nop +else as_fn_error $? "bluetooth.h not found. install bluez" "$LINENO" 5 fi + SYSTEM_BLUEZ=TRUE else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_BLUEZ= fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, dbus disabled" >&5 -printf "%s\n" "no, dbus disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dbus disabled" >&5 +$as_echo "no, dbus disabled" >&6; } ENABLE_SDREMOTE_BLUETOOTH= SYSTEM_BLUEZ= fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_SDREMOTE_BLUETOOTH=TRUE SYSTEM_BLUEZ= SDREMOTE_ENTITLEMENT="$SDREMOTE_ENTITLEMENT @@ -40482,16 +39157,16 @@ " fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_SDREMOTE_BLUETOOTH= SYSTEM_BLUEZ= fi else ENABLE_SDREMOTE= SYSTEM_BLUEZ= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -40499,22 +39174,22 @@ if test "$ENABLE_GTK4" = "TRUE" -o "$ENABLE_GTK3" = "TRUE" -o "$ENABLE_GTK3_KDE5" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable GIO support" >&5 -printf %s "checking whether to enable GIO support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GIO support" >&5 +$as_echo_n "checking whether to enable GIO support... " >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5 -printf %s "checking for GIO... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.26" >&5 +$as_echo_n "checking for gio-2.0 >= 2.26... " >&6; } if test -n "$GIO_CFLAGS"; then pkg_cv_GIO_CFLAGS="$GIO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.26\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.26\""; } >&5 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.26") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40528,10 +39203,10 @@ pkg_cv_GIO_LIBS="$GIO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.26\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.26\""; } >&5 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.26") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40545,8 +39220,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40563,26 +39238,26 @@ ENABLE_GIO="" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_GIO="" else GIO_CFLAGS=$pkg_cv_GIO_CFLAGS GIO_LIBS=$pkg_cv_GIO_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_GIO="TRUE" fi if test "$ENABLE_GIO" = "TRUE"; then - printf "%s\n" "#define ENABLE_GIO 1" >>confdefs.h + $as_echo "#define ENABLE_GIO 1" >>confdefs.h GIO_CFLAGS=$(printf '%s' "$GIO_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${GIO_LIBS}" GIO_LIBS="${filteredlibs}" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -40608,25 +39283,25 @@ if test "$test_gstreamer_1_0" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable the GStreamer 1.0 avmedia backend" >&5 -printf %s "checking whether to enable the GStreamer 1.0 avmedia backend... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the GStreamer 1.0 avmedia backend" >&5 +$as_echo_n "checking whether to enable the GStreamer 1.0 avmedia backend... " >&6; } if test "$enable_avmedia" = yes -a "$enable_gstreamer_1_0" != no; then ENABLE_GSTREAMER_1_0="TRUE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER_1_0" >&5 -printf %s "checking for GSTREAMER_1_0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 " >&5 +$as_echo_n "checking for gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 ... " >&6; } if test -n "$GSTREAMER_1_0_CFLAGS"; then pkg_cv_GSTREAMER_1_0_CFLAGS="$GSTREAMER_1_0_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 \""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 \""; } >&5 ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 ") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GSTREAMER_1_0_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40640,10 +39315,10 @@ pkg_cv_GSTREAMER_1_0_LIBS="$GSTREAMER_1_0_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 \""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 \""; } >&5 ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 ") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GSTREAMER_1_0_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40657,8 +39332,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40684,10 +39359,10 @@ and GSTREAMER_1_0_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -40701,18 +39376,18 @@ else GSTREAMER_1_0_CFLAGS=$pkg_cv_GSTREAMER_1_0_CFLAGS GSTREAMER_1_0_LIBS=$pkg_cv_GSTREAMER_1_0_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi GSTREAMER_1_0_CFLAGS=$(printf '%s' "$GSTREAMER_1_0_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${GSTREAMER_1_0_LIBS}" GSTREAMER_1_0_LIBS="${filteredlibs}" - printf "%s\n" "#define ENABLE_GSTREAMER_1_0 1" >>confdefs.h + $as_echo "#define ENABLE_GSTREAMER_1_0 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -40726,22 +39401,21 @@ elif test "$_os" = "Darwin"; then # We use frameworks on macOS, no need for detail checks ENABLE_OPENGL_TRANSITIONS=TRUE - printf "%s\n" "#define HAVE_FEATURE_OPENGL 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_OPENGL 1" >>confdefs.h ENABLE_OPENGL_CANVAS=TRUE elif test $_os = WINNT; then ENABLE_OPENGL_TRANSITIONS=TRUE - printf "%s\n" "#define HAVE_FEATURE_OPENGL 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_OPENGL 1" >>confdefs.h ENABLE_OPENGL_CANVAS=TRUE else if test "$USING_X11" = TRUE; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 -printf %s "checking for glBegin in -lGL... " >&6; } -if test ${ac_cv_lib_GL_glBegin+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 +$as_echo_n "checking for glBegin in -lGL... " >&6; } +if ${ac_cv_lib_GL_glBegin+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lGL $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -40750,36 +39424,37 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char glBegin (); int -main (void) +main () { return glBegin (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_GL_glBegin=yes -else $as_nop +else ac_cv_lib_GL_glBegin=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 -printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; } -if test "x$ac_cv_lib_GL_glBegin" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 +$as_echo "$ac_cv_lib_GL_glBegin" >&6; } +if test "x$ac_cv_lib_GL_glBegin" = xyes; then : : -else $as_nop +else as_fn_error $? "libGL required." "$LINENO" 5 fi ENABLE_OPENGL_TRANSITIONS=TRUE - printf "%s\n" "#define HAVE_FEATURE_OPENGL 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_OPENGL 1" >>confdefs.h ENABLE_OPENGL_CANVAS=TRUE fi @@ -40793,7 +39468,7 @@ # OPENCL in BUILD_TYPE and HAVE_FEATURE_OPENCL tell that OpenCL is potentially available on the # platform (optional at run-time, used through clew). BUILD_TYPE="$BUILD_TYPE OPENCL" - printf "%s\n" "#define HAVE_FEATURE_OPENCL 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_OPENCL 1" >>confdefs.h fi @@ -40801,17 +39476,17 @@ if test $_os != Android -a $_os != iOS -a "$enable_dconf" != no; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DCONF" >&5 -printf %s "checking for DCONF... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dconf >= 0.15.2" >&5 +$as_echo_n "checking for dconf >= 0.15.2... " >&6; } if test -n "$DCONF_CFLAGS"; then pkg_cv_DCONF_CFLAGS="$DCONF_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dconf >= 0.15.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dconf >= 0.15.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "dconf >= 0.15.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DCONF_CFLAGS=`$PKG_CONFIG --cflags "dconf >= 0.15.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40825,10 +39500,10 @@ pkg_cv_DCONF_LIBS="$DCONF_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dconf >= 0.15.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dconf >= 0.15.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "dconf >= 0.15.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DCONF_LIBS=`$PKG_CONFIG --libs "dconf >= 0.15.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40842,8 +39517,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40865,8 +39540,8 @@ enable_dconf=no fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if test "$enable_dconf" = yes; then as_fn_error $? "dconf not found" "$LINENO" 5 @@ -40876,80 +39551,80 @@ else DCONF_CFLAGS=$pkg_cv_DCONF_CFLAGS DCONF_LIBS=$pkg_cv_DCONF_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dconf" >&5 -printf %s "checking whether to enable dconf... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dconf" >&5 +$as_echo_n "checking whether to enable dconf... " >&6; } if test $_os = Android -o $_os = iOS -o "$enable_dconf" = no; then DCONF_CFLAGS= DCONF_LIBS= ENABLE_DCONF= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else ENABLE_DCONF=TRUE - printf "%s\n" "#define ENABLE_DCONF 1" >>confdefs.h + $as_echo "#define ENABLE_DCONF 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi # pdf import? -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build the PDF import feature" >&5 -printf %s "checking whether to build the PDF import feature... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the PDF import feature" >&5 +$as_echo_n "checking whether to build the PDF import feature... " >&6; } ENABLE_PDFIMPORT= if test -z "$enable_pdfimport" -o "$enable_pdfimport" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_PDFIMPORT=TRUE - printf "%s\n" "#define HAVE_FEATURE_PDFIMPORT 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_PDFIMPORT 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Pdfium? -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build PDFium" >&5 -printf %s "checking whether to build PDFium... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build PDFium" >&5 +$as_echo_n "checking whether to build PDFium... " >&6; } ENABLE_PDFIUM= if test \( -z "$enable_pdfium" -a "$ENABLE_PDFIMPORT" = "TRUE" \) -o "$enable_pdfium" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_PDFIUM=TRUE BUILD_TYPE="$BUILD_TYPE PDFIUM" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$ENABLE_PDFIUM" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which OpenJPEG library to use" >&5 -printf %s "checking which OpenJPEG library to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which OpenJPEG library to use" >&5 +$as_echo_n "checking which OpenJPEG library to use... " >&6; } if test "$with_system_openjpeg" = "yes"; then SYSTEM_OPENJPEG2=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OPENJPEG2" >&5 -printf %s "checking for OPENJPEG2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libopenjp2 " >&5 +$as_echo_n "checking for libopenjp2 ... " >&6; } if test -n "$OPENJPEG2_CFLAGS"; then pkg_cv_OPENJPEG2_CFLAGS="$OPENJPEG2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 \""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 \""; } >&5 ($PKG_CONFIG --exists --print-errors "libopenjp2 ") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENJPEG2_CFLAGS=`$PKG_CONFIG --cflags "libopenjp2 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40963,10 +39638,10 @@ pkg_cv_OPENJPEG2_LIBS="$OPENJPEG2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 \""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 \""; } >&5 ($PKG_CONFIG --exists --print-errors "libopenjp2 ") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENJPEG2_LIBS=`$PKG_CONFIG --libs "libopenjp2 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40980,8 +39655,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -41007,10 +39682,10 @@ and OPENJPEG2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -41024,8 +39699,8 @@ else OPENJPEG2_CFLAGS=$pkg_cv_OPENJPEG2_CFLAGS OPENJPEG2_LIBS=$pkg_cv_OPENJPEG2_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi OPENJPEG2_CFLAGS=$(printf '%s' "$OPENJPEG2_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") @@ -41033,15 +39708,15 @@ OPENJPEG2_LIBS="${filteredlibs}" else SYSTEM_OPENJPEG2=FALSE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which Abseil library to use" >&5 -printf %s "checking which Abseil library to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Abseil library to use" >&5 +$as_echo_n "checking which Abseil library to use... " >&6; } if test "$with_system_abseil" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ABSEIL=TRUE ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -41049,52 +39724,47 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_fn_cxx_check_header_compile "$LINENO" "absl/types/bad_optional_access.h" "ac_cv_header_absl_types_bad_optional_access_h" "$ac_includes_default" -if test "x$ac_cv_header_absl_types_bad_optional_access_h" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "absl/types/bad_optional_access.h" "ac_cv_header_absl_types_bad_optional_access_h" "$ac_includes_default" +if test "x$ac_cv_header_absl_types_bad_optional_access_h" = xyes; then : -else $as_nop +else as_fn_error $? "abseil headers not found." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -labsl_bad_optional_access" >&5 -printf %s "checking for main in -labsl_bad_optional_access... " >&6; } -if test ${ac_cv_lib_absl_bad_optional_access_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -labsl_bad_optional_access" >&5 +$as_echo_n "checking for main in -labsl_bad_optional_access... " >&6; } +if ${ac_cv_lib_absl_bad_optional_access_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-labsl_bad_optional_access $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_absl_bad_optional_access_main=yes -else $as_nop +else ac_cv_lib_absl_bad_optional_access_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_absl_bad_optional_access_main" >&5 -printf "%s\n" "$ac_cv_lib_absl_bad_optional_access_main" >&6; } -if test "x$ac_cv_lib_absl_bad_optional_access_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_absl_bad_optional_access_main" >&5 +$as_echo "$ac_cv_lib_absl_bad_optional_access_main" >&6; } +if test "x$ac_cv_lib_absl_bad_optional_access_main" = xyes; then : ABSEIL_LIBS=-labsl_bad_optional_access -else $as_nop +else as_fn_error $? "libabsl_bad_optional_access library not found." "$LINENO" 5 fi @@ -41108,8 +39778,8 @@ FilterLibs "${ABSEIL_LIBS}" ABSEIL_LIBS="${filteredlibs}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } fi fi @@ -41118,17 +39788,17 @@ ENABLE_POPPLER= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Poppler" >&5 -printf %s "checking whether to build Poppler... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Poppler" >&5 +$as_echo_n "checking whether to build Poppler... " >&6; } if test \( -z "$enable_poppler" -a "$ENABLE_PDFIMPORT" = "TRUE" -a $_os != Android \) -o "$enable_poppler" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_POPPLER=TRUE - printf "%s\n" "#define HAVE_FEATURE_POPPLER 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_POPPLER 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -41141,25 +39811,25 @@ fi if test "$ENABLE_PDFIMPORT" = "TRUE" -a "$ENABLE_POPPLER" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which PDF import poppler to use" >&5 -printf %s "checking which PDF import poppler to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which PDF import poppler to use" >&5 +$as_echo_n "checking which PDF import poppler to use... " >&6; } if test "$with_system_poppler" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_POPPLER=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POPPLER" >&5 -printf %s "checking for POPPLER... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler >= 0.14 poppler-cpp" >&5 +$as_echo_n "checking for poppler >= 0.14 poppler-cpp... " >&6; } if test -n "$POPPLER_CFLAGS"; then pkg_cv_POPPLER_CFLAGS="$POPPLER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.14 poppler-cpp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.14 poppler-cpp\""; } >&5 ($PKG_CONFIG --exists --print-errors "poppler >= 0.14 poppler-cpp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.14 poppler-cpp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41173,10 +39843,10 @@ pkg_cv_POPPLER_LIBS="$POPPLER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.14 poppler-cpp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.14 poppler-cpp\""; } >&5 ($PKG_CONFIG --exists --print-errors "poppler >= 0.14 poppler-cpp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.14 poppler-cpp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41190,8 +39860,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -41217,10 +39887,10 @@ and POPPLER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -41234,20 +39904,20 @@ else POPPLER_CFLAGS=$pkg_cv_POPPLER_CFLAGS POPPLER_LIBS=$pkg_cv_POPPLER_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${POPPLER_LIBS}" POPPLER_LIBS="${filteredlibs}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_POPPLER= BUILD_TYPE="$BUILD_TYPE POPPLER" fi - printf "%s\n" "#define ENABLE_PDFIMPORT 1" >>confdefs.h + $as_echo "#define ENABLE_PDFIMPORT 1" >>confdefs.h fi @@ -41261,10 +39931,10 @@ # Skia now requires at least freetype2 >= 2.8.1, which is less that what LO requires as system freetype. if test "$SYSTEM_FREETYPE" = TRUE; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 21.0.15\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 21.0.15\""; } >&5 ($PKG_CONFIG --exists --print-errors "freetype2 >= 21.0.15") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # 21.0.15 = 2.8.1 skia_freetype_ok=yes @@ -41274,34 +39944,34 @@ else # internal is ok skia_freetype_ok=yes fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Skia" >&5 -printf %s "checking whether to build Skia... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Skia" >&5 +$as_echo_n "checking whether to build Skia... " >&6; } if test "$skia_freetype_ok" = "yes"; then if test "$enable_skia" = "debug"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (debug)" >&5 -printf "%s\n" "yes (debug)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (debug)" >&5 +$as_echo "yes (debug)" >&6; } ENABLE_SKIA_DEBUG=TRUE else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_SKIA_DEBUG= fi ENABLE_SKIA=TRUE - printf "%s\n" "#define HAVE_FEATURE_SKIA 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_SKIA 1" >>confdefs.h BUILD_TYPE="$BUILD_TYPE SKIA" if test "$OS" = "MACOSX"; then - printf "%s\n" "#define SK_SUPPORT_GPU 1" >>confdefs.h + $as_echo "#define SK_SUPPORT_GPU 1" >>confdefs.h - printf "%s\n" "#define SK_METAL 1" >>confdefs.h + $as_echo "#define SK_METAL 1" >>confdefs.h SKIA_GPU=METAL else - printf "%s\n" "#define SK_SUPPORT_GPU 1" >>confdefs.h + $as_echo "#define SK_SUPPORT_GPU 1" >>confdefs.h - printf "%s\n" "#define SK_VULKAN 1" >>confdefs.h + $as_echo "#define SK_VULKAN 1" >>confdefs.h SKIA_GPU=VULKAN @@ -41312,16 +39982,16 @@ fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (freetype too old)" >&5 -printf "%s\n" "no (freetype too old)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (freetype too old)" >&5 +$as_echo "no (freetype too old)" >&6; } add_warning "freetype version is too old for Skia library, at least 2.8.1 required, Skia support disabled" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Skia" >&5 -printf %s "checking whether to build Skia... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Skia" >&5 +$as_echo_n "checking whether to build Skia... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -41340,14 +40010,14 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then if test -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Clang" >&5 -printf %s "checking for Clang... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LO_CLANG_CC / $LO_CLANG_CXX" >&5 -printf "%s\n" "$LO_CLANG_CC / $LO_CLANG_CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Clang" >&5 +$as_echo_n "checking for Clang... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LO_CLANG_CC / $LO_CLANG_CXX" >&5 +$as_echo "$LO_CLANG_CC / $LO_CLANG_CXX" >&6; } else if test "$_os" = "WINNT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang-cl" >&5 -printf %s "checking for clang-cl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang-cl" >&5 +$as_echo_n "checking for clang-cl... " >&6; } if test -x "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"; then LO_CLANG_CC=`win_short_path_for_make "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"` elif test -n "$PROGRAMFILES" -a -x "$PROGRAMFILES/LLVM/bin/clang-cl.exe"; then @@ -41358,15 +40028,15 @@ if test -n "$LO_CLANG_CC"; then LO_CLANG_CC="$LO_CLANG_CC -m$WIN_HOST_BITS" LO_CLANG_CXX="$LO_CLANG_CC" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LO_CLANG_CC" >&5 -printf "%s\n" "$LO_CLANG_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LO_CLANG_CC" >&5 +$as_echo "$LO_CLANG_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the dependency generation prefix (clang.exe -showIncludes)" >&5 -printf %s "checking the dependency generation prefix (clang.exe -showIncludes)... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the dependency generation prefix (clang.exe -showIncludes)" >&5 +$as_echo_n "checking the dependency generation prefix (clang.exe -showIncludes)... " >&6; } echo "#include " > conftest.c LO_CLANG_SHOWINCLUDES_PREFIX=`$LO_CLANG_CC $CFLAGS -c -showIncludes conftest.c 2>/dev/null | \ grep 'stdlib\.h' | head -n1 | sed 's/ [[:alpha:]]:.*//'` @@ -41374,18 +40044,17 @@ if test -z "$LO_CLANG_SHOWINCLUDES_PREFIX"; then as_fn_error $? "cannot determine the -showIncludes prefix" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$LO_CLANG_SHOWINCLUDES_PREFIX\"" >&5 -printf "%s\n" "\"$LO_CLANG_SHOWINCLUDES_PREFIX\"" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$LO_CLANG_SHOWINCLUDES_PREFIX\"" >&5 +$as_echo "\"$LO_CLANG_SHOWINCLUDES_PREFIX\"" >&6; } fi else # Extract the first word of "clang", so it can be a program name with args. set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_LO_CLANG_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LO_CLANG_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$LO_CLANG_CC"; then ac_cv_prog_LO_CLANG_CC="$LO_CLANG_CC" # Let the user override the test. else @@ -41393,15 +40062,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LO_CLANG_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -41412,22 +40077,21 @@ fi LO_CLANG_CC=$ac_cv_prog_LO_CLANG_CC if test -n "$LO_CLANG_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LO_CLANG_CC" >&5 -printf "%s\n" "$LO_CLANG_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LO_CLANG_CC" >&5 +$as_echo "$LO_CLANG_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "clang++", so it can be a program name with args. set dummy clang++; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_LO_CLANG_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LO_CLANG_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$LO_CLANG_CXX"; then ac_cv_prog_LO_CLANG_CXX="$LO_CLANG_CXX" # Let the user override the test. else @@ -41435,15 +40099,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LO_CLANG_CXX="clang++" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -41454,11 +40114,11 @@ fi LO_CLANG_CXX=$ac_cv_prog_LO_CLANG_CXX if test -n "$LO_CLANG_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LO_CLANG_CXX" >&5 -printf "%s\n" "$LO_CLANG_CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LO_CLANG_CXX" >&5 +$as_echo "$LO_CLANG_CXX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -41468,8 +40128,8 @@ clang2_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | $LO_CLANG_CC -E - | tail -1 | sed 's/ //g'` clang2_ver=`echo "$clang2_version" | $AWK -F. '{ print \$1*10000+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'` if test "$clang2_ver" -lt 50002; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"$clang2_version\" is too old or unrecognized, must be at least Clang 5.0.2" >&5 -printf "%s\n" "$as_me: WARNING: \"$clang2_version\" is too old or unrecognized, must be at least Clang 5.0.2" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"$clang2_version\" is too old or unrecognized, must be at least Clang 5.0.2" >&5 +$as_echo "$as_me: WARNING: \"$clang2_version\" is too old or unrecognized, must be at least Clang 5.0.2" >&2;} LO_CLANG_CC= LO_CLANG_CXX= fi @@ -41477,8 +40137,8 @@ if test -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX" -a "$_os" = "WINNT"; then save_CXX="$CXX" CXX="$LO_CLANG_CXX" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -Zc:dllexportInlines-" >&5 -printf %s "checking whether $CXX supports -Zc:dllexportInlines-... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -Zc:dllexportInlines-" >&5 +$as_echo_n "checking whether $CXX supports -Zc:dllexportInlines-... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41491,18 +40151,17 @@ /* end confdefs.h. */ _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : HAVE_LO_CLANG_DLLEXPORTINLINES=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -41521,8 +40180,8 @@ if test "$_os" = "WINNT" -o "$_os" = "Darwin"; then as_fn_error $? "Clang compiler not found. The Skia library needs to be built using Clang, or use --disable-skia." "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Clang compiler not found." >&5 -printf "%s\n" "$as_me: WARNING: Clang compiler not found." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Clang compiler not found." >&5 +$as_echo "$as_me: WARNING: Clang compiler not found." >&2;} fi else @@ -41540,8 +40199,8 @@ flag_f16c=-mf16c flag_fma=-mfma - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE2 intrinsics" >&5 -printf %s "checking whether $CXX can compile SSE2 intrinsics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE2 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile SSE2 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41561,13 +40220,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_sse2=yes -else $as_nop +else can_compile_sse2=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41575,14 +40233,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse2}" >&5 -printf "%s\n" "${can_compile_sse2}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse2}" >&5 +$as_echo "${can_compile_sse2}" >&6; } if test "${can_compile_sse2}" = "yes" ; then LO_CLANG_CXXFLAGS_INTRINSICS_SSE2="$flag_sse2" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSSE3 intrinsics" >&5 -printf %s "checking whether $CXX can compile SSSE3 intrinsics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSSE3 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile SSSE3 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41602,13 +40260,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_ssse3=yes -else $as_nop +else can_compile_ssse3=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41616,14 +40273,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_ssse3}" >&5 -printf "%s\n" "${can_compile_ssse3}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_ssse3}" >&5 +$as_echo "${can_compile_ssse3}" >&6; } if test "${can_compile_ssse3}" = "yes" ; then LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3="$flag_ssse3" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE4.1 intrinsics" >&5 -printf %s "checking whether $CXX can compile SSE4.1 intrinsics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE4.1 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile SSE4.1 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41643,13 +40300,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_sse41=yes -else $as_nop +else can_compile_sse41=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41657,14 +40313,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse41}" >&5 -printf "%s\n" "${can_compile_sse41}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse41}" >&5 +$as_echo "${can_compile_sse41}" >&6; } if test "${can_compile_sse41}" = "yes" ; then LO_CLANG_CXXFLAGS_INTRINSICS_SSE41="$flag_sse41" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE4.2 intrinsics" >&5 -printf %s "checking whether $CXX can compile SSE4.2 intrinsics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile SSE4.2 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile SSE4.2 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41684,13 +40340,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_sse42=yes -else $as_nop +else can_compile_sse42=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41698,14 +40353,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse42}" >&5 -printf "%s\n" "${can_compile_sse42}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_sse42}" >&5 +$as_echo "${can_compile_sse42}" >&6; } if test "${can_compile_sse42}" = "yes" ; then LO_CLANG_CXXFLAGS_INTRINSICS_SSE42="$flag_sse42" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX intrinsics" >&5 -printf %s "checking whether $CXX can compile AVX intrinsics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile AVX intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41725,13 +40380,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_avx=yes -else $as_nop +else can_compile_avx=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41739,14 +40393,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx}" >&5 -printf "%s\n" "${can_compile_avx}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx}" >&5 +$as_echo "${can_compile_avx}" >&6; } if test "${can_compile_avx}" = "yes" ; then LO_CLANG_CXXFLAGS_INTRINSICS_AVX="$flag_avx" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX2 intrinsics" >&5 -printf %s "checking whether $CXX can compile AVX2 intrinsics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX2 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile AVX2 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41766,13 +40420,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_avx2=yes -else $as_nop +else can_compile_avx2=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41780,14 +40433,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx2}" >&5 -printf "%s\n" "${can_compile_avx2}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx2}" >&5 +$as_echo "${can_compile_avx2}" >&6; } if test "${can_compile_avx2}" = "yes" ; then LO_CLANG_CXXFLAGS_INTRINSICS_AVX2="$flag_avx2" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX512 intrinsics" >&5 -printf %s "checking whether $CXX can compile AVX512 intrinsics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile AVX512 intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile AVX512 intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41809,13 +40462,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_avx512=yes -else $as_nop +else can_compile_avx512=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41823,15 +40475,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx512}" >&5 -printf "%s\n" "${can_compile_avx512}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx512}" >&5 +$as_echo "${can_compile_avx512}" >&6; } if test "${can_compile_avx512}" = "yes" ; then LO_CLANG_CXXFLAGS_INTRINSICS_AVX512="$flag_avx512" LO_CLANG_CXXFLAGS_INTRINSICS_AVX512F="$flag_avx512f" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile F16C intrinsics" >&5 -printf %s "checking whether $CXX can compile F16C intrinsics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile F16C intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile F16C intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41852,13 +40504,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_f16c=yes -else $as_nop +else can_compile_f16c=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41866,14 +40517,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_f16c}" >&5 -printf "%s\n" "${can_compile_f16c}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_f16c}" >&5 +$as_echo "${can_compile_f16c}" >&6; } if test "${can_compile_f16c}" = "yes" ; then LO_CLANG_CXXFLAGS_INTRINSICS_F16C="$flag_f16c" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile FMA intrinsics" >&5 -printf %s "checking whether $CXX can compile FMA intrinsics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX can compile FMA intrinsics" >&5 +$as_echo_n "checking whether $CXX can compile FMA intrinsics... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41893,13 +40544,12 @@ } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : can_compile_fma=yes -else $as_nop +else can_compile_fma=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41907,8 +40557,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS=$save_CXXFLAGS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${can_compile_fma}" >&5 -printf "%s\n" "${can_compile_fma}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_fma}" >&5 +$as_echo "${can_compile_fma}" >&6; } if test "${can_compile_fma}" = "yes" ; then LO_CLANG_CXXFLAGS_INTRINSICS_FMA="$flag_fma" fi @@ -41920,8 +40570,8 @@ # prefix LO_CLANG_CC/LO_CLANG_CXX with ccache if needed # if test "$CCACHE" != "" -a -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $LO_CLANG_CC is already ccached" >&5 -printf %s "checking whether $LO_CLANG_CC is already ccached... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LO_CLANG_CC is already ccached" >&5 +$as_echo_n "checking whether $LO_CLANG_CC is already ccached... " >&6; } ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41936,29 +40586,28 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : use_ccache=yes -else $as_nop +else use_ccache=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$save_CFLAGS CC=$save_CC if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else LO_CLANG_CC="$CCACHE $LO_CLANG_CC" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -41967,8 +40616,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $LO_CLANG_CXX is already ccached" >&5 -printf %s "checking whether $LO_CLANG_CXX is already ccached... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LO_CLANG_CXX is already ccached" >&5 +$as_echo_n "checking whether $LO_CLANG_CXX is already ccached... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41983,27 +40632,26 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : use_ccache=yes -else $as_nop +else use_ccache=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else LO_CLANG_CXX="$CCACHE $LO_CLANG_CXX" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi CXXFLAGS=$save_CXXFLAGS CXX=$save_CXX @@ -42033,91 +40681,89 @@ SYSTEM_GPGMEPP= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable gpgmepp" >&5 -printf %s "checking whether to enable gpgmepp... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable gpgmepp" >&5 +$as_echo_n "checking whether to enable gpgmepp... " >&6; } if test "$enable_gpgmepp" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } elif test "$enable_mpl_subset" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (MPL only" >&5 -printf "%s\n" "no (MPL only" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (MPL only" >&5 +$as_echo "no (MPL only" >&6; } elif test "$enable_fuzzers" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (oss-fuzz)" >&5 -printf "%s\n" "no (oss-fuzz)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (oss-fuzz)" >&5 +$as_echo "no (oss-fuzz)" >&6; } elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE \) -o "$_os" = "WINNT" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which gpgmepp to use" >&5 -printf %s "checking which gpgmepp to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which gpgmepp to use" >&5 +$as_echo_n "checking which gpgmepp to use... " >&6; } if test "$with_system_gpgmepp" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_GPGMEPP=TRUE # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way - ac_fn_c_check_header_compile "$LINENO" "gpgme++/gpgmepp_version.h" "ac_cv_header_gpgmepp_gpgmepp_version_h" "$ac_includes_default" -if test "x$ac_cv_header_gpgmepp_gpgmepp_version_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "gpgme++/gpgmepp_version.h" "ac_cv_header_gpgmepp_gpgmepp_version_h" "$ac_includes_default" +if test "x$ac_cv_header_gpgmepp_gpgmepp_version_h" = xyes; then : GPGMEPP_CFLAGS=-I/usr/include/gpgme++ -else $as_nop +else as_fn_error $? "gpgmepp headers not found, install gpgmepp >= 1.14 development package" "$LINENO" 5 fi - # progress_callback is the only func with plain C linkage - # checking for it also filters out older, KDE-dependent libgpgmepp versions - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for progress_callback in -lgpgmepp" >&5 -printf %s "checking for progress_callback in -lgpgmepp... " >&6; } -if test ${ac_cv_lib_gpgmepp_progress_callback+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + ac_fn_c_check_header_mongrel "$LINENO" "gpgme.h" "ac_cv_header_gpgme_h" "$ac_includes_default" +if test "x$ac_cv_header_gpgme_h" = xyes; then : + +else + as_fn_error $? "gpgme headers not found, install gpgme development package" "$LINENO" 5 +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgpgmepp" >&5 +$as_echo_n "checking for main in -lgpgmepp... " >&6; } +if ${ac_cv_lib_gpgmepp_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpgmepp $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char progress_callback (); + int -main (void) +main () { -return progress_callback (); +return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_gpgmepp_progress_callback=yes -else $as_nop - ac_cv_lib_gpgmepp_progress_callback=no +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gpgmepp_main=yes +else + ac_cv_lib_gpgmepp_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpgmepp_progress_callback" >&5 -printf "%s\n" "$ac_cv_lib_gpgmepp_progress_callback" >&6; } -if test "x$ac_cv_lib_gpgmepp_progress_callback" = xyes -then : - GPGMEPP_LIBS=-lgpgmepp -else $as_nop - as_fn_error $? "gpgmepp not found or not functional" "$LINENO" 5 -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpgmepp_main" >&5 +$as_echo "$ac_cv_lib_gpgmepp_main" >&6; } +if test "x$ac_cv_lib_gpgmepp_main" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGPGMEPP 1 +_ACEOF - ac_fn_c_check_header_compile "$LINENO" "gpgme.h" "ac_cv_header_gpgme_h" "$ac_includes_default" -if test "x$ac_cv_header_gpgme_h" = xyes -then : + LIBS="-lgpgmepp $LIBS" -else $as_nop - as_fn_error $? "gpgme headers not found, install gpgme development package" "$LINENO" 5 +else + as_fn_error $? "gpgmepp not found or not functional" "$LINENO" 5 fi + GPGMEPP_LIBS=-lgpgmepp else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src" @@ -42128,16 +40774,15 @@ fi fi ENABLE_GPGMEPP=TRUE - printf "%s\n" "#define HAVE_FEATURE_GPGME 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_GPGME 1" >>confdefs.h # Extract the first word of "gpg", so it can be a program name with args. set dummy gpg; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GPG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GPG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $GPG in [\\/]* | ?:[\\/]*) ac_cv_path_GPG="$GPG" # Let the user override the test with a path. @@ -42147,15 +40792,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GPG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GPG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -42167,11 +40808,11 @@ fi GPG=$ac_cv_path_GPG if test -n "$GPG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GPG" >&5 -printf "%s\n" "$GPG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG" >&5 +$as_echo "$GPG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -42180,24 +40821,23 @@ if test -n "$GPG" -a "$_os" != "WINNT"; then # make sure we not only have a working gpgme, but a full working # gpg installation to run OpenPGP signature verification - printf "%s\n" "#define HAVE_FEATURE_GPGVERIFY 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_GPGVERIFY 1" >>confdefs.h fi if test "$_os" = "Linux"; then uid=`id -u` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /run/user/$uid" >&5 -printf %s "checking for /run/user/$uid... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /run/user/$uid" >&5 +$as_echo_n "checking for /run/user/$uid... " >&6; } if test -d /run/user/$uid; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } # Extract the first word of "gpgconf", so it can be a program name with args. set dummy gpgconf; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GPGCONF+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GPGCONF+:} false; then : + $as_echo_n "(cached) " >&6 +else case $GPGCONF in [\\/]* | ?:[\\/]*) ac_cv_path_GPGCONF="$GPGCONF" # Let the user override the test with a path. @@ -42207,15 +40847,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GPGCONF="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GPGCONF="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -42227,11 +40863,11 @@ fi GPGCONF=$ac_cv_path_GPGCONF if test -n "$GPGCONF"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GPGCONF" >&5 -printf "%s\n" "$GPGCONF" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGCONF" >&5 +$as_echo "$GPGCONF" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -42240,43 +40876,45 @@ # `gpgconf --remove-socketdir` fails to exit any gpg-agent daemon operating # on that socket dir that has (indirectly) been started by the tests in xmlsecurity/qa/unit/signing/signing.cxx # (see commit message of f0305ec0a7d199e605511844d9d6af98b66d4bfd%5E ) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether version of gpgconf is suitable ... " >&5 -printf %s "checking whether version of gpgconf is suitable ... ... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether version of gpgconf is suitable ... " >&5 +$as_echo_n "checking whether version of gpgconf is suitable ... ... " >&6; } GPGCONF_VERSION=`"$GPGCONF" --version | "$AWK" '/^gpgconf \(GnuPG\)/{print $3}'` GPGCONF_NUMVER=`echo $GPGCONF_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$GPGCONF_VERSION" = "2.2_OOo" -o "$GPGCONF_NUMVER" -ge "020200"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, $GPGCONF_VERSION" >&5 -printf "%s\n" "yes, $GPGCONF_VERSION" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gpgconf --create-socketdir... " >&5 -printf %s "checking for gpgconf --create-socketdir... ... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $GPGCONF_VERSION" >&5 +$as_echo "yes, $GPGCONF_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpgconf --create-socketdir... " >&5 +$as_echo_n "checking for gpgconf --create-socketdir... ... " >&6; } if $GPGCONF --dump-options > /dev/null ; then if $GPGCONF --dump-options | grep -q create-socketdir ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - printf "%s\n" "#define HAVE_GPGCONF_SOCKETDIR 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_GPGCONF_SOCKETDIR 1" >>confdefs.h - printf "%s\n" "#define GPGME_GPGCONF \"$GPGCONF\"" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define GPGME_GPGCONF "$GPGCONF" +_ACEOF else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no. missing or broken gpgconf?" >&5 -printf "%s\n" "no. missing or broken gpgconf?" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. missing or broken gpgconf?" >&5 +$as_echo "no. missing or broken gpgconf?" >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, $GPGCONF_VERSION" >&5 -printf "%s\n" "no, $GPGCONF_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, $GPGCONF_VERSION" >&5 +$as_echo "no, $GPGCONF_VERSION" >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (unsupported OS or missing NSS)" >&5 -printf "%s\n" "no (unsupported OS or missing NSS)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (unsupported OS or missing NSS)" >&5 +$as_echo "no (unsupported OS or missing NSS)" >&6; } fi @@ -42287,36 +40925,36 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build the Wiki Publisher extension" >&5 -printf %s "checking whether to build the Wiki Publisher extension... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Wiki Publisher extension" >&5 +$as_echo_n "checking whether to build the Wiki Publisher extension... " >&6; } if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_MEDIAWIKI=TRUE BUILD_TYPE="$BUILD_TYPE XSLTML" if test "x$with_java" = "xno"; then as_fn_error $? "Wiki Publisher requires Java! Enable Java if you want to build it." "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_MEDIAWIKI= SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build the Report Builder" >&5 -printf %s "checking whether to build the Report Builder... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Report Builder" >&5 +$as_echo_n "checking whether to build the Report Builder... " >&6; } if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_REPORTBUILDER=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which jfreereport libs to use" >&5 -printf %s "checking which jfreereport libs to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which jfreereport libs to use" >&5 +$as_echo_n "checking which jfreereport libs to use... " >&6; } if test "$with_system_jfreereport" = "yes"; then SYSTEM_JFREEREPORT=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } if test -z $SAC_JAR; then SAC_JAR=/usr/share/java/sac.jar fi @@ -42445,15 +41083,15 @@ fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_JFREEREPORT= BUILD_TYPE="$BUILD_TYPE JFREEREPORT" NEED_ANT=TRUE fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_REPORTBUILDER= SYSTEM_JFREEREPORT= fi @@ -42472,18 +41110,18 @@ # scripting provider for BeanShell? -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build support for scripts in BeanShell" >&5 -printf %s "checking whether to build support for scripts in BeanShell... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build support for scripts in BeanShell" >&5 +$as_echo_n "checking whether to build support for scripts in BeanShell... " >&6; } if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_SCRIPTING_BEANSHELL=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which beanshell to use" >&5 -printf %s "checking which beanshell to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which beanshell to use" >&5 +$as_echo_n "checking which beanshell to use... " >&6; } if test "$with_system_beanshell" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_BSH=TRUE if test -z $BSH_JAR; then BSH_JAR=/usr/share/java/bsh.jar @@ -42492,14 +41130,14 @@ as_fn_error $? "bsh.jar not found." "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_BSH= BUILD_TYPE="$BUILD_TYPE BSH" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_SCRIPTING_BEANSHELL= SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_BEANSHELL" fi @@ -42508,18 +41146,18 @@ # scripting provider for JavaScript? -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build support for scripts in JavaScript" >&5 -printf %s "checking whether to build support for scripts in JavaScript... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build support for scripts in JavaScript" >&5 +$as_echo_n "checking whether to build support for scripts in JavaScript... " >&6; } if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_SCRIPTING_JAVASCRIPT=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which rhino to use" >&5 -printf %s "checking which rhino to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which rhino to use" >&5 +$as_echo_n "checking which rhino to use... " >&6; } if test "$with_system_rhino" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_RHINO=TRUE if test -z $RHINO_JAR; then RHINO_JAR=/usr/share/java/js.jar @@ -42528,15 +41166,15 @@ as_fn_error $? "js.jar not found." "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_RHINO= BUILD_TYPE="$BUILD_TYPE RHINO" NEED_ANT=TRUE fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_SCRIPTING_JAVASCRIPT= SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_JAVASCRIPT" fi @@ -42588,12 +41226,11 @@ if test -n "$QT5DIR"; then # Extract the first word of "qmake", so it can be a program name with args. set dummy qmake; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_QMAKE5+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_QMAKE5+:} false; then : + $as_echo_n "(cached) " >&6 +else case $QMAKE5 in [\\/]* | ?:[\\/]*) ac_cv_path_QMAKE5="$QMAKE5" # Let the user override the test with a path. @@ -42603,15 +41240,11 @@ for as_dir in $QT5DIR/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_QMAKE5="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_QMAKE5="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -42624,11 +41257,11 @@ fi QMAKE5=$ac_cv_path_QMAKE5 if test -n "$QMAKE5"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $QMAKE5" >&5 -printf "%s\n" "$QMAKE5" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE5" >&5 +$as_echo "$QMAKE5" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -42637,12 +41270,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_QMAKE5+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_QMAKE5+:} false; then : + $as_echo_n "(cached) " >&6 +else case $QMAKE5 in [\\/]* | ?:[\\/]*) ac_cv_path_QMAKE5="$QMAKE5" # Let the user override the test with a path. @@ -42652,15 +41284,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_QMAKE5="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_QMAKE5="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -42672,11 +41300,11 @@ fi QMAKE5=$ac_cv_path_QMAKE5 if test -n "$QMAKE5"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $QMAKE5" >&5 -printf "%s\n" "$QMAKE5" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE5" >&5 +$as_echo "$QMAKE5" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -42697,8 +41325,8 @@ if test "$qmake5_minor_version" -lt "$qt5_minimal_minor"; then as_fn_error $? "The minimal supported Qt5 version is 5.${qt5_minimal_minor}, but your 'qmake -v' reports Qt5 version $qmake5_test_ver." "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Detected Qt5 version: $qmake5_test_ver" >&5 -printf "%s\n" "$as_me: Detected Qt5 version: $qmake5_test_ver" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Detected Qt5 version: $qmake5_test_ver" >&5 +$as_echo "$as_me: Detected Qt5 version: $qmake5_test_ver" >&6;} fi fi @@ -42707,8 +41335,8 @@ qt5_platformsdir="`$QMAKE5 -query QT_INSTALL_PLUGINS`/platforms" QT5_PLATFORMS_SRCDIR="$qt5_platformsdir" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt5 headers" >&5 -printf %s "checking for Qt5 headers... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 headers" >&5 +$as_echo_n "checking for Qt5 headers... " >&6; } qt5_incdir="no" for inc_dir in $qt5_incdirs; do if test -r "$inc_dir/$qt5_test_include"; then @@ -42716,8 +41344,8 @@ break fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $qt5_incdir" >&5 -printf "%s\n" "$qt5_incdir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt5_incdir" >&5 +$as_echo "$qt5_incdir" >&6; } if test "x$qt5_incdir" = "xno"; then as_fn_error $? "Qt5 headers not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running \"configure\"." "$LINENO" 5 fi @@ -42730,14 +41358,14 @@ save_CPPFLAGS=$CPPFLAGS CPPFLAGS="${CPPFLAGS} -I${qt5_incdir}" - ac_fn_cxx_check_header_compile "$LINENO" "QtCore/qconfig.h" "ac_cv_header_QtCore_qconfig_h" "$ac_includes_default" -if test "x$ac_cv_header_QtCore_qconfig_h" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "QtCore/qconfig.h" "ac_cv_header_QtCore_qconfig_h" "$ac_includes_default" +if test "x$ac_cv_header_QtCore_qconfig_h" = xyes; then : -else $as_nop +else as_fn_error $? "qconfig.h header not found." "$LINENO" 5 fi + CPPFLAGS=$save_CPPFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -42746,8 +41374,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt5 libraries" >&5 -printf %s "checking for Qt5 libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 libraries" >&5 +$as_echo_n "checking for Qt5 libraries... " >&6; } qt5_libdir="no" for lib_dir in $qt5_libdirs; do if test -r "$lib_dir/$qt5_test_library"; then @@ -42755,8 +41383,8 @@ break fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $qt5_libdir" >&5 -printf "%s\n" "$qt5_libdir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt5_libdir" >&5 +$as_echo "$qt5_libdir" >&6; } if test "x$qt5_libdir" = "xno"; then as_fn_error $? "Qt5 libraries not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running \"configure\"." "$LINENO" 5 fi @@ -42795,17 +41423,17 @@ if test "$USING_X11" = TRUE; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QT5_XCB" >&5 -printf %s "checking for QT5_XCB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xcb" >&5 +$as_echo_n "checking for xcb... " >&6; } if test -n "$QT5_XCB_CFLAGS"; then pkg_cv_QT5_XCB_CFLAGS="$QT5_XCB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT5_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42819,10 +41447,10 @@ pkg_cv_QT5_XCB_LIBS="$QT5_XCB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT5_XCB_LIBS=`$PKG_CONFIG --libs "xcb" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42836,8 +41464,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42854,29 +41482,29 @@ as_fn_error $? "XCB not found, which is needed for correct app grouping in X11." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } as_fn_error $? "XCB not found, which is needed for correct app grouping in X11." "$LINENO" 5 else QT5_XCB_CFLAGS=$pkg_cv_QT5_XCB_CFLAGS QT5_XCB_LIBS=$pkg_cv_QT5_XCB_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QT5_XCB_ICCCM" >&5 -printf %s "checking for QT5_XCB_ICCCM... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xcb-icccm" >&5 +$as_echo_n "checking for xcb-icccm... " >&6; } if test -n "$QT5_XCB_ICCCM_CFLAGS"; then pkg_cv_QT5_XCB_ICCCM_CFLAGS="$QT5_XCB_ICCCM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-icccm\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-icccm\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-icccm") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT5_XCB_ICCCM_CFLAGS=`$PKG_CONFIG --cflags "xcb-icccm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42890,10 +41518,10 @@ pkg_cv_QT5_XCB_ICCCM_LIBS="$QT5_XCB_ICCCM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-icccm\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-icccm\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-icccm") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT5_XCB_ICCCM_LIBS=`$PKG_CONFIG --libs "xcb-icccm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42907,8 +41535,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42924,33 +41552,33 @@ echo "$QT5_XCB_ICCCM_PKG_ERRORS" >&5 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XCB ICCCM not found, which is needed for old Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" >&5 -printf "%s\n" "$as_me: WARNING: XCB ICCCM not found, which is needed for old Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XCB ICCCM not found, which is needed for old Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" >&5 +$as_echo "$as_me: WARNING: XCB ICCCM not found, which is needed for old Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" >&2;} add_warning "XCB ICCCM not found, which is needed for Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XCB ICCCM not found, which is needed for old Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" >&5 -printf "%s\n" "$as_me: WARNING: XCB ICCCM not found, which is needed for old Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XCB ICCCM not found, which is needed for old Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" >&5 +$as_echo "$as_me: WARNING: XCB ICCCM not found, which is needed for old Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" >&2;} add_warning "XCB ICCCM not found, which is needed for Qt versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)" else QT5_XCB_ICCCM_CFLAGS=$pkg_cv_QT5_XCB_ICCCM_CFLAGS QT5_XCB_ICCCM_LIBS=$pkg_cv_QT5_XCB_ICCCM_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } QT5_HAVE_XCB_ICCCM=1 - printf "%s\n" "#define QT5_HAVE_XCB_ICCCM 1" >>confdefs.h + $as_echo "#define QT5_HAVE_XCB_ICCCM 1" >>confdefs.h fi QT5_CFLAGS="$QT5_CFLAGS $QT5_XCB_CFLAGS $QT5_XCB_ICCCM_CFLAGS" QT5_LIBS="$QT5_LIBS $QT5_XCB_LIBS $QT5_XCB_ICCCM_LIBS -lQt5X11Extras" QT5_USING_X11=1 - printf "%s\n" "#define QT5_USING_X11 1" >>confdefs.h + $as_echo "#define QT5_USING_X11 1" >>confdefs.h fi @@ -42959,12 +41587,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_MOC5+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MOC5+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MOC5 in [\\/]* | ?:[\\/]*) ac_cv_path_MOC5="$MOC5" # Let the user override the test with a path. @@ -42975,15 +41602,11 @@ for as_dir in $as_dummy do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_MOC5="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MOC5="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -42995,11 +41618,11 @@ fi MOC5=$ac_cv_path_MOC5 if test -n "$MOC5"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MOC5" >&5 -printf "%s\n" "$MOC5" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC5" >&5 +$as_echo "$MOC5" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -43015,17 +41638,17 @@ if test "$test_gstreamer_1_0" = yes; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QT5_GOBJECT" >&5 -printf %s "checking for QT5_GOBJECT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0" >&5 +$as_echo_n "checking for gobject-2.0... " >&6; } if test -n "$QT5_GOBJECT_CFLAGS"; then pkg_cv_QT5_GOBJECT_CFLAGS="$QT5_GOBJECT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gobject-2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT5_GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43039,10 +41662,10 @@ pkg_cv_QT5_GOBJECT_LIBS="$QT5_GOBJECT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gobject-2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT5_GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43056,8 +41679,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43072,23 +41695,23 @@ # Put the nasty error message in config.log where it belongs echo "$QT5_GOBJECT_PKG_ERRORS" >&5 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No GObject found, can't use QWidget GStreamer sink on wayland!" >&5 -printf "%s\n" "$as_me: WARNING: No GObject found, can't use QWidget GStreamer sink on wayland!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No GObject found, can't use QWidget GStreamer sink on wayland!" >&5 +$as_echo "$as_me: WARNING: No GObject found, can't use QWidget GStreamer sink on wayland!" >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No GObject found, can't use QWidget GStreamer sink on wayland!" >&5 -printf "%s\n" "$as_me: WARNING: No GObject found, can't use QWidget GStreamer sink on wayland!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No GObject found, can't use QWidget GStreamer sink on wayland!" >&5 +$as_echo "$as_me: WARNING: No GObject found, can't use QWidget GStreamer sink on wayland!" >&2;} else QT5_GOBJECT_CFLAGS=$pkg_cv_QT5_GOBJECT_CFLAGS QT5_GOBJECT_LIBS=$pkg_cv_QT5_GOBJECT_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } QT5_HAVE_GOBJECT=1 - printf "%s\n" "#define QT5_HAVE_GOBJECT 1" >>confdefs.h + $as_echo "#define QT5_HAVE_GOBJECT 1" >>confdefs.h fi @@ -43127,12 +41750,11 @@ if test -n "$QT6DIR"; then # Extract the first word of "qmake", so it can be a program name with args. set dummy qmake; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_QMAKE6+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_QMAKE6+:} false; then : + $as_echo_n "(cached) " >&6 +else case $QMAKE6 in [\\/]* | ?:[\\/]*) ac_cv_path_QMAKE6="$QMAKE6" # Let the user override the test with a path. @@ -43142,15 +41764,11 @@ for as_dir in $QT6DIR/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_QMAKE6="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_QMAKE6="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -43163,11 +41781,11 @@ fi QMAKE6=$ac_cv_path_QMAKE6 if test -n "$QMAKE6"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $QMAKE6" >&5 -printf "%s\n" "$QMAKE6" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE6" >&5 +$as_echo "$QMAKE6" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -43176,12 +41794,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_QMAKE6+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_QMAKE6+:} false; then : + $as_echo_n "(cached) " >&6 +else case $QMAKE6 in [\\/]* | ?:[\\/]*) ac_cv_path_QMAKE6="$QMAKE6" # Let the user override the test with a path. @@ -43191,15 +41808,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_QMAKE6="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_QMAKE6="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -43211,11 +41824,11 @@ fi QMAKE6=$ac_cv_path_QMAKE6 if test -n "$QMAKE6"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $QMAKE6" >&5 -printf "%s\n" "$QMAKE6" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE6" >&5 +$as_echo "$QMAKE6" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -43231,8 +41844,8 @@ if test -z "$qmake6_test_ver"; then as_fn_error $? "Wrong qmake for Qt6 found. Please specify the root of your Qt6 installation by exporting QT6DIR before running \"configure\"." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Detected Qt6 version: $qmake6_test_ver" >&5 -printf "%s\n" "$as_me: Detected Qt6 version: $qmake6_test_ver" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Detected Qt6 version: $qmake6_test_ver" >&5 +$as_echo "$as_me: Detected Qt6 version: $qmake6_test_ver" >&6;} fi qt6_incdirs="`$QMAKE6 -query QT_INSTALL_HEADERS` $qt6_incdirs" @@ -43240,8 +41853,8 @@ qt6_platformsdir="`$QMAKE6 -query QT_INSTALL_PLUGINS`/platforms" QT6_PLATFORMS_SRCDIR="$qt6_platformsdir" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt6 headers" >&5 -printf %s "checking for Qt6 headers... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt6 headers" >&5 +$as_echo_n "checking for Qt6 headers... " >&6; } qt6_incdir="no" for inc_dir in $qt6_incdirs; do if test -r "$inc_dir/$qt6_test_include"; then @@ -43249,8 +41862,8 @@ break fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $qt6_incdir" >&5 -printf "%s\n" "$qt6_incdir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt6_incdir" >&5 +$as_echo "$qt6_incdir" >&6; } if test "x$qt6_incdir" = "xno"; then as_fn_error $? "Qt6 headers not found. Please specify the root of your Qt6 installation by exporting QT6DIR before running \"configure\"." "$LINENO" 5 fi @@ -43263,14 +41876,14 @@ save_CPPFLAGS=$CPPFLAGS CPPFLAGS="${CPPFLAGS} -I${qt6_incdir}" - ac_fn_cxx_check_header_compile "$LINENO" "QtCore/qconfig.h" "ac_cv_header_QtCore_qconfig_h" "$ac_includes_default" -if test "x$ac_cv_header_QtCore_qconfig_h" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "QtCore/qconfig.h" "ac_cv_header_QtCore_qconfig_h" "$ac_includes_default" +if test "x$ac_cv_header_QtCore_qconfig_h" = xyes; then : -else $as_nop +else as_fn_error $? "qconfig.h header not found." "$LINENO" 5 fi + CPPFLAGS=$save_CPPFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -43279,8 +41892,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt6 libraries" >&5 -printf %s "checking for Qt6 libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt6 libraries" >&5 +$as_echo_n "checking for Qt6 libraries... " >&6; } qt6_libdir="no" for lib_dir in $qt6_libdirs; do if test -r "$lib_dir/$qt6_test_library"; then @@ -43288,8 +41901,8 @@ break fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $qt6_libdir" >&5 -printf "%s\n" "$qt6_libdir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt6_libdir" >&5 +$as_echo "$qt6_libdir" >&6; } if test "x$qt6_libdir" = "xno"; then as_fn_error $? "Qt6 libraries not found. Please specify the root of your Qt6 installation by exporting QT6DIR before running \"configure\"." "$LINENO" 5 fi @@ -43313,17 +41926,17 @@ if test "$USING_X11" = TRUE; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QT6_XCB" >&5 -printf %s "checking for QT6_XCB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xcb" >&5 +$as_echo_n "checking for xcb... " >&6; } if test -n "$QT6_XCB_CFLAGS"; then pkg_cv_QT6_XCB_CFLAGS="$QT6_XCB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT6_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43337,10 +41950,10 @@ pkg_cv_QT6_XCB_LIBS="$QT6_XCB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT6_XCB_LIBS=`$PKG_CONFIG --libs "xcb" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43354,8 +41967,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43372,20 +41985,20 @@ as_fn_error $? "XCB not found, which is needed for key modifier handling in X11." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } as_fn_error $? "XCB not found, which is needed for key modifier handling in X11." "$LINENO" 5 else QT6_XCB_CFLAGS=$pkg_cv_QT6_XCB_CFLAGS QT6_XCB_LIBS=$pkg_cv_QT6_XCB_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi QT6_CFLAGS="$QT6_CFLAGS $QT6_XCB_CFLAGS" QT6_LIBS="$QT6_LIBS $QT6_XCB_LIBS" QT6_USING_X11=1 - printf "%s\n" "#define QT6_USING_X11 1" >>confdefs.h + $as_echo "#define QT6_USING_X11 1" >>confdefs.h fi @@ -43401,12 +42014,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_MOC6+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MOC6+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MOC6 in [\\/]* | ?:[\\/]*) ac_cv_path_MOC6="$MOC6" # Let the user override the test with a path. @@ -43417,15 +42029,11 @@ for as_dir in $as_dummy do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_MOC6="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MOC6="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -43437,11 +42045,11 @@ fi MOC6=$ac_cv_path_MOC6 if test -n "$MOC6"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MOC6" >&5 -printf "%s\n" "$MOC6" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC6" >&5 +$as_echo "$MOC6" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -43484,12 +42092,11 @@ # Extract the first word of "$KF5_CONFIG", so it can be a program name with args. set dummy $KF5_CONFIG; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_KF5_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_KF5_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $KF5_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_KF5_CONFIG="$KF5_CONFIG" # Let the user override the test with a path. @@ -43499,15 +42106,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_KF5_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_KF5_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -43520,11 +42123,11 @@ fi KF5_CONFIG=$ac_cv_path_KF5_CONFIG if test -n "$KF5_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $KF5_CONFIG" >&5 -printf "%s\n" "$KF5_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KF5_CONFIG" >&5 +$as_echo "$KF5_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -43533,8 +42136,8 @@ kf5_libdirs="`$KF5_CONFIG --path lib` $kf5_libdirs" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for KF5 headers" >&5 -printf %s "checking for KF5 headers... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KF5 headers" >&5 +$as_echo_n "checking for KF5 headers... " >&6; } kf5_incdir="no" for kf5_check in $kf5_incdirs; do if test -r "$kf5_check/$kf5_test_include"; then @@ -43542,14 +42145,14 @@ break fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kf5_incdir" >&5 -printf "%s\n" "$kf5_incdir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kf5_incdir" >&5 +$as_echo "$kf5_incdir" >&6; } if test "x$kf5_incdir" = "xno"; then as_fn_error $? "KF5 headers not found. Please specify the root of your KF5 installation by exporting KF5DIR before running \"configure\"." "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for KF5 libraries" >&5 -printf %s "checking for KF5 libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KF5 libraries" >&5 +$as_echo_n "checking for KF5 libraries... " >&6; } kf5_libdir="no" for kf5_check in $kf5_libdirs; do if test -r "$kf5_check/$kf5_test_library"; then @@ -43558,8 +42161,8 @@ fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kf5_libdir" >&5 -printf "%s\n" "$kf5_libdir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kf5_libdir" >&5 +$as_echo "$kf5_libdir" >&6; } if test "x$kf5_libdir" = "xno"; then as_fn_error $? "KF5 libraries not found. Please specify the root of your KF5 installation by exporting KF5DIR before running \"configure\"." "$LINENO" 5 fi @@ -43580,15 +42183,14 @@ save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $KF5_CFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether KDE is >= 5.0" >&5 -printf %s "checking whether KDE is >= 5.0... " >&6; } - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether KDE is >= 5.0" >&5 +$as_echo_n "checking whether KDE is >= 5.0... " >&6; } + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43600,11 +42202,10 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else $as_nop +if ac_fn_cxx_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else as_fn_error $? "KDE version too old" "$LINENO" 5 fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -43622,24 +42223,24 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable evolution 2 support" >&5 -printf %s "checking whether to enable evolution 2 support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable evolution 2 support" >&5 +$as_echo_n "checking whether to enable evolution 2 support... " >&6; } if test "$enable_evolution2" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GOBJECT" >&5 -printf %s "checking for GOBJECT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0" >&5 +$as_echo_n "checking for gobject-2.0... " >&6; } if test -n "$GOBJECT_CFLAGS"; then pkg_cv_GOBJECT_CFLAGS="$GOBJECT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gobject-2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43653,10 +42254,10 @@ pkg_cv_GOBJECT_LIBS="$GOBJECT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gobject-2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43670,8 +42271,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43697,10 +42298,10 @@ and GOBJECT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -43714,8 +42315,8 @@ else GOBJECT_CFLAGS=$pkg_cv_GOBJECT_CFLAGS GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi GOBJECT_CFLAGS=$(printf '%s' "$GOBJECT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") @@ -43723,15 +42324,15 @@ GOBJECT_LIBS="${filteredlibs}" ENABLE_EVOAB2="TRUE" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which themes to include" >&5 -printf %s "checking which themes to include... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which themes to include" >&5 +$as_echo_n "checking which themes to include... " >&6; } # if none given use default subset of available themes if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then with_theme="breeze breeze_dark breeze_dark_svg breeze_svg colibre colibre_svg colibre_dark colibre_dark_svg elementary elementary_svg karasa_jaga karasa_jaga_svg sifr sifr_svg sifr_dark sifr_dark_svg sukapura sukapura_svg" @@ -43748,14 +42349,14 @@ WITH_THEMES=`echo "$WITH_THEMES $real_theme"|tr '\ ' '\n'|sort|uniq|tr '\n' '\ '` done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WITH_THEMES" >&5 -printf "%s\n" "$WITH_THEMES" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_THEMES" >&5 +$as_echo "$WITH_THEMES" >&6; } # FIXME: remove this, and the convenience default->colibre remapping after a grace period for theme in $with_theme; do case $theme in - default) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --with-theme=default is deprecated and will be removed, use --with-theme=colibre" >&5 -printf "%s\n" "$as_me: WARNING: --with-theme=default is deprecated and will be removed, use --with-theme=colibre" >&2;} ;; + default) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-theme=default is deprecated and will be removed, use --with-theme=colibre" >&5 +$as_echo "$as_me: WARNING: --with-theme=default is deprecated and will be removed, use --with-theme=colibre" >&2;} ;; *) ;; esac done @@ -43763,17 +42364,17 @@ ############################################################################### # Extensions checking ############################################################################### -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extensions integration" >&5 -printf %s "checking for extensions integration... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extensions integration" >&5 +$as_echo_n "checking for extensions integration... " >&6; } if test "x$enable_extension_integration" != "xno"; then WITH_EXTENSION_INTEGRATION=TRUE SCPDEFS="$SCPDEFS -DWITH_EXTENSION_INTEGRATION" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, use integration" >&5 -printf "%s\n" "yes, use integration" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, use integration" >&5 +$as_echo "yes, use integration" >&6; } else WITH_EXTENSION_INTEGRATION= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, do not integrate" >&5 -printf "%s\n" "no, do not integrate" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, do not integrate" >&5 +$as_echo "no, do not integrate" >&6; } fi @@ -43782,66 +42383,63 @@ # Check whether --enable-ext-numbertext was given. -if test ${enable_ext_numbertext+y} -then : +if test "${enable_ext_numbertext+set}" = set; then : enableval=$enable_ext_numbertext; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for building the Numbertext extension" >&5 -printf %s "checking for building the Numbertext extension... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for building the Numbertext extension" >&5 +$as_echo_n "checking for building the Numbertext extension... " >&6; } 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="b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt" BUILD_TYPE="$BUILD_TYPE NUMBERTEXT" WITH_EXTRA_EXTENSIONS=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$with_java" != "xno"; then # Check whether --enable-ext-nlpsolver was given. -if test ${enable_ext_nlpsolver+y} -then : +if test "${enable_ext_nlpsolver+set}" = set; then : enableval=$enable_ext_nlpsolver; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for building the NLPSolver extension" >&5 -printf %s "checking for building the NLPSolver extension... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for building the NLPSolver extension" >&5 +$as_echo_n "checking for building the NLPSolver extension... " >&6; } NLPSOLVER_EXTENSION_PACK= if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" != "xno"; then SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER" NLPSOLVER_EXTENSION_PACK="" BUILD_TYPE="$BUILD_TYPE NLPSOLVER" WITH_EXTRA_EXTENSIONS=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build opens___.ttf" >&5 -printf %s "checking whether to build opens___.ttf... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build opens___.ttf" >&5 +$as_echo_n "checking whether to build opens___.ttf... " >&6; } if test "$enable_build_opensymbol" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } # Extract the first word of "fontforge", so it can be a program name with args. set dummy fontforge; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_FONTFORGE+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_FONTFORGE+:} false; then : + $as_echo_n "(cached) " >&6 +else case $FONTFORGE in [\\/]* | ?:[\\/]*) ac_cv_path_FONTFORGE="$FONTFORGE" # Let the user override the test with a path. @@ -43851,15 +42449,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_FONTFORGE="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_FONTFORGE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -43871,11 +42465,11 @@ fi FONTFORGE=$ac_cv_path_FONTFORGE if test -n "$FONTFORGE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FONTFORGE" >&5 -printf "%s\n" "$FONTFORGE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTFORGE" >&5 +$as_echo "$FONTFORGE" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -43883,56 +42477,56 @@ as_fn_error $? "fontforge not installed" "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } BUILD_TYPE="$BUILD_TYPE OPENSYMBOL" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include third-party fonts" >&5 -printf %s "checking whether to include third-party fonts... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include third-party fonts" >&5 +$as_echo_n "checking whether to include third-party fonts... " >&6; } if test "$with_fonts" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } WITH_FONTS=TRUE BUILD_TYPE="$BUILD_TYPE MORE_FONTS" - printf "%s\n" "#define HAVE_MORE_FONTS 1" >>confdefs.h + $as_echo "#define HAVE_MORE_FONTS 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } WITH_FONTS= SCPDEFS="$SCPDEFS -DWITHOUT_FONTS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable online update" >&5 -printf %s "checking whether to enable online update... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable online update" >&5 +$as_echo_n "checking whether to enable online update... " >&6; } ENABLE_ONLINE_UPDATE= ENABLE_ONLINE_UPDATE_MAR= UPDATE_CONFIG= if test "$enable_online_update" = ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else if test "$enable_online_update" = "mar"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes - MAR-based online update" >&5 -printf "%s\n" "yes - MAR-based online update" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - MAR-based online update" >&5 +$as_echo "yes - MAR-based online update" >&6; } ENABLE_ONLINE_UPDATE_MAR="TRUE" if test "$with_update_config" = ""; then as_fn_error $? "mar based online updater needs an update config specified with \"with-update-config" "$LINENO" 5 fi UPDATE_CONFIG="$with_update_config" - printf "%s\n" "#define HAVE_FEATURE_UPDATE_MAR 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_UPDATE_MAR 1" >>confdefs.h elif test "$enable_online_update" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_ONLINE_UPDATE="TRUE" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -43943,8 +42537,8 @@ PRIVACY_POLICY_URL="$with_privacy_policy_url" if test "$ENABLE_ONLINE_UPDATE" = TRUE -o "$ENABLE_BREAKPAD" = "TRUE"; then if test "x$with_privacy_policy_url" = "xundefined"; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "online update or breakpad/crashreporting are enabled, but no --with-privacy-policy-url=... was provided See \`config.log' for more details" "$LINENO" 5; } fi @@ -43952,25 +42546,25 @@ SYSTEM_BZIP2= if test "$ENABLE_ONLINE_UPDATE_MAR" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use system bzip2" >&5 -printf %s "checking whether to use system bzip2... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use system bzip2" >&5 +$as_echo_n "checking whether to use system bzip2... " >&6; } if test "$with_system_bzip2" = yes; then SYSTEM_BZIP2=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZIP2" >&5 -printf %s "checking for BZIP2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bzip2" >&5 +$as_echo_n "checking for bzip2... " >&6; } if test -n "$BZIP2_CFLAGS"; then pkg_cv_BZIP2_CFLAGS="$BZIP2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bzip2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bzip2\""; } >&5 ($PKG_CONFIG --exists --print-errors "bzip2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BZIP2_CFLAGS=`$PKG_CONFIG --cflags "bzip2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43984,10 +42578,10 @@ pkg_cv_BZIP2_LIBS="$BZIP2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bzip2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bzip2\""; } >&5 ($PKG_CONFIG --exists --print-errors "bzip2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BZIP2_LIBS=`$PKG_CONFIG --libs "bzip2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44001,8 +42595,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44028,10 +42622,10 @@ and BZIP2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -44045,15 +42639,15 @@ else BZIP2_CFLAGS=$pkg_cv_BZIP2_CFLAGS BZIP2_LIBS=$pkg_cv_BZIP2_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi FilterLibs "${BZIP2_LIBS}" BZIP2_LIBS="${filteredlibs}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } BUILD_TYPE="$BUILD_TYPE BZIP2" fi fi @@ -44061,39 +42655,39 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable extension update" >&5 -printf %s "checking whether to enable extension update... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable extension update" >&5 +$as_echo_n "checking whether to enable extension update... " >&6; } ENABLE_EXTENSION_UPDATE= if test "x$enable_extension_update" = "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_EXTENSION_UPDATE="TRUE" - printf "%s\n" "#define ENABLE_EXTENSION_UPDATE 1" >>confdefs.h + $as_echo "#define ENABLE_EXTENSION_UPDATE 1" >>confdefs.h SCPDEFS="$SCPDEFS -DENABLE_EXTENSION_UPDATE" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to create MSI with LIMITUI=1 (silent install)" >&5 -printf %s "checking whether to create MSI with LIMITUI=1 (silent install)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to create MSI with LIMITUI=1 (silent install)" >&5 +$as_echo_n "checking whether to create MSI with LIMITUI=1 (silent install)... " >&6; } if test "$enable_silent_msi" = "" -o "$enable_silent_msi" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ENABLE_SILENT_MSI= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_SILENT_MSI=TRUE SCPDEFS="$SCPDEFS -DENABLE_SILENT_MSI" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether and how to use Xinerama" >&5 -printf %s "checking whether and how to use Xinerama... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether and how to use Xinerama" >&5 +$as_echo_n "checking whether and how to use Xinerama... " >&6; } if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then if test "$x_libraries" = "default_x_libraries"; then XINERAMALIB=`$PKG_CONFIG --variable=libdir xinerama` @@ -44131,16 +42725,16 @@ XINERAMA_LINK=none fi if test "$USE_XINERAMA" = "TRUE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, with $XINERAMA_LINK linking" >&5 -printf "%s\n" "yes, with $XINERAMA_LINK linking" >&6; } - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_extensions_Xinerama_h" = xyes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with $XINERAMA_LINK linking" >&5 +$as_echo "yes, with $XINERAMA_LINK linking" >&6; } + ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_extensions_Xinerama_h" = xyes; then : -else $as_nop +else as_fn_error $? "Xinerama header not found." "$LINENO" 5 fi + XEXTLIBS=`$PKG_CONFIG --variable=libs xext` if test "x$XEXTLIB" = x; then XEXTLIBS="-L$XLIB -L$XINERAMALIB -lXext" @@ -44152,12 +42746,11 @@ if test "$_os" = "Linux"; then XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XineramaIsActive in -lXinerama" >&5 -printf %s "checking for XineramaIsActive in -lXinerama... " >&6; } -if test ${ac_cv_lib_Xinerama_XineramaIsActive+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaIsActive in -lXinerama" >&5 +$as_echo_n "checking for XineramaIsActive in -lXinerama... " >&6; } +if ${ac_cv_lib_Xinerama_XineramaIsActive+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lXinerama $XINERAMA_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -44166,71 +42759,72 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char XineramaIsActive (); int -main (void) +main () { return XineramaIsActive (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xinerama_XineramaIsActive=yes -else $as_nop +else ac_cv_lib_Xinerama_XineramaIsActive=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 -printf "%s\n" "$ac_cv_lib_Xinerama_XineramaIsActive" >&6; } -if test "x$ac_cv_lib_Xinerama_XineramaIsActive" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 +$as_echo "$ac_cv_lib_Xinerama_XineramaIsActive" >&6; } +if test "x$ac_cv_lib_Xinerama_XineramaIsActive" = xyes; then : : -else $as_nop +else as_fn_error $? "Xinerama not functional?" "$LINENO" 5 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, libXinerama not found or wrong architecture." >&5 -printf "%s\n" "no, libXinerama not found or wrong architecture." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, libXinerama not found or wrong architecture." >&5 +$as_echo "no, libXinerama not found or wrong architecture." >&6; } fi else USE_XINERAMA= XINERAMA_LINK=none - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$test_cairo" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use the system cairo" >&5 -printf %s "checking whether to use the system cairo... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the system cairo" >&5 +$as_echo_n "checking whether to use the system cairo... " >&6; } : ${with_system_cairo:=$with_system_libs} if test "$with_system_cairo" = "yes"; then SYSTEM_CAIRO=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 -printf %s "checking for CAIRO... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo >= 1.8.0 " >&5 +$as_echo_n "checking for cairo >= 1.8.0 ... " >&6; } if test -n "$CAIRO_CFLAGS"; then pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.8.0 \""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.8.0 \""; } >&5 ($PKG_CONFIG --exists --print-errors "cairo >= 1.8.0 ") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.8.0 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44244,10 +42838,10 @@ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.8.0 \""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.8.0 \""; } >&5 ($PKG_CONFIG --exists --print-errors "cairo >= 1.8.0 ") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.8.0 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44261,8 +42855,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44288,10 +42882,10 @@ and CAIRO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -44305,8 +42899,8 @@ else CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS CAIRO_LIBS=$pkg_cv_CAIRO_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi CAIRO_CFLAGS=$(printf '%s' "$CAIRO_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") @@ -44314,8 +42908,8 @@ CAIRO_LIBS="${filteredlibs}" if test "$test_xrender" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Xrender.h defines PictStandardA8" >&5 -printf %s "checking whether Xrender.h defines PictStandardA8... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xrender.h defines PictStandardA8" >&5 +$as_echo_n "checking whether Xrender.h defines PictStandardA8... " >&6; } ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -44326,7 +42920,7 @@ /* end confdefs.h. */ #include int -main (void) +main () { #ifdef PictStandardA8 @@ -44338,14 +42932,13 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else $as_nop +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else as_fn_error $? "no, X headers too old." "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -44355,13 +42948,13 @@ fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } BUILD_TYPE="$BUILD_TYPE CAIRO" fi if test "$enable_cairo_canvas" != no; then - printf "%s\n" "#define ENABLE_CAIRO_CANVAS 1" >>confdefs.h + $as_echo "#define ENABLE_CAIRO_CANVAS 1" >>confdefs.h ENABLE_CAIRO_CANVAS=TRUE fi @@ -44378,17 +42971,17 @@ elif test "$_os" != "Darwin" -a "$enable_avahi" = "yes"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5 -printf %s "checking for AVAHI... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi-client >= 0.6.10" >&5 +$as_echo_n "checking for avahi-client >= 0.6.10... " >&6; } if test -n "$AVAHI_CFLAGS"; then pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-client >= 0.6.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44402,10 +42995,10 @@ pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-client >= 0.6.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44419,8 +43012,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44446,10 +43039,10 @@ and AVAHI_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -44463,11 +43056,11 @@ else AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS AVAHI_LIBS=$pkg_cv_AVAHI_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_AVAHI="TRUE" fi - printf "%s\n" "#define HAVE_FEATURE_AVAHI 1" >>confdefs.h + $as_echo "#define HAVE_FEATURE_AVAHI 1" >>confdefs.h AVAHI_CFLAGS=$(printf '%s' "$AVAHI_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${AVAHI_LIBS}" @@ -44479,25 +43072,25 @@ SYSTEM_LIBLANGTAG= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use system liblangtag" >&5 -printf %s "checking whether to use system liblangtag... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use system liblangtag" >&5 +$as_echo_n "checking whether to use system liblangtag... " >&6; } if test "$with_system_liblangtag" = yes; then SYSTEM_LIBLANGTAG=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBLANGTAG" >&5 -printf %s "checking for LIBLANGTAG... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblangtag >= 0.4.0" >&5 +$as_echo_n "checking for liblangtag >= 0.4.0... " >&6; } if test -n "$LIBLANGTAG_CFLAGS"; then pkg_cv_LIBLANGTAG_CFLAGS="$LIBLANGTAG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblangtag >= 0.4.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblangtag >= 0.4.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "liblangtag >= 0.4.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBLANGTAG_CFLAGS=`$PKG_CONFIG --cflags "liblangtag >= 0.4.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44511,10 +43104,10 @@ pkg_cv_LIBLANGTAG_LIBS="$LIBLANGTAG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblangtag >= 0.4.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblangtag >= 0.4.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "liblangtag >= 0.4.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBLANGTAG_LIBS=`$PKG_CONFIG --libs "liblangtag >= 0.4.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44528,8 +43121,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44555,10 +43148,10 @@ and LIBLANGTAG_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -44572,19 +43165,19 @@ else LIBLANGTAG_CFLAGS=$pkg_cv_LIBLANGTAG_CFLAGS LIBLANGTAG_LIBS=$pkg_cv_LIBLANGTAG_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblangtag >= 0.5.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblangtag >= 0.5.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "liblangtag >= 0.5.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then : else - printf "%s\n" "#define LIBLANGTAG_INLINE_FIX 1" >>confdefs.h + $as_echo "#define LIBLANGTAG_INLINE_FIX 1" >>confdefs.h fi LIBLANGTAG_CFLAGS=$(printf '%s' "$LIBLANGTAG_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") @@ -44592,8 +43185,8 @@ LIBLANGTAG_LIBS="${filteredlibs}" else SYSTEM_LIBLANGTAG= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" LIBLANGTAG_CFLAGS="-I${WORKDIR}/UnpackedTarball/liblangtag" if test "$COM" = "MSC"; then @@ -44629,10 +43222,9 @@ # Check whether --with-system-libpng was given. -if test ${with_system_libpng+y} -then : +if test "${with_system_libpng+set}" = set; then : withval=$with_system_libpng; -else $as_nop +else if test "${with_system_libpng+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libpng="$with_system_libs"; @@ -44644,27 +43236,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libpng to use" >&5 -printf %s "checking which libpng to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libpng to use" >&5 +$as_echo_n "checking which libpng to use... " >&6; } if test "$test_libpng" != no -a "$found_libpng" != yes -a "$enable_libpng" != no; then ENABLE_LIBPNG=TRUE if test "$with_system_libpng" = yes -a "$test_system_libpng" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBPNG=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBPNG" >&5 -printf %s "checking for LIBPNG... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5 +$as_echo_n "checking for libpng... " >&6; } if test -n "$LIBPNG_CFLAGS"; then pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpng") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44678,10 +43270,10 @@ pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpng") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44695,8 +43287,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44722,10 +43314,10 @@ and LIBPNG_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -44739,16 +43331,16 @@ else LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBPNG_CFLAGS=$(printf '%s' "${LIBPNG_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LIBPNG_LIBS}" LIBPNG_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBPNG= LIBPNG_CFLAGS="${LIBPNG_CFLAGS_internal}" LIBPNG_LIBS="${LIBPNG_LIBS_internal}" @@ -44756,8 +43348,8 @@ fi else if test "$found_libpng" = yes -a "$enable_libpng" != no -a "$with_system_libpng" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_LIBPNG=TRUE SYSTEM_LIBPNG=TRUE else @@ -44766,11 +43358,11 @@ LIBPNG_CFLAGS= LIBPNG_LIBS= if test "$test_libpng" != no -a "$enable_libpng" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -44801,10 +43393,9 @@ # Check whether --with-system-libtiff was given. -if test ${with_system_libtiff+y} -then : +if test "${with_system_libtiff+set}" = set; then : withval=$with_system_libtiff; -else $as_nop +else if test "${with_system_libtiff+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libtiff="$with_system_libs"; @@ -44816,27 +43407,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libtiff to use" >&5 -printf %s "checking which libtiff to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libtiff to use" >&5 +$as_echo_n "checking which libtiff to use... " >&6; } if test "$test_libtiff" != no -a "$found_libtiff" != yes -a "$enable_libtiff" != no; then ENABLE_LIBTIFF=TRUE if test "$with_system_libtiff" = yes -a "$test_system_libtiff" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBTIFF=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBTIFF" >&5 -printf %s "checking for LIBTIFF... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtiff-4" >&5 +$as_echo_n "checking for libtiff-4... " >&6; } if test -n "$LIBTIFF_CFLAGS"; then pkg_cv_LIBTIFF_CFLAGS="$LIBTIFF_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBTIFF_CFLAGS=`$PKG_CONFIG --cflags "libtiff-4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44850,10 +43441,10 @@ pkg_cv_LIBTIFF_LIBS="$LIBTIFF_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBTIFF_LIBS=`$PKG_CONFIG --libs "libtiff-4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44867,8 +43458,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44894,10 +43485,10 @@ and LIBTIFF_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -44911,16 +43502,16 @@ else LIBTIFF_CFLAGS=$pkg_cv_LIBTIFF_CFLAGS LIBTIFF_LIBS=$pkg_cv_LIBTIFF_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBTIFF_CFLAGS=$(printf '%s' "${LIBTIFF_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LIBTIFF_LIBS}" LIBTIFF_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBTIFF= LIBTIFF_CFLAGS="${LIBTIFF_CFLAGS_internal}" LIBTIFF_LIBS="${LIBTIFF_LIBS_internal}" @@ -44928,8 +43519,8 @@ fi else if test "$found_libtiff" = yes -a "$enable_libtiff" != no -a "$with_system_libtiff" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_LIBTIFF=TRUE SYSTEM_LIBTIFF=TRUE else @@ -44938,11 +43529,11 @@ LIBTIFF_CFLAGS= LIBTIFF_LIBS= if test "$test_libtiff" != no -a "$enable_libtiff" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -44973,10 +43564,9 @@ # Check whether --with-system-libwebp was given. -if test ${with_system_libwebp+y} -then : +if test "${with_system_libwebp+set}" = set; then : withval=$with_system_libwebp; -else $as_nop +else if test "${with_system_libwebp+set}" != set -a "${with_system_libs+set}" = set -a "" != TRUE; then with_system_libwebp="$with_system_libs"; @@ -44988,27 +43578,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which libwebp to use" >&5 -printf %s "checking which libwebp to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libwebp to use" >&5 +$as_echo_n "checking which libwebp to use... " >&6; } if test "$test_libwebp" != no -a "$found_libwebp" != yes -a "$enable_libwebp" != no; then ENABLE_LIBWEBP=TRUE if test "$with_system_libwebp" = yes -a "$test_system_libwebp" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBWEBP=TRUE pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBWEBP" >&5 -printf %s "checking for LIBWEBP... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5 +$as_echo_n "checking for libwebp... " >&6; } if test -n "$LIBWEBP_CFLAGS"; then pkg_cv_LIBWEBP_CFLAGS="$LIBWEBP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwebp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBWEBP_CFLAGS=`$PKG_CONFIG --cflags "libwebp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45022,10 +43612,10 @@ pkg_cv_LIBWEBP_LIBS="$LIBWEBP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwebp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBWEBP_LIBS=`$PKG_CONFIG --libs "libwebp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45039,8 +43629,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -45066,10 +43656,10 @@ and LIBWEBP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -45083,16 +43673,16 @@ else LIBWEBP_CFLAGS=$pkg_cv_LIBWEBP_CFLAGS LIBWEBP_LIBS=$pkg_cv_LIBWEBP_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi LIBWEBP_CFLAGS=$(printf '%s' "${LIBWEBP_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LIBWEBP_LIBS}" LIBWEBP_LIBS="$filteredlibs" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -printf "%s\n" "internal" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBWEBP= LIBWEBP_CFLAGS="${LIBWEBP_CFLAGS_internal}" LIBWEBP_LIBS="${LIBWEBP_LIBS_internal}" @@ -45100,8 +43690,8 @@ fi else if test "$found_libwebp" = yes -a "$enable_libwebp" != no -a "$with_system_libwebp" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: external" >&5 -printf "%s\n" "external" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 +$as_echo "external" >&6; } ENABLE_LIBWEBP=TRUE SYSTEM_LIBWEBP=TRUE else @@ -45110,11 +43700,11 @@ LIBWEBP_CFLAGS= LIBWEBP_LIBS= if test "$test_libwebp" != no -a "$enable_libwebp" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 -printf "%s\n" "not tested" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not tested" >&5 +$as_echo "not tested" >&6; } fi fi fi @@ -45125,11 +43715,11 @@ if test "$ENABLE_JAVA" != ""; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use specific JVM search path at runtime" >&5 -printf %s "checking whether to use specific JVM search path at runtime... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use specific JVM search path at runtime" >&5 +$as_echo_n "checking whether to use specific JVM search path at runtime... " >&6; } if test -n "$with_jvm_path" -a "$with_jvm_path" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } if ! test -d "$with_jvm_path"; then as_fn_error $? "\"$with_jvm_path\" not a directory" "$LINENO" 5 fi @@ -45139,8 +43729,8 @@ JVM_ONE_PATH_CHECK="$with_jvm_path" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -45164,12 +43754,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_ANT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ANT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $ANT in [\\/]* | ?:[\\/]*) ac_cv_path_ANT="$ANT" # Let the user override the test with a path. @@ -45179,15 +43768,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_ANT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -45199,11 +43784,11 @@ fi ANT=$ac_cv_path_ANT if test -n "$ANT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5 -printf "%s\n" "$ANT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5 +$as_echo "$ANT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -45221,12 +43806,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_ANT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ANT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $ANT in [\\/]* | ?:[\\/]*) ac_cv_path_ANT="$ANT" # Let the user override the test with a path. @@ -45237,15 +43821,11 @@ for as_dir in $as_dummy do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_ANT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -45257,11 +43837,11 @@ fi ANT=$ac_cv_path_ANT if test -n "$ANT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5 -printf "%s\n" "$ANT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5 +$as_echo "$ANT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -45286,8 +43866,8 @@ cd "$a_cwd" done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $ANT works" >&5 -printf %s "checking if $ANT works... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $ANT works" >&5 +$as_echo_n "checking if $ANT works... " >&6; } mkdir -p conftest.dir a_cwd=$(pwd) cd conftest.dir @@ -45312,11 +43892,11 @@ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; } if test $? = 0 -a -f ./conftest.class; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Ant works" >&5 -printf "%s\n" "Ant works" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant works" >&5 +$as_echo "Ant works" >&6; } if test -z "$WITH_ANT_HOME"; then ANT_HOME=`"$ANT" -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"` if test -z "$ANT_HOME"; then @@ -45344,8 +43924,8 @@ fi if test "$ANT_HOME" != "NO_ANT_HOME"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Ant lib directory" >&5 -printf %s "checking Ant lib directory... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ant lib directory" >&5 +$as_echo_n "checking Ant lib directory... " >&6; } if test -f $ANT_HOME/lib/ant.jar; then ANT_LIB="$ANT_HOME/lib" else @@ -45373,15 +43953,15 @@ fi PathFormat "$ANT_LIB" ANT_LIB="$formatted_path" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Ant lib directory found." >&5 -printf "%s\n" "Ant lib directory found." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant lib directory found." >&5 +$as_echo "Ant lib directory found." >&6; } fi ant_minver=1.6.0 ant_minminor1=`echo $ant_minver | cut -d"." -f2` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Ant is >= $ant_minver" >&5 -printf %s "checking whether Ant is >= $ant_minver... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Ant is >= $ant_minver" >&5 +$as_echo_n "checking whether Ant is >= $ant_minver... " >&6; } ant_version=`"$ANT" -version | $AWK '$3 == "version" { print $4; }'` ant_version_major=`echo $ant_version | cut -d. -f1` ant_version_minor=`echo $ant_version | cut -d. -f2` @@ -45389,11 +43969,11 @@ echo "configure: ant_version_major $ant_version_major " >&5 echo "configure: ant_version_minor $ant_version_minor " >&5 if test "$ant_version_major" -ge "2"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5 -printf "%s\n" "yes, $ant_version" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5 +$as_echo "yes, $ant_version" >&6; } elif test "$ant_version_major" = "1" -a "$ant_version_minor" -ge "$ant_minminor1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5 -printf "%s\n" "yes, $ant_version" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5 +$as_echo "yes, $ant_version" >&6; } else as_fn_error $? "no, you need at least Ant >= $ant_minver" "$LINENO" 5 fi @@ -45407,8 +43987,8 @@ OOO_JUNIT_JAR= HAMCREST_JAR= if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" -a "$cross_compiling" != "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JUnit 4" >&5 -printf %s "checking for JUnit 4... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JUnit 4" >&5 +$as_echo_n "checking for JUnit 4... " >&6; } if test "$with_junit" = "yes"; then if test -n "$LODE_HOME" -a -e "$LODE_HOME/opt/share/java/junit.jar" ; then OOO_JUNIT_JAR="$LODE_HOME/opt/share/java/junit.jar" @@ -45429,8 +44009,8 @@ fi printf 'import org.junit.Before;' > conftest.java if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OOO_JUNIT_JAR" >&5 -printf "%s\n" "$OOO_JUNIT_JAR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OOO_JUNIT_JAR" >&5 +$as_echo "$OOO_JUNIT_JAR" >&6; } else as_fn_error $? "cannot find JUnit 4 jar; please install one in the default location (/usr/share/java), specify its pathname via --with-junit=..., or disable it via --without-junit" "$LINENO" 5 @@ -45440,17 +44020,17 @@ BUILD_TYPE="$BUILD_TYPE QADEVOOO" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for included Hamcrest" >&5 -printf %s "checking for included Hamcrest... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for included Hamcrest" >&5 +$as_echo_n "checking for included Hamcrest... " >&6; } printf 'import org.hamcrest.BaseDescription;' > conftest.java if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Included in $OOO_JUNIT_JAR" >&5 -printf "%s\n" "Included in $OOO_JUNIT_JAR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Included in $OOO_JUNIT_JAR" >&5 +$as_echo "Included in $OOO_JUNIT_JAR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Not included" >&5 -printf "%s\n" "Not included" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for standalone hamcrest jar." >&5 -printf %s "checking for standalone hamcrest jar.... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not included" >&5 +$as_echo "Not included" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standalone hamcrest jar." >&5 +$as_echo_n "checking for standalone hamcrest jar.... " >&6; } if test "$with_hamcrest" = "yes"; then if test -e /usr/share/lib/java/hamcrest.jar; then HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar @@ -45468,8 +44048,8 @@ HAMCREST_JAR=`cygpath -m "$HAMCREST_JAR"` fi if "$JAVACOMPILER" -classpath "$HAMCREST_JAR" conftest.java >&5 2>&5; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HAMCREST_JAR" >&5 -printf "%s\n" "$HAMCREST_JAR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAMCREST_JAR" >&5 +$as_echo "$HAMCREST_JAR" >&6; } else as_fn_error $? "junit does not contain hamcrest; please use a junit jar that includes hamcrest, install a hamcrest jar in the default location (/usr/share/java), specify its path with --with-hamcrest=..., or disable junit with --without-junit" "$LINENO" 5 @@ -45542,8 +44122,8 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which languages to be built" >&5 -printf %s "checking which languages to be built... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which languages to be built" >&5 +$as_echo_n "checking which languages to be built... " >&6; } # get list of all languages # generate shell variable from completelangiso= from solenv/inc/langlist.mk # the sed command does the following: @@ -45564,11 +44144,11 @@ fi if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: en-US" >&5 -printf "%s\n" "en-US" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: en-US" >&5 +$as_echo "en-US" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WITH_LANG" >&5 -printf "%s\n" "$WITH_LANG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_LANG" >&5 +$as_echo "$WITH_LANG" >&6; } GIT_NEEDED_SUBMODULES="translations $GIT_NEEDED_SUBMODULES" if test -z "$MSGFMT"; then if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msgfmt" ; then @@ -45580,12 +44160,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_MSGFMT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$MSGFMT"; then ac_cv_prog_MSGFMT="$MSGFMT" # Let the user override the test. else @@ -45593,15 +44172,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MSGFMT="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -45612,11 +44187,11 @@ fi MSGFMT=$ac_cv_prog_MSGFMT if test -n "$MSGFMT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -printf "%s\n" "$MSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -45638,12 +44213,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_MSGUNIQ+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MSGUNIQ+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$MSGUNIQ"; then ac_cv_prog_MSGUNIQ="$MSGUNIQ" # Let the user override the test. else @@ -45651,15 +44225,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MSGUNIQ="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -45670,11 +44240,11 @@ fi MSGUNIQ=$ac_cv_prog_MSGUNIQ if test -n "$MSGUNIQ"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGUNIQ" >&5 -printf "%s\n" "$MSGUNIQ" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGUNIQ" >&5 +$as_echo "$MSGUNIQ" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -45716,7 +44286,9 @@ ALL_LANGS=`echo $ALL_LANGS qtz` fi -printf "%s\n" "#define WITH_LANG \"$WITH_LANG\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define WITH_LANG "$WITH_LANG" +_ACEOF @@ -45741,22 +44313,24 @@ for locale in $WITH_LOCALES; do lang=${locale%_*} - printf "%s\n" "#define WITH_LOCALE_$lang 1" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define WITH_LOCALE_$lang 1 +_ACEOF case $lang in hi|mr*ne) - printf "%s\n" "#define WITH_LOCALE_FOR_SCRIPT_Deva 1" >>confdefs.h + $as_echo "#define WITH_LOCALE_FOR_SCRIPT_Deva 1" >>confdefs.h ;; bg|ru) - printf "%s\n" "#define WITH_LOCALE_FOR_SCRIPT_Cyrl 1" >>confdefs.h + $as_echo "#define WITH_LOCALE_FOR_SCRIPT_Cyrl 1" >>confdefs.h ;; esac done else - printf "%s\n" "#define WITH_LOCALE_ALL 1" >>confdefs.h + $as_echo "#define WITH_LOCALE_ALL 1" >>confdefs.h fi @@ -45779,28 +44353,28 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alternative branding images directory" >&5 -printf %s "checking for alternative branding images directory... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alternative branding images directory" >&5 +$as_echo_n "checking for alternative branding images directory... " >&6; } # initialize mapped arrays BRAND_INTRO_IMAGES="intro.png intro-highres.png" brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg logo-sc.svg logo-sc_inverted.svg about.svg" if test -z "$with_branding" -o "$with_branding" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } DEFAULT_BRAND_IMAGES="$brand_files" else if ! test -d $with_branding ; then as_fn_error $? "No directory $with_branding, falling back to default branding" "$LINENO" 5 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_branding" >&5 -printf "%s\n" "$with_branding" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_branding" >&5 +$as_echo "$with_branding" >&6; } CUSTOM_BRAND_DIR="$with_branding" for lfile in $brand_files do if ! test -f $with_branding/$lfile ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Branded file $lfile does not exist, using the default one" >&5 -printf "%s\n" "$as_me: WARNING: Branded file $lfile does not exist, using the default one" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Branded file $lfile does not exist, using the default one" >&5 +$as_echo "$as_me: WARNING: Branded file $lfile does not exist, using the default one" >&2;} DEFAULT_BRAND_IMAGES="$DEFAULT_BRAND_IMAGES $lfile" else CUSTOM_BRAND_IMAGES="$CUSTOM_BRAND_IMAGES $lfile" @@ -45815,8 +44389,8 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 'intro' progress settings" >&5 -printf %s "checking for 'intro' progress settings... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 'intro' progress settings" >&5 +$as_echo_n "checking for 'intro' progress settings... " >&6; } PROGRESSBARCOLOR= PROGRESSSIZE= PROGRESSPOSITION= @@ -45826,11 +44400,11 @@ if test "$check_for_progress" = "yes" -a -f "$with_branding/progress.conf" ; then source "$with_branding/progress.conf" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: settings found in $with_branding/progress.conf" >&5 -printf "%s\n" "settings found in $with_branding/progress.conf" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: settings found in $with_branding/progress.conf" >&5 +$as_echo "settings found in $with_branding/progress.conf" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi @@ -45841,25 +44415,27 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extra build ID" >&5 -printf %s "checking for extra build ID... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra build ID" >&5 +$as_echo_n "checking for extra build ID... " >&6; } if test -n "$with_extra_buildid" -a "$with_extra_buildid" != "yes" ; then EXTRA_BUILDID="$with_extra_buildid" fi # in tinderboxes, it is easier to set EXTRA_BUILDID via the environment variable instead of configure switch if test -n "$EXTRA_BUILDID" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXTRA_BUILDID" >&5 -printf "%s\n" "$EXTRA_BUILDID" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXTRA_BUILDID" >&5 +$as_echo "$EXTRA_BUILDID" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -printf "%s\n" "not set" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +$as_echo "not set" >&6; } fi -printf "%s\n" "#define EXTRA_BUILDID \"$EXTRA_BUILDID\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define EXTRA_BUILDID "$EXTRA_BUILDID" +_ACEOF OOO_VENDOR= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vendor" >&5 -printf %s "checking for vendor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vendor" >&5 +$as_echo_n "checking for vendor... " >&6; } if test -z "$with_vendor" -o "$with_vendor" = "no"; then OOO_VENDOR="$USERNAME" @@ -45871,21 +44447,23 @@ OOO_VENDOR="`id -u -n`" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set, using $OOO_VENDOR" >&5 -printf "%s\n" "not set, using $OOO_VENDOR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set, using $OOO_VENDOR" >&5 +$as_echo "not set, using $OOO_VENDOR" >&6; } else OOO_VENDOR="$with_vendor" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OOO_VENDOR" >&5 -printf "%s\n" "$OOO_VENDOR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OOO_VENDOR" >&5 +$as_echo "$OOO_VENDOR" >&6; } fi -printf "%s\n" "#define OOO_VENDOR \"$OOO_VENDOR\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define OOO_VENDOR "$OOO_VENDOR" +_ACEOF if test "$_os" = "Android" ; then ANDROID_PACKAGE_NAME= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Android package name" >&5 -printf %s "checking for Android package name... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Android package name" >&5 +$as_echo_n "checking for Android package name... " >&6; } if test -z "$with_android_package_name" -o "$with_android_package_name" = "no"; then if test -n "$ENABLE_DEBUG"; then # Default to the package name that makes ndk-gdb happy. @@ -45894,46 +44472,46 @@ ANDROID_PACKAGE_NAME="org.example.libreoffice" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set, using $ANDROID_PACKAGE_NAME" >&5 -printf "%s\n" "not set, using $ANDROID_PACKAGE_NAME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set, using $ANDROID_PACKAGE_NAME" >&5 +$as_echo "not set, using $ANDROID_PACKAGE_NAME" >&6; } else ANDROID_PACKAGE_NAME="$with_android_package_name" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ANDROID_PACKAGE_NAME" >&5 -printf "%s\n" "$ANDROID_PACKAGE_NAME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANDROID_PACKAGE_NAME" >&5 +$as_echo "$ANDROID_PACKAGE_NAME" >&6; } fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to install the compat oo* wrappers" >&5 -printf %s "checking whether to install the compat oo* wrappers... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install the compat oo* wrappers" >&5 +$as_echo_n "checking whether to install the compat oo* wrappers... " >&6; } if test "$with_compat_oowrappers" = "yes"; then WITH_COMPAT_OOWRAPPERS=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else WITH_COMPAT_OOWRAPPERS= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi INSTALLDIRNAME=`echo LibreOffice | $AWK '{print tolower($0)}'` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for install dirname" >&5 -printf %s "checking for install dirname... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install dirname" >&5 +$as_echo_n "checking for install dirname... " >&6; } if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes"; then INSTALLDIRNAME="$with_install_dirname" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALLDIRNAME" >&5 -printf "%s\n" "$INSTALLDIRNAME" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALLDIRNAME" >&5 +$as_echo "$INSTALLDIRNAME" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for prefix" >&5 -printf %s "checking for prefix... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prefix" >&5 +$as_echo_n "checking for prefix... " >&6; } test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix PREFIXDIR="$prefix" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PREFIXDIR" >&5 -printf "%s\n" "$PREFIXDIR" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PREFIXDIR" >&5 +$as_echo "$PREFIXDIR" >&6; } LIBDIR=$(eval echo $(eval echo $libdir)) @@ -45962,75 +44540,87 @@ # OAuth2 id and secrets # =================================================================== -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Google Drive client id and secret" >&5 -printf %s "checking for Google Drive client id and secret... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Google Drive client id and secret" >&5 +$as_echo_n "checking for Google Drive client id and secret... " >&6; } if test "$with_gdrive_client_id" = "no" -o -z "$with_gdrive_client_id"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -printf "%s\n" "not set" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +$as_echo "not set" >&6; } GDRIVE_CLIENT_ID="\"\"" GDRIVE_CLIENT_SECRET="\"\"" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: set" >&5 -printf "%s\n" "set" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: set" >&5 +$as_echo "set" >&6; } GDRIVE_CLIENT_ID="\"$with_gdrive_client_id\"" GDRIVE_CLIENT_SECRET="\"$with_gdrive_client_secret\"" fi -printf "%s\n" "#define GDRIVE_CLIENT_ID $GDRIVE_CLIENT_ID" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GDRIVE_CLIENT_ID $GDRIVE_CLIENT_ID +_ACEOF -printf "%s\n" "#define GDRIVE_CLIENT_SECRET $GDRIVE_CLIENT_SECRET" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GDRIVE_CLIENT_SECRET $GDRIVE_CLIENT_SECRET +_ACEOF -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Alfresco Cloud client id and secret" >&5 -printf %s "checking for Alfresco Cloud client id and secret... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Alfresco Cloud client id and secret" >&5 +$as_echo_n "checking for Alfresco Cloud client id and secret... " >&6; } if test "$with_alfresco_cloud_client_id" = "no" -o -z "$with_alfresco_cloud_client_id"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -printf "%s\n" "not set" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +$as_echo "not set" >&6; } ALFRESCO_CLOUD_CLIENT_ID="\"\"" ALFRESCO_CLOUD_CLIENT_SECRET="\"\"" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: set" >&5 -printf "%s\n" "set" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: set" >&5 +$as_echo "set" >&6; } ALFRESCO_CLOUD_CLIENT_ID="\"$with_alfresco_cloud_client_id\"" ALFRESCO_CLOUD_CLIENT_SECRET="\"$with_alfresco_cloud_client_secret\"" fi -printf "%s\n" "#define ALFRESCO_CLOUD_CLIENT_ID $ALFRESCO_CLOUD_CLIENT_ID" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define ALFRESCO_CLOUD_CLIENT_ID $ALFRESCO_CLOUD_CLIENT_ID +_ACEOF -printf "%s\n" "#define ALFRESCO_CLOUD_CLIENT_SECRET $ALFRESCO_CLOUD_CLIENT_SECRET" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define ALFRESCO_CLOUD_CLIENT_SECRET $ALFRESCO_CLOUD_CLIENT_SECRET +_ACEOF -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OneDrive client id and secret" >&5 -printf %s "checking for OneDrive client id and secret... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OneDrive client id and secret" >&5 +$as_echo_n "checking for OneDrive client id and secret... " >&6; } if test "$with_onedrive_client_id" = "no" -o -z "$with_onedrive_client_id"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -printf "%s\n" "not set" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +$as_echo "not set" >&6; } ONEDRIVE_CLIENT_ID="\"\"" ONEDRIVE_CLIENT_SECRET="\"\"" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: set" >&5 -printf "%s\n" "set" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: set" >&5 +$as_echo "set" >&6; } ONEDRIVE_CLIENT_ID="\"$with_onedrive_client_id\"" ONEDRIVE_CLIENT_SECRET="\"$with_onedrive_client_secret\"" fi -printf "%s\n" "#define ONEDRIVE_CLIENT_ID $ONEDRIVE_CLIENT_ID" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define ONEDRIVE_CLIENT_ID $ONEDRIVE_CLIENT_ID +_ACEOF -printf "%s\n" "#define ONEDRIVE_CLIENT_SECRET $ONEDRIVE_CLIENT_SECRET" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define ONEDRIVE_CLIENT_SECRET $ONEDRIVE_CLIENT_SECRET +_ACEOF -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dependency tracking" >&5 -printf %s "checking whether to enable dependency tracking... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dependency tracking" >&5 +$as_echo_n "checking whether to enable dependency tracking... " >&6; } if test "$enable_dependency_tracking" = "no"; then nodep=TRUE - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for number of processors to use" >&5 -printf %s "checking for number of processors to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of processors to use" >&5 +$as_echo_n "checking for number of processors to use... " >&6; } # plain --with-parallelism is just the default if test -n "$with_parallelism" -a "$with_parallelism" != "yes"; then if test "$with_parallelism" = "no"; then @@ -46063,11 +44653,11 @@ fi if test $PARALLELISM -eq 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: explicit make -j option needed" >&5 -printf "%s\n" "explicit make -j option needed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicit make -j option needed" >&5 +$as_echo "explicit make -j option needed" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PARALLELISM" >&5 -printf "%s\n" "$PARALLELISM" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PARALLELISM" >&5 +$as_echo "$PARALLELISM" >&6; } fi @@ -46106,8 +44696,8 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports a working C++20 consteval" >&5 -printf %s "checking whether $CXX_BASE supports a working C++20 consteval... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX_BASE supports a working C++20 consteval" >&5 +$as_echo_n "checking whether $CXX_BASE supports a working C++20 consteval... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -46120,11 +44710,10 @@ fi save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" -if test "$cross_compiling" = yes -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: assumed no (cross compiling)" >&5 -printf "%s\n" "assumed no (cross compiling)" >&6; } -else $as_nop +if test "$cross_compiling" = yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: assumed no (cross compiling)" >&5 +$as_echo "assumed no (cross compiling)" >&6; } +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46163,7 +44752,7 @@ auto s5 = S5().f(); int -main (void) +main () { return (s.i == 1) ? 0 : 1; @@ -46172,17 +44761,16 @@ return 0; } _ACEOF -if ac_fn_cxx_try_run "$LINENO" -then : +if ac_fn_cxx_try_run "$LINENO"; then : - printf "%s\n" "#define HAVE_CPP_CONSTEVAL 1" >>confdefs.h + $as_echo "#define HAVE_CPP_CONSTEVAL 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -46200,8 +44788,8 @@ # =================================================================== # Creating bigger shared library to link against # =================================================================== -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to create huge library" >&5 -printf %s "checking whether to create huge library... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to create huge library" >&5 +$as_echo_n "checking whether to create huge library... " >&6; } MERGELIBS= if test $_os = iOS -o $_os = Android; then @@ -46215,26 +44803,26 @@ add_warning "--enable-mergelibs is not tested for this platform" fi MERGELIBS="TRUE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - printf "%s\n" "#define ENABLE_MERGELIBS 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define ENABLE_MERGELIBS 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use icerun wrapper" >&5 -printf %s "checking whether to use icerun wrapper... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use icerun wrapper" >&5 +$as_echo_n "checking whether to use icerun wrapper... " >&6; } ICECREAM_RUN= if test "$enable_icecream" = "yes" && which icerun >/dev/null 2>&1 ; then ICECREAM_RUN=icerun - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -46246,8 +44834,8 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking MPL subset" >&5 -printf %s "checking MPL subset... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MPL subset" >&5 +$as_echo_n "checking MPL subset... " >&6; } MPL_SUBSET= if test "$enable_mpl_subset" = "yes"; then @@ -46290,49 +44878,49 @@ fi MPL_SUBSET="TRUE" - printf "%s\n" "#define MPL_HAVE_SUBSET 1" >>confdefs.h + $as_echo "#define MPL_HAVE_SUBSET 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: only" >&5 -printf "%s\n" "only" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: only" >&5 +$as_echo "only" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no restrictions" >&5 -printf "%s\n" "no restrictions" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no restrictions" >&5 +$as_echo "no restrictions" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking formula logger" >&5 -printf %s "checking formula logger... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking formula logger" >&5 +$as_echo_n "checking formula logger... " >&6; } ENABLE_FORMULA_LOGGER= if test "x$enable_formula_logger" = "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - printf "%s\n" "#define ENABLE_FORMULA_LOGGER 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define ENABLE_FORMULA_LOGGER 1" >>confdefs.h ENABLE_FORMULA_LOGGER=TRUE elif test -n "$ENABLE_DBGUTIL" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - printf "%s\n" "#define ENABLE_FORMULA_LOGGER 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define ENABLE_FORMULA_LOGGER 1" >>confdefs.h ENABLE_FORMULA_LOGGER=TRUE else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test $_os = WINNT -a -f "$SRC_ROOT/antivirusDetection.vbs" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for active Antivirus software" >&5 -printf %s "checking for active Antivirus software... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for active Antivirus software" >&5 +$as_echo_n "checking for active Antivirus software... " >&6; } ANTIVIRUS_LIST=`cscript.exe //Nologo $SRC_ROOT/antivirusDetection.vbs` if [ "$ANTIVIRUS_LIST" != "NULL" ] ; then if [ "$ANTIVIRUS_LIST" != "NOT_FOUND" ] ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 -printf "%s\n" "found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } EICAR_STRING='X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*' echo $EICAR_STRING > $SRC_ROOT/eicar EICAR_TEMP_FILE_CONTENTS=`cat $SRC_ROOT/eicar` @@ -46348,17 +44936,17 @@ fi add_warning "To speed up builds and avoid failures in unit tests, it is highly recommended that you exclude the build and source directories associated with LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf "%s\n" "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: n/a" >&5 -printf "%s\n" "n/a" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: n/a" >&5 +$as_echo "n/a" >&6; } fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: setting up the build environment variables..." >&5 -printf "%s\n" "$as_me: setting up the build environment variables..." >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: setting up the build environment variables..." >&5 +$as_echo "$as_me: setting up the build environment variables..." >&6;} @@ -46496,8 +45084,8 @@ if test -n "$libo_fuzz_list"; then tmps=`eval echo $libo_fuzz_list` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Summary of fuzzing: $tmps" >&5 -printf "%s\n" "$as_me: Summary of fuzzing: $tmps" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Summary of fuzzing: $tmps" >&5 +$as_echo "$as_me: Summary of fuzzing: $tmps" >&6;} fi @@ -46635,8 +45223,8 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -46666,15 +45254,15 @@ /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -46688,8 +45276,8 @@ fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -46706,7 +45294,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -46723,8 +45311,8 @@ ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -46747,16 +45335,14 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -46766,46 +45352,46 @@ fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -46814,6 +45400,13 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -46822,12 +45415,8 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -46839,10 +45428,30 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -46855,14 +45464,13 @@ as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -46889,20 +45497,18 @@ { eval $1=; unset $1;} } as_unset=as_fn_unset - # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -46914,13 +45520,12 @@ # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -46951,7 +45556,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -46973,10 +45578,6 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -46990,12 +45591,6 @@ ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -47037,7 +45632,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -47046,7 +45641,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -47108,8 +45703,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibreOffice $as_me 7.4.1.2, which was -generated by GNU Autoconf 2.70. Invocation command line was +This file was extended by LibreOffice $as_me 7.4.2.3, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -47172,16 +45767,14 @@ LibreOffice home page: ." _ACEOF -ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` -ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config='$ac_cs_config_escaped' +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibreOffice config.status 7.4.1.2 -configured by $0, generated by GNU Autoconf 2.70, +LibreOffice config.status 7.4.2.3 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2020 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -47219,15 +45812,15 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - printf "%s\n" "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - printf "%s\n" "$ac_cs_config"; exit ;; + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -47235,7 +45828,7 @@ --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -47244,7 +45837,7 @@ as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - printf "%s\n" "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -47272,7 +45865,7 @@ if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -47286,7 +45879,7 @@ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - printf "%s\n" "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF @@ -47367,9 +45960,9 @@ # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files - test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers - test ${CONFIG_LINKS+y} || CONFIG_LINKS=$config_links + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links fi # Have a temporary directory for convenience. Make it in the build tree @@ -47705,7 +46298,7 @@ esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -47713,17 +46306,17 @@ # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -printf "%s\n" "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`printf "%s\n" "$configure_input" | + ac_sed_conf_input=`$as_echo "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -47740,7 +46333,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -47764,9 +46357,9 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -47819,8 +46412,8 @@ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -47862,9 +46455,9 @@ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -47880,20 +46473,20 @@ # if test x"$ac_file" != x-; then { - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -47911,8 +46504,8 @@ ac_source=$srcdir/$ac_source fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 -printf "%s\n" "$as_me: linking $ac_source to $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 +$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} if test ! -r "$ac_source"; then as_fn_error $? "$ac_source: file not found" "$LINENO" 5 @@ -47965,8 +46558,8 @@ $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi @@ -48079,4 +46672,3 @@ # Remove unneeded emconfigure artifacts rm -f a.out a.wasm a.out.js a.out.wasm - diff -Nru libreoffice-7.4.1~rc2/configure.ac libreoffice-7.4.2~rc3/configure.ac --- libreoffice-7.4.1~rc2/configure.ac 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/configure.ac 2022-10-10 10:15:14.000000000 +0000 @@ -9,7 +9,7 @@ # 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],[7.4.1.2],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.4.2.3],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard @@ -9973,7 +9973,7 @@ SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=8 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.13 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.14 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst]) fi @@ -10871,7 +10871,7 @@ HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src" HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz" -libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42]) +libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.1.0]) if test "$COM" = "MSC"; then # override the above GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib" @@ -12537,12 +12537,11 @@ # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) - # progress_callback is the only func with plain C linkage - # checking for it also filters out older, KDE-dependent libgpgmepp versions - AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], - [AC_MSG_ERROR(gpgmepp not found or not functional)], []) AC_CHECK_HEADER(gpgme.h, [], [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) + AC_CHECK_LIB(gpgmepp, main, [], + [AC_MSG_ERROR(gpgmepp not found or not functional)], []) + GPGMEPP_LIBS=-lgpgmepp else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" diff -Nru libreoffice-7.4.1~rc2/cui/source/dialogs/hlmarkwn.cxx libreoffice-7.4.2~rc3/cui/source/dialogs/hlmarkwn.cxx --- libreoffice-7.4.1~rc2/cui/source/dialogs/hlmarkwn.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/cui/source/dialogs/hlmarkwn.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -366,7 +366,7 @@ // push if the inserted entry is a child if (nOutlineLevel > aHeadingsParentEntryStack.top().second) aHeadingsParentEntryStack.push( - std::pair(std::move(xEntry), nOutlineLevel)); + std::pair(mxLbTree->make_iterator(xEntry.get()), nOutlineLevel)); } else { diff -Nru libreoffice-7.4.1~rc2/cui/source/dialogs/SpellDialog.cxx libreoffice-7.4.2~rc3/cui/source/dialogs/SpellDialog.cxx --- libreoffice-7.4.1~rc2/cui/source/dialogs/SpellDialog.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/cui/source/dialogs/SpellDialog.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -1128,6 +1129,12 @@ WeldEditView::SetDrawingArea(pDrawingArea); // tdf#132288 don't merge equal adjacent attributes m_xEditEngine->DisableAttributeExpanding(); + + // tdf#142631 use document background color in this widget + Color aBgColor = svtools::ColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; + OutputDevice& rDevice = pDrawingArea->get_ref_device(); + rDevice.SetBackground(aBgColor); + m_xEditView->SetBackgroundColor(aBgColor); } SentenceEditWindow_Impl::~SentenceEditWindow_Impl() diff -Nru libreoffice-7.4.1~rc2/cui/source/tabpages/tabstpge.cxx libreoffice-7.4.2~rc3/cui/source/tabpages/tabstpge.cxx --- libreoffice-7.4.1~rc2/cui/source/tabpages/tabstpge.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/cui/source/tabpages/tabstpge.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -52,7 +52,11 @@ Size aSize(GetOutputSizePixel()); aPoint.setX( aSize.Width() / 2 ); aPoint.setY( aSize.Height() / 2 ); - Ruler::DrawTab(rRenderContext, rRenderContext.GetSettings().GetStyleSettings().GetFontColor(), aPoint, nTabStyle); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + rRenderContext.SetLineColor(rStyleSettings.GetShadowColor()); + rRenderContext.SetFillColor(rStyleSettings.GetDialogColor()); + rRenderContext.DrawRect(tools::Rectangle(Point(0,0), rRenderContext.GetOutputSize())); + Ruler::DrawTab(rRenderContext, rStyleSettings.GetDialogTextColor(), aPoint, nTabStyle); } SvxTabulatorTabPage::SvxTabulatorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr) diff -Nru libreoffice-7.4.1~rc2/cui/source/tabpages/tparea.cxx libreoffice-7.4.2~rc3/cui/source/tabpages/tparea.cxx --- libreoffice-7.4.1~rc2/cui/source/tabpages/tparea.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/cui/source/tabpages/tparea.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -238,8 +238,11 @@ { XFillStyleItem aStyleItem( drawing::FillStyle_NONE ); _pSet->Put( aStyleItem ); - XFillUseSlideBackgroundItem aFillBgItem( false ); - _pSet->Put( aFillBgItem ); + if (_pSet->HasItem(XATTR_FILLUSESLIDEBACKGROUND)) + { + XFillUseSlideBackgroundItem aFillBgItem( false ); + _pSet->Put( aFillBgItem ); + } } break; } diff -Nru libreoffice-7.4.1~rc2/dbaccess/source/ui/control/dbtreelistbox.cxx libreoffice-7.4.2~rc3/dbaccess/source/ui/control/dbtreelistbox.cxx --- libreoffice-7.4.1~rc2/dbaccess/source/ui/control/dbtreelistbox.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/dbaccess/source/ui/control/dbtreelistbox.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -186,8 +186,16 @@ std::unique_ptr TreeListBox::GetEntryPosByName(std::u16string_view aName, const weld::TreeIter* pStart, const IEntryFilter* _pFilter) const { auto xEntry(m_xTreeView->make_iterator(pStart)); - if (!pStart && !m_xTreeView->get_iter_first(*xEntry)) - return nullptr; + if (pStart) + { + if (!m_xTreeView->iter_children(*xEntry)) + return nullptr; + } + else + { + if (!m_xTreeView->get_iter_first(*xEntry)) + return nullptr; + } do { @@ -199,7 +207,7 @@ return xEntry; } } - } while (m_xTreeView->iter_next(*xEntry)); + } while (m_xTreeView->iter_next_sibling(*xEntry)); return nullptr; } diff -Nru libreoffice-7.4.1~rc2/debian/changelog libreoffice-7.4.2~rc3/debian/changelog --- libreoffice-7.4.1~rc2/debian/changelog 2022-09-10 17:39:45.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/changelog 2022-10-10 20:28:38.000000000 +0000 @@ -1,4 +1,4 @@ -libreoffice (1:7.4.1~rc2-0ubuntu0.20.04.1~lo1) focal; urgency=medium +libreoffice (1:7.4.2~rc3-0ubuntu0.20.04.1~lo1) focal; urgency=medium * Backport from kinetic * Lower dpkg-dev requirement @@ -8,7 +8,88 @@ to meat upstream requirements * Enable CoinMP support - -- Rico Tzschichholz Sat, 10 Sep 2022 19:39:45 +0200 + -- Rico Tzschichholz Mon, 10 Oct 2022 22:28:38 +0200 + +libreoffice (1:7.4.2~rc3-0ubuntu1) kinetic; urgency=medium + + * New upstream release candidate + + -- Rico Tzschichholz Mon, 10 Oct 2022 22:28:38 +0200 + +libreoffice (1:7.4.2~rc3-1) experimental; urgency=medium + + * New upstream release candidate + + -- Rene Engelhard Mon, 10 Oct 2022 19:06:49 +0200 + +libreoffice (1:7.4.2~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - add missing >&3 to ufcq calls in bug scripts + - fix build-depends-on-obsolete-package + (s/libfreetype6-dev/libfreetype-dev/, + s/libfontconfig1-dev/libfontconfig-dev/) + * debian/control.gtk4.in: remove "when running under GNOME" + from package description since GNOME implies gtk3 + * debian/control.{gtk4,qt5,qt6}.in: mention the need to + manually export SAL_USE_VCLPLUGIN + + -- Rene Engelhard Thu, 06 Oct 2022 17:44:16 +0200 + +libreoffice (1:7.4.2~rc2-0ubuntu1) kinetic; urgency=medium + + * New upstream release candidate + + [ Rene Engelhard ] + * debian/rules: add missing >&3 + * debian/rules: fix build-depends-on-obsolete-package + (s/libfreetype6-dev/libfreetype-dev/, + s/libfontconfig1-dev/libfontconfig-dev/) + + -- Rico Tzschichholz Thu, 06 Oct 2022 10:38:00 +0200 + +libreoffice (1:7.4.2~rc1-0ubuntu1) kinetic; urgency=medium + + * New upstream release candidate + + -- Rico Tzschichholz Wed, 21 Sep 2022 10:03:05 +0200 + +libreoffice (1:7.4.2~rc1-2) experimental; urgency=medium + + * reupload with correct control... + + -- Rene Engelhard Wed, 21 Sep 2022 18:08:40 +0200 + +libreoffice (1:7.4.2~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + -- Rene Engelhard Wed, 21 Sep 2022 17:36:50 +0200 + +libreoffice (1:7.4.1-1) unstable; urgency=medium + + * LibreOffice 7.4.1 final release (identical to rc2) + (closes: #1018173) + + * debian/source/lintian-overrides: update for latest copyright changes + + -- Rene Engelhard Sat, 17 Sep 2022 19:49:58 +0200 + +libreoffice (1:7.4.1~rc2-3) unstable; urgency=medium + + * upload to unstable + + * debian/rules: + - don't depend on node-prismjs on bullseye-backport since there it + depends on nodejs... + - also use node-prismjs/node-normalize.css for the build and add them + to Build-Depends-Indep + * debian/copyright, debian/libreoffice-common.links: mention prism.css + explicitly and link to node-primsjs' prism-coy.css + + -- Rene Engelhard Sun, 11 Sep 2022 22:30:14 +0200 libreoffice (1:7.4.1~rc2-0ubuntu1) kinetic; urgency=medium @@ -17,7 +98,18 @@ -- Rico Tzschichholz Fri, 09 Sep 2022 22:23:33 +0200 -libreoffice (1:7.4.1~rc1-4) UNRELEASED; urgency=medium +libreoffice (1:7.4.1~rc2-2) experimental; urgency=medium + + * upload with correct control.... + + -- Rene Engelhard Sat, 10 Sep 2022 13:28:55 +0200 + +libreoffice (1:7.4.1~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/patches/poppler-22.09.diff: fix build with poppler 22.09, + from gerrit The "hrmpf. lintian" release. @@ -36,7 +128,7 @@ on node-prismjs (and depend on node-normalize.css instead of the virtual libjs-normalize.css) - -- Rene Engelhard Sat, 03 Sep 2022 12:03:10 +0200 + -- Rene Engelhard Sat, 10 Sep 2022 08:16:12 +0200 libreoffice (1:7.4.1~rc1-3) unstable; urgency=medium diff -Nru libreoffice-7.4.1~rc2/debian/control libreoffice-7.4.2~rc3/debian/control --- libreoffice-7.4.1~rc2/debian/control 2022-09-10 17:39:45.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/control 2022-10-10 20:28:38.000000000 +0000 @@ -63,10 +63,10 @@ libetonyek-dev (<< 0.2~), libexpat1-dev, libexttextcat-dev (>= 3.4.1), - libfontconfig1-dev, + libfontconfig-dev | libfontconfig1-dev, libfreehand-dev (<< 0.2~), libfreehand-dev (>= 0.1), - libfreetype6-dev (>= 2.8.1), + libfreetype-dev (>= 2.8.1), libgirepository1.0-dev (>= 1.32), libgl-dev, libglib2.0-dev (>= 2.38.0), @@ -76,7 +76,7 @@ libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, libgtk-3-dev (>= 3.20.0), - libharfbuzz-dev (>= 0.9.42), + libharfbuzz-dev (>= 2.1.0), libhsqldb1.8.0-java (>> 1.8.0.10) , libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), @@ -102,7 +102,7 @@ libopenjp2-7-dev (>= 2.3), libpagemaker-dev, libpagemaker-dev (<< 0.1~), - libpng-dev, + libpng-dev (>= 1.6), libpoppler-cpp-dev, libpoppler-dev (>= 0.14.0), libpoppler-private-dev, @@ -5049,6 +5049,9 @@ . This package contains the Qt 5 plugin for drawing LibreOffices widgets with Qt 5 and a Qt File Picker and print dialog. + . + You need to enable it manually by export SAL_USE_VCLPLUGIN=qt5 if you are + not using Plasma. Package: libreoffice-plasma Architecture: amd64 arm64 armhf ppc64el s390x diff -Nru libreoffice-7.4.1~rc2/debian/control.gtk4.in libreoffice-7.4.2~rc3/debian/control.gtk4.in --- libreoffice-7.4.1~rc2/debian/control.gtk4.in 2022-06-02 05:45:08.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/control.gtk4.in 2022-10-10 20:28:38.000000000 +0000 @@ -11,5 +11,7 @@ a near drop-in replacement for Microsoft(R) Office. . This package contains the Gtk plugin for drawing LibreOffices widgets - with Gtk+ 4 and Gtk/GNOMEish print dialog when running under GNOME. + with Gtk+ 4 and Gtk/GNOMEish print dialog. + . + You need to enable it manually by export SAL_USE_VCLPLUGIN=gtk4. diff -Nru libreoffice-7.4.1~rc2/debian/control.qt5.in libreoffice-7.4.2~rc3/debian/control.qt5.in --- libreoffice-7.4.1~rc2/debian/control.qt5.in 2022-09-10 17:15:41.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/control.qt5.in 2022-10-10 20:28:38.000000000 +0000 @@ -10,4 +10,7 @@ . This package contains the Qt 5 plugin for drawing LibreOffices widgets with Qt 5 and a Qt File Picker and print dialog. + . + You need to enable it manually by export SAL_USE_VCLPLUGIN=qt5 if you are + not using Plasma. diff -Nru libreoffice-7.4.1~rc2/debian/control.qt6.in libreoffice-7.4.2~rc3/debian/control.qt6.in --- libreoffice-7.4.1~rc2/debian/control.qt6.in 2022-06-02 05:45:08.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/control.qt6.in 2022-10-10 20:28:38.000000000 +0000 @@ -10,4 +10,6 @@ . This package contains the Qt 6 plugin for drawing LibreOffices widgets with Qt 6 and a Qt File Picker and print dialog. + . + You need to enable it manually by export SAL_USE_VCLPLUGIN=qt6. diff -Nru libreoffice-7.4.1~rc2/debian/copyright libreoffice-7.4.2~rc3/debian/copyright --- libreoffice-7.4.1~rc2/debian/copyright 2022-09-10 17:39:45.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/copyright 2022-09-26 12:07:23.000000000 +0000 @@ -103,10 +103,14 @@ Copyright: Copyright © Nicolas Gallagher and Jonathan Neal License: Expat -Files: helpcontent2/help3xsl/prism.* +Files: helpcontent2/help3xsl/prism.js Copyright: Copyright (c) Lea Verou License: MIT +Files: helpcontent2/help3xsl/prism.css +Copyright: Copyright (c) Tim Shedor +License: MIT + Files: debian/* Copyright: Copyright (C) 2002-2009 Software in the Public Interest, Inc. License: GPL-2 diff -Nru libreoffice-7.4.1~rc2/debian/patches/Make-configure-work-with-gpgme-1.18.patch libreoffice-7.4.2~rc3/debian/patches/Make-configure-work-with-gpgme-1.18.patch --- libreoffice-7.4.1~rc2/debian/patches/Make-configure-work-with-gpgme-1.18.patch 2022-09-10 17:39:45.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/patches/Make-configure-work-with-gpgme-1.18.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b Mon Sep 17 00:00:00 2001 -From: Rene Engelhard -Date: Wed, 24 Aug 2022 09:55:33 +0200 -Subject: [PATCH] Make configure work with gpgme >= 1.18 - -Sam James wrote: -> gpgme-1.18.0 dropped a bunch of internal symbols, -> including progress_callback (see e.g. callbacks.h -> which has a comment at the top saying it's internal). - -Plausibly the workaround to not link against older KDE-specific distro -packages is not needed anymore. - -Check for main as a workaround as we do for other C++ libraries, too. - -Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4 ---- - configure.ac | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 24cb01aa0db0..61806988b94b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -12539,12 +12539,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE - # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way - AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], - [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) -- # progress_callback is the only func with plain C linkage -- # checking for it also filters out older, KDE-dependent libgpgmepp versions -- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], -- [AC_MSG_ERROR(gpgmepp not found or not functional)], []) - AC_CHECK_HEADER(gpgme.h, [], - [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) -+ AC_CHECK_LIB(gpgmepp, main, [], -+ [AC_MSG_ERROR(gpgmepp not found or not functional)], []) -+ GPGMEPP_LIBS=-lgpgmepp - else - AC_MSG_RESULT([internal]) - BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" --- -2.30.2 - diff -Nru libreoffice-7.4.1~rc2/debian/patches/series libreoffice-7.4.2~rc3/debian/patches/series --- libreoffice-7.4.1~rc2/debian/patches/series 2022-09-10 17:39:45.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/patches/series 2022-10-10 20:28:38.000000000 +0000 @@ -53,5 +53,4 @@ do-not-ABORT_ON_NON_APPLICATION_FONT_USE.diff hrk-euro.diff fix-eot-configure-ac.diff -Make-configure-work-with-gpgme-1.18.patch icu-66.patch diff -Nru libreoffice-7.4.1~rc2/debian/rules libreoffice-7.4.2~rc3/debian/rules --- libreoffice-7.4.1~rc2/debian/rules 2022-09-10 17:39:45.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/rules 2022-10-10 20:28:38.000000000 +0000 @@ -74,11 +74,11 @@ GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice # bootstraping this from the source tree is breaking get-orig-source #lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,') -lo_sources_ver=7.4.1.2 +lo_sources_ver=7.4.2.3 # NOT in proper libreoffice-3-6 branch # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1 GIT_TAG=libreoffice-$(lo_sources_ver) -GIT_BRANCH=libreoffice-7-4-1 +GIT_BRANCH=libreoffice-7-4-2 endif ifeq "$(USE_SOURCE_TARBALLS)" "y" lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2) @@ -103,7 +103,7 @@ fontforge-nox | fontforge, \ gperf (>= 3.1),\ libc0.1 (>= 2.10.2-7) [kfreebsd-any],\ - libfontconfig1-dev,\ + libfontconfig-dev | libfontconfig1-dev,\ pkg-config,\ unzip,\ xsltproc,\ @@ -379,9 +379,9 @@ endif # see https://cgit.freedesktop.org/libreoffice/core/commit/?id=a0edcc68f94915a78fcc08e70d2cdd752abd9ebb ifeq "$(ENABLE_SKIA)" "y" - BUILD_DEPS += , libfreetype6-dev (>= 2.8.1) + BUILD_DEPS += , libfreetype-dev (>= 2.8.1) else - BUILD_DEPS += , libfreetype6-dev (>= 2.2.0) + BUILD_DEPS += , libfreetype-dev (>= 2.2.0) endif SYSTEM_STUFF += libpng ENABLE_NSS=y @@ -886,7 +886,7 @@ endif ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF))) - BUILD_DEPS += , libharfbuzz-dev (>= 0.9.42) + BUILD_DEPS += , libharfbuzz-dev (>= 2.1.0) endif ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF))) @@ -927,7 +927,7 @@ BUILD_DEPS += , libsane-dev endif ifneq (,$(filter libpng, $(SYSTEM_STUFF))) - BUILD_DEPS += , libpng-dev + BUILD_DEPS += , libpng-dev (>= 1.6) endif ifeq "$(ENABLE_CURL)" "y" @@ -3253,7 +3253,7 @@ if [ ! -e debian/$$i.bug-script.in ]; then \ printf "#!/bin/sh\n\n" > debian/$$i.bug-script; \ fi ;\ - echo "ucfq $$i" >> debian/$$i.bug-script; \ + echo "ucfq $$i >&3" >> debian/$$i.bug-script; \ fi ;\ done # generate .links files from *.in diff -Nru libreoffice-7.4.1~rc2/debian/source/lintian-overrides libreoffice-7.4.2~rc3/debian/source/lintian-overrides --- libreoffice-7.4.1~rc2/debian/source/lintian-overrides 2022-09-10 17:39:45.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/source/lintian-overrides 2022-09-26 12:07:23.000000000 +0000 @@ -4,7 +4,7 @@ libreoffice source: source-is-missing [odk/examples/DevelopersGuide/examples.html] libreoffice source: source-is-missing [odk/examples/examples.html] libreoffice source: source-is-missing [odk/index_online.html] -# similar, this is NOT minified. FIXME: use node-prismjs even though it's 1.26 while this is 1.28? +# similar, this is NOT minified. libreoffice source: source-is-missing [helpcontent2/help3xsl/prism.js] # no, it isn't. the one is always, the other is for tests ()! libreoffice source: redundant-build-prerequisites libmwaw-dev (>= 0.3.1), libmwaw-dev (>= 0.3.21) @@ -13,13 +13,13 @@ # tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip tarballs/dtoa-20180411.tgz # tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip tarballs/pdfium-5058.tar.bz2 # tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip tarballs/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz -libreoffice source: superfluous-file-pattern tarballs/*rhino* [debian/copyright:131] -libreoffice source: superfluous-file-pattern tarballs/*swingEx* [debian/copyright:163] -libreoffice source: superfluous-file-pattern tarballs/*xsltml* [debian/copyright:136] -libreoffice source: superfluous-file-pattern tarballs/dtoa* [debian/copyright:122] -libreoffice source: superfluous-file-pattern tarballs/pdfium* [debian/copyright:169] -libreoffice source: superfluous-file-pattern tarballs/skia* [debian/copyright:127] +libreoffice source: superfluous-file-pattern tarballs/*rhino* [debian/copyright:135] +libreoffice source: superfluous-file-pattern tarballs/*swingEx* [debian/copyright:167] +libreoffice source: superfluous-file-pattern tarballs/*xsltml* [debian/copyright:140] +libreoffice source: superfluous-file-pattern tarballs/dtoa* [debian/copyright:126] +libreoffice source: superfluous-file-pattern tarballs/pdfium* [debian/copyright:173] +libreoffice source: superfluous-file-pattern tarballs/skia* [debian/copyright:131] # patched in by us -libreoffice source: superfluous-file-pattern wizards/source/access2base/access2base.html [debian/copyright:199] +libreoffice source: superfluous-file-pattern wizards/source/access2base/access2base.html [debian/copyright:203] # two licenses.. -libreoffice source: duplicate-globbing-patterns helpcontent2/help3xsl/polyfills.js (lines 228 232) [debian/copyright] +libreoffice source: duplicate-globbing-patterns helpcontent2/help3xsl/polyfills.js (lines 232 236) [debian/copyright] diff -Nru libreoffice-7.4.1~rc2/debian/watch libreoffice-7.4.2~rc3/debian/watch --- libreoffice-7.4.1~rc2/debian/watch 2022-09-10 17:39:45.000000000 +0000 +++ libreoffice-7.4.2~rc3/debian/watch 2022-10-10 20:28:38.000000000 +0000 @@ -6,28 +6,28 @@ # Unfortunately it seems that download.documentfoundation.org/libreoffice/src gets the rcs too. But # download.documentfoundation.org/stable((\d.\d.\d) doesn't work since we then get no tarball information # as that doesn't ship the source... And I fail getting parsing of www.libreoffice.org/download to work -opts="compression=xz,pgpsigurlmangle=s/$/.asc/,uversionmangle=s/(\d.\d.\d).(\d)/$1/" \ - http://download.documentfoundation.org/@PACKAGE@/src/(\d.\d.\d)/@PACKAGE@-(\d.\d.\d).(\d).tar.xz debian - -opts="pgpsigurlmangle=s/$/.asc/,component=helpcontent2,uversionmangle=s/(\d.\d.\d).(\d)/$1/" \ - http://download.documentfoundation.org/@PACKAGE@/src/(\d.\d.\d)/@PACKAGE@-help-(\d.\d.\d).(\d).tar.xz same - -opts="pgpsigurlmangle=s/$/.asc/,component=translations,uversionmangle=s/(\d.\d.\d).(\d)/$1/" \ - http://download.documentfoundation.org/@PACKAGE@/src/(\d.\d.\d)/@PACKAGE@-translations-(\d.\d.\d).(\d).tar.xz same +#opts="compression=xz,pgpsigurlmangle=s/$/.asc/,uversionmangle=s/(\d.\d.\d).(\d)/$1/" \ +# http://download.documentfoundation.org/@PACKAGE@/src/(\d.\d.\d)/@PACKAGE@-(\d.\d.\d).(\d).tar.xz debian +# +#opts="pgpsigurlmangle=s/$/.asc/,component=helpcontent2,uversionmangle=s/(\d.\d.\d).(\d)/$1/" \ +# http://download.documentfoundation.org/@PACKAGE@/src/(\d.\d.\d)/@PACKAGE@-help-(\d.\d.\d).(\d).tar.xz same +# +#opts="pgpsigurlmangle=s/$/.asc/,component=translations,uversionmangle=s/(\d.\d.\d).(\d)/$1/" \ +# http://download.documentfoundation.org/@PACKAGE@/src/(\d.\d.\d)/@PACKAGE@-translations-(\d.\d.\d).(\d).tar.xz same # FIXME: Combine those to one part? # Problem: 6.4.3.2 -> 6.4.3~rc2 (rc added manually) # 7.0.0.0.alpha1 -> 7.0.0~alpha1 (.0. stripped and following value taken as-is) # rcs (and the last rc which will become final, see above) -#opts="compression=xz,pgpsigurlmangle=s/$/.asc/,versionmangle=s/(\d.\d.\d).(\d)/$1~rc$2/" \ -# https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-(\d.\d.\d).(\d).tar.xz debian -# -#opts="pgpsigurlmangle=s/$/.asc/,component=helpcontent2,versionmangle=s/(\d.\d.\d).(\d)/$1~rc$2/" \ -# https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-help-(\d.\d.\d).(\d).tar.xz same -# -#opts="pgpsigurlmangle=s/$/.asc/,component=translations,versionmangle=s/(\d.\d.\d).(\d)/$1~rc$2/" \ -# https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-translations-(\d.\d.\d).(\d).tar.xz same +opts="compression=xz,pgpsigurlmangle=s/$/.asc/,versionmangle=s/(\d.\d.\d).(\d)/$1~rc$2/" \ + https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-(\d.\d.\d).(\d).tar.xz debian + +opts="pgpsigurlmangle=s/$/.asc/,component=helpcontent2,versionmangle=s/(\d.\d.\d).(\d)/$1~rc$2/" \ + https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-help-(\d.\d.\d).(\d).tar.xz same + +opts="pgpsigurlmangle=s/$/.asc/,component=translations,versionmangle=s/(\d.\d.\d).(\d)/$1~rc$2/" \ + https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-translations-(\d.\d.\d).(\d).tar.xz same # alpha, beta #opts="compression=xz,pgpsigurlmangle=s/$/.asc/,versionmangle=s/(\d.\d.\d).(alpha|beta).(\d)/$1~$2$3/" \ diff -Nru libreoffice-7.4.1~rc2/download.lst libreoffice-7.4.2~rc3/download.lst --- libreoffice-7.4.1~rc2/download.lst 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/download.lst 2022-10-10 10:15:14.000000000 +0000 @@ -33,8 +33,8 @@ export COINMP_TARBALL := CoinMP-1.7.6.tgz export CPPUNIT_SHA256SUM := 89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz -export CURL_SHA256SUM := 2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4 -export CURL_TARBALL := curl-7.83.1.tar.xz +export CURL_SHA256SUM := 88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6 +export CURL_TARBALL := curl-7.85.0.tar.xz export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz export EPOXY_SHA256SUM := d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4 @@ -46,8 +46,8 @@ export ETONYEK_SHA256SUM := b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a export ETONYEK_VERSION_MICRO := 10 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b -export EXPAT_TARBALL := expat-2.4.6.tar.xz +export EXPAT_SHA256SUM := 6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354 +export EXPAT_TARBALL := expat-2.4.9.tar.xz export FIREBIRD_SHA256SUM := acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76 export FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2 export FONTCONFIG_SHA256SUM := a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c @@ -136,8 +136,8 @@ export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export LIBJPEG_TURBO_SHA256SUM := 09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.2.tar.gz -export LANGTAGREG_SHA256SUM := d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837 -export LANGTAGREG_TARBALL := language-subtag-registry-2021-12-29.tar.bz2 +export LANGTAGREG_SHA256SUM := e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00 +export LANGTAGREG_TARBALL := language-subtag-registry-2022-08-08.tar.bz2 export LCMS2_SHA256SUM := 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 export LCMS2_TARBALL := lcms2-2.12.tar.gz export LIBASSUAN_SHA256SUM := 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 @@ -158,13 +158,13 @@ export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.10.tar.xz export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483 export LIBTOMMATH_TARBALL := ltm-1.0.zip -export LIBWEBP_SHA256SUM := 7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6 -export LIBWEBP_TARBALL := libwebp-1.2.2.tar.gz +export LIBWEBP_SHA256SUM := 7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df +export LIBWEBP_TARBALL := libwebp-1.2.4.tar.gz export XMLSEC_SHA256SUM := 52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262 export XMLSEC_TARBALL := xmlsec1-1.2.34.tar.gz -export LIBXML_SHA256SUM := 60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee -export LIBXML_VERSION_MICRO := 14 -export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.xz +export LIBXML_SHA256SUM := d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265 +export LIBXML_VERSION_MICRO := 2 +export LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz export LIBXSLT_SHA256SUM := 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 export LIBXSLT_VERSION_MICRO := 35 export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz @@ -185,8 +185,8 @@ export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz -export NSS_SHA256SUM := 5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835 -export NSS_TARBALL := nss-3.79-with-nspr-4.34.tar.gz +export NSS_SHA256SUM := b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30 +export NSS_TARBALL := nss-3.83-with-nspr-4.34.1.tar.gz export ODFGEN_SHA256SUM := 55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625 export ODFGEN_VERSION_MICRO := 8 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.xz @@ -210,14 +210,14 @@ export LIBPNG_TARBALL := libpng-1.6.37.tar.xz export LIBTIFF_SHA256SUM := 49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1 export LIBTIFF_TARBALL := tiff-4.4.0.tar.xz -export POPPLER_SHA256SUM := 7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e -export POPPLER_TARBALL := poppler-22.01.0.tar.xz +export POPPLER_SHA256SUM := d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e +export POPPLER_TARBALL := poppler-22.09.0.tar.xz export POPPLER_DATA_SHA256SUM := 2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz export POSTGRESQL_SHA256SUM := 9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3 export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2 -export PYTHON_SHA256SUM := 6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57 -export PYTHON_TARBALL := Python-3.8.13.tar.xz +export PYTHON_SHA256SUM := 5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3 +export PYTHON_TARBALL := Python-3.8.14.tar.xz export QXP_SHA256SUM := e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c export QXP_TARBALL := libqxp-0.0.2.tar.xz export RAPTOR_SHA256SUM := ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed diff -Nru libreoffice-7.4.1~rc2/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx libreoffice-7.4.2~rc3/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx --- libreoffice-7.4.1~rc2/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1071,7 +1071,8 @@ // Limit the bitmap size to the visible area. basegfx::B2DRange bitmapRange(aRange); - bitmapRange.intersect(aExpandedViewInfo.getDiscreteViewport()); + if (!aExpandedViewInfo.getDiscreteViewport().isEmpty()) + bitmapRange.intersect(aExpandedViewInfo.getDiscreteViewport()); if (!bitmapRange.isEmpty()) { const tools::Rectangle aRect( @@ -1132,7 +1133,8 @@ // Limit the bitmap size to the visible area. basegfx::B2DRange bitmapRange(aRange); - bitmapRange.intersect(aExpandedViewInfo.getDiscreteViewport()); + if (!aExpandedViewInfo.getDiscreteViewport().isEmpty()) + bitmapRange.intersect(aExpandedViewInfo.getDiscreteViewport()); if (!bitmapRange.isEmpty()) { const tools::Rectangle aRect( diff -Nru libreoffice-7.4.1~rc2/embeddedobj/source/msole/olecomponent.cxx libreoffice-7.4.2~rc3/embeddedobj/source/msole/olecomponent.cxx --- libreoffice-7.4.1~rc2/embeddedobj/source/msole/olecomponent.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/embeddedobj/source/msole/olecomponent.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -589,11 +589,24 @@ HRESULT OleLoadSeh(LPSTORAGE pIStorage, LPVOID* ppObj) { HRESULT hr = E_FAIL; + // tdf#119039: there is a nasty bug in OleLoad, that may call an unpaired + // IUnknown::Release on pIStorage on STG_E_FILENOTFOUND: see + // https://developercommunity.visualstudio.com/t/10144795 + // Workaround it here to avoid crash in smart COM pointer destructor that + // would try to release already released object. Since we don't know if + // the bug appears each time STG_E_FILENOTFOUND is returned, this might + // potentially leak the storge object. + if (pIStorage) + pIStorage->AddRef(); + __try { hr = OleLoad(pIStorage, IID_IUnknown, nullptr, ppObj); } __except( EXCEPTION_EXECUTE_HANDLER ) { - return E_FAIL; + hr = E_FAIL; } + if (pIStorage && hr != STG_E_FILENOTFOUND) + pIStorage->Release(); + return hr; } } diff -Nru libreoffice-7.4.1~rc2/external/curl/asan-poison-nsspem.patch.0 libreoffice-7.4.2~rc3/external/curl/asan-poison-nsspem.patch.0 --- libreoffice-7.4.1~rc2/external/curl/asan-poison-nsspem.patch.0 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/curl/asan-poison-nsspem.patch.0 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ --- lib/vtls/nss.c +++ lib/vtls/nss.c -@@ -1891,7 +1891,7 @@ +@@ -1942,7 +1942,7 @@ PK11_SetPasswordFunc(nss_get_password); diff -Nru libreoffice-7.4.1~rc2/external/curl/clang-cl.patch.0 libreoffice-7.4.2~rc3/external/curl/clang-cl.patch.0 --- libreoffice-7.4.1~rc2/external/curl/clang-cl.patch.0 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/curl/clang-cl.patch.0 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ --- winbuild/MakefileBuild.vc +++ winbuild/MakefileBuild.vc -@@ -60,7 +60,7 @@ +@@ -52,7 +52,7 @@ !ELSE CC_NODEBUG = $(CC) /O2 /DNDEBUG CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd diff -Nru libreoffice-7.4.1~rc2/external/curl/configurable-z-option.patch.0 libreoffice-7.4.2~rc3/external/curl/configurable-z-option.patch.0 --- libreoffice-7.4.1~rc2/external/curl/configurable-z-option.patch.0 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/curl/configurable-z-option.patch.0 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ --- winbuild/MakefileBuild.vc.sav 2021-11-13 11:43:40.756226600 +0000 +++ winbuild/MakefileBuild.vc 2021-11-13 11:52:08.921692300 +0000 -@@ -45,7 +45,7 @@ +@@ -47,7 +47,7 @@ !IF "$(VC)"=="6" CC_NODEBUG = $(CC) /O2 /DNDEBUG @@ -9,7 +9,7 @@ CFLAGS = /I. /I../lib /I../include /nologo /W4 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL !ELSE CC_NODEBUG = $(CC) /O2 /DNDEBUG -@@ -62,7 +62,7 @@ +@@ -64,7 +64,7 @@ # Instead of id: just create an archive, that contains all objects LNKLIB = lib.exe diff -Nru libreoffice-7.4.1~rc2/external/curl/curl-msvc-disable-protocols.patch.1 libreoffice-7.4.2~rc3/external/curl/curl-msvc-disable-protocols.patch.1 --- libreoffice-7.4.1~rc2/external/curl/curl-msvc-disable-protocols.patch.1 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/curl/curl-msvc-disable-protocols.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -2,7 +2,7 @@ --- curl/lib/config-win32.h.orig 2017-08-09 16:43:29.464000000 +0200 +++ curl/lib/config-win32.h 2017-08-09 16:47:38.549200000 +0200 -@@ -733,4 +733,20 @@ +@@ -616,4 +616,20 @@ # define ENABLE_IPV6 1 #endif @@ -25,7 +25,7 @@ #endif /* HEADER_CURL_CONFIG_WIN32_H */ --- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 23:41:21.393200000 +0200 +++ curl/winbuild/MakefileBuild.vc 2017-10-23 23:34:16.028000000 +0200 -@@ -431,7 +431,7 @@ +@@ -562,7 +562,7 @@ EXE_OBJS = $(CURL_OBJS) $(CURL_DIROBJ)\curl.res diff -Nru libreoffice-7.4.1~rc2/external/curl/curl-msvc.patch.1 libreoffice-7.4.2~rc3/external/curl/curl-msvc.patch.1 --- libreoffice-7.4.1~rc2/external/curl/curl-msvc.patch.1 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/curl/curl-msvc.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -2,7 +2,7 @@ --- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 16:36:07.713550851 +0200 +++ curl/winbuild/MakefileBuild.vc 2017-10-23 16:38:19.301547594 +0200 -@@ -60,7 +60,7 @@ +@@ -52,7 +52,7 @@ !ELSE CC_NODEBUG = $(CC) /O2 /DNDEBUG CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd @@ -11,7 +11,7 @@ !ENDIF LFLAGS = /nologo /machine:$(MACHINE) -@@ -300,11 +300,11 @@ +@@ -426,11 +426,11 @@ # CURL_XX macros are for the curl.exe command !IF "$(DEBUG)"=="yes" diff -Nru libreoffice-7.4.1~rc2/external/curl/curl-msvc-zlib.patch.1 libreoffice-7.4.2~rc3/external/curl/curl-msvc-zlib.patch.1 --- libreoffice-7.4.1~rc2/external/curl/curl-msvc-zlib.patch.1 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/curl/curl-msvc-zlib.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -2,7 +2,7 @@ --- curl/winbuild/MakefileBuild.vc.orig2 2021-10-27 20:44:48.685237000 +0200 +++ curl/winbuild/MakefileBuild.vc 2021-10-27 20:47:23.792407400 +0200 -@@ -222,8 +222,9 @@ +@@ -244,8 +244,9 @@ ZLIB_LIB_DIR = $(ZLIB_PATH)\lib ZLIB_LFLAGS = $(ZLIB_LFLAGS) "/LIBPATH:$(ZLIB_LIB_DIR)" !ELSE diff -Nru libreoffice-7.4.1~rc2/external/curl/curl-nss.patch.1 libreoffice-7.4.2~rc3/external/curl/curl-nss.patch.1 --- libreoffice-7.4.1~rc2/external/curl/curl-nss.patch.1 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/curl/curl-nss.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -1,7 +1,7 @@ diff -ur curl.org/configure curl/configure --- curl.org/configure 2016-03-13 15:14:07.177000076 +0100 +++ curl/configure 2016-03-13 15:16:44.132000076 +0100 -@@ -28216,7 +28216,7 @@ +@@ -27985,7 +27985,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired libraries and compilation flags for NSS." >&5 printf "%s\n" "$as_me: WARNING: Using hard-wired libraries and compilation flags for NSS." >&2;} addld="-L$OPT_NSS/lib" diff -Nru libreoffice-7.4.1~rc2/external/curl/zlib.patch.0 libreoffice-7.4.2~rc3/external/curl/zlib.patch.0 --- libreoffice-7.4.1~rc2/external/curl/zlib.patch.0 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/curl/zlib.patch.0 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ --- configure +++ configure -@@ -22699,7 +22699,6 @@ +@@ -22808,7 +22808,6 @@ clean_CPPFLAGS=$CPPFLAGS clean_LDFLAGS=$LDFLAGS clean_LIBS=$LIBS @@ -8,7 +8,7 @@ # Check whether --with-zlib was given. if test ${with_zlib+y} -@@ -22709,6 +22708,7 @@ +@@ -22818,6 +22818,7 @@ if test "$OPT_ZLIB" = "no" ; then @@ -16,7 +16,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5 printf "%s\n" "$as_me: WARNING: zlib disabled" >&2;} else -@@ -22716,6 +22716,21 @@ +@@ -22825,6 +825,21 @@ OPT_ZLIB="" fi @@ -38,7 +38,7 @@ if test -z "$OPT_ZLIB" ; then if test -n "$PKG_CONFIG"; then -@@ -23011,6 +23026,7 @@ +@@ -23120,6 +23120,7 @@ printf "%s\n" "$as_me: found both libz and libz.h header" >&6;} curl_zlib_msg="enabled" fi @@ -48,7 +48,7 @@ if test x"$AMFIXLIB" = x1; then --- configure.ac +++ configure.ac -@@ -880,19 +880,30 @@ +@@ -1222,19 +1222,30 @@ clean_CPPFLAGS=$CPPFLAGS clean_LDFLAGS=$LDFLAGS clean_LIBS=$LIBS @@ -80,7 +80,7 @@ if test -z "$OPT_ZLIB" ; then CURL_CHECK_PKGCONFIG(zlib) -@@ -975,6 +986,7 @@ +@@ -1316,6 +1316,7 @@ AC_MSG_NOTICE([found both libz and libz.h header]) curl_zlib_msg="enabled" fi diff -Nru libreoffice-7.4.1~rc2/external/harfbuzz/62e803b36173fd096d7ad460dd1d1db9be542593.patch.1 libreoffice-7.4.2~rc3/external/harfbuzz/62e803b36173fd096d7ad460dd1d1db9be542593.patch.1 --- libreoffice-7.4.1~rc2/external/harfbuzz/62e803b36173fd096d7ad460dd1d1db9be542593.patch.1 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/harfbuzz/62e803b36173fd096d7ad460dd1d1db9be542593.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,29 @@ +From 62e803b36173fd096d7ad460dd1d1db9be542593 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Wed, 1 Jun 2022 07:38:21 -0600 +Subject: [PATCH] [sbix] Limit glyph extents + +Fixes https://github.com/harfbuzz/harfbuzz/issues/3557 +--- + src/hb-ot-color-sbix-table.hh | 6 ++++++ + test/fuzzing/fonts/sbix-extents.ttf | Bin 0 -> 582 bytes + 2 files changed, 6 insertions(+) + create mode 100644 test/fuzzing/fonts/sbix-extents.ttf + +diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh +index 9741ebd450..6efae43cda 100644 +--- a/src/hb-ot-color-sbix-table.hh ++++ b/src/hb-ot-color-sbix-table.hh +@@ -298,6 +298,12 @@ struct sbix + + const PNGHeader &png = *blob->as(); + ++ if (png.IHDR.height >= 65536 || png.IHDR.width >= 65536) ++ { ++ hb_blob_destroy (blob); ++ return false; ++ } ++ + extents->x_bearing = x_offset; + extents->y_bearing = png.IHDR.height + y_offset; + extents->width = png.IHDR.width; diff -Nru libreoffice-7.4.1~rc2/external/harfbuzz/UnpackedTarball_harfbuzz.mk libreoffice-7.4.2~rc3/external/harfbuzz/UnpackedTarball_harfbuzz.mk --- libreoffice-7.4.1~rc2/external/harfbuzz/UnpackedTarball_harfbuzz.mk 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/harfbuzz/UnpackedTarball_harfbuzz.mk 2022-10-10 10:15:14.000000000 +0000 @@ -20,6 +20,7 @@ # be negative": $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ external/harfbuzz/negativeadvance.patch \ + external/harfbuzz/62e803b36173fd096d7ad460dd1d1db9be542593.patch.1 \ )) # vim: set noet sw=4 ts=4: diff -Nru libreoffice-7.4.1~rc2/external/libwebp/Makefile.vc.patch libreoffice-7.4.2~rc3/external/libwebp/Makefile.vc.patch --- libreoffice-7.4.1~rc2/external/libwebp/Makefile.vc.patch 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/libwebp/Makefile.vc.patch 2022-10-10 10:15:14.000000000 +0000 @@ -25,7 +25,7 @@ +CCDEBUG = $(CC) $(NOLOGO) /Od /Zi /D_DEBUG /RTC1 CFLAGS = /I. /Isrc $(NOLOGO) /W3 /EHsc /c CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN - LDFLAGS = /LARGEADDRESSAWARE /MANIFEST /NXCOMPAT /DYNAMICBASE + LDFLAGS = /LARGEADDRESSAWARE /MANIFEST:EMBED /NXCOMPAT /DYNAMICBASE @@ -67,7 +67,7 @@ RTLIB = /MD RTLIBD = /MDd @@ -89,7 +89,7 @@ {src}.rc{$(DIROBJ)}.res: $(RC) /fo$@ $< -@@ -461,39 +461,39 @@ +@@ -469,41 +469,41 @@ # File-specific flag builds. Note batch rules take precedence over wildcards, # so for now name each file individually. $(DIROBJ)\examples\anim_diff.obj: examples\anim_diff.c @@ -122,6 +122,9 @@ {imageio}.c{$(DIROBJ)\imageio}.obj:: - $(CC) $(CFLAGS) /Fd$(DIROBJ)\imageio\ /Fo$(DIROBJ)\imageio\ $< + $(CC_) $(CFLAGS) /Fd$(DIROBJ)\imageio\ /Fo$(DIROBJ)\imageio\ $< + {sharpyuv}.c{$(DIROBJ)\sharpyuv}.obj:: +- $(CC) $(CFLAGS) /Fd$(DIROBJ)\sharpyuv\ /Fo$(DIROBJ)\sharpyuv\ $< ++ $(CC_) $(CFLAGS) /Fd$(DIROBJ)\sharpyuv\ /Fo$(DIROBJ)\sharpyuv\ $< {src\dec}.c{$(DIROBJ)\dec}.obj:: - $(CC) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$(DIROBJ)\dec\ $< + $(CC_) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$(DIROBJ)\dec\ $< diff -Nru libreoffice-7.4.1~rc2/external/libxml2/ExternalPackage_libxml2.mk libreoffice-7.4.2~rc3/external/libxml2/ExternalPackage_libxml2.mk --- libreoffice-7.4.1~rc2/external/libxml2/ExternalPackage_libxml2.mk 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/libxml2/ExternalPackage_libxml2.mk 2022-10-10 10:15:14.000000000 +0000 @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.$(LIBXML_VERSION_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.10.$(LIBXML_VERSION_MICRO))) endif endif # DISABLE_DYNLOADING diff -Nru libreoffice-7.4.1~rc2/external/libxml2/libxml2-android.patch libreoffice-7.4.2~rc3/external/libxml2/libxml2-android.patch --- libreoffice-7.4.1~rc2/external/libxml2/libxml2-android.patch 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/libxml2/libxml2-android.patch 2022-10-10 10:15:14.000000000 +0000 @@ -2,9 +2,9 @@ +++ misc/build/libxml2-2.7.6/Makefile.in @@ -1635,7 +1635,7 @@ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-recursive --all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \ + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-recursive +-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) \ +all-am: Makefile $(LTLIBRARIES) \ config.h install-binPROGRAMS: install-libLTLIBRARIES diff -Nru libreoffice-7.4.1~rc2/external/nss/nss-android.patch.1 libreoffice-7.4.2~rc3/external/nss/nss-android.patch.1 --- libreoffice-7.4.1~rc2/external/nss/nss-android.patch.1 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/nss/nss-android.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -74,7 +74,7 @@ diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk --- nss/nss/coreconf/arch.mk 2019-11-01 10:29:44.933245745 +0100 +++ nss/nss/coreconf/arch.mk 2019-11-01 10:32:04.347181076 +0100 -@@ -234,7 +234,15 @@ +@@ -213,7 +213,15 @@ # # this should be configurable from the user # diff -Nru libreoffice-7.4.1~rc2/external/nss/nss-bz1646594.patch.1 libreoffice-7.4.2~rc3/external/nss/nss-bz1646594.patch.1 --- libreoffice-7.4.1~rc2/external/nss/nss-bz1646594.patch.1 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/nss/nss-bz1646594.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -2,7 +2,7 @@ --- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200 +++ nss/nss/coreconf/arch.mk 2020-08-18 14:33:46.360320806 +0200 -@@ -116,8 +116,10 @@ +@@ -94,8 +94,10 @@ OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) endif KERNEL = Linux diff -Nru libreoffice-7.4.1~rc2/external/nss/nss.patch libreoffice-7.4.2~rc3/external/nss/nss.patch --- libreoffice-7.4.1~rc2/external/nss/nss.patch 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/nss/nss.patch 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ --- a/a/nspr/configure 2017-08-29 23:44:13.686045013 +0530 +++ b/b/nspr/configure 2017-08-29 23:46:53.774768655 +0530 -@@ -7034,7 +7034,7 @@ +@@ -6794,7 +6794,7 @@ PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC @@ -11,7 +11,7 @@ # combo is not yet good at debugging inlined --- a/nss.orig/nspr/pr/src/misc/prnetdb.c 2017-08-29 23:44:13.690045031 +0530 +++ b/nss/nspr/pr/src/misc/prnetdb.c 2017-08-29 23:47:03.810814019 +0530 -@@ -438,7 +438,7 @@ +@@ -441,7 +441,7 @@ char *buf = *bufp; PRIntn buflen = *buflenp; @@ -51,7 +51,7 @@ --- a/nss.org/nss/coreconf/arch.mk 2017-08-29 23:44:13.646044832 +0530 +++ b/nss/nss/coreconf/arch.mk 2017-08-29 23:45:51.494487134 +0530 -@@ -305,11 +305,17 @@ +@@ -284,11 +284,17 @@ OBJDIR_NAME_COMPILER = $(COMPILER_TAG) endif OBJDIR_NAME_BASE = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(OBJDIR_NAME_COMPILER)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG) @@ -83,7 +83,7 @@ # The default implementation strategy for FreeBSD is pthreads. --- a/nss.org/nss/coreconf/Linux.mk 2017-08-29 23:44:13.642044814 +0530 +++ b/nss/nss/coreconf/Linux.mk 2017-08-29 23:47:26.318915759 +0530 -@@ -147,7 +147,7 @@ +@@ -158,7 +158,7 @@ # Also, -z defs conflicts with Address Sanitizer, which emits relocations # against the libsanitizer runtime built into the main executable. ZDEFS_FLAG = -Wl,-z,defs @@ -92,7 +92,7 @@ LDFLAGS += $(ARCHFLAG) -z noexecstack # On Maemo, we need to use the -rpath-link flag for even the standard system -@@ -177,8 +177,13 @@ +@@ -188,8 +188,13 @@ endif endif @@ -108,7 +108,7 @@ # dependencies in the same directory where it resides. --- a/nss.org/nss/coreconf/rules.mk 2017-08-29 23:44:13.646044832 +0530 +++ b/nss/nss/coreconf/rules.mk 2017-08-29 23:47:37.442966042 +0530 -@@ -261,7 +261,7 @@ +@@ -176,7 +176,7 @@ ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) $(AR) $(subst /,\\,$(OBJS)) else @@ -119,7 +119,7 @@ --- a/nss.org/nss/coreconf/SunOS5.mk 2017-08-29 23:44:13.646044832 +0530 +++ b/nss/nss/coreconf/SunOS5.mk 2017-08-29 23:45:00.902258445 +0530 -@@ -48,8 +48,11 @@ +@@ -46,8 +46,11 @@ # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer endif else @@ -135,7 +135,7 @@ ifndef BUILD_OPT --- a/nss.org/nss/coreconf/Werror.mk 2017-08-29 23:44:13.646044832 +0530 +++ b/nss/nss/coreconf/Werror.mk 2017-08-29 23:44:23.994091608 +0530 -@@ -94,7 +94,8 @@ +@@ -96,7 +96,8 @@ endif #ndef NSS_ENABLE_WERROR ifeq ($(NSS_ENABLE_WERROR),1) diff -Nru libreoffice-7.4.1~rc2/external/poppler/disable-freetype.patch.1 libreoffice-7.4.2~rc3/external/poppler/disable-freetype.patch.1 --- libreoffice-7.4.1~rc2/external/poppler/disable-freetype.patch.1 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/poppler/disable-freetype.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,41 @@ +disable freetype dependent code + +--- poppler/poppler/Form.cc.orig 2022-09-14 15:46:48.588316681 +0200 ++++ poppler/poppler/Form.cc 2022-09-14 15:48:01.468274551 +0200 +@@ -46,7 +46,7 @@ + #include + #include + #include +-#include "goo/ft_utils.h" ++//#include "goo/ft_utils.h" + #include "goo/gmem.h" + #include "goo/gfile.h" + #include "goo/GooString.h" +@@ -77,8 +77,8 @@ + #include "fofi/FoFiTrueType.h" + #include "fofi/FoFiIdentifier.h" + +-#include +-#include FT_FREETYPE_H ++//#include ++//#include FT_FREETYPE_H + + // return a newly allocated char* containing an UTF16BE string of size length + char *pdfDocEncodingToUTF16(const std::string &orig, int *length) +@@ -2730,6 +2730,8 @@ + + Form::AddFontResult Form::addFontToDefaultResources(const std::string &filepath, int faceIndex, const std::string &fontFamily, const std::string &fontStyle) + { ++ return {}; ++#if 0 + if (!GooString::endsWith(filepath, ".ttf") && !GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath, ".otf")) { + error(errIO, -1, "We only support embedding ttf/ttc/otf fonts for now. The font file for {0:s} {1:s} was {2:s}", fontFamily.c_str(), fontStyle.c_str(), filepath.c_str()); + return {}; +@@ -2939,6 +2941,7 @@ + } + + return { dictFontName, fontDictRef }; ++#endif + } + + std::string Form::getFallbackFontForChar(Unicode uChar, const GfxFont &fontToEmulate) const diff -Nru libreoffice-7.4.1~rc2/external/poppler/gcc7-EntityInfo.patch.1 libreoffice-7.4.2~rc3/external/poppler/gcc7-EntityInfo.patch.1 --- libreoffice-7.4.1~rc2/external/poppler/gcc7-EntityInfo.patch.1 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/poppler/gcc7-EntityInfo.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,48 @@ +gcc 7.3.1 says: + +workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:42:34: error: function ‘X509CertificateInfo::EntityInfo& X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ + +--- poppler/poppler/CertificateInfo.h.orig 2022-09-14 19:32:12.426351385 +0200 ++++ poppler/poppler/CertificateInfo.h 2022-09-14 19:32:18.947347812 +0200 +@@ -70,7 +70,7 @@ + ~EntityInfo(); + + EntityInfo(EntityInfo &&) noexcept; +- EntityInfo &operator=(EntityInfo &&) noexcept; ++ EntityInfo &operator=(EntityInfo &&) /*noexcept*/; + + EntityInfo(const EntityInfo &) = delete; + EntityInfo &operator=(const EntityInfo &) = delete; +--- poppler/poppler/CertificateInfo.cc.orig 2022-09-14 19:31:10.225385467 +0200 ++++ poppler/poppler/CertificateInfo.cc 2022-09-14 19:31:12.572384182 +0200 +@@ -39,7 +39,7 @@ + + X509CertificateInfo::EntityInfo::EntityInfo(X509CertificateInfo::EntityInfo &&other) noexcept = default; + +-X509CertificateInfo::EntityInfo &X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo &&other) noexcept = default; ++X509CertificateInfo::EntityInfo &X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo &&other) /*noexcept*/ = default; + + X509CertificateInfo::X509CertificateInfo() : ku_extensions(KU_NONE), cert_version(-1), is_self_signed(false) { } + +--- poppler/poppler/GfxFont.cc.orig 2022-09-14 20:24:32.569607333 +0200 ++++ poppler/poppler/GfxFont.cc 2022-09-14 20:24:52.323596186 +0200 +@@ -180,7 +180,7 @@ + + GfxFontLoc::GfxFontLoc(GfxFontLoc &&other) noexcept = default; + +-GfxFontLoc &GfxFontLoc::operator=(GfxFontLoc &&other) noexcept = default; ++GfxFontLoc &GfxFontLoc::operator=(GfxFontLoc &&other) /*noexcept*/ = default; + + void GfxFontLoc::setPath(GooString *pathA) + { +--- poppler/poppler/GfxFont.h.orig 2022-09-14 20:24:30.784608340 +0200 ++++ poppler/poppler/GfxFont.h 2022-09-14 20:25:08.850586861 +0200 +@@ -124,7 +124,7 @@ + GfxFontLoc(const GfxFontLoc &) = delete; + GfxFontLoc(GfxFontLoc &&) noexcept; + GfxFontLoc &operator=(const GfxFontLoc &) = delete; +- GfxFontLoc &operator=(GfxFontLoc &&other) noexcept; ++ GfxFontLoc &operator=(GfxFontLoc &&other) /*noexcept*/; + + // Set the 'path' string from a GooString on the heap. + // Ownership of the object is taken. diff -Nru libreoffice-7.4.1~rc2/external/poppler/pch.patch.0 libreoffice-7.4.2~rc3/external/poppler/pch.patch.0 --- libreoffice-7.4.1~rc2/external/poppler/pch.patch.0 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/poppler/pch.patch.0 2022-10-10 10:15:14.000000000 +0000 @@ -2,10 +2,10 @@ +++ ./goo/gdir.h 2021-11-03 15:16:04.306277081 +0100 @@ -37,6 +37,8 @@ - #include "poppler-config.h" + #include +#include "gfile.h" + class GooString; - //------------------------------------------------------------------------ + #if defined(_WIN32) diff -Nru libreoffice-7.4.1~rc2/external/poppler/poppler-config.patch.1 libreoffice-7.4.2~rc3/external/poppler/poppler-config.patch.1 --- libreoffice-7.4.1~rc2/external/poppler/poppler-config.patch.1 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/poppler/poppler-config.patch.1 2022-10-10 10:15:14.000000000 +0000 @@ -16,7 +16,7 @@ index 0fbd336a..451213f8 100644 --- /dev/null +++ b/config.h -@@ -0,0 +1,223 @@ +@@ -0,0 +1,220 @@ +/* config.h. Generated from config.h.cmake by cmake. */ + +/* Build against libcurl. */ @@ -105,9 +105,6 @@ +#define HAVE_TIMEGM 1 +#endif + -+/* Define if you have the iconv() function and it works. */ -+/* #undef HAVE_ICONV */ -+ +/* Define to 1 if you have the `z' library (-lz). */ +/* #undef HAVE_LIBZ */ + @@ -176,7 +173,7 @@ +#define PACKAGE_NAME "poppler" + +/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "poppler 21.11.0" ++#define PACKAGE_STRING "poppler 22.09.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "poppler" @@ -185,7 +182,7 @@ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ -+#define PACKAGE_VERSION "21.11.0" ++#define PACKAGE_VERSION "22.09.0" + +/* Poppler data dir */ +#define POPPLER_DATADIR "/usr/local/share/poppler" @@ -203,7 +200,7 @@ +/* #undef USE_FLOAT */ + +/* Version number of package */ -+#define VERSION "21.11.0" ++#define VERSION "22.09.0" + +#if defined(__APPLE__) +#elif defined (_WIN32) @@ -229,7 +226,7 @@ +#define popen _popen +#define pclose _pclose +#define strncasecmp _strnicmp -+// error C4005: "strcasecmp": macro redefinition #define strcasecmp _stricmp ++#define strcasecmp _stricmp +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ @@ -250,7 +247,7 @@ +// +// poppler-config.h +// -+// Copyright 1996-2011 Glyph & Cog, LLC ++// Copyright 1996-2011, 2022 Glyph & Cog, LLC +// +//======================================================================== + @@ -284,7 +281,7 @@ + +/* Defines the poppler version. */ +#ifndef POPPLER_VERSION -+#define POPPLER_VERSION "21.11.0" ++#define POPPLER_VERSION "22.09.0" +#endif + +/* Use single precision arithmetic in the Splash backend */ @@ -376,8 +373,8 @@ +//------------------------------------------------------------------------ + +// copyright notice -+#define popplerCopyright "Copyright 2005-2021 The Poppler Developers - http://poppler.freedesktop.org" -+#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" ++#define popplerCopyright "Copyright 2005-2022 The Poppler Developers - http://poppler.freedesktop.org" ++#define xpdfCopyright "Copyright 1996-2011, 2022 Glyph & Cog, LLC" + +//------------------------------------------------------------------------ +// Win32 stuff @@ -436,9 +433,9 @@ + +#include "poppler-global.h" + -+#define POPPLER_VERSION "21.11.0" -+#define POPPLER_VERSION_MAJOR 21 -+#define POPPLER_VERSION_MINOR 11 ++#define POPPLER_VERSION "22.09.0" ++#define POPPLER_VERSION_MAJOR 22 ++#define POPPLER_VERSION_MINOR 9 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler diff -Nru libreoffice-7.4.1~rc2/external/poppler/UnpackedTarball_poppler.mk libreoffice-7.4.2~rc3/external/poppler/UnpackedTarball_poppler.mk --- libreoffice-7.4.1~rc2/external/poppler/UnpackedTarball_poppler.mk 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/poppler/UnpackedTarball_poppler.mk 2022-10-10 10:15:14.000000000 +0000 @@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/poppler-config.patch.1 \ external/poppler/pch.patch.0 \ + external/poppler/disable-freetype.patch.1 \ + external/poppler/gcc7-EntityInfo.patch.1 \ )) ifneq ($(filter -fsanitize=%,$(CC)),) diff -Nru libreoffice-7.4.1~rc2/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch libreoffice-7.4.2~rc3/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch --- libreoffice-7.4.1~rc2/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,29 @@ +From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 8 Aug 2022 10:50:09 -0700 +Subject: [PATCH] Fix extra field processing bug that dereferences NULL + state->head. + +The recent commit to fix a gzip header extra field processing bug +introduced the new bug fixed here. +--- + inflate.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/inflate.c b/inflate.c +index 7a7289749..2a3c4fe98 100644 +--- a/inflate.c ++++ b/inflate.c +@@ -763,10 +763,10 @@ int flush; + copy = state->length; + if (copy > have) copy = have; + if (copy) { +- len = state->head->extra_len - state->length; + if (state->head != Z_NULL && + state->head->extra != Z_NULL && +- len < state->head->extra_max) { ++ (len = state->head->extra_len - state->length) < ++ state->head->extra_max) { + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); diff -Nru libreoffice-7.4.1~rc2/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch libreoffice-7.4.2~rc3/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch --- libreoffice-7.4.1~rc2/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,32 @@ +From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Sat, 30 Jul 2022 15:51:11 -0700 +Subject: [PATCH] Fix a bug when getting a gzip header extra field with + inflate(). + +If the extra field was larger than the space the user provided with +inflateGetHeader(), and if multiple calls of inflate() delivered +the extra header data, then there could be a buffer overflow of the +provided space. This commit assures that provided space is not +exceeded. +--- + inflate.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/inflate.c b/inflate.c +index 7be8c6366..7a7289749 100644 +--- a/inflate.c ++++ b/inflate.c +@@ -763,9 +763,10 @@ int flush; + copy = state->length; + if (copy > have) copy = have; + if (copy) { ++ len = state->head->extra_len - state->length; + if (state->head != Z_NULL && +- state->head->extra != Z_NULL) { +- len = state->head->extra_len - state->length; ++ state->head->extra != Z_NULL && ++ len < state->head->extra_max) { + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); diff -Nru libreoffice-7.4.1~rc2/external/zlib/UnpackedTarball_zlib.mk libreoffice-7.4.2~rc3/external/zlib/UnpackedTarball_zlib.mk --- libreoffice-7.4.1~rc2/external/zlib/UnpackedTarball_zlib.mk 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/external/zlib/UnpackedTarball_zlib.mk 2022-10-10 10:15:14.000000000 +0000 @@ -16,6 +16,11 @@ cp $(addsuffix .c,adler32 compress crc32 deflate inffast inflate inftrees trees zutil) x64 \ )) -$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0)) +$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,zlib,\ + external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch \ + external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch \ +)) # vim: set noet sw=4 ts=4: diff -Nru libreoffice-7.4.1~rc2/filter/source/pdf/pdffilter.cxx libreoffice-7.4.2~rc3/filter/source/pdf/pdffilter.cxx --- libreoffice-7.4.1~rc2/filter/source/pdf/pdffilter.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/filter/source/pdf/pdffilter.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -89,9 +89,10 @@ = comphelper::JsonToPropertyValues(aFilterOptions.toUtf8()); aFilterData = comphelper::containerToSequence(aData); } - catch (const boost::property_tree::json_parser::json_parser_error&) + catch (const boost::property_tree::json_parser::json_parser_error& e) { // This wasn't a valid json; maybe came from import filter (tdf#150846) + SAL_WARN("filter.pdf", "error parsing FilterOptions: " << e.message()); } } diff -Nru libreoffice-7.4.1~rc2/formula/source/core/api/FormulaCompiler.cxx libreoffice-7.4.2~rc3/formula/source/core/api/FormulaCompiler.cxx --- libreoffice-7.4.1~rc2/formula/source/core/api/FormulaCompiler.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/formula/source/core/api/FormulaCompiler.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -817,43 +817,52 @@ FormulaCompiler::OpCodeMapPtr FormulaCompiler::GetOpCodeMap( const sal_Int32 nLanguage ) const { + const bool bTemporary = !HasOpCodeMap(nLanguage); + OpCodeMapPtr xMap = GetFinalOpCodeMap(nLanguage); + if (bTemporary) + const_cast(this)->DestroyOpCodeMap(nLanguage); + return xMap; +} + +FormulaCompiler::OpCodeMapPtr FormulaCompiler::GetFinalOpCodeMap( const sal_Int32 nLanguage ) const +{ FormulaCompiler::OpCodeMapPtr xMap; using namespace sheet; switch (nLanguage) { case FormulaLanguage::ODFF : if (!mxSymbolsODFF) - InitSymbolsODFF(); + InitSymbolsODFF( InitSymbols::INIT); xMap = mxSymbolsODFF; break; case FormulaLanguage::ODF_11 : if (!mxSymbolsPODF) - InitSymbolsPODF(); + InitSymbolsPODF( InitSymbols::INIT); xMap = mxSymbolsPODF; break; case FormulaLanguage::ENGLISH : if (!mxSymbolsEnglish) - InitSymbolsEnglish(); + InitSymbolsEnglish( InitSymbols::INIT); xMap = mxSymbolsEnglish; break; case FormulaLanguage::NATIVE : if (!mxSymbolsNative) - InitSymbolsNative(); + InitSymbolsNative( InitSymbols::INIT); xMap = mxSymbolsNative; break; case FormulaLanguage::XL_ENGLISH: if (!mxSymbolsEnglishXL) - InitSymbolsEnglishXL(); + InitSymbolsEnglishXL( InitSymbols::INIT); xMap = mxSymbolsEnglishXL; break; case FormulaLanguage::OOXML: if (!mxSymbolsOOXML) - InitSymbolsOOXML(); + InitSymbolsOOXML( InitSymbols::INIT); xMap = mxSymbolsOOXML; break; case FormulaLanguage::API : if (!mxSymbolsAPI) - InitSymbolsAPI(); + InitSymbolsAPI( InitSymbols::INIT); xMap = mxSymbolsAPI; break; default: @@ -862,6 +871,62 @@ return xMap; } +void FormulaCompiler::DestroyOpCodeMap( const sal_Int32 nLanguage ) +{ + using namespace sheet; + switch (nLanguage) + { + case FormulaLanguage::ODFF : + InitSymbolsODFF( InitSymbols::DESTROY); + break; + case FormulaLanguage::ODF_11 : + InitSymbolsPODF( InitSymbols::DESTROY); + break; + case FormulaLanguage::ENGLISH : + InitSymbolsEnglish( InitSymbols::DESTROY); + break; + case FormulaLanguage::NATIVE : + InitSymbolsNative( InitSymbols::DESTROY); + break; + case FormulaLanguage::XL_ENGLISH: + InitSymbolsEnglishXL( InitSymbols::DESTROY); + break; + case FormulaLanguage::OOXML: + InitSymbolsOOXML( InitSymbols::DESTROY); + break; + case FormulaLanguage::API : + InitSymbolsAPI( InitSymbols::DESTROY); + break; + default: + ; // nothing + } +} + +bool FormulaCompiler::HasOpCodeMap( const sal_Int32 nLanguage ) const +{ + using namespace sheet; + switch (nLanguage) + { + case FormulaLanguage::ODFF : + return InitSymbolsODFF( InitSymbols::ASK); + case FormulaLanguage::ODF_11 : + return InitSymbolsPODF( InitSymbols::ASK); + case FormulaLanguage::ENGLISH : + return InitSymbolsEnglish( InitSymbols::ASK); + case FormulaLanguage::NATIVE : + return InitSymbolsNative( InitSymbols::ASK); + case FormulaLanguage::XL_ENGLISH: + return InitSymbolsEnglishXL( InitSymbols::ASK); + case FormulaLanguage::OOXML: + return InitSymbolsOOXML( InitSymbols::ASK); + case FormulaLanguage::API : + return InitSymbolsAPI( InitSymbols::ASK); + default: + ; // nothing + } + return false; +} + OUString FormulaCompiler::FindAddInFunction( const OUString& /*rUpperName*/, bool /*bLocalFirst*/ ) const { return OUString(); @@ -898,12 +963,16 @@ return xMap; } -static void lcl_fillNativeSymbols( FormulaCompiler::NonConstOpCodeMapPtr& xMap, bool bDestroy = false ) +static bool lcl_fillNativeSymbols( FormulaCompiler::NonConstOpCodeMapPtr& xMap, FormulaCompiler::InitSymbols eWhat = FormulaCompiler::InitSymbols::INIT ) { static OpCodeMapData aSymbolMap; osl::MutexGuard aGuard(&aSymbolMap.maMtx); - if ( bDestroy ) + if (eWhat == FormulaCompiler::InitSymbols::ASK) + { + return bool(aSymbolMap.mxSymbolMap); + } + else if (eWhat == FormulaCompiler::InitSymbols::DESTROY) { aSymbolMap.mxSymbolMap.reset(); } @@ -919,6 +988,8 @@ } xMap = aSymbolMap.mxSymbolMap; + + return true; } const OUString& FormulaCompiler::GetNativeSymbol( OpCode eOp ) @@ -933,54 +1004,80 @@ return GetNativeSymbol(eOp)[0]; } -void FormulaCompiler::InitSymbolsNative() const +bool FormulaCompiler::InitSymbolsNative( FormulaCompiler::InitSymbols eWhat ) const { - lcl_fillNativeSymbols( mxSymbolsNative); + return lcl_fillNativeSymbols( mxSymbolsNative, eWhat); } -void FormulaCompiler::InitSymbolsEnglish() const +bool FormulaCompiler::InitSymbolsEnglish( FormulaCompiler::InitSymbols eWhat ) const { static OpCodeMapData aMap; osl::MutexGuard aGuard(&aMap.maMtx); - if (!aMap.mxSymbolMap) + if (eWhat == InitSymbols::ASK) + return bool(aMap.mxSymbolMap); + else if (eWhat == InitSymbols::DESTROY) + aMap.mxSymbolMap.reset(); + else if (!aMap.mxSymbolMap) loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH, FormulaGrammar::GRAM_ENGLISH, aMap.mxSymbolMap); mxSymbolsEnglish = aMap.mxSymbolMap; + return true; } -void FormulaCompiler::InitSymbolsPODF() const +bool FormulaCompiler::InitSymbolsPODF( FormulaCompiler::InitSymbols eWhat ) const { static OpCodeMapData aMap; osl::MutexGuard aGuard(&aMap.maMtx); - if (!aMap.mxSymbolMap) + if (eWhat == InitSymbols::ASK) + return bool(aMap.mxSymbolMap); + else if (eWhat == InitSymbols::DESTROY) + aMap.mxSymbolMap.reset(); + else if (!aMap.mxSymbolMap) loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF, FormulaGrammar::GRAM_PODF, aMap.mxSymbolMap, SeparatorType::RESOURCE_BASE); mxSymbolsPODF = aMap.mxSymbolMap; + return true; } -void FormulaCompiler::InitSymbolsAPI() const +bool FormulaCompiler::InitSymbolsAPI( FormulaCompiler::InitSymbols eWhat ) const { static OpCodeMapData aMap; osl::MutexGuard aGuard(&aMap.maMtx); - if (!aMap.mxSymbolMap) + if (eWhat == InitSymbols::ASK) + return bool(aMap.mxSymbolMap); + else if (eWhat == InitSymbols::DESTROY) + aMap.mxSymbolMap.reset(); + else if (!aMap.mxSymbolMap) loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH_API, FormulaGrammar::GRAM_API, aMap.mxSymbolMap, SeparatorType::RESOURCE_BASE); mxSymbolsAPI = aMap.mxSymbolMap; + return true; } -void FormulaCompiler::InitSymbolsODFF() const +bool FormulaCompiler::InitSymbolsODFF( FormulaCompiler::InitSymbols eWhat ) const { static OpCodeMapData aMap; osl::MutexGuard aGuard(&aMap.maMtx); - if (!aMap.mxSymbolMap) + if (eWhat == InitSymbols::ASK) + return bool(aMap.mxSymbolMap); + else if (eWhat == InitSymbols::DESTROY) + aMap.mxSymbolMap.reset(); + else if (!aMap.mxSymbolMap) loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF, FormulaGrammar::GRAM_ODFF, aMap.mxSymbolMap, SeparatorType::RESOURCE_BASE); mxSymbolsODFF = aMap.mxSymbolMap; + return true; } -void FormulaCompiler::InitSymbolsEnglishXL() const +bool FormulaCompiler::InitSymbolsEnglishXL( FormulaCompiler::InitSymbols eWhat ) const { static OpCodeMapData aMap; osl::MutexGuard aGuard(&aMap.maMtx); - if (!aMap.mxSymbolMap) + if (eWhat == InitSymbols::ASK) + return bool(aMap.mxSymbolMap); + else if (eWhat == InitSymbols::DESTROY) + aMap.mxSymbolMap.reset(); + else if (!aMap.mxSymbolMap) loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH, FormulaGrammar::GRAM_ENGLISH, aMap.mxSymbolMap); mxSymbolsEnglishXL = aMap.mxSymbolMap; + if (eWhat != InitSymbols::INIT) + return true; // TODO: For now, just replace the separators to the Excel English // variants. Later, if we want to properly map Excel functions with Calc @@ -988,15 +1085,22 @@ mxSymbolsEnglishXL->putOpCode( OUString(','), ocSep, nullptr); mxSymbolsEnglishXL->putOpCode( OUString(','), ocArrayColSep, nullptr); mxSymbolsEnglishXL->putOpCode( OUString(';'), ocArrayRowSep, nullptr); + + return true; } -void FormulaCompiler::InitSymbolsOOXML() const +bool FormulaCompiler::InitSymbolsOOXML( FormulaCompiler::InitSymbols eWhat ) const { static OpCodeMapData aMap; osl::MutexGuard aGuard(&aMap.maMtx); - if (!aMap.mxSymbolMap) + if (eWhat == InitSymbols::ASK) + return bool(aMap.mxSymbolMap); + else if (eWhat == InitSymbols::DESTROY) + aMap.mxSymbolMap.reset(); + else if (!aMap.mxSymbolMap) loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML, FormulaGrammar::GRAM_OOXML, aMap.mxSymbolMap, SeparatorType::RESOURCE_BASE); mxSymbolsOOXML = aMap.mxSymbolMap; + return true; } @@ -1099,7 +1203,7 @@ if ( nLen > 1 && rStr[0] == '\'' && rStr[ nLen-1 ] == '\'' ) { rStr = rStr.copy( 1, nLen-2 ); - rStr = rStr.replaceAll( "\\\'", "\'" ); + rStr = rStr.replaceAll( "''", "'" ); return true; } return false; @@ -1201,7 +1305,16 @@ } } - // TODO: maybe copy the external maps too? + // This was meant to copy to native map that does not have AddIn symbols + // but needs them from the source map. It is unclear what should happen if + // the destination already had externals, so do it only if it doesn't. + if (!hasExternals()) + { + maExternalHashMap = r.maExternalHashMap; + maReverseExternalHashMap = r.maReverseExternalHashMap; + mbCore = r.mbCore; + mbEnglish = r.mbEnglish; + } } @@ -2588,7 +2701,7 @@ void FormulaCompiler::ResetNativeSymbols() { NonConstOpCodeMapPtr xSymbolsNative; - lcl_fillNativeSymbols( xSymbolsNative, true); + lcl_fillNativeSymbols( xSymbolsNative, InitSymbols::DESTROY); lcl_fillNativeSymbols( xSymbolsNative); } diff -Nru libreoffice-7.4.1~rc2/fpicker/source/office/iodlg.cxx libreoffice-7.4.2~rc3/fpicker/source/office/iodlg.cxx --- libreoffice-7.4.1~rc2/fpicker/source/office/iodlg.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/fpicker/source/office/iodlg.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -467,7 +467,7 @@ { // save window state SvtViewOptions aDlgOpt( EViewType::Dialog, m_xImpl->m_aIniKey ); - aDlgOpt.SetWindowState(OStringToOUString(m_xDialog->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_UTF8)); + aDlgOpt.SetWindowState(OStringToOUString(m_xDialog->get_window_state(WindowStateMask::All), RTL_TEXTENCODING_UTF8)); OUString sUserData = m_xFileView->GetConfigString(); aDlgOpt.SetUserItem( "UserData", Any( sUserData ) ); diff -Nru libreoffice-7.4.1~rc2/fpicker/source/office/RemoteFilesDialog.cxx libreoffice-7.4.2~rc3/fpicker/source/office/RemoteFilesDialog.cxx --- libreoffice-7.4.1~rc2/fpicker/source/office/RemoteFilesDialog.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/fpicker/source/office/RemoteFilesDialog.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -124,7 +124,7 @@ if( !m_sIniKey.isEmpty() ) { SvtViewOptions aDlgOpt( EViewType::Dialog, m_sIniKey ); - aDlgOpt.SetWindowState(OStringToOUString(m_xDialog->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_UTF8)); + aDlgOpt.SetWindowState(OStringToOUString(m_xDialog->get_window_state(WindowStateMask::All), RTL_TEXTENCODING_UTF8)); Size aSize(m_xDialog->get_size()); diff -Nru libreoffice-7.4.1~rc2/framework/source/helper/persistentwindowstate.cxx libreoffice-7.4.2~rc3/framework/source/helper/persistentwindowstate.cxx --- libreoffice-7.4.1~rc2/framework/source/helper/persistentwindowstate.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/framework/source/helper/persistentwindowstate.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -215,7 +215,7 @@ // check for system window is necessary to guarantee correct pointer cast! if ( pWindow && pWindow->IsSystemWindow() ) { - vcl::WindowDataMask const nMask = vcl::WindowDataMask::All & ~vcl::WindowDataMask::Minimized; + WindowStateMask const nMask = WindowStateMask::All & ~WindowStateMask::Minimized; sWindowState = OStringToOUString( static_cast(pWindow.get())->GetWindowState(nMask), RTL_TEXTENCODING_UTF8); diff -Nru libreoffice-7.4.1~rc2/.gitreview libreoffice-7.4.2~rc3/.gitreview --- libreoffice-7.4.1~rc2/.gitreview 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/.gitreview 2022-10-10 10:15:14.000000000 +0000 @@ -3,5 +3,5 @@ port=29418 project=core defaultremote=logerrit -defaultbranch=libreoffice-7-4-1 +defaultbranch=libreoffice-7-4-2 diff -Nru libreoffice-7.4.1~rc2/i18npool/source/transliteration/fullwidthToHalfwidth.cxx libreoffice-7.4.2~rc3/i18npool/source/transliteration/fullwidthToHalfwidth.cxx --- libreoffice-7.4.1~rc2/i18npool/source/transliteration/fullwidthToHalfwidth.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/i18npool/source/transliteration/fullwidthToHalfwidth.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -50,7 +50,7 @@ const OUString& newStr = i18nutil::widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, pOffset); // One to One mapping - return transliteration_OneToOne::transliterateImpl( newStr, 0, newStr.getLength(), pOffset); + return transliteration_OneToOne::transliterateImpl( newStr, 0, newStr.getLength(), nullptr); } sal_Unicode SAL_CALL diff -Nru libreoffice-7.4.1~rc2/include/avmedia/mediaitem.hxx libreoffice-7.4.2~rc3/include/avmedia/mediaitem.hxx --- libreoffice-7.4.1~rc2/include/avmedia/mediaitem.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/avmedia/mediaitem.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -33,6 +33,7 @@ namespace com::sun::star::frame { class XModel; } namespace com::sun::star::io { class XInputStream; } namespace com::sun::star::io { class XStream; } +namespace com::sun::star::text { struct GraphicCrop; } class Graphic; enum class AVMediaSetMask @@ -48,11 +49,12 @@ URL = 0x080, MIME_TYPE = 0x100, GRAPHIC = 0x200, - ALL = 0x3ff, + CROP = 0x400, + ALL = 0x7ff, }; namespace o3tl { - template<> struct typed_flags : is_typed_flags {}; + template<> struct typed_flags : is_typed_flags {}; } @@ -120,6 +122,8 @@ OUString getMimeType() const; bool setGraphic(const Graphic& rGraphic); const Graphic & getGraphic() const; + bool setCrop(const css::text::GraphicCrop& rCrop); + const css::text::GraphicCrop& getCrop() const; const OUString& getTempURL() const; const OUString& getReferer() const; diff -Nru libreoffice-7.4.1~rc2/include/comphelper/SelectionMultiplex.hxx libreoffice-7.4.2~rc3/include/comphelper/SelectionMultiplex.hxx --- libreoffice-7.4.1~rc2/include/comphelper/SelectionMultiplex.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/comphelper/SelectionMultiplex.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -80,6 +80,8 @@ void unlock(); /// get the lock count sal_Int32 locked() const { return m_nLockCount; } + + void dispose(); }; diff -Nru libreoffice-7.4.1~rc2/include/drawinglayer/geometry/viewinformation2d.hxx libreoffice-7.4.2~rc3/include/drawinglayer/geometry/viewinformation2d.hxx --- libreoffice-7.4.1~rc2/include/drawinglayer/geometry/viewinformation2d.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/drawinglayer/geometry/viewinformation2d.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -121,6 +121,7 @@ /// data access const basegfx::B2DHomMatrix& getObjectTransformation() const; const basegfx::B2DHomMatrix& getViewTransformation() const; + /// Empty viewport means everything is visible. const basegfx::B2DRange& getViewport() const; double getViewTime() const; const css::uno::Reference& getVisualizedPage() const; @@ -130,6 +131,7 @@ const basegfx::B2DHomMatrix& getInverseObjectToViewTransformation() const; /// On-demand prepared Viewport in discrete units for convenience + /// Empty viewport means everything is visible. const basegfx::B2DRange& getDiscreteViewport() const; /** support reduced DisplayQuality, PropertyName is 'ReducedDisplayQuality'. This diff -Nru libreoffice-7.4.1~rc2/include/formula/FormulaCompiler.hxx libreoffice-7.4.2~rc3/include/formula/FormulaCompiler.hxx --- libreoffice-7.4.1~rc2/include/formula/FormulaCompiler.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/formula/FormulaCompiler.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -196,13 +196,56 @@ typedef std::shared_ptr< const OpCodeMap > OpCodeMapPtr; typedef std::shared_ptr< OpCodeMap > NonConstOpCodeMapPtr; +protected: + /** Get finalized OpCodeMap for formula language. + + Creates/returns a singleton instance of an OpCodeMap that contains + external AddIn mappings if the derived class supports them. Do not call + at this base class as it results in a permanent mapping without AddIns + even for derived classes (unless it is for the implementation of the + temporary GetOpCodeMap()). + + @param nLanguage + One of css::sheet::FormulaLanguage constants. + @return Map for nLanguage. If nLanguage is unknown, a NULL map is returned. + */ + OpCodeMapPtr GetFinalOpCodeMap( const sal_Int32 nLanguage ) const; + +public: /** Get OpCodeMap for formula language. + + Returns either the finalized OpCodeMap (created by GetFinalOpCodeMap() + of a derived class) for nLanguage if there is such, or if not then a + temporary map of which its singleton is reset immediately and the + temporary will get destroyed by the caller's scope. A temporary map + created at this base class does *not* contain AddIn mappings. + @param nLanguage One of css::sheet::FormulaLanguage constants. @return Map for nLanguage. If nLanguage is unknown, a NULL map is returned. */ OpCodeMapPtr GetOpCodeMap( const sal_Int32 nLanguage ) const; + /** Destroy the singleton OpCodeMap for formula language. + + This unconditionally destroys the underlying singleton instance of the + map to be reinitialized again later on the next GetOpCodeMap() call. + Use if the base class FormulaCompiler::GetOpCodeMap() was called and + created the map (i.e. HasOpCodeMap() before returned false) and later a + derived class like ScCompiler shall initialize it including AddIns. + + @param nLanguage + One of css::sheet::FormulaLanguage constants. + */ + void DestroyOpCodeMap( const sal_Int32 nLanguage ); + + /** Whether the singleton OpCodeMap for formula language exists already. + + @param nLanguage + One of css::sheet::FormulaLanguage constants. + */ + bool HasOpCodeMap( const sal_Int32 nLanguage ) const; + /** Create an internal symbol map from API mapping. @param bEnglish Use English number parser / formatter instead of native. @@ -370,14 +413,22 @@ bool mbComputeII; // whether to attempt computing implicit intersection ranges while building the RPN array. bool mbMatrixFlag; // whether the formula is a matrix formula (needed for II computation) +public: + enum InitSymbols + { + ASK = 0, + INIT, + DESTROY + }; + private: - void InitSymbolsNative() const; /// only SymbolsNative, on first document creation - void InitSymbolsEnglish() const; /// only SymbolsEnglish, maybe later - void InitSymbolsPODF() const; /// only SymbolsPODF, on demand - void InitSymbolsAPI() const; /// only SymbolsAPI, on demand - void InitSymbolsODFF() const; /// only SymbolsODFF, on demand - void InitSymbolsEnglishXL() const; /// only SymbolsEnglishXL, on demand - void InitSymbolsOOXML() const; /// only SymbolsOOXML, on demand + bool InitSymbolsNative( InitSymbols ) const; /// only SymbolsNative, on first document creation + bool InitSymbolsEnglish( InitSymbols ) const; /// only SymbolsEnglish, maybe later + bool InitSymbolsPODF( InitSymbols ) const; /// only SymbolsPODF, on demand + bool InitSymbolsAPI( InitSymbols ) const; /// only SymbolsAPI, on demand + bool InitSymbolsODFF( InitSymbols ) const; /// only SymbolsODFF, on demand + bool InitSymbolsEnglishXL( InitSymbols ) const; /// only SymbolsEnglishXL, on demand + bool InitSymbolsOOXML( InitSymbols ) const; /// only SymbolsOOXML, on demand void loadSymbols(const std::pair* pSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap, SeparatorType eSepType = SeparatorType::SEMICOLON_BASE) const; diff -Nru libreoffice-7.4.1~rc2/include/sfx2/viewsh.hxx libreoffice-7.4.2~rc3/include/sfx2/viewsh.hxx --- libreoffice-7.4.1~rc2/include/sfx2/viewsh.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/sfx2/viewsh.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -224,9 +224,10 @@ * Initialize is called after the frame has been loaded and the controller * has been set. By the time this is called the document has been fully * imported. + * @param bOnlyASample used by some dialogs to avoid constructing monster strings e.g. in calc */ virtual bool PrepareClose( bool bUI = true ); - virtual OUString GetSelectionText( bool bCompleteWords = false ); + virtual OUString GetSelectionText( bool bCompleteWords = false, bool bOnlyASample = false ); virtual bool HasSelection( bool bText = true ) const; virtual SdrView* GetDrawView() const; diff -Nru libreoffice-7.4.1~rc2/include/svl/hint.hxx libreoffice-7.4.2~rc3/include/svl/hint.hxx --- libreoffice-7.4.1~rc2/include/svl/hint.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/svl/hint.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -72,7 +72,6 @@ ScDbAreasChanged, ScAreasChanged, ScTablesChanged, - ScTablesRenamed, ScDrawChanged, ScDocNameChanged, ScAreaLinksChanged, @@ -165,7 +164,6 @@ case SfxHintId::ScDbAreasChanged: return stream << "ScDbAreasChanged"; case SfxHintId::ScAreasChanged: return stream << "ScAreasChanged"; case SfxHintId::ScTablesChanged: return stream << "ScTablesChanged"; - case SfxHintId::ScTablesRenamed: return stream << "ScTablesRenamed"; case SfxHintId::ScDrawChanged: return stream << "ScDrawChanged"; case SfxHintId::ScDocNameChanged: return stream << "ScDocNameChanged"; case SfxHintId::ScAreaLinksChanged: return stream << "ScAreaLinksChanged"; diff -Nru libreoffice-7.4.1~rc2/include/svl/sharedstringpool.hxx libreoffice-7.4.2~rc3/include/svl/sharedstringpool.hxx --- libreoffice-7.4.1~rc2/include/svl/sharedstringpool.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/svl/sharedstringpool.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -53,8 +53,9 @@ */ void purge(); + // For unit tests. Note that an "empty" pool may contain some internal items, + // such as SharedString::getEmptyString(). size_t getCount() const; - size_t getCountIgnoreCase() const; }; } diff -Nru libreoffice-7.4.1~rc2/include/svx/svdotable.hxx libreoffice-7.4.2~rc3/include/svx/svdotable.hxx --- libreoffice-7.4.1~rc2/include/svx/svdotable.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/svx/svdotable.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -256,6 +256,13 @@ /// Next time layouting would be done, skip it (to layout at the end of multiple actions). void SetSkipChangeLayout(bool bSkipChangeLayout); + /** Tries to get table height if rows with sizes less then the minimum size were expanded + + (i.e. Table height layouted without fitting to an area) + Helper for OOXML import + */ + sal_Int32 getHeightWithoutFitting(); + virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override; diff -Nru libreoffice-7.4.1~rc2/include/svx/unoshape.hxx libreoffice-7.4.2~rc3/include/svx/unoshape.hxx --- libreoffice-7.4.1~rc2/include/svx/unoshape.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/svx/unoshape.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -858,6 +858,8 @@ // override these for special property handling in subcasses. Return true if property is handled virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; + bool getPropertyStateImpl(const SfxItemPropertyMapEntry* pProperty, + css::beans::PropertyState& rState) override; OUString referer_; }; diff -Nru libreoffice-7.4.1~rc2/include/tools/gen.hxx libreoffice-7.4.2~rc3/include/tools/gen.hxx --- libreoffice-7.4.1~rc2/include/tools/gen.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/tools/gen.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -481,13 +481,6 @@ /// etc. methods interpret the interval as closed, while the lowercase /// getWidth() / getHeight() etc. methods interpret the interval as half-open. /// Ok, now is the time for despair. -/// -/// If you want to work with Size, you must use the closed interval functions! -/// And don't add getSize / setSize; this will probably just introduce bugs, -/// especially when used in combination with list-initialization. -/// -/// (Eventually you might notice, that the same engineer was also working on -/// Qt at some point; see documentation on QRect::bottom / QRect::right ;-). namespace tools { class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Rectangle final @@ -500,7 +493,6 @@ tools::Long nRight, tools::Long nBottom ); /// Constructs an empty Rectangle, with top/left at the specified params constexpr Rectangle( tools::Long nLeft, tools::Long nTop ); - /// Constructs a closed interval rectangle constexpr Rectangle( const Point& rLT, const Size& rSize ); constexpr inline static Rectangle Justify(const Point& rLT, const Point& rRB); diff -Nru libreoffice-7.4.1~rc2/include/vcl/glyphitemcache.hxx libreoffice-7.4.2~rc3/include/vcl/glyphitemcache.hxx --- libreoffice-7.4.1~rc2/include/vcl/glyphitemcache.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/vcl/glyphitemcache.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -75,6 +75,8 @@ double fontScaleY; MapMode mapMode; bool rtl; + bool artificialItalic; + bool artificialBold; vcl::text::ComplexTextLayoutFlags layoutMode; LanguageType digitLanguage; size_t hashValue; diff -Nru libreoffice-7.4.1~rc2/include/vcl/syswin.hxx libreoffice-7.4.2~rc3/include/vcl/syswin.hxx --- libreoffice-7.4.1~rc2/include/vcl/syswin.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/vcl/syswin.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -139,7 +139,7 @@ explicit SystemWindow(WindowType nType, const char* pIdleDebugName); void loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference &rFrame = css::uno::Reference()); - void SetWindowState(const vcl::WindowData& rData); + void SetWindowStateData( const WindowStateData& rData ); virtual void settingOptimalLayoutSize(Window *pBox); @@ -177,7 +177,7 @@ const Size& GetMaxOutputSizePixel() const; void SetWindowState(std::string_view rStr); - OString GetWindowState(vcl::WindowDataMask nMask = vcl::WindowDataMask::All) const; + OString GetWindowState(WindowStateMask nMask = WindowStateMask::All) const; void SetMenuBar(MenuBar* pMenuBar); MenuBar* GetMenuBar() const { return mpMenuBar; } @@ -194,7 +194,7 @@ VclPtr const & GetNotebookBar() const; TaskPaneList* GetTaskPaneList(); - void GetWindowState(vcl::WindowData& rData) const; + void GetWindowStateData( WindowStateData& rData ) const; virtual void SetText( const OUString& rStr ) override; virtual OUString GetText() const override; diff -Nru libreoffice-7.4.1~rc2/include/vcl/vclenum.hxx libreoffice-7.4.2~rc3/include/vcl/vclenum.hxx --- libreoffice-7.4.1~rc2/include/vcl/vclenum.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/vcl/vclenum.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -118,6 +118,27 @@ template<> struct typed_flags : is_typed_flags {}; } +enum class WindowStateMask { + NONE = 0x0000, + X = 0x0001, + Y = 0x0002, + Width = 0x0004, + Height = 0x0008, + State = 0x0010, + Minimized = 0x0020, + MaximizedX = 0x0100, + MaximizedY = 0x0200, + MaximizedWidth = 0x0400, + MaximizedHeight = 0x0800, + Pos = X | Y, + Size = Width | Height, + All = X | Y | Width | Height | MaximizedX | MaximizedY | MaximizedWidth | MaximizedHeight | State | Minimized +}; +namespace o3tl +{ + template<> struct typed_flags : is_typed_flags {}; +} + enum class TimeFormat { Hour12, Hour24 @@ -278,6 +299,24 @@ Size32, }; +enum class WindowStateState { + NONE = 0x0000, + Normal = 0x0001, + Minimized = 0x0002, + Maximized = 0x0004, + // Rollup is no longer used, but retained because WindowStateState is serialized + // from/to strings describing window state that are stored in a users config + Rollup = 0x0008, + MaximizedHorz = 0x0010, + MaximizedVert = 0x0020, + FullScreen = 0x0040, + SystemMask = 0xffff +}; +namespace o3tl +{ + template<> struct typed_flags : is_typed_flags {}; +} + namespace vcl { // The exact sizes of the icons in each size grouping are not necessarily diff -Nru libreoffice-7.4.1~rc2/include/vcl/weld.hxx libreoffice-7.4.2~rc3/include/vcl/weld.hxx --- libreoffice-7.4.1~rc2/include/vcl/weld.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/vcl/weld.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -544,7 +543,7 @@ virtual bool is_default_widget(const weld::Widget* pCandidate) const = 0; virtual void set_window_state(const OString& rStr) = 0; - virtual OString get_window_state(vcl::WindowDataMask nMask) const = 0; + virtual OString get_window_state(WindowStateMask nMask) const = 0; virtual css::uno::Reference GetXWindow() = 0; diff -Nru libreoffice-7.4.1~rc2/include/vcl/WindowPosSize.hxx libreoffice-7.4.2~rc3/include/vcl/WindowPosSize.hxx --- libreoffice-7.4.1~rc2/include/vcl/WindowPosSize.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/vcl/WindowPosSize.hxx 1970-01-01 00:00:00.000000000 +0000 @@ -1,137 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_VCL_FRAMEPOSSIZE_HXX -#define INCLUDED_VCL_FRAMEPOSSIZE_HXX - -#include -#include -#include -#include -#include - -namespace vcl -{ -/** - * There are multiple ways to store the two different areas of a vcl::Window. - * But this representation is hopefully less error prone from the used types - * and more clear in what values in- or exclude the non-drawable window frame. - * - * There are especially two things to remember: - * * pos() is the top-left position of the window frame - * * size() returns just the drawable client area - * - * So these values actually don't represent any "real" geometry of either the - * outer frame or the inner client area of the window. That's my reason for - * naming the rectangle function posSize() instead of geometry(). Also to not - * be confused with Qt's geometry() function. YMMV. - * - * LO already is supposed to use this schema. FWIW, the Qt documentation claims - * "The differentiation is done in a way that covers the most common usage - * transparently." AFAIK this is common for most/all platforms / UI toolkits. - * - * The API is kept largely overload free, as we can now use list-initialization. - */ -class VCL_PLUGIN_PUBLIC WindowPosSize -{ - // position of the window frames left-top corner - sal_Int32 m_nX; - sal_Int32 m_nY; - // size of the client / drawable area, i.e. without decorations / borders - sal_Int32 m_nWidth; - sal_Int32 m_nHeight; - -protected: - WindowPosSize() - : m_nX(0) - , m_nY(0) - , m_nWidth(1) - , m_nHeight(1) - { - } - -public: - constexpr sal_Int32 x() const { return m_nX; } - void setX(sal_Int32 nX) { m_nX = nX; } - constexpr sal_Int32 y() const { return m_nY; } - void setY(sal_Int32 nY) { m_nY = nY; } - - constexpr Point pos() const { return { m_nX, m_nY }; } - void setPos(const Point& aPos) - { - setX(aPos.getX()); - setY(aPos.getY()); - } - void move(sal_Int32 nDX, sal_Int32 nDY) - { - m_nX += nDX; - m_nY += nDY; - } - - constexpr sal_Int32 width() const { return m_nWidth; } - void setWidth(sal_Int32 nWidth) - { - assert(nWidth >= 0); - if (nWidth >= 0) - m_nWidth = nWidth; - else - m_nWidth = 0; - } - - constexpr sal_Int32 height() const { return m_nHeight; } - void setHeight(sal_Int32 nHeight) - { - assert(nHeight >= 0); - if (nHeight >= 0) - m_nHeight = nHeight; - else - m_nHeight = 0; - } - - constexpr Size size() const - { - return { static_cast(m_nWidth), static_cast(m_nHeight) }; - } - void setSize(const Size& rSize) - { - setWidth(rSize.Width()); - setHeight(rSize.Height()); - } - - constexpr tools::Rectangle posSize() const { return { pos(), size() }; } - void setPosSize(const tools::Rectangle& rRect) - { - setPos(rRect.GetPos()); - setSize(rRect.GetSize()); - } - // because tools::Rectangle has the ambiguous (Point&, Point&) constructor, which we don't want here - void setPosSize(const Point& rPos, const Size& rSize) { setPosSize({ rPos, rSize }); } -}; - -inline std::ostream& operator<<(std::ostream& s, const WindowPosSize& rGeom) -{ - s << rGeom.width() << "x" << rGeom.height() << "@(" << rGeom.x() << "," << rGeom.y() << ")"; - return s; -} - -} // namespace vcl - -#endif // INCLUDED_VCL_FRAMEPOSSIZE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-7.4.1~rc2/include/vcl/windowstate.hxx libreoffice-7.4.2~rc3/include/vcl/windowstate.hxx --- libreoffice-7.4.1~rc2/include/vcl/windowstate.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/vcl/windowstate.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -20,78 +20,52 @@ #ifndef INCLUDED_VCL_WINDOWSTATE_HXX #define INCLUDED_VCL_WINDOWSTATE_HXX -#include - -namespace vcl -{ -enum class WindowState -{ - NONE = 0x0000, - Normal = 0x0001, - Minimized = 0x0002, - Maximized = 0x0004, - // Rollup is no longer used, but the bit is retained because WindowData is serialized - // from/to strings describing window state that are stored in a users config - // Rollup = 0x0008, - MaximizedHorz = 0x0010, - MaximizedVert = 0x0020, - FullScreen = 0x0040, - SystemMask = 0xffff -}; - -enum class WindowDataMask -{ - NONE = 0x0000, - X = 0x0001, - Y = 0x0002, - Width = 0x0004, - Height = 0x0008, - State = 0x0010, - Minimized = 0x0020, - MaximizedX = 0x0100, - MaximizedY = 0x0200, - MaximizedWidth = 0x0400, - MaximizedHeight = 0x0800, - Pos = X | Y, - Size = Width | Height, - PosSize = Pos | Size, - PosSizeState = Pos | Size | State, - All = X | Y | Width | Height | MaximizedX | MaximizedY | MaximizedWidth | MaximizedHeight - | State | Minimized -}; - -class VCL_PLUGIN_PUBLIC WindowData final : public WindowPosSize -{ - WindowState m_nState; - WindowDataMask m_nMask; - +#include +#include +#include + +class VCL_PLUGIN_PUBLIC WindowStateData +{ +private: + WindowStateMask mnValidMask; + int mnX; + int mnY; + unsigned int mnWidth; + unsigned int mnHeight; int mnMaximizedX; int mnMaximizedY; unsigned int mnMaximizedWidth; unsigned int mnMaximizedHeight; + WindowStateState mnState; public: - WindowData() - : m_nState(WindowState::NONE) - , m_nMask(WindowDataMask::NONE) + WindowStateData() + : mnValidMask(WindowStateMask::NONE) + , mnX(0) + , mnY(0) + , mnWidth(0) + , mnHeight(0) , mnMaximizedX(0) , mnMaximizedY(0) , mnMaximizedWidth(0) , mnMaximizedHeight(0) + , mnState(WindowStateState::NONE) { } - // serialize values to a string (the original WindowState representation) - OString toStr() const; - - void setState(WindowState nState) { m_nState = nState; } - WindowState state() const { return m_nState; } - WindowState& rState() { return m_nState; } - - void setMask(WindowDataMask nMask) { m_nMask = nMask; } - WindowDataMask mask() const { return m_nMask; } - WindowDataMask& rMask() { return m_nMask; } + void SetMask(WindowStateMask nValidMask) { mnValidMask = nValidMask; } + WindowStateMask GetMask() const { return mnValidMask; } + void SetX(int nX) { mnX = nX; } + int GetX() const { return mnX; } + void SetY(int nY) { mnY = nY; } + int GetY() const { return mnY; } + void SetWidth(unsigned int nWidth) { mnWidth = nWidth; } + unsigned int GetWidth() const { return mnWidth; } + void SetHeight(unsigned int nHeight) { mnHeight = nHeight; } + unsigned int GetHeight() const { return mnHeight; } + void SetState(WindowStateState nState) { mnState = nState; } + WindowStateState GetState() const { return mnState; } void SetMaximizedX(int nRX) { mnMaximizedX = nRX; } int GetMaximizedX() const { return mnMaximizedX; } void SetMaximizedY(int nRY) { mnMaximizedY = nRY; } @@ -100,19 +74,9 @@ unsigned int GetMaximizedWidth() const { return mnMaximizedWidth; } void SetMaximizedHeight(unsigned int nRHeight) { mnMaximizedHeight = nRHeight; } unsigned int GetMaximizedHeight() const { return mnMaximizedHeight; } -}; - -} // namespace vcl -namespace o3tl -{ -template <> struct typed_flags : is_typed_flags -{ -}; -template <> struct typed_flags : is_typed_flags -{ + OString ToStr() const; }; -} #endif // INCLUDED_VCL_WINDOWSTATE_HXX diff -Nru libreoffice-7.4.1~rc2/include/vcl/wrkwin.hxx libreoffice-7.4.2~rc3/include/vcl/wrkwin.hxx --- libreoffice-7.4.1~rc2/include/vcl/wrkwin.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/include/vcl/wrkwin.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -60,7 +60,7 @@ protected: explicit WorkWindow( WindowType nType ); SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = nullptr ); - SAL_DLLPRIVATE void ImplSetFrameState(vcl::WindowState); + SAL_DLLPRIVATE void ImplSetFrameState( WindowStateState aFrameState ); public: explicit WorkWindow( vcl::Window* pParent, WinBits nStyle = WB_STDWORK ); diff -Nru libreoffice-7.4.1~rc2/librelogo/source/LibreLogo/LibreLogo.py libreoffice-7.4.2~rc3/librelogo/source/LibreLogo/LibreLogo.py --- libreoffice-7.4.1~rc2/librelogo/source/LibreLogo/LibreLogo.py 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/librelogo/source/LibreLogo/LibreLogo.py 2022-10-10 10:15:14.000000000 +0000 @@ -35,7 +35,7 @@ __lng__[lng][i] = __lng_fallback__[i][lng] except: try: - __lng__[lng][i] = __lng_fallback__[i][lng[:2]] + __lng__[lng][i] = __lng_fallback__[i][lng.split('_')[0]] except: __lng__[lng][i] = __lng_fallback__[i]["en_US"] return __lng__[lng] diff -Nru libreoffice-7.4.1~rc2/oox/inc/drawingml/fillproperties.hxx libreoffice-7.4.2~rc3/oox/inc/drawingml/fillproperties.hxx --- libreoffice-7.4.1~rc2/oox/inc/drawingml/fillproperties.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/oox/inc/drawingml/fillproperties.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -113,6 +113,7 @@ OptValue< sal_Int32 > moColorEffect; /// XML token for a color effect. OptValue< sal_Int32 > moBrightness; /// Brightness in the range [-100000,100000]. OptValue< sal_Int32 > moContrast; /// Contrast in the range [-100000,100000]. + OptValue< sal_Int32 > moBiLevelThreshold; /// Bi-Level (Black/White) effect threshold (1/1000 percent) Color maColorChangeFrom; /// Start color of color transformation. Color maColorChangeTo; /// Destination color of color transformation. Color maDuotoneColors[2]; /// Duotone Colors diff -Nru libreoffice-7.4.1~rc2/oox/source/drawingml/fillproperties.cxx libreoffice-7.4.2~rc3/oox/source/drawingml/fillproperties.cxx --- libreoffice-7.4.1~rc2/oox/source/drawingml/fillproperties.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/oox/source/drawingml/fillproperties.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include @@ -185,6 +187,32 @@ return aReturnGraphic.GetXGraphic(); } +/// Applies the graphic Black&White (Monochrome) effect with the imported threshold +Reference lclApplyBlackWhiteEffect(const BlipFillProperties& aBlipProps, + const uno::Reference& xGraphic) +{ + const auto& oBiLevelThreshold = aBlipProps.moBiLevelThreshold; + if (oBiLevelThreshold.has()) + { + sal_uInt8 nThreshold + = static_cast(oBiLevelThreshold.get() * 255 / MAX_PERCENT); + + ::Graphic aGraphic(xGraphic); + ::Graphic aReturnGraphic; + + BitmapEx aBitmapEx(aGraphic.GetBitmapEx()); + AlphaMask aMask(aBitmapEx.GetAlpha()); + + BitmapEx aTmpBmpEx(aBitmapEx.GetBitmap()); + BitmapFilter::Filter(aTmpBmpEx, BitmapMonochromeFilter{ nThreshold }); + + aReturnGraphic = ::Graphic(BitmapEx(aTmpBmpEx.GetBitmap(), aMask)); + aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); + return aReturnGraphic.GetXGraphic(); + } + return xGraphic; +} + Reference< XGraphic > lclCheckAndApplyChangeColorTransform(const BlipFillProperties &aBlipProps, uno::Reference const & xGraphic, const GraphicHelper& rGraphicHelper, const ::Color nPhClr) { @@ -197,9 +225,31 @@ sal_Int16 nToTransparence = aBlipProps.maColorChangeTo.getTransparency(); sal_Int8 nToAlpha = static_cast< sal_Int8 >( (100 - nToTransparence) * 2.55 ); + sal_uInt8 nTolerance = 9; + Graphic aGraphic{ xGraphic }; + if( aGraphic.IsGfxLink() ) + { + // tdf#149670: Try to guess tolerance depending on image format + switch (aGraphic.GetGfxLink().GetType()) + { + case GfxLinkType::NativeJpg: + nTolerance = 15; + break; + case GfxLinkType::NativePng: + case GfxLinkType::NativeTif: + nTolerance = 1; + break; + case GfxLinkType::NativeBmp: + nTolerance = 0; + break; + default: + break; + } + } + uno::Reference xTransformer(aBlipProps.mxFillGraphic, uno::UNO_QUERY); if (xTransformer.is()) - return xTransformer->colorChange(xGraphic, sal_Int32(nFromColor), 9, sal_Int32(nToColor), nToAlpha); + return xTransformer->colorChange(xGraphic, sal_Int32(nFromColor), nTolerance, sal_Int32(nToColor), nToAlpha); } } return xGraphic; @@ -328,6 +378,7 @@ moColorEffect.assignIfUsed( rSourceProps.moColorEffect ); moBrightness.assignIfUsed( rSourceProps.moBrightness ); moContrast.assignIfUsed( rSourceProps.moContrast ); + moBiLevelThreshold.assignIfUsed( rSourceProps.moBiLevelThreshold ); maColorChangeFrom.assignIfUsed( rSourceProps.maColorChangeFrom ); maColorChangeTo.assignIfUsed( rSourceProps.maColorChangeTo ); maDuotoneColors[0].assignIfUsed( rSourceProps.maDuotoneColors[0] ); @@ -885,6 +936,17 @@ uno::Reference xGraphic = lclCheckAndApplyChangeColorTransform(maBlipProps, maBlipProps.mxFillGraphic, rGraphicHelper, API_RGB_TRANSPARENT); xGraphic = lclCheckAndApplyDuotoneTransform(maBlipProps, xGraphic, rGraphicHelper, API_RGB_TRANSPARENT); + if( eColorMode == ColorMode_MONO ) + { + // ColorMode_MONO is the same with MSO's biLevel with 50000 (50%) threshold, + // when threshold isn't 50000 bake the effect instead. + if( maBlipProps.moBiLevelThreshold.get() != 50000 ) + { + xGraphic = lclApplyBlackWhiteEffect(maBlipProps, xGraphic); + eColorMode = ColorMode_STANDARD; + } + } + if (eColorMode == ColorMode_STANDARD && nBrightness == 70 && nContrast == -70) { // map MSO 'washout' to our Watermark colormode diff -Nru libreoffice-7.4.1~rc2/oox/source/drawingml/misccontexts.cxx libreoffice-7.4.2~rc3/oox/source/drawingml/misccontexts.cxx --- libreoffice-7.4.1~rc2/oox/source/drawingml/misccontexts.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/oox/source/drawingml/misccontexts.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -172,6 +172,10 @@ switch( nElement ) { case A_TOKEN( biLevel ): + mrBlipProps.moBiLevelThreshold = rAttribs.getInteger( XML_thresh ); + mrBlipProps.moColorEffect = getBaseToken(nElement); + break; + case A_TOKEN( grayscl ): mrBlipProps.moColorEffect = getBaseToken( nElement ); break; diff -Nru libreoffice-7.4.1~rc2/oox/source/drawingml/shape.cxx libreoffice-7.4.2~rc3/oox/source/drawingml/shape.cxx --- libreoffice-7.4.1~rc2/oox/source/drawingml/shape.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/oox/source/drawingml/shape.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -94,6 +94,7 @@ #include #include #include +#include #include #include #include @@ -834,6 +835,8 @@ maSize.Height = 0; for (auto const& elem : mpTablePropertiesPtr->getTableRows()) { + // WARN: When less then minimum sized rows exist, calculated height here + // is corrected before layouting takes place maSize.Height = o3tl::saturating_add(maSize.Height, elem.getHeight()); } } @@ -1256,7 +1259,14 @@ mpGraphicPropertiesPtr->pushToPropMap( aShapeProps, rGraphicHelper, mbFlipH, mbFlipV ); } if ( mpTablePropertiesPtr && aServiceName == "com.sun.star.drawing.TableShape" ) + { mpTablePropertiesPtr->pushToPropSet( rFilterBase, xSet, mpMasterTextListStyle ); + if ( auto* pTableShape = dynamic_cast(SdrObject::getSdrObjectFromXShape(mxShape)) ) + { + // Disable layouting until an attempt at correcting faulty table height is made + pTableShape->SetSkipChangeLayout(true); + } + } FillProperties aFillProperties = getActualFillProperties(pTheme, &rShapeOrParentShapeFillProps); if (getFillProperties().moFillType.has() && getFillProperties().moFillType.get() == XML_grpFill) @@ -1487,6 +1497,21 @@ } PropertySet( xSet ).setProperties( aShapeProps ); + + if (mpTablePropertiesPtr && aServiceName == "com.sun.star.drawing.TableShape") + { + // Powerpoint sometimes export row heights less than the minimum size, + // which during import expanded to the minimum + if (auto* pTableShape = dynamic_cast(SdrObject::getSdrObjectFromXShape(mxShape))) + { + sal_Int32 nCorrectedHeight = pTableShape->getHeightWithoutFitting(); + const auto& aShapeSize = mxShape->getSize(); + if( nCorrectedHeight > aShapeSize.Height ) + mxShape->setSize( {aShapeSize.Width, nCorrectedHeight} ); + pTableShape->SetSkipChangeLayout(false); + } + } + if (mbLockedCanvas) { putPropertyToGrabBag( "LockedCanvas", Any( true ) ); @@ -1794,6 +1819,17 @@ aPropertySet.setAnyProperty(PROP_ParaAdjust, uno::Any(eAdjust)); } } + + // tdf#144092 For empty textboxes push character styles & + // endParaRPr into the Shape's properties + if (rParagraphs.size() == 1 && pParagraph->getRuns().empty()) + { + TextCharacterProperties aTextCharacterProps{ pParagraph->getCharacterStyle( + aCharStyleProperties, *mpMasterTextListStyle, + getTextBody()->getTextListStyle()) }; + aTextCharacterProps.assignUsed(pParagraph->getEndProperties()); + aTextCharacterProps.pushToPropSet(aPropertySet, rFilterBase); + } } } } diff -Nru libreoffice-7.4.1~rc2/oox/source/drawingml/table/tablecell.cxx libreoffice-7.4.2~rc3/oox/source/drawingml/table/tablecell.cxx --- libreoffice-7.4.1~rc2/oox/source/drawingml/table/tablecell.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/oox/source/drawingml/table/tablecell.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include #include @@ -541,7 +543,8 @@ // TODO: phClr? aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() ); - PropertySet( xPropSet ).setProperties( aPropMap ); + PropertySet aPropSet{xPropSet}; + aPropSet.setProperties( aPropMap ); if ( getVertToken() == XML_eaVert ) { @@ -550,6 +553,20 @@ getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle ); + // tdf#144092 For empty cells push character styles & endParaRPr to the Cell's properties + const TextParagraphVector& rParagraphs = getTextBody()->getParagraphs(); + if (rParagraphs.size() == 1) + { + const auto pFirstParagraph = rParagraphs.at(0); + if (pFirstParagraph->getRuns().empty()) + { + TextCharacterProperties aTextCharacterProps{ pFirstParagraph->getCharacterStyle( + aTextStyleProps, *pMasterTextListStyle, getTextBody()->getTextListStyle()) }; + aTextCharacterProps.assignUsed(pFirstParagraph->getEndProperties()); + aTextCharacterProps.pushToPropSet(aPropSet, rFilterBase); + } + } + if (getVertToken() == XML_vert) xPropSet->setPropertyValue("RotateAngle", Any(short(27000))); else if (getVertToken() == XML_vert270) diff -Nru libreoffice-7.4.1~rc2/oox/source/export/drawingml.cxx libreoffice-7.4.2~rc3/oox/source/export/drawingml.cxx --- libreoffice-7.4.1~rc2/oox/source/export/drawingml.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/oox/source/export/drawingml.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -2298,6 +2298,23 @@ WriteSolidFill(color, nTransparency); } } + else if (GetDocumentType() == DOCUMENT_PPTX) + { + // Resolve COL_AUTO for PPTX since MS Powerpoint doesn't have automatic colors. + bool bIsTextBackgroundDark = mbIsBackgroundDark; + if (rXShapePropSet.is() && GetProperty(rXShapePropSet, "FillStyle") + && mAny.get() != FillStyle_NONE + && GetProperty(rXShapePropSet, "FillColor")) + { + ::Color aShapeFillColor(ColorTransparency, mAny.get()); + bIsTextBackgroundDark = aShapeFillColor.IsDark(); + } + + if (bIsTextBackgroundDark) + WriteSolidFill(COL_WHITE); + else + WriteSolidFill(COL_BLACK); + } } } @@ -3707,6 +3724,24 @@ sal_Int32 nCharHeight = -1; bool bFirstParagraph = true; + // tdf#144092 For shapes without text: Export run properties (into + // endParaRPr) from the shape's propset instead of the paragraph's. + if(xXText->getString().isEmpty() && enumeration->hasMoreElements()) + { + Any aAny (enumeration->nextElement()); + Reference xParagraph; + if( aAny >>= xParagraph ) + { + mpFS->startElementNS(XML_a, XML_p); + WriteParagraphProperties(xParagraph, nCharHeight, XML_pPr); + sal_Int16 nDummy = -1; + WriteRunProperties(rXPropSet, false, XML_endParaRPr, false, + bOverridingCharHeight, nCharHeight, nDummy, rXPropSet); + mpFS->endElementNS(XML_a, XML_p); + } + return; + } + while( enumeration->hasMoreElements() ) { Reference< XTextContent > paragraph; diff -Nru libreoffice-7.4.1~rc2/oox/source/export/shapes.cxx libreoffice-7.4.2~rc3/oox/source/export/shapes.cxx --- libreoffice-7.4.1~rc2/oox/source/export/shapes.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/oox/source/export/shapes.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1797,8 +1797,12 @@ WriteOutline( xShapeProps ); pFS->endElementNS( mnXmlNamespace, XML_spPr ); - // write text - WriteTextBox( xShape, mnXmlNamespace ); + // connector shape (cxnSp) cannot contain text (txBody) (according to schema) + if( nShapeNode != XML_cxnSp ) + { + // write text + WriteTextBox( xShape, mnXmlNamespace ); + } pFS->endElementNS(mnXmlNamespace, nShapeNode); @@ -2006,26 +2010,36 @@ return *this; } +static bool lcl_isTextBox(const Reference& xIface) +{ + uno::Reference xPropertySet(xIface, uno::UNO_QUERY); + if (!xPropertySet.is()) + return false; + uno::Reference xPropertySetInfo = xPropertySet->getPropertySetInfo(); + if (!xPropertySetInfo->hasPropertyByName("TextBox")) + return false; + css::uno::Any aTextBox(xPropertySet->getPropertyValue("TextBox")); + if (!aTextBox.hasValue()) + return false; + return aTextBox.get(); +} + ShapeExport& ShapeExport::WriteTextBox( const Reference< XInterface >& xIface, sal_Int32 nXmlNamespace, bool bWritePropertiesAsLstStyles ) { // In case this shape has an associated textbox, then export that, and we're done. if (GetDocumentType() == DOCUMENT_DOCX && !mbUserShapes && GetTextExport()) { - uno::Reference xPropertySet(xIface, uno::UNO_QUERY); - if (xPropertySet.is()) + if (lcl_isTextBox(xIface)) { - uno::Reference xPropertySetInfo = xPropertySet->getPropertySetInfo(); - if (xPropertySetInfo->hasPropertyByName("TextBox") && xPropertySet->getPropertyValue("TextBox").get()) - { - GetTextExport()->WriteTextBox(uno::Reference(xIface, uno::UNO_QUERY_THROW)); - WriteText( xIface, /*bBodyPr=*/true, /*bText=*/false, /*nXmlNamespace=*/nXmlNamespace ); - return *this; - } + GetTextExport()->WriteTextBox(uno::Reference(xIface, uno::UNO_QUERY_THROW)); + WriteText( xIface, /*bBodyPr=*/true, /*bText=*/false, /*nXmlNamespace=*/nXmlNamespace ); + return *this; } } Reference< XText > xXText( xIface, UNO_QUERY ); - if( NonEmptyText( xIface ) && xXText.is() ) + if( (NonEmptyText( xIface ) || GetDocumentType() == DOCUMENT_PPTX) + && xXText.is() ) { FSHelperPtr pFS = GetFS(); diff -Nru libreoffice-7.4.1~rc2/oox/source/export/vmlexport.cxx libreoffice-7.4.2~rc3/oox/source/export/vmlexport.cxx --- libreoffice-7.4.1~rc2/oox/source/export/vmlexport.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/oox/source/export/vmlexport.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1153,12 +1153,15 @@ static bool lcl_isTextBox(const SdrObject* pSdrObject) { uno::Reference xPropertySet(const_cast(pSdrObject)->getUnoShape(), uno::UNO_QUERY); - if (xPropertySet.is()) - { - uno::Reference xPropertySetInfo = xPropertySet->getPropertySetInfo(); - return xPropertySetInfo->hasPropertyByName("TextBox") && xPropertySet->getPropertyValue("TextBox").get(); - } - return false; + if (!xPropertySet.is()) + return false; + uno::Reference xPropertySetInfo = xPropertySet->getPropertySetInfo(); + if (!xPropertySetInfo->hasPropertyByName("TextBox")) + return false; + css::uno::Any aTextBox(xPropertySet->getPropertyValue("TextBox")); + if (!aTextBox.hasValue()) + return false; + return aTextBox.get(); } static OUString lcl_getAnchorIdFromGrabBag(const SdrObject* pSdrObject) diff -Nru libreoffice-7.4.1~rc2/pyuno/source/loader/pythonloader.py libreoffice-7.4.2~rc3/pyuno/source/loader/pythonloader.py --- libreoffice-7.4.1~rc2/pyuno/source/loader/pythonloader.py 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/pyuno/source/loader/pythonloader.py 2022-10-10 10:15:14.000000000 +0000 @@ -21,6 +21,7 @@ import sys import types import os +from urllib.parse import unquote from com.sun.star.uno import Exception,RuntimeException from com.sun.star.loader import XImplementationLoader from com.sun.star.lang import XServiceInfo @@ -68,7 +69,7 @@ protocol, dependent = splitUrl( url ) if "vnd.sun.star.expand" == protocol: exp = self.ctx.getValueByName( "/singletons/com.sun.star.util.theMacroExpander" ) - url = exp.expandMacros(dependent) + url = exp.expandMacros(unquote(dependent)) protocol,dependent = splitUrl( url ) if DEBUG: diff -Nru libreoffice-7.4.1~rc2/readlicense_oo/license/CREDITS.fodt libreoffice-7.4.2~rc3/readlicense_oo/license/CREDITS.fodt --- libreoffice-7.4.1~rc2/readlicense_oo/license/CREDITS.fodt 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/readlicense_oo/license/CREDITS.fodt 2022-10-10 10:15:14.000000000 +0000 @@ -348,58 +348,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -408,16 +408,19 @@ - + - + - + - + + + + @@ -426,110 +429,151 @@ - + - + - + - + - + + + + - - + + + + + - + - - - - - - - + - + - + - + - + - + - + + + + - + + + + - + + - - + + - - - + + - - + + + + + + - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + - - + + - - + + + + + + + + - - + + + + + @@ -552,134 +596,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -711,69 +691,69 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -1081,10 +1061,21 @@ - Credits - 1788 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-09-09 19:59:37. - * marks developers whose first contributions happened after 2010-09-28. - Developers committing code since 2010-09-28 + Credits + + + Wiki Contributors (scroll down) + + + Pictures, Website & Images Credits (scroll down) + + + Translators (those using weblate - opens in new window) + + + 1793 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-10-05 16:48:10. + * marks developers whose first contributions happened after 2010-09-28. + Developers committing code since 2010-09-28 @@ -1095,7 +1086,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 33507Joined: 2000-10-10 + Caolán McNamaraCommits: 33603Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1112,10 +1103,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Stephan BergmannCommits: 19994Joined: 2000-10-04 + Stephan BergmannCommits: 20022Joined: 2000-10-04 - *Noel GrandinCommits: 16662Joined: 2011-12-12 + *Noel GrandinCommits: 16808Joined: 2011-12-12 @@ -1123,13 +1114,13 @@ Ivo HinkelmannCommits: 9480Joined: 2002-09-09 - Miklos VajnaCommits: 9108Joined: 2010-07-29 + Miklos VajnaCommits: 9152Joined: 2010-07-29 - Tor LillqvistCommits: 9084Joined: 2010-03-23 + Tor LillqvistCommits: 9090Joined: 2010-03-23 - Michael StahlCommits: 8034Joined: 2008-06-16 + Michael StahlCommits: 8043Joined: 2008-06-16 @@ -1140,7 +1131,7 @@ *Markus MohrhardCommits: 5203Joined: 2011-03-17 - Eike RathkeCommits: 5169Joined: 2000-10-11 + Eike RathkeCommits: 5190Joined: 2000-10-11 Frank Schoenheit [fs]Commits: 5008Joined: 2000-09-19 @@ -1151,18 +1142,18 @@ David TardonCommits: 3648Joined: 2009-11-12 - *Julien NabetCommits: 3526Joined: 2010-11-04 + *Julien NabetCommits: 3540Joined: 2010-11-04 - *Andrea GelminiCommits: 3216Joined: 2014-10-30 + *Andrea GelminiCommits: 3241Joined: 2014-10-30 - Luboš LuňákCommits: 3154Joined: 2010-09-21 + Luboš LuňákCommits: 3201Joined: 2010-09-21 - *Tomaž VajngerlCommits: 3093Joined: 2012-06-02 + *Tomaž VajngerlCommits: 3100Joined: 2012-06-02 Hans-Joachim LankenauCommits: 3007Joined: 2000-09-19 @@ -1185,12 +1176,12 @@ Michael MeeksCommits: 2477Joined: 2004-08-05 - Bjoern MichaelsenCommits: 2454Joined: 2009-10-14 + Bjoern MichaelsenCommits: 2462Joined: 2009-10-14 - *Mike KaganskiCommits: 2398Joined: 2015-04-26 + *Mike KaganskiCommits: 2423Joined: 2015-04-26 *Norbert ThiebaudCommits: 2176Joined: 2010-09-29 @@ -1204,10 +1195,10 @@ - *Xisco FauliCommits: 2037Joined: 2011-02-06 + *Xisco FauliCommits: 2062Joined: 2011-02-06 - *Andras TimarCommits: 1969Joined: 2010-10-02 + *Andras TimarCommits: 1970Joined: 2010-10-02 Christian LippkaCommits: 1805Joined: 2000-09-25 @@ -1218,7 +1209,7 @@ - *Olivier HallotCommits: 1619Joined: 2010-10-25 + *Olivier HallotCommits: 1628Joined: 2010-10-25 Armin Le Grand (Allotropia)Commits: 1542Joined: 2000-09-25 @@ -1235,7 +1226,7 @@ Thorsten BehrensCommits: 1441Joined: 2001-04-25 - *Chris SherlockCommits: 1433Joined: 2013-02-25 + *Chris SherlockCommits: 1436Joined: 2013-02-25 Fridrich ŠtrbaCommits: 1338Joined: 2007-02-22 @@ -1263,13 +1254,13 @@ Daniel Rentz [dr]Commits: 1206Joined: 2000-09-28 - *Samuel MehrbrodtCommits: 1113Joined: 2011-06-08 + *Samuel MehrbrodtCommits: 1122Joined: 2011-06-08 - *Gabor KelemenCommits: 1088Joined: 2013-06-18 + *Gabor KelemenCommits: 1093Joined: 2013-06-18 - *Szymon KłosCommits: 1057Joined: 2014-03-22 + *Szymon KłosCommits: 1062Joined: 2014-03-22 @@ -1277,7 +1268,7 @@ *Lionel Elie MamaneCommits: 1051Joined: 2011-01-15 - Christian LohmaierCommits: 1022Joined: 2008-06-01 + Christian LohmaierCommits: 1024Joined: 2008-06-01 *Johnny_MCommits: 966Joined: 2016-05-12 @@ -1316,13 +1307,13 @@ - *Maxim MonastirskyCommits: 798Joined: 2013-10-27 + *Maxim MonastirskyCommits: 799Joined: 2013-10-27 Mikhail VoytenkoCommits: 793Joined: 2001-01-16 - *László NémethCommits: 760Joined: 2010-09-29 + *László NémethCommits: 765Joined: 2010-09-29 Carsten DriesnerCommits: 748Joined: 2000-10-06 @@ -1353,7 +1344,7 @@ Joerg Skottke [jsk]Commits: 678Joined: 2008-06-17 - *Michael WeghornCommits: 664Joined: 2014-09-10 + *Michael WeghornCommits: 675Joined: 2014-09-10 @@ -1378,15 +1369,15 @@ *Rafael DominguezCommits: 606Joined: 2011-02-13 - *Jochen NitschkeCommits: 587Joined: 2016-02-02 + *Rizal MuttaqinCommits: 591Joined: 2018-05-21 - *Rizal MuttaqinCommits: 574Joined: 2018-05-21 + *Jochen NitschkeCommits: 587Joined: 2016-02-02 - Rene EngelhardCommits: 569Joined: 2005-03-14 + Rene EngelhardCommits: 572Joined: 2005-03-14 *Yousuf PhilipsCommits: 569Joined: 2014-09-21 @@ -1400,7 +1391,7 @@ - *Adolfo Jayme BarrientosCommits: 534Joined: 2013-06-21 + *Adolfo Jayme BarrientosCommits: 539Joined: 2013-06-21 Jürgen SchmidtCommits: 512Joined: 2000-10-09 @@ -1420,10 +1411,10 @@ *Seth ChaiklinCommits: 461Joined: 2019-11-13 - *Jim RaykowskiCommits: 448Joined: 2017-04-16 + *Jim RaykowskiCommits: 457Joined: 2017-04-16 - *Heiko TietzeCommits: 395Joined: 2016-10-06 + *Heiko TietzeCommits: 396Joined: 2016-10-06 @@ -1431,13 +1422,13 @@ Dirk VoelzkeCommits: 392Joined: 2000-11-27 - *Ashod NakashianCommits: 388Joined: 2015-01-07 + *Ashod NakashianCommits: 390Joined: 2015-01-07 - *Ivan TimofeevCommits: 380Joined: 2011-09-16 + *Laurent BPCommits: 386Joined: 2011-08-31 - *Laurent BPCommits: 375Joined: 2011-08-31 + *Ivan TimofeevCommits: 380Joined: 2011-09-16 @@ -1465,7 +1456,7 @@ *David OstrovskyCommits: 334Joined: 2012-04-01 - *Jean-Pierre LedureCommits: 322Joined: 2013-10-12 + *Jean-Pierre LedureCommits: 323Joined: 2013-10-12 @@ -1473,7 +1464,7 @@ *Marco CecchettiCommits: 321Joined: 2011-04-14 - *Arnaud VERSINICommits: 311Joined: 2010-10-05 + *Arnaud VersiniCommits: 313Joined: 2010-10-05 Radek DoulikCommits: 305Joined: 2010-05-03 @@ -1484,16 +1475,16 @@ - *Mark HungCommits: 298Joined: 2014-11-04 + *Justin LuthCommits: 300Joined: 2018-04-21 - *Justin LuthCommits: 291Joined: 2018-04-21 + *Mark HungCommits: 298Joined: 2014-11-04 *August SodoraCommits: 285Joined: 2011-10-18 - *Henry CastroCommits: 281Joined: 2015-01-09 + *Henry CastroCommits: 283Joined: 2015-01-09 @@ -1512,7 +1503,7 @@ - *Vasily MelenchukCommits: 254Joined: 2015-01-27 + *Vasily MelenchukCommits: 255Joined: 2015-01-27 Bartosz KosiorekCommits: 251Joined: 2010-09-17 @@ -1529,21 +1520,21 @@ *Winfried DonkersCommits: 213Joined: 2011-11-11 - *Tamas BunthCommits: 203Joined: 2016-03-08 + *Rafael LimaCommits: 213Joined: 2020-11-13 - Ingo SchmidtCommits: 202Joined: 2004-02-05 + *Tamas BunthCommits: 203Joined: 2016-03-08 - *Rafael LimaCommits: 202Joined: 2020-11-13 + Ingo SchmidtCommits: 202Joined: 2004-02-05 - *Arkadiy IllarionovCommits: 201Joined: 2017-01-15 + *Regina HenschelCommits: 202Joined: 2010-11-04 - *Regina HenschelCommits: 198Joined: 2010-11-04 + *Arkadiy IllarionovCommits: 201Joined: 2017-01-15 *Jacobo Aragunde PérezCommits: 192Joined: 2013-09-25 @@ -1563,12 +1554,12 @@ Giuseppe CastagnoCommits: 187Joined: 2007-12-09 - *François TigeotCommits: 176Joined: 2011-01-31 + *Andreas HeinischCommits: 177Joined: 2019-05-13 - *Andreas HeinischCommits: 172Joined: 2019-05-13 + *François TigeotCommits: 176Joined: 2011-01-31 *Philipp RiemerCommits: 171Joined: 2012-05-25 @@ -1585,18 +1576,18 @@ *Gülşah KöseCommits: 157Joined: 2015-03-14 - *Gert FallerCommits: 151Joined: 2010-10-25 + *Tünde TóthCommits: 152Joined: 2019-03-14 - *Artur DordaCommits: 151Joined: 2012-04-15 + *Gert FallerCommits: 151Joined: 2010-10-25 - *Alexander WilmsCommits: 151Joined: 2012-05-26 + *Artur DordaCommits: 151Joined: 2012-04-15 - *Tünde TóthCommits: 151Joined: 2019-03-14 + *Alexander WilmsCommits: 151Joined: 2012-05-26 *Ilmari LauhakangasCommits: 143Joined: 2017-04-15 @@ -1669,16 +1660,19 @@ *Joren De CuyperCommits: 114Joined: 2013-01-07 + *Khaled HosnyCommits: 113Joined: 2022-06-06 + + *I-Jui (Ray) SungCommits: 112Joined: 2013-09-30 *Dennis FrancisCommits: 112Joined: 2015-04-15 + + *Akshay DeepCommits: 110Joined: 2016-01-23 - - *Sophia SchröderCommits: 110Joined: 2018-04-07 @@ -1686,14 +1680,14 @@ *Louis-Francis Ratté-BoulianneCommits: 102Joined: 2014-10-29 - *Rishabh KumarCommits: 100Joined: 2015-02-13 - - - *HosseinCommits: 100Joined: 2021-06-29 + *HosseinCommits: 101Joined: 2021-06-29 + *Rishabh KumarCommits: 100Joined: 2015-02-13 + + *Thomas KlausnerCommits: 99Joined: 2010-10-01 @@ -1702,12 +1696,12 @@ *Attila Bakos (NISZ)Commits: 96Joined: 2019-10-28 - - *Laurent GodardCommits: 93Joined: 2011-05-06 - + *Laurent GodardCommits: 93Joined: 2011-05-06 + + *Stefan KnorrCommits: 91Joined: 2011-07-04 @@ -1716,11 +1710,11 @@ *Krisztian PinterCommits: 90Joined: 2013-02-18 + + *Philipp HoferCommits: 90Joined: 2020-11-06 - - *Albert ThuswaldnerCommits: 89Joined: 2011-01-26 @@ -1730,11 +1724,11 @@ *Daniel BankstonCommits: 88Joined: 2012-04-03 + + *Korrawit PruegsanusakCommits: 87Joined: 2011-05-28 - - *Adam CoCommits: 86Joined: 2013-04-28 @@ -1744,11 +1738,11 @@ Mihaela KedikovaCommits: 85Joined: 2009-10-30 + + *Javier FernandezCommits: 84Joined: 2013-03-06 - - Tobias KrauseCommits: 83Joined: 2007-10-02 @@ -1758,11 +1752,11 @@ *Roman KuznetsovCommits: 83Joined: 2018-10-23 + + *Ricardo MontaniaCommits: 82Joined: 2012-08-18 - - *Tibor NagyCommits: 82Joined: 2020-04-01 @@ -1770,27 +1764,27 @@ *Steve FanningCommits: 78Joined: 2020-04-20 + *offtkpCommits: 75Joined: 2021-03-07 + + + + *Tobias MadlCommits: 74Joined: 2014-09-15 *Gergo MocsiCommits: 72Joined: 2013-02-14 - - *weigaoCommits: 72Joined: 2014-05-07 Thorsten BosbachCommits: 70Joined: 2008-06-18 - - *offtkpCommits: 70Joined: 2021-03-07 - + + *Michaël LefèvreCommits: 68Joined: 2011-02-22 - - *Riccardo MagliocchettiCommits: 68Joined: 2012-01-25 @@ -1800,11 +1794,11 @@ *Kevin HunterCommits: 67Joined: 2010-10-22 + + *Jelle van der WaaCommits: 66Joined: 2013-06-16 - - *Tomoyuki KubotaCommits: 66Joined: 2018-03-11 @@ -1814,26 +1808,26 @@ *tageziCommits: 63Joined: 2015-09-16 - - *Mohammed Abdul AzeemCommits: 63Joined: 2016-02-08 - - *Rosemary SebastianCommits: 62Joined: 2015-06-23 + *Mohammed Abdul AzeemCommits: 63Joined: 2016-02-08 - *Pranam LashkariCommits: 62Joined: 2020-04-03 + *Alain RomedenneCommits: 63Joined: 2021-02-17 - *Alain RomedenneCommits: 62Joined: 2021-02-17 + *Rosemary SebastianCommits: 62Joined: 2015-06-23 - *Khaled HosnyCommits: 62Joined: 2022-06-06 + *Justin LuthCommits: 62Joined: 2020-02-03 + *Pranam LashkariCommits: 62Joined: 2020-04-03 + + Wolfram Garten [wg]Commits: 61Joined: 2009-10-23 @@ -1842,11 +1836,11 @@ *Pierre-Eric Pelloux-PrayerCommits: 61Joined: 2012-06-20 + + Oliver Craemer [oc]Commits: 60Joined: 2009-10-23 - - *Jaskaran SinghCommits: 60Joined: 2016-02-18 @@ -1856,11 +1850,11 @@ *shiming zhangCommits: 59Joined: 2013-11-04 + + *Simon SteinbeissCommits: 59Joined: 2015-06-01 - - *Ahmed ElShreifCommits: 59Joined: 2019-06-10 @@ -1870,11 +1864,11 @@ *yiming juCommits: 57Joined: 2013-11-01 + + *matteocamCommits: 56Joined: 2014-02-25 - - *Niklas JohanssonCommits: 55Joined: 2011-11-07 @@ -1884,11 +1878,11 @@ Nikolai PretzellCommits: 54Joined: 2001-03-09 + + *Mihály PalenikCommits: 54Joined: 2013-07-11 - - *yangzhangCommits: 54Joined: 2013-11-04 @@ -1898,11 +1892,11 @@ *Rob SneldersCommits: 53Joined: 2011-02-08 + + *Martin KepplingerCommits: 53Joined: 2011-02-18 - - *Lior KaplanCommits: 52Joined: 2010-10-05 @@ -1912,11 +1906,11 @@ *Will ThompsonCommits: 51Joined: 2012-03-21 + + *Faisal M. Al-OtaibiCommits: 51Joined: 2012-06-25 - - *Cao Cuong NgoCommits: 51Joined: 2013-03-04 @@ -1926,9 +1920,6 @@ *Ptyl DragonCommits: 50Joined: 2013-05-09 - - *Justin LuthCommits: 50Joined: 2020-02-03 - @@ -2025,15 +2016,15 @@ *AdityaCommits: 41Joined: 2019-01-04 - *Francisco SaitoCommits: 40Joined: 2011-03-21 + *Kevin SuoCommits: 41Joined: 2020-10-10 - *Grzegorz AraminowiczCommits: 40Joined: 2019-03-08 + *Francisco SaitoCommits: 40Joined: 2011-03-21 - *Kevin SuoCommits: 40Joined: 2020-10-10 + *Grzegorz AraminowiczCommits: 40Joined: 2019-03-08 *Kayo HamidCommits: 39Joined: 2010-10-09 @@ -2047,16 +2038,19 @@ *minwangCommits: 39Joined: 2013-11-04 + *Sarper AkdemirCommits: 39Joined: 2021-04-25 + + *Valentin KettnerCommits: 38Joined: 2014-03-17 *Damjan JovanovicCommits: 38Joined: 2015-08-26 + + *Shivam Kumar SinghCommits: 38Joined: 2020-01-15 - - *Iain BillettCommits: 37Joined: 2012-04-11 @@ -2066,11 +2060,11 @@ *Jennifer LiebelCommits: 37Joined: 2014-08-29 + + *Ayhan YalçınsoyCommits: 37Joined: 2019-12-20 - - *Guillaume PousselCommits: 36Joined: 2010-12-22 @@ -2080,11 +2074,11 @@ *Vinaya MandkeCommits: 36Joined: 2013-02-08 + + *Csikós TamásCommits: 36Joined: 2013-07-01 - - *Priyanka GaikwadCommits: 36Joined: 2013-11-12 @@ -2092,9 +2086,6 @@ *Kohei YoshidaCommits: 36Joined: 2019-08-12 - *Sarper AkdemirCommits: 36Joined: 2021-04-25 - - *Laurent CharrièreCommits: 35Joined: 2010-10-14 @@ -2137,11 +2128,14 @@ *Steve YinCommits: 34Joined: 2013-11-14 - *Aurimas FišerasCommits: 33Joined: 2010-10-11 + *Ilhan YesilCommits: 34Joined: 2018-04-11 + *Aurimas FišerasCommits: 33Joined: 2010-10-11 + + *Cor NouwsCommits: 33Joined: 2011-11-19 @@ -2150,9 +2144,6 @@ *Dennis RoczekCommits: 33Joined: 2015-06-09 - - *Ilhan YesilCommits: 33Joined: 2018-04-11 - @@ -2240,6 +2231,9 @@ + *Thorsten BehrensCommits: 30Joined: 2020-12-19 + + *Harri PitkänenCommits: 29Joined: 2010-10-04 @@ -2248,13 +2242,10 @@ *xinjiangCommits: 29Joined: 2013-11-04 - - *Matthias SeidelCommits: 29Joined: 2017-02-18 - - *Thorsten BehrensCommits: 29Joined: 2020-12-19 + *Matthias SeidelCommits: 29Joined: 2017-02-18 Andre Fischer<andre.f.fischerCommits: 28Joined: 2010-07-21 @@ -2585,11 +2576,14 @@ *Bayram ÇiçekCommits: 17Joined: 2020-11-23 - Florian ReuterCommits: 16Joined: 2010-09-14 + *Mark HungCommits: 17Joined: 2022-05-01 + Florian ReuterCommits: 16Joined: 2010-09-14 + + *Luke DixonCommits: 16Joined: 2010-10-26 @@ -2598,11 +2592,11 @@ *Jordan AyersCommits: 16Joined: 2010-11-04 + + *Anders JonssonCommits: 16Joined: 2010-12-11 - - *Maciej RumianowskiCommits: 16Joined: 2011-07-19 @@ -2612,11 +2606,11 @@ *Jean-Noël RouvignacCommits: 16Joined: 2013-01-09 + + *tsahi glikCommits: 16Joined: 2013-06-04 - - *Chris LaplanteCommits: 16Joined: 2014-04-07 @@ -2626,9 +2620,6 @@ *nd101Commits: 16Joined: 2019-07-03 - - *Mark HungCommits: 16Joined: 2022-05-01 - @@ -2758,289 +2749,300 @@ + *Armin Le Grand (allotropia)Commits: 13Joined: 2022-06-27 + + + *Taichi HaradaguchiCommits: 13Joined: 2022-09-06 + + *Jani MonosesCommits: 12Joined: 2010-10-30 *Wilhelm PfluegerCommits: 12Joined: 2011-02-05 + + *Tomas HlavatyCommits: 12Joined: 2011-12-06 *Mariusz DykierekCommits: 12Joined: 2012-01-16 - - *Greg Kroah-HartmanCommits: 12Joined: 2012-02-06 *Gábor StefanikCommits: 12Joined: 2012-04-07 + + *Mirek MazelCommits: 12Joined: 2012-06-05 *Wei WeiCommits: 12Joined: 2013-11-16 - - *kadertarlanCommits: 12Joined: 2015-12-14 *tymyjanCommits: 12Joined: 2016-04-03 + + *Abhilash SinghCommits: 12Joined: 2016-07-22 *Kacper KasperCommits: 12Joined: 2018-02-18 - - *Pelin KuranCommits: 12Joined: 2020-01-25 *Gleb PopovCommits: 12Joined: 2020-10-05 + + *Emircan AgacCommits: 12Joined: 2021-08-02 Mox SoiniCommits: 11Joined: 2008-04-04 - - Frank PetersCommits: 11Joined: 2010-05-20 *Jonas Finnemann JensenCommits: 11Joined: 2010-10-01 + + *René KjellerupCommits: 11Joined: 2010-10-14 *Peter RabiCommits: 11Joined: 2011-07-14 - - *David BolenCommits: 11Joined: 2012-03-07 *Jung-uk KimCommits: 11Joined: 2012-08-13 + + *Enrico Weigelt, metux ITSCommits: 11Joined: 2012-11-14 *Abdulaziz A AlayedCommits: 11Joined: 2013-01-22 - - *Sean YoungCommits: 11Joined: 2013-05-16 *Krunoslav ŠebetićCommits: 11Joined: 2013-07-18 + + *Charu TyagiCommits: 11Joined: 2014-06-25 *Michael JaumannCommits: 11Joined: 2014-09-02 - - *Phillip SzCommits: 11Joined: 2015-03-16 *nadithCommits: 11Joined: 2016-07-14 + + *Maarten BosmansCommits: 11Joined: 2016-08-24 *Fakabbir AminCommits: 11Joined: 2017-01-29 - - *Colomban WendlingCommits: 11Joined: 2017-03-15 *jmzambonCommits: 11Joined: 2017-05-19 + + *Manuj VashistCommits: 11Joined: 2017-12-10 *Milian WolffCommits: 11Joined: 2018-01-10 - - *Abhyudaya SharmaCommits: 11Joined: 2018-03-19 *Srijan BhatiaCommits: 11Joined: 2020-05-30 + + *shubham656Commits: 11Joined: 2020-11-07 *AnshuCommits: 11Joined: 2020-11-09 - - *Jeff HuangCommits: 11Joined: 2021-04-12 *Timo HeinoCommits: 10Joined: 2010-11-22 + + *Luke PetrolekasCommits: 10Joined: 2011-02-12 *Theo van KlaverenCommits: 10Joined: 2011-03-10 - - *Troy RolloCommits: 10Joined: 2011-07-11 *Kristian RietveldCommits: 10Joined: 2011-10-15 + + *David VogtCommits: 10Joined: 2012-02-05 *Jianyuan LiCommits: 10Joined: 2012-08-16 - - *Stefan WeibergCommits: 10Joined: 2014-08-28 *Benjamin NiCommits: 10Joined: 2015-04-02 + + *Arul MichaelCommits: 10Joined: 2016-01-05 *Chirag ManwaniCommits: 10Joined: 2016-02-16 - - *Dilek UzulmezCommits: 10Joined: 2016-10-15 *Kiyotaka NishiboriCommits: 10Joined: 2017-08-27 + + *Rahul GurungCommits: 10Joined: 2018-08-26 *Mark RobbinsonCommits: 10Joined: 2019-01-02 - - *A_GANCommits: 10Joined: 2020-01-25 *Michael WarnerCommits: 10Joined: 2020-05-24 + + *Vert DCommits: 10Joined: 2020-09-26 *tusharCommits: 10Joined: 2021-01-10 - - *Vincent LE GARRECCommits: 10Joined: 2021-02-21 *Balazs SanthaCommits: 10Joined: 2021-02-26 + + *xuenhuaCommits: 10Joined: 2022-04-08 *Mattias JohnssonCommits: 9Joined: 2010-10-18 - - *Surendran MahendranCommits: 9Joined: 2010-11-05 *Steven ButlerCommits: 9Joined: 2011-01-07 + + *Robinson TryonCommits: 9Joined: 2012-06-21 *Mihkel TõnnovCommits: 9Joined: 2012-07-02 - - *Michael DunphyCommits: 9Joined: 2013-04-18 *Dinesh PatilCommits: 9Joined: 2014-03-12 + + *Matthew PottageCommits: 9Joined: 2014-07-26 *Deena FrancisCommits: 9Joined: 2014-07-29 - - *Ryan McCoskrieCommits: 9Joined: 2014-09-14 *Jun NogataCommits: 9Joined: 2015-01-07 + + *Aybuke OzdemirCommits: 9Joined: 2015-10-07 *skswalesCommits: 9Joined: 2016-05-06 - - *pv2kCommits: 9Joined: 2016-11-28 *Adam KovacsCommits: 9Joined: 2018-08-16 + + *Scott ClarkeCommits: 9Joined: 2019-06-07 *Canberk TURANCommits: 9Joined: 2020-01-25 - - *Jussi PakkanenCommits: 9Joined: 2020-02-22 + *Balazs VargaCommits: 9Joined: 2022-06-29 + + + + *Povilas KanapickasCommits: 9Joined: 2022-08-24 @@ -3049,11 +3051,11 @@ Jody GoldbergCommits: 8Joined: 2010-09-15 - - *Michael CallahanCommits: 8Joined: 2010-12-06 + + *Robert DargaudCommits: 8Joined: 2011-04-12 @@ -3063,11 +3065,11 @@ *Terrence EngerCommits: 8Joined: 2011-10-27 - - *Daisuke NishinoCommits: 8Joined: 2011-11-06 + + *Tomcsik BenceCommits: 8Joined: 2012-01-14 @@ -3077,11 +3079,11 @@ *Norah A. AbanumayCommits: 8Joined: 2012-07-30 - - *Jean-Tiare Le BigotCommits: 8Joined: 2012-08-08 + + *Timothy PearsonCommits: 8Joined: 2012-08-18 @@ -3091,11 +3093,11 @@ *karthCommits: 8Joined: 2013-01-07 - - *Ádám Csaba KirályCommits: 8Joined: 2013-02-28 + + *Brian FraserCommits: 8Joined: 2013-09-03 @@ -3105,11 +3107,11 @@ *Keith CurtisCommits: 8Joined: 2013-12-20 - - *SouravCommits: 8Joined: 2014-03-15 + + *Thomas ViehmannCommits: 8Joined: 2014-08-15 @@ -3119,11 +3121,11 @@ *Ursache VladimirCommits: 8Joined: 2015-02-10 - - *Sean DavisCommits: 8Joined: 2015-06-01 + + *HeiherCommits: 8Joined: 2015-07-07 @@ -3133,11 +3135,11 @@ *Matus UzakCommits: 8Joined: 2016-02-22 - - *Christian BarthCommits: 8Joined: 2017-06-25 + + *ShinnokCommits: 8Joined: 2017-09-06 @@ -3147,11 +3149,11 @@ *Rasmus JonssonCommits: 8Joined: 2019-03-20 - - *Artur NeumannCommits: 8Joined: 2019-06-11 + + *Ouyang LeyanCommits: 8Joined: 2020-09-06 @@ -3161,25 +3163,25 @@ *Gökhan ÖzeloğluCommits: 8Joined: 2020-11-21 - - *Balaharipreetha MuthuCommits: 8Joined: 2020-12-04 + + - *4k5h1tCommits: 8Joined: 2021-08-26 + *Radhey ParekhCommits: 8Joined: 2021-04-01 - *Balazs VargaCommits: 8Joined: 2022-06-29 + *4k5h1tCommits: 8Joined: 2021-08-26 *Thies PierdolaCommits: 7Joined: 2011-01-28 - - *Sergey DavidoffCommits: 7Joined: 2011-04-11 + + *Samuel CantrellCommits: 7Joined: 2011-06-11 @@ -3189,11 +3191,11 @@ *Christoph LutzCommits: 7Joined: 2011-09-06 - - *Keith McRaeCommits: 7Joined: 2012-01-18 + + *Gert van ValkenhoefCommits: 7Joined: 2012-02-14 @@ -3203,11 +3205,11 @@ *Wang LeiCommits: 7Joined: 2012-06-14 - - *Issa AlkurtassCommits: 7Joined: 2012-09-04 + + *Christopher CopitsCommits: 7Joined: 2012-09-19 @@ -3217,11 +3219,11 @@ *Eric SeynaeveCommits: 7Joined: 2013-02-04 - - *SJacobiCommits: 7Joined: 2013-03-05 + + *Roi IllouzCommits: 7Joined: 2013-10-20 @@ -3231,11 +3233,11 @@ *Trent MacAlpineCommits: 7Joined: 2014-03-06 - - *David DelmaCommits: 7Joined: 2014-05-13 + + *Giuseppe BilottaCommits: 7Joined: 2014-09-09 @@ -3245,11 +3247,11 @@ *RaalCommits: 7Joined: 2014-12-31 - - *brinzingCommits: 7Joined: 2015-08-22 + + *Feyza YavuzCommits: 7Joined: 2015-10-04 @@ -3259,11 +3261,11 @@ *Rico TzschichholzCommits: 7Joined: 2016-02-09 - - *apurvapriyadarshiCommits: 7Joined: 2016-05-27 + + *slackaCommits: 7Joined: 2016-07-30 @@ -3273,11 +3275,11 @@ *Tiago SantosCommits: 7Joined: 2016-08-12 - - *HieronymousCommits: 7Joined: 2016-10-13 + + *Ulrich GemkowCommits: 7Joined: 2016-10-27 @@ -3287,11 +3289,11 @@ *Furkan Ahmet KaraCommits: 7Joined: 2017-10-21 - - *Vincas DargisCommits: 7Joined: 2018-01-21 + + *Guilhem MoulinCommits: 7Joined: 2018-02-05 @@ -3301,11 +3303,11 @@ *BugraCommits: 7Joined: 2020-01-30 - - *Chris MayoCommits: 7Joined: 2020-05-08 + + *Pedro Pinto SilvaCommits: 7Joined: 2020-06-16 @@ -3315,162 +3317,154 @@ *Ahmet Hakan ÇelikCommits: 7Joined: 2021-03-07 - - - - *Radhey ParekhCommits: 7Joined: 2021-04-01 - *BaiXiaochunCommits: 7Joined: 2021-06-27 + + *Dhiraj HoldenCommits: 7Joined: 2021-11-30 - *Armin Le Grand (allotropia)Commits: 7Joined: 2022-06-27 + *Liu HaoCommits: 7Joined: 2022-08-14 - - *Phil BordelonCommits: 6Joined: 2010-09-30 *Ricardo MorenoCommits: 6Joined: 2010-11-03 + + *Alexander O. AnisimovCommits: 6Joined: 2010-11-06 *Daniel Di MarcoCommits: 6Joined: 2010-11-15 - - *shiraharaCommits: 6Joined: 2011-01-28 *Xavier ALTCommits: 6Joined: 2011-03-06 + + *Anurag JainCommits: 6Joined: 2011-04-05 *Thomas CollertonCommits: 6Joined: 2011-11-18 - - *David VerrierCommits: 6Joined: 2013-02-26 *Anurag KanungoCommits: 6Joined: 2013-04-19 + + *tianyaoCommits: 6Joined: 2013-11-09 *Jeroen NijhofCommits: 6Joined: 2014-05-01 - - *Kay SchenkCommits: 6Joined: 2014-09-19 *Michel RenonCommits: 6Joined: 2015-05-19 + + *Fabio BusoCommits: 6Joined: 2015-11-01 *Sedat AkCommits: 6Joined: 2015-11-08 - - *Guillaume SmahaCommits: 6Joined: 2015-11-25 *Ricardo PalomaresCommits: 6Joined: 2016-01-16 + + *baltasarqCommits: 6Joined: 2016-02-24 *Steven GuoCommits: 6Joined: 2016-03-02 - - *ChamalCommits: 6Joined: 2016-08-01 *RosenCommits: 6Joined: 2016-08-04 + + *giaccoCommits: 6Joined: 2016-10-11 *abdulwdCommits: 6Joined: 2016-12-22 - - *Gian Domenico CeccariniCommits: 6Joined: 2017-01-13 *Jean-Sebastien BevilacquaCommits: 6Joined: 2017-02-09 + + *udareechkCommits: 6Joined: 2017-09-20 *Kemal AyhanCommits: 6Joined: 2019-12-18 - - *Gökay ŞATIRCommits: 6Joined: 2019-12-24 *Batuhan TaskayaCommits: 6Joined: 2020-01-25 + + *Mehmet Emin BaşoğluCommits: 6Joined: 2020-01-25 *iakarsuCommits: 6Joined: 2020-01-25 - - *Ivan StefanenkoCommits: 6Joined: 2020-08-26 *ViKrAm-BaisCommits: 6Joined: 2021-01-07 + + *msrijita18Commits: 6Joined: 2021-01-26 *Henrik PalomäkiCommits: 6Joined: 2021-10-18 - - *Ramreiso KashungCommits: 6Joined: 2021-12-22 - *Liu HaoCommits: 6Joined: 2022-08-14 - - *Gil ForcadaCommits: 5Joined: 2010-09-28 + + *David HobleyCommits: 5Joined: 2010-10-04 - - *Bernhard RosenkraenzerCommits: 5Joined: 2010-11-01 @@ -3480,11 +3474,11 @@ *Tobias RosenbergerCommits: 5Joined: 2011-01-31 + + *Jeffrey ChangCommits: 5Joined: 2011-06-01 - - *ericb2Commits: 5Joined: 2011-10-30 @@ -3494,11 +3488,11 @@ *Gustavo Buzzatti PachecoCommits: 5Joined: 2011-12-15 + + *Wei Ming KhooCommits: 5Joined: 2012-02-17 - - *Lionel DricotCommits: 5Joined: 2012-06-04 @@ -3508,11 +3502,11 @@ *Bence BabatiCommits: 5Joined: 2012-08-13 + + *Pavel JaníkCommits: 5Joined: 2012-11-29 - - *Werner KoernerCommits: 5Joined: 2012-12-11 @@ -3522,11 +3516,11 @@ *Miguel GomezCommits: 5Joined: 2013-04-02 + + *pje335_NLCommits: 5Joined: 2013-05-10 - - *Ciorba EdmondCommits: 5Joined: 2013-06-11 @@ -3536,11 +3530,11 @@ *MÁTÉ GergelyCommits: 5Joined: 2013-07-19 + + *Timothy MarkleCommits: 5Joined: 2014-01-31 - - *Jan KantertCommits: 5Joined: 2014-06-12 @@ -3550,11 +3544,11 @@ *Berk GurekenCommits: 5Joined: 2015-10-01 + + *Yossi ZahnCommits: 5Joined: 2016-11-25 - - *Edmund WongCommits: 5Joined: 2016-12-08 @@ -3564,11 +3558,11 @@ *tamsil1amani3Commits: 5Joined: 2016-12-22 + + *Lukas RöllinCommits: 5Joined: 2017-02-06 - - *Paul MenzelCommits: 5Joined: 2017-05-17 @@ -3578,11 +3572,11 @@ *Tolunay DündarCommits: 5Joined: 2019-12-18 + + *Eda Nur VarCommits: 5Joined: 2020-01-25 - - *Yukio SiraichiCommits: 5Joined: 2020-03-09 @@ -3592,11 +3586,11 @@ *gokaysatirCommits: 5Joined: 2020-08-08 + + *Gabriel MaseiCommits: 5Joined: 2020-09-02 - - *Tomofumi YagiCommits: 5Joined: 2020-09-12 @@ -3606,11 +3600,11 @@ *Georgy LitvinovCommits: 5Joined: 2020-12-16 + + *Suhaas JoshiCommits: 5Joined: 2021-01-04 - - *Baran AytasCommits: 5Joined: 2021-08-22 @@ -3620,11 +3614,11 @@ *flywireCommits: 5Joined: 2021-11-12 + + *Pragat PandyaCommits: 5Joined: 2022-02-01 - - *zhutyraCommits: 5Joined: 2022-02-01 @@ -3634,11 +3628,11 @@ *Siddhant ChaudharyCommits: 5Joined: 2022-03-11 + + *Florian BircherCommits: 4Joined: 2010-10-16 - - *Andrew C. E. DentCommits: 4Joined: 2010-10-24 @@ -3648,11 +3642,11 @@ *Maja DjordjevicCommits: 4Joined: 2011-01-06 + + *An LeendersCommits: 4Joined: 2011-01-25 - - *Alexander ThurgoodCommits: 4Joined: 2011-01-26 @@ -3662,11 +3656,11 @@ *Michael MuenchCommits: 4Joined: 2011-02-13 + + *Pantelis KoukousoulasCommits: 4Joined: 2011-03-14 - - *Samphan RaruenromCommits: 4Joined: 2011-03-24 @@ -3676,11 +3670,11 @@ *Roland BaudinCommits: 4Joined: 2011-05-16 + + *André SchnabelCommits: 4Joined: 2011-05-31 - - *Tom TromeyCommits: 4Joined: 2011-08-11 @@ -3690,11 +3684,11 @@ *Cheng-Chia TsengCommits: 4Joined: 2012-01-16 + + *Kate GossCommits: 4Joined: 2012-02-11 - - *Mariana MarasoiuCommits: 4Joined: 2012-03-14 @@ -3704,11 +3698,11 @@ *Raimundo MouraCommits: 4Joined: 2012-06-16 + + *Florian ReisingerCommits: 4Joined: 2012-06-22 - - *Nicholas ShanksCommits: 4Joined: 2012-09-04 @@ -3718,11 +3712,11 @@ *Joan MontanéCommits: 4Joined: 2013-02-22 + + *XiaoliCommits: 4Joined: 2013-03-23 - - *Sameer DeshmukhCommits: 4Joined: 2013-04-20 @@ -3732,11 +3726,11 @@ *Elie RouxCommits: 4Joined: 2013-05-29 + + *Nourah.AlShoeibiCommits: 4Joined: 2013-07-07 - - *Honza HavlíčekCommits: 4Joined: 2013-07-27 @@ -3746,11 +3740,11 @@ *Robert CampbellCommits: 4Joined: 2013-11-13 + + *Ulrich KitzingerCommits: 4Joined: 2013-11-30 - - *Ken BiondiCommits: 4Joined: 2014-03-05 @@ -3760,11 +3754,11 @@ *Simon DannerCommits: 4Joined: 2014-08-02 + + *Kevin SuoCommits: 4Joined: 2014-11-06 - - *Aleksandr AndreevCommits: 4Joined: 2015-04-20 @@ -3774,11 +3768,11 @@ *Sahasranaman M SCommits: 4Joined: 2015-10-04 + + *ccshellerCommits: 4Joined: 2015-10-08 - - *pasqual milvaquesCommits: 4Joined: 2015-12-02 @@ -3788,11 +3782,11 @@ *Burcin AkalinCommits: 4Joined: 2015-12-18 + + *Kumar ThangavelCommits: 4Joined: 2016-01-04 - - *erdemdemirkapiCommits: 4Joined: 2016-01-30 @@ -3802,11 +3796,11 @@ *dtmCommits: 4Joined: 2016-02-11 + + *Tim EvesCommits: 4Joined: 2016-02-23 - - *GurkaranCommits: 4Joined: 2016-03-17 @@ -3816,11 +3810,11 @@ *Gaurav DhingraCommits: 4Joined: 2016-12-03 + + *Patrick JaapCommits: 4Joined: 2017-01-30 - - *Piotr DrągCommits: 4Joined: 2017-03-05 @@ -3830,11 +3824,11 @@ *Olivier TilloyCommits: 4Joined: 2018-01-08 + + *Jon NermutCommits: 4Joined: 2018-01-20 - - *Jozsef SzakacsCommits: 4Joined: 2018-11-07 @@ -3844,11 +3838,11 @@ *dldldCommits: 4Joined: 2019-12-18 + + *Aleyna DoğrucanCommits: 4Joined: 2019-12-28 - - *Efdal İncesuCommits: 4Joined: 2020-01-25 @@ -3858,11 +3852,11 @@ *Hakan BakacakCommits: 4Joined: 2020-01-26 + + *Burak BalaCommits: 4Joined: 2020-01-26 - - *Mohamed SamehCommits: 4Joined: 2020-02-11 @@ -3872,11 +3866,11 @@ *Gokce KulerCommits: 4Joined: 2020-10-20 + + *VishwasCommits: 4Joined: 2020-12-31 - - *Aditya Pratap SinghCommits: 4Joined: 2021-02-01 @@ -3886,11 +3880,11 @@ *HosseinCommits: 4Joined: 2021-03-23 + + *tobiasCommits: 4Joined: 2021-06-03 - - *Gopi Krishna MenonCommits: 4Joined: 2021-06-07 @@ -3900,11 +3894,11 @@ *Juan C. SanzCommits: 4Joined: 2021-09-03 + + *jsalaCommits: 4Joined: 2022-06-19 - - *ehsanCommits: 4Joined: 2022-07-01 @@ -3914,11 +3908,11 @@ *Jacopo NespoloCommits: 3Joined: 2010-10-01 + + *Alan DuCommits: 3Joined: 2010-10-12 - - *Gioele BarabucciCommits: 3Joined: 2010-11-18 @@ -3928,11 +3922,11 @@ *Pascal UllrichCommits: 3Joined: 2010-12-28 + + *Jonathan AquilinaCommits: 3Joined: 2011-01-18 - - *Michael KochCommits: 3Joined: 2011-01-21 @@ -3942,11 +3936,11 @@ *Chris Carpenter(mordocai)Commits: 3Joined: 2011-02-02 + + *Tantai TanakanokCommits: 3Joined: 2011-02-09 - - *David NalleyCommits: 3Joined: 2011-03-03 @@ -3956,11 +3950,11 @@ *Anthony DurityCommits: 3Joined: 2011-04-18 + + *Dimitri DucCommits: 3Joined: 2011-04-19 - - *Mike EberdtCommits: 3Joined: 2011-07-12 @@ -3970,11 +3964,11 @@ *Dmitry AshkadovCommits: 3Joined: 2011-08-29 + + *Michael BauerCommits: 3Joined: 2011-11-23 - - *Sérgio MarquesCommits: 3Joined: 2011-11-25 @@ -3984,11 +3978,11 @@ *Cameron PaulCommits: 3Joined: 2012-02-27 + + *Tom ThorogoodCommits: 3Joined: 2012-02-28 - - *Stephan van den AkkerCommits: 3Joined: 2012-06-07 @@ -3998,11 +3992,11 @@ *Mathieu VonlanthenCommits: 3Joined: 2012-07-19 + + *Bertrand LorentzCommits: 3Joined: 2012-08-03 - - *Oliver GüntherCommits: 3Joined: 2012-08-09 @@ -4012,11 +4006,11 @@ *Jeremy BrownCommits: 3Joined: 2012-09-19 + + *Peter BaumgartenCommits: 3Joined: 2012-11-24 - - *Markus MaierCommits: 3Joined: 2012-11-25 @@ -4026,11 +4020,11 @@ *Dávid VastagCommits: 3Joined: 2013-02-04 + + *Stefan SchickCommits: 3Joined: 2013-02-18 - - *Petr KrausCommits: 3Joined: 2013-03-26 @@ -4040,11 +4034,11 @@ *vjinochCommits: 3Joined: 2013-04-09 + + *Jason HulmeCommits: 3Joined: 2013-06-05 - - *Nagy AkosCommits: 3Joined: 2013-06-27 @@ -4054,11 +4048,11 @@ *Haidong LianCommits: 3Joined: 2013-07-24 + + *Tobias MuellerCommits: 3Joined: 2014-02-10 - - *Peter Senna TschudinCommits: 3Joined: 2014-05-26 @@ -4068,11 +4062,11 @@ *Renato FerreiraCommits: 3Joined: 2014-11-15 + + *Popa Adrian MariusCommits: 3Joined: 2015-03-23 - - *Matthew NichollsCommits: 3Joined: 2015-04-01 @@ -4082,11 +4076,11 @@ *Marek DoleželCommits: 3Joined: 2015-07-06 + + *Simon LongCommits: 3Joined: 2015-07-08 - - *Lucas SatabinCommits: 3Joined: 2015-08-25 @@ -4094,171 +4088,179 @@ *n.r.pearsonCommits: 3Joined: 2015-09-09 - *AlexFCommits: 3Joined: 2015-11-12 + *Sergey FukanchikCommits: 3Joined: 2015-09-17 + + + + + *AlexFCommits: 3Joined: 2015-11-12 *Giovanni CaligarisCommits: 3Joined: 2015-11-30 - - *Mayank GuptaCommits: 3Joined: 2016-03-11 *Johannes BergCommits: 3Joined: 2016-08-03 + + *drazilCommits: 3Joined: 2016-08-27 *Jacek FraczekCommits: 3Joined: 2016-10-05 - - *liongoldCommits: 3Joined: 2016-11-21 *John Paul Adrian GlaubitzCommits: 3Joined: 2016-11-27 + + *bansan85Commits: 3Joined: 2016-12-21 *Dimitri BouronCommits: 3Joined: 2016-12-22 - - *Ivan SafonovCommits: 3Joined: 2017-07-13 *Gabriel ChiquiniCommits: 3Joined: 2017-10-01 + + *Bán RóbertCommits: 3Joined: 2017-10-25 *Mark VecsernyesCommits: 3Joined: 2017-11-15 - - *Gergely TarsolyCommits: 3Joined: 2017-11-28 *Ahmed GHANMICommits: 3Joined: 2017-11-30 + + *Abhishek ShrivastavaCommits: 3Joined: 2018-01-17 *TelestoCommits: 3Joined: 2018-01-22 - - *Bartosz KosiorekCommits: 3Joined: 2018-02-07 *Shubham VermaCommits: 3Joined: 2018-02-17 + + *Laurent GodardCommits: 3Joined: 2018-04-24 *Ulkem KasapogluCommits: 3Joined: 2018-07-04 - - *Salih SariyarCommits: 3Joined: 2019-02-09 *Omer Fatih CelikCommits: 3Joined: 2019-02-10 + + *Meryem EzberCommits: 3Joined: 2019-02-10 *Andrés MaldonadoCommits: 3Joined: 2019-02-21 - - *EL-SHREIFCommits: 3Joined: 2019-02-24 *Stepas ToliautasCommits: 3Joined: 2019-12-16 + + *Michel ThomasCommits: 3Joined: 2020-02-01 *nienzuCommits: 3Joined: 2020-02-19 - - *Julian KalinowskiCommits: 3Joined: 2020-03-31 *Ian Barkley-YeungCommits: 3Joined: 2020-04-06 + + *Pierre MartyCommits: 3Joined: 2020-04-17 *Eivind SamsethCommits: 3Joined: 2020-05-16 - - *yakovruCommits: 3Joined: 2020-06-17 *mariamfahmyCommits: 3Joined: 2020-10-16 + + *Leo WangCommits: 3Joined: 2020-10-18 *Gizem OzgunCommits: 3Joined: 2020-10-23 - - *Tarun SharmaCommits: 3Joined: 2021-01-14 *Stéphane GuillouCommits: 3Joined: 2021-01-22 + + *Zeynep YavuzCommits: 3Joined: 2021-08-02 *Natalia GavrilovaCommits: 3Joined: 2021-09-24 - - *Verne-LaiCommits: 3Joined: 2021-10-01 *Arnaud VERSINICommits: 3Joined: 2021-12-19 + + *Renwa HiwaCommits: 3Joined: 2022-02-09 *Tushar JhamCommits: 3Joined: 2022-02-21 - - *Isha_DesaiCommits: 3Joined: 2022-04-06 + *PoonamShokeenCommits: 3Joined: 2022-07-21 + + + + *Chenxiong QiCommits: 3Joined: 2022-08-27 @@ -4267,11 +4269,11 @@ *Justin MalcolmCommits: 2Joined: 2010-09-29 - - *Seo SanghyeonCommits: 2Joined: 2010-09-29 + + *Sean McNamaraCommits: 2Joined: 2010-09-29 @@ -4281,11 +4283,11 @@ *Sean McMurrayCommits: 2Joined: 2010-10-20 - - *Nadav VinikCommits: 2Joined: 2010-10-21 + + *Marcin eXine MCommits: 2Joined: 2010-11-02 @@ -4295,11 +4297,11 @@ *Christoph NoackCommits: 2Joined: 2010-12-13 - - *Sophie GautierCommits: 2Joined: 2010-12-19 + + *Ed DeanCommits: 2Joined: 2011-01-14 @@ -4309,11 +4311,11 @@ *Karsten GerloffCommits: 2Joined: 2011-02-06 - - *Jean Charles PapinCommits: 2Joined: 2011-02-11 + + *Tobias KranzCommits: 2Joined: 2011-02-17 @@ -4323,11 +4325,11 @@ *Michael NattererCommits: 2Joined: 2011-04-08 - - *Cyril RoelandtCommits: 2Joined: 2011-04-26 + + *Kelly AndersonCommits: 2Joined: 2011-05-31 @@ -4337,11 +4339,11 @@ *Mohammad ElahiCommits: 2Joined: 2011-08-27 - - *Takashi NakamotoCommits: 2Joined: 2011-08-28 + + *Andreu Correa CasablancaCommits: 2Joined: 2011-09-11 @@ -4351,11 +4353,11 @@ *Arno TeigsethCommits: 2Joined: 2011-09-14 - - *Maxim IorshCommits: 2Joined: 2011-10-05 + + *Emanuele FiaCommits: 2Joined: 2011-11-02 @@ -4365,11 +4367,11 @@ *Mateusz ZasuwikCommits: 2Joined: 2011-12-20 - - *Milos SramekCommits: 2Joined: 2012-01-20 + + *Andreas SchierlCommits: 2Joined: 2012-01-30 @@ -4379,11 +4381,11 @@ *UrmasCommits: 2Joined: 2012-02-13 - - *Bartolomé Sánchez SaladoCommits: 2Joined: 2012-02-18 + + *Greggory HernandezCommits: 2Joined: 2012-02-22 @@ -4393,11 +4395,11 @@ *Karthik A PadmanabhanCommits: 2Joined: 2012-03-31 - - *Mark WolfCommits: 2Joined: 2012-04-04 + + *Andrew HigginsonCommits: 2Joined: 2012-04-10 @@ -4407,11 +4409,11 @@ *Ferran VidalCommits: 2Joined: 2012-04-21 - - *Vicente VendrellCommits: 2Joined: 2012-04-23 + + *David SteeleCommits: 2Joined: 2012-04-24 @@ -4421,11 +4423,11 @@ *Marc GarciaCommits: 2Joined: 2012-05-04 - - *Martyn RussellCommits: 2Joined: 2012-06-07 + + *Jesso Clarence MuruganCommits: 2Joined: 2012-06-23 @@ -4435,11 +4437,11 @@ *Yuri DarioCommits: 2Joined: 2012-07-18 - - *Horacio FernandesCommits: 2Joined: 2012-07-20 + + *Andras BartekCommits: 2Joined: 2012-08-06 @@ -4449,11 +4451,11 @@ *Johann MessnerCommits: 2Joined: 2012-08-28 - - *Flex LiuCommits: 2Joined: 2012-09-04 + + *Sergey FarbotkaCommits: 2Joined: 2012-09-21 @@ -4463,11 +4465,11 @@ *Christos StrubulisCommits: 2Joined: 2012-12-09 - - *Arne de BruijnCommits: 2Joined: 2012-12-11 + + *Milan CrhaCommits: 2Joined: 2013-02-07 @@ -4477,11 +4479,11 @@ *Gregg KingCommits: 2Joined: 2013-02-26 - - *Benedikt MorbachCommits: 2Joined: 2013-03-10 + + *Moritz KuettCommits: 2Joined: 2013-03-23 @@ -4491,11 +4493,11 @@ *Janit AnjariaCommits: 2Joined: 2013-04-19 - - *mmeof2Commits: 2Joined: 2013-05-03 + + *Donizete WaterkemperCommits: 2Joined: 2013-05-23 @@ -4505,11 +4507,11 @@ *Jing XianCommits: 2Joined: 2013-06-26 - - *Chris HoppeCommits: 2Joined: 2013-06-27 + + *Ri GangHuCommits: 2Joined: 2013-07-28 @@ -4519,11 +4521,11 @@ *Viktor VargaCommits: 2Joined: 2013-08-28 - - *Janos FaragoCommits: 2Joined: 2013-09-03 + + *Richard HughesCommits: 2Joined: 2013-10-01 @@ -4533,11 +4535,11 @@ *Jagan LokanathaCommits: 2Joined: 2013-11-19 - - *Anderson RobertoCommits: 2Joined: 2014-01-15 + + *Martin LiškaCommits: 2Joined: 2014-03-26 @@ -4547,11 +4549,11 @@ *Hussian AlamriCommits: 2Joined: 2014-05-14 - - *Mukhiddin YusupovCommits: 2Joined: 2014-05-19 + + *Clarence GuoCommits: 2Joined: 2014-05-26 @@ -4561,11 +4563,11 @@ *Boris EgorovCommits: 2Joined: 2014-09-08 - - *YiiChang YenCommits: 2Joined: 2014-10-16 + + *Vinicius VendraminiCommits: 2Joined: 2014-10-22 @@ -4575,11 +4577,11 @@ *Daniel StoneCommits: 2Joined: 2014-10-29 - - *Supreme AryalCommits: 2Joined: 2014-12-04 + + *Gary HoustonCommits: 2Joined: 2014-12-15 @@ -4589,11 +4591,11 @@ *Clément LassieurCommits: 2Joined: 2014-12-21 - - *Rimas KudelisCommits: 2Joined: 2015-01-06 + + *dbeurleCommits: 2Joined: 2015-01-12 @@ -4603,11 +4605,11 @@ *gamebusterzCommits: 2Joined: 2015-02-19 - - *Piet van OostrumCommits: 2Joined: 2015-03-12 + + *Laszlo Kis-AdamCommits: 2Joined: 2015-03-12 @@ -4617,11 +4619,11 @@ *Jingtao YanCommits: 2Joined: 2015-03-23 - - *Austin ChenCommits: 2Joined: 2015-03-25 + + *Valter MuraCommits: 2Joined: 2015-06-07 @@ -4631,433 +4633,436 @@ *Lubosz SarneckiCommits: 2Joined: 2015-08-20 - - - - *Sergey FukanchikCommits: 2Joined: 2015-09-17 - *alexey.chemichevCommits: 2Joined: 2015-11-18 + + *Sheikha AL-HinaiCommits: 2Joined: 2015-12-28 *Yogesh DesaiCommits: 2Joined: 2016-01-05 - - *Kenneth KoskiCommits: 2Joined: 2016-02-20 *ackepenekCommits: 2Joined: 2016-02-21 + + *Martin NathansenCommits: 2Joined: 2016-04-18 *Michal KubecekCommits: 2Joined: 2016-06-02 - - *Akash DeshpandeCommits: 2Joined: 2016-08-13 *Sophie SuCommits: 2Joined: 2016-08-27 + + *sllCommits: 2Joined: 2016-09-06 *Pierre LepageCommits: 2Joined: 2016-11-05 - - *Tibor MógerCommits: 2Joined: 2016-12-06 *G_ZoltanCommits: 2Joined: 2016-12-27 + + *George KorepanovCommits: 2Joined: 2017-01-06 *Jeremy BichaCommits: 2Joined: 2017-02-06 - - *JeevanCommits: 2Joined: 2017-03-04 *blendergeekCommits: 2Joined: 2017-04-08 + + *Alexey VlasovCommits: 2Joined: 2017-04-12 *fxwanCommits: 2Joined: 2017-05-15 - - *Yash SrivastavCommits: 2Joined: 2017-06-20 *Sabin FrandesCommits: 2Joined: 2017-09-15 + + *Your NameCommits: 2Joined: 2017-10-09 *G??bor KoruhelyCommits: 2Joined: 2017-10-25 - - *Furkan TokacCommits: 2Joined: 2017-10-25 *Timotej LazarCommits: 2Joined: 2017-11-22 + + *martinb214Commits: 2Joined: 2017-11-28 *Jon NermutCommits: 2Joined: 2018-01-13 - - *Denis ArnaudCommits: 2Joined: 2018-01-16 *brian houston morrowCommits: 2Joined: 2018-01-24 + + *Dmitri KharchevCommits: 2Joined: 2018-01-27 *Andika TriwidadaCommits: 2Joined: 2018-02-15 - - *Franklin WengCommits: 2Joined: 2018-02-28 *Victor MireyevCommits: 2Joined: 2018-05-04 + + *Kevin DubrulleCommits: 2Joined: 2018-07-07 *George WoodCommits: 2Joined: 2018-07-25 - - *Réka CsékeiCommits: 2Joined: 2018-10-09 *Simon QuigleyCommits: 2Joined: 2018-10-11 + + *Mark DoboCommits: 2Joined: 2018-10-20 *Izabela BakollariCommits: 2Joined: 2018-10-27 - - *Alyssa RossCommits: 2Joined: 2018-11-18 *Tóth AttilaCommits: 2Joined: 2018-12-30 + + *Patrik VasCommits: 2Joined: 2018-12-31 *Dawid GanCommits: 2Joined: 2019-01-09 - - *Sass DávidCommits: 2Joined: 2019-01-09 *kaishu-sahuCommits: 2Joined: 2019-01-27 + + *Phil KrylovCommits: 2Joined: 2019-02-10 *Muzaffer Kadir YILMAZCommits: 2Joined: 2019-02-10 - - *Alexander FarrowCommits: 2Joined: 2019-03-19 *Jaromir WysogladCommits: 2Joined: 2019-03-27 + + *Rtch90Commits: 2Joined: 2019-04-22 *DarkByt31Commits: 2Joined: 2019-04-22 - - *wishawaCommits: 2Joined: 2019-04-29 *DaeHyun SungCommits: 2Joined: 2019-06-01 + + *John ZhangCommits: 2Joined: 2019-09-23 *Mayank SumanCommits: 2Joined: 2019-10-03 - - *shameempkCommits: 2Joined: 2019-10-09 *Mattia RizzoloCommits: 2Joined: 2019-10-23 + + *Batuhan Görkem BenzerCommits: 2Joined: 2019-12-18 *Desmin AlpaslanCommits: 2Joined: 2019-12-18 - - *Luca CarlonCommits: 2Joined: 2020-01-11 *Bjoern KirchhoffCommits: 2Joined: 2020-01-15 + + *Burak BalaCommits: 2Joined: 2020-01-25 *Marina LatiniCommits: 2Joined: 2020-02-11 - - *AlanTangCommits: 2Joined: 2020-02-25 *jamesCommits: 2Joined: 2020-02-28 + + *Andrew Lee (李健秋)Commits: 2Joined: 2020-03-07 *Jean-Louis FuchsCommits: 2Joined: 2020-03-10 - - *shivammoreCommits: 2Joined: 2020-03-18 *FatihCommits: 2Joined: 2020-04-23 + + *Yunusemre ŞentürkCommits: 2Joined: 2020-05-14 *Ilkyu JuCommits: 2Joined: 2020-08-08 - - *Nnamani EzinneCommits: 2Joined: 2020-08-22 *Luke DixonCommits: 2Joined: 2020-08-30 + + *Sven LüppkenCommits: 2Joined: 2020-10-30 *Zeynep İnkayaCommits: 2Joined: 2020-11-21 - - *Gül ToksözCommits: 2Joined: 2020-11-21 *Bartu BayazıtCommits: 2Joined: 2020-11-21 + + *Mücahid AydinCommits: 2Joined: 2020-11-21 *ShyamPraveenSinghCommits: 2Joined: 2020-11-24 - - *DuP-491Commits: 2Joined: 2020-12-13 *siddheshpatil777Commits: 2Joined: 2020-12-19 + + *halfhiddencodeCommits: 2Joined: 2020-12-26 *princesinghtomarCommits: 2Joined: 2020-12-28 - - *AlchemistCommits: 2Joined: 2020-12-31 *ShobhitCommits: 2Joined: 2021-01-30 + + *Quan NguyenCommits: 2Joined: 2021-02-09 *Eyal RozenbergCommits: 2Joined: 2021-02-13 - - *Buse OrakCommits: 2Joined: 2021-02-13 *MoazCommits: 2Joined: 2021-02-21 + + *Winston Min TjongCommits: 2Joined: 2021-03-02 *Gökay ŞatırCommits: 2Joined: 2021-03-14 - - *PanosCommits: 2Joined: 2021-03-23 *rounakCommits: 2Joined: 2021-03-31 + + *sarynasserCommits: 2Joined: 2021-04-10 *Mihail BalabanovCommits: 2Joined: 2021-04-11 - - *haru-02Commits: 2Joined: 2021-04-21 *Batmunkh DorjgotovCommits: 2Joined: 2021-04-27 + + *Harshita NagCommits: 2Joined: 2021-06-25 *Sabyasachi BhoiCommits: 2Joined: 2021-07-22 - - *HuilinCommits: 2Joined: 2021-07-24 *oguzbalkayaCommits: 2Joined: 2021-08-03 + + *Ankur KhandelwalCommits: 2Joined: 2021-08-09 *Karan AbrolCommits: 2Joined: 2021-08-11 - - *Emanuel SchorschCommits: 2Joined: 2021-10-04 *HarjotCommits: 2Joined: 2021-11-17 + + *Pesi TaototoCommits: 2Joined: 2021-12-05 *Sinduja YCommits: 2Joined: 2022-02-07 - - *Kunal PawarCommits: 2Joined: 2022-02-10 *psidiumcodeCommits: 2Joined: 2022-02-15 + + *Gautham KrishnanCommits: 2Joined: 2022-03-01 *Rizal MuttaqinCommits: 2Joined: 2022-04-05 - - *Vincent ReherCommits: 2Joined: 2022-04-06 *Aman JhaCommits: 2Joined: 2022-04-15 + + *LukasCommits: 2Joined: 2022-04-20 *AshSincCommits: 2Joined: 2022-05-19 - - *Kurt NordbackCommits: 2Joined: 2022-05-28 *nazanin yadiCommits: 2Joined: 2022-06-03 + + + + *Laurent BallandCommits: 2Joined: 2022-06-19 + *Nathan Pratta TeodosioCommits: 2Joined: 2022-06-21 - *PoonamShokeenCommits: 2Joined: 2022-07-21 + *Mahdi TizabiCommits: 2Joined: 2022-06-25 + + + *Stanislav LopatinCommits: 2Joined: 2022-08-07 - *Stanislav LopatinCommits: 2Joined: 2022-08-07 + *SatyaCommits: 2Joined: 2022-09-05 - *Taichi HaradaguchiCommits: 2Joined: 2022-09-06 + *galjitCommits: 2Joined: 2022-09-07 *NeilBrownCommits: 1Joined: 2010-09-28 @@ -6835,71 +6840,73 @@ *Diane LeighCommits: 1Joined: 2022-06-18 - *Laurent BallandCommits: 1Joined: 2022-06-19 - - *Mahdyar M. M. SadeghiCommits: 1Joined: 2022-06-22 *Mahkame ArabgariCommits: 1Joined: 2022-06-22 - - - - *Mahdi TizabiCommits: 1Joined: 2022-06-25 - *ParsaCommits: 1Joined: 2022-06-25 + + *Amir HCommits: 1Joined: 2022-06-25 *m.hashemianCommits: 1Joined: 2022-06-29 - - *am.farajiCommits: 1Joined: 2022-07-09 *Mohsen RahimiCommits: 1Joined: 2022-07-10 + + *Ali_AbdollahianCommits: 1Joined: 2022-07-10 *Arman RezaeiCommits: 1Joined: 2022-07-11 - - *wjh-laCommits: 1Joined: 2022-07-27 *Thierry EmeryCommits: 1Joined: 2022-08-08 + + *Niko FinkCommits: 1Joined: 2022-08-09 *cutamarCommits: 1Joined: 2022-08-28 + + *Sam JamesCommits: 1Joined: 2022-09-02 + + + *Aleksa SavicCommits: 1Joined: 2022-09-02 + - *Aleksa SavicCommits: 1Joined: 2022-09-02 + *U-LAPTOP-06BFT6KB\ClientCommits: 1Joined: 2022-09-15 - *SatyaCommits: 1Joined: 2022-09-05 + *Aron FischerCommits: 1Joined: 2022-09-23 - - + + *Nalini Prasad DashCommits: 1Joined: 2022-10-04 + + + - - Contributors to bundled templates + Contributors to bundled templates @@ -6907,7 +6914,7 @@ - *Laurent BPCommits: 49Joined: 2015-11-19 + *Laurent BPCommits: 59Joined: 2015-11-19 *andreas kainzCommits: 23Joined: 2020-04-18 @@ -7004,7 +7011,7 @@ - Developers not committing code since 2010-09-28 + Developers not committing code since 2010-09-28 @@ -7466,17 +7473,17 @@ gh93821Commits: 1Joined: 2010-04-09 - + - Contributors to bundled templates + Contributors to bundled templates - + Oliver BolteCommits: 418Joined: 2004-09-08 @@ -7510,24 +7517,24 @@ Volker Ahrendt [va]Commits: 2Joined: 2002-05-29 - + - We do not distinguish between commits that were imported from the OOo code base and those who went directly into the LibreOffice code base as: - + We do not distinguish between commits that were imported from the OOo code base and those who went directly into the LibreOffice code base as: + - a) it is technically not possible to distinguish between commits that go directly into the LibreOffice code base and commits that were merged in from the OpenOffice.org code base, and + a) it is technically not possible to distinguish between commits that go directly into the LibreOffice code base and commits that were merged in from the OpenOffice.org code base, and - b) contributors to the OOo code base should also be credited for the excellent work they do. + b) contributors to the OOo code base should also be credited for the excellent work they do. - Do note that LibreOffice used to be divided into 20 git repositories. Pushing a change into all repositories will be counted as 20 commits as there is no way to distinguish this from 20 separate commits. - Total contributions to the TDF Wiki - 2772 individuals contributed: + Do note that LibreOffice used to be divided into 20 git repositories. Pushing a change into all repositories will be counted as 20 commits as there is no way to distinguish this from 20 separate commits. + Total contributions to the TDF Wiki + 2775 individuals contributed: @@ -7535,16 +7542,16 @@ - Hrbrgr (47049) + Hrbrgr (48416) - Beluga (32613) + Beluga (33044) - Marric (27211) + Marric (27214) - Raal (19608) + Raal (19645) @@ -7552,18 +7559,18 @@ SteenRønnow (19458) - Manuelf (14807) + Manuelf (14888) - HanV (12631) + Akurery (12939) - Akurery (12618) + HanV (12778) - Bantoniof (11149) + Bantoniof (11163) Pierre-yves samyn (10099) @@ -7572,21 +7579,21 @@ K-j (9376) - Roczek, Dennis (8272) + Penny (8284) - Jayme Barrientos, Adolfo (8026) + Roczek, Dennis (8272) - Penny (7993) + Jayme Barrientos, Adolfo (8049) - Filmsi (7299) + Filmsi (7303) - Stevefanning (6691) + Stevefanning (6832) @@ -7594,7 +7601,7 @@ Goncharuk, Lera (5436) - Gautier, Sophie (5350) + Gautier, Sophie (5352) Nogata Jun (5238) @@ -7605,7 +7612,7 @@ - Uroveits (4543) + Uroveits (4547) Yaron (4222) @@ -7619,6 +7626,9 @@ + Martin187 (3778) + + Tryon, Robinson (3712) @@ -7627,19 +7637,16 @@ Balland-Poirier, Laurent (3512) - - Martin187 (3470) - - Rizmut (3193) + Kevin, Suo (锁琨珑) (3223) - Jeanweber (3121) + Rizmut (3193) - Kevin, Suo (锁琨珑) (3087) + Jeanweber (3121) Hibagonsan (3073) @@ -7647,7 +7654,7 @@ - Prcek (2866) + Prcek (2871) Noorikhah, Hossein (2732) @@ -7670,32 +7677,32 @@ Bielefeld, Rainer (2077) - X1sc0 (1802) + X1sc0 (1806) - Effenberger, Florian (1752) + Diegoperesmarques (1782) - Diegoperesmarques (1746) + Effenberger, Florian (1752) - LobaLuna (1674) + LobaLuna (1692) - Michaelsen, Björn (1554) + Enoki (1559) - Lyzbet (1552) + Michaelsen, Björn (1554) - Iva Ot (1545) + Lyzbet (1552) - Enoki (1535) + Iva Ot (1545) Kolarkater (1418) @@ -7773,13 +7780,13 @@ - Tietze, Heiko (815) + Sanz Cabrero, Juan Carlos (824) - H-k (804) + Tietze, Heiko (818) - Sanz Cabrero, Juan Carlos (794) + H-k (804) Henschel, Regina (784) @@ -7810,21 +7817,21 @@ RobertG (684) - Floris v (660) + AAAA (670) - Rathke, Eike (659) + Rathke, Eike (664) - AAAA (655) + Floris v (660) Kees538 (654) - Vajna, Miklos (646) + Vajna, Miklos (647) @@ -7849,7 +7856,7 @@ Lohmaier, Christian (559) - Sam m (553) + Sam m (554) Elmau (550) @@ -7863,7 +7870,7 @@ Paulo (546) - JO3EMC (530) + JO3EMC (537) Knorr, Stefan (521) @@ -7891,7 +7898,7 @@ Jana.urbanova (478) - Stahl, Michael (472) + Stahl, Michael (473) Veracape (472) @@ -7978,11 +7985,14 @@ Herissongrognon (378) - LenkaD (377) + Hellotheworld (377) + LenkaD (377) + + Emanuel Marcatinco (374) @@ -7991,11 +8001,11 @@ Thackert (359) + + Kara, Muhammet (347) - - Mayan Tigger (347) @@ -8005,11 +8015,11 @@ Vpanter (333) + + Pruegsanusak, Korrawit (330) - - Drodriguez (329) @@ -8017,97 +8027,97 @@ Volkerme (329) + Timotheonb (327) + + + + Wget (323) Arranna (322) - - - Kosiorek, Bartosz (309) + Kosiorek, Bartosz (310) Donaldo (305) + + Khanson679 (305) Tseng, Cheng-Chia (294) - - Heinzws (292) Librelegal (292) + + Lillqvist, Tor (292) Emanuel A. Marcatinco B. (290) - - Dhsung (287) HARA (279) + + Kitaygrad (278) Cheche (277) - - - Hellotheworld (274) + Bergmann, Stephan (270) - Bergmann, Stephan (270) + Ansiklopedici (269) + + Epix (268) Helen russian (268) - - Kaplan, Lior (267) Lodahl (264) + + Dayeong (263) Twistios (259) - - - - Ansiklopedici (258) - Remarques (252) Deemonizer (248) + + Adrianoafonso (246) - - Loic (240) @@ -8117,11 +8127,11 @@ Steve (237) + + Vignoli, Italo (235) - - Maintenance script (235) @@ -8131,11 +8141,11 @@ Mesho (233) + + Bosdonnat, Cédric (231) - - Bedipp (226) @@ -8145,11 +8155,11 @@ Kerwyn (221) + + Jbfaure (220) - - Almusaireae (219) @@ -8159,11 +8169,11 @@ Gilvanvilarim (217) + + Libo02 (217) - - Khirano (215) @@ -8173,12 +8183,11 @@ ZuzuN (208) + + Andreschnabel (207) - - - Daveb (207) @@ -8188,11 +8197,11 @@ Ithaldenni20 (203) + + XsLiDian (203) - - Latini, Marina (202) @@ -8202,11 +8211,11 @@ Wheatbix (198) + + Erhardt (193) - - Schulz, Charles-H. (191) @@ -8216,12 +8225,12 @@ Franklin (188) - - Nemeth (187) - + Nemeth (188) + + Tarnhold (187) @@ -8230,11 +8239,11 @@ Naniud (183) + + Méixome, Antón (179) - - Alkurtass, Issa (178) @@ -8244,11 +8253,11 @@ Raw text (175) + + Madl, Tobias (175) - - Fridrich (172) @@ -8258,11 +8267,11 @@ N.yadi (171) + + Furusho (170) - - Pitkänen, Harri (169) @@ -8272,11 +8281,11 @@ Óvári (165) + + Matuaki (163) - - Ckhe1215 (162) @@ -8286,11 +8295,11 @@ Snelders, Rob (159) + + Ponzo, Gabriele (159) - - Hagar Delest (159) @@ -8300,11 +8309,11 @@ Uminakabkbk (153) + + Pietro (150) - - Slacka (150) @@ -8314,11 +8323,11 @@ Chris-hoh (147) + + Back69 (146) - - Det (145) @@ -8328,77 +8337,88 @@ Mipmap (144) + + + + Teseu (144) + Mamane, Lionel Elie (141) - - Michelr (141) Lorenzo (140) + + Gurbetoğlu, Gökhan (139) Zolnai, Tamás (139) - - De Cuyper, Joren (138) Weissenbacher, Philipp (138) + + Rutilus (138) Abe, Takeshi (138) - - Heliojsf (137) P.guimberteau (137) + + Pepeleduin (137) Norah (135) - - Shunesburg69 (135) Guilhem (134) + + Filhocf (132) Llunak (132) - - Davydych (131) Richteruwe (131) + + Michel, Mathias (129) + Tjhietala (129) + + + Goodlinuxuser (127) + + Ikuya (127) @@ -8441,14 +8461,11 @@ Trapezus (122) - Goodlinuxuser (120) + JohnSmith (120) - JohnSmith (120) - - Liebel, Jennifer (119) @@ -8457,36 +8474,28 @@ Lqju96 (117) - - Spaeth, Sebastian (115) - - Tjhietala (115) - + + Ysabeau (115) Markers (114) - - - - Teseu (114) - Massimo.zaffaina (113) PulkitKrishna00 (113) + + Vohe (113) - - Marcus Gama (112) @@ -8496,11 +8505,11 @@ Medieval (111) + + Bachka (110) - - Monthoflibreoffice bot (110) @@ -8510,11 +8519,11 @@ Jstnlth (108) + + Nyucel (108) - - Salix (107) @@ -8524,11 +8533,11 @@ Stephan.ficht (106) + + Bitsfritz (104) - - Klaibson (104) @@ -8538,11 +8547,11 @@ Mbalabanov (104) + + Timur LOL (102) - - Pechlaner, Wolfgang (102) @@ -8552,11 +8561,11 @@ WillZ (100) + + Android272 (99) - - JeHa (99) @@ -8566,11 +8575,11 @@ Dan (95) + + Vpinheiro (95) - - Köse, Gülşah (94) @@ -8580,11 +8589,11 @@ Geraldg (93) + + MagicFab (93) - - Andreasg (92) @@ -8594,11 +8603,11 @@ Atalanttore (90) + + Frombenny (90) - - Richv2 (90) @@ -8608,11 +8617,11 @@ Catalin Festila (88) + + Hertel, Jesper (88) - - Fišeras, Aurimas (87) @@ -8622,11 +8631,11 @@ Paulojose (87) + + Omori (86) - - Steve- - (86) @@ -8636,11 +8645,11 @@ Evy (84) + + Jfnif (84) - - KorrawitBot (84) @@ -8650,11 +8659,11 @@ Enio.gemmo (81) + + JamesWalker (81) - - Ogervasi (80) @@ -8664,11 +8673,11 @@ KeithCu (79) + + Kjh000121 (79) - - Laveni (79) @@ -8678,11 +8687,11 @@ CharlieRamirezAnimationStudiosMX (78) + + Jwtiyar (78) - - Marcio Oliveira (78) @@ -8692,11 +8701,11 @@ Socetk (77) + + Tommy.WU (77) - - Albino (75) @@ -8706,11 +8715,11 @@ Uwealtmann (75) + + Emoreno (74) - - Lbalbalba (74) @@ -8720,11 +8729,11 @@ Rachel618 (73) + + Castermans, Luc (72) - - Momo50 (72) @@ -8734,11 +8743,11 @@ RalfHB (71) + + Sawakaze (71) - - Al-Harthi, Ahmad Hussein (70) @@ -8748,11 +8757,11 @@ Malhassoun (69) + + Freetank (68) - - Fábio Farias (68) @@ -8762,11 +8771,11 @@ SoNick RND (68) + + Ptux (67) - - Quikee (66) @@ -8776,11 +8785,11 @@ Bmcs (65) + + Kabe (65) - - StanG (65) @@ -8790,11 +8799,11 @@ Oipila (64) + + Ptrsk (64) - - Hanapospisilova (63) @@ -8804,11 +8813,11 @@ Sikeler (63) + + Popa, Adrian Marius (62) - - Thibault, Samuel (62) @@ -8818,11 +8827,11 @@ Frieder (61) + + Jimin (61) - - Arnaudlecam (60) @@ -8832,11 +8841,11 @@ Montané, Joan (60) + + OctopusET (60) - - Piotrekr1 (60) @@ -8846,11 +8855,11 @@ AndikaTriwidada (58) + + Camillem (58) - - Neel, Daniel (58) @@ -8860,11 +8869,11 @@ Kukan, Matúš (58) + + Jihui choi (57) - - Bubli (56) @@ -8874,11 +8883,11 @@ Glen.reesor (56) + + Ramones (56) - - Ramtk6726 (56) @@ -8888,26 +8897,26 @@ Fifh (55) - - Jrahemipour (55) - - Cornell, Clayton (54) + Grandin, Noel (55) - Fanthomas (54) + Jrahemipour (55) - Grandin, Noel (54) + Cornell, Clayton (54) - Mahfiaz (54) + Fanthomas (54) + Mahfiaz (54) + + Heben2 (53) @@ -8916,11 +8925,11 @@ Petrizzo (52) + + ArnoldSchiller (51) - - Helmar (51) @@ -8930,11 +8939,11 @@ Lendo (51) + + Agd (50) - - Halparker (50) @@ -8944,11 +8953,11 @@ Ronaldo (50) + + SeoYeonJin (50) - - Mpescador (49) @@ -8958,11 +8967,11 @@ Vardomescro (49) + + Afaccioli74 (48) - - Lviktoria (48) @@ -8972,11 +8981,11 @@ Tomoyuki, Kubota (47) + + Quest-88 (47) - - Buj Gelonch, Robert Antoni (47) @@ -8986,11 +8995,11 @@ FloF (46) + + Sk94 (46) - - Sveinki (46) @@ -9000,11 +9009,11 @@ Hosny, Khaled (45) + + Lua (45) - - Jung, Philippe (45) @@ -9014,53 +9023,53 @@ Bhorst (44) + + Ikh1 (44) - - + + Jhannine20 (44) + Aaronxu (43) Cottage14 (43) + + Gareth (43) GerhardW (43) - - Wilper, Simon (43) Enger, Terrence (43) + + Donkers, Winfried (43) Bluedwarf (42) - - Fkara (42) - Jhannine20 (42) - - KAMI (42) + + Northwoods35 (42) - - SangwooPark (42) @@ -9070,11 +9079,11 @@ Another sam (41) + + Arjunaraoc (41) - - Joey (41) @@ -9084,11 +9093,11 @@ Pedlino (41) + + Fábio Coelho (40) - - Kraucer (40) @@ -9098,11 +9107,11 @@ Enervation (38) + + Partick.auclair (38) - - Pje335 (38) @@ -9112,11 +9121,11 @@ Budea, Áron (37) + + Cjenkins (37) - - Eliskavotipkova (37) @@ -9126,11 +9135,11 @@ Aragunde Pérez, Jacobo (37) + + Kano (37) - - Kinshuksunil (37) @@ -9138,100 +9147,108 @@ Castle, John LeMoyne (37) + Pavel1513 (37) + + + + RaducuG (37) Sistemo2021 (37) - - Sherlock, Chris (37) Caco13 (36) + + Danishka (36) Weghorn, Michael (36) - - Patheticcockroach (36) Sci citation (36) + + Yan Pashkovsky (36) Andreas ka (35) - - Jingtao, Yan (35) Liongold (35) + + Nora (35) Pingping111 (35) - - Stalker08 (35) Subramanian, Muthu (35) + + Alg (34) Skagh1750 (34) - - Bormant (33) Davidlamhauge (33) + + Corrius, Jesús (33) Lmartinezh (33) - - Marrod (33) Mateus.m.luna (33) + + Pereriksson (33) + Ptoye (33) + + Rafi (33) - - Shirahara (33) + + Alexanderwerner (32) @@ -9240,12 +9257,12 @@ Clio (32) - - - + Daud (32) + + Kłos, Szymon (32) @@ -9255,263 +9272,263 @@ Marinello, Marco (32) - - Dryomov, Artur (32) + + Monocat (32) - Ptoye (32) - - Vulcain (32) - - Xuacu (32) Chloeeekim (31) + + H (31) IvanM (31) - - Kant, Pranav (31) Usayan (31) + + Am97 (30) Justman10000 (30) - - Njsg (30) SEVEN (30) + + Speck (30) Tclovis (30) - - Thardeck (30) Acbaird (29) + + Cida.Coltro (29) Darbe (29) - - EdvaldoSCruz (29) Haaninjo (29) + + RodolfoRG (29) Серж (29) - - Ace-dent (28) FelipeAle (28) + + Riemer, Philipp (28) PaoloPelloni (28) - - المسيكين (28) Marcofilippozzi (27) + + Marcos Paulo de Souza (27) Micm (27) - - PeppinoLib (27) Sarojdhakal (27) + + Thuswaldner, Albert (27) Alayaran (26) - - Eresus (26) Ezeperez26 (26) + + Fanch (26) Ledure, Jean-Pierre (26) - - Librek (26) Libreofficer (26) + + Linuxman (26) Lutch (26) - - Myunghoonju (26) Hawkins, Nigel (26) + + Pirat Michi (26) Vaslav (26) - - Aidsoid (25) Ailion (25) + + Roßmanith, Christina (25) Freddyrh (25) - - Sullivan, Gatlin (25) Lboccia (25) + + Linux 9x (25) Manuel De Franceschi (25) - - Noelson (25) Onur.bingo (25) + + Freund, Matthias (25) Schröder, Sophia (25) - - Winniemiel05 (25) Magee, Timothy (24) + + Elpapki (24) Gaianer (24) - - Gérard24 (24) Ksoviero (24) + + Nik vr (24) Olivier (24) - - Elsass68490 (23) Hamurcu (23) + + + + Jeppebundsgaard (23) + Lostinthiswhirlpool (23) Olorin (23) - - Skip-on (23) + + TaeWong (23) @@ -9521,11 +9538,11 @@ Thumperward (23) - - Tommy27 (23) + + Toxitom (23) @@ -9535,11 +9552,11 @@ Youngman, Anthony W. (23) - - Aphaia (22) + + Bellerophon (22) @@ -9549,11 +9566,11 @@ HenryGR (22) - - JChimene (22) + + Roman (22) @@ -9561,1872 +9578,1864 @@ Flywire (21) - Jeppebundsgaard (21) - - - - Johannes (21) Keymap19 (21) + + Liusiqi43 (21) Logisch dede (21) - - Necdetyucel (21) Puster (21) + + Shiko (21) WalterPape (21) - - Wayra (21) Bugmenot (20) + + Dennisfrancis (20) Grasip (20) - - Grzesiek a (20) HeinF (20) + + Icobgr (20) LLyaudet (20) - - Mattsturgeon (20) PRosmaninho (20) + + Vdragon (20) Vmalep (20) - - XMatence (20) Yorick (20) + + Zapata (20) A-zakh (19) - - Chernik (19) Clarice Vigliazzi (19) + + Guateconexion (19) Houbsi (19) - - JaronBaron (19) Jem (19) + + Funk, Juergen (19) Juergenfenn (19) - - Kentarch (19) Lothar.becker (19) + + PeeWee (19) RegisPerdreau (19) - - Ionita, Teodor-Mircea (19) Ehsan.movahed (18) + + Foolfitz (18) Hidayet (18) - - Jstaerk (18) Monastirsky, Maxim (18) + + Narayan (18) Nestifea61 (18) - - Power, Noel (18) Richard (18) + + Serge Krot (18) Sooth (18) - - UriHerrera (18) Vuhung (18) + + Yusufketen (18) 林漢昌 (18) - - Akerbeltz (17) Chd (17) + + Craigo (17) Dlmoretz (17) - - Ertsey, Andor (17) Guilherme.vanz (17) + + Gulmorais (17) Tõnnov, Mihkel (17) - - Rubembarreto (17) Sohyun99 (17) + + Taken (17) Zu, Ximeng (17) - - Yumakino (17) Беломир (17) + + Airon90 (16) Alexpikptz (16) - - Dhersh (16) Kingu (16) + + Pinto, Marco A.G. (16) MoIshihara (16) - - Oweng (16) P.Guimberteau (16) + + PauGNU (16) Ristoi (16) - - Smarquespt (16) Smrabelo (16) + + TPJ (16) APerson (15) - - Akki95 (15) Andy98 (15) + + Bertob (15) Gilward Kukel (15) - - Irmhild (15) Khlood Elsayed (15) + + Lefevre00 (15) Luctur (15) - - Miko (15) Naudy (15) + + Dominguez, Rafael (15) Patriciasc (15) - - Rafaelff (15) Raniaamina (15) + + Raul.malea (15) Royerjy (15) - - Syntaxerrormmm (15) Thorogood, Tom (15) + + Ulf hamburg (15) Yecril21pl (15) - - 暗影遺言 (15) Adsoncristian (14) + + AliIsingor (14) Darkcircle (14) - - Elrath (14) Fina (14) + + Francis59 (14) Guuml (14) - - Halencarjunior (14) Lfernandocarvalho (14) + + Librosaurus (14) Dixon, Luke (14) - - Mderoucy (14) Rania (14) + + Reinsle (14) RiderExMachina (14) - - Susobhang70 (14) Svante (14) + + Tamiliam (14) Testnoda (14) - - Thangamani-arun (14) Yoshi (14) + + Akoscomp (13) Alrt84 (13) - - Alyssonware (13) Beuss (13) + + Cedric31 (13) Crolidge (13) - - Gallaecio (13) Jobo (13) + + Kadekilo (13) Leomota (13) - - Ljelly (13) Luc (13) + + Mabbb (13) Mikeyy (13) - - Mortense (13) Odd123 (13) + + Pete Boyd (13) S.Gecko (13) - - Samtuke (13) Sanyii (13) + + Simplicity Instinct (13) ThierryM (13) - - Tnishiki (13) Tusharrai2017 (13) + + Vivaelcelta (13) Vkkodali (13) - - A8 (12) Alfabech (12) + + And471 (12) AustinW (12) - - Bhaskar (12) Brett (12) + + Cepiloth (12) Chris2020 (12) - - Cralin (12) Debring (12) + + Al-Otaibi, Faisal M. (12) Halan (12) - - Immanuelg (12) Kikopb (12) + + Krabina (12) Šebetić, Krunoslav (12) - - Godard, Laurent (12) Rimkus, Modestas (12) + + Nandar (12) Pcapeluto (12) - - Gupta, Rachit (12) Raruenrom, Samphan (12) + + Möller, Sören — spelled Soeren Moeller in some patches (12) Staticsafe (12) - - Melenchuk, Vasily (12) Veerh01 (12) + + 翼之靈歌 (12) Bryanquigley (11) - - Cdan (11) ChristopheS (11) + + Dajare (11) Ebraminio (11) - - Eduaraujo (11) Gokul, S (11) + + Janus (11) Johnny M (11) - - Kallecarl (11) Kolbjoern (11) + + Leatherbottle (11) Luiz Henrique Natalino (11) - - MNeto (11) Pearson, Timothy (11) + + Marco c (11) Marcuskgosi (11) - - NON (11) Johansson, Niklas (11) + + Nuernbergerj (11) Rogeniobelem (11) - - Salmaan (11) Sunk8 (11) + + Gomez, Andres (11) Vrlivre (11) - - Zero0w (11) Aeusebio (10) + + Algotruneman (10) Castagno, Giuseppe (10) - - Blargh (10) Diginin (10) + + Eagles051387 (10) Eduardogula (10) - - Eficheux (10) El7r (10) + + J.baer (10) Jdittrich (10) - - Joacim (10) Kadertarlan (10) + + Kirill NN (10) Linuxuser330250 (10) - - Lionlinux (10) Mesutcfc (10) + + Chung, Elton (10) Mikalai (10) - - Morvan (10) Mpumrlova (10) + + Nateyee (10) Olea (10) - - Otto (10) Paour (10) + + Rafaelhlima (10) Revol (10) - - Ronja (10) Tatat (10) + + Tomg (10) Ttocsmij (10) - - Twstdude0to1 (10) User8192 (10) + + Wlenon (10) Al-Abdulrazzaq, Abdulmajeed (9) - - Agger (9) Aicra (9) + + Brandner, Andreas (9) AtkinsSJ (9) - - Camargo (9) Cnuss (9) + + Compressor nickel (9) Crazyskeggy (9) - - Dupreyb (9) Fatdf (9) + + Gibi (9) GisbertFriege (9) - - Goranrakic (9) Jim-BobHarris (9) + + Jonatoni (9) Jopsen (9) - - Jowyta (9) Kscanne (9) + + Lapetec (9) Lexeii (9) - - Mapper (9) Marco (9) + + Meo (9) MertTumer (9) - - Msaffron (9) Ohnemax (9) + + Onting (9) Oprea.luci (9) - - Milvaques, Pasqual (9) Foley, Peter (9) + + Pixpray (9) Dricot, Lionel (9) - - Rantaro (9) Rogawa (9) + + Rpr (9) Rptr (9) - - Spacebat (9) Spyros (9) + + Therabi (9) Urdulizer (9) - - Tamás, Bunth (9) Zhangxiaofei (9) + + ميدو (9) Alexxed (8) - - Andrea Gelmini (8) AndreasL (8) + + Ausserirdischegesund (8) Cocofan (8) - - Cusiri (8) Dashohoxha (8) + + DrDub (8) Ed Eyles (8) - - Elacheche (8) Horst (8) + + Israel Chaves (8) JR (8) - - Jiero (8) Jrsiqueira (8) + + Jslozier (8) Hoffimann Mendes, Júlio (8) - - Dywan, Christian (8) Kednar (8) + + Rietveld, Kristian (8) Lee (8) - - Leigh, Jack (8) Leo.h.hildebrandt (8) + + Luisgulo (8) Manj k (8) - - Mrmox2 (8) NightMonkey (8) + + NirajanPant (8) Osnola (8) - - PaoloVecchi (8) Paulo.tavares (8) + + Peterpall (8) Ricardolau (8) - - Thejack (8) Tibbylickle (8) + + Troumad (8) Vbkaisetsu (8) - - VlhOwn (8) Yakusha (8) + + Yellow.h (8) Yostane (8) - - Kabatsayev, Ruslan (7) Ahiijny (7) + + Andrea.soragna (7) Bastik (7) - - Belkacem77 (7) Berrykevin (7) + + Bjherbison (7) Bookman900 (7) - - Borim7 (7) Capiscuas (7) + + Chin Zee Yuen (7) Ciaran (7) - - Dado (7) Drose (7) + + Esbardu (7) Bateman, George (7) - - GuKK-Devel (7) Hunter, Kevin (7) + + Ingotian (7) Levith (7) - - Lonelyhiker (7) M1cky (7) + + Mariosv (7) Mbayer (7) - - MephistoBooks (7) Francis, Matthew (7) + + Nathanjh13 (7) Ndduong (7) - - Nemo bis (7) Christener, Nicolas (7) + + Olivier DDB (7) Opensas (7) - - PeaceByJesus (7) Polte (7) + + RMCampos (7) Ravi (7) - - Raykowj (7) Rodo (7) + + Scottclarke (7) Shady (7) - - Shaunrobot (7) Simosx (7) + + Tonnysmile (7) Toxicbits (7) - - Wabuo (7) Webfork (7) + + Woordje (7) صفا الفليج (7) - - Alexandrorodrigez (6) Alpha (6) + + Armin Dänzer (6) Asian flower (6) - - Higginson, Andrew (6) Barend (6) + + Bobe (6) Bruno (6) - - Cagatayyigit (6) Cccfr (6) + + ClausKofoed (6) Coypu (6) - - Dag (6) BEN MANSOUR, Mohamed-Ali (6) + + Ddxavier (6) Dfriedman (6) - - DotnetCarpenter (6) Mencken, Douglas (6) + + Dr.Faust (6) DrRobotto (6) - - Druzhshchienschkyj (6) Edmond ciorba (6) + + Edmund.laugasson (6) Equis (6) - - FPhoenix (6) Fdekruijf (6) + + Gallaire, Florent (6) Fisiu (6) - - Florian heckl (6) Gerritg (6) + + Ghune (6) Googly Googly (6) - - HdV (6) Hmoi (6) + + Hramrach (6) Infoprof (6) - - Iplaw67 (6) Timofeev, Ivan (6) + + James 00cat (6) Jeffersonx (6) - - Kawichi (6) Levlazinskiy (6) + + Link Mauve (6) MaggieT (6) - - - + Mahdyar (6) Manas (6) + + Manop (6) Mas (6) - - Mgommel (6) Mhonline (6) + + Mmetz (6) Ndlsas (6) - - Öttl, Gerhard (6) Only you (6) + + Os cib (6) PLNET (6) - - Pescetti (6) Peter Chastain (6) + + Peterhuang1kimo (6) Piotr285 (6) - - Puggan (6) Rotaj (6) + + Goyal, Shubham (6) Sn!py (6) - - Sukit (6) Sumitcn (6) + + Telesto (6) Heidenreich, Josh (6) - - Thorwil (6) TiagoSantos (6) + + Tyree (6) VACHER (6) - - Vgezer (6) Virthus (6) + + Wagner Augusto Silva Rodrigo (6) Wasserthal (6) - - Wigglejimmy (6) Wiseacre (6) + + Xhi2018 (6) Xiaoyu2006 (6) - - 3blz (5) Adam Co (5) + + Albucasis (5) AleXanDeR G (5) - - Alfalb (5) Alvarez, Octavio (5) + + Anousak (5) Liwen, Fan (5) - - Art.Gilvanov (5) Sodora, August (5) + + AustinSaintAubin (5) Baumgarp (5) - - BillRVA (5) Bitigchi (5) + + BloodIce (5) CassieLX (5) - - Cono (5) Cray85 (5) + + Dejourdain (5) DickStomp (5) - - Dmtrs32 (5) DoFoWerner (5) + + Faiq Aminuddin (5) Fazbdillah (5) - - Florian.haftmann (5) Francewhoa (5) + + GaboXandre (5) Ggurley (5) - - Gpoussel (5) H.Sparks (5) + + Habib (5) Hatochan (5) - - HubPfalz (5) Hummer5354 (5) + + HwangTW (5) Icyitscold (5) - - Jambdev (5) Jaysponsored (5) + + JoeP (5) John.pratt (5) - - KadlecOn (5) Kamataki (5) + + Klausmach (5) Koji Annoura (5) - - LibreOfficeUser1 (5) Mak (5) + + Mgaster (5) Midimarcus (5) - - Laplante, Chris (5) Mtg (5) + + Mtnyildrm (5) Namikawa (5) - - OSVALDO LINS VIANA (5) Orcmid (5) + + Pepe (5) Pkoroau (5) - - Poeml (5) Quwex (5) + + Radish (5) Rajesh (5) - - Raknor (5) Raulpaes (5) + + Rautamiekka (5) ReneEngelhard (5) - - Rhoslyn (5) Rogerio DA (5) + + Rsolipa (5) SabinGC (5) - - Salavine1 (5) Samson (5) + + Chvátal, Tomáš (5) Kurmann, Roland (5) - - Sergej (5) Shantanuo (5) + + Shivam (5) Silva.arapi (5) - - So solid moo (5) Srividya (5) + + Starseeker (5) Taylorh140 (5) - - Terentev.mn (5) - Timotheonb (5) - - Tranzistors (5) + + Wasdin (5) - - Wt (5) @@ -11436,11 +11445,11 @@ AHi (4) + + Aalam (4) - - Aaronkyle (4) @@ -11450,11 +11459,11 @@ Adderbox76 (4) + + Adrien.Ollier (4) - - Agron (4) @@ -11464,11 +11473,11 @@ Nureña, Aldo Román (4) + + Alex1 (4) - - Alexstrand7 (4) @@ -11478,11 +11487,11 @@ Alvarenga (4) + + Alzoo (4) - - Amire80 (4) @@ -11492,11 +11501,11 @@ Archlid (4) + + Arhitectul (4) - - Axel (4) @@ -11506,11 +11515,11 @@ Bardo (4) + + BathuAlike (4) - - Widl, Bernhard (4) @@ -11520,11 +11529,11 @@ Blender3dartist (4) + + Bntser (4) - - Cam AW (4) @@ -11534,11 +11543,11 @@ ConquerorsHaki (4) + + Crankybot (4) - - Cwendling (4) @@ -11548,11 +11557,11 @@ Dante (4) + + Deivan (4) - - Dmerker (4) @@ -11562,11 +11571,11 @@ Doubi (4) + + Dragon (4) - - Robertson, Daniel (4) @@ -11576,11 +11585,11 @@ Erx700 (4) + + EyalRozenberg (4) - - Fmolinero (4) @@ -11590,11 +11599,11 @@ Garrowolf (4) + + Gmjs (4) - - Gustav (4) @@ -11604,11 +11613,11 @@ Hdu (4) + + ImperfectlyInformed (4) - - JKaufmann (4) @@ -11618,11 +11627,11 @@ Jessefrgsmith (4) + + Jiehong (4) - - Jjmeric (4) @@ -11632,11 +11641,11 @@ JnRouvignac (4) + + Jonata (4) - - Jones (4) @@ -11646,11 +11655,11 @@ Joriki (4) + + Le Bigot, Jean-Tiare (4) - - Kemalayhan (4) @@ -11660,11 +11669,11 @@ Loren.rogers (4) + + M.m.mozffart (4) - - Haggag, Muhammad (4) @@ -11674,11 +11683,11 @@ Rumianowski, Maciej (4) + + Marinela (4) - - Mikedoherty ca (4) @@ -11688,11 +11697,11 @@ Morgan greywolf (4) + + Mortgage01 (4) - - NGHLibreOffice (4) @@ -11702,11 +11711,11 @@ Offidocs (4) + + Orson69 (4) - - Oscar90210 (4) @@ -11716,11 +11725,11 @@ Paranemertes (4) + + PatrickJ (4) - - Pegasus (4) @@ -11730,11 +11739,11 @@ Philj (4) + + Phillip.davis (4) - - van Oostrum, Pieter (4) @@ -11744,11 +11753,11 @@ Prolog.guy (4) + + Psao (4) - - Qubit-test (4) @@ -11758,11 +11767,11 @@ Rebahozkoc (4) + + Reyn100 (4) - - Ricgal (4) @@ -11772,11 +11781,11 @@ Rodhos (4) + + Sasha (4) - - Sealview (4) @@ -11786,11 +11795,11 @@ Sswales (4) + + Stevenmw (4) - - Surat (4) @@ -11800,11 +11809,11 @@ Thetic (4) + + Tk (4) - - Tlequire (4) @@ -11814,11 +11823,11 @@ Ufas (4) + + UlKu (4) - - Urhixidur (4) @@ -11828,11 +11837,11 @@ V., Artem (4) + + Wcolen (4) - - Wikiuser (4) @@ -11842,11 +11851,11 @@ Wpeixoto (4) + + Денис (4) - - AbhilashSingh (3) @@ -11856,11 +11865,11 @@ Aexyn (3) + + AhmadHaris (3) - - Jain, Atishay (3) @@ -11870,11 +11879,11 @@ Alexsfagundes (3) + + Almorca (3) - - Andrey Usov (3) @@ -11884,12 +11893,12 @@ Ariete (3) - - Arkanosis (3) - + Arkanosis (3) + + Armin (3) @@ -11898,11 +11907,11 @@ Arthur Zennig (3) + + Aurelien (3) - - Baena (3) @@ -11912,11 +11921,11 @@ Benjwgarner (3) + + Bernardi, Paolo (3) - - Bindassanant (3) @@ -11926,11 +11935,11 @@ Bootingman (3) + + Bos (3) - - Prajapati, Gautam (3) @@ -11940,11 +11949,11 @@ Burdakov (3) + + CIB.Mathias (3) - - Canberkturan (3) @@ -11954,11 +11963,11 @@ Charu (3) + + ChrisConCas (3) - - Claudiosegovia (3) @@ -11968,11 +11977,11 @@ Colokalle (3) + + D0ugparker (3) - - DaSch (3) @@ -11982,11 +11991,11 @@ Beurle, Darcy (3) + + Bankston, Daniel (3) - - Dilip (3) @@ -11996,11 +12005,11 @@ Dubyk (3) + + EdgeE (3) - - Eeha0120 (3) @@ -12010,11 +12019,11 @@ Elproferoman (3) + + Schorsch, Emanuel (3) - - ErSey (3) @@ -12024,11 +12033,11 @@ Ericatamiris (3) + + Estebanmonge (3) - - Farukuzun (3) @@ -12038,11 +12047,11 @@ Fraang (3) + + Franzjakob (3) - - Frob tea (3) @@ -12052,11 +12061,11 @@ FunkyPenguin (3) + + Gokcen (3) - - Gouchi (3) @@ -12066,11 +12075,11 @@ Hansgerd.schneider (3) + + Nag,Harshita (3) - - Herrmarder (3) @@ -12080,11 +12089,11 @@ IanL (3) + + Imanuelr10 (3) - - Imcon (3) @@ -12094,11 +12103,11 @@ IvanMM (3) + + Izabela (3) - - JDM (3) @@ -12108,11 +12117,11 @@ Jcrben (3) + + Jennifer.park (3) - - Jessemoreirao (3) @@ -12122,11 +12131,11 @@ Jhbn (3) + + Jo Cab (3) - - Joe312213 (3) @@ -12136,11 +12145,11 @@ Joseroberto (3) + + Juanpabl (3) - - Julianm (3) @@ -12150,11 +12159,11 @@ Katasisc (3) + + Kbiondi (3) - - KeilaAlonso (3) @@ -12164,11 +12173,11 @@ Kfogel (3) + + Khunshan (3) - - Kkrothapalli (3) @@ -12178,11 +12187,11 @@ Lennoazevedo (3) + + LewisCowles (3) - - Libcub (3) @@ -12192,11 +12201,11 @@ LucaCappelletti (3) + + Hryniuk, Łukasz (3) - - Luuk (3) @@ -12206,11 +12215,11 @@ Bessières, Marc (3) + + Margott (3) - - Marializ (3) @@ -12220,11 +12229,11 @@ Mattias (3) + + Maxwell (3) - - Measure for Measure (3) @@ -12234,11 +12243,11 @@ Meryemezber (3) + + Mhoes (3) - - Mhsmsantos (3) @@ -12248,11 +12257,11 @@ Mike98 (3) + + Neookano (3) - - NickWingate (3) @@ -12262,11 +12271,11 @@ Nicolas.abel (3) + + Niconil (3) - - Ragnarsson, Björgvin (3) @@ -12276,11 +12285,11 @@ Noel Power (3) + + OOarthurOo (3) - - Steinbeiß, Simon (3) @@ -12290,11 +12299,11 @@ Oliverguenther (3) + + Oprea luci (3) - - Penalvch (3) @@ -12304,11 +12313,11 @@ Prakash72 (3) + + Rajatvijay (3) - - Rapha.ksf (3) @@ -12318,11 +12327,11 @@ Bevilacqua, Jean-Sébastien (3) + + RebeccaHodgson (3) - - Rick (3) @@ -12332,11 +12341,11 @@ Rosemary (3) + + S8321414 (3) - - Sander Klootwijk (3) @@ -12346,11 +12355,11 @@ Saper (3) + + Satabin (3) - - Sayt (3) @@ -12360,11 +12369,11 @@ Sebby (3) + + Sergey Aka (3) - - Shelandy (3) @@ -12374,11 +12383,11 @@ Smile4ever (3) + + Soliac (3) - - Songchuan (3) @@ -12388,11 +12397,11 @@ Soued031 (3) + + StefanRing (3) - - SteveKelem (3) @@ -12402,11 +12411,11 @@ Suren (3) + + Sushils (3) - - Taylor46 (3) @@ -12416,11 +12425,11 @@ Tiagosilva.anps (3) + + Timsamoff (3) - - Tititou36 (3) @@ -12430,11 +12439,11 @@ Toki (3) + + Tomi Toivio (3) - - ToniB (3) @@ -12444,11 +12453,11 @@ TrnsltLife (3) + + Tushantin (3) - - Ubap (3) @@ -12458,11 +12467,11 @@ Underdog (3) + + Vinctor (3) - - Vljubovic (3) @@ -12472,11 +12481,11 @@ Khoo, Wei Ming (3) + + WesPeacock (3) - - Xaker1 (3) @@ -12486,11 +12495,11 @@ Yukawa (3) + + Kolesnykov, Yurii (3) - - Yvon Henel (3) @@ -12500,11 +12509,11 @@ Zaxebo1 (3) + + §chinagl (3) - - ترجمان05 (3) @@ -12514,11 +12523,11 @@ AbbeyI19jfjc (2) + + AdamPrado8 (2) - - AdrianValdez4 (2) @@ -12528,11 +12537,11 @@ Agarciamog (2) + + Aggelalex (2) - - Alan (2) @@ -12542,11 +12551,11 @@ AliceOliver7 (2) + + Alina12345 (2) - - Alisha (2) @@ -12556,11 +12565,11 @@ AlphonsoNava4 (2) + + Amunizp (2) - - AmyCarney5 (2) @@ -12570,11 +12579,11 @@ AndresChandia (2) + + Andrew (2) - - AndrewKuhn7 (2) @@ -12584,11 +12593,11 @@ Andthebrain (2) + + Anipeter (2) - - Anjar (2) @@ -12598,11 +12607,11 @@ AnnabelMcmullen (2) + + AnnunciationGunn (2) - - Anonimus (2) @@ -12612,11 +12621,11 @@ Jain, Anurag (2) + + Aplatypus (2) - - ApostlesSheldon (2) @@ -12626,11 +12635,11 @@ Asal (2) + + Ashaneba (2) - - Nakashian, Ashod (2) @@ -12640,11 +12649,11 @@ Ozdemir, Aybuke (2) + + BZT42 (2) - - Le Garrec, Vincent (2) @@ -12654,11 +12663,11 @@ Beto (2) + + BirdRivas2 (2) - - BlazejJones1 (2) @@ -12668,11 +12677,11 @@ Blume (2) + + Blushingorg (2) - - BoD (2) @@ -12682,11 +12691,11 @@ Boivie (2) + + Boldizsakawi7 (2) - - BoleslausSaunders (2) @@ -12696,11 +12705,11 @@ BrandiToomer (2) + + BridgetJarvis (2) - - Bruceschaller (2) @@ -12710,11 +12719,11 @@ ButlerBarron6 (2) + + C0bb3r (2) - - C1pr1an (2) @@ -12724,11 +12733,11 @@ CallieSalgado (2) + + CamilleMccarthy (2) - - CandidoRutherford (2) @@ -12738,11 +12747,11 @@ Capri99 (2) + + CaraDang6 (2) - - Carlosr (2) @@ -12752,11 +12761,11 @@ CarrieDaniels (2) + + CarrollRico2 (2) - - Iacob, Catalin (2) @@ -12766,11 +12775,11 @@ Celsovsm (2) + + Cgrosdemange (2) - - Chabermu (2) @@ -12780,12 +12789,12 @@ Chemyakyn (2) - - ChrisBarth (2) - + ChrisBarth (2) + + ChrzcicielCampbell (2) @@ -12794,11 +12803,11 @@ Cjbackhouse (2) + + Cl-r (2) - - ClariceThorne (2) @@ -12808,11 +12817,11 @@ Clemen Beek (2) + + McDonald, Jason C. (2) - - Codingmicha (2) @@ -12822,11 +12831,11 @@ Conrado (2) + + Coogor (2) - - CoralieCarr7 (2) @@ -12836,11 +12845,11 @@ CupertinoDarnell (2) + + Cvk (2) - - CyrillicEscobedo (2) @@ -12850,11 +12859,11 @@ DaCaPo (2) + + Dairdev (2) - - DaisieQuigley (2) @@ -12864,11 +12873,11 @@ DanForrest2 (2) + + Danese (2) - - Danthedev (2) @@ -12878,11 +12887,11 @@ David4you (2) + + Bolen, David (2) - - De-jourdain (2) @@ -12892,11 +12901,11 @@ DelinaRomano5 (2) + + DellePoole7 (2) - - DenisArnaud (2) @@ -12906,11 +12915,11 @@ Denytracom (2) + + Devilcynthy (2) - - Diazbastian (2) @@ -12920,11 +12929,11 @@ Django (2) + + DoctorBaxter7 (2) - - Domasj (2) @@ -12934,11 +12943,11 @@ DonaldBryant7 (2) + + Donals (2) - - DrDrack (2) @@ -12948,11 +12957,11 @@ Duiliodias (2) + + DukeDejesus7 (2) - - EarleSiegel7 (2) @@ -12962,11 +12971,11 @@ EdaFreeman3 (2) + + Eduardoarandah (2) - - Edwardcottreau (2) @@ -12976,11 +12985,11 @@ Efs710920mex (2) + + Ejep520 (2) - - Sánchez, Bartolomé (2) @@ -12990,11 +12999,11 @@ ElisabethHolcomb (2) + + Elixir (2) - - EllieBowers3 (2) @@ -13004,11 +13013,11 @@ Eloquence (2) + + ElsieMacias7 (2) - - Emily (2) @@ -13018,11 +13027,11 @@ Eneville (2) + + EnosKraus6 (2) - - Erdalronahi (2) @@ -13032,11 +13041,11 @@ ErieTovar6 (2) + + Erikcht (2) - - Ersteinmal (2) @@ -13046,11 +13055,11 @@ Escriba (2) + + EssieKeller8 (2) - - EsterEngland7 (2) @@ -13060,11 +13069,11 @@ F.werner.pohl (2) + + FannyTillman8 (2) - - FateHarrington (2) @@ -13074,11 +13083,11 @@ Fcelik (2) + + Fcojavmc (2) - - Feldo (2) @@ -13088,11 +13097,11 @@ FlaviaPratt8 (2) + + FlorenceGrossman (2) - - FlorenceKim1 (2) @@ -13102,11 +13111,11 @@ FranciscoByrne (2) + + FredaDowning7 (2) - - Fukanchik, Sergey (2) @@ -13116,11 +13125,11 @@ Garcia.marc (2) + + Gauste (2) - - GayeRossetti (2) @@ -13130,11 +13139,11 @@ GeoffLawrence (2) + + GeorgiannaOchoa (2) - - Gerardgiraud (2) @@ -13144,11 +13153,11 @@ GertieEllington (2) + + GiertrudaLehman (2) - - Girvinh (2) @@ -13158,11 +13167,11 @@ Glanbeav (2) + + Glococo (2) - - Gmasei (2) @@ -13172,11 +13181,11 @@ Gmolleda (2) + + GraciaNorwood (2) - - Grakic (2) @@ -13186,11 +13195,11 @@ Gualtiero (2) + + Guillem (2) - - Hacmiranda (2) @@ -13200,11 +13209,11 @@ HannaEspinoza (2) + + HardyBurris1 (2) - - HarleyWatkins (2) @@ -13214,11 +13223,11 @@ Hector (2) + + Hedaja (2) - - Hellpé (2) @@ -13228,11 +13237,11 @@ Hemmerling (2) + + Jensen, Henrik (2) - - HeriberDacomb (2) @@ -13242,11 +13251,11 @@ Herronrobertson (2) + + HershelPeterson (2) - - IIIYates8 (2) @@ -13256,11 +13265,11 @@ Iannz (2) + + IkeVasquez9 (2) - - IlaRoberts4 (2) @@ -13270,11 +13279,11 @@ InezFinney8 (2) + + IraLane4 (2) - - IrinaMccormack (2) @@ -13284,11 +13293,11 @@ IsadoraFoster (2) + + IsaiahBuck5 (2) - - IsiahLackey2 (2) @@ -13298,11 +13307,11 @@ Burant, Jiri (2) + + JOIMER REYES (2) - - JacintaGibson (2) @@ -13312,11 +13321,11 @@ C., James (2) + + JanuariusStringer (2) - - Jasmins (2) @@ -13326,11 +13335,11 @@ JavierFernandez (2) + + JayStafford3 (2) - - Jcarl (2) @@ -13340,11 +13349,11 @@ Jcubic (2) + + Jeraldinesewell (2) - - JesseBHXEmrh (2) @@ -13354,11 +13363,11 @@ Jgpestana (2) + + Lingard, J. Graeme (2) - - Jnicolas (2) @@ -13368,11 +13377,11 @@ Johnki (2) + + Jonathanacohen (2) - - JonesRichter8 (2) @@ -13382,11 +13391,11 @@ João Pedro (2) + + Jsargey (2) - - Jsbueno (2) @@ -13396,11 +13405,11 @@ JudasPeoples9 (2) + + JudasPritchard (2) - - JudithGraves6 (2) @@ -13410,11 +13419,11 @@ JustinaEldridge (2) + + K.euser (2) - - Kammreiter (2) @@ -13424,11 +13433,11 @@ Karakartala (2) + + KarkGunn4 (2) - - Karolus (2) @@ -13438,11 +13447,11 @@ Kay D (2) + + Kazuyuki Yoshimura (2) - - Keepiledar (2) @@ -13452,11 +13461,11 @@ Khokkanen (2) + + KittyBauer5 (2) - - KlementynaMckinney (2) @@ -13466,11 +13475,11 @@ KolbeKline1 (2) + + Kolorguild (2) - - Krauss (2) @@ -13480,11 +13489,11 @@ KrisvdMewe (2) + + KroniK907 (2) - - Krumelmonster (2) @@ -13494,11 +13503,11 @@ KsaweryDempsey (2) + + Kwilliams (2) - - L (2) @@ -13508,11 +13517,11 @@ LeanaParks2 (2) + + LemuelHo1 (2) - - LemuelWerner5 (2) @@ -13522,11 +13531,11 @@ Lhcezar (2) + + LidaMasters1 (2) - - Lino (2) @@ -13536,11 +13545,11 @@ Lj LO (2) + + Lliehu (2) - - Scheidt, Heiko (2) @@ -13550,11 +13559,11 @@ Petrolekas, Luke (2) + + LubomyrWalden (2) - - LucretiLlb (2) @@ -13564,11 +13573,11 @@ Lupp (2) + + LynnForbes3 (2) - - Casalin, Matteo (2) @@ -13578,11 +13587,11 @@ Mărăşoiu, Mariana (2) + + MZNBelendndq (2) - - Ma83mit (2) @@ -13592,11 +13601,11 @@ MadisonDarnell (2) + + MagdaleneOneal (2) - - MaggieGray2 (2) @@ -13606,11 +13615,11 @@ Manebule (2) + + Mangat veer sagar (2) - - Manu.unni (2) @@ -13620,11 +13629,11 @@ MarchCourtney (2) + + Marcinz (2) - - Marco74 (2) @@ -13634,11 +13643,11 @@ MarillaMarsh7 (2) + + Marius (2) - - MartaRollins2 (2) @@ -13648,11 +13657,11 @@ MartinPC (2) + + MateuszDominguez (2) - - Matt 51 (2) @@ -13662,12 +13671,12 @@ Mbemidio (2) - - Meghanmcfadden15 (2) - + Meghanmcfadden15 (2) + + MercedesDelatorre (2) @@ -13676,11 +13685,11 @@ Kepplinger, Martin (2) + + MerleGlass6 (2) - - Mesutkullar (2) @@ -13690,11 +13699,11 @@ Michaelx (2) + + Michal.p (2) - - Michel Gagnon (2) @@ -13704,11 +13713,11 @@ Mifritscher (2) + + MikeyZ (2) - - MinaHuggins7 (2) @@ -13718,11 +13727,11 @@ MinervaLuna8 (2) + + Mitcoes (2) - - Mjkopp (2) @@ -13732,11 +13741,11 @@ Lechner, Marco (2) + + Mloiseleur (2) - - Mnalima (2) @@ -13744,2704 +13753,2712 @@ Mnsoto (2) + Mochir (2) + + + + Mordocai (2) MorganJohnstone (2) - - Rugiero, Mario (2) Mst0 (2) + + Mttza1 (2) Musicstave (2) - - Mustafa22 (2) Nathansen, Martin (2) + + Mzalewski (2) Nacerix (2) - - Narcisgarcia (2) NealEspinoza6 (2) + + Nestor (2) NettaHurd9 (2) - - NettieParra1 (2) NewtonZuniga9 (2) + + Nishino, Daisuke (2) NicholasLanier (2) - - Nickk (2) NinaLam6 (2) + + Noirin (2) NoricumArthur (2) - - NorrisAndersen (2) NovemberVogel (2) + + Nsharifi (2) Nuclearbob (2) - - Naeil, Zoueidi (2) OUPS (2) + + Oashnic (2) Odalcet (2) - - Offtkp (2) Oiaohm (2) + + OlaPost6 (2) OlieBooth3 (2) - - OlivierC (2) OnopriyBrandon (2) + + OrlandoArellano (2) OscarMeredith (2) - - Paolettopn (2) Paolobenve (2) + + Pascaje (2) Paultrojahn (2) - - Penguin42 (2) Percherie (2) + + PercherskySanford (2) Senna Tschudin, Peter (2) - - Pgraber (2) Phil.davis (2) + + Szelat, Phillip (2) Pierre (2) - - Piotrdrag (2) Pitonyak (2) + + Pkst (2) PolishHungarianSharp (2) - - Posterboy (2) PragueBergman (2) + + Pulsifer (2) R.Yu. (2) - - Rahul050 (2) Rbecke (2) + + ReeseShepherd (2) ReginaldMcgraw (2) - - RenniePrescott (2) RetaStern5 (2) + + RhodaMackey3 (2) RiceBurger3 (2) - - Ritlay (2) Rmarquardt (2) + + Roadrunner (2) RollandHannah (2) - - RosaliaFair4 (2) RosannaPaul7 (2) + + RosariaLampungm (2) RoyFokker (2) - - RoyShelton7 (2) Ryan (2) + + SDann22 (2) Sagar.libo (2) - - Sahasranaman M S (2) Sam888 (2) + + SamBenavides5 (2) Sankarshan (2) - - SavinaShaffer (2) Bosio, Santiago (2) + + Seanyoung (2) SebastianNorth (2) - - Sebutler (2) Sergwish (2) + + Sfeuser (2) Sgrotz (2) - - Shaforostoff (2) Shankar (2) + + Shaun.schutte (2) Shitamo (2) - - SidneyArredondo (2) Sidorelauku (2) + + Silwol (2) Simplecontrast (2) - - SlavicNapier8 (2) Kasztenny, Adam (2) + + Soothsilver (2) Spledger (2) - - Sshelagh (2) Sshi (2) + + Ssorgatem (2) StaciBorthwick (2) - - Stappers (2) Weiberg, Stefan (2) + + Stephan66 (2) Steveo o (2) - - StillSven (2) Stuarta0 (2) + + Sturm (2) Sungkhum (2) - - Superurbi (2) SusanSwain3 (2) + + Sven.fischer.de (2) Swazmo (2) - - Sydbarrett74 (2) Synanceia (Pierre) (2) + + Tauon (2) Techal (2) - - Teelittle (2) TeresaMacias3 (2) + + Teresavillegas1 (2) TheaGallardo8 (2) - - TheodoseyPeralta (2) TheophilusHess (2) + + Thomase (2) Thomeck (2) - - Thorongil (2) Tim1075 (2) + + Timeshifter (2) Timj (2) - - TimothyChilds (2) TomaMora8 (2) + + Tomkeb (2) Tomrobert87 (2) - - TressieCulver (2) Tsimonq2 (2) + + TuMadre (2) Isnard, Timothée (2) - - Tux40000 (2) Unhammer (2) + + Unknown 32 (2) Usik64 (2) - - ValessioBrito (2) VanHogan7 (2) + + Dhall, Varun (2) VasylynaKendall (2) - - VerneDodd5 (2) VeronaXiong3 (2) + + VeronicaGrimes (2) Villeroy (2) - - Viper550 (2) VirginArredondo (2) + + VladimirBassett (2) VladimirPrince (2) - - VladislavA (2) Volker (2) + + VolodymyraGagnon (2) Vossman (2) - - WaclawaSavage (2) WalentynaPatrick (2) + + WallaceSolano (2) WarrenChristian (2) - - WashingtonOakley (2) Watermelons (2) + + WeronikaKeene (2) Wi24rd (2) - - WikiImporter (2) WilhelminaEaton (2) + + WincentyMorrison (2) Wirelessben (2) - - Wkn (2) Wulei (2) + + Xoristzatziki (2) Yalda (2) - - Yaw (2) ZiriaKo (2) + + ZoraWinkler1 (2) 流星依旧 (2) - - 29jm (1) A H (1) + + A.jadiba (1) AJW (1) - - AaronPeterson (1) Abdulaziz A Alayed (1) + + Absolute Garcinia (1) Acagastya (1) - - Kepenek, Ahmet Can (1) AdalberDesailll (1) + + Adlard.matthew (1) Aevora (1) - - Agradecido (1) Ainurshakirov (1) + + Ajaxfiore (1) Sudheer Kumar, Akshit (1) - - Alagris (1) Alavec (1) + + Albrechtloh (1) Aleks (1) - - Aleksio Kverka (1) Henrie, Alex (1) + + Alex-16 (1) Alex38-68 (1) - - Alex80 (1) AlexF (1) + + AlexP111223 (1) AlexPS (1) - - Alexandrevicenzi (1) Alexandri (1) + + Chemichev, Alexey (1) Alexis 0071 (1) - - Alexis Wilke (1) Alexnivan (1) + + Alexsandro Matias (1) Aleyna.sare (1) - - Ali (1) AlphonsDen (1) + + Alvaropg (1) Alverne (1) - - Amacater (1) Andarilhobotto (1) + + Anderius (1) AndreasEk (1) - - AndreasK (1) AndreasNeudecker (1) + + Andrey.turkin (1) Andriazdk2177 (1) - - AniVar (1) Anjilajoli (1) + + Ankur, Khandelwal (1) AntoineVe (1) - - Antonello Lobianco (1) AntoniePonder (1) + + Anurag kanungo (1) Apfelsaft (1) - - Priyadarshi, Apurva (1) Arekm (1) + + Ari (1) ArielleWx (1) - - Arkonide (1) Armandos (1) + + Arnaudc (1) Arnoldu (1) - - Teigseth, Arno (1) Artintal (1) + + ArturNeumann (1) Arulm (1) - - Asiersar (1) Asselbornmauro (1) + + Astalaseven (1) Atpnguyen (1) - - Tang, Audrey (1) AundreaPqf (1) + + Averell7 (1) Ayoooub (1) - - B3t (1) Bailiwick (1) + + Bailly02 (1) Bami (1) - - Bandera (1) BarryLovegrove (1) + + Vincent, Babu (1) Bayramcicek (1) - - Bburak (1) Bckurera (1) + + Khorram, Behrad (1) BernardHannafor (1) - - Bestdating (1) Beyoken (1) + + Beznogov (1) Bezzy (1) - - Bgloberman (1) Bgranados (1) + + Bhumikasethi (1) BillyBurke (1) - - Biofool (1) Bittin (1) + + Bjossir (1) Bkg2018 (1) - - BlakeGartrell (1) BlancheBelstead (1) + + BlancheClopton (1) Blandyna (1) - - Boboo (1) Bolo (1) + + Borowcm (1) Bortis (1) - - Sowden, Brad (1) BrentHawthorne (1) + + BridgettC (1) Brinzing, Oliver (1) - - BroderiHolyman (1) BryceBrassell (1) + + BryceMoorhouse (1) Budo (1) - - Burcin (1) Bureken (1) + + Burger.ga (1) Bwi (1) - - Bzsolt (1) BáthoryPéter (1) + + CalebSommer (1) CalebWgypcu (1) - - Paul, Cameron (1) Capira (1) + + CarloASilva (1) Carlos (1) - - Carlos.gilaranz (1) Castarco (1) + + Cathy (1) CedricQ73ktehvp (1) - - Cesera (1) ChantalWalker (1) + + CharlesJenkins (1) Chatjoe (1) - - Chmilblick (1) Beauzée-Luyssen, Hugo (1) + + ChrPr (1) Chrism (1) - - Christoph.herzog (1) Chrlutz (1) + + Ciampix (1) CiaraLockie (1) - - Ciriaco (1) Classieur (1) + + Claudio Pannacci (1) Cleitongalvao (1) - - Clem (1) CletaValentino (1) + + Cnzhx (1) Company (1) - - Cora17 (1) Corsolibreoffice (1) + + Cosmopolitan (1) Cpatrick08 (1) - - Cpinedar (1) Cpmipn (1) + + Craigsbookclub (1) Csanyipal (1) - - Csongorhalmai (1) Css17 (1) + + Ctfranz (1) Cycpe950609 (1) - - DaisieDavison (1) Danichocolate (1) + + Danielt998 (1) Dar18proore (1) - - Darianospb (1) DarylAlcantar (1) + + DarylBoot (1) Dave (1) - - DavidDyck (1) Davidmichel (1) + + DawnOgles (1) Dbojan (1) - - Di Marco, Daniel (1) DeShark (1) + + DeannaQuaife (1) Ray, Debarshi (1) - - DeborahW18 (1) Decs75 (1) + + Dennisroczek's Test Account (1) Deragon (1) - - Dezsiszabi (1) Kis-Ádám, László (1) + + Herde, Daniel (1) Dhiren (1) - - Dianasedlak (1) Dirgita (1) + + Kettner, Valentin (1) Diver (1) - - Do Nhu Vy (1) DocuFree (1) + + Dominiko (1) Dominuk (1) - - Donadel (1) DoreenDuell (1) + + Douglasm (1) Drizamanuber (1) - - Drlandi (1) Drtimwright (1) + + Dschulten (1) Dusek (1) - - Dxider (1) Eardeleanu (1) + + EarnestLamaro (1) Echada (1) - - EdgardoRios (1) Edsonlead (1) + + Edz (1) Efcis (1) - - Efegurkan (1) Brill, Christoph (1) + + Ehenryb (1) Ekuiitr (1) - - ElahiMohammad (1) Elliot1415 (1) + + ElmaWalcott (1) Elshize (1) - - Emad (1) Emanuele.gissi (1) + + Emyr (1) Enesates (1) - - Ennael (1) Erasmo (1) + + Erdemdemirkapi (1) Eric (1) - - ErickRijoJr (1) Ernsttremel (1) + + Roux, Elie (1) Erto (1) - - Esben aaberg (1) EstelaAWTxiu (1) + + Etinos (1) Etua (1) - - Eulerian (1) Evfool (1) + + FMA (1) Factooor (1) - - Falatooni (1) Falcao (1) + + Farhaf (1) Farhank (1) - - Farlfr (1) FarzanehSarafraz (1) + + Faseeh1218 (1) Fdem (1) - - Fenchi (1) FerminAndrade (1) + + Feyza (1) Fgland (1) - - Flaviodegodoi (1) Flirtwomens (1) + + Foadv (1) Foobar (1) - - Fourdollars (1) Francesco (1) + + Fred.th (1) Funnym0nk3y (1) - - Manas Joshi (1) Gabix (1) + + GabrielSwart (1) Gabrielcossette (1) - - Gabrielezorzi (1) Ganton (1) + + Gbilotta (1) Gcoelho (1) - - GeeZ (1) Gekacheka (1) + + Geoff newson (1) Gerard (1) - - van Valkenhoef, Gert (1) Houston, Gary (1) + + Giancav (1) Gicmo (1) - - Gmeijssen (1) Goldensgui (1) + + Gpmanrpi (1) Grahl (1) - - GrantCelley (1) Grass-tree (1) + + Hernandez, Gregg (1) GroverYQVvwokac (1) - - Gstein (1) Guhde (1) + + Guillaume (1) Gxyd (1) - - H Wettlaufer (1) HFujimaki (1) + + HKagerer (1) HLGZorawdi (1) - - Haggai (1) Hagos (1) + + Hamati (1) Hamkins (1) - - Hapeck (1) Hasinasi (1) + + Hbr (1) Rui Wang (1) - - Hermeli2856 (1) HessnovTHR44 (1) + + Heygo (1) Heyheyitshay (1) - - Hfischer (1) Hillrich (1) + + HiltonFtel (1) Hitomi t (1) - - Hkdocholid (1) Hlavaty, Tomas (1) + + Hoaivan27299 (1) K, Akshit (1) - - Honza.havlicek (1) Hopman (1) + + HoracioRydge (1) Hornmichaels (1) - - Hosiryuhosi (1) Hriostat (1) + + HumbertGno (1) Hwoehrle (1) - - Ialbors (1) Ian (1) + + Iandol (1) Ianjo (1) - - Iantheprogrammer (1) IbraM (1) + + IceBlur (1) Ida (1) - - Gilham, Ian (1) Igorizyumin (1) + + Imypsychconsult (1) Iosonja (1) - - Şendur, İrem (1) Irene (1) + + IrrevdJohn (1) IrvinFunkw (1) - - Ismael (1) IvanP (1) + + JDługosz (1) JJ2020 (1) - - JK2308 (1) Jab (1) + + Jailletc36 (1) JaimeS (1) - - Jamil (1) JanEnEm (1) + + Janani (1) Jani (1) - - Jano (1) Janvlug (1) + + Jayppc (1) Jazzon (1) - - Jcdericco (1) Chaffraix, Julien (1) + + Jean.fr (1) JeanAmessdvaei (1) - - JeanMcPhillamy (1) JefferyMackenna (1) + + Jentron256 (1) Jeongkyu (1) - - Jerdum (1) Bicha, Jeremy (1) + + JerryShi (1) JessicaParker (1) - - Gao, Qiwen (1) JestineNww (1) + + Lazar, Timotej (1) Jflory7 (1) - - Bruhn, Jan-Henrik (1) Jinocvla (1) + + JiroMatsuzawa (1) Jj151515 (1) - - Jmarchn (1) Joachim (1) + + Joanluc (1) Joaofernando (1) - - JoelH (1) JohnTheHuman (1) + + Johnplay2 (1) JomarSilva (1) - - Jonatanpc8 (1) JonelleFritz (1) + + Wu, Haidong (1) JordanS (1) - - Jorge Rodríguez Fonseca (1) Jorgemendes (1) + + JoseGatica (1) Joselaurian (1) - - Joshun (1) José Eduardo (1) + + Jp.santi (1) Jpl (1) - - Clarke, James (1) JudeMcCafferty (1) + + Juergen (1) JuliannSnider (1) - - Picca, Juan (1) Jwcampbell (1) + + Dubrulle, Kevin (1) Kader (1) - - Kapoorsahab (1) KatjaG (1) + + Bhat, Kishor (1) Keith Long (1) - - Kenb (1) Kenneth.venken (1) + + Kenton3255 (1) Kiyotaka Nishibori (1) - - Kasper, Kacper (1) Kkremitzki (1) + + Knobo (1) Koeleman (1) - - KoffeinFlummi (1) Kosmous (1) + + KourtneNester (1) Kr1shna (1) - - Krotow (1) Kumar, Thangavel (1) + + Kying (1) LKPSharylptwsdo (1) - - LMKemm (1) LOFF (1) + + LaPingvino (1) Laskov (1) - - LatoshaZnu (1) LaverneNavarret (1) + + LavinaVandermar (1) Learner (1) - - Librestez54 (1) Likoski (1) + + LillieNlowccx (1) Lineinthesand (1) - - Literacyglenys (1) Litishia (1) + + Liturgist (1) Llalllal1 (1) - - Lnjuanj (1) Lobillo (1) + + Lonaowna (1) Lopp Rs (1) - - Lorne (1) Lplatypus (1) + + Luca (1) Lucas Filho (1) - - LudieNutter (1) Luiz Cláudio (1) + + Luiz Rezende (1) Luke (1) - - M.sacharewicz (1) M1ndfr3ak (1) + + ME-ON1 (1) MJW (1) - - Maahicool (1) Mabel7997eelu (1) + + Maemst (1) Magicienap (1) - - Magmag (1) Mahdiekrani (1) + + Mahmudul (1) Maliuta (1) - - Manveru1986 (1) Rizzolo, Mattia (1) + + MarcK (1) MarcelProut (1) - - MarcoZ (1) Biscaro, Marco (1) + + Marcosalex (1) Marcosps (1) - - MargoBergman (1) MarianaConnell (1) + + Mariano Gaudix (1) MarkWielaaard (1) - - Markcoomes (1) Markzog21 (1) + + MarthaWaterman (1) Martinvanzijl (1) - - Marwan (1) Maryanndefo91 (1) + + Masaki tamakoshi (1) Masakim-icraft (1) - - Massao (1) Mastizada (1) + + Matsuura (1) MattTheGeek (1) - - Campanelli, Matteo (1) Matěj (1) + + Mau (1) MauroTrevisan (1) - - MavropaliasG (1) Maxjf1 (1) + + Mazinho (1) Bechler, Moritz (1) - - Mblume3 (1) Doležel, Marek (1) + + Megan44Dgxg (1) Melikeyurtoglu (1) - - Menturi (1) MeskoBalazs (1) + + Mete0r (1) Mhaehnel (1) - - Mhcrnl (1) Mhenriday (1) + + Mibm123 (1) Michaelwood (1) - - Michka B (1) Midomidi2013 (1) + + MiguelKastner (1) Miguelteixeira (1) - - Miguelverdu (1) Mike-y (1) + + MikeLittle (1) Mikolg (1) - - MilagroWilkerso (1) Milanbv (1) + + Miles (1) Minarja4 (1) - - Mirsad (1) Miurahr (1) + + Mixer (1) Mixstah (1) - - Mlager (1) Mmeof (1) + + Moaz eldfrawy (1) Moberg (1) - - Mohammedzalta (1) Mohsenzl (1) + + Monikayadav (1) Morenonatural (1) - - Soini, Mox (1) Mrund (1) + + Muhammadsufyanzainalabidin (1) Mw (1) - - Myan (1) MyraBlacklow (1) + + N3rd4i (1) NEOhidra (1) - - NNe8Lx2gc (1) Nanotron (1) + + Nattu (1) Ncaio (1) - - Nedrichards (1) NellieSMWX (1) + + Neteler (1) Nevanos (1) - - Ngoswami (1) Nickko (1) + + Nilss (1) Nithin.padavu (1) - - Ngo, Minh (1) Nnino2 (1) + + Norty (1) Notafish (1) - - NotesTracker (1) Nouiurm (1) + + Norbert X (1) Nurohman (1) - - Oclei (1) Oig (1) + + Oiouitt (1) Okusi (1) - - Olr (1) Omansmith (1) + + Omerta (1) Onurkucuk67 (1) - - Oosterkamp (1) Opestawon (1) + + Sezen, Hunter (1) Orrd (1) - - Osoitz (1) Otrembad (1) + + Oui (1) Ouyang.leyan (1) - - Anderson, Owen (1) Esen, Özcan (1) + + Ozpoz (1) Öztürk, Emre (1) - - PBsoft (1) Pal, Pawan (1) + + Padenton (1) Paintdog (1) - - PamalaDorsch (1) Pankaj (1) + + Papesky (1) Passerpunt (1) - - Pastim (1) Paulmenzel (1) + + Paulolima (1) + Pedro.silva (1) + + Pelambrera (1) - - PelinKuran (1) + + PenelopHewlett (1) @@ -16451,11 +16468,11 @@ Vorel, Petr (1) - - Pharmankur (1) + + Phb.nbnet.nb.ca (1) @@ -16465,11 +16482,11 @@ PhilDur (1) - - Philhart (1) + + PhilipTimms (1) @@ -16479,11 +16496,11 @@ Philippe43 (1) - - Krylov, Phil (1) + + Phomes (1) @@ -16493,11 +16510,11 @@ Pi (1) - - Piero (1) + + PieterDeBruijn (1) @@ -16507,11 +16524,11 @@ Pilavi (1) - - Piratu (1) + + Piternoize (1) @@ -16521,11 +16538,11 @@ Pkavinda (1) - - Plastique (1) + + Plastovicka (1) @@ -16535,11 +16552,11 @@ PopularOutcast (1) - - Por (1) + + Carter, Travis (1) @@ -16549,11 +16566,11 @@ Psauthor (1) - - Psmits (1) + + Psychicread531 (1) @@ -16563,11 +16580,11 @@ Pwz266266 (1) - - Illarionov, Arkadiy (1) + + Qiguo (1) @@ -16577,11 +16594,11 @@ Quick8130 (1) - - Quickbooktech (1) + + Qwe (1) @@ -16591,11 +16608,11 @@ Rainy (1) - - Ramonturner (1) + + Randallperry (1) @@ -16605,11 +16622,11 @@ Ratias (1) - - Rcampbelllaos (1) + + RebeccaToscano (1) @@ -16619,11 +16636,11 @@ RexRTEJnlzus (1) - - Rholler (1) + + Rich (1) @@ -16633,11 +16650,11 @@ RickieHpejt (1) - - Riessmi (1) + + Rif (1) @@ -16647,11 +16664,11 @@ Rimas (1) - - Ringlerloje (1) + + Rion (1) @@ -16661,11 +16678,11 @@ Rizobix (1) - - Kondratenko, Rostislav (1) + + Robert Wetzlmayr (1) @@ -16675,11 +16692,11 @@ Robustchao (1) - - Rockers (1) + + Rodney78 (1) @@ -16689,11 +16706,11 @@ Deshmukh, Rohit (1) - - Rombert (1) + + Ron1 (1) @@ -16703,11 +16720,11 @@ Ronny (1) - - Roscoe5731 (1) + + Rosemarie (1) @@ -16717,11 +16734,11 @@ Rsedak (1) - - RuleAndLine (1) + + Rvr (1) @@ -16731,11 +16748,11 @@ ONODERA, Ryo (1) - - SallyMorales (1) + + Samanicute (1) @@ -16745,11 +16762,11 @@ Tygier, Sam (1) - - Sandeeps (1) + + Sanipache (1) @@ -16759,11 +16776,11 @@ Sariyar (1) - - Satya kompella (1) + + Sbar1 (1) @@ -16773,11 +16790,11 @@ Schrillesbunteshamburg (1) - - Scno (1) + + Sctenebro (1) @@ -16787,11 +16804,11 @@ Ak, Sedat (1) - - Senopen (1) + + Serdarot5 (1) @@ -16801,11 +16818,11 @@ Shay030 (1) - - ShaynaMan (1) + + SherylMillingto (1) @@ -16815,11 +16832,11 @@ Shin en (1) - - Chaurasia, Shobhit (1) + + Shortblack (1) @@ -16829,11 +16846,11 @@ Siegi (1) - - Silvestr (1) + + Silvia (1) @@ -16843,11 +16860,11 @@ Skierpage (1) - - Smalalur (1) + + Socialmitchell (1) @@ -16857,11 +16874,11 @@ Sourabh1031 (1) - - Sovichet (1) + + SpeedyGonsales (1) @@ -16871,11 +16888,11 @@ Spreadsheetsorter (1) - - Srijanani (1) + + StefanU (1) @@ -16885,11 +16902,11 @@ Stonehubmn (1) - - StuartHalliday (1) + + Subhash (1) @@ -16899,11 +16916,11 @@ SusieVeasley (1) - - Svalo (1) + + SvenHornung (1) @@ -16913,11 +16930,11 @@ Sviola (1) - - Svtlichnijj (1) + + Sébastien C. (1) @@ -16927,11 +16944,11 @@ TAQSamueld (1) - - Talueses (1) + + Tanguy k (1) @@ -16941,11 +16958,11 @@ TaylorSlemp (1) - - Techsquirrel (1) + + TeganCreswick (1) @@ -16955,11 +16972,11 @@ Terber (1) - - Testsflirt (1) + + The Magpie (1) @@ -16969,11 +16986,11 @@ Thephilosoft (1) - - Thom (1) + + Thor574 (1) @@ -16983,11 +17000,11 @@ Tifroumi (1) - - Tigerbeard (1) + + Tilt (1) @@ -16997,11 +17014,11 @@ Tolunaydundar (1) - - Tomasdd (1) + + TomofumiYagi (1) @@ -17011,11 +17028,11 @@ Tpokorra (1) - - Transcend (1) + + Trebledcliff (1) @@ -17025,11 +17042,11 @@ Trondtr (1) - - Ttv20 (1) + + Tuliouel (1) @@ -17039,11 +17056,11 @@ Thibault, Vallois (1) - - Jain, Umang (1) + + Udit Sharma (1) @@ -17053,11 +17070,11 @@ Vincent, Brennan (1) - - Unho (1) + + UrmasD (1) @@ -17067,11 +17084,11 @@ Ushabtay (1) - - VIPSylar (1) + + VPUJamikajklq (1) @@ -17081,11 +17098,11 @@ Veeven (1) - - Vera Cavalcante (1) + + VernaSchulze (1) @@ -17095,11 +17112,11 @@ Vinkas (1) - - Virus009 (1) + + WOBFriedauk (1) @@ -17109,11 +17126,11 @@ WandaSingletary (1) - - Wastl (1) + + Waynemcl (1) @@ -17123,11 +17140,11 @@ Wedeluxe (1) - - Wes (1) + + Westantenna (1) @@ -17137,11 +17154,11 @@ Wilhelm (1) - - William Avery (1) + + Williewortel (1) @@ -17151,11 +17168,11 @@ Woulouf (1) - - Tjong, Winston Min (1) + + XSXKristin (1) @@ -17165,11 +17182,11 @@ XeroxMe (1) - - Xsdcfghjk (1) + + Suhail Alkowaileet (1) @@ -17179,11 +17196,11 @@ Xtrusia (1) - - Xuenhua (1) + + Yangyiji (1) @@ -17193,11 +17210,11 @@ Yazu (1) - - Yeliztaneroglu (1) + + Desai, Yogesh (1) @@ -17207,11 +17224,11 @@ Yowbooks (1) - - YvanM (1) + + Yy y ja jp (1) @@ -17221,11 +17238,11 @@ ZBMCallumbwire (1) - - Zangune (1) + + Zibi (1) @@ -17235,10 +17252,13 @@ 鄒延 (1) + + + - If you want to replace your Wiki user name with your full name, go to this wiki page and add yourself to the name mapping list. + If you want to replace your Wiki user name with your full name, go to this wiki page and add yourself to the name mapping list. - \ No newline at end of file + diff -Nru libreoffice-7.4.1~rc2/reportdesign/source/ui/dlg/Formula.cxx libreoffice-7.4.2~rc3/reportdesign/source/ui/dlg/Formula.cxx --- libreoffice-7.4.1~rc2/reportdesign/source/ui/dlg/Formula.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/reportdesign/source/ui/dlg/Formula.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -87,7 +87,7 @@ if ( m_xAddField ) { SvtViewOptions aDlgOpt( EViewType::Window, HID_RPT_FIELD_SEL_WIN ); - aDlgOpt.SetWindowState(OStringToOUString(m_xAddField->getDialog()->get_window_state(vcl::WindowDataMask::Pos | vcl::WindowDataMask::State | vcl::WindowDataMask::Minimized), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(OStringToOUString(m_xAddField->getDialog()->get_window_state(WindowStateMask::X | WindowStateMask::Y | WindowStateMask::State | WindowStateMask::Minimized), RTL_TEXTENCODING_ASCII_US)); if (m_xAddField->getDialog()->get_visible()) m_xAddField->response(RET_CANCEL); diff -Nru libreoffice-7.4.1~rc2/reportdesign/source/ui/dlg/Navigator.cxx libreoffice-7.4.2~rc3/reportdesign/source/ui/dlg/Navigator.cxx --- libreoffice-7.4.1~rc2/reportdesign/source/ui/dlg/Navigator.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/reportdesign/source/ui/dlg/Navigator.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -238,6 +238,7 @@ delete pData; return false; }); + m_pSelectionListener->dispose(); m_pReportListener->dispose(); } diff -Nru libreoffice-7.4.1~rc2/reportdesign/source/ui/report/DesignView.cxx libreoffice-7.4.2~rc3/reportdesign/source/ui/report/DesignView.cxx --- libreoffice-7.4.1~rc2/reportdesign/source/ui/report/DesignView.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/reportdesign/source/ui/report/DesignView.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -136,7 +136,7 @@ if ( m_xAddField ) { SvtViewOptions aDlgOpt( EViewType::Window, UID_RPT_RPT_APP_VIEW ); - aDlgOpt.SetWindowState(OStringToOUString(m_xAddField->getDialog()->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(OStringToOUString(m_xAddField->getDialog()->get_window_state(WindowStateMask::All), RTL_TEXTENCODING_ASCII_US)); if (m_xAddField->getDialog()->get_visible()) m_xAddField->response(RET_CANCEL); @@ -146,7 +146,7 @@ if ( m_xReportExplorer ) { SvtViewOptions aDlgOpt(EViewType::Window, OStringToOUString(m_xReportExplorer->get_help_id(), RTL_TEXTENCODING_UTF8)); - aDlgOpt.SetWindowState(OStringToOUString(m_xReportExplorer->getDialog()->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(OStringToOUString(m_xReportExplorer->getDialog()->get_window_state(WindowStateMask::All), RTL_TEXTENCODING_ASCII_US)); if (m_xReportExplorer->getDialog()->get_visible()) m_xReportExplorer->response(RET_CANCEL); diff -Nru libreoffice-7.4.1~rc2/reportdesign/source/ui/report/ReportController.cxx libreoffice-7.4.2~rc3/reportdesign/source/ui/report/ReportController.cxx --- libreoffice-7.4.1~rc2/reportdesign/source/ui/report/ReportController.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/reportdesign/source/ui/report/ReportController.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -150,7 +150,9 @@ #define RPTUI_ID_START XATTR_FILL_FIRST - 3 #define RPTUI_ID_END XATTR_FILL_FIRST - 2 #define RPTUI_ID_BRUSH TypedWhichId(XATTR_FILL_FIRST - 1) -#define RPTUI_ID_METRIC XATTR_FILL_LAST + 1 +/// Note that we deliberately overlap an existing item id, so that we can have contiguous item ids for +/// the static defaults. +#define RPTUI_ID_METRIC XATTR_FILL_LAST using namespace ::com::sun::star; using namespace uno; @@ -294,7 +296,7 @@ if ( m_xGroupsFloater ) { SvtViewOptions aDlgOpt(EViewType::Window, OStringToOUString(m_xGroupsFloater->get_help_id(), RTL_TEXTENCODING_UTF8)); - aDlgOpt.SetWindowState(OStringToOUString(m_xGroupsFloater->getDialog()->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(OStringToOUString(m_xGroupsFloater->getDialog()->get_window_state(WindowStateMask::All), RTL_TEXTENCODING_ASCII_US)); if (m_xGroupsFloater->getDialog()->get_visible()) m_xGroupsFloater->response(RET_CANCEL); m_xGroupsFloater.reset(); @@ -2336,26 +2338,26 @@ { SID_PAPER_START, true }, { SID_PAPER_END, true }, { SID_ATTR_BRUSH, true }, - { XATTR_FILLSTYLE, true }, - { XATTR_FILLCOLOR, true }, - { XATTR_FILLGRADIENT, true }, - { XATTR_FILLHATCH, true }, - { XATTR_FILLBITMAP, true }, - { XATTR_FILLTRANSPARENCE, true }, - { XATTR_GRADIENTSTEPCOUNT, true }, - { XATTR_FILLBMP_TILE, true }, - { XATTR_FILLBMP_POS, true }, - { XATTR_FILLBMP_SIZEX, true }, - { XATTR_FILLBMP_SIZEY, true }, - { XATTR_FILLFLOATTRANSPARENCE, true }, - { XATTR_SECONDARYFILLCOLOR, true }, - { XATTR_FILLBMP_SIZELOG, true }, - { XATTR_FILLBMP_TILEOFFSETX, true }, - { XATTR_FILLBMP_TILEOFFSETY, true }, - { XATTR_FILLBMP_STRETCH, true }, - { XATTR_FILLBMP_POSOFFSETX, true }, - { XATTR_FILLBMP_POSOFFSETY, true }, - { XATTR_FILLBACKGROUND, true }, + { 0, true }, // XATTR_FILLSTYLE + { 0, true }, // XATTR_FILLCOLOR + { 0, true }, // XATTR_FILLGRADIENT + { 0, true }, // XATTR_FILLHATCH + { 0, true }, // XATTR_FILLBITMAP + { 0, true }, // XATTR_FILLTRANSPARENCE + { 0, true }, // XATTR_GRADIENTSTEPCOUNT + { 0, true }, // XATTR_FILLBMP_TILE + { 0, true }, // XATTR_FILLBMP_POS + { 0, true }, // XATTR_FILLBMP_SIZEX + { 0, true }, // XATTR_FILLBMP_SIZEY + { 0, true }, // XATTR_FILLFLOATTRANSPARENCE + { 0, true }, // XATTR_SECONDARYFILLCOLOR + { 0, true }, // XATTR_FILLBMP_SIZELOG + { 0, true }, // XATTR_FILLBMP_TILEOFFSETX + { 0, true }, // XATTR_FILLBMP_TILEOFFSETY + { 0, true }, // XATTR_FILLBMP_STRETCH + { 0, true }, // XATTR_FILLBMP_POSOFFSETX + { 0, true }, // XATTR_FILLBMP_POSOFFSETY + { 0, true }, // XATTR_FILLBACKGROUND { SID_ATTR_METRIC, true } }; diff -Nru libreoffice-7.4.1~rc2/sc/inc/addincol.hxx libreoffice-7.4.2~rc3/sc/inc/addincol.hxx --- libreoffice-7.4.1~rc2/sc/inc/addincol.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/inc/addincol.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -43,6 +43,7 @@ class ScUnoAddInFuncData; class ScFuncDesc; class LanguageTag; +class ScDocument; typedef std::unordered_map< OUString, const ScUnoAddInFuncData* > ScAddInHashMap; @@ -87,6 +88,7 @@ OUString aLocalName; ///< for display OUString aUpperName; ///< for entering formulas OUString aUpperLocal; ///< for entering formulas + OUString aUpperEnglish; ///< for Function Wizard and tooltips OUString aDescription; css::uno::Reference< css::reflection::XIdlMethod> xFunction; css::uno::Any aObject; @@ -113,6 +115,7 @@ const OUString& GetLocalName() const { return aLocalName; } const OUString& GetUpperName() const { return aUpperName; } const OUString& GetUpperLocal() const { return aUpperLocal; } + const OUString& GetUpperEnglish() const { return aUpperEnglish; } const css::uno::Reference< css::reflection::XIdlMethod>& GetFunction() const { return xFunction; } const css::uno::Any& GetObject() const { return aObject; } @@ -132,6 +135,9 @@ void SetArguments( tools::Long nNewCount, const ScAddInArgDesc* pNewDescs ); void SetCallerPos( tools::Long nNewPos ); void SetCompNames( ::std::vector< LocalizedName >&& rNew ); + + /// Takes care of handling an empty name *after* upper local name was set. + void SetEnglishName( const OUString& rEnglishName ); }; class SC_DLLPUBLIC ScUnoAddInCollection @@ -175,9 +181,10 @@ void LocalizeString( OUString& rName ); ///< modify rName - input: exact name tools::Long GetFuncCount(); - bool FillFunctionDesc( tools::Long nFunc, ScFuncDesc& rDesc ); + bool FillFunctionDesc( tools::Long nFunc, ScFuncDesc& rDesc, bool bEnglishFunctionNames ); - static bool FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc ); + static bool FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc, + bool bEnglishFunctionNames ); /// leave rRetExcelName unchanged, if no matching name is found bool GetExcelName( const OUString& rCalcName, LanguageType eDestLang, OUString& rRetExcelName ); /// leave rRetCalcName unchanged, if no matching name is found @@ -191,6 +198,7 @@ css::uno::Sequence aArgs; css::uno::Sequence aVarArg; css::uno::Reference xCaller; + ScDocument& mrDoc; bool bValidCount; // result: FormulaError nErrCode; @@ -204,7 +212,7 @@ public: // exact name - ScUnoAddInCall( ScUnoAddInCollection& rColl, const OUString& rName, + ScUnoAddInCall( ScDocument& rDoc, ScUnoAddInCollection& rColl, const OUString& rName, tools::Long nParamCount ); ~ScUnoAddInCall(); diff -Nru libreoffice-7.4.1~rc2/sc/inc/chart2uno.hxx libreoffice-7.4.2~rc3/sc/inc/chart2uno.hxx --- libreoffice-7.4.1~rc2/sc/inc/chart2uno.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/inc/chart2uno.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -147,10 +147,6 @@ ScDocument* m_pDocument; SfxItemPropertySet m_aPropSet; bool m_bIncludeHiddenCells; - css::uno::Reference< css::chart2::data::XDataSource > mxCachedDataSource; - css::uno::Sequence< css::beans::PropertyValue > maCachedArguments; - css::uno::Sequence< css::beans::PropertyValue > maCreateDataSourceArguments; - css::uno::Reference< css::chart2::data::XDataSource > mxCreatedDataSource; }; // DataSource diff -Nru libreoffice-7.4.1~rc2/sc/inc/compiler.hxx libreoffice-7.4.2~rc3/sc/inc/compiler.hxx --- libreoffice-7.4.1~rc2/sc/inc/compiler.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/inc/compiler.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -257,6 +257,7 @@ private: + static osl::Mutex maMutex; static const CharClass *pCharClassEnglish; // character classification for en_US locale static const CharClass *pCharClassLocalized; // character classification for UI locale static const Convention *pConventions[ formula::FormulaGrammar::CONV_LAST ]; @@ -377,8 +378,9 @@ bool HasPossibleNamedRangeConflict(SCTAB nTab) const; - static const CharClass* GetCharClassEnglish(); +public: static const CharClass* GetCharClassLocalized(); + static const CharClass* GetCharClassEnglish(); public: ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos, @@ -437,6 +439,11 @@ static const Convention* GetRefConvention( formula::FormulaGrammar::AddressConvention eConv ); + /** Overwrite FormulaCompiler::GetOpCodeMap() forwarding to + GetFinalOpCodeMap(). + */ + OpCodeMapPtr GetOpCodeMap( const sal_Int32 nLanguage ) const { return GetFinalOpCodeMap(nLanguage); } + /// Set symbol map if not empty. void SetFormulaLanguage( const OpCodeMapPtr & xMap ); diff -Nru libreoffice-7.4.1~rc2/sc/inc/dociter.hxx libreoffice-7.4.2~rc3/sc/inc/dociter.hxx --- libreoffice-7.4.1~rc2/sc/inc/dociter.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/inc/dociter.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -53,7 +53,7 @@ typedef sc::CellStoreType::const_position_type PositionType; ScDocument& mrDoc; - ScInterpreterContext* pContext; + ScInterpreterContext& mrContext; const ScAttrArray* pAttrArray; sal_uInt32 nNumFormat; // for CalcAsShown sal_uInt32 nNumFmtIndex; @@ -83,7 +83,7 @@ public: - ScValueIterator( + ScValueIterator(ScInterpreterContext& rContext, ScDocument& rDocument, const ScRange& rRange, SubtotalFlags nSubTotalFlags = SubtotalFlags::NONE, bool bTextAsZero = false ); @@ -94,8 +94,6 @@ /// Does NOT reset rValue if no value found! bool GetNext( double& rValue, FormulaError& rErr ); - - void SetInterpreterContext( ScInterpreterContext* context ) { pContext = context; } }; class ScDBQueryDataIterator diff -Nru libreoffice-7.4.1~rc2/sc/inc/funcdesc.hxx libreoffice-7.4.2~rc3/sc/inc/funcdesc.hxx --- libreoffice-7.4.1~rc2/sc/inc/funcdesc.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/inc/funcdesc.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -241,7 +241,7 @@ class ScFunctionList { public: - ScFunctionList(); + explicit ScFunctionList( bool bEnglishFunctionNames ); ~ScFunctionList(); sal_uInt32 GetCount() const @@ -253,9 +253,12 @@ const ScFuncDesc* GetFunction( sal_uInt32 nIndex ) const; + bool IsEnglishFunctionNames() const { return mbEnglishFunctionNames; } + private: ::std::vector aFunctionList; /**< List of functions */ ::std::vector::iterator aFunctionListIter; /**< position in function list */ + bool mbEnglishFunctionNames; }; /** diff -Nru libreoffice-7.4.1~rc2/sc/inc/global.hxx libreoffice-7.4.2~rc3/sc/inc/global.hxx --- libreoffice-7.4.1~rc2/sc/inc/global.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/inc/global.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -20,6 +20,7 @@ #pragma once #include "address.hxx" +#include "typedstrdata.hxx" #include #include #include @@ -455,6 +456,17 @@ bool operator== ( const ScImportParam& r ) const; }; +// Formula data replacement character for a pair of parentheses at end of +// function name, to force sorting parentheses before all other characters. +// Collation may treat parentheses differently. +constexpr sal_Unicode cParenthesesReplacement = 0x0001; +struct InputHandlerFunctionNames +{ + ScTypedCaseStrSet maFunctionData; + ScTypedCaseStrSet maFunctionDataPara; + std::set maFunctionChar; +}; + class ScDocShell; class SvxSearchItem; class ScAutoFormat; @@ -523,6 +535,8 @@ static std::atomic pSharedStringPoolPurge; + static InputHandlerFunctionNames maInputHandlerFunctionNames; + static void InitPPT(); public: @@ -595,6 +609,7 @@ static ScFunctionList* GetStarCalcFunctionList(); static ScFunctionMgr* GetStarCalcFunctionMgr(); static void ResetFunctionList(); + static const InputHandlerFunctionNames& GetInputHandlerFunctionNames(); static OUString GetErrorString(FormulaError nErrNumber); static OUString GetLongErrorString(FormulaError nErrNumber); diff -Nru libreoffice-7.4.1~rc2/sc/inc/rangeutl.hxx libreoffice-7.4.2~rc3/sc/inc/rangeutl.hxx --- libreoffice-7.4.1~rc2/sc/inc/rangeutl.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/inc/rangeutl.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -276,6 +276,15 @@ ScRangeUpdater() = delete; static void UpdateInsertTab(ScAddress& rAddr, const sc::RefUpdateInsertTabContext& rCxt); + + /** This is for the base-cell-address of a defined name or conditional + format, not for references. A sheet position on or after the start of + the deleted range is moved towards the beginning by the amount of + deleted sheets, within the deleted range to the front of that or set to + 0 (as there is always at least one sheet in a document) if the position + would result in a negative value, e.g. if position was 0 and (only) + sheet 0 is deleted it would had become -1. + */ static void UpdateDeleteTab(ScAddress& rAddr, const sc::RefUpdateDeleteTabContext& rCxt); }; diff -Nru libreoffice-7.4.1~rc2/sc/inc/table.hxx libreoffice-7.4.2~rc3/sc/inc/table.hxx --- libreoffice-7.4.1~rc2/sc/inc/table.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/inc/table.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -294,6 +294,14 @@ } // out-of-line the cold part of the function void CreateColumnIfNotExistsImpl( const SCCOL nScCol ); + + ScColumnData& GetColumnData( SCCOL nCol ) + { + if( nCol >= aCol.size()) + return aDefaultColData; + return aCol[nCol]; + } + sal_uInt64 GetCellCount() const; sal_uInt64 GetWeightedCount() const; sal_uInt64 GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const; diff -Nru libreoffice-7.4.1~rc2/sc/qa/uitest/calc_tests8/navigator.py libreoffice-7.4.2~rc3/sc/qa/uitest/calc_tests8/navigator.py --- libreoffice-7.4.1~rc2/sc/qa/uitest/calc_tests8/navigator.py 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/qa/uitest/calc_tests8/navigator.py 2022-10-10 10:15:14.000000000 +0000 @@ -140,7 +140,9 @@ # Use return to update the current cell xColumn.executeAction("TYPE", mkPropertyValues({"KEYCODE":"RETURN"})) + self.ui_test.wait_until_property_is_updated(xColumn, "Value", "2") self.assertEqual(get_state_as_dict(xColumn)['Value'], '2') + self.ui_test.wait_until_property_is_updated(xRow, "Value", "2") self.assertEqual(get_state_as_dict(xRow)['Value'], '2') self.assertEqual(get_state_as_dict(xGridWin)["CurrentRow"], "1") @@ -169,4 +171,4 @@ self.xUITest.executeCommand(".uno:Sidebar") -# vim: set shiftwidth=4 softtabstop=4 expandtab: \ No newline at end of file +# vim: set shiftwidth=4 softtabstop=4 expandtab: diff -Nru libreoffice-7.4.1~rc2/sc/qa/uitest/inputLine/tdf142031.py libreoffice-7.4.2~rc3/sc/qa/uitest/inputLine/tdf142031.py --- libreoffice-7.4.1~rc2/sc/qa/uitest/inputLine/tdf142031.py 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/qa/uitest/inputLine/tdf142031.py 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,41 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +from uitest.framework import UITestCase +from uitest.uihelper.common import get_state_as_dict, type_text +from libreoffice.calc.document import get_cell_by_position +from libreoffice.uno.propertyvalue import mkPropertyValues + +class tdf142031(UITestCase): + + def test_tdf142031(self): + with self.ui_test.create_doc_in_start_center("calc") as document: + xCalcDoc = self.xUITest.getTopFocusWindow() + gridwin = xCalcDoc.getChild("grid_window") + xPosWindow = xCalcDoc.getChild('pos_window') + + with self.ui_test.execute_modeless_dialog_through_command(".uno:AddName", close_button="add") as xAddNameDlg: + xEdit = xAddNameDlg.getChild("edit") + type_text(xEdit, "crédit") + + self.assertEqual('crédit', get_state_as_dict(xPosWindow)['Text']) + + gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"})) + + xInputWin = xCalcDoc.getChild("sc_input_window") + xInputWin.executeAction("TYPE", mkPropertyValues({"TEXT":"=cré"})) + xInputWin.executeAction("TYPE", mkPropertyValues({"KEYCODE":"RETURN"})) + + # Without the fix in place, this test would have failed here + self.assertEqual("=crédit", get_state_as_dict(xInputWin)["Text"]) + + xInputWin.executeAction("TYPE", mkPropertyValues({"KEYCODE":"RETURN"})) + + self.assertEqual("0", get_cell_by_position(document, 0, 1, 0).getString()) + +# vim: set shiftwidth=4 softtabstop=4 expandtab: Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sc/qa/unit/data/ods/pivottable_restore_query_filter.ods and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sc/qa/unit/data/ods/pivottable_restore_query_filter.ods differ diff -Nru libreoffice-7.4.1~rc2/sc/qa/unit/pivottable_filters_test.cxx libreoffice-7.4.2~rc3/sc/qa/unit/pivottable_filters_test.cxx --- libreoffice-7.4.1~rc2/sc/qa/unit/pivottable_filters_test.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/qa/unit/pivottable_filters_test.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -25,6 +25,9 @@ #include #include #include +#include +#include +#include #include #include @@ -96,6 +99,7 @@ void testTdf125046(); void testTdf125055(); void testTdf125086(); + void testTdf73845(); CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest); @@ -149,6 +153,7 @@ CPPUNIT_TEST(testTdf125046); CPPUNIT_TEST(testTdf125055); CPPUNIT_TEST(testTdf125086); + CPPUNIT_TEST(testTdf73845); CPPUNIT_TEST_SUITE_END(); @@ -2743,6 +2748,42 @@ assertXPath(pDoc, "/x:pivotTableDefinition/x:pivotFields/x:pivotField[2]", "dataField", "1"); } +void ScPivotTableFiltersTest::testTdf73845() +{ + // Query filter is set for individual pivot table in this ODS document. + // This test checks the query filter is restored for ByEmpty and ByNonEmpty query. + ScDocShellRef xDocSh = loadDoc(u"pivottable_restore_query_filter.", FORMAT_ODS); + ScDocument& rDoc = xDocSh->GetDocument(); + ScDPCollection* pDPs = rDoc.GetDPCollection(); + CPPUNIT_ASSERT_MESSAGE("Failed to get a live ScDPCollection instance.", pDPs); + + // Three pivot tables are created in the spreadsheet. Query filters are set as follow: + // pivot table 0: Confirmed Date = Not Empty + // pivot table 1: Confirmed Date = Empty + // pivot table 2: Category > C1 AND Confirmed Date = Not Empty + // + // Following assertions check the Confirmed Date is restored properly + // after file is opened again. + const SCCOLROW nConfirmedDateCol = SCCOLROW(2); + size_t nDPCount = pDPs->GetCount(); + for (size_t i = 0; i < nDPCount; i++) + { + ScDPObject& pDPObj = (*pDPs)[i]; + ScQueryParam aQueryParam(pDPObj.GetSheetDesc()->GetQueryParam()); + size_t nEntriesCount = aQueryParam.GetEntryCount(); + for (size_t j = 0; j < nEntriesCount; j++) + { + ScQueryEntry rEntry = aQueryParam.GetEntry(j); + if (rEntry.IsQueryByEmpty() || rEntry.IsQueryByNonEmpty()) + { + const OString msg = "Query entry " + OString::number(j) + " on pivot table " + + OString::number(i) + " is not restored."; + CPPUNIT_ASSERT_EQUAL_MESSAGE(msg.getStr(), nConfirmedDateCol, rEntry.nField); + } + } + } +} + CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-7.4.1~rc2/sc/qa/unit/ucalc.cxx libreoffice-7.4.2~rc3/sc/qa/unit/ucalc.cxx --- libreoffice-7.4.1~rc2/sc/qa/unit/ucalc.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/qa/unit/ucalc.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -380,6 +380,10 @@ { m_pDoc->InsertTab(0, "foo"); + svl::SharedStringPool& rPool = m_pDoc->GetSharedStringPool(); + size_t extraCount = rPool.getCount(); // internal items such as SharedString::getEmptyString() + size_t extraCountIgnoreCase = rPool.getCountIgnoreCase(); + // Strings that are identical. m_pDoc->SetString(ScAddress(0,0,0), "Andy"); // A1 m_pDoc->SetString(ScAddress(0,1,0), "Andy"); // A2 @@ -417,40 +421,39 @@ } // Check the string counts after purging. Purging shouldn't remove any strings in this case. - svl::SharedStringPool& rPool = m_pDoc->GetSharedStringPool(); rPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(5), rPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(5+extraCount, rPool.getCount()); + CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, rPool.getCountIgnoreCase()); // Clear A1 and purge again. clearRange(m_pDoc, ScAddress(0,0,0)); rPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(5), rPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(5+extraCount, rPool.getCount()); + CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, rPool.getCountIgnoreCase()); // Clear A2 and purge again. clearRange(m_pDoc, ScAddress(0,1,0)); rPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(4), rPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(4+extraCount, rPool.getCount()); + CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, rPool.getCountIgnoreCase()); // Clear A3 and purge again. clearRange(m_pDoc, ScAddress(0,2,0)); rPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(3), rPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(3+extraCount, rPool.getCount()); + CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, rPool.getCountIgnoreCase()); // Clear A4 and purge again. clearRange(m_pDoc, ScAddress(0,3,0)); rPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(1), rPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(1), rPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(1+extraCount, rPool.getCount()); + CPPUNIT_ASSERT_EQUAL(1+extraCountIgnoreCase, rPool.getCountIgnoreCase()); // Clear A5 and the pool should be completely empty. clearRange(m_pDoc, ScAddress(0,4,0)); rPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(0), rPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(0), rPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(extraCount, rPool.getCount()); + CPPUNIT_ASSERT_EQUAL(extraCountIgnoreCase, rPool.getCountIgnoreCase()); // Now, compare string and edit text cells. m_pDoc->SetString(ScAddress(0,0,0), "Andy and Bruce"); // A1 @@ -1349,6 +1352,8 @@ aOpt.SetCalcAsShown(true); m_pDoc->SetDocOptions(aOpt); + ScInterpreterContext aContext(*m_pDoc, m_pDoc->GetFormatTable()); + // Purely horizontal data layout with numeric data. for (SCCOL i = 1; i <= 3; ++i) m_pDoc->SetValue(ScAddress(i,2,0), i); @@ -1356,7 +1361,7 @@ { const double aChecks[] = { 1.0, 2.0, 3.0 }; size_t const nCheckLen = SAL_N_ELEMENTS(aChecks); - ScValueIterator aIter(*m_pDoc, ScRange(1,2,0,3,2,0)); + ScValueIterator aIter(aContext, *m_pDoc, ScRange(1,2,0,3,2,0)); bool bHas = false; size_t nCheckPos = 0; double fVal; diff -Nru libreoffice-7.4.1~rc2/sc/source/core/data/column3.cxx libreoffice-7.4.2~rc3/sc/source/core/data/column3.cxx --- libreoffice-7.4.1~rc2/sc/source/core/data/column3.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/data/column3.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -569,6 +569,40 @@ if (GetDoc().IsClipOrUndo()) return; + // Need to process (start listening) entire shared formula groups, not just + // a slice thereof. + bool bEnlargedDown = false; + aPos = maCells.position(nRow1); + it = aPos.first; + if (it->type == sc::element_type_formula) + { + ScFormulaCell& rCell = *sc::formula_block::at(*it->data, aPos.second); + if (rCell.IsShared()) + { + nRow1 = std::min( nRow1, rCell.GetSharedTopRow()); + if (nRow2 < rCell.GetSharedTopRow() + rCell.GetSharedLength()) + { + nRow2 = rCell.GetSharedTopRow() + rCell.GetSharedLength() - 1; + bEnlargedDown = true; + // Same end row is also enlarged, i.e. doesn't need to be + // checked for another group. + } + } + } + if (!bEnlargedDown) + { + aPos = maCells.position(it, nRow2); + it = aPos.first; + if (it->type == sc::element_type_formula) + { + ScFormulaCell& rCell = *sc::formula_block::at(*it->data, aPos.second); + if (rCell.IsShared()) + { + nRow2 = std::max( nRow2, rCell.GetSharedTopRow() + rCell.GetSharedLength() - 1); + } + } + } + AttachFormulaCellsHandler aFunc(rCxt); sc::ProcessFormula(it, maCells, nRow1, nRow2, aFunc); } diff -Nru libreoffice-7.4.1~rc2/sc/source/core/data/dociter.cxx libreoffice-7.4.2~rc3/sc/source/core/data/dociter.cxx --- libreoffice-7.4.1~rc2/sc/source/core/data/dociter.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/data/dociter.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -82,10 +82,10 @@ nAttrEndRow = nRowEnd; } -ScValueIterator::ScValueIterator( ScDocument& rDocument, const ScRange& rRange, +ScValueIterator::ScValueIterator(ScInterpreterContext& rContext, ScDocument& rDocument, const ScRange& rRange, SubtotalFlags nSubTotalFlags, bool bTextZero ) : mrDoc(rDocument) - , pContext(nullptr) + , mrContext(rContext) , pAttrArray(nullptr) , nNumFormat(0) // Initialized in GetNumberFormat , nNumFmtIndex(0) @@ -194,8 +194,8 @@ if (bCalcAsShown) { ScAttrArray_IterGetNumberFormat(nNumFormat, pAttrArray, - nAttrEndRow, pCol->pAttrArray.get(), nCurRow, mrDoc, pContext); - rValue = mrDoc.RoundValueAsShown(rValue, nNumFormat, pContext); + nAttrEndRow, pCol->pAttrArray.get(), nCurRow, mrDoc, &mrContext); + rValue = mrDoc.RoundValueAsShown(rValue, nNumFormat, &mrContext); } return true; // Found it! } diff -Nru libreoffice-7.4.1~rc2/sc/source/core/data/fillinfo.cxx libreoffice-7.4.2~rc3/sc/source/core/data/fillinfo.cxx --- libreoffice-7.4.1~rc2/sc/source/core/data/fillinfo.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/data/fillinfo.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -807,8 +807,8 @@ } if (bBottomDiff && bRightDiff) { - pRowInfo[nArrRow+1].cellInfo(nCol).pHShadowOrigin = pThisAttr; - pRowInfo[nArrRow+1].cellInfo(nCol).eHShadowPart = SC_SHADOW_CORNER; + pRowInfo[nArrRow+1].cellInfo(nCol+1).pHShadowOrigin = pThisAttr; + pRowInfo[nArrRow+1].cellInfo(nCol+1).eHShadowPart = SC_SHADOW_CORNER; } break; diff -Nru libreoffice-7.4.1~rc2/sc/source/core/data/funcdesc.cxx libreoffice-7.4.2~rc3/sc/source/core/data/funcdesc.cxx --- libreoffice-7.4.1~rc2/sc/source/core/data/funcdesc.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/data/funcdesc.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -397,7 +397,8 @@ #define ENTRY(CODE) CODE, SAL_N_ELEMENTS(CODE) -ScFunctionList::ScFunctionList() +ScFunctionList::ScFunctionList( bool bEnglishFunctionNames ) + : mbEnglishFunctionNames( bEnglishFunctionNames ) { sal_Int32 nMaxFuncNameLen = 0; // Length of longest function name @@ -958,7 +959,7 @@ pDesc = new ScFuncDesc; pDesc->nFIndex = nNextId++; - if ( pUnoAddIns->FillFunctionDesc( nFunc, *pDesc ) ) + if ( pUnoAddIns->FillFunctionDesc( nFunc, *pDesc, mbEnglishFunctionNames ) ) { tmpFuncVector.push_back(pDesc); nStrLen = pDesc->mxFuncName->getLength(); diff -Nru libreoffice-7.4.1~rc2/sc/source/core/data/global.cxx libreoffice-7.4.2~rc3/sc/source/core/data/global.cxx --- libreoffice-7.4.1~rc2/sc/source/core/data/global.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/data/global.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -74,6 +74,7 @@ #include #include #include +#include tools::SvRef ScGlobal::xDrawClipDocShellRef; std::unique_ptr ScGlobal::xSearchItem; @@ -118,6 +119,9 @@ bool ScGlobal::bThreadedGroupCalcInProgress = false; +InputHandlerFunctionNames ScGlobal::maInputHandlerFunctionNames; + + // Static functions bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs, @@ -621,7 +625,7 @@ { assert(!bThreadedGroupCalcInProgress); if ( !xStarCalcFunctionList ) - xStarCalcFunctionList.reset(new ScFunctionList); + xStarCalcFunctionList.reset( new ScFunctionList( SC_MOD()->GetFormulaOptions().GetUseEnglishFuncName())); return xStarCalcFunctionList.get(); } @@ -640,6 +644,40 @@ // FunctionMgr has pointers into FunctionList, must also be updated xStarCalcFunctionMgr.reset(); xStarCalcFunctionList.reset(); + // Building new names also needs InputHandler data to be refreshed. + maInputHandlerFunctionNames = InputHandlerFunctionNames(); +} + +const InputHandlerFunctionNames& ScGlobal::GetInputHandlerFunctionNames() +{ + if (maInputHandlerFunctionNames.maFunctionData.empty()) + { + const OUString aParenthesesReplacement( cParenthesesReplacement); + const ScFunctionList* pFuncList = GetStarCalcFunctionList(); + const sal_uInt32 nListCount = pFuncList->GetCount(); + const CharClass* pCharClass = (pFuncList->IsEnglishFunctionNames() + ? ScCompiler::GetCharClassEnglish() + : ScCompiler::GetCharClassLocalized()); + for (sal_uInt32 i=0; i < nListCount; ++i) + { + const ScFuncDesc* pDesc = pFuncList->GetFunction( i ); + if ( pDesc->mxFuncName ) + { + OUString aFuncName(pCharClass->uppercase(*(pDesc->mxFuncName))); + // fdo#75264 fill maFormulaChar with all characters used in formula names + for (sal_Int32 j = 0; j < aFuncName.getLength(); j++) + maInputHandlerFunctionNames.maFunctionChar.insert(aFuncName[j]); + maInputHandlerFunctionNames.maFunctionData.insert( + ScTypedStrData(*(pDesc->mxFuncName) + aParenthesesReplacement, 0.0, 0.0, + ScTypedStrData::Standard)); + pDesc->initArgumentInfo(); + OUString aEntry = pDesc->getSignature(); + maInputHandlerFunctionNames.maFunctionDataPara.insert( + ScTypedStrData(aEntry, 0.0, 0.0, ScTypedStrData::Standard)); + } + } + } + return maInputHandlerFunctionNames; } ScUnitConverter* ScGlobal::GetUnitConverter() diff -Nru libreoffice-7.4.1~rc2/sc/source/core/data/table4.cxx libreoffice-7.4.2~rc3/sc/source/core/data/table4.cxx --- libreoffice-7.4.1~rc2/sc/source/core/data/table4.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/data/table4.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -910,9 +910,9 @@ if ( bGetPattern ) { if (bVertical) // rInner&:=nRow, rOuter&:=nCol - pSrcPattern = aCol[nCol].GetPattern(static_cast(nAtSrc)); + pSrcPattern = GetColumnData(nCol).GetPattern(static_cast(nAtSrc)); else // rInner&:=nCol, rOuter&:=nRow - pSrcPattern = aCol[nAtSrc].GetPattern(static_cast(nRow)); + pSrcPattern = GetColumnData(nAtSrc).GetPattern(static_cast(nRow)); bGetPattern = false; pStyleSheet = pSrcPattern->GetStyleSheet(); // do transfer ATTR_MERGE / ATTR_MERGE_FLAG @@ -1894,7 +1894,7 @@ return; } const SvNumFormatType nFormatType = rDocument.GetFormatTable()->GetType( - aCol[rCol].GetNumberFormat( rDocument.GetNonThreadedContext(), nSource)); + GetColumnData(rCol).GetNumberFormat( rDocument.GetNonThreadedContext(), nSource)); bBooleanCell = (nFormatType == SvNumFormatType::LOGICAL); bPercentCell = (nFormatType == SvNumFormatType::PERCENT); @@ -1903,7 +1903,7 @@ { aSrcCell = GetCellValue(nSource, rRow); const SvNumFormatType nFormatType = rDocument.GetFormatTable()->GetType( - aCol[nSource].GetNumberFormat( rDocument.GetNonThreadedContext(), rRow)); + GetColumnData(nSource).GetNumberFormat( rDocument.GetNonThreadedContext(), rRow)); bBooleanCell = (nFormatType == SvNumFormatType::LOGICAL); bPercentCell = (nFormatType == SvNumFormatType::PERCENT); } diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/addincol.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/addincol.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/addincol.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/addincol.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -59,6 +59,8 @@ #include #include #include +#include +#include #include using namespace com::sun::star; @@ -138,6 +140,19 @@ bCompInitialized = true; } +void ScUnoAddInFuncData::SetEnglishName( const OUString& rEnglishName ) +{ + if (!rEnglishName.isEmpty()) + aUpperEnglish = ScCompiler::GetCharClassEnglish()->uppercase(rEnglishName); + else + { + // A dumb fallback to not have an empty name, mainly just for the + // assignment to ScFuncDesc::mxFuncName for the Function Wizard and + // formula input tooltips. + aUpperEnglish = aUpperLocal; + } +} + bool ScUnoAddInFuncData::GetExcelName( const LanguageTag& rDestLang, OUString& rRetExcelName, bool bFallbackToAny ) const { const ::std::vector& rCompNames = GetCompNames(); @@ -544,9 +559,10 @@ else { pEnglishHashMap->emplace( - aEnglishName.toAsciiUpperCase(), + ScCompiler::GetCharClassEnglish()->uppercase(aEnglishName), pData ); } + pData->SetEnglishName(aEnglishName); // takes care of handling empty } } } @@ -720,12 +736,11 @@ if ( !(xAddIn.is() && xName.is()) ) return; - // fdo50118 when GetUseEnglishFunctionName() returns true, set the - // locale to en-US to get English function names - if ( SC_MOD()->GetFormulaOptions().GetUseEnglishFuncName() ) - xAddIn->setLocale( lang::Locale( "en", "US", "")); - else - xAddIn->setLocale( Application::GetSettings().GetUILanguageTag().getLocale()); + // Even if GetUseEnglishFunctionName() would return true, do not set the + // locale to en-US to get English function names as that also would mix in + // English descriptions and parameter names. English function names are now + // handled below. + xAddIn->setLocale( Application::GetSettings().GetUILanguageTag().getLocale()); OUString aServiceName( xName->getServiceName() ); ScUnoAddInHelpIdGenerator aHelpIdGenerator( aServiceName ); @@ -919,8 +934,7 @@ xFunc, aObject, nVisibleCount, pVisibleArgs.get(), nCallerPos ) ); - const ScUnoAddInFuncData* pData = - ppFuncData[nFuncPos+nOld].get(); + ScUnoAddInFuncData* pData = ppFuncData[nFuncPos+nOld].get(); pExactHashMap->emplace( pData->GetOriginalName(), pData ); @@ -937,18 +951,21 @@ else { pEnglishHashMap->emplace( - aEnglishName.toAsciiUpperCase(), + ScCompiler::GetCharClassEnglish()->uppercase(aEnglishName), pData ); } + pData->SetEnglishName(aEnglishName); // takes care of handling empty } } } } } -static void lcl_UpdateFunctionList( const ScFunctionList& rFunctionList, const ScUnoAddInFuncData& rFuncData ) +static void lcl_UpdateFunctionList( const ScFunctionList& rFunctionList, const ScUnoAddInFuncData& rFuncData, + bool bEnglishFunctionNames ) { - const OUString& aCompare = rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData + // as used in FillFunctionDescFromData + const OUString& aCompare = (bEnglishFunctionNames ? rFuncData.GetUpperEnglish() : rFuncData.GetUpperLocal()); sal_uLong nCount = rFunctionList.GetCount(); for (sal_uLong nPos=0; nPosmxFuncName && *pDesc->mxFuncName == aCompare ) { - ScUnoAddInCollection::FillFunctionDescFromData( rFuncData, *const_cast(pDesc) ); + ScUnoAddInCollection::FillFunctionDescFromData( rFuncData, *const_cast(pDesc), + bEnglishFunctionNames); break; } } @@ -977,16 +995,10 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference& xInterface, std::u16string_view rServiceName ) { + const bool bEnglishFunctionNames = SC_MOD()->GetFormulaOptions().GetUseEnglishFuncName(); uno::Reference xLoc( xInterface, uno::UNO_QUERY ); if ( xLoc.is() ) // optional in new add-ins - { - // fdo50118 when GetUseEnglishFunctionName() returns true, set the - // locale to en-US to get English function names - if ( SC_MOD()->GetFormulaOptions().GetUseEnglishFuncName() ) - xLoc->setLocale( lang::Locale( "en", "US", "")); - else - xLoc->setLocale( Application::GetSettings().GetUILanguageTag().getLocale()); - } + xLoc->setLocale( Application::GetSettings().GetUILanguageTag().getLocale()); // if function list was already initialized, it must be updated @@ -1092,7 +1104,7 @@ pOldData->SetCallerPos( nCallerPos ); if ( pFunctionList ) - lcl_UpdateFunctionList( *pFunctionList, *pOldData ); + lcl_UpdateFunctionList( *pFunctionList, *pOldData, bEnglishFunctionNames ); } } } @@ -1193,7 +1205,7 @@ return nFuncCount; } -bool ScUnoAddInCollection::FillFunctionDesc( tools::Long nFunc, ScFuncDesc& rDesc ) +bool ScUnoAddInCollection::FillFunctionDesc( tools::Long nFunc, ScFuncDesc& rDesc, bool bEnglishFunctionNames ) { if (!bInitialized) Initialize(); @@ -1203,10 +1215,11 @@ const ScUnoAddInFuncData& rFuncData = *ppFuncData[nFunc]; - return FillFunctionDescFromData( rFuncData, rDesc ); + return FillFunctionDescFromData( rFuncData, rDesc, bEnglishFunctionNames ); } -bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc ) +bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc, + bool bEnglishFunctionNames ) { rDesc.Clear(); @@ -1221,7 +1234,7 @@ // nFIndex is set from outside - rDesc.mxFuncName = rFuncData.GetUpperLocal(); //TODO: upper? + rDesc.mxFuncName = (bEnglishFunctionNames ? rFuncData.GetUpperEnglish() : rFuncData.GetUpperLocal()); rDesc.nCategory = rFuncData.GetCategory(); rDesc.sHelpId = rFuncData.GetHelpId(); @@ -1270,8 +1283,9 @@ return true; } -ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const OUString& rName, +ScUnoAddInCall::ScUnoAddInCall( ScDocument& rDoc, ScUnoAddInCollection& rColl, const OUString& rName, tools::Long nParamCount ) : + mrDoc( rDoc ), bValidCount( false ), nErrCode( FormulaError::NoCode ), // before function was called bHasString( true ), @@ -1624,13 +1638,13 @@ for (sal_Int32 nCol=0; nColPutString( - svl::SharedString(pColArr[nCol]), + mrDoc.GetSharedStringPool().intern(pColArr[nCol]), static_cast(nCol), static_cast(nRow)); } for (sal_Int32 nCol=nColCount; nColPutString( - svl::SharedString(OUString()), + svl::SharedString::getEmptyString(), static_cast(nCol), static_cast(nRow)); } } diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/calcconfig.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/calcconfig.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/calcconfig.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/calcconfig.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -234,6 +234,7 @@ // HACK: Both unary and binary minus have the same string but different opcodes. if( result->find( ocSub ) != result->end()) result->insert( ocNegSub ); + return result; } diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/compiler.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/compiler.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/compiler.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/compiler.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -77,6 +77,7 @@ using namespace ::com::sun::star; using ::std::vector; +osl::Mutex ScCompiler::maMutex; const CharClass* ScCompiler::pCharClassEnglish = nullptr; const CharClass* ScCompiler::pCharClassLocalized = nullptr; const ScCompiler::Convention* ScCompiler::pConventions[ ] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; @@ -225,9 +226,12 @@ { if (!pCharClassEnglish) { - css::lang::Locale aLocale( "en", "US", ""); - pCharClassEnglish = new CharClass( - ::comphelper::getProcessComponentContext(), LanguageTag( aLocale)); + osl::MutexGuard aGuard(maMutex); + if (!pCharClassEnglish) + { + pCharClassEnglish = new CharClass( ::comphelper::getProcessComponentContext(), + LanguageTag( LANGUAGE_ENGLISH_US)); + } } return pCharClassEnglish; } @@ -238,8 +242,12 @@ { // Switching UI language requires restart; if not, we would have to // keep track of that. - pCharClassLocalized = new CharClass( - ::comphelper::getProcessComponentContext(), Application::GetSettings().GetUILanguageTag()); + osl::MutexGuard aGuard(maMutex); + if (!pCharClassLocalized) + { + pCharClassLocalized = new CharClass( ::comphelper::getProcessComponentContext(), + Application::GetSettings().GetUILanguageTag()); + } } return pCharClassLocalized; } @@ -253,17 +261,17 @@ if( eGrammar == FormulaGrammar::GRAM_EXTERNAL ) { meGrammar = eGrammar; - mxSymbols = GetOpCodeMap( css::sheet::FormulaLanguage::NATIVE); + mxSymbols = GetFinalOpCodeMap( css::sheet::FormulaLanguage::NATIVE); } else { FormulaGrammar::Grammar eMyGrammar = eGrammar; const sal_Int32 nFormulaLanguage = FormulaGrammar::extractFormulaLanguage( eMyGrammar); - OpCodeMapPtr xMap = GetOpCodeMap( nFormulaLanguage); + OpCodeMapPtr xMap = GetFinalOpCodeMap( nFormulaLanguage); OSL_ENSURE( xMap, "ScCompiler::SetGrammar: unknown formula language"); if (!xMap) { - xMap = GetOpCodeMap( css::sheet::FormulaLanguage::NATIVE); + xMap = GetFinalOpCodeMap( css::sheet::FormulaLanguage::NATIVE); eMyGrammar = xMap->getGrammar(); } @@ -5498,15 +5506,10 @@ // quote characters contained within are escaped by '\\'. bool ScCompiler::EnQuote( OUString& rStr ) { - sal_Int32 nType = ScGlobal::getCharClass().getStringType( rStr, 0, rStr.getLength() ); - if ( !CharClass::isNumericType( nType ) - && CharClass::isAlphaNumericType( nType ) ) - return false; - sal_Int32 nPos = 0; while ( (nPos = rStr.indexOf( '\'', nPos)) != -1 ) { - rStr = rStr.replaceAt( nPos, 0, u"\\" ); + rStr = rStr.replaceAt( nPos, 0, u"'" ); nPos += 2; } rStr = "'" + rStr + "'"; diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/dbdata.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/dbdata.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/dbdata.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/dbdata.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1010,30 +1010,47 @@ }; OUString lcl_IncrementNumberInNamedRange(ScDBCollection::NamedDBs& namedDBs, - const OUString& sOldName) + std::u16string_view rOldName) { - sal_Int32 nLastIndex = sOldName.lastIndexOf('_') + 1; + // Append or increment a numeric suffix and do not generate names that + // could result in a cell reference by ensuring at least one underscore is + // present. + // "aa" => "aa_2" + // "aaaa1" => "aaaa1_2" + // "aa_a" => "aa_a_2" + // "aa_a_" => "aa_a__2" + // "aa_a1" => "aa_a1_2" + // "aa_1a" => "aa_1a_2" + // "aa_1" => "aa_2" + // "aa_2" => "aa_3" + + size_t nLastIndex = rOldName.rfind('_'); sal_Int32 nOldNumber = 1; - if (nLastIndex >= 0) + OUString aPrefix; + if (nLastIndex != std::u16string_view::npos) { - std::u16string_view sLastPart(sOldName.subView(nLastIndex)); + ++nLastIndex; + std::u16string_view sLastPart(rOldName.substr(nLastIndex)); nOldNumber = o3tl::toInt32(sLastPart); - // When no number found, add number at the end. - // When there is a literal "0" at the end, keep the "lastIndex" from above - // (OUString::toInt32() also returns 0 on failure) - if (nOldNumber == 0 && sLastPart != u"0") + // If that number is exactly at the end then increment the number; else + // append "_" and number. + // toInt32() returns 0 on failure and also stops at trailing non-digit + // characters (toInt32("1a")==1). + if (OUString::number(nOldNumber) == sLastPart) + aPrefix = rOldName.substr(0, nLastIndex); + else { + aPrefix = OUString::Concat(rOldName) + "_"; nOldNumber = 1; - nLastIndex = sOldName.getLength(); } } - else // No "_" found, add number at the end - nLastIndex = sOldName.getLength(); + else // No "_" found, append "_" and number. + aPrefix = OUString::Concat(rOldName) + "_"; OUString sNewName; do { - sNewName = sOldName.subView(0, nLastIndex) + OUString::number(++nOldNumber); + sNewName = aPrefix + OUString::number(++nOldNumber); } while (namedDBs.findByName(sNewName) != nullptr); return sNewName; } @@ -1546,17 +1563,23 @@ void ScDBCollection::CopyToTable(SCTAB nOldPos, SCTAB nNewPos) { + // Create temporary copy of pointers to not insert in a set we are + // iterating over. + std::vector aTemp; + aTemp.reserve( maNamedDBs.size()); for (const auto& rxNamedDB : maNamedDBs) { if (rxNamedDB->GetTab() != nOldPos) - return; - - OUString newName - = lcl_IncrementNumberInNamedRange(getNamedDBs(), rxNamedDB->GetName()); + continue; + aTemp.emplace_back( rxNamedDB.get()); + } + for (const auto& rxNamedDB : aTemp) + { + const OUString newName( lcl_IncrementNumberInNamedRange( maNamedDBs, rxNamedDB->GetName())); std::unique_ptr pDataCopy = std::make_unique(newName, *rxNamedDB); pDataCopy->UpdateMoveTab(nOldPos, nNewPos); pDataCopy->SetIndex(0); - getNamedDBs().insert(std::move(pDataCopy)); + maNamedDBs.insert(std::move(pDataCopy)); } } diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/interpr1.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/interpr1.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/interpr1.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/interpr1.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1314,7 +1314,7 @@ { double fVal; FormulaError nErr = FormulaError::NONE; - ScValueIterator aValIter( mrDoc, aRange ); + ScValueIterator aValIter( mrContext, mrDoc, aRange ); if ( aValIter.GetFirst( fVal, nErr ) && nErr == FormulaError::NONE ) { bHaveValue = true; @@ -1412,7 +1412,7 @@ { double fVal; FormulaError nErr = FormulaError::NONE; - ScValueIterator aValIter( mrDoc, aRange ); + ScValueIterator aValIter( mrContext, mrDoc, aRange ); if ( aValIter.GetFirst( fVal, nErr ) ) { bHaveValue = true; @@ -1514,7 +1514,7 @@ { double fVal; FormulaError nErr = FormulaError::NONE; - ScValueIterator aValIter( mrDoc, aRange ); + ScValueIterator aValIter( mrContext, mrDoc, aRange ); if ( aValIter.GetFirst( fVal, nErr ) ) { bHaveValue = true; @@ -2308,8 +2308,26 @@ } else if( aInfoType == "ADDRESS" ) { // address formatted as [['FILENAME'#]$TABLE.]$COL$ROW + + // Follow the configurable string reference address syntax as also + // used by INDIRECT() (and ADDRESS() for the sheet separator). + FormulaGrammar::AddressConvention eConv = maCalcConfig.meStringRefAddressSyntax; + switch (eConv) + { + default: + // Use the current address syntax if unspecified or says + // one or the other or one we don't explicitly handle. + eConv = mrDoc.GetAddressConvention(); + break; + case FormulaGrammar::CONV_OOO: + case FormulaGrammar::CONV_XL_A1: + case FormulaGrammar::CONV_XL_R1C1: + // Use that. + break; + } + ScRefFlags nFlags = (aCellPos.Tab() == aPos.Tab()) ? ScRefFlags::ADDR_ABS : ScRefFlags::ADDR_ABS_3D; - OUString aStr(aCellPos.Format(nFlags, &mrDoc, mrDoc.GetAddressConvention())); + OUString aStr(aCellPos.Format(nFlags, &mrDoc, eConv)); PushString(aStr); } else if( aInfoType == "FILENAME" ) @@ -3692,8 +3710,7 @@ { FormulaError nErr = FormulaError::NONE; PopDoubleRef( aRange, nParamCount, nRefInList); - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); - aValIter.SetInterpreterContext( &mrContext ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); if (aValIter.GetFirst(nVal, nErr)) { if (nMin > nVal) @@ -3850,8 +3867,7 @@ { FormulaError nErr = FormulaError::NONE; PopDoubleRef( aRange, nParamCount, nRefInList); - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); - aValIter.SetInterpreterContext( &mrContext ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); if (aValIter.GetFirst(nVal, nErr)) { if (nMax < nVal) @@ -4027,7 +4043,7 @@ ArrayRefListValue& rArrayValue = vArrayValues[nRefArrayPos]; FormulaError nErr = FormulaError::NONE; PopDoubleRef( aRange, nParamCount, nRefInList); - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); if (aValIter.GetFirst(fVal, nErr)) { do @@ -4052,7 +4068,7 @@ { FormulaError nErr = FormulaError::NONE; PopDoubleRef( aRange, nParamCount, nRefInList); - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); if (aValIter.GetFirst(fVal, nErr)) { do @@ -8174,6 +8190,72 @@ const ScAddress::Details aDetailsXlA1( FormulaGrammar::CONV_XL_A1, aPos ); SCTAB nTab = aPos.Tab(); + // Named expressions and DB range names need to be tried first, as older 1K + // columns allowed names that would now match a 16k columns cell address. + do + { + ScRangeData* pData = ScRangeStringConverter::GetRangeDataFromString( sRefStr, nTab, mrDoc, eConv); + if (!pData) + break; + + // We need this in order to obtain a good range. + pData->ValidateTabRefs(); + + ScRange aRange; + + // This is the usual way to treat named ranges containing + // relative references. + if (!pData->IsReference( aRange, aPos)) + break; + + if (aRange.aStart == aRange.aEnd) + PushSingleRef( aRange.aStart.Col(), aRange.aStart.Row(), + aRange.aStart.Tab()); + else + PushDoubleRef( aRange.aStart.Col(), aRange.aStart.Row(), + aRange.aStart.Tab(), aRange.aEnd.Col(), + aRange.aEnd.Row(), aRange.aEnd.Tab()); + + // success! + return; + } + while (false); + + do + { + OUString aName( ScGlobal::getCharClass().uppercase( sRefStr)); + ScDBCollection::NamedDBs& rDBs = mrDoc.GetDBCollection()->getNamedDBs(); + const ScDBData* pData = rDBs.findByUpperName( aName); + if (!pData) + break; + + ScRange aRange; + pData->GetArea( aRange); + + // In Excel, specifying a table name without [] resolves to the + // same as with [], a range that excludes header and totals + // rows and contains only data rows. Do the same. + if (pData->HasHeader()) + aRange.aStart.IncRow(); + if (pData->HasTotals()) + aRange.aEnd.IncRow(-1); + + if (aRange.aStart.Row() > aRange.aEnd.Row()) + break; + + if (aRange.aStart == aRange.aEnd) + PushSingleRef( aRange.aStart.Col(), aRange.aStart.Row(), + aRange.aStart.Tab()); + else + PushDoubleRef( aRange.aStart.Col(), aRange.aStart.Row(), + aRange.aStart.Tab(), aRange.aEnd.Col(), + aRange.aEnd.Row(), aRange.aEnd.Tab()); + + // success! + return; + } + while (false); + ScRefAddress aRefAd, aRefAd2; ScAddress::ExternalInfo aExtInfo; if ( ConvertDoubleRef(mrDoc, sRefStr, nTab, aRefAd, aRefAd2, aDetails, &aExtInfo) || @@ -8204,70 +8286,6 @@ } else { - do - { - ScRangeData* pData = ScRangeStringConverter::GetRangeDataFromString( sRefStr, nTab, mrDoc, eConv); - if (!pData) - break; - - // We need this in order to obtain a good range. - pData->ValidateTabRefs(); - - ScRange aRange; - - // This is the usual way to treat named ranges containing - // relative references. - if (!pData->IsReference( aRange, aPos)) - break; - - if (aRange.aStart == aRange.aEnd) - PushSingleRef( aRange.aStart.Col(), aRange.aStart.Row(), - aRange.aStart.Tab()); - else - PushDoubleRef( aRange.aStart.Col(), aRange.aStart.Row(), - aRange.aStart.Tab(), aRange.aEnd.Col(), - aRange.aEnd.Row(), aRange.aEnd.Tab()); - - // success! - return; - } - while (false); - - do - { - OUString aName( ScGlobal::getCharClass().uppercase( sRefStr)); - ScDBCollection::NamedDBs& rDBs = mrDoc.GetDBCollection()->getNamedDBs(); - const ScDBData* pData = rDBs.findByUpperName( aName); - if (!pData) - break; - - ScRange aRange; - pData->GetArea( aRange); - - // In Excel, specifying a table name without [] resolves to the - // same as with [], a range that excludes header and totals - // rows and contains only data rows. Do the same. - if (pData->HasHeader()) - aRange.aStart.IncRow(); - if (pData->HasTotals()) - aRange.aEnd.IncRow(-1); - - if (aRange.aStart.Row() > aRange.aEnd.Row()) - break; - - if (aRange.aStart == aRange.aEnd) - PushSingleRef( aRange.aStart.Col(), aRange.aStart.Row(), - aRange.aStart.Tab()); - else - PushDoubleRef( aRange.aStart.Col(), aRange.aStart.Row(), - aRange.aStart.Tab(), aRange.aEnd.Col(), - aRange.aEnd.Row(), aRange.aEnd.Tab()); - - // success! - return; - } - while (false); - // It may be even a TableRef or an external name. // Anything else that resolves to one reference could be added // here, but we don't want to compile every arbitrary string. This diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/interpr2.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/interpr2.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/interpr2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/interpr2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1445,7 +1445,7 @@ } else { - ScValueIterator aValIter(mrDoc, aRange, mnSubTotalFlags); + ScValueIterator aValIter(mrContext, mrDoc, aRange, mnSubTotalFlags); bool bLoop = aValIter.GetFirst(fValue, nIterError); while (bLoop && nIterError == FormulaError::NONE) { @@ -1553,7 +1553,7 @@ } else { - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags ); double fCellValue; FormulaError nIterError = FormulaError::NONE; diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/interpr3.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/interpr3.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/interpr3.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/interpr3.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -2505,7 +2505,7 @@ ScRange aRange; FormulaError nErr = FormulaError::NONE; PopDoubleRef( aRange, nParam, nRefInList); - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags ); if (aValIter.GetFirst(fVal, nErr)) { fSum += fVal; @@ -2947,7 +2947,7 @@ FormulaError nErr = FormulaError::NONE; PopDoubleRef( aRange, nParamCount, nRefInList); double nCellVal; - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags ); if (aValIter.GetFirst(nCellVal, nErr)) { if (nCellVal > 0.0) @@ -3085,7 +3085,7 @@ FormulaError nErr = FormulaError::NONE; PopDoubleRef( aRange, nParamCount, nRefInList); double nCellVal; - ScValueIterator aValIter(mrDoc, aRange, mnSubTotalFlags); + ScValueIterator aValIter(mrContext, mrDoc, aRange, mnSubTotalFlags); if (aValIter.GetFirst(nCellVal, nErr)) { if (nCellVal > 0.0) @@ -3250,7 +3250,7 @@ { PopDoubleRef( aRange, nParamCount, nRefInList); FormulaError nErr = FormulaError::NONE; - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags ); if (aValIter.GetFirst(fVal, nErr)) { fSum += fVal; @@ -3885,7 +3885,7 @@ FormulaError nErr = FormulaError::NONE; double fCellVal; - ScValueIterator aValIter(mrDoc, aRange, mnSubTotalFlags); + ScValueIterator aValIter(mrContext, mrDoc, aRange, mnSubTotalFlags); if (aValIter.GetFirst(fCellVal, nErr)) { do @@ -3966,7 +3966,7 @@ FormulaError nErr = FormulaError::NONE; double fCellVal; - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags ); if (aValIter.GetFirst( fCellVal, nErr)) { if (bIgnoreErrVal) @@ -4304,7 +4304,7 @@ FormulaError nErr = FormulaError::NONE; double nCellVal; PopDoubleRef( aRange, nParam, nRefInList); - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags ); if (aValIter.GetFirst(nCellVal, nErr)) { rVal += nCellVal; @@ -4383,7 +4383,7 @@ FormulaError nErr = FormulaError::NONE; double nCellVal; PopDoubleRef( aRange, nParam, nRefInList); - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags ); if (aValIter.GetFirst(nCellVal, nErr)) { rVal += std::abs(nCellVal - nMiddle); diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/interpr4.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/interpr4.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/interpr4.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/interpr4.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -2734,7 +2734,7 @@ // bLocalFirst=false in FindFunction, cFunc should be the stored // internal name - ScUnoAddInCall aCall( *ScGlobal::GetAddInCollection(), aUnoName, nParamCount ); + ScUnoAddInCall aCall( mrDoc, *ScGlobal::GetAddInCollection(), aUnoName, nParamCount ); if ( !aCall.ValidParamCount() ) SetError( FormulaError::IllegalParameter ); diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/interpr5.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/interpr5.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/interpr5.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/interpr5.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -158,7 +158,7 @@ FormulaError nErr = FormulaError::NONE; PopDoubleRef( aRange, nParamCount, nRefInList); double nCellVal; - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags ); if (aValIter.GetFirst(nCellVal, nErr)) { do @@ -235,7 +235,7 @@ FormulaError nErr = FormulaError::NONE; PopDoubleRef( aRange, nParamCount, nRefInList); double nCellVal; - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags ); if (aValIter.GetFirst(nCellVal, nErr)) { do diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/interpr6.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/interpr6.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/interpr6.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/interpr6.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -783,8 +783,7 @@ } else { - ScValueIterator aValIter( mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); - aValIter.SetInterpreterContext( &mrContext ); + ScValueIterator aValIter( mrContext, mrDoc, aRange, mnSubTotalFlags, bTextAsZero ); FormulaError nErr = FormulaError::NONE; if (aValIter.GetFirst(fVal, nErr)) { diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/interpr7.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/interpr7.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/interpr7.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/interpr7.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -219,6 +219,7 @@ case XPATH_STRING: PushString(OUString::createFromAscii(reinterpret_cast(pXPathObj->stringval))); break; +#if LIBXML_VERSION < 21000 || defined(LIBXML_XPTR_LOCS_ENABLED) case XPATH_POINT: PushNoValue(); break; @@ -228,6 +229,7 @@ case XPATH_LOCATIONSET: PushNoValue(); break; +#endif case XPATH_USERS: PushNoValue(); break; diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/rangenam.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/rangenam.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/rangenam.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/rangenam.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -407,8 +408,7 @@ if (aRes.mbReferenceModified) rCxt.maUpdatedNames.setUpdatedName(nLocalTab, nIndex); - if (rCxt.mnDeletePos <= aPos.Tab()) - aPos.IncTab(-rCxt.mnSheets); + ScRangeUpdater::UpdateDeleteTab( aPos, rCxt); } void ScRangeData::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nLocalTab ) diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/rangeutl.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/rangeutl.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/rangeutl.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/rangeutl.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1061,7 +1061,7 @@ { if (rCxt.mnDeletePos <= rAddr.Tab()) { - rAddr.IncTab(-rCxt.mnSheets); + rAddr.SetTab( std::max(0, rAddr.Tab() - rCxt.mnSheets)); } } diff -Nru libreoffice-7.4.1~rc2/sc/source/core/tool/token.cxx libreoffice-7.4.2~rc3/sc/source/core/tool/token.cxx --- libreoffice-7.4.1~rc2/sc/source/core/tool/token.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/core/tool/token.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -4234,8 +4235,7 @@ { sc::RefUpdateResult aRes; ScAddress aNewPos = rOldPos; - if (rCxt.mnDeletePos < rOldPos.Tab()) - aNewPos.IncTab(-1*rCxt.mnSheets); + ScRangeUpdater::UpdateDeleteTab( aNewPos, rCxt); TokenPointers aPtrs( pCode.get(), nLen, pRPN, nRPN); for (size_t j=0; j<2; ++j) diff -Nru libreoffice-7.4.1~rc2/sc/source/filter/xml/xmlfilti.cxx libreoffice-7.4.2~rc3/sc/source/filter/xml/xmlfilti.cxx --- libreoffice-7.4.1~rc2/sc/source/filter/xml/xmlfilti.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/filter/xml/xmlfilti.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -745,6 +745,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ ) { ScQueryEntry aFilterField; + aFilterField.nField = nField; if (pFilterContext->GetConnection()) aFilterField.eConnect = SC_OR; else @@ -759,7 +760,6 @@ utl::SearchParam::SearchType eSearchType = utl::SearchParam::SearchType::Normal; getOperatorXML(sOperator, aFilterField.eOp, eSearchType); pFilterContext->SetSearchType(eSearchType); - aFilterField.nField = nField; ScQueryEntry::Item& rItem = aFilterField.GetQueryItem(); svl::SharedStringPool& rPool = GetScImport().GetDocument()->GetSharedStringPool(); diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/app/inputhdl.cxx libreoffice-7.4.2~rc3/sc/source/ui/app/inputhdl.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/app/inputhdl.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/app/inputhdl.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -99,11 +100,6 @@ namespace { -// Formula data replacement character for a pair of parentheses at end of -// function name, to force sorting parentheses before all other characters. -// Collation may treat parentheses differently. -const sal_Unicode cParenthesesReplacement = 0x0001; - ScTypedCaseStrSet::const_iterator findText( const ScTypedCaseStrSet& rDataSet, ScTypedCaseStrSet::const_iterator const & itPos, const OUString& rStart, OUString& rResult, bool bBack) @@ -1020,27 +1016,11 @@ const OUString aParenthesesReplacement( cParenthesesReplacement); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); - sal_uInt32 nListCount = pFuncList->GetCount(); - for(sal_uInt32 i=0;iGetFunction( i ); - if ( pDesc->mxFuncName ) - { - const sal_Unicode* pName = pDesc->mxFuncName->getStr(); - const sal_Int32 nLen = pDesc->mxFuncName->getLength(); - // fdo#75264 fill maFormulaChar with all characters used in formula names - for ( sal_Int32 j = 0; j < nLen; j++ ) - { - sal_Unicode c = pName[ j ]; - maFormulaChar.insert( c ); - } - OUString aFuncName = *pDesc->mxFuncName + aParenthesesReplacement; - pFormulaData->insert(ScTypedStrData(aFuncName, 0.0, 0.0, ScTypedStrData::Standard)); - pDesc->initArgumentInfo(); - OUString aEntry = pDesc->getSignature(); - pFormulaDataPara->insert(ScTypedStrData(aEntry, 0.0, 0.0, ScTypedStrData::Standard)); - } - } + const sal_uInt32 nListCount = pFuncList->GetCount(); + const InputHandlerFunctionNames& rFunctionNames = ScGlobal::GetInputHandlerFunctionNames(); + *pFormulaData = rFunctionNames.maFunctionData; + *pFormulaDataPara = rFunctionNames.maFunctionDataPara; + maFormulaChar = rFunctionNames.maFunctionChar; // Increase suggestion priority of MRU formulas const ScAppOptions& rOpt = SC_MOD()->GetAppOptions(); @@ -1065,8 +1045,19 @@ } } miAutoPosFormula = pFormulaData->end(); - rDoc.GetFormulaEntries( *pFormulaData ); - rDoc.GetFormulaEntries( *pFormulaDataPara ); + + // tdf#142031 - collect all the characters for the formula suggestion auto input + ScTypedCaseStrSet aStrSet; + rDoc.GetFormulaEntries( aStrSet ); + for (auto iter = aStrSet.begin(); iter != aStrSet.end(); ++iter) + { + const OUString aFuncName = ScGlobal::getCharClass().uppercase((*iter).GetString()); + // fdo#75264 fill maFormulaChar with all characters used in formula names + for (sal_Int32 j = 0; j < aFuncName.getLength(); j++) + maFormulaChar.insert(aFuncName[j]); + } + pFormulaData->insert(aStrSet.begin(), aStrSet.end()); + pFormulaDataPara->insert(aStrSet.begin(), aStrSet.end()); } IMPL_LINK( ScInputHandler, ShowHideTipVisibleParentListener, VclWindowEvent&, rEvent, void ) @@ -2180,10 +2171,11 @@ { // Examine character left to the cursor sal_Int32 nPos = aSel.nStartPos - 1; - OUString aFormula = mpEditEngine->GetText(0); + OUString aFormula = mpEditEngine->GetText(aSel.nStartPara); sal_Unicode c = aFormula[nPos]; if ( c == '(' || c == ')' ) { + // Note this matches only within one paragraph. sal_Int32 nOther = lcl_MatchParenthesis( aFormula, nPos ); if ( nOther != -1 ) { @@ -2199,9 +2191,9 @@ mpEditEngine->RemoveCharAttribs( i, EE_CHAR_WEIGHT ); } - ESelection aSelThis( 0,nPos, 0,nPos+1 ); + ESelection aSelThis( aSel.nStartPara, nPos, aSel.nStartPara, nPos+1); mpEditEngine->QuickSetAttribs( aSet, aSelThis ); - ESelection aSelOther( 0,nOther, 0,nOther+1 ); + ESelection aSelOther( aSel.nStartPara, nOther, aSel.nStartPara, nOther+1); mpEditEngine->QuickSetAttribs( aSet, aSelOther ); // Dummy InsertText for Update and Paint (selection is empty) diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/app/inputwin.cxx libreoffice-7.4.2~rc3/sc/source/ui/app/inputwin.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/app/inputwin.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/app/inputwin.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1550,6 +1550,10 @@ m_xEditView->setEditViewCallbacks(this); m_xEditView->SetInsertMode(bIsInsertMode); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + Color aBgColor = rStyleSettings.GetWindowColor(); + m_xEditView->SetBackgroundColor(aBgColor); + if (pAcc) { pAcc->InitAcc(nullptr, m_xEditView.get(), @@ -2064,6 +2068,10 @@ m_xEditView = std::make_unique(m_xEditEngine.get(), nullptr); m_xEditView->setEditViewCallbacks(this); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + Color aBgColor = rStyleSettings.GetWindowColor(); + m_xEditView->SetBackgroundColor(aBgColor); + if (pAcc) { pAcc->InitAcc(nullptr, m_xEditView.get(), @@ -2361,8 +2369,7 @@ else { const SfxHintId nHintId = rHint.GetId(); - if (nHintId == SfxHintId::ScAreasChanged || nHintId == SfxHintId::ScNavigatorUpdateAll - || nHintId == SfxHintId::ScTablesRenamed) + if (nHintId == SfxHintId::ScAreasChanged || nHintId == SfxHintId::ScNavigatorUpdateAll) FillRangeNames(); } } diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/condformat/condformatmgr.cxx libreoffice-7.4.2~rc3/sc/source/ui/condformat/condformatmgr.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/condformat/condformatmgr.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/condformat/condformatmgr.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -112,7 +112,7 @@ // tdf#101285 - Remember position of dialog SvtViewOptions aDlgOpt(EViewType::Dialog, "CondFormatDialog"); OString sWindowState - = m_xDialog->get_window_state(vcl::WindowDataMask::Pos); + = m_xDialog->get_window_state(WindowStateMask::Pos); aDlgOpt.SetWindowState(OUString::fromUtf8(sWindowState)); } diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/docshell/docfunc.cxx libreoffice-7.4.2~rc3/sc/source/ui/docshell/docfunc.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/docshell/docfunc.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/docshell/docfunc.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -3407,6 +3407,7 @@ SfxApplication* pSfxApp = SfxGetpApp(); // Navigator pSfxApp->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); + pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScDbAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreaLinksChanged ) ); @@ -3523,7 +3524,7 @@ rDocShell.PostPaintExtras(); aModificator.SetDocumentModified(); SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); - SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesRenamed ) ); + SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) ); bSuccess = true; } diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/docshell/docsh6.cxx libreoffice-7.4.2~rc3/sc/source/ui/docshell/docsh6.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/docshell/docsh6.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/docshell/docsh6.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -445,7 +445,8 @@ if (rOpt.GetUseEnglishFuncName()) { // switch native symbols to English. - formula::FormulaCompiler aComp; + ScAddress aAddress; + ScCompiler aComp( *m_pDocument, aAddress); ScCompiler::OpCodeMapPtr xMap = aComp.GetOpCodeMap(css::sheet::FormulaLanguage::ENGLISH); ScCompiler::SetNativeSymbols(xMap); } diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/inc/inputhdl.hxx libreoffice-7.4.2~rc3/sc/source/ui/inc/inputhdl.hxx --- libreoffice-7.4.1~rc2/sc/source/ui/inc/inputhdl.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/inc/inputhdl.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -66,8 +66,9 @@ std::unique_ptr pColumnData; std::unique_ptr pFormulaData; std::unique_ptr pFormulaDataPara; - ScTypedCaseStrSet::const_iterator miAutoPosColumn; - ScTypedCaseStrSet::const_iterator miAutoPosFormula; + ScTypedCaseStrSet::const_iterator miAutoPosColumn; + ScTypedCaseStrSet::const_iterator miAutoPosFormula; + std::set maFormulaChar; VclPtr pTipVisibleParent; void* nTipVisible; @@ -127,8 +128,6 @@ std::unique_ptr pRangeFindList; - ::std::set< sal_Unicode > maFormulaChar; //fdo 75264 - private: void UpdateActiveView(); void SyncViews( const EditView* pSourceView = nullptr ); diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/inc/tabvwsh.hxx libreoffice-7.4.2~rc3/sc/source/ui/inc/tabvwsh.hxx --- libreoffice-7.4.1~rc2/sc/source/ui/inc/tabvwsh.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/inc/tabvwsh.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -201,7 +201,7 @@ virtual void QueryObjAreaPixel( tools::Rectangle& rRect ) const override; - virtual OUString GetSelectionText( bool bWholeWord = false ) override; + virtual OUString GetSelectionText( bool bWholeWord = false, bool bOnlyASample = false ) override; virtual bool HasSelection( bool bText = true ) const override; virtual void WriteUserData(OUString &, bool bBrowse = false) override; diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/pagedlg/tphfedit.cxx libreoffice-7.4.2~rc3/sc/source/ui/pagedlg/tphfedit.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/pagedlg/tphfedit.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/pagedlg/tphfedit.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -87,6 +88,10 @@ if (mbRTL) m_xEditEngine->SetDefaultHorizontalTextDirection(EEHorizontalTextDirection::R2L); + Color aBgColor = svtools::ColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; + rDevice.SetBackground(aBgColor); + m_xEditView->SetBackgroundColor(aBgColor); + auto tmpAcc = mxAcc.get(); if (!tmpAcc) return; @@ -145,6 +150,13 @@ pSet->Put( rPattern.GetItem(ATTR_FONT_HEIGHT).CloneSetWhich(EE_CHAR_FONTHEIGHT) ); pSet->Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT).CloneSetWhich(EE_CHAR_FONTHEIGHT_CJK) ); pSet->Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT).CloneSetWhich(EE_CHAR_FONTHEIGHT_CTL) ); + // font color used, suitable header/footer background color set in ScEditWindow::SetDrawingArea + Color aFgColor = svtools::ColorConfig().GetColorValue(svtools::FONTCOLOR, false).nColor; + if (aFgColor == COL_AUTO) { + Color aBgColor = svtools::ColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; + aFgColor = aBgColor.IsDark() ? COL_WHITE : COL_BLACK; + } + pSet->Put(SvxColorItem(aFgColor, EE_CHAR_COLOR)); if (mbRTL) pSet->Put( SvxAdjustItem( SvxAdjust::Right, EE_PARA_JUST ) ); GetEditEngine()->SetDefaults( std::move(pSet) ); diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/undo/undotab.cxx libreoffice-7.4.2~rc3/sc/source/ui/undo/undotab.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/undo/undotab.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/undo/undotab.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -366,6 +366,7 @@ } SfxApplication* pSfxApp = SfxGetpApp(); // Navigator pSfxApp->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); + pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScDbAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreaLinksChanged ) ); @@ -436,7 +437,7 @@ rDoc.RenameTab( nTabP, rName ); SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); // Navigator - SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesRenamed ) ); // Name Box + SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) ); // Also Name Box pDocShell->PostPaintGridAll(); pDocShell->PostPaintExtras(); @@ -600,7 +601,9 @@ if (pViewShell) pViewShell->SetTabNo((*mpOldTabs)[0],true); - SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); // Navigator + SfxApplication* pSfxApp = SfxGetpApp(); // Navigator + pSfxApp->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); + pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) ); pDocShell->PostPaintGridAll(); pDocShell->PostPaintExtras(); diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/unoobj/chart2uno.cxx libreoffice-7.4.2~rc3/sc/source/ui/unoobj/chart2uno.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/unoobj/chart2uno.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/unoobj/chart2uno.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1403,11 +1403,7 @@ if ( ! m_pDocument ) throw uno::RuntimeException(); - // This is expensive to compute and we get called more than once, so cache - if (maCreateDataSourceArguments == aArguments) - return mxCreatedDataSource; - maCreateDataSourceArguments = aArguments; - + uno::Reference< chart2::data::XDataSource> xResult; bool bLabel = true; bool bCategories = false; bool bOrientCol = true; @@ -1494,7 +1490,7 @@ const Chart2PositionMap* pChartMap = aChPositioner.getPositionMap(); if (!pChartMap) // No chart position map instance. Bail out. - return mxCreatedDataSource; + return xResult; rtl::Reference pDS; ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aSeqs; @@ -1572,8 +1568,8 @@ } } - mxCreatedDataSource.set(pDS); - return mxCreatedDataSource; + xResult.set( pDS ); + return xResult; } namespace @@ -1765,10 +1761,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArguments( const uno::Reference< chart2::data::XDataSource >& xDataSource ) { - // Cache these because this is expensive to compute and we get called more than once - if (xDataSource == mxCachedDataSource) - return maCachedArguments; - ::std::vector< beans::PropertyValue > aResult; bool bRowSourceDetected = false; bool bFirstCellAsLabel = false; @@ -2034,10 +2026,7 @@ } } - mxCachedDataSource = xDataSource; - maCachedArguments = comphelper::containerToSequence( aResult ); - - return maCachedArguments; + return comphelper::containerToSequence( aResult ); } sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/view/tabvwshe.cxx libreoffice-7.4.2~rc3/sc/source/ui/view/tabvwshe.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/view/tabvwshe.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/view/tabvwshe.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -39,7 +39,7 @@ #include #include -OUString ScTabViewShell::GetSelectionText( bool bWholeWord ) +OUString ScTabViewShell::GetSelectionText( bool bWholeWord, bool bOnlyASample ) { OUString aStrSelection; @@ -54,7 +54,7 @@ if ( GetViewData().GetSimpleArea( aRange ) == SC_MARK_SIMPLE ) { ScDocument& rDoc = GetViewData().GetDocument(); - if ( bInFormatDialog && aRange.aStart.Row() != aRange.aEnd.Row() ) + if ( (bOnlyASample || bInFormatDialog) && aRange.aStart.Row() != aRange.aEnd.Row() ) { // limit range to one data row // (only when the call comes from a format dialog) diff -Nru libreoffice-7.4.1~rc2/sc/source/ui/view/viewfun2.cxx libreoffice-7.4.2~rc3/sc/source/ui/view/viewfun2.cxx --- libreoffice-7.4.1~rc2/sc/source/ui/view/viewfun2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sc/source/ui/view/viewfun2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -2631,6 +2631,7 @@ SfxApplication* pSfxApp = SfxGetpApp(); // Navigator pSfxApp->Broadcast( SfxHint( SfxHintId::ScTablesChanged ) ); + pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScDbAreasChanged ) ); pSfxApp->Broadcast( SfxHint( SfxHintId::ScAreaLinksChanged ) ); } Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sd/qa/filter/eppt/data/video-loop.pptx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sd/qa/filter/eppt/data/video-loop.pptx differ diff -Nru libreoffice-7.4.1~rc2/sd/qa/filter/eppt/eppt.cxx libreoffice-7.4.2~rc3/sd/qa/filter/eppt/eppt.cxx --- libreoffice-7.4.1~rc2/sd/qa/filter/eppt/eppt.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/filter/eppt/eppt.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -125,6 +125,32 @@ // i.e. the RGB color was lost on export. xComponent->dispose(); } + +CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation) +{ + // Given a media shape that has an animation that specifies looping for the video: + OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "video-loop.pptx"; + getComponent() = loadFromDesktop(aURL); + + // When exporting that to PPTX: + utl::TempFile aTempFile; + uno::Reference xStorable(getComponent(), uno::UNO_QUERY); + utl::MediaDescriptor aMediaDescriptor; + aMediaDescriptor["FilterName"] <<= OUString("Impress Office Open XML"); + aTempFile.EnableKillingFile(); + xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + validate(aTempFile.GetFileName(), test::OOXML); + + // Then make sure that the "infinite" repeat count is written: + std::unique_ptr pStream = parseExportStream(aTempFile, "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get()); + // Without the fix in place, this test would have failed with: + // - Expected: 1 + // - Actual : 0 + // - In <>, XPath '//p:cMediaNode/p:cTn' number of nodes is incorrect + // i.e. the media node was lost on export, the video no longer looped. + assertXPath(pXmlDoc, "//p:cMediaNode/p:cTn", "repeatCount", "indefinite"); +} } CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-7.4.1~rc2/sd/qa/uitest/impress_tests/tdf148620.py libreoffice-7.4.2~rc3/sd/qa/uitest/impress_tests/tdf148620.py --- libreoffice-7.4.1~rc2/sd/qa/uitest/impress_tests/tdf148620.py 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/uitest/impress_tests/tdf148620.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -from uitest.uihelper.common import get_state_as_dict -from libreoffice.uno.propertyvalue import mkPropertyValues -from uitest.framework import UITestCase - -class Tdf148620(UITestCase): - - def test_Tdf148620(self): - with self.ui_test.create_doc_in_start_center("impress") as document: - - xTemplateDlg = self.xUITest.getTopFocusWindow() - xCancelBtn = xTemplateDlg.getChild("close") - self.ui_test.close_dialog_through_button(xCancelBtn) - - xDoc = self.xUITest.getTopFocusWindow() - xEditWin = xDoc.getChild("impress_win") - - xEditWin.executeAction("SELECT", mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"})) - self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName()) - - xEditWin.executeAction("TYPE", mkPropertyValues({"TEXT":"one"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"TEXT":"two"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"TEXT":"three"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"TEXT":"four"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"TEXT":"five"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) - xEditWin.executeAction("TYPE", mkPropertyValues({"TEXT":"six"})) - - self.assertEqual("One\nTwo\nThree\nFour\nFive\nsix", document.DrawPages[0].getByIndex(1).String) - - xArgs = mkPropertyValues({"KeyModifier": 0}) - self.xUITest.executeCommandWithParameters(".uno:OutlineUp", xArgs) - self.assertEqual("One\nTwo\nThree\nFour\nsix\nFive", document.DrawPages[0].getByIndex(1).String) - - self.xUITest.executeCommandWithParameters(".uno:OutlineUp", xArgs) - self.assertEqual("One\nTwo\nThree\nsix\nFour\nFive", document.DrawPages[0].getByIndex(1).String) - - self.xUITest.executeCommandWithParameters(".uno:OutlineUp", xArgs) - self.assertEqual("One\nTwo\nsix\nThree\nFour\nFive", document.DrawPages[0].getByIndex(1).String) - - self.xUITest.executeCommandWithParameters(".uno:OutlineUp", xArgs) - self.assertEqual("One\nsix\nTwo\nThree\nFour\nFive", document.DrawPages[0].getByIndex(1).String) - - self.xUITest.executeCommandWithParameters(".uno:OutlineUp", xArgs) - self.assertEqual("six\nOne\nTwo\nThree\nFour\nFive", document.DrawPages[0].getByIndex(1).String) - - self.xUITest.executeCommandWithParameters(".uno:OutlineDown", xArgs) - - # Without the fix in place, this test would have failed with - # AssertionError: 'One\nsix\nTwo\nThree\nFour\nFive' != 'One\nTwo\nsix\nThree\nFour\nFive' - self.assertEqual("One\nsix\nTwo\nThree\nFour\nFive", document.DrawPages[0].getByIndex(1).String) - - self.xUITest.executeCommandWithParameters(".uno:OutlineDown", xArgs) - self.assertEqual("One\nTwo\nsix\nThree\nFour\nFive", document.DrawPages[0].getByIndex(1).String) - - self.xUITest.executeCommandWithParameters(".uno:OutlineDown", xArgs) - self.assertEqual("One\nTwo\nThree\nsix\nFour\nFive", document.DrawPages[0].getByIndex(1).String) - - self.xUITest.executeCommandWithParameters(".uno:OutlineDown", xArgs) - self.assertEqual("One\nTwo\nThree\nFour\nsix\nFive", document.DrawPages[0].getByIndex(1).String) - - self.xUITest.executeCommandWithParameters(".uno:OutlineDown", xArgs) - self.assertEqual("One\nTwo\nThree\nFour\nFive\nsix", document.DrawPages[0].getByIndex(1).String) - -# vim: set shiftwidth=4 softtabstop=4 expandtab: diff -Nru libreoffice-7.4.1~rc2/sd/qa/uitest/impress_tests/tdf91762.py libreoffice-7.4.2~rc3/sd/qa/uitest/impress_tests/tdf91762.py --- libreoffice-7.4.1~rc2/sd/qa/uitest/impress_tests/tdf91762.py 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/uitest/impress_tests/tdf91762.py 2022-10-10 10:15:14.000000000 +0000 @@ -39,8 +39,8 @@ xEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) # tdf#138011: Without the fix in place, this test would have failed with - # AssertionError: 5494 != 3559 - self.assertEqual(5494, document.DrawPages[0].getByIndex(1).BoundRect.Height) + # AssertionError: 5504 != 3559 + self.assertEqual(5504, document.DrawPages[0].getByIndex(1).BoundRect.Height) # vim: set shiftwidth=4 softtabstop=4 expandtab: Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sd/qa/unit/data/odp/tdf94122_autocolor.odp and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sd/qa/unit/data/odp/tdf94122_autocolor.odp differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sd/qa/unit/data/pptx/tdf144092-emptyShapeTextProps.pptx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sd/qa/unit/data/pptx/tdf144092-emptyShapeTextProps.pptx differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sd/qa/unit/data/pptx/tdf144092-tableHeight.pptx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sd/qa/unit/data/pptx/tdf144092-tableHeight.pptx differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sd/qa/unit/data/pptx/tdf89928-blackWhiteEffectThreshold.pptx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sd/qa/unit/data/pptx/tdf89928-blackWhiteEffectThreshold.pptx differ diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/n762695_0.xml libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/n762695_0.xml --- libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/n762695_0.xml 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/n762695_0.xml 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -84,7 +84,7 @@ - + @@ -161,7 +161,7 @@ - + diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/n762695_1.xml libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/n762695_1.xml --- libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/n762695_1.xml 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/n762695_1.xml 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -84,7 +84,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -474,7 +474,7 @@ - + diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/n819614_0.xml libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/n819614_0.xml --- libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/n819614_0.xml 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/n819614_0.xml 2022-10-10 10:15:14.000000000 +0000 @@ -6541,7 +6541,7 @@ - + diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/n820786_0.xml libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/n820786_0.xml --- libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/n820786_0.xml 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/n820786_0.xml 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -64,7 +64,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -299,7 +299,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -547,7 +547,7 @@ - + @@ -609,7 +609,7 @@ - + @@ -671,7 +671,7 @@ - + @@ -733,7 +733,7 @@ - + @@ -795,7 +795,7 @@ - + @@ -857,7 +857,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -981,7 +981,7 @@ - + @@ -1043,7 +1043,7 @@ - + @@ -1105,7 +1105,7 @@ - + @@ -1167,7 +1167,7 @@ - + @@ -1229,7 +1229,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1353,7 +1353,7 @@ - + @@ -1415,7 +1415,7 @@ - + @@ -1477,7 +1477,7 @@ - + @@ -1539,7 +1539,7 @@ - + @@ -1601,7 +1601,7 @@ - + @@ -1663,7 +1663,7 @@ - + @@ -1725,7 +1725,7 @@ - + @@ -1787,7 +1787,7 @@ - + @@ -1849,7 +1849,7 @@ - + @@ -1911,7 +1911,7 @@ - + @@ -1973,7 +1973,7 @@ - + @@ -2035,7 +2035,7 @@ - + @@ -2097,7 +2097,7 @@ - + @@ -2159,7 +2159,7 @@ - + @@ -2221,7 +2221,7 @@ - + @@ -2283,7 +2283,7 @@ - + @@ -2345,7 +2345,7 @@ - + @@ -2407,7 +2407,7 @@ - + @@ -2469,7 +2469,7 @@ - + @@ -2531,7 +2531,7 @@ - + @@ -2593,7 +2593,7 @@ - + @@ -2655,7 +2655,7 @@ - + @@ -2717,7 +2717,7 @@ - + @@ -2779,7 +2779,7 @@ - + @@ -2841,7 +2841,7 @@ - + @@ -2903,7 +2903,7 @@ - + @@ -2965,7 +2965,7 @@ - + @@ -3027,7 +3027,7 @@ - + @@ -3089,7 +3089,7 @@ - + @@ -3151,7 +3151,7 @@ - + diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/tdf109317_0.xml libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/tdf109317_0.xml --- libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/tdf109317_0.xml 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/tdf109317_0.xml 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -108,7 +108,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -328,7 +328,7 @@ - + @@ -384,7 +384,7 @@ - + diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/tdf90338_0.xml libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/tdf90338_0.xml --- libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/tdf90338_0.xml 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/tdf90338_0.xml 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/tdf92001_0.xml libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/tdf92001_0.xml --- libreoffice-7.4.1~rc2/sd/qa/unit/data/xml/tdf92001_0.xml 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/data/xml/tdf92001_0.xml 2022-10-10 10:15:14.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/export-tests-ooxml2.cxx libreoffice-7.4.2~rc3/sd/qa/unit/export-tests-ooxml2.cxx --- libreoffice-7.4.1~rc2/sd/qa/unit/export-tests-ooxml2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/export-tests-ooxml2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -442,7 +442,7 @@ sdr::table::SdrTableObj* pTableObj = dynamic_cast(pPage->GetObj(0)); CPPUNIT_ASSERT(pTableObj); // The position was previously not properly initialized: (0, 0, 100, 100) - CPPUNIT_ASSERT_EQUAL(tools::Rectangle(Point(6991, 6902), Size(14099, 1999)), + CPPUNIT_ASSERT_EQUAL(tools::Rectangle(Point(6991, 6902), Size(14099, 2000)), pTableObj->GetLogicRect()); uno::Reference xTable(pTableObj->getTable()); diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/export-tests-ooxml3.cxx libreoffice-7.4.2~rc3/sd/qa/unit/export-tests-ooxml3.cxx --- libreoffice-7.4.1~rc2/sd/qa/unit/export-tests-ooxml3.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/export-tests-ooxml3.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -116,6 +117,8 @@ void testTdf74670(); void testTdf109169_OctagonBevel(); void testTdf109169_DiamondBevel(); + void testTdf144092_emptyShapeTextProps(); + void testTdf94122_autoColor(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest3); @@ -199,6 +202,8 @@ CPPUNIT_TEST(testTdf74670); CPPUNIT_TEST(testTdf109169_OctagonBevel); CPPUNIT_TEST(testTdf109169_DiamondBevel); + CPPUNIT_TEST(testTdf144092_emptyShapeTextProps); + CPPUNIT_TEST(testTdf94122_autoColor); CPPUNIT_TEST_SUITE_END(); virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override @@ -2095,6 +2100,83 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(20), aCoordinates.getLength()); } +void SdOOXMLExportTest3::testTdf144092_emptyShapeTextProps() +{ + // Document contains one shape and one table. Both without any text but with + // text properties contained inside endParaRPr - The import and export + // of endParaRPr for empty cells and shapes are tested here + ::sd::DrawDocShellRef xDocShRef = loadURL( + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf144092-emptyShapeTextProps.pptx"), + PPTX); + xDocShRef = saveAndReload(xDocShRef.get(), PPTX); + + Color aColor; + // check text properties of empty shape + uno::Reference xRectShapeProps(getShapeFromPage(1, 0, xDocShRef)); + CPPUNIT_ASSERT_EQUAL(OUString("Calibri"), + xRectShapeProps->getPropertyValue("CharFontName").get()); + CPPUNIT_ASSERT_EQUAL(float(196), xRectShapeProps->getPropertyValue("CharHeight").get()); + xRectShapeProps->getPropertyValue("CharColor") >>= aColor; + CPPUNIT_ASSERT_EQUAL(Color(0x70AD47), aColor); + + const SdrPage* pPage = GetPage(1, xDocShRef); + sdr::table::SdrTableObj* pTableObj = dynamic_cast(pPage->GetObj(0)); + CPPUNIT_ASSERT(pTableObj); + uno::Reference xTable(pTableObj->getTable(), uno::UNO_QUERY_THROW); + uno::Reference xCell; + + // check text properties of empty cells + xCell.set(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW); + xCell->getPropertyValue("CharColor") >>= aColor; + CPPUNIT_ASSERT_EQUAL(Color(0xFFFFFF), aColor); + + xCell.set(xTable->getCellByPosition(0, 1), uno::UNO_QUERY_THROW); + xCell->getPropertyValue("CharColor") >>= aColor; + CPPUNIT_ASSERT_EQUAL(Color(0x70AD47), aColor); + CPPUNIT_ASSERT_EQUAL(float(96), xCell->getPropertyValue("CharHeight").get()); + xDocShRef->DoClose(); +} + +void SdOOXMLExportTest3::testTdf94122_autoColor() +{ + // Document contains three pages, with different scenarios for automatic + // color export to pptx. + // - First page: Page background light, automatic colored text on a FillType_NONE shape + // - Second page: Page background dark, automatic colored text on a FillType_NONE shape + // - Third page: Page background light, automatic colored text on a dark colored fill + // and another automatic colored text on a light colored fill + ::sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf94122_autocolor.odp"), ODP); + + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + xDocShRef->DoClose(); + + // Without the accompanying fix in place, these tests would have failed with: + // - Expected: 1 + // - Actual : 0 + // - In ..., XPath '/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:r/a:rPr/a:solidFill/a:srgbClr' number of nodes is incorrect + // i.e. automatic color wasn't resolved & exported + + xmlDocUniquePtr pXmlDocContent1 = parseExport(tempFile, "ppt/slides/slide1.xml"); + assertXPath(pXmlDocContent1, + "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:r/a:rPr/a:solidFill/a:srgbClr", "val", + "000000"); + + xmlDocUniquePtr pXmlDocContent2 = parseExport(tempFile, "ppt/slides/slide2.xml"); + assertXPath(pXmlDocContent2, + "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:r/a:rPr/a:solidFill/a:srgbClr", "val", + "ffffff"); + + xmlDocUniquePtr pXmlDocContent3 = parseExport(tempFile, "ppt/slides/slide3.xml"); + assertXPath(pXmlDocContent3, + "/p:sld/p:cSld/p:spTree/p:sp[1]/p:txBody/a:p/a:r/a:rPr/a:solidFill/a:srgbClr", + "val", "ffffff"); + assertXPath(pXmlDocContent3, + "/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p/a:r/a:rPr/a:solidFill/a:srgbClr", + "val", "000000"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest3); CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/import-tests2.cxx libreoffice-7.4.2~rc3/sd/qa/unit/import-tests2.cxx --- libreoffice-7.4.1~rc2/sd/qa/unit/import-tests2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/import-tests2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -136,6 +136,8 @@ void testTdf128596(); void testDefaultTabStop(); void testCropToZero(); + void testTdf144092TableHeight(); + void testTdf89928BlackWhiteThreshold(); CPPUNIT_TEST_SUITE(SdImportTest2); @@ -206,6 +208,8 @@ CPPUNIT_TEST(testTdf128596); CPPUNIT_TEST(testDefaultTabStop); CPPUNIT_TEST(testCropToZero); + CPPUNIT_TEST(testTdf144092TableHeight); + CPPUNIT_TEST(testTdf89928BlackWhiteThreshold); CPPUNIT_TEST_SUITE_END(); }; @@ -2060,6 +2064,64 @@ loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/croppedTo0.pptx"), PPTX); } +void SdImportTest2::testTdf144092TableHeight() +{ + sd::DrawDocShellRef xDocShRef = loadURL( + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf144092-tableHeight.pptx"), PPTX); + + uno::Reference xTableShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 7208 + // - Actual : 4595 + // i.e. the table height wasn't corrected by expanding less than minimum sized rows. + CPPUNIT_ASSERT_EQUAL(sal_Int32(7208), xTableShape->getSize().Height); + xDocShRef->DoClose(); +} + +void SdImportTest2::testTdf89928BlackWhiteThreshold() +{ + // A slide with two graphics, one with color HSV{0,0,74%} and one with HSV{0,0,76%} + // where both have an applied 75% Black/White Color Effect. + sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc( + u"sd/qa/unit/data/pptx/tdf89928-blackWhiteEffectThreshold.pptx"), + PPTX); + + // First graphic should appear black + { + uno::Reference xShape(getShapeFromPage(0, 0, xDocShRef), + uno::UNO_SET_THROW); + uno::Reference xGraphic; + xShape->getPropertyValue("Graphic") >>= xGraphic; + CPPUNIT_ASSERT(xGraphic.is()); + + Graphic aGraphic(xGraphic); + BitmapEx aBitmap(aGraphic.GetBitmapEx()); + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: Color: R:0 G:0 B:0 A:0 + // - Actual : Color: R:189 G:189 B:189 A:0 + CPPUNIT_ASSERT_EQUAL(Color(ColorTransparency, 0x000000), aBitmap.GetPixelColor(0, 0)); + } + + // Second graphic should appear white + { + uno::Reference xShape(getShapeFromPage(1, 0, xDocShRef), + uno::UNO_SET_THROW); + uno::Reference xGraphic; + xShape->getPropertyValue("Graphic") >>= xGraphic; + CPPUNIT_ASSERT(xGraphic.is()); + + Graphic aGraphic(xGraphic); + BitmapEx aBitmap(aGraphic.GetBitmapEx()); + + CPPUNIT_ASSERT_EQUAL(Color(ColorTransparency, 0xFFFFFF), aBitmap.GetPixelColor(0, 0)); + } + + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest2); CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-7.4.1~rc2/sd/qa/unit/uiimpress.cxx libreoffice-7.4.2~rc3/sd/qa/unit/uiimpress.cxx --- libreoffice-7.4.1~rc2/sd/qa/unit/uiimpress.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/qa/unit/uiimpress.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -67,6 +67,8 @@ virtual void tearDown() override; void checkCurrentPageNumber(sal_uInt16 nNum); + void typeString(SdXImpressDocument* rImpressDocument, const std::string& rStr); + void typeKey(SdXImpressDocument* rImpressDocument, const sal_uInt16 nKey); void insertStringToObject(sal_uInt16 nObj, const std::string& rStr, bool bUseEscape); sd::slidesorter::SlideSorterViewShell* getSlideSorterViewShell(); FileFormat* getFormat(sal_Int32 nExportType); @@ -100,6 +102,23 @@ CPPUNIT_ASSERT_EQUAL(nNum, nPageNumber); } +void SdUiImpressTest::typeKey(SdXImpressDocument* rImpressDocument, const sal_uInt16 nKey) +{ + rImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, nKey); + rImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, nKey); + Scheduler::ProcessEventsToIdle(); +} + +void SdUiImpressTest::typeString(SdXImpressDocument* rImpressDocument, const std::string& rStr) +{ + for (const char c : rStr) + { + rImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, c, 0); + rImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, c, 0); + Scheduler::ProcessEventsToIdle(); + } +} + void SdUiImpressTest::insertStringToObject(sal_uInt16 nObj, const std::string& rStr, bool bUseEscape) { @@ -110,24 +129,17 @@ CPPUNIT_ASSERT_MESSAGE("No Shape", pShape); SdrView* pView = pViewShell->GetView(); pView->MarkObj(pShape, pView->GetSdrPageView()); + Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT(!pView->IsTextEdit()); - for (const char c : rStr) - { - pImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, c, 0); - pImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, c, 0); - Scheduler::ProcessEventsToIdle(); - } + typeString(pImpressDocument, rStr); CPPUNIT_ASSERT(pView->IsTextEdit()); if (bUseEscape) { - pImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::ESCAPE); - pImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::ESCAPE); - Scheduler::ProcessEventsToIdle(); - + typeKey(pImpressDocument, KEY_ESCAPE); CPPUNIT_ASSERT(!pView->IsTextEdit()); } } @@ -586,6 +598,86 @@ CPPUNIT_ASSERT_EQUAL(OUString("Test 2"), pViewShell->GetActualPage()->GetName()); } +CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf148620) +{ + mxComponent = loadFromDesktop("private:factory/simpress", + "com.sun.star.presentation.PresentationDocument"); + + auto pXImpressDocument = dynamic_cast(mxComponent.get()); + + uno::Reference xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), + uno::UNO_QUERY); + uno::Reference xShape(xDrawPage->getByIndex(1), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString(u""), xShape->getString()); + + insertStringToObject(1, "one", /*bUseEscape*/ false); + typeKey(pXImpressDocument, KEY_RETURN); + typeString(pXImpressDocument, "two"); + typeKey(pXImpressDocument, KEY_RETURN); + typeString(pXImpressDocument, "three"); + typeKey(pXImpressDocument, KEY_RETURN); + typeString(pXImpressDocument, "four"); + typeKey(pXImpressDocument, KEY_RETURN); + typeString(pXImpressDocument, "five"); + typeKey(pXImpressDocument, KEY_RETURN); + typeString(pXImpressDocument, "six"); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nFive\nsix"), xShape->getString()); + + uno::Sequence aArgs( + comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(sal_Int32(0)) } })); + dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nsix\nFive"), xShape->getString()); + + dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nsix\nFour\nFive"), xShape->getString()); + + dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nsix\nThree\nFour\nFive"), xShape->getString()); + + dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nsix\nTwo\nThree\nFour\nFive"), xShape->getString()); + + dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"six\nOne\nTwo\nThree\nFour\nFive"), xShape->getString()); + + dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nsix\nTwo\nThree\nFour\nFive"), xShape->getString()); + + dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nsix\nThree\nFour\nFive"), xShape->getString()); + + dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nsix\nFour\nFive"), xShape->getString()); + + dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nsix\nFive"), xShape->getString()); + + dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nFive\nsix"), xShape->getString()); +} + CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf141703) { mxComponent = loadFromDesktop("private:factory/simpress", @@ -607,22 +699,14 @@ Scheduler::ProcessEventsToIdle(); } - pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'A', 0); - pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'A', 0); - Scheduler::ProcessEventsToIdle(); + typeString(pXImpressDocument, "A"); // Move to A2 with Tab and write 'B' - pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_TAB); - pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_TAB); - Scheduler::ProcessEventsToIdle(); + typeKey(pXImpressDocument, KEY_TAB); - pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'B', 0); - pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'B', 0); - Scheduler::ProcessEventsToIdle(); + typeString(pXImpressDocument, "B"); - pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::ESCAPE); - pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::ESCAPE); - Scheduler::ProcessEventsToIdle(); + typeKey(pXImpressDocument, KEY_ESCAPE); sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); SdPage* pActualPage = pViewShell->GetActualPage(); diff -Nru libreoffice-7.4.1~rc2/sd/source/core/CustomAnimationEffect.cxx libreoffice-7.4.2~rc3/sd/source/core/CustomAnimationEffect.cxx --- libreoffice-7.4.1~rc2/sd/source/core/CustomAnimationEffect.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/source/core/CustomAnimationEffect.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1605,8 +1605,10 @@ { ::tools::Rectangle aBoundRect(0,0,0,0); + drawinglayer::primitive2d::Primitive2DContainer xPrimitives; + pObj->GetViewContact().getViewIndependentPrimitive2DContainer(xPrimitives); const drawinglayer::geometry::ViewInformation2D aViewInformation2D; - const basegfx::B2DRange aRange = pObj->GetViewContact().getRange(aViewInformation2D); + const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aViewInformation2D)); if(!aRange.isEmpty()) { diff -Nru libreoffice-7.4.1~rc2/sd/source/filter/eppt/pptx-animations.cxx libreoffice-7.4.2~rc3/sd/source/filter/eppt/pptx-animations.cxx --- libreoffice-7.4.1~rc2/sd/source/filter/eppt/pptx-animations.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/source/filter/eppt/pptx-animations.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -659,6 +659,9 @@ { return rURL.endsWithIgnoreAsciiCase(".wav") || rURL.endsWithIgnoreAsciiCase(".m4a"); } + +/// Returns if rURL has an extension which is a video format. +bool IsVideoURL(const OUString& rURL) { return rURL.endsWithIgnoreAsciiCase(".mp4"); } } namespace oox::core @@ -1235,6 +1238,7 @@ bValid = true; } + bool bVideo = false; if (!bValid) { if (xAudio->getSource() >>= xShape) @@ -1243,7 +1247,8 @@ bool bHasMediaURL = xShapeProps->getPropertySetInfo()->hasPropertyByName("MediaURL"); if (bHasMediaURL && (xShapeProps->getPropertyValue("MediaURL") >>= sUrl)) { - bValid = IsAudioURL(sUrl); + bVideo = IsVideoURL(sUrl); + bValid = IsAudioURL(sUrl) || bVideo; } } } @@ -1256,12 +1261,31 @@ mrPowerPointExport.embedEffectAudio(mpFS, sUrl, sRelId, sName); } - bool bNarration = xAudio->getNarration(); - mpFS->startElementNS(XML_p, XML_audio, XML_isNarration, bNarration ? "1" : "0"); - bool bHideDuringShow = xAudio->getHideDuringShow(); - mpFS->startElementNS(XML_p, XML_cMediaNode, XML_showWhenStopped, bHideDuringShow ? "0" : "1"); + if (bVideo) + { + mpFS->startElementNS(XML_p, XML_video); + mpFS->startElementNS(XML_p, XML_cMediaNode); + } + else + { + bool bNarration = xAudio->getNarration(); + mpFS->startElementNS(XML_p, XML_audio, XML_isNarration, bNarration ? "1" : "0"); + bool bHideDuringShow = xAudio->getHideDuringShow(); + mpFS->startElementNS(XML_p, XML_cMediaNode, XML_showWhenStopped, + bHideDuringShow ? "0" : "1"); + } - mpFS->startElementNS(XML_p, XML_cTn); + animations::Timing eTiming{}; + bool bLooping + = (xAudio->getRepeatCount() >>= eTiming) && eTiming == animations::Timing_INDEFINITE; + if (bVideo && bLooping) + { + mpFS->startElementNS(XML_p, XML_cTn, XML_repeatCount, "indefinite"); + } + else + { + mpFS->startElementNS(XML_p, XML_cTn); + } WriteAnimationCondList(mpContext->getCondition(true), XML_stCondLst); WriteAnimationCondList(mpContext->getCondition(false), XML_endCondLst); mpFS->endElementNS(XML_p, XML_cTn); @@ -1281,7 +1305,14 @@ mpFS->endElementNS(XML_p, XML_tgtEl); mpFS->endElementNS(XML_p, XML_cMediaNode); - mpFS->endElementNS(XML_p, XML_audio); + if (bVideo) + { + mpFS->endElementNS(XML_p, XML_video); + } + else + { + mpFS->endElementNS(XML_p, XML_audio); + } } void PPTXAnimationExport::WriteAnimationNode(const NodeContextPtr& pContext) @@ -1456,7 +1487,7 @@ = xShapeProps->getPropertySetInfo()->hasPropertyByName("MediaURL"); if (bHasMediaURL && (xShapeProps->getPropertyValue("MediaURL") >>= sURL)) { - mbValid = IsAudioURL(sURL); + mbValid = IsAudioURL(sURL) || IsVideoURL(sURL); } } } diff -Nru libreoffice-7.4.1~rc2/sd/source/ui/inc/ViewShellBase.hxx libreoffice-7.4.2~rc3/sd/source/ui/inc/ViewShellBase.hxx --- libreoffice-7.4.1~rc2/sd/source/ui/inc/ViewShellBase.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/source/ui/inc/ViewShellBase.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -108,7 +108,7 @@ void GetState (SfxItemSet& rSet); /* override these from SfxViewShell */ - virtual OUString GetSelectionText(bool = false) override; + virtual OUString GetSelectionText(bool = false, bool bOnlyASample = false) override; virtual bool HasSelection(bool = true ) const override; SvBorder GetBorder (bool bOuterResize); diff -Nru libreoffice-7.4.1~rc2/sd/source/ui/view/ViewShellBase.cxx libreoffice-7.4.2~rc3/sd/source/ui/view/ViewShellBase.cxx --- libreoffice-7.4.1~rc2/sd/source/ui/view/ViewShellBase.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sd/source/ui/view/ViewShellBase.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -441,7 +441,7 @@ { } -OUString ViewShellBase::GetSelectionText(bool bCompleteWords) +OUString ViewShellBase::GetSelectionText(bool bCompleteWords, bool /*bOnlyASample*/) { std::shared_ptr const pMainShell(GetMainViewShell()); DrawViewShell *const pDrawViewShell( diff -Nru libreoffice-7.4.1~rc2/sdext/Executable_xpdfimport.mk libreoffice-7.4.2~rc3/sdext/Executable_xpdfimport.mk --- libreoffice-7.4.1~rc2/sdext/Executable_xpdfimport.mk 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sdext/Executable_xpdfimport.mk 2022-10-10 10:15:14.000000000 +0000 @@ -22,6 +22,10 @@ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl \ )) +$(eval $(call gb_Executable_use_system_win32_libs,xpdfimport,\ + shell32 \ +)) + $(eval $(call gb_Executable_add_default_nativeres,xpdfimport)) ifneq ($(SYSTEM_POPPLER),) diff -Nru libreoffice-7.4.1~rc2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx libreoffice-7.4.2~rc3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx --- libreoffice-7.4.1~rc2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -678,8 +678,15 @@ return; assert(state); - double* dashArray; int arrayLen; double startOffset; + int arrayLen; double startOffset; +#if POPPLER_CHECK_VERSION(22, 9, 0) + const std::vector &dash = state->getLineDash(&startOffset); + const double* dashArray = dash.data(); + arrayLen = dash.size(); +#else + double* dashArray; state->getLineDash(&dashArray, &arrayLen, &startOffset); +#endif printf( "updateLineDash" ); if( arrayLen && dashArray ) diff -Nru libreoffice-7.4.1~rc2/sfx2/source/appl/childwin.cxx libreoffice-7.4.2~rc3/sfx2/source/appl/childwin.cxx --- libreoffice-7.4.1~rc2/sfx2/source/appl/childwin.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sfx2/source/appl/childwin.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -310,9 +310,9 @@ weld::Dialog* pDialog = xController->getDialog(); aInfo.aPos = pDialog->get_position(); aInfo.aSize = pDialog->get_size(); - vcl::WindowDataMask nMask = vcl::WindowDataMask::Pos | vcl::WindowDataMask::State; + WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State; if (pDialog->get_resizable()) - nMask |= vcl::WindowDataMask::Size; + nMask |= WindowStateMask::Size; aInfo.aWinState = pDialog->get_window_state(nMask); } else if (pWindow) @@ -321,9 +321,9 @@ aInfo.aSize = pWindow->GetSizePixel(); if ( pWindow->IsSystemWindow() ) { - vcl::WindowDataMask nMask = vcl::WindowDataMask::Pos | vcl::WindowDataMask::State; + WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State; if ( pWindow->GetStyle() & WB_SIZEABLE ) - nMask |= vcl::WindowDataMask::Size; + nMask |= WindowStateMask::Size; aInfo.aWinState = static_cast(pWindow.get())->GetWindowState( nMask ); } else if (DockingWindow* pDockingWindow = dynamic_cast(pWindow.get())) diff -Nru libreoffice-7.4.1~rc2/sfx2/source/dialog/basedlgs.cxx libreoffice-7.4.2~rc3/sfx2/source/dialog/basedlgs.cxx --- libreoffice-7.4.1~rc2/sfx2/source/dialog/basedlgs.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sfx2/source/dialog/basedlgs.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -173,9 +173,9 @@ { if (m_xImpl->pMgr) { - vcl::WindowDataMask nMask = vcl::WindowDataMask::Pos | vcl::WindowDataMask::State; + WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State; if (m_xDialog->get_resizable()) - nMask |= vcl::WindowDataMask::Size; + nMask |= WindowStateMask::Size; m_xImpl->aWinState = m_xDialog->get_window_state(nMask); GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, m_xImpl->pMgr->GetType() ); } diff -Nru libreoffice-7.4.1~rc2/sfx2/source/dialog/recfloat.cxx libreoffice-7.4.2~rc3/sfx2/source/dialog/recfloat.cxx --- libreoffice-7.4.1~rc2/sfx2/source/dialog/recfloat.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sfx2/source/dialog/recfloat.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -56,10 +56,11 @@ aPos.AdjustX(20); aPos.AdjustY(10); - vcl::WindowData aState; - aState.setMask(vcl::WindowDataMask::Pos); - aState.setPos(aPos); - pDlg->set_window_state(aState.toStr()); + WindowStateData aState; + aState.SetMask(WindowStateMask::Pos); + aState.SetX(aPos.X()); + aState.SetY(aPos.Y()); + pDlg->set_window_state(aState.ToStr()); pFloatDlg->Initialize(pInfo); } diff -Nru libreoffice-7.4.1~rc2/sfx2/source/view/viewsh.cxx libreoffice-7.4.2~rc3/sfx2/source/view/viewsh.cxx --- libreoffice-7.4.1~rc2/sfx2/source/view/viewsh.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sfx2/source/view/viewsh.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1189,7 +1189,7 @@ OUString SfxViewShell::GetSelectionText ( - bool /*bCompleteWords*/ /* FALSE (default) + bool /*bCompleteWords*/, /* FALSE (default) Only the actual selected text is returned. TRUE @@ -1198,6 +1198,7 @@ these are used: white spaces and punctuation ".,;" and single and double quotes. */ + bool /*bOnlyASample*/ /* used by some dialogs to avoid constructing monster strings e.g. in calc */ ) /* [Description] diff -Nru libreoffice-7.4.1~rc2/sfx2/uiconfig/ui/commandpopup.ui libreoffice-7.4.2~rc3/sfx2/uiconfig/ui/commandpopup.ui --- libreoffice-7.4.1~rc2/sfx2/uiconfig/ui/commandpopup.ui 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sfx2/uiconfig/ui/commandpopup.ui 2022-10-10 10:15:14.000000000 +0000 @@ -1,7 +1,7 @@ - + @@ -31,7 +31,6 @@ True True - False True Search command diff -Nru libreoffice-7.4.1~rc2/slideshow/CppunitTest_slideshow_engine.mk libreoffice-7.4.2~rc3/slideshow/CppunitTest_slideshow_engine.mk --- libreoffice-7.4.1~rc2/slideshow/CppunitTest_slideshow_engine.mk 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/CppunitTest_slideshow_engine.mk 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,50 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,slideshow_engine)) + +$(eval $(call gb_CppunitTest_use_externals,slideshow_engine,\ + boost_headers \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,slideshow_engine, \ + slideshow/qa/engine/engine \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,slideshow_engine, \ + comphelper \ + cppu \ + slideshow \ + sal \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,slideshow_engine)) + +$(eval $(call gb_CppunitTest_set_include,slideshow_engine,\ + -I$(SRCDIR)/slideshow/source/inc \ + -I$(SRCDIR)/slideshow/source/engine/animationnodes \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_ure,slideshow_engine)) +$(eval $(call gb_CppunitTest_use_vcl,slideshow_engine)) + +$(eval $(call gb_CppunitTest_use_rdb,slideshow_engine,services)) + +$(eval $(call gb_CppunitTest_use_custom_headers,slideshow_engine,\ + officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,slideshow_engine)) + +# vim: set noet sw=4 ts=4: diff -Nru libreoffice-7.4.1~rc2/slideshow/Library_slideshow.mk libreoffice-7.4.2~rc3/slideshow/Library_slideshow.mk --- libreoffice-7.4.1~rc2/slideshow/Library_slideshow.mk 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/Library_slideshow.mk 2022-10-10 10:15:14.000000000 +0000 @@ -28,6 +28,10 @@ epoxy \ )) +$(eval $(call gb_Library_add_defs,slideshow,\ + -DSLIDESHOW_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_Library_use_sdk_api,slideshow)) $(eval $(call gb_Library_use_libraries,slideshow,\ diff -Nru libreoffice-7.4.1~rc2/slideshow/Module_slideshow.mk libreoffice-7.4.2~rc3/slideshow/Module_slideshow.mk --- libreoffice-7.4.1~rc2/slideshow/Module_slideshow.mk 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/Module_slideshow.mk 2022-10-10 10:15:14.000000000 +0000 @@ -21,6 +21,7 @@ $(eval $(call gb_Module_add_check_targets,slideshow,\ CppunitTest_slideshow \ + CppunitTest_slideshow_engine \ )) # vim: set noet sw=4 ts=4: Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/slideshow/qa/engine/data/video-loop.pptx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/slideshow/qa/engine/data/video-loop.pptx differ diff -Nru libreoffice-7.4.1~rc2/slideshow/qa/engine/engine.cxx libreoffice-7.4.2~rc3/slideshow/qa/engine/engine.cxx --- libreoffice-7.4.1~rc2/slideshow/qa/engine/engine.cxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/qa/engine/engine.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,102 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +using namespace ::com::sun::star; + +namespace +{ +/// Covers slideshow/source/engine/ fixes. +class Test : public test::BootstrapFixture, public unotest::MacrosTest +{ +private: + uno::Reference mxComponent; + +public: + void setUp() override; + void tearDown() override; + uno::Reference& getComponent() { return mxComponent; } +}; + +void Test::setUp() +{ + test::BootstrapFixture::setUp(); + + mxDesktop.set(frame::Desktop::create(mxComponentContext)); +} + +void Test::tearDown() +{ + if (mxComponent.is()) + mxComponent->dispose(); + + test::BootstrapFixture::tearDown(); +} + +/// Get the first command node in the animation tree of the page, assuming that it's the first child +/// (recursively). +uno::Reference +GetFirstCommandNodeOfPage(const uno::Reference& xPage) +{ + uno::Reference xAnimationNodeSupplier(xPage, + uno::UNO_QUERY); + uno::Reference xNode = xAnimationNodeSupplier->getAnimationNode(); + while (true) + { + if (xNode->getType() == animations::AnimationNodeType::COMMAND) + { + break; + } + uno::Reference xEnumAccess(xNode, uno::UNO_QUERY); + uno::Reference xNodes = xEnumAccess->createEnumeration(); + xNode.set(xNodes->nextElement(), uno::UNO_QUERY); + } + uno::Reference xRet(xNode, uno::UNO_QUERY); + return xRet; +} +} + +CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation) +{ + // Given a document with a looping video, the looping is defined as part of its auto-play + // animation (and not on the media shape): + OUString aURL = m_directories.getURLFromSrc(u"slideshow/qa/engine/data/video-loop.pptx"); + getComponent().set(loadFromDesktop(aURL)); + uno::Reference xDoc(getComponent(), uno::UNO_QUERY); + uno::Reference xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY); + uno::Reference xCommandNode = GetFirstCommandNodeOfPage(xPage); + uno::Reference xShape(xPage->getByIndex(0), uno::UNO_QUERY); + + // When determining if the video should be looping or not: + bool bLooping + = slideshow::internal::AnimationCommandNode::GetLoopingFromAnimation(xCommandNode, xShape); + + // Then make sure that we detect the looping is wanted: + CPPUNIT_ASSERT(bLooping); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-7.4.1~rc2/slideshow/source/engine/animationnodes/animationcommandnode.cxx libreoffice-7.4.2~rc3/slideshow/source/engine/animationnodes/animationcommandnode.cxx --- libreoffice-7.4.1~rc2/slideshow/source/engine/animationnodes/animationcommandnode.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/engine/animationnodes/animationcommandnode.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -19,8 +19,14 @@ #include +#include +#include +#include +#include #include +#include + #include "animationcommandnode.hxx" #include #include @@ -28,6 +34,52 @@ using namespace com::sun::star; +namespace +{ +/// Determines if this is the root of the timing node tree. +bool IsTimingRootNode(const uno::Reference& xNode) +{ + uno::Sequence aUserData = xNode->getUserData(); + comphelper::SequenceAsHashMap aMap(aUserData); + auto it = aMap.find("node-type"); + if (it == aMap.end()) + { + return false; + } + + sal_Int16 nNodeType{}; + if (!(it->second >>= nNodeType)) + { + return false; + } + + return nNodeType == css::presentation::EffectNodeType::TIMING_ROOT; +} + +/// Walks the parent chain of xNode and stops at the timing root. +uno::Reference +GetTimingRoot(const uno::Reference& xNode) +{ + uno::Reference xParent(xNode->getParent(), uno::UNO_QUERY); + while (true) + { + if (!xParent.is()) + { + break; + } + + if (IsTimingRootNode(xParent)) + { + return xParent; + } + + xParent.set(xParent->getParent(), uno::UNO_QUERY); + } + + return {}; +} +} + namespace slideshow::internal { namespace EffectCommands = css::presentation::EffectCommands; @@ -43,6 +95,7 @@ uno::UNO_QUERY ); ShapeSharedPtr pShape( getContext().mpSubsettableShapeManager->lookupShape( xShape ) ); mpShape = ::std::dynamic_pointer_cast< IExternalMediaShapeBase >( pShape ); + mxShape = xShape; } void AnimationCommandNode::dispose() @@ -52,6 +105,42 @@ BaseNode::dispose(); } +bool AnimationCommandNode::GetLoopingFromAnimation( + const uno::Reference& xCommandNode, + const uno::Reference& xShape) +{ + uno::Reference xTimingRoot = GetTimingRoot(xCommandNode); + uno::Reference xEnumAccess(xTimingRoot, uno::UNO_QUERY); + if (!xEnumAccess.is()) + { + return false; + } + + uno::Reference xNodes = xEnumAccess->createEnumeration(); + while (xNodes->hasMoreElements()) + { + uno::Reference xNode(xNodes->nextElement(), uno::UNO_QUERY); + if (xNode->getType() != animations::AnimationNodeType::AUDIO) + { + continue; + } + + uno::Reference xAudio(xNode, uno::UNO_QUERY); + uno::Reference xSource(xAudio->getSource(), uno::UNO_QUERY); + if (xSource != xShape) + { + continue; + } + + animations::Timing eTiming{}; + if ((xAudio->getRepeatCount() >>= eTiming) && eTiming == animations::Timing_INDEFINITE) + { + return true; + } + } + return false; +} + void AnimationCommandNode::activate_st() { switch( mxCommandNode->getCommand() ) { @@ -71,6 +160,14 @@ if( mpShape ) { mpShape->setMediaTime(fMediaTime/1000.0); + + if (AnimationCommandNode::GetLoopingFromAnimation(mxCommandNode, mxShape)) + { + // If looping is requested from the animation, then that has priority over the + // looping from the shape itself. + mpShape->setLooping(true); + } + mpShape->play(); } break; diff -Nru libreoffice-7.4.1~rc2/slideshow/source/engine/animationnodes/animationcommandnode.hxx libreoffice-7.4.2~rc3/slideshow/source/engine/animationnodes/animationcommandnode.hxx --- libreoffice-7.4.1~rc2/slideshow/source/engine/animationnodes/animationcommandnode.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/engine/animationnodes/animationcommandnode.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -20,6 +20,7 @@ #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOMMANDNODE_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOMMANDNODE_HXX +#include #include #include #include @@ -31,7 +32,7 @@ This animation node encapsulates a command. Not yet implemented: verb & custom. */ -class AnimationCommandNode : public BaseNode +class SLIDESHOW_DLLPUBLIC AnimationCommandNode : public BaseNode { public: AnimationCommandNode( @@ -39,6 +40,12 @@ ::std::shared_ptr const& pParent, NodeContext const& rContext ); + /// Assuming that xCommandNode is a play command, determines if an audio node wants looping when + /// xShape plays. + static bool + GetLoopingFromAnimation(const css::uno::Reference& xCommandNode, + const css::uno::Reference& xShape); + protected: virtual void dispose() override; @@ -49,6 +56,7 @@ private: IExternalMediaShapeBaseSharedPtr mpShape; css::uno::Reference mxCommandNode; + css::uno::Reference mxShape; }; } // namespace slideshow::internal diff -Nru libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/drawshape.cxx libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/drawshape.cxx --- libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/drawshape.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/drawshape.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -366,7 +366,8 @@ mbIsVisible( true ), mbForceUpdate( false ), mbAttributeLayerRevoked( false ), - mbDrawingLayerAnim( false ) + mbDrawingLayerAnim( false ), + mbContainsPageField( false ) { ENSURE_OR_THROW( mxShape.is(), "DrawShape::DrawShape(): Invalid XShape" ); ENSURE_OR_THROW( mxPage.is(), "DrawShape::DrawShape(): Invalid containing page" ); @@ -391,6 +392,26 @@ maSubsetting.reset( mpCurrMtf ); prepareHyperlinkIndices(); + + if(mbContainsPageField && mpCurrMtf && !maBounds.isEmpty()) + { + // tdf#150402 Use mbContainsPageField that gets set in prepareHyperlinkIndices + // which has to be run anyways, so this will cause no harm in execution speed. + // It lets us detect the potential error case that a PageField is contained in + // the Text of the Shape. That is a hint that maBounds contains the wrong Range + // and needs to be corrected. The correct size is in the PrefSize of the metafile. + // For more backgrund information please refer to tdf#150402, Comment 16. + const double fWidthDiff(fabs(mpCurrMtf->GetPrefSize().Width() - maBounds.getWidth())); + const double fHeightDiff(fabs(mpCurrMtf->GetPrefSize().Height() - maBounds.getHeight())); + + if(fWidthDiff > 1.0 || fHeightDiff > 1.0) + { + maBounds = basegfx::B2DRange( + maBounds.getMinX(), maBounds.getMinY(), + maBounds.getMinX() + mpCurrMtf->GetPrefSize().Width(), + maBounds.getMinY() + mpCurrMtf->GetPrefSize().Height()); + } + } } DrawShape::DrawShape( const uno::Reference< drawing::XShape >& xShape, @@ -425,7 +446,8 @@ mbIsVisible( true ), mbForceUpdate( false ), mbAttributeLayerRevoked( false ), - mbDrawingLayerAnim( false ) + mbDrawingLayerAnim( false ), + mbContainsPageField( false ) { ENSURE_OR_THROW( rGraphic.IsAnimated(), "DrawShape::DrawShape(): Graphic is no animation" ); @@ -475,7 +497,8 @@ mbIsVisible( rSrc.mbIsVisible ), mbForceUpdate( false ), mbAttributeLayerRevoked( false ), - mbDrawingLayerAnim( false ) + mbDrawingLayerAnim( false ), + mbContainsPageField( false ) { ENSURE_OR_THROW( mxShape.is(), "DrawShape::DrawShape(): Invalid XShape" ); ENSURE_OR_THROW( mpCurrMtf, "DrawShape::DrawShape(): Invalid metafile" ); @@ -867,6 +890,10 @@ { maHyperlinkIndices.back().second = nIndex; } + else if (pAct->GetComment().equalsIgnoreAsciiCase("FIELD_SEQ_BEGIN;PageField")) + { + mbContainsPageField = true; + } ++nIndex; } else diff -Nru libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/drawshape.hxx libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/drawshape.hxx --- libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/drawshape.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/drawshape.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -349,6 +349,8 @@ /// whether a drawing layer animation has to be performed bool mbDrawingLayerAnim; + /// tdf#150402 wether mpCurrMtf contains any Text with a PageField ("FIELD_SEQ_BEGIN;PageField") + mutable bool mbContainsPageField; }; } diff -Nru libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/externalshapebase.cxx libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/externalshapebase.cxx --- libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/externalshapebase.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/externalshapebase.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -143,6 +143,7 @@ implSetIntrinsicAnimationTime(fTime); } + void ExternalShapeBase::setLooping(bool bLooping) { implSetLooping(bLooping); } bool ExternalShapeBase::update() const { diff -Nru libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/externalshapebase.hxx libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/externalshapebase.hxx --- libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/externalshapebase.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/externalshapebase.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -65,6 +65,7 @@ virtual void pause() override; virtual bool isPlaying() const override; virtual void setMediaTime(double) override; + void setLooping(bool bLooping) override; // render methods @@ -108,6 +109,7 @@ virtual bool implIsIntrinsicAnimationPlaying() const = 0; /// override in derived class to set media time virtual void implSetIntrinsicAnimationTime(double) = 0; + virtual void implSetLooping(bool /*bLooping*/) {} /// The associated XShape diff -Nru libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/mediashape.cxx libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/mediashape.cxx --- libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/mediashape.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/mediashape.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -82,6 +82,7 @@ virtual void implPauseIntrinsicAnimation() override; virtual bool implIsIntrinsicAnimationPlaying() const override; virtual void implSetIntrinsicAnimationTime(double) override; + void implSetLooping(bool bLooping) override; /// the list of active view shapes (one for each registered view layer) typedef ::std::vector< ViewMediaShapeSharedPtr > ViewMediaShapeVector; @@ -235,6 +236,13 @@ pViewMediaShape->setMediaTime( fTime ); } + void MediaShape::implSetLooping(bool bLooping) + { + for (const auto& pViewMediaShape : maViewMediaShapes) + { + pViewMediaShape->setLooping(bLooping); + } + } ShapeSharedPtr createMediaShape( const uno::Reference< drawing::XShape >& xShape, diff -Nru libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/viewmediashape.cxx libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/viewmediashape.cxx --- libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/viewmediashape.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/viewmediashape.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -36,6 +36,8 @@ #include #include #include +#include +#include #include #include @@ -141,6 +143,14 @@ mxPlayer->setMediaTime(fTime); } + void ViewMediaShape::setLooping(bool bLooping) + { + if (mxPlayer.is()) + { + mxPlayer->setPlaybackLoop(bLooping); + } + } + bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const { #if !HAVE_FEATURE_AVMEDIA @@ -441,10 +451,20 @@ aAWTRect.X = aAWTRect.Y = 0; + SdrObject* pObj = SdrObject::getSdrObjectFromXShape(mxShape); + auto pMediaObj = dynamic_cast(pObj); + const avmedia::MediaItem* pMediaItem = nullptr; + if (pMediaObj) + { + pMediaItem = &pMediaObj->getMediaProperties(); + } + uno::Sequence< uno::Any > aArgs{ uno::Any(nParentWindowHandle), uno::Any(aAWTRect), - uno::Any(reinterpret_cast< sal_IntPtr >( mpMediaWindow.get() )) + uno::Any(reinterpret_cast< sal_IntPtr >( mpMediaWindow.get() )), + // Media item contains media properties, e.g. cropping. + uno::Any(reinterpret_cast< sal_IntPtr >( pMediaItem )) }; mxPlayerWindow.set( mxPlayer->createPlayerWindow( aArgs ) ); diff -Nru libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/viewmediashape.hxx libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/viewmediashape.hxx --- libreoffice-7.4.1~rc2/slideshow/source/engine/shapes/viewmediashape.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/engine/shapes/viewmediashape.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -112,6 +112,8 @@ */ void setMediaTime(double fTime); + void setLooping(bool bLooping); + // render methods diff -Nru libreoffice-7.4.1~rc2/slideshow/source/inc/iexternalmediashapebase.hxx libreoffice-7.4.2~rc3/slideshow/source/inc/iexternalmediashapebase.hxx --- libreoffice-7.4.1~rc2/slideshow/source/inc/iexternalmediashapebase.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/inc/iexternalmediashapebase.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -72,6 +72,8 @@ presented */ virtual void setMediaTime(double fTime) = 0; + + virtual void setLooping(bool /*bLooping*/){}; }; typedef ::std::shared_ptr< IExternalMediaShapeBase > IExternalMediaShapeBaseSharedPtr; diff -Nru libreoffice-7.4.1~rc2/slideshow/source/inc/slideshowdllapi.h libreoffice-7.4.2~rc3/slideshow/source/inc/slideshowdllapi.h --- libreoffice-7.4.1~rc2/slideshow/source/inc/slideshowdllapi.h 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/slideshow/source/inc/slideshowdllapi.h 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include + +#if defined(SLIDESHOW_DLLIMPLEMENTATION) +#define SLIDESHOW_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define SLIDESHOW_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-7.4.1~rc2/solenv/clang-format/excludelist libreoffice-7.4.2~rc3/solenv/clang-format/excludelist --- libreoffice-7.4.1~rc2/solenv/clang-format/excludelist 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/solenv/clang-format/excludelist 2022-10-10 10:15:14.000000000 +0000 @@ -14424,6 +14424,7 @@ vcl/inc/salframe.hxx vcl/inc/salgdi.hxx vcl/inc/salgdiimpl.hxx +vcl/inc/salgeom.hxx vcl/inc/salinst.hxx vcl/inc/sallayout.hxx vcl/inc/salmenu.hxx diff -Nru libreoffice-7.4.1~rc2/sources.ver libreoffice-7.4.2~rc3/sources.ver --- libreoffice-7.4.1~rc2/sources.ver 2022-09-09 18:50:10.000000000 +0000 +++ libreoffice-7.4.2~rc3/sources.ver 2022-10-10 11:10:51.000000000 +0000 @@ -1 +1 @@ -lo_sources_ver=7.4.1.2 +lo_sources_ver=7.4.2.3 diff -Nru libreoffice-7.4.1~rc2/starmath/source/edit.cxx libreoffice-7.4.2~rc3/starmath/source/edit.cxx --- libreoffice-7.4.1~rc2/starmath/source/edit.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/starmath/source/edit.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -100,6 +100,12 @@ { weld::CustomWidgetController::SetDrawingArea(pDrawingArea); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + Color aBgColor = rStyleSettings.GetWindowColor(); + + OutputDevice& rDevice = pDrawingArea->get_ref_device(); + rDevice.SetBackground(aBgColor); + SetHelpId(HID_SMA_COMMAND_WIN_EDIT); EnableRTL(false); @@ -113,6 +119,8 @@ m_xEditView->SetOutputArea(mrEditWindow.AdjustScrollBars()); + m_xEditView->SetBackgroundColor(aBgColor); + pDrawingArea->set_cursor(PointerStyle::Text); pEditEngine->SetStatusEventHdl(LINK(this, SmEditTextWindow, EditStatusHdl)); diff -Nru libreoffice-7.4.1~rc2/starmath/source/view.cxx libreoffice-7.4.2~rc3/starmath/source/view.cxx --- libreoffice-7.4.1~rc2/starmath/source/view.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/starmath/source/view.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -100,6 +100,8 @@ SmGraphicWindow::SmGraphicWindow(SmViewShell& rShell) : InterimItemWindow(&rShell.GetViewFrame()->GetWindow(), "modules/smath/ui/mathwindow.ui", "MathWindow") + , nLinePixH(GetSettings().GetStyleSettings().GetScrollBarSize()) + , nColumnPixW(nLinePixH) , nZoom(100) // continue to use user-scrolling to make this work equivalent to how it 'always' worked , mxScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow", true)) @@ -108,8 +110,6 @@ { InitControlBase(mxGraphic->GetDrawingArea()); - nColumnPixW = nLinePixH = GetSettings().GetStyleSettings().GetScrollBarSize(); - mxScrolledWindow->connect_hadjustment_changed(LINK(this, SmGraphicWindow, ScrollHdl)); mxScrolledWindow->connect_vadjustment_changed(LINK(this, SmGraphicWindow, ScrollHdl)); diff -Nru libreoffice-7.4.1~rc2/svl/qa/unit/svl.cxx libreoffice-7.4.2~rc3/svl/qa/unit/svl.cxx --- libreoffice-7.4.1~rc2/svl/qa/unit/svl.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svl/qa/unit/svl.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -48,6 +48,15 @@ return rStrm; } +namespace svl +{ +static std::ostream& operator<<(std::ostream& rStrm, const SharedString& string ) +{ + return rStrm << "(" << static_cast(string.getData()) << ")" << string.getString(); +} +} + + namespace { class Test : public CppUnit::TestFixture { @@ -62,6 +71,7 @@ void testSharedStringPool(); void testSharedStringPoolPurge(); void testSharedStringPoolPurgeBug1(); + void testSharedStringPoolEmptyString(); void testFdo60915(); void testI116701(); void testTdf103060(); @@ -80,6 +90,7 @@ CPPUNIT_TEST(testSharedStringPool); CPPUNIT_TEST(testSharedStringPoolPurge); CPPUNIT_TEST(testSharedStringPoolPurgeBug1); + CPPUNIT_TEST(testSharedStringPoolEmptyString); CPPUNIT_TEST(testFdo60915); CPPUNIT_TEST(testI116701); CPPUNIT_TEST(testTdf103060); @@ -363,18 +374,21 @@ { SvtSysLocale aSysLocale; svl::SharedStringPool aPool(aSysLocale.GetCharClass()); + size_t extraCount = aPool.getCount(); // internal items such as SharedString::getEmptyString() + size_t extraCountIgnoreCase = aPool.getCountIgnoreCase(); + aPool.intern("Andy"); aPool.intern("andy"); aPool.intern("ANDY"); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong string count.", static_cast(3), aPool.getCount()); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong case insensitive string count.", static_cast(1), aPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong string count.", 3+extraCount, aPool.getCount()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong case insensitive string count.", 1+extraCountIgnoreCase, aPool.getCountIgnoreCase()); // Since no string objects referencing the pooled strings exist, purging - // the pool should empty it. + // the pool should empty it (except for internal items). aPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(0), aPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(0), aPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(extraCount, aPool.getCount()); + CPPUNIT_ASSERT_EQUAL(extraCountIgnoreCase, aPool.getCountIgnoreCase()); // Now, create string objects using optional so we can clear them std::optional pStr1 = aPool.intern("Andy"); @@ -382,37 +396,37 @@ std::optional pStr3 = aPool.intern("ANDY"); std::optional pStr4 = aPool.intern("Bruce"); - CPPUNIT_ASSERT_EQUAL(static_cast(5), aPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(5+extraCount, aPool.getCount()); + CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, aPool.getCountIgnoreCase()); // This shouldn't purge anything. aPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(5), aPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(5+extraCount, aPool.getCount()); + CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, aPool.getCountIgnoreCase()); // Delete one heap string object, and purge. That should purge one string. pStr1.reset(); aPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(4), aPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(4+extraCount, aPool.getCount()); + CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, aPool.getCountIgnoreCase()); // Nothing changes, because the upper-string is still in the map pStr3.reset(); aPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(4), aPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(4+extraCount, aPool.getCount()); + CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, aPool.getCountIgnoreCase()); // Again. pStr2.reset(); aPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(1), aPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(2+extraCount, aPool.getCount()); + CPPUNIT_ASSERT_EQUAL(1+extraCountIgnoreCase, aPool.getCountIgnoreCase()); // Delete 'Bruce' and purge. pStr4.reset(); aPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(0), aPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(0), aPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(extraCount, aPool.getCount()); + CPPUNIT_ASSERT_EQUAL(extraCountIgnoreCase, aPool.getCountIgnoreCase()); } void Test::testSharedStringPoolPurgeBug1() @@ -421,11 +435,26 @@ // purge() would de-reference a dangling pointer and consequently cause an ASAN failure. SvtSysLocale aSysLocale; svl::SharedStringPool aPool(aSysLocale.GetCharClass()); + size_t extraCount = aPool.getCount(); // internal items such as SharedString::getEmptyString() + size_t extraCountIgnoreCase = aPool.getCountIgnoreCase(); aPool.intern("Andy"); aPool.intern("andy"); aPool.purge(); - CPPUNIT_ASSERT_EQUAL(static_cast(0), aPool.getCount()); - CPPUNIT_ASSERT_EQUAL(static_cast(0), aPool.getCountIgnoreCase()); + CPPUNIT_ASSERT_EQUAL(extraCount, aPool.getCount()); + CPPUNIT_ASSERT_EQUAL(extraCountIgnoreCase, aPool.getCountIgnoreCase()); +} + +void Test::testSharedStringPoolEmptyString() +{ + // Make sure SharedString::getEmptyString() is in the pool and matches empty strings. + SvtSysLocale aSysLocale; + svl::SharedStringPool aPool(aSysLocale.GetCharClass()); + aPool.intern(""); + CPPUNIT_ASSERT_EQUAL(SharedString::getEmptyString(), aPool.intern("")); + CPPUNIT_ASSERT_EQUAL(SharedString::getEmptyString(), aPool.intern(OUString())); + // And it should still work even after purging. + aPool.purge(); + CPPUNIT_ASSERT_EQUAL(SharedString::getEmptyString(), aPool.intern(OUString())); } void Test::checkPreviewString(SvNumberFormatter& aFormatter, diff -Nru libreoffice-7.4.1~rc2/svl/source/misc/sharedstringpool.cxx libreoffice-7.4.2~rc3/svl/source/misc/sharedstringpool.cxx --- libreoffice-7.4.1~rc2/svl/source/misc/sharedstringpool.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svl/source/misc/sharedstringpool.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -70,6 +70,9 @@ SharedStringPool::SharedStringPool(const CharClass& rCharClass) : mpImpl(new Impl(rCharClass)) { + // make sure the one empty string instance is shared in this pool as well + intern(OUString()); + assert(intern(OUString()) == SharedString::getEmptyString()); } SharedStringPool::~SharedStringPool() {} Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/svx/qa/unit/data/video-snapshot.pptx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/svx/qa/unit/data/video-snapshot.pptx differ diff -Nru libreoffice-7.4.1~rc2/svx/qa/unit/svdraw.cxx libreoffice-7.4.2~rc3/svx/qa/unit/svdraw.cxx --- libreoffice-7.4.1~rc2/svx/qa/unit/svdraw.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/qa/unit/svdraw.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -483,6 +484,34 @@ // The first light is harsh, the second light soft. So the 3D scene should have 6 lights (1+1+4). assertXPath(pXmlDoc, "//light", 6); } + +CPPUNIT_TEST_FIXTURE(SvdrawTest, testVideoSnapshot) +{ + // Given a slide with a media shape, containing a 4 sec video, red-green-blue-black being the 4 + // seconds: + OUString aURL = m_directories.getURLFromSrc(u"svx/qa/unit/data/video-snapshot.pptx"); + mxComponent = loadFromDesktop(aURL, "com.sun.star.presentation.PresentationDocument"); + SdrPage* pSdrPage = getFirstDrawPageWithAssert(); + auto pSdrMediaObj = dynamic_cast(pSdrPage->GetObj(0)); + + // When getting the red snapshot of the video: + Graphic aSnapshot(pSdrMediaObj->getSnapshot()); + + // Then make sure the color is correct: + const BitmapEx& rBitmap = aSnapshot.GetBitmapExRef(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: rgba[ff0000ff] + // - Actual : rgba[000000ff] + // i.e. the preview was black, not ~red; since we seeked 3 secs into the video, while PowerPoint + // doesn't do that. + CPPUNIT_ASSERT_EQUAL(Color(0xfe, 0x0, 0x0), rBitmap.GetPixelColor(0, 0)); + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 321 + // - Actual : 640 + // i.e. ~25% crop from left and right should result in half width, but it was not reduced. + CPPUNIT_ASSERT_EQUAL(static_cast(321), rBitmap.GetSizePixel().getWidth()); +} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-7.4.1~rc2/svx/source/dialog/fntctrl.cxx libreoffice-7.4.2~rc3/svx/source/dialog/fntctrl.cxx --- libreoffice-7.4.1~rc2/svx/source/dialog/fntctrl.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/dialog/fntctrl.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -122,18 +122,11 @@ * removes line feeds and carriage returns from string * returns if param is empty */ -bool CleanAndCheckEmpty(OUString& rText) +OUString removeCRLF(const OUString& rText) { - bool bEmpty = true; - for (sal_Int32 i = 0; i < rText.getLength(); ++i) - { - if (0xa == rText[i] || 0xd == rText[i]) - rText = rText.replaceAt(i, 1, u" "); - else - bEmpty = false; - } - return bEmpty; + return rText.replace(0xa, ' ').replace(0xd, ' ').trim(); } + } // end anonymous namespace class FontPrevWin_Impl @@ -635,9 +628,9 @@ if (pSh && !pImpl->mbGetSelection && !pImpl->mbUseFontNameAsText) { - pImpl->maText = pSh->GetSelectionText(); + pImpl->maText = removeCRLF(pSh->GetSelectionText(/*bCompleteWords*/false, /*bOnlyASample*/true)); pImpl->mbGetSelection = true; - pImpl->mbSelection = !CleanAndCheckEmpty(pImpl->maText); + pImpl->mbSelection = !(pImpl->maText.isEmpty()); } if (!pImpl->mbSelection || pImpl->mbUseFontNameAsText) @@ -670,9 +663,7 @@ pImpl->maText = makeRepresentativeTextForFont(LATIN, rFont); } - bool bEmpty = CleanAndCheckEmpty(pImpl->maText); - if (bEmpty) - pImpl->maText = OUString(); + pImpl->maText = removeCRLF(pImpl->maText); if (pImpl->maText.getLength() > (TEXT_WIDTH - 1)) { diff -Nru libreoffice-7.4.1~rc2/svx/source/dialog/weldeditview.cxx libreoffice-7.4.2~rc3/svx/source/dialog/weldeditview.cxx --- libreoffice-7.4.1~rc2/svx/source/dialog/weldeditview.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/dialog/weldeditview.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -161,13 +161,6 @@ void WeldEditView::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - Color aBgColor = rStyleSettings.GetWindowColor(); - - rRenderContext.SetBackground(aBgColor); - if (EditView* pEditView = GetEditView()) - pEditView->SetBackgroundColor(aBgColor); - DoPaint(rRenderContext, rRect); } diff -Nru libreoffice-7.4.1~rc2/svx/source/sidebar/area/AreaPropertyPanelBase.cxx libreoffice-7.4.2~rc3/svx/source/sidebar/area/AreaPropertyPanelBase.cxx --- libreoffice-7.4.1~rc2/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -466,26 +466,63 @@ mxMTRAngle->set_sensitive(true); mxLbFillAttr->clear(); - const SvxGradientListItem* pItem = pSh->GetItem(SID_GRADIENT_LIST); - - if (0 < pItem->GetGradientList()->Count()) + if (bUpdateModel) { - const XGradient aGradient = pItem->GetGradientList()->GetGradient(0)->GetGradient(); - const OUString aName = pItem->GetGradientList()->GetGradient(0)->GetName(); - const XFillGradientItem aXFillGradientItem(aName, aGradient); + mxLbFillAttr->hide(); + mxToolBoxColor->hide(); + mxBmpImport->hide(); - // #i122676# change FillStyle and Gradient in one call - if (bUpdateModel) + const SvxGradientListItem* pItem = pSh->GetItem(SID_GRADIENT_LIST); + if (pItem->GetGradientList()->Count() > 0) { + const XGradient aGradient + = pItem->GetGradientList()->GetGradient(0)->GetGradient(); + const OUString aName = pItem->GetGradientList()->GetGradient(0)->GetName(); + const XFillGradientItem aXFillGradientItem(aName, aGradient); + + // #i122676# change FillStyle and Gradient in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_GRADIENT); setFillStyleAndGradient(&aXFillStyleItem, aXFillGradientItem); - } - mxLbFillGradFrom->SelectEntry(aGradient.GetStartColor()); - mxLbFillGradTo->SelectEntry(aGradient.GetEndColor()); + mxLbFillGradFrom->SelectEntry(aGradient.GetStartColor()); + mxLbFillGradTo->SelectEntry(aGradient.GetEndColor()); - mxMTRAngle->set_value(toDegrees(aGradient.GetAngle()), FieldUnit::DEGREE); - css::awt::GradientStyle eXGS = aGradient.GetGradientStyle(); - mxGradientStyle->set_active(sal::static_int_cast(eXGS)); + mxMTRAngle->set_value(toDegrees(aGradient.GetAngle()), FieldUnit::DEGREE); + css::awt::GradientStyle eXGS = aGradient.GetGradientStyle(); + mxGradientStyle->set_active(sal::static_int_cast(eXGS)); + } + } + else + { + if (pSh && pSh->GetItem(SID_GRADIENT_LIST)) + { + SvxFillAttrBox::Fill(*mxLbFillAttr, + pSh->GetItem(SID_GRADIENT_LIST)->GetGradientList()); + mxLbFillGradTo->SetNoSelection(); + mxLbFillGradFrom->SetNoSelection(); + if (mpFillGradientItem) + { + const OUString aString(mpFillGradientItem->GetName()); + mxLbFillAttr->set_active_text(aString); + const XGradient aGradient = mpFillGradientItem->GetGradientValue(); + mxLbFillGradFrom->SelectEntry(aGradient.GetStartColor()); + mxLbFillGradTo->SelectEntry(aGradient.GetEndColor()); + mxGradientStyle->set_active( + sal::static_int_cast(aGradient.GetGradientStyle())); + if (mxGradientStyle->get_active() == sal_Int32(GradientStyle::Radial)) + mxMTRAngle->set_sensitive(false); + else + mxMTRAngle->set_value(toDegrees(aGradient.GetAngle()), + FieldUnit::DEGREE); + } + else + { + mxLbFillAttr->set_active(-1); + } + } + else + { + mxLbFillAttr->set_active(-1); + } } break; } diff -Nru libreoffice-7.4.1~rc2/svx/source/sidebar/area/AreaPropertyPanel.cxx libreoffice-7.4.2~rc3/svx/source/sidebar/area/AreaPropertyPanel.cxx --- libreoffice-7.4.1~rc2/svx/source/sidebar/area/AreaPropertyPanel.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/sidebar/area/AreaPropertyPanel.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -90,9 +90,19 @@ void AreaPropertyPanel::setFillUseBackground(const XFillStyleItem* pStyleItem, const XFillUseSlideBackgroundItem& rItem) { - GetBindings()->GetDispatcher()->ExecuteList( - SID_ATTR_FILL_USE_SLIDE_BACKGROUND, SfxCallMode::RECORD, - std::initializer_list{ &rItem, pStyleItem }); + const SfxPoolItem* pItem = nullptr; + auto pDispatcher = GetBindings()->GetDispatcher(); + auto state = pDispatcher->QueryState(SID_ATTR_FILL_USE_SLIDE_BACKGROUND, pItem); + // FillUseSlideBackground is only available in Impress + if (state == SfxItemState::DISABLED) + { + setFillStyle(*pStyleItem); + } + else + { + pDispatcher->ExecuteList(SID_ATTR_FILL_USE_SLIDE_BACKGROUND, SfxCallMode::RECORD, + std::initializer_list{ &rItem, pStyleItem }); + } } void AreaPropertyPanel::setFillFloatTransparence(const XFillFloatTransparenceItem& rItem) diff -Nru libreoffice-7.4.1~rc2/svx/source/svdraw/svdomedia.cxx libreoffice-7.4.2~rc3/svx/source/svdraw/svdomedia.cxx --- libreoffice-7.4.1~rc2/svx/source/svdraw/svdomedia.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/svdraw/svdomedia.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -21,6 +21,8 @@ #include +#include + #include #include @@ -151,6 +153,29 @@ #if HAVE_FEATURE_AVMEDIA if( !m_xImpl->m_xCachedSnapshot.is() ) { + Graphic aGraphic = m_xImpl->m_MediaProperties.getGraphic(); + if (!aGraphic.IsNone()) + { + Size aPref = aGraphic.GetPrefSize(); + Size aPixel = aGraphic.GetSizePixel(); + const text::GraphicCrop& rCrop = m_xImpl->m_MediaProperties.getCrop(); + if (rCrop.Bottom > 0 || rCrop.Left > 0 || rCrop.Right > 0 || rCrop.Top > 0) + { + tools::Long nLeft = aPixel.getWidth() * rCrop.Left / aPref.getWidth(); + tools::Long nTop = aPixel.getHeight() * rCrop.Top / aPref.getHeight(); + tools::Long nRight = aPixel.getWidth() * rCrop.Right / aPref.getWidth(); + tools::Long nBottom = aPixel.getHeight() * rCrop.Bottom / aPref.getHeight(); + BitmapEx aBitmapEx = aGraphic.GetBitmapEx(); + aBitmapEx.Crop({nLeft, nTop, aPixel.getWidth() - nRight, aPixel.getHeight() - nBottom}); + aGraphic = aBitmapEx; + } + + // We have an explicit graphic for this media object, then go with that instead of + // generating our own one. + m_xImpl->m_xCachedSnapshot = aGraphic.GetXGraphic(); + return m_xImpl->m_xCachedSnapshot; + } + OUString aRealURL = m_xImpl->m_MediaProperties.getTempURL(); if( aRealURL.isEmpty() ) aRealURL = m_xImpl->m_MediaProperties.getURL(); @@ -354,6 +379,11 @@ m_xImpl->m_MediaProperties.setGraphic(rNewProperties.getGraphic()); } + if (nMaskSet & AVMediaSetMask::CROP) + { + m_xImpl->m_MediaProperties.setCrop(rNewProperties.getCrop()); + } + if( ( AVMediaSetMask::URL & nMaskSet ) && ( rNewProperties.getURL() != getURL() )) { diff -Nru libreoffice-7.4.1~rc2/svx/source/svdraw/svdoole2.cxx libreoffice-7.4.2~rc3/svx/source/svdraw/svdoole2.cxx --- libreoffice-7.4.1~rc2/svx/source/svdraw/svdoole2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/svdraw/svdoole2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1470,8 +1470,10 @@ // objects' visual area. The scaling will not change, but it might exist already and must // be used in calculations MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( mpImpl->mxObjRef->getMapUnit( GetAspect() ) ); - Size aVisSize( static_cast( Fraction( maRect.GetWidth() ) / aScaleWidth ), - static_cast( Fraction( maRect.GetHeight() ) / aScaleHeight ) ); + Size aVisSize; + if (sal_Int32(aScaleWidth) != 0 && sal_Int32(aScaleHeight) != 0) // avoid div by zero + aVisSize = Size( static_cast( Fraction( maRect.GetWidth() ) / aScaleWidth ), + static_cast( Fraction( maRect.GetHeight() ) / aScaleHeight ) ); aVisSize = OutputDevice::LogicToLogic( aVisSize, diff -Nru libreoffice-7.4.1~rc2/svx/source/table/svdotable.cxx libreoffice-7.4.2~rc3/svx/source/table/svdotable.cxx --- libreoffice-7.4.1~rc2/svx/source/table/svdotable.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/table/svdotable.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -2393,6 +2393,18 @@ mpImpl->CropTableModelToSelection(rStart, rEnd); } +sal_Int32 SdrTableObj::getHeightWithoutFitting() +{ + tools::Rectangle aRect{}; + if( mpImpl.is() && mpImpl->mpLayouter) + { + mpImpl->mpLayouter->LayoutTableHeight(aRect, /*bFit=*/false); + return aRect.GetHeight(); + } + else + return 0; +} + void SdrTableObj::DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColumn, const bool bOptimize, const bool bMinimize ) { if( mpImpl.is() && mpImpl->mpLayouter ) diff -Nru libreoffice-7.4.1~rc2/svx/source/table/tablelayouter.cxx libreoffice-7.4.2~rc3/svx/source/table/tablelayouter.cxx --- libreoffice-7.4.1~rc2/svx/source/table/tablelayouter.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/table/tablelayouter.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -742,14 +742,9 @@ sal_Int32 nCol, nRow; for( nRow = 0; nRow < nRowCount; ++nRow ) { - Reference< XPropertySet > xRowSet( xRows->getByIndex(nRow), UNO_QUERY_THROW ); - sal_Int32 nRowPropHeight = 0; - xRowSet->getPropertyValue( gsSize ) >>= nRowPropHeight; sal_Int32 nMinHeight = 0; bool bIsEmpty = true; // check if all cells in this row are merged - bool bRowHasText = false; - bool bRowHasCellInEditMode = false; for( nCol = 0; nCol < nColCount; ++nCol ) { @@ -766,39 +761,7 @@ } else { - // WARNING: tdf#144092 / tdf#139511 suggest this entire section is invalid. - // Empty cells should not be ignored in regards to row height, - // especially MS formats, despite this code being added to import MS files... - // The problem is getMinimumHeight can give wrong values for empty cells. - - bool bCellHasText = xCell->hasText(); - bool bCellInEditMode = xCell->IsTextEditActive(); - - if (!bRowHasCellInEditMode && bCellInEditMode) - bRowHasCellInEditMode = true; - - if ((bRowHasText == bCellHasText) || (bRowHasText && bCellInEditMode)) - { - nMinHeight = std::max( nMinHeight, xCell->getMinimumHeight() ); - } - else if ( !bRowHasText && bCellHasText ) - { - bRowHasText = true; - nMinHeight = xCell->getMinimumHeight(); - } - - // tdf#137949 We should consider "Height" property while calculating minimum height. - // This control decides when we use "Height" property value instead of calculated minimum height - // Case 1: * Row has "Height" property - // * Calculated minimum height is smaller than Height property value. - // Case 2: * Row has "Height" property - // * Calculated minimum height is bigger than Height property value and - // * Row has not any text of any cell in edit mode in the row (means completely empty) - if ((nMinHeight < nRowPropHeight && nRowPropHeight > 0 && (bRowHasText || bRowHasCellInEditMode)) || - (nMinHeight > nRowPropHeight && nRowPropHeight > 0 && (!bRowHasText && !bRowHasCellInEditMode))) - { - nMinHeight = nRowPropHeight; - } + nMinHeight = std::max( nMinHeight, xCell->getMinimumHeight() ); } } } @@ -812,6 +775,7 @@ else { sal_Int32 nRowHeight = 0; + Reference xRowSet(xRows->getByIndex(nRow), UNO_QUERY_THROW); bool bOptimal = false; xRowSet->getPropertyValue( sOptimalSize ) >>= bOptimal; diff -Nru libreoffice-7.4.1~rc2/svx/source/table/tablelayouter.hxx libreoffice-7.4.2~rc3/svx/source/table/tablelayouter.hxx --- libreoffice-7.4.1~rc2/svx/source/table/tablelayouter.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/table/tablelayouter.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -123,13 +123,13 @@ const bool bMinimize ); void dumpAsXml(xmlTextWriterPtr pWriter) const; + void LayoutTableWidth(::tools::Rectangle& rArea, bool bFit); + void LayoutTableHeight(::tools::Rectangle& rArea, bool bFit); + private: CellRef getCell( const CellPos& rPos ) const; basegfx::B2ITuple getCellSize( const CellRef& xCell, const CellPos& rPos ) const; - void LayoutTableWidth( ::tools::Rectangle& rArea, bool bFit ); - void LayoutTableHeight( ::tools::Rectangle& rArea, bool bFit ); - bool isValidColumn( sal_Int32 nColumn ) const { return (nColumn >= 0) && (o3tl::make_unsigned(nColumn) < maColumns.size()); } bool isValidRow( sal_Int32 nRow ) const { return (nRow >= 0) && (o3tl::make_unsigned(nRow) < maRows.size()); } bool isValid( const CellPos& rPos ) const { return isValidColumn( rPos.mnCol ) && isValidRow( rPos.mnRow ); } diff -Nru libreoffice-7.4.1~rc2/svx/source/unodraw/unoprov.cxx libreoffice-7.4.2~rc3/svx/source/unodraw/unoprov.cxx --- libreoffice-7.4.1~rc2/svx/source/unodraw/unoprov.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/unodraw/unoprov.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -736,6 +736,7 @@ { u"MediaMimeType", OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType::get(), 0, 0}, { u"FallbackGraphic", OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_GRAPHOBJ_GRAPHIC, OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType::get(), 0, 0}, + { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP , cppu::UnoType::get(), 0, 0}, { u"", 0, css::uno::Type(), 0, 0 } }; diff -Nru libreoffice-7.4.1~rc2/svx/source/unodraw/unoshap4.cxx libreoffice-7.4.2~rc3/svx/source/unodraw/unoshap4.cxx --- libreoffice-7.4.1~rc2/svx/source/unodraw/unoshap4.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/unodraw/unoshap4.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -783,7 +783,8 @@ if( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) || (pProperty->nWID == OWN_ATTR_MEDIA_STREAM) || (pProperty->nWID == OWN_ATTR_MEDIA_MIMETYPE) - || (pProperty->nWID == OWN_ATTR_VALUE_GRAPHIC)) + || (pProperty->nWID == OWN_ATTR_VALUE_GRAPHIC) + || (pProperty->nWID == SDRATTR_GRAFCROP)) { #if HAVE_FEATURE_AVMEDIA SdrMediaObj* pMedia = static_cast< SdrMediaObj* >( GetSdrObject() ); @@ -888,6 +889,19 @@ #endif break; + case SDRATTR_GRAFCROP: +#if HAVE_FEATURE_AVMEDIA + { + text::GraphicCrop aCrop; + if (rValue >>= aCrop) + { + bOk = true; + aItem.setCrop(aCrop); + } + } +#endif + break; + case OWN_ATTR_MEDIA_STREAM: #if HAVE_FEATURE_AVMEDIA try @@ -946,7 +960,8 @@ || (pProperty->nWID == OWN_ATTR_MEDIA_TEMPFILEURL) || (pProperty->nWID == OWN_ATTR_MEDIA_MIMETYPE) || (pProperty->nWID == OWN_ATTR_FALLBACK_GRAPHIC) - || (pProperty->nWID == OWN_ATTR_VALUE_GRAPHIC)) + || (pProperty->nWID == OWN_ATTR_VALUE_GRAPHIC) + || (pProperty->nWID == SDRATTR_GRAFCROP)) { SdrMediaObj* pMedia = static_cast< SdrMediaObj* >( GetSdrObject() ); #if HAVE_FEATURE_AVMEDIA @@ -1031,6 +1046,15 @@ #endif break; + case SDRATTR_GRAFCROP: +#if HAVE_FEATURE_AVMEDIA + { + text::GraphicCrop aCrop = aItem.getCrop(); + rValue <<= aCrop; + } +#endif + break; + case OWN_ATTR_FALLBACK_GRAPHIC: rValue <<= pMedia->getSnapshot(); break; @@ -1046,4 +1070,29 @@ } } +bool SvxMediaShape::getPropertyStateImpl(const SfxItemPropertyMapEntry* pProperty, + css::beans::PropertyState& rState) +{ +#if HAVE_FEATURE_AVMEDIA + if (pProperty->nWID == SDRATTR_GRAFCROP) + { + auto pMedia = static_cast(GetSdrObject()); + const avmedia::MediaItem& rItem = pMedia->getMediaProperties(); + const text::GraphicCrop& rCrop = rItem.getCrop(); + if (rCrop.Bottom > 0 || rCrop.Left > 0 || rCrop.Right > 0 || rCrop.Top > 0) + { + // The media has a crop, expose it to UNO-based export filters. + rState = beans::PropertyState_DIRECT_VALUE; + } + else + { + rState = beans::PropertyState_AMBIGUOUS_VALUE; + } + return true; + } +#endif + + return SvxShape::getPropertyStateImpl(pProperty, rState); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-7.4.1~rc2/svx/source/unodraw/unoshape.cxx libreoffice-7.4.2~rc3/svx/source/unodraw/unoshape.cxx --- libreoffice-7.4.1~rc2/svx/source/unodraw/unoshape.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/svx/source/unodraw/unoshape.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -971,14 +971,13 @@ // do cheap checks first, this method is hot if (rHint.GetId() != SfxHintId::ThisIsAnSdrHint) return; - const SdrHint* pSdrHint = static_cast(&rHint); - if (pSdrHint->GetKind() != SdrHintKind::ModelCleared && - pSdrHint->GetKind() != SdrHintKind::ObjectChange) + SdrObject* pSdrObject(mpSdrObjectWeakReference.get()); + if( !pSdrObject ) return; - + const SdrHint* pSdrHint = static_cast(&rHint); // #i55919# SdrHintKind::ObjectChange is only interesting if it's for this object - SdrObject* pSdrObject(GetSdrObject()); - if ( !pSdrObject || pSdrHint->GetObject() != pSdrObject ) + if ((pSdrHint->GetKind() != SdrHintKind::ModelCleared) && + (pSdrHint->GetKind() != SdrHintKind::ObjectChange || pSdrHint->GetObject() != pSdrObject )) return; uno::Reference< uno::XInterface > xSelf( pSdrObject->getWeakUnoShape() ); diff -Nru libreoffice-7.4.1~rc2/sw/CppunitTest_sw_filter_html.mk libreoffice-7.4.2~rc3/sw/CppunitTest_sw_filter_html.mk --- libreoffice-7.4.1~rc2/sw/CppunitTest_sw_filter_html.mk 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/CppunitTest_sw_filter_html.mk 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,75 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,sw_filter_html)) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_filter_html)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_filter_html, \ + sw/qa/filter/html/html \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sw_filter_html, \ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + sal \ + sfx \ + svl \ + svx \ + svxcore \ + sw \ + swqahelper \ + test \ + unotest \ + utl \ + vcl \ + tl \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_filter_html,\ + boost_headers \ + libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_filter_html,\ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/uibase/inc \ + -I$(SRCDIR)/sw/qa/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_filter_html,\ + udkapi \ + offapi \ + oovbaapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_filter_html)) +$(eval $(call gb_CppunitTest_use_vcl,sw_filter_html)) + +$(eval $(call gb_CppunitTest_use_rdb,sw_filter_html,services)) + +$(eval $(call gb_CppunitTest_use_custom_headers,sw_filter_html,\ + officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_filter_html)) + +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_filter_html, \ + modules/swriter \ +)) + +$(eval $(call gb_CppunitTest_use_more_fonts,sw_filter_html)) + +# vim: set noet sw=4 ts=4: diff -Nru libreoffice-7.4.1~rc2/sw/inc/charfmt.hxx libreoffice-7.4.2~rc3/sw/inc/charfmt.hxx --- libreoffice-7.4.1~rc2/sw/inc/charfmt.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/inc/charfmt.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -36,10 +36,11 @@ {} public: + ~SwCharFormat(); void dumpAsXml(xmlTextWriterPtr pWriter) const; - void SetLinkedParaFormat(SwTextFormatColl& rLink); + void SetLinkedParaFormat(SwTextFormatColl* pLink); const SwTextFormatColl* GetLinkedParaFormat() const; }; diff -Nru libreoffice-7.4.1~rc2/sw/inc/doc.hxx libreoffice-7.4.2~rc3/sw/inc/doc.hxx --- libreoffice-7.4.1~rc2/sw/inc/doc.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/inc/doc.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -1489,7 +1489,9 @@ static bool GetRowBackground( const SwCursor& rCursor, std::unique_ptr& rToFill ); /// rNotTracked = false means that the row was deleted or inserted with its tracked cell content /// bAll: delete all table rows without selection - void SetRowNotTracked( const SwCursor& rCursor, const SvxPrintItem &rNotTracked, bool bAll = false ); + /// bIns: insert table row + void SetRowNotTracked( const SwCursor& rCursor, + const SvxPrintItem &rNotTracked, bool bAll = false, bool bIns = false ); /// don't call SetRowNotTracked() for rows with tracked row change static bool HasRowNotTracked( const SwCursor& rCursor ); void SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ); diff -Nru libreoffice-7.4.1~rc2/sw/inc/fmtcol.hxx libreoffice-7.4.2~rc3/sw/inc/fmtcol.hxx --- libreoffice-7.4.1~rc2/sw/inc/fmtcol.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/inc/fmtcol.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -103,7 +103,7 @@ inline void SetNextTextFormatColl(SwTextFormatColl& rNext); SwTextFormatColl& GetNextTextFormatColl() const { return *mpNextTextFormatColl; } - void SetLinkedCharFormat(SwCharFormat& rLink); + void SetLinkedCharFormat(SwCharFormat* pLink); const SwCharFormat* GetLinkedCharFormat() const; diff -Nru libreoffice-7.4.1~rc2/sw/inc/unoredline.hxx libreoffice-7.4.2~rc3/sw/inc/unoredline.hxx --- libreoffice-7.4.1~rc2/sw/inc/unoredline.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/inc/unoredline.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -39,6 +39,9 @@ SwNodeIndex m_aNodeIndex; virtual const SwStartNode *GetStartNode() const override; + virtual css::uno::Reference< css::text::XTextCursor > + CreateCursor() override; + public: SwXRedlineText(SwDoc* pDoc, const SwNodeIndex& aNodeIndex); diff -Nru libreoffice-7.4.1~rc2/sw/inc/view.hxx libreoffice-7.4.2~rc3/sw/inc/view.hxx --- libreoffice-7.4.1~rc2/sw/inc/view.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/inc/view.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -397,7 +397,7 @@ OUString GetSelectionTextParam( bool bCompleteWords, bool bEraseTrail ); virtual bool HasSelection( bool bText = true ) const override; - virtual OUString GetSelectionText( bool bCompleteWords = false ) override; + virtual OUString GetSelectionText( bool bCompleteWords = false, bool bOnlyASample = false ) override; virtual bool PrepareClose( bool bUI = true ) override; virtual void MarginChanged() override; diff -Nru libreoffice-7.4.1~rc2/sw/Module_sw.mk libreoffice-7.4.2~rc3/sw/Module_sw.mk --- libreoffice-7.4.1~rc2/sw/Module_sw.mk 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/Module_sw.mk 2022-10-10 10:15:14.000000000 +0000 @@ -149,6 +149,7 @@ CppunitTest_sw_core_view \ CppunitTest_sw_core_attr \ CppunitTest_sw_filter_ww8 \ + CppunitTest_sw_filter_html \ )) ifneq ($(DISABLE_GUI),TRUE) diff -Nru libreoffice-7.4.1~rc2/sw/qa/core/doc/doc.cxx libreoffice-7.4.2~rc3/sw/qa/core/doc/doc.cxx --- libreoffice-7.4.1~rc2/sw/qa/core/doc/doc.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/core/doc/doc.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -255,6 +256,35 @@ CPPUNIT_ASSERT_EQUAL(OUString("\x0001test\x0001"), pTextNode->GetText()); } +CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testLinkedStyleDelete) +{ + // Given a document with linked styles: myparastyle is linked to mycharstyle and vica versa: + createSwDoc(); + uno::Reference xFactory(mxComponent, uno::UNO_QUERY); + uno::Reference xParaStyle( + xFactory->createInstance("com.sun.star.style.ParagraphStyle"), uno::UNO_QUERY); + uno::Reference xCharStyle( + xFactory->createInstance("com.sun.star.style.CharacterStyle"), uno::UNO_QUERY); + uno::Reference xParaStyles(getStyles("ParagraphStyles"), + uno::UNO_QUERY); + xParaStyles->insertByName("myparastyle", uno::Any(xParaStyle)); + uno::Reference xCharStyles(getStyles("CharacterStyles"), + uno::UNO_QUERY); + xCharStyles->insertByName("mycharstyle", uno::Any(xCharStyle)); + xParaStyle->setPropertyValue("LinkStyle", uno::Any(OUString("mycharstyle"))); + xCharStyle->setPropertyValue("LinkStyle", uno::Any(OUString("myparastyle"))); + + // When deleting the paragraph style (and only that): + xParaStyles->removeByName("myparastyle"); + + // Then make sure we don't crash on save: + uno::Reference xStorable(mxComponent, uno::UNO_QUERY); + uno::Sequence aArgs = { + comphelper::makePropertyValue("FilterName", OUString("writer8")), + }; + xStorable->storeAsURL(maTempFile.GetURL(), aArgs); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sw/qa/extras/htmlexport/data/paint-ole-bitmap-format.odt and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sw/qa/extras/htmlexport/data/paint-ole-bitmap-format.odt differ diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/htmlexport/htmlexport.cxx libreoffice-7.4.2~rc3/sw/qa/extras/htmlexport/htmlexport.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/htmlexport/htmlexport.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/htmlexport/htmlexport.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -1310,6 +1311,38 @@ CPPUNIT_ASSERT_EQUAL(OString("PBrush"), aClassName); } +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifOle1PaintBitmapFormat) +{ + // Given a document with a 8bpp bitmap: + OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "paint-ole-bitmap-format.odt"; + mxComponent = loadFromDesktop(aURL, "com.sun.star.text.TextDocument", {}); + + // When exporting to reqif-xhtml with ExportImagesAsOLE enabled: + uno::Reference xStorable(mxComponent, uno::UNO_QUERY); + uno::Sequence aStoreProperties = { + comphelper::makePropertyValue("FilterName", OUString("HTML (StarWriter)")), + comphelper::makePropertyValue("FilterOptions", OUString("xhtmlns=reqif-xhtml")), + comphelper::makePropertyValue("ExportImagesAsOLE", true), + }; + xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties); + + // Then make sure the resulting bitmap is 24bpp: + OUString aRtfUrl = GetOlePath(); + SvMemoryStream aOle1; + ParseOle1FromRtfUrl(aRtfUrl, aOle1); + OLE1Reader aOle1Reader(aOle1); + Bitmap aBitmap; + SvMemoryStream aMemory; + aMemory.WriteBytes(aOle1Reader.m_aNativeData.data(), aOle1Reader.m_aNativeData.size()); + aMemory.Seek(0); + CPPUNIT_ASSERT(ReadDIB(aBitmap, aMemory, true)); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 24 + // - Actual : 8 + // i.e. it was not a pixel format ms paint could handle in OLE mode. + CPPUNIT_ASSERT_EQUAL(vcl::PixelFormat::N24_BPP, aBitmap.getPixelFormat()); +} + CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testMultiParaListItem) { // Create a document with 3 list items: A, B&C and D. @@ -2392,6 +2425,63 @@ assertXPath(pXmlDoc, "//reqif-xhtml:div[@id='mysect']", "style", "dir: ltr"); } +CPPUNIT_TEST_FIXTURE(HtmlExportTest, testTdf114769) +{ + // Create document from scratch since relative urls to filesystem can be replaced + // by absolute during save/load + SwDoc* pDoc = createSwDoc(); + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + pWrtShell->Insert("Hyperlink1"); + pWrtShell->SplitNode(); + pWrtShell->Insert("Hyperlink2"); + pWrtShell->SplitNode(); + pWrtShell->Insert("Hyperlink3"); + pWrtShell->SplitNode(); + pWrtShell->Insert("Hyperlink4"); + pWrtShell->SplitNode(); + pWrtShell->Insert("Hyperlink5"); + pWrtShell->SplitNode(); + + // Normal external URL + uno::Reference xRun(getRun(getParagraph(1), 1), uno::UNO_QUERY); + xRun->setPropertyValue("HyperLinkURL", uno::Any(OUString("http://libreoffice.org/"))); + + // Bookmark reference + xRun.set(getRun(getParagraph(2), 1), uno::UNO_QUERY); + xRun->setPropertyValue("HyperLinkURL", uno::Any(OUString("#some_bookmark"))); + + // Filesystem absolute link + xRun.set(getRun(getParagraph(3), 1), uno::UNO_QUERY); + xRun->setPropertyValue("HyperLinkURL", uno::Any(OUString("C:\\test.txt"))); + + // Filesystem relative link + xRun.set(getRun(getParagraph(4), 1), uno::UNO_QUERY); + xRun->setPropertyValue("HyperLinkURL", uno::Any(OUString("..\\..\\test.odt"))); + + // Filesystem relative link + xRun.set(getRun(getParagraph(5), 1), uno::UNO_QUERY); + xRun->setPropertyValue("HyperLinkURL", uno::Any(OUString(".\\another.odt"))); + + // Export + uno::Reference xStorable(mxComponent, uno::UNO_QUERY); + uno::Sequence aStoreProperties + = { comphelper::makePropertyValue("FilterName", OUString("HTML (StarWriter)")) }; + xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties); + + htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); + CPPUNIT_ASSERT(pHtmlDoc); + + CPPUNIT_ASSERT_EQUAL(OUString("http://libreoffice.org/"), + getXPath(pHtmlDoc, "/html/body/p[1]/a", "href")); + CPPUNIT_ASSERT_EQUAL(OUString("#some_bookmark"), + getXPath(pHtmlDoc, "/html/body/p[2]/a", "href")); + CPPUNIT_ASSERT_EQUAL(OUString("C:\\test.txt"), getXPath(pHtmlDoc, "/html/body/p[3]/a", "href")); + CPPUNIT_ASSERT_EQUAL(OUString("..\\..\\test.odt"), + getXPath(pHtmlDoc, "/html/body/p[4]/a", "href")); + CPPUNIT_ASSERT_EQUAL(OUString(".\\another.odt"), + getXPath(pHtmlDoc, "/html/body/p[5]/a", "href")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sw/qa/extras/layout/data/tdf150642.odt and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sw/qa/extras/layout/data/tdf150642.odt differ diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/layout/layout2.cxx libreoffice-7.4.2~rc3/sw/qa/extras/layout/layout2.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/layout/layout2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/layout/layout2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -2173,6 +2173,15 @@ assertXPath(pDump, "//bounds[@top<0]", 0); } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf150642) +{ + createSwDoc(DATA_DIRECTORY, "tdf150642.odt"); + auto pDump = parseLayoutDump(); + // There used to be negative values that made the cell frame invisible. + assertXPath(pDump, "//bounds[@left<0]", 0); + assertXPath(pDump, "//bounds[@right<0]", 0); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sw/qa/extras/odfexport/data/table-in-frame-in-table-in-header-base.odt and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sw/qa/extras/odfexport/data/table-in-frame-in-table-in-header-base.odt differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sw/qa/extras/odfexport/data/tdf151100.docx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sw/qa/extras/odfexport/data/tdf151100.docx differ diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/odfexport/odfexport2.cxx libreoffice-7.4.2~rc3/sw/qa/extras/odfexport/odfexport2.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/odfexport/odfexport2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/odfexport/odfexport2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -28,6 +28,20 @@ }; +CPPUNIT_TEST_FIXTURE(Test, tdf151100) +{ + // Similar to tdf135942 + + loadAndReload("tdf151100.docx"); + // All table autostyles should be collected, including nested, and must not crash. + + CPPUNIT_ASSERT_EQUAL(1, getPages()); + + xmlDocUniquePtr pXmlDoc = parseExport("styles.xml"); + + assertXPath(pXmlDoc, "/office:document-styles/office:automatic-styles/style:style[@style:family='table']", 1); +} + DECLARE_ODFEXPORT_TEST(testTdf52065_centerTabs, "testTdf52065_centerTabs.odt") { CPPUNIT_ASSERT_EQUAL(1, getPages()); diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/odfexport/odfexport.cxx libreoffice-7.4.2~rc3/sw/qa/extras/odfexport/odfexport.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/odfexport/odfexport.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/odfexport/odfexport.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -3182,6 +3182,20 @@ assertXPath(pXmlDoc, "/office:document-styles/office:automatic-styles/style:style[@style:family='table']", 2); } +CPPUNIT_TEST_FIXTURE(Test, tdf150927) +{ + // Similar to tdf135942 + + loadAndReload("table-in-frame-in-table-in-header-base.odt"); + // All table autostyles should be collected, including nested, and must not crash. + + CPPUNIT_ASSERT_EQUAL(1, getPages()); + + xmlDocUniquePtr pXmlDoc = parseExport("styles.xml"); + + assertXPath(pXmlDoc, "/office:document-styles/office:automatic-styles/style:style[@style:family='table']", 2); +} + DECLARE_ODFEXPORT_TEST(testGutterLeft, "gutter-left.odt") { CPPUNIT_ASSERT_EQUAL(1, getPages()); Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sw/qa/extras/ooxmlexport/data/cell-sdt-redline.docx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sw/qa/extras/ooxmlexport/data/cell-sdt-redline.docx differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sw/qa/extras/ooxmlexport/data/inline-sdt-header.docx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sw/qa/extras/ooxmlexport/data/inline-sdt-header.docx differ diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx libreoffice-7.4.2~rc3/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -56,6 +56,19 @@ CPPUNIT_ASSERT_EQUAL(OUString("1."), getProperty(getParagraph(1), "ListLabelString")); } +CPPUNIT_TEST_FIXTURE(Test, testInlineSdtHeader) +{ + // Without the accompanying fix in place, this test would have failed with an assertion failure, + // we produced not-well-formed XML on save. + loadAndSave("inline-sdt-header.docx"); +} + +CPPUNIT_TEST_FIXTURE(Test, testCellSdtRedline) +{ + // Without the accompanying fix in place, this test would have failed with an assertion failure, + // we produced not-well-formed XML on save. + loadAndSave("cell-sdt-redline.docx"); +} CPPUNIT_PLUGIN_IMPLEMENT(); Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sw/qa/extras/ooxmlimport/data/tdf119039_bad_embedded_compound.docx and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sw/qa/extras/ooxmlimport/data/tdf119039_bad_embedded_compound.docx differ diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx libreoffice-7.4.2~rc3/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -934,6 +934,13 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty(xRun, "CharColor")); } } + +CPPUNIT_TEST_FIXTURE(Test, testTdf119039) +{ + load(mpTestDocumentPath, "tdf119039_bad_embedded_compound.docx"); + // Should not crash/hang because of problematic embedded compound +} + // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/rtfexport/data/tdf127806.rtf libreoffice-7.4.2~rc3/sw/qa/extras/rtfexport/data/tdf127806.rtf --- libreoffice-7.4.1~rc2/sw/qa/extras/rtfexport/data/tdf127806.rtf 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/rtfexport/data/tdf127806.rtf 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,86 @@ +{\rtf1\ansi\ansicpg1252 +{\shpgrp{\*\shpinst +\shplid67 +\shpleft0\shptop21\shpright11906\shpbottom16137\shpfhdr0 +\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0 +\shpwr3\shpfblwtxt1 +{\sp{\sn groupLeft}{\sv 0}} +{\sp{\sn groupTop}{\sv 21}} +{\sp{\sn groupRight}{\sv 11906}} +{\sp{\sn groupBottom}{\sv 16137}} +{\sp{\sn fFlipH}{\sv 0}} +{\sp{\sn fFlipV}{\sv 0}} +{\sp{\sn posrelh}{\sv 1}} +{\sp{\sn posrelv}{\sv 1}} +{\sp{\sn fBehindDocument}{\sv 1}} + +{\shp{\*\shpinst\shplid70 +{\sp{\sn relLeft}{\sv 979}} +{\sp{\sn relTop}{\sv 14827}} +{\sp{\sn relRight}{\sv 10918}} +{\sp{\sn relBottom}{\sv 15176}} +{\sp{\sn fRelFlipH}{\sv 0}} +{\sp{\sn fRelFlipV}{\sv 0}} +{\sp{\sn shapeType}{\sv 0}} +{\sp{\sn rotation}{\sv 0}} +{\sp{\sn geoRight}{\sv 9939}} +{\sp{\sn geoBottom}{\sv 349}} +{\sp{\sn shapePath}{\sv 4}} +{\sp{\sn pVerticies}{\sv 8;5;(9938,0);(0,0);(0,348);(9938,348);(9938,0)}} +{\sp{\sn pSegmentInfo}{\sv 2;12;16384;45824;1;45824;1;45824;1;45824;1;45824;24577;32768}} +{\sp{\sn fFillOK}{\sv 1}} +{\sp{\sn fFilled}{\sv 1}} +{\sp{\sn fillColor}{\sv 5987168}} +{\sp{\sn fLine}{\sv 0}}{\sp{\sn lineType}{\sv 0}} +{\sp{\sn posrelh}{\sv 1}} +{\sp{\sn posrelv}{\sv 1}} +{\sp{\sn fArrowheadsOK}{\sv 1}} +{\sp{\sn fBehindDocument}{\sv 1}} +}} + +{\shp{\*\shpinst\shplid72 +{\sp{\sn relLeft}{\sv 830}} +{\sp{\sn relTop}{\sv 816}} +{\sp{\sn relRight}{\sv 1190}} +{\sp{\sn relBottom}{\sv 1156}} +{\sp{\sn pib}{\sv{\pict\picscalex500\picscaley9\piccropl0\piccropr0\piccropt0\piccropb0\picw1270\pich1243\picwgoal720\pichgoal705 +\pngblip{\*\blipuid c0d486c26efd24459c14592d8249a32b} +89504e470d0a1a0a0000000d49484452000000300000002f0806000000a58249 +c900000006624b474400ff00ff00ffa0bda793000000097048597300000ec400 +000ec401952b0e1b0000041e494441546881cd984d6c1b4514c7ff33ebf5b7e3 +943a6da2a290402528a5520f9168f9101c00b5a71e2ace9c7be28022242e1542 +e28038708023070e1c901007041c8a904088b6082808921450212d4e9438561c +3bb1d7ebddd9791ce275b7eeaee38f59dbbfd3ee7b3b6fe6bff366e6ed322282 +8bf5fb4b5764f9eb17110276310ae3a72c00a62c66e4686a87bb37246d5deefe +f0b4b2e81e9c3d0dc6af1350397800489fbbbc785740f5e7054823a9b40700d2 +62307ec902821ffc700fe8c7260bb113af7cd88a2acbdf3da7b407002401e346 +16d288a80e8df4f9b75f0580bb022adf3eafb20322a0be9481538aaa0c0b00d0 +e7a6f2d1e3173f019a0288444475fe5bb713b0d7122a43b6489f7ff7927bbd2f +c0f8f33138d5b4aa0eecad28cc9bcac2dd83968bef461f3af7a57bbf2fa0b6f4 +84aa0e9c5a383b8e4bfcd40b5f78ef3900c8da1fa754042702cc9534e0a8dd71 +5a3042e2cc1b97bda6e60ca811200a3188624c45285ff4071fd8d4b28fdcf2da +94092001d457c2c97b97f8e98b1fb7db3889bd0c356ecf0d1abc712b0532b541 +c304a311e20b8b6fb59b3999ff3e3c686ca7aaa1b1aafc10bf87c8e15499c726 +2bed764ed6fab141021301f5e50c40e1ec3a2e9199f9bffdec9c1a8309b03762 +70b6d59fb6ede8b367bff7b3730c300324586807563bd1e3173ef5b30f3403d6 +5a1cd40871e1366131483eb5f0a39faf6f01448075279c5aa79d486eb2c83927 +3f1f27bb38d54f50a7a443d6d497c97ef0c9231b813ec87a5fafb131a4b70f00 +3c91dd09f4f523409a1ca2105ec9d00e4b1e2a05f938f521c0cac743dff7bdf0 +646e2bd0d7eb0c9004acfcf0d2070078eae866a00f4e6f02c45634dc9ac7079e +9e590ff4811a3d25b37527dc9ac70f96c815837c1c2c6a751b886c06b1adab19 +550f50a37c28c8c7c1e366b781444947589f8a9d90b5c274908f8327eadd0612 +3bc37ffb004046f148908fb31e66208c7f3cdd20ebdb81d542d7294402702ac3 +291deeebdb281d0ef27168a95a37419cb23ed4c3cb8b344ab9201f67d1e9c043 +c28b1851fa008028aecd07f938d3bb1430a2050c004ea9d22185623381a5aa0b +49c019a10032c19dd2ca493f5f5733e05422801c4dfebb58ab5f5df0b377b506 +a431dcdac70f91bff6ac9f9db3f8fcea418dc90ae95f670fd8ebcba7fdec9c25 +1ffdeba0c6648f8380d2b4acdffff9cb9996ae2236fb5fa7c6648d36ff010092 +c1bcf1deebed660e003c79e266c7b663904200602e7dfe72bb8d03003b40c038 +ac0100b0f38559d92867bdb6a68093cb9d1a8e8b000806f3b7f75ff39af65368 +e249dfbf5e2e63b1069ad4af7f74c97bdf9c81c757a065f6fc1a108dc72ee422 +367673d63f9fb5d6c2be00a6393c73e6ba7f0b36b22a3488da376fbee35eb75e +2d9b387bcdef6112e3357800b05637e6c4e6d567008f003ef1d455dfa7c76ffc +003154af2c7e0000ff03fbe27bc1eb13f80b0000000049454e44ae426082}}}}} +}} + +} \ No newline at end of file diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/rtfexport/rtfexport3.cxx libreoffice-7.4.2~rc3/sw/qa/extras/rtfexport/rtfexport3.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/rtfexport/rtfexport3.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/rtfexport/rtfexport3.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -492,6 +492,29 @@ CPPUNIT_ASSERT_EQUAL(static_cast(-646), nTopBorderDistance); } +CPPUNIT_TEST_FIXTURE(Test, testTdf127806) +{ + load(mpTestDocumentPath, "tdf127806.rtf"); + CPPUNIT_ASSERT_EQUAL(2, getShapes()); + + CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GroupShape"), getShape(1)->getShapeType()); + auto xImage = getShape(2); + CPPUNIT_ASSERT_EQUAL(OUString("FrameShape"), xImage->getShapeType()); + awt::Size aSize(xImage->getSize()); + CPPUNIT_ASSERT_EQUAL(static_cast(600), aSize.Height); + CPPUNIT_ASSERT_EQUAL(static_cast(635), aSize.Width); + + reload(mpFilter, "tdf127806.rtf"); + CPPUNIT_ASSERT_EQUAL(1, getShapes()); // FIXME: We lost one shape on export, that's sucks + + xImage = getShape(1); + CPPUNIT_ASSERT_EQUAL(OUString("FrameShape"), xImage->getShapeType()); + + aSize = xImage->getSize(); + CPPUNIT_ASSERT_EQUAL(static_cast(600), aSize.Height); + CPPUNIT_ASSERT_EQUAL(static_cast(635), aSize.Width); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/rtfexport/rtfexport5.cxx libreoffice-7.4.2~rc3/sw/qa/extras/rtfexport/rtfexport5.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/rtfexport/rtfexport5.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/rtfexport/rtfexport5.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -840,18 +841,11 @@ uno::Reference xModel(mxComponent, uno::UNO_QUERY); uno::Reference xSupplier(xModel, uno::UNO_QUERY); uno::Reference xTextFieldMasters = xSupplier->getTextFieldMasters(); - uno::Sequence aMasterNames = xTextFieldMasters->getElementNames(); - bool bHasUnusedField = false; - for (const auto& rMasterName : std::as_const(aMasterNames)) - { - if (rMasterName == "com.sun.star.text.fieldmaster.User.Unused") - { - bHasUnusedField = true; - break; - } - } + CPPUNIT_ASSERT_EQUAL(sal_True, + xTextFieldMasters->hasByName("com.sun.star.text.fieldmaster.User.Unused")); - CPPUNIT_ASSERT_EQUAL(true, bHasUnusedField); + auto xFieldMaster = xTextFieldMasters->getByName("com.sun.star.text.fieldmaster.User.Unused"); + CPPUNIT_ASSERT_EQUAL(OUString("Hello World"), getProperty(xFieldMaster, "Content")); } DECLARE_RTFEXPORT_TEST(testTdf108416, "tdf108416.rtf") @@ -1233,7 +1227,7 @@ xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval; sal_Int32 shapesOnPage = xmlXPathNodeSetGetLength(pXmlNodes); xmlXPathFreeObject(pXmlObj); - CPPUNIT_ASSERT_EQUAL(sal_Int32(120), shapesOnPage); + CPPUNIT_ASSERT_EQUAL(sal_Int32(118), shapesOnPage); } // Third page { @@ -1242,7 +1236,7 @@ xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval; sal_Int32 shapesOnPage = xmlXPathNodeSetGetLength(pXmlNodes); xmlXPathFreeObject(pXmlObj); - CPPUNIT_ASSERT_EQUAL(sal_Int32(86), shapesOnPage); + CPPUNIT_ASSERT_EQUAL(sal_Int32(84), shapesOnPage); } } diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/rtfimport/rtfimport.cxx libreoffice-7.4.2~rc3/sw/qa/extras/rtfimport/rtfimport.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/rtfimport/rtfimport.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/rtfimport/rtfimport.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1417,11 +1417,11 @@ OUString value = paragraph->getString(); CPPUNIT_ASSERT_EQUAL(OUString("First Page"), value); - paragraph = getParagraph(4); + paragraph = getParagraph(3); value = paragraph->getString(); CPPUNIT_ASSERT_EQUAL(OUString("Second Page"), value); - paragraph = getParagraph(7); + paragraph = getParagraph(5); value = paragraph->getString(); CPPUNIT_ASSERT_EQUAL(OUString("Third Page"), value); diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/data/tdf147507.fodt libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/data/tdf147507.fodt --- libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/data/tdf147507.fodt 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/data/tdf147507.fodt 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Author + 2004-01-12T03:00:00 + + + + + + + Author + 2004-01-05T21:45:00 + + + + + a + + + + + + + + + + + + + + s + + + diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/data/tdf148849.fodt libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/data/tdf148849.fodt --- libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/data/tdf148849.fodt 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/data/tdf148849.fodt 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,53 @@ + + + + + + + + + + xxx4 + 2021-09-21T14:41:20 + + + + + + + xxx4 + 2021-09-21T14:41:20 + + + + + + + + + + + + + + + + + 12 + + + + + Row 2 + + + + + Row 3 + + + + + + + diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/uiwriter2.cxx libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/uiwriter2.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/uiwriter2.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/uiwriter2.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -2036,6 +2036,25 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount()); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf147507) +{ + SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf147507.fodt"); + + // turn on red-lining and show changes + pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowDelete + | RedlineFlags::ShowInsert); + CPPUNIT_ASSERT_MESSAGE("redlining should be on", + pDoc->getIDocumentRedlineAccess().IsRedlineOn()); + CPPUNIT_ASSERT_MESSAGE( + "redlines should be visible", + IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags())); + + // select all, backspace and reject all crashed + dispatchCommand(mxComponent, ".uno:SelectAll", {}); + dispatchCommand(mxComponent, ".uno:SwBackSpace", {}); + dispatchCommand(mxComponent, ".uno:RejectAllTrackedChanges", {}); +} + CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf119019) { // check handling of overlapping redlines diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/uiwriter3.cxx libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/uiwriter3.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/uiwriter3.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/uiwriter3.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -3530,6 +3530,110 @@ CPPUNIT_ASSERT_EQUAL(OUString("204"), xCellA4->getString()); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf148849) +{ + // load a document with a table and an empty paragraph before the table + SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf148849.fodt"); + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + + // record changes + pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowDelete + | RedlineFlags::ShowInsert); + CPPUNIT_ASSERT_MESSAGE("redlining should be on", + pDoc->getIDocumentRedlineAccess().IsRedlineOn()); + // hide changes + dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {}); + CPPUNIT_ASSERT(pWrtShell->GetLayout()->IsHideRedlines()); + + uno::Reference xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xTables(xTablesSupplier->getTextTables(), + uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); + + // put cursor in the first table row + pWrtShell->Down(/*bSelect=*/false, /*nCount=*/1); + + // delete a table row + pWrtShell->DeleteRow(); + + // check cursor position + + // This was "", because the text cursor jumped to the start of the document + // after deleting a table row instead of remaining in the next table row + SwNode& rNode = pWrtShell->GetCursor()->GetNode(); + CPPUNIT_ASSERT_EQUAL(OUString("Row 2"), rNode.GetTextNode()->GetText()); +} + +CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf150576) +{ + // load a document with a table and an empty paragraph before the table + SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf148849.fodt"); + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + + // record changes + pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowDelete + | RedlineFlags::ShowInsert); + CPPUNIT_ASSERT_MESSAGE("redlining should be on", + pDoc->getIDocumentRedlineAccess().IsRedlineOn()); + // hide changes + dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {}); + CPPUNIT_ASSERT(pWrtShell->GetLayout()->IsHideRedlines()); + + uno::Reference xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xTables(xTablesSupplier->getTextTables(), + uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); + + // Check deletion of the first row, if the second row deleted already + + // put cursor in the second table row + pWrtShell->Down(/*bSelect=*/false, /*nCount=*/2); + SwNode& rNode = pWrtShell->GetCursor()->GetNode(); + CPPUNIT_ASSERT_EQUAL(OUString("Row 2"), rNode.GetTextNode()->GetText()); + + // delete the second table row + pWrtShell->DeleteRow(); + + // check cursor position (row 3) + SwNode& rNode2 = pWrtShell->GetCursor()->GetNode(); + CPPUNIT_ASSERT_EQUAL(OUString("Row 3"), rNode2.GetTextNode()->GetText()); + + // put cursor in the first row + pWrtShell->Up(/*bSelect=*/false, /*nCount=*/1); + SwNode& rNode3 = pWrtShell->GetCursor()->GetNode(); + CPPUNIT_ASSERT_EQUAL(OUString("12"), rNode3.GetTextNode()->GetText()); + + // delete the first row + pWrtShell->DeleteRow(); + + // This was empty (cursor jumped in the start of the document instead of + // the next not deleted row) + SwNode& rNode4 = pWrtShell->GetCursor()->GetNode(); + CPPUNIT_ASSERT_EQUAL(OUString("Row 3"), rNode4.GetTextNode()->GetText()); + + // Check skipping previous lines + + // restore deleted rows + dispatchCommand(mxComponent, ".uno:Undo", {}); + dispatchCommand(mxComponent, ".uno:Undo", {}); + Scheduler::ProcessEventsToIdle(); + SwNode& rNode5 = pWrtShell->GetCursor()->GetNode(); + CPPUNIT_ASSERT_EQUAL(OUString("Row 2"), rNode5.GetTextNode()->GetText()); + + // delete the second row + pWrtShell->DeleteRow(); + SwNode& rNode7 = pWrtShell->GetCursor()->GetNode(); + CPPUNIT_ASSERT_EQUAL(OUString("Row 3"), rNode7.GetTextNode()->GetText()); + + // delete the third, i.e. last row + pWrtShell->DeleteRow(); + SwNode& rNode8 = pWrtShell->GetCursor()->GetNode(); + + // This was empty (cursor jumped in the start of the document instead of + // the previous not deleted row) + CPPUNIT_ASSERT_EQUAL(OUString("12"), rNode8.GetTextNode()->GetText()); +} + CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132603) { createSwDoc(); diff -Nru libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/uiwriter5.cxx libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/uiwriter5.cxx --- libreoffice-7.4.1~rc2/sw/qa/extras/uiwriter/uiwriter5.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/extras/uiwriter/uiwriter5.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -2048,6 +2048,74 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRows()->getCount()); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf150666) +{ + // load a table with tracked insertion of an empty row + SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "TC-table-rowadd.docx"); + + // check table count + uno::Reference xTextTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xTables(xTextTablesSupplier->getTextTables(), + uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); + + // check table row count + uno::Reference xTable(xTables->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xTable->getRows()->getCount()); + + // select the second row (tracked table row insertion) + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + pWrtShell->Down(/*bSelect=*/false); + + // delete it, and accept all tracked changes + dispatchCommand(mxComponent, ".uno:DeleteRows", {}); + dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {}); + + // This was 4 (it was not possible to delete only the tracked row insertions) + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRows()->getCount()); + + // insert a new table row with track changes + dispatchCommand(mxComponent, ".uno:InsertRowsAfter", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xTable->getRows()->getCount()); + + // select and delete it + pWrtShell->Down(/*bSelect=*/false); + dispatchCommand(mxComponent, ".uno:DeleteRows", {}); + dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {}); + + // This was 4 (it was not possible to delete own tracked row insertions) + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRows()->getCount()); +} + +CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf150666_regression) +{ + // load a table with tracked insertion of an empty row + SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "TC-table-rowadd.docx"); + + // check table count + uno::Reference xTextTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xTables(xTextTablesSupplier->getTextTables(), + uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); + + // check table row count + uno::Reference xTable(xTables->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xTable->getRows()->getCount()); + + // select the second row (tracked table row insertion) + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + pWrtShell->Down(/*bSelect=*/false); + + // insert a new table row with track changes + dispatchCommand(mxComponent, ".uno:InsertRowsAfter", {}); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xTable->getRows()->getCount()); + + dispatchCommand(mxComponent, ".uno:RejectAllTrackedChanges", {}); + + // This was 4 (the inserted table row wasn't tracked) + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRows()->getCount()); +} + CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf144748) { // load a table with an empty row, and an empty line before the table diff -Nru libreoffice-7.4.1~rc2/sw/qa/filter/html/data/empty-paragraph.xhtml libreoffice-7.4.2~rc3/sw/qa/filter/html/data/empty-paragraph.xhtml --- libreoffice-7.4.1~rc2/sw/qa/filter/html/data/empty-paragraph.xhtml 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/filter/html/data/empty-paragraph.xhtml 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,3 @@ +a + + diff -Nru libreoffice-7.4.1~rc2/sw/qa/filter/html/data/ole2.ole libreoffice-7.4.2~rc3/sw/qa/filter/html/data/ole2.ole --- libreoffice-7.4.1~rc2/sw/qa/filter/html/data/ole2.ole 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/filter/html/data/ole2.ole 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,1014 @@ +{\object\objemb{\*\objclass PowerPoint.Show.12}\objw10020\objh5638{\*\objdata +01050000 +02000000 +13000000 +506f776572506f696e742e53686f772e313200 +00000000 +00000000 +00940000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000 +0000000000010000000100000000000000001000000200000001000000feffffff000000000000 +0000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffdffffff47000000feffffff48000000050000000600000007000000080000000900 +00000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013 +0000001400000015000000160000001700000018000000190000001a0000001b0000001c000000 +1d0000001e0000001f000000200000002100000022000000230000002400000025000000260000 +002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f0000003000 +00003100000032000000330000003400000035000000360000003700000038000000390000003a +0000003b0000003c0000003d0000003e0000003f00000040000000410000004200000043000000 +440000004500000046000000fefffffffefffffffeffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000016000500 +ffffffffffffffff02000000f4554fcf878f474d80bb5808164bb3f80000000000000000000000 +0080609bf8f8bcd30103000000000300000000000001004f006c00650000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000a000201ffffffffffffffffffffffff00000000000000000000000000000000 +00000000000000000000000000000000000000000000000014000000000000005000610063006b +006100670065000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000100002010100000004000000ffffffff0000000000 +000000000000000000000000000000000000000000000000000000000000000400000056840000 +00000000010043006f006d0070004f0062006a0000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000012000200ffffffffffff +ffffffffffff000000000000000000000000000000000000000000000000000000000000000000 +000000010000007c00000000000000feffffff02000000feffffff040000000500000006000000 +0700000008000000090000000a000000fefffffffeffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffff01000002000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000100feff030a0000fffffffff4554fcf878f474d80bb5808164bb3f8220000004d +6963726f736f667420506f776572506f696e742d5072e473656e746174696f6e000f0000004d53 +50726573656e746174696f6e0013000000506f776572506f696e742e53686f772e313200f439b2 +7100000000000000000000000000000000ffffffff030000000400000001000000ffffffff0200 +0000000000000a450000d8260000ba010000010009000003dd0000000600120000000000040000 +0003010800050000000b0200000000050000000c02cf08a80f030000001e0007000000fc020000 +ffffff000000040000002d01000008000000fa02050000000000ffffff00040000002d0101000e +00000024030500ffffffffffffcf08a80fcf08a80fffffffffffff08000000fa02000000000000 +00000000040000002d01020007000000fc020000ffffff000000040000002d01030004000000f0 +01000007000000fc0200004472c4000000040000002d0100000400000006010100040000002d01 +0100120000002403070065026a03e4086a03e408af025a0a2504e4089b05e408e0046502e00404 +0000002d0102000400000006010100040000002d0103000800504b030414000600080000002100 +dfcc18f5ad010000460c0000130008025b436f6e74656e745f54797065735d2e786d6c20a20402 +28a000020000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000cc975b4fc23014c7df4dfc0e4b5f0d2ba0221a060f5e9ebc90881fa06e07 +a8766dd316846fefd90582849b02b12f4bcecef9ffcfaf6bb776adce2415c1188ce54a46a41656 +4900325609978388bcf51e2a4d1258c764c2849210912958d2699f9eb47a530d3640b5b411193a +a76f28b5f110526643a54162a6af4cca1c866640358b3fd90068bd5a6dd0584907d2555ce641da +ad3be8b39170c1fd046f17241f1a0624b82d0ab35e11e169669027e84a8d016197344c6bc163e6 +304fc7325922ab9454212af31a3be4da9e61c19a0e59667d8352f7828fd3f004822e33ee99a558 +45b576541bb0a8cb6bc3cd4e2b5055bfcf6348543c4a51122e9aa5e24718a68ccbd920d6c15881 +379f987538f58b41edd0640bde3b319534c7e1d8469069ba46697b8cf9c98db7118c397c1d8560 +6ebc8dc0e13b0cc575ff49c86db67664ef025edd54c0c147bd60bdd3ea7b64533572e51a2c82e3 +acc4c2fbaf4c750f99ce3d64baf090e9d243a686874c571e32353d64baf690a956f511eabfbee4 +28cf775e3cf71af83dc3ec909aa92b1a8dc038be793f9b7744ebbd070dd9f9378164456f9aff05 +b4bf010000ffff0300504b03041400060008000000210068f874a103010000e20200000b000802 +5f72656c732f2e72656c7320a2040228a000020000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000ac92db4a03311086ef05df21cc7d37 +db2a22d26c6f44e89dc8fa006332bb1bdd1c48a6d2bebda1e061612d82bdcccc3f1fdf24596ff6 +6e14ef94b20d5ec1b2aa4190d7c158df2b786e1f16b72032a33738064f0a0e9461d35c5eac9f68 +442e4379b0318b42f159c1c01cefa4cc7a2087b90a917ce9742139e4724cbd8ca8dfb027b9aaeb +1b997e32a09930c5d628485b7305a23d44fa1f5b3a6234c8287548b488a94c27b66517d162ea89 +1598a01f4b391f135521839c175a9d5788879d7bf168c71995af5ef51aa9ff4d68f977a1d07556 +d37dd03b479ee7bca6896fa71859c644b9148fe95337747d4e21da337943e6f4a3618c9f4672f2 +339b0f000000ffff0300504b030414000600080000002100635c23b4c000000037010000200000 +007070742f736c696465732f5f72656c732f736c696465312e786d6c2e72656c738ccfbd6ac330 +1007f03dd07710b757b23b84102c65290543a7903ec0219d6d515b123ab9c46f1f8d3174c8785f +bf3fd75deecb2cfe28b38f41432b1b10146c743e8c1a7e6e5fef27105c30389c63200d1b315ccc +dba1bbd28ca51ef1e4138baa04d6309592ce4ab19d6841963151a89321e6054b2df3a812da5f1c +497d34cd51e56703ccce14bdd3907bd782b86d895eb1e330784b9fd1ae0b85f24f84e2d93bfac6 +2daea5b298472a1aa47ceeef965a592340994eedde350f000000ffff0300504b03041400060008 +00000021001b2e35070c010000d00300001f0008017070742f5f72656c732f70726573656e7461 +74696f6e2e786d6c2e72656c7320a2040128a00001000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000ac93414ec3301045f748dcc19a3d7152a042a84e3708a90b2404e100269924168e6d79 +4c21b7c76aa12455157591e5fff6fc799ab157ebef4eb32d7a52d608c89214189ad256ca3402de +8ac7ab3b6014a4a9a4b60605f448b0ce2f2f562fa8658845d42a472ca61812d086e0ee39a7b2c5 +4e52621d9a78525bdfc910a56fb893e5876c902fd274c9fd3003f25126db5402fca6ba0656f40e +cfc9b675ad4a7cb0e56787269c68c19d477af636366385f40d0601072b8969c04f432ce68420ad +2afc07d8c95f379b82c86687789214d01fa1eccdd18d49ace59c5841be6b7c0dbdc6c18a06e614 +c8edac20b176b0a49ddc9b93c3b8999361abf0ebe8b51eac3f083efa87f90f000000ffff030050 +4b030414000600080000002100bcd1a735de0200002c0e0000140000007070742f70726573656e +746174696f6e2e786d6cec97cd6fda3014c0ef93f63f44be4e34385f0444a86034d3a44e42a5bb +ece62606a23a71641b0a9df6bfefd97120a59ad4c38e3961fb7dfae7a7f0def4f65832e740852c +7895207c33440ead329e17d536413f1fd3418c1ca9489513c62b9aa01395e876f6f9d3b49ed482 +4a5a29a2c0d40137959c9004ed94aa27ae2bb31d2d89bce135ad40b6e1a2240ab662ebe682bc80 +fb92b9de7018b925292a64edc547ecf966536474c9b37d09e11b2782329387dc15b56cbdd51ff1 +d6bdc5db94241500e617e76582c2211e8670440e74bd7f9254a5bc521280a11990902cff41a4a2 +e27b7e2fd5d58953e409f270300a623f0a00a798e8139060e4cea6ee3fccdfae1b2761d4b1f62e +d65dddf5ab931d21310f8fe12ef09cd92941511cc67ae36aa58a2b2aad5a2b305a631c0467ad9c +6ec89ea9477a546b7562743625fa6cb51276f5b0120e23ba4c723a58de996cba2aecc0700d3a25 +11f7098210846da1c4187240e7913cad5fdb887029c58c0a25f7d5423c6bae8e7ed0ca6e41b483 +505035ab7d95a986fb390b099e70acfd3c53a1ab182e6ee492b3224f0bc6cc46d700fdca847320 +104d1d1bfc575a26aaa34e355c3f837aff525603a6b42699507225a0a41164f24a90c90b8e078d +c33df3b068bc0b9a201ce9847b3e068ae5e35ff8b4107a3e1a8ae5135cf8607f84a31e504bc502 +0a3b80622f36d9f78034150b28ba00f2bc3832ff023d204dc5021a75008d02bfff469fa95840f1 +0590a6d37fa4cf542ca0710750148efa8ff4998ae95cdfb798f504d6b6978595b31745827edfa5 +f374e1f9fe6018f9e920f016e120863fbdc17899fa698817733c9cffd18d380e7507fc6d5fe414 +9cb453000edfcd016591092ef946dd64bcb403855bf3172a6a5e9899027bcd14d078dd6a97a607 +8727e1a28081017c72f18a9c9a4bddde47c07d0f13c312861b0ddf1a66ccd48214dba733f37930 +f7e741d3bdb72a6665a25c07f46c083f0efe5f08b3eea032cf01c0dbdff6a83b1ccdfe020000ff +ff0300504b030414000600080000002100303a84e5ea0200006c060000150000007070742f736c +696465732f736c696465312e786d6c8c545b6f9b30147e9fb4ff8078a75c020450691548a8266d +6bd4763fc033262019dbb2dd3451b5ff3edb98a45d23ad3c707c39dfb97ce71c5fdf1e46ecec11 +170325a51b5e05ae8308a4ed4076a5fbeba9f132d711129016604a50e91e91706f6fbe7eb96685 +c0ada3d04414a0747b2959e1fb02f66804e28a3244d45d47f908a4daf29ddf72f0a2ac8ed88f82 +20f5473010d7e2f967f0b4eb0688d6143e8f88c8c90847184815b9e80726666bec33d618474299 +31e87721dda8cce0236eb514ec8923a457647fc7d923db7273fd73bfe5ced02abe5c878051d1e2 +faf6c2aa992dd99b85ff0f7c372f4171e8f8a8a5cacd3994ae22ffa8ffbe3e4307e9c0e9109e4f +617f7f4117f69b0bdafeecc07fe354673505f7319d784e67dba101176a037b8723d84be12c5c1b +d47721e7f09ef950baaf4d1355c9a689bd46adbc38a862afdac4b9d7448b6c132d9b3a5aa47f34 +3a4c0bc891a1fcdba975c2f443b9c601722a6827af201d6ddde7f651950a63db3c3ae4d764d934 +6114575e1ed7991757e9dacb56abdc5b6749be08f3661584eb3f960d15f32c4d16be4ddeb270b1 +7067d62e962cccd2348c22538c28c8832059be2f5f1ae649122da7b244d1324d97ef8b030ac685 +bc437474f4a274f9b0ebe58a73fa6228077b15eb0498154d6853404aca23465a119307d4295294 +d3c8200d9fa8c6dcd9035cba0042d5f1e174d583164dc749a03e1bd1096176c6a0d6ee068c4fb6 +ad81cbb6273356dfd0d07508ca1338f83ff884309e293983c781507ec9003e7b9ef42782266258 +210f156d8f1af75b49d5eb5ce29a62332c80c09eaaf7074a3ed50d0bf9a88166c3cc4f2100de91 +374a88b45bc0c183bac140bf942df2d61b1b0333de67a7a65256ccafc9dc7f6665a7a8aaf234aa +b3caabc2b8f1e275bef4564d9a784db288e3baca56f562a3a78885f1c72952879f9b22465f1067 +74300f6818d841322486e922cbb3659447260f13db2c4fd3621f4688f90fc0eef7662294338978 +6d8e981ed149f5aca27357b8bf000000ffff0300504b030414000600080000002100d5d192f1bc +000000370100002c0000007070742f736c6964654c61796f7574732f5f72656c732f736c696465 +4c61796f7574362e786d6c2e72656c738ccfbd0ac2301007f05df01dc2ed26ad8388347511c1c1 +45f4018ee4da06db24e4a2e8db9bd18283e37dfdfe5cb37f4da378526217bc865a5620c89b609d +ef35dcaec7d5160467f416c7e049c39b18f6ed72d15c68c45c8e78709145513c6b18728e3ba5d8 +0c3421cb10c9974917d284b994a95711cd1d7b52ebaadaa8f46d403b33c5c96a48275b83b8be23 +fd6387ae73860ec13c26f2f94784e2d1593a23674a85c5d453d620e5777fb654cb1201aa6dd4ec +ddf6030000ffff0300504b030414000600080000002100d5d192f1bc000000370100002c000000 +7070742f736c6964654c61796f7574732f5f72656c732f736c6964654c61796f7574372e786d6c +2e72656c738ccfbd0ac2301007f05df01dc2ed26ad8388347511c1c145f4018ee4da06db24e4a2 +e8db9bd18283e37dfdfe5cb37f4da378526217bc865a5620c89b609def35dcaec7d5160467f416 +c7e049c39b18f6ed72d15c68c45c8e78709145513c6b18728e3ba5d80c3421cb10c9974917d284 +b994a95711cd1d7b52ebaadaa8f46d403b33c5c96a48275b83b8be23fd6387ae73860ec13c26f2 +f94784e2d1593a23674a85c5d453d620e5777fb654cb1201aa6dd4ecddf6030000ffff0300504b +030414000600080000002100d5d192f1bc000000370100002c0000007070742f736c6964654c61 +796f7574732f5f72656c732f736c6964654c61796f7574392e786d6c2e72656c738ccfbd0ac230 +1007f05df01dc2ed26ad8388347511c1c145f4018ee4da06db24e4a2e8db9bd18283e37dfdfe5c +b37f4da378526217bc865a5620c89b609def35dcaec7d5160467f416c7e049c39b18f6ed72d15c +68c45c8e78709145513c6b18728e3ba5d80c3421cb10c9974917d284b994a95711cd1d7b52ebaa +daa8f46d403b33c5c96a48275b83b8be23fd6387ae73860ec13c26f2f94784e2d1593a23674a85 +c5d453d620e5777fb654cb1201aa6dd4ecddf6030000ffff0300504b0304140006000800000021 +00d5d192f1bc000000370100002d0000007070742f736c6964654c61796f7574732f5f72656c73 +2f736c6964654c61796f757431302e786d6c2e72656c738ccfbd0ac2301007f05df01dc2ed26ad +8388347511c1c145f4018ee4da06db24e4a2e8db9bd18283e37dfdfe5cb37f4da378526217bc86 +5a5620c89b609def35dcaec7d5160467f416c7e049c39b18f6ed72d15c68c45c8e78709145513c +6b18728e3ba5d80c3421cb10c9974917d284b994a95711cd1d7b52ebaadaa8f46d403b33c5c96a +48275b83b8be23fd6387ae73860ec13c26f2f94784e2d1593a23674a85c5d453d620e5777fb654 +cb1201aa6dd4ecddf6030000ffff0300504b030414000600080000002100d5d192f1bc00000037 +0100002c0000007070742f736c6964654c61796f7574732f5f72656c732f736c6964654c61796f +7574382e786d6c2e72656c738ccfbd0ac2301007f05df01dc2ed26ad8388347511c1c145f4018e +e4da06db24e4a2e8db9bd18283e37dfdfe5cb37f4da378526217bc865a5620c89b609def35dcae +c7d5160467f416c7e049c39b18f6ed72d15c68c45c8e78709145513c6b18728e3ba5d80c3421cb +10c9974917d284b994a95711cd1d7b52ebaadaa8f46d403b33c5c96a48275b83b8be23fd6387ae +73860ec13c26f2f94784e2d1593a23674a85c5d453d620e5777fb654cb1201aa6dd4ecddf60300 +00ffff0300504b030414000600080000002100d5d192f1bc000000370100002d0000007070742f +736c6964654c61796f7574732f5f72656c732f736c6964654c61796f757431312e786d6c2e7265 +6c738ccfbd0ac2301007f05df01dc2ed26ad8388347511c1c145f4018ee4da06db24e4a2e8db9b +d18283e37dfdfe5cb37f4da378526217bc865a5620c89b609def35dcaec7d5160467f416c7e049 +c39b18f6ed72d15c68c45c8e78709145513c6b18728e3ba5d80c3421cb10c9974917d284b994a9 +5711cd1d7b52ebaadaa8f46d403b33c5c96a48275b83b8be23fd6387ae73860ec13c26f2f94784 +e2d1593a23674a85c5d453d620e5777fb654cb1201aa6dd4ecddf6030000ffff0300504b030414 +000600080000002100d5d192f1bc000000370100002c0000007070742f736c6964654c61796f75 +74732f5f72656c732f736c6964654c61796f7574312e786d6c2e72656c738ccfbd0ac2301007f0 +5df01dc2ed26ad8388347511c1c145f4018ee4da06db24e4a2e8db9bd18283e37dfdfe5cb37f4d +a378526217bc865a5620c89b609def35dcaec7d5160467f416c7e049c39b18f6ed72d15c68c45c +8e78709145513c6b18728e3ba5d80c3421cb10c9974917d284b994a95711cd1d7b52ebaadaa8f4 +6d403b33c5c96a48275b83b8be23fd6387ae73860ec13c26f2f94784e2d1593a23674a85c5d453 +d620e5777fb654cb1201aa6dd4ecddf6030000ffff0300504b030414000600080000002100d5d1 +92f1bc000000370100002c0000007070742f736c6964654c61796f7574732f5f72656c732f736c +6964654c61796f7574322e786d6c2e72656c738ccfbd0ac2301007f05df01dc2ed26ad83883475 +11c1c145f4018ee4da06db24e4a2e8db9bd18283e37dfdfe5cb37f4da378526217bc865a5620c8 +9b609def35dcaec7d5160467f416c7e049c39b18f6ed72d15c68c45c8e78709145513c6b18728e +3ba5d80c3421cb10c9974917d284b994a95711cd1d7b52ebaadaa8f46d403b33c5c96a48275b83 +b8be23fd6387ae73860ec13c26f2f94784e2d1593a23674a85c5d453d620e5777fb654cb1201aa +6dd4ecddf6030000ffff0300504b030414000600080000002100d5d192f1bc000000370100002c +0000007070742f736c6964654c61796f7574732f5f72656c732f736c6964654c61796f7574332e +786d6c2e72656c738ccfbd0ac2301007f05df01dc2ed26ad8388347511c1c145f4018ee4da06db +24e4a2e8db9bd18283e37dfdfe5cb37f4da378526217bc865a5620c89b609def35dcaec7d51604 +67f416c7e049c39b18f6ed72d15c68c45c8e78709145513c6b18728e3ba5d80c3421cb10c99749 +17d284b994a95711cd1d7b52ebaadaa8f46d403b33c5c96a48275b83b8be23fd6387ae73860ec1 +3c26f2f94784e2d1593a23674a85c5d453d620e5777fb654cb1201aa6dd4ecddf6030000ffff03 +00504b030414000600080000002100d5d192f1bc000000370100002c0000007070742f736c6964 +654c61796f7574732f5f72656c732f736c6964654c61796f7574342e786d6c2e72656c738ccfbd +0ac2301007f05df01dc2ed26ad8388347511c1c145f4018ee4da06db24e4a2e8db9bd18283e37d +fdfe5cb37f4da378526217bc865a5620c89b609def35dcaec7d5160467f416c7e049c39b18f6ed +72d15c68c45c8e78709145513c6b18728e3ba5d80c3421cb10c9974917d284b994a95711cd1d7b +52ebaadaa8f46d403b33c5c96a48275b83b8be23fd6387ae73860ec13c26f2f94784e2d1593a23 +674a85c5d453d620e5777fb654cb1201aa6dd4ecddf6030000ffff0300504b0304140006000800 +0000210069a25f2115010000c70700002c0000007070742f736c6964654d6173746572732f5f72 +656c732f736c6964654d6173746572312e786d6c2e72656c73c4d54d6ac3301005e07da17730b3 +8f253b899394c8d98442a0ab921e4058e31f6a4b46524a7dfb8a96420c616821a08dc092f5e6e3 +6db43f7c0e7df281d675460bc8520e09eacaa84e3702dececf8b2d24ce4bad646f340a98d0c1a1 +7c7cd8bf622f7db8e4da6e744948d14e40ebfdf8c498ab5a1ca44bcd883a9cd4c60ed2874fdbb0 +5156efb24196735e307b9d01e52c33392901f6a4c2fcf334e25fb24d5d77151e4d751950fb1b23 +98eb3b852f7232171f62a56dd00b48d3ebfdd94fdb348c00765bb68c295b52b24d4cd9869265f9 +3d693edcc519ea7be767cd28c75d19ff6d28271b8a29233b2b62ca0ab2b3b8a591adad63d2d664 +6b3c6a6b9cb2ad62d256946c1753b6fb95b1d9f35b7e010000ffff0300504b0304140006000800 +00002100e40b4c2ac604000089100000220000007070742f736c6964654c61796f7574732f736c +6964654c61796f757431312e786d6ccc58cd6edc3610be17e83b08bad32b891425195907fa6351 +347fa8dd1c7aa325ae5788fe4a71d7eb0401f2267d8e16bde54df2241d52929dd88eb32ee2c297 +2545cd0c67e6fb6648ed93a7bba6b6b6420e55d72e6df7c0b12dd1165d59b5674bfbb7138642db +1a146f4b5e77ad58da1762b09f1efdf8c393fe70a8cb67fca2db280b6cb4c3215fda6ba5fac3c5 +6228d6a2e1c341d78b16dead3ad970058ff26c514a7e0eb69b7ae1390e5d34bc6aed495feea3df +ad565521b2aed834a255a311296aaec0ff615df5c36caddfc75a2fc500668cf6972ea98b1ea285 +c4a8934ad5226ecb939d6d1979b98537ae7d0429288eebd26a79030baf41b47ac36b212dd010b5 +b5694beb44ec94111cfa1329849eb5db9f647fdcbf9246ffc5f695b4aa52db9becd88be9c52466 +1edbad992caea99fcd537eb85bc9468f901f6bb7b401c60bfdbbd06be084558c8bc5d56ab17e79 +8b6cb1ce6f915ecc1b2c3edb5447353a77331c6f0ee7465a74e28c4bcf06353bb791d5d27ec798 +97f8392388c10c11272128c949849887c3dc0b58ea61fa5e6bbbf4b090c280f6733993cfa53700 +6faa427643b7520745d74ccc99090858bb64c25a3bfc2e49a893e718a3d48942447c3f80dd4307 +2549c26246589e90e8fd940bf0791e4d148b29f42907332643ffac2bde0c56db01661ae211c24b +8911573df6eb89704a93cdb63a59012d47fe4d5aa3a8995ca5ff56ecc3c0239133a28aa9ef7afe +9734f0a8179af71a5e3f74dd1087d7411e4df7876a9774e585d63e8511c0d51e2d6dc135aea3d9 +7a50c7eaa216e6a1d73fc62909c235d75da41428cb475975644800e02821c742b4ca8d2cd6d62f +7555bc11ad752ab83c1520d46a7fc634ebb88de9c59543c6c7bb39886fe32024a1876ef176cd6b +70c1f21e291be38826cc0b33045b1244282528a629450e8bfc284fc23cc0dec3b351637e8d8ce0 +deee4af91ea4c4a1770727830013fc909cec351db7f5659fbb8ba3cc1073dbc99a9f01254b3118 +de8cac1deea6e8f5ed4ca6eedeeef7736dccca4f452bf6b0e87ddb62262b750f8bf8db165f5790 +dbfd2d923d92fcf19f767587c9fbd53a996b3de36ad30c9f97387ea4259e666114504c118b0894 +789445fac04911893d97b931ce823c7cf8122fa1a487b71009af5773718f47fe57abdbdc48ae17 +e157ca6e05f723136d84532fa5094638600c8e5716a128f04284d32866414cf28092f7f3b5abe4 +4aa8aa11ac3adb48f172a3ef503789640d8d4a6bc1dbcba256472e3d70f001a43abca214f86070 +6fcb575cf25f6fd2f1bf10ce9f09c7361fff7c2baa5ab49f938e3c52d279d4f1fc380a80740945 +2488139464b18fa2344e1d9f26b193e38727dd4ac991757f6c38b4153913ef1bc7ca7d88f77dd1 +a6976877351c86eda66984fc0270ff91021ea42427d4c5507211f4962c0851eca439f29d308949 +18f971fc3f7419f8547cb1696ec5dc1c67dfb9d9647916d09cf928a53882d6ca729478598a9893 +7b21a3ccf7dde8b2d90c75550a4074ef1ef3e9c35f2fe4c1a70f7f7f87166386f9d370cebb994d +ec4992887a690865ea12e89b19946ecca88f988f094993304e71aed9d3bbe4267b60713ff6f4dd +b9907d57992f6ad79908b4e5fa02e37b0e76b0e79a337d617c9bc74b961cebf861ace573debfdc +1a9a8cd7a5d42cf59a9aa3e895888e7dfe0be1e85f000000ffff0300504b030414000600080000 +002100ee0bf3bf90040000a70f0000220000007070742f736c6964654c61796f7574732f736c69 +64654c61796f757431302e786d6ccc57db6edc36107d2fd07f10f44eeb46dd8cac03dd5814756c +a376f3d0375ae27a85e8568abbde7560207fd2ef68d1b7fc49bea4434af2dab1e3ac031bf08b78 +d1703833e7cc907cf3765d57da8af1be6c9b996eed99bac69abc2dcae662a6ff714650a06bbda0 +4d41abb661337dc37afdedc1cf3fbde9f6fbaa38a49b762934d0d1f4fb74a62f84e8f60da3cf17 +aca6fd5edbb106fecd5b5e5301437e61149c5e82eeba326cd3f48c9a968d3eaee7bbac6fe7f332 +67699b2f6bd6884109671515607fbf28bb7ed2d6eda2ade3ac07356af55d93c4a6036f2130e26c +ad6b4a8eaf60c6d20fc0f5fcb42ab486d63071560a5669cba6905114e5075a31ae9db1b550827d +77c61993bd66f50bef4ebb13aed61fad4eb8561652dfa84737c61fa3981a362bd531be5a7e3175 +e9fe7ace6bd9425cb4f54c07f836f26bc8393042cb87c97c3b9b2f8e1f90cd17d903d2c6b48171 +6b53e9d560dc7d77ecc99d212c325aca8ec35e4c162d7939d33f1262c76e463022d043d88c318a +331c22623b4166fb24b11def5aaeb6bcfd9c3385d0afc5c434cbbb876e5de6bceddbb9d8cbdb7a +a4c9c43600d6c223b0d2ca8fb66f054eeac7c8719308e130b550ec3a094adcccc38e935a76985e +8f01009ba75679618cfe8e8e4f40f4dd619b7fe8b5a605a024ae036e37120398b2ed1623bb4429 +2a36ca0d3f55671be59105621db7c5466e720ead9aa4fb552f4ec5a6626ad0c98f328303101595 +c95b30946603b8e240c10161128c0ffcd78a25cf17da6f55997f608d76ce283f6720d448570787 +a53d4ab5b135c198c0ff36059c8902efefe64307497ab5a01598a0d9af941709f6dc08c71e0a92 +087627568a02270e8126416aa659e4e1d07c795e489475ade52594a6a10649f3d6dbc54f218b2a +4b339d5109c74087fbd4e9246b56d54d35788c4a44f167d5f28a5e00730ad62b780772f58f33e9 +ebed94438f6ff7e7a554a665e7ac613b68b4bfaf31e5a5788246e7fb1adf9710dbdd35e21d82fc +f9bf66fe88caa7a5249e5232a56259f7b733d179a59988bdd8c4212128b47c13e12c345140c004 +171333b49dcc37c3f0e533b180ccebafc0135acda71c1c0ec667a9d873b845286f4327b1132f76 +90e383cbd825210a7d3b404e1246c48f70e67bf87aba9414543051d68c94174bce8e97f2a6719f +485a5f8ba462b4b9496a7160797ba6b307a10eb694021b14ee4d714239fdfd3e1d7f8470ee4438 +b2fcfcf7152b2bd6dc261d7ea5a48b82308a039220df8b2c84831443f9771d04fbc6b11d618f44 +d6cb936e2ef8c0babf9614ca0a9f88f723d5ff1bc47b5eb4bd1bb4db0aceac6659d78cdf01dc7d +a580a72ea45ae8c6c8f28300cefbcc44a1094327c9029bc4a1ac412f0f383ca48e96f58398abe3 +ec998b4d9aa5be971117259e13c2e5976428b6d3041133b303e211d7b5c29b62d35765c100d19d +6bcc974fff1cf1bd2f9ffe7d8612a39ae90135c55df546f6c471e8d94910a3d8c25037d3d04711 +f15c445c07e3240ea2c4c9247b3a0bdf670f4ceec69eaebd64bc6b4bf5deb4cc91402b2a2f07be +6b390176436f046a60c9d65a09fda9f41fda8abfa3ddf14ad164b82e256aaa93d41c44b722d2f7 +e9817df03f000000ffff0300504b0304140006000800000021005a9d3795690500006715000021 +0000007070742f736c6964654c61796f7574732f736c6964654c61796f7574332e786d6ccc58dd +6edb3614be1fb077103460778c259212a9ac4ea13f6ec3b2b458ba0750243a16aabf51b4eba428 +d037d9736cd85ddfa44f3292926ca749336f6b82dc98147578f89df37da40efdecf9a6aeac3517 +7dd93673db3d726c8b37795b94cde5dcfef51503d4b67a99354556b50d9fdb57bcb79f9f7cfdd5 +b3eeb8af8ad3ecaa5d494bf968fae36c6e2fa5ec8e67b33e5ff23aeb8fda8e37eadda2157526d5 +a3b89c15227ba37cd7d50c3a8e3fabb3b2b1c7f9e290f9ed6251e63c69f355cd1b393811bccaa4 +c2df2fcbae9fbc758778eb04ef951b33fb262479d5a9687b9effc0b3c2b68ca158ab21d73e51b1 +e7e755613559ad06c20bb540534ad9836fbfd984df7df8eb42a5335f8a72218d6ddfbd129ceb5e +b3fe5e74e7dd4b615c9cad5f0aab2cb4cbd1953d1b5f8c66e6b1599bceec93e99753373bde2c44 +ad5b951b6b33b7158557fa77a6c7f8465af93098ef46f3e58b3b6cf3657a87f56c5a60b6b7a88e +6a00773b1c3885f3aa94bcb274c20c8ed35e4e8856a29cdb6f19839197320c98ea01ec44184429 +0e008388a690b01822ff9d9eedfac7b9e086a51f8b496dae7f8be1bacc45dbb70b7994b7f52895 +49718a5c178fe46a946f03274843c808086948010e68080296ba2075621c45288e100edf8d0950 +98a7d644311be31d039f88e8bbd3367fdd5b4dab88d2bc0ebc6d2d063275db2d4785c952567cb4 +1b5e9ace2ecb77524c914bbd813b97380141f426dbaee3b99eef8c3442ea4182c8a7640ebebb63 +b989dae24a4fbf50ad22316bf265ab76e3c5e0b4eae5b9bcaab8e9af2b778454f0c52fcab8bf9e +db6aa5492a5b03dddf9bd8e91f334fa84955a68f978283241dd69027462c8a44c9c5b043ad6225 +f2a5f55355e6af79635df04c5c7065d468d7031dc3329d89668ac20476bf40d156a02a5f9d3a3b +ae9759a5d6b5e013952a8b13163a29017e922025558f8288520248801d88433f42943dbc54b53a +3420adafffa358ecd100fbe83ec5ba9ee3b8f460c57e4ea6569d8953739a954da1ce79dd35b356 +67ea636666eda918626778ddb75559b0b2aacc83268cc795b0d659a5f6eb6638cf64d9c8618478 +3bf56f8d87a79d9fd9b4d2cd4d62ba7087147b04ea1c1c04572ffb587035c6112edac10d5cac73 +76105c973e225c8d71848b77705d445c23b183f06acbc7c2ab418e78bd3dbc14529db5a7875783 +1cf1fa3bbc1052f325787a7835c8112fd9c34b303a78bb3d2a5e0d72c44b777835d8c3f7db63e2 +d52047bcc11e5edf234f73bf69907797281abd32d8d6c4f7952cccd429eb5654d9a5aa500ade5b +baa2188a98fe4b562c78aa58924caeea7ebf66414fb466a129f63c184090f8240618c708049051 +405ce27a8cc42c26f1c3d72c85b48dba54b21653ed32c8e5b3c58bb974dd5b619807a39685ba05 +0e970914c358d5610011c600f658000202294071103212e294f8f8dd74ab2c32c9655973565eae +047fb1d2d7c4db22b3fa5ac615cf9aad16e589eb1f39e848a59aee24a53018de9be2652632bd9d +3e91ea7f119c37098ead3efc7ecdcb8a37fba2c34f55743e4969e0b8c0f1824415ca410828a38a +15e4e3044192423f7878d12da41854f7db2a132a5d93f0fea16afe37c2fbb26cfb5bb6d599c99b +6655d75cdc20dc7ba284c328f270927a2056ab011cba0e0854110d62c7f5a0e3d3d071d0c313de +57c5d9aabe9373f800874d9226c44f990ada478152394b4104931830278594f9ccf3dc607bd8f4 +ea2bc815a3079f311fdfff71268e3ebefff30b1c31a699fefd9af26e7aa37aa228f0614c2310b9 +589d9b494040c87c0f300fa94f4644c318a55a3d9d8b6fab470d1ea69eae7dc345d796e60f43d7 +190564ea079fb808a99be744f320921d58cdfcb90e5fb595f839eb5eac8d4a868f7c6c863aadcc +c17467a2439ffe203df91b0000ffff0300504b0304140006000800000021008f55c3fd73040000 +6b0f0000210000007070742f736c6964654c61796f7574732f736c6964654c61796f7574322e78 +6d6ccc97cb6ee3361486f705fa0e82f6b42ea46ec63803dd580c9a26419376d11d23d1b13aba95 +a21c3b8300f3267d8e16ddcd9bcc9394a4a4783249334ee100d998147578780effefd0d49bb79b +aad4d6947545532f746b66ea1aadb3262feaab85fecb0506beae759cd439299b9a2ef42dedf4b7 +47df7ff7a69d77657e4cb64dcf35e1a3eee664a1af386fe786d1652b5a916ed6b4b416ef960dab +08178feccac819b916beabd2b04dd3352a52d4fa389fed33bf592e8b8c264dd657b4e68313464b +c245fcddaa68bbc95bbb8fb796d14eb851b3ef87c4b7adc8b6b9fc5dd794115b8b474b3f127967 +e765aed5a412031705a7a5d6d7b9f6ae5e9192abf75d7bc12895bd7afd036bcfdb33a6a69daccf +9856e4d2cd385d37c617a3997aacd7aa637c35fd6aea92f966c92ad98abdd0360b5d48b695bf86 +1ca31bae65c360b61bcd56a78fd866abf4116b635ac0f8625199d510dcc374ec299d6137e426a9 +388e3b3e45d4b362a17fc0d88e9c142380450f203342204a5100b00dfdd4f6706c43f756ceb6dc +79c6a852e55d3ed165b90f14ad8a8c355db3e4b3aca9463426c28498161ac594517e883c2f347d +b11cb42c0ba008a520401001c7b2133f08a06de1e476dc0011f3d4aa2c8c31df31f14988ae3d6e +b2f79d56374228a9eba0db9dc520a66cdbd548142f784947bbe1a5eaec7679a4806fa226dfca45 +2e45ab06c9bcecf839df96543db4f24785c184102591059b5390a483b8fc48c921b689533630af +e53dcb56da8f6591bda7b5764909bba4c2a896a90e09cb78946b6317823189ffdf08c00981a10c +ba5614e48dec51a6d9af940798fac8775d045ccb0b01421602611407c00c4de85808c7d88a5e92 +8722dfec4c0e80422b29589777d5fd141a58f1b06e5849ae040939edb40b91db004bf734195f2f +a752787ab9dfaea5332dbda435ddc3a3fd6d8f092bf8333cc26f7bfcb5a0ec191ed11e9bfce99f +7af984cbe795189a4a2c21bcafee55187ca51516c756e8413b06a68b20405e68c91337023849d3 +c8f73c1198f3f2276ecec50de6466442caa50c4c56ddf0477790b25b8acb80ca3680b11dbb1104 +d0c31820070720f06c1fc03808b117a2d473d1ed74b1c809a7bca8282eae7a464f7b7973780892 +d6553c2e29a9ef8a9a1f59eecc8433b1d5fe0e291183d2bdcecf08233f3fc4f1ff00e74cc0e1fe +d39f37b42869fd2574e89542e7d911b41cc19b87a138d671e08330767d90402f753d1cd85e18be +3c744bce06eafee8893856d804de01cffbc3aaeddea9dd9405adebbeaa28bb27b8f34a054fa3c4 +09fdd403293463807cc7017e8421b0a1679a711a24317ad1fff14170f13174d2578f6aaefece0e +7cd82469e2b9297640ecc200a000a720b293186033b57dec62c7b182bbc3a62b8b9c0a45f73e63 +3e7ffceb84cd3e7ffcfb00478c6aa60fa269df556fa4278a02d78efd0844e2d20550127820c4ae +03b003118a233f8c612ae9692df4901e31b81f3d6d734d59db14ea9bd1324780d6445e0ea0e740 +cbf6dd60146aa06417ad94fe5ce62fda92fd44dad3b5c264b82ec56aa895680ea63b1399fbf491 +7cf42f000000ffff0300504b0304140006000800000021007555dfd22405000070120000210000 +007070742f736c6964654c61796f7574732f736c6964654c61796f7574312e786d6ccc585d6edc +36107e2fd03b087aa75724254a32b20ef45b14759ca0760e204b5caf10fd95a236768200b949cf +d1bef62639498794e4ddb59dd48ee3c22f4b8a1a7e9c99efd368b42f5e5ed695b1e1a22fdb6669 +e203cb347893b745d95c2ccdb76729f24ca39759536455dbf0a579c57bf3e5d1cf3fbde80efbaa +38ceaeda411a80d1f487d9d25c4bd91d2e167dbee675d61fb41d6fe0deaa157526e1525c2c0a91 +bd07ecba5a10cb628b3a2b1b73da2feeb3bf5dadca9cc76d3ed4bc912388e05526c1ff7e5d76fd +8cd6dd07ad13bc0718bd7bdf2579d541b4b29415370d6d2636b080cd23883c3fad0aa3c96a5838 +2b2507c8aae4fa4edf9d09ced5acd9fc22bad3ee8dd01b4e366f8451160a60da682ea61b9399be +6c367ab2b8b1fd629e6687972b51ab11f2605c2e4da0eb4afd2ed41abf94463e2ee6dbd57cfdfa +0edb7c9ddc61bd980f58ec1caaa21a9dbb1d0e99c3d17930547ab41fc7bd9c3d1a44b9343fa629 +099d24b5510a33645ba18dc2c4f6514aa89710378d08659fd46ecc0e73c13523bf16b3b230bbc5 +665de6a2eddb953cc8db7a92c5ac2e2012db1391cacb8f0e0b284eb185ec2081d3632f4681eb07 +08278e1746961fa781ff694a00f83c8f3a8ac514ef14f84c44df1db7f9bbde685a204af13af276 +6d3192a9c66e3da92997e24c0b6aa658ddd7936da2ef64193bc4b6ac913f8c09a48aee33ee637b +34504c42465d66dde273c4ee0ee565d816576af7398cc063d6e4eb161ebef311b3eae5a9bcaab8 +9e6f2adc2993eaa2d1fe6b7e0bbefa1d16fb0f4b93a953c78326db71be83d1a91f1d95804d55a6 +0a4bc1519c8cc7c9232d1da05472313e9b4631887c6dfc5695f93bde18e73c13e71c8c1a053d92 +331ed3e9c0e680748cdf962b9de5fab681d3a4d62c79a69ab580c6c4c30c8561ec233bf2521452 +27425ee87b0e75a81579f1d36bb61fce47cd82534a898fd22e651681b0bea15dcc1cc765e4beda +fdaa60eb4c1cebd256360514783ddd17f1f970022f340db0a367e5eb4d3deb29d9a2da8e4b94bf +0f85de7b5414de044db7d0632e1e0c8dbd5d68853741db5b684c5dacaac283b1b7a564029cb09d +1d6c8f78ca85c7612bc0099b6db109f17491791cb6029cb0dd1d6cd7a6df43e53eb6029cb0bd2d +b602fe2e2ef7b015e084edef60334757f8c7612bc08757eb5497e84d2baaec821b05ef8d6d2d1d +8b78ff74f5db9eeb779cc9a1ee3be8fb3eacb30a0e35e8736d3d0296604a020437e074cf2128f0 +43e83f1c4282d00ebcc0c24f5fc60b696a0540b25673291fa5f0d55aae1bd26f165c7da105b382 +7e5847ebd388442ca488ba698a6c27f591ef120fd1c80f5237b01397d99fe6eebac8249765cdd3 +f26210fcf5203585377567f4b58c2a9e35d7bdab3cc2ecc0a20790516f2b29f041f3de146f3291 +29c9df50eff708ce9905970efffcf98197156f7645673f53d179d4b269101114474182ec1094e7 +63df8544441676ec942651f8f4a25b4131d2aafb63c804a46b16de7f34110f11de8f659b5db3ad +3ee89a66a86b2ef608779e29e1984531096d07311cc0578e87e1c3dd497ce47a8cba21745dcc0b +fe8766b12a4e86fa4ecec796eec7169b38895d96a40e8a18850ed94f1314923842a995102f65a9 +e360ffbad8f45509ef4af0eebe35e6cbe7bf4ec4c197cf7fff8012a387f99f8139ef7a36a9270c +7d46222f4421b6a16ec6f0ac06297350ea50db8e422f8868a2d4d361fbb67a60f17eeae9daf75c +746da9ff38c1d624a04d56e9f69012c6089b791e55b2f556517faae287b112afb2eef546cb647c +e7477aa953d21c4db7262af6f99fa2a37f010000ffff0300504b030414000600080000002100fd +00fcd1320800004e360000210000007070742f736c6964654d6173746572732f736c6964654d61 +73746572312e786d6cec5bdd6ee33616be5fa0ef20f8b6502c8ad49f314e61495677b0e93468a6 +7bb177b444dbdae86f293a93a41860de64817d8b5dec5ddf649ea4879464cb49ec49da49e10446 +008b3a3ca20ecf77bec343da79f3dd759e69578cd769598c07e8c41868ac88cb242d16e3c1cfef +23dd1d68b5a04542b3b260e3c10dab07df9d7ef39737d5a8ce921f682d18d7608ca21ed1f16029 +44351a0eeb78c9725a9f94152ba06f5ef29c0ab8e58b61c2e907183bcf86a661d8c39ca6c5a07d +9e3fe6f9723e4f631696f12a67856806e12ca302ecaf97695577a3558f19ade2ac8661d4d35b26 +9dc2fce28b2c91d7d9a2f9fc89cdb534b9062f1906020d3a5223b320e3da15cdc683d9020d86a7 +6f86ad72db920fd7d57bce986c1557dff3eaa23ae7ea0defaece398c09430eb482e6e05f3980ea +68d5d46d71a51ac33b8f2fba261d5dcf792eafe01e0d2c04146fe4e750cad8b5d0e246186fa4f1 +f2c70774e3e5f401ed61f78261efa572568d71f7a76376d3799f0a965500cfed926632541ac781 +4967b5e88c5bf1743cf8258a4cdf9a46448fa0a513c327ba3f259e1e99d89d9a4e1498d8fe289f +46f628e64c61f636e9620fd9f7f0ced39897753917277199b781d3c51f408d481b7dd2e05f0c02 +12ec06fa04598e4e42c3d43dcb413af61cc3833e9f38e863eb0bb0b9bbaa590cdba9b73ee830a9 +abb332beacb5a204cc24c40d846b8d065779ad969ab8a9c05d2215196bf59a4ed5d838fc41b45d +ec42e42a18b16d21d3dac61d1916b26ca9200145d8b42c1b6fc14a4715afc5f7accc35d9180f38 +8b85028a5ec10c1bd54e45d9d458528dc4b55f263752730657401f52093cbf2cf9ed40cbde16f5 +78e02142e0dd42dd10cb31e186f77b665b3d220bca4c851f2d6218673c880557b61440dcc94a94 +f3b4b5a879a5ecca6a71216e32a6e65dc90f25e660504665264b981e4e1bb788531594b94a5d4d +32d092158f97dadfb234be6485366394cf182815f22d0dd6120a35f4703369e587fd44c06b2200 +1a7d1e9807ca83c8987a7e3835f48937011e20043c70ac896e637bea19fed4c7f84fe08144561a +24a3f78fd001b9a665efe703c116c2d83d7c3e3c9902958cfe2bf5ac12eea344a4787055f28c2e +800109ab3519b10d49eafd8cb8fb3a85d8fed7fde3831c4c9bce58c11e31a2f9e511439e8a278c +a8f2dffe11ff9e02748f1f913cc2c9bffebf98ef19f269a98574a925a46295d7fde4820f34b9b8 +51e8987e38d1dd20243a71609175c308e961141ac83203c341c6f327974440497b0b33a1d9bc4d +322ac07e6f92b131aca7d69d62cb7408560a32c76c56e517b4e4aae9745945b5af3224c39d660b +d82a64cad884cd7f0291742792d3559094599a4469963d50228beba6001469211a896319465764 +ae959bbbcd38c3ee4daad91ad2b47b062a42ceb3a409360f076660fb58c74e14e9c48a3c58c94c +57c78137899c09993a36f938e862820a26d29c45e962c5d98fab068abb3cd6ea5c0419a3c53aa7 +8a53649f18f80422dddd307a2e370e100b45724e39950eba930d7e0fdfad8eefd1ead77fdfb234 +63459ff3e440391f460176d104eb6138f17462bb13ddf3ac00aa6b0ff9aee1d8beed3c3fe7e710 +d02a4affb5a290d579cbfba60c7e0aef89815d553bec223e944cc47dcdc4efcaf1c3a3fed7e59b +bde61b18c38a6295e78c6f51ce3a50ca99d3c09cb88ea54f43076af86812c95dadab47641ad941 +e4e1107bcf4fb93a4bdeadf28758a74aa5a7adb63632f6b2eed52fb787cab9f5721b42b0d9d3c8 +d2031b439ef7a2a9ee9b61a0c386d274233bb22ce4ad97db1a5ec580518f5e653f7ffaef3b7ef2 +f9d3ffbec222ab2edd795c17f7aad5b2d7f73ddb0c5c5ff71181ca21f41c7d12d9961e599890c0 +7727019e4af65688dc672f081fc7deaafcc07855a6ea1413192d811548d8c1c842aee3364829db +baeb9aa5ede9649cf11f68a5cd16086a3281c0c3d7d04a2ea1355b9852664a992965d0a271cc0a +011a6da393989d64ad833b09ee24a493904e627512ab93d89d04d2e7324b8b4b7086bc0cb47999 +fdb51174ade6ac13f2c419bd2957e26dd222d19334a7898838c4c536f1803d2329e16f13958276 +eb5a92699dae2aeff7e8a29eae2a09f6e89a3d5d95c8f6e8e29eaeca477b74494fd7fe82aed5d3 +75bea06bf774d529c71e5da7a7eb7d41d7ed63a1e2748ff21670dde2711f7871ad924baddaf228 +74e7de4383fcf49ece2e6edb1cdbe4559554193d2b7c7ea9ced4e5f702457b0b5d4b4810b0609e +af8a58c87e35727151c5cd12179fc76d96f48c4d96ec2bf8f2547f5b759d4cd7bdb3d5bbb268ce +617af9ba31f2124a8827e4ee76e8be969a924aa3731a432afd36ffa79e897635a4773a186d8ff5 +eb3b1d71dd8efd609edff67ea556be7b50e4949f01c466530ea705247470aade090e07295137aa +a8b7f2f5c08a4a581b37de99f09482d5152dca1a6e0dd3f0a1f42070edfe80a9552ae26544f334 +93e50608e225e53513eb156bb60a40a2c4e3c1e74fff69a4bd7030d51ee139c2a1d8150ec5ae70 +28f687836a9a1bc86dd752c6bf00c8ad4342fcd912c057445cc2dc228e3788c396164b9f1f217f +22e4ca69070eb9c4b9859cf4200778d586ea08f99320472f21af4b9c5bc8adde526e588e82f108 +f9eb835ce2dc426ef720b7107929e5db11f227422e716e21777a907b4e63fd11f2d707b9c4b985 +dcdd408e89299d7e84fc35422e716e21f77a90bbae7d2cdf5e29e412e7e6c7a59b73996a548a25 +e3eb531a78e2bc098c7676f70fc7372adb473acf12242fcdc70f1f7da8af708efed97950d039e1 +e89f1dbb6aecc88df5d141bbf6a0c8355d65fdd1413b766c6a193f3a68f7fea6fb25c0d1413b76 +0360ee3149efab9d6dcb3926e9ed4ab35f5caa5f54745fd436dfe336ff0776fa1b000000ffff03 +00504b0304140006000800000021009119fff8d404000095130000210000007070742f736c6964 +654c61796f7574732f736c6964654c61796f7574342e786d6cec58cd6edc3610be17e83b08bad3 +12c51f4946ec407f2c823ab651bb3df4464b5caf1afd95e2aed70e02e44dfa1c2d7acb9be4494a +512b3bfe89bd0eecc2875c9614351cceccf7cd7056af5eafeaca5a0ad9976db363c32dd7b64493 +b745d99ceed8bf1e3310d856af7853f0aa6dc48e7d2e7afbf5ee8f3fbceab6fbaad8e3e7ed4259 +5a47d36ff31d7bae54b7ed387d3e1735efb7da4e34faddac953557fa519e3a85e4675a775d399e +eb52a7e66563aff7cb4df6b7b359998bb4cd17b568d4a8448a8a2b6d7f3f2fbb7ed2d66da2ad93 +a2d76acceeeb26a9f34e7babceda83933f6ccbc8c9a55e81f6ae763d3faa0aabe1b55ef8fd4c94 +d69b66ce2b25ccbbbe3b96420cb366f993ec8eba4369b6ec2f0fa55516838af556db59bf588b99 +c7666926ce8deda7d3946faf66b21e461d0a6bb5636bc4ce875f6758132b65e5e3627eb59acf0f +ee90cde7d91dd2ce7480f3c5a18357a371b7ddf126778e4b252a6b0890b163af5793450b59eed8 +ef19f36292310c989e01ecc618c4190e01f35090793e4b3c443f0cbb21ddcea530a0bc29267241 +7a0bd0bacc65dbb733b595b7f59a1913c1349610afb11cac7cefa1183237202088620470865210 +bb24004118c208277e18607dfa18006df3341a2f9cb5bf6bc72720fa6eafcddff556d36aa0065c +47dc2e25463087b19b4f842a5525d672e34b33b98af29a056a15b7c5f970c8891ecd22dfae7a75 +a4ce2b611ebae1c798213510151ff2b51020cd4670d5ae81438749093952de2a16329f5b3f5765 +fe4e34d689e0f24468a16670757478b0c7a876ae4c7026f0bf4e01345160cc83bed3f978613242 +5ade0be5038c538203e6034ab208e0388e4018bb21486106634218826ef09c7ce82fb4fdbc9a0d +e6acae84bf428a3bf23e4081ae5726a161e011ea91eb2580c000d24160486d8c084428b899e0a3 +ea8de9d60d4c5b569715e43efa31c3b9652b2b7eaad95688de3ad6a68d84ecef67dfcde34c70ee +3f6e28c34a58d98968c4061abd8735a6b2548fd0881ed6f85b29e42334e20d82fce9df66768fca +c7a531be278dd10b4de334630451cf07098b438051e283288d5d00094efd308a8298c0ff318d0d +af1e95c614fadef73cfe9ec74f98c764cae394ab457d2d8df14b4de3240903162720a121031827 +09885c9602142628a409832979d6db78ecce0a65dfba97c7a6f849bab599fed360bc0d51e22554 +b7a1c867da5bc24210fa5e00501246cc8f70e653fc61fa0f52702554590b569e2ea438582803e1 +4d22597dad924af0e632a9d52ea45b2edad2a10eae28a56d30b837c52197fc97db74fc16c2d189 +706cf1e9af0b5156a2f99274e485920e27a18722ea812c2110e0845010c591b683119f309f86c4 +45cf4fba999223ebfe5c705d56e444bc073ac2c710ef69d1f62fd16eab5234cda2ae85bc06387d +a1805314e90b9465002601d655c6d55526f07d90519cc5888698f9f8f901efab627f51df89f903 +edc337159b344b7daabb245d5a91ee9042ed7eeca509606ee6058c32426078596cfaaa2c844674 +e31af3f9e3dffb72ebf3c77f9ea0c49861fa7832c5ddccd6ec89e3907a49108318625d37d35037 +7b8c12a05b407d65c44194a06c604f07f16df6e8c5cdd8d3b56742766d693e2f41774da025d757 +798811428442d3a239c6b469bc24c9d1e0be1e2bf99677074bc392b15b4acc5237307314bd1219 +5c9f3ea7edfe070000ffff0300504b030414000600080000002100d60634cc2e060000371f0000 +210000007070742f736c6964654c61796f7574732f736c6964654c61796f7574352e786d6cec59 +cb6edc3614dd17e83f08b3a747a4288a3462077ab108eada41ed66d19d2c713c6af42aa519db09 +02e44ffa1d2dbacb9fe44b4a529267fcccd8890303f5664449e4e125cfb94777a4172fcfcac25a +0ad9e675b533815bf6c412555a677975b233f9ed88033ab1da2ea9b2a4a82bb1333917ede4e5ee +8f3fbc68b6db22db4bceeb4567298caadd4e7626f3ae6bb6a7d3369d8b3269b7ea4654eadeac96 +65d2a9537932cd6472aab0cb628a6c9b4ccb24af26c378b9c9f87a36cb5311d5e9a21455d78348 +51249d8abf9de74d3ba2359ba03552b40ac68cbe1c5277dea8d576a7f5d1d9d1697d70fcc7c432 +9de5525d86935db5fef4b0c8ac2a29d58537429e14224fe7e646db1c492174ab5afe249bc3e6b5 +34fdf797afa595677afc306e321d6e0cddcc69b5348de995e1276333d93e9bc9521fd56658673b +13c5d9b9fe9dea6be2acb3d2fe62baba9ace0f6ee89bcee31b7a4fc709a66b93ea55f5c15d5f0e +1a97739477a2b0f4ee9838f6da6e8c6821f39dc97bce51e0c61c03ae5a00db0106418c19e0c8a1 +31f278881cf2418f86643b95c2d0f22a1be505c9354acb3c95755bcfbaadb42e076d8c12536c42 +3cb0a9a37c6fc7761cb00082d0836a76e80680da3e073ef5380b2881ccf63e0c1ba0621e8f6615 +d361bdc3c24722da66af4edfb656552ba234af3d6f173d7a32f5b1998f92cabb420cfdfa9ba6b1 +dae51b29a60ef32835dc39c485c8bd4c36b45de8127b60113ac875897395cb1ebad9eece823a3b +d7c38fd5d1682dd92edaeeb03b2f843969f48f09432a8a8b447b41264014f7b376bb8668454027 +649f4e56b690e9dcfab9c8d3b7a2b28e45228f85ea54e908faadd42b35d0d3550826aabbc5e55c +884b2db65189fe6e9e146a5e0b3d519985d4269e1fc4c0b5a31860eedb80c55e08a807b14f5d14 +b0103ebecc34b53a202d8eaf511b2414c25e4b2bb929b1791ef57ab551e4308836159b9554e9bc +56567fdc438eba33ed6501d530ab4ce49eb1a4bcca943beba60158ecab4790199589d9afaa63fb +4e990fd6b23f1e9779813200a21520763da4fb6e846a5f47d55003aab34265109b08364185f43a +aa861a50f10a153a1e34f9bc11ace9791956630db0ee1a2c45d4c4f050588d35c092152c429498 +0d7b28acc61a60bd35580f3b1b337613acc61a60e90a56636e4ed90db01a6b80656bb0c4f5be8a +328dd5b7d772c258b19e4475b8786edf65cddcf8f1b2964572a29c3813ada59db337ebf65b3a33 +1e9df955a52db95d3767e7899a332411839451c0b0e303ecb904042a0680a94b239bd98807fc31 +cd5973afb6683658736f9b0fb466e4daaeed5da9042e59b343287655efaf2b04be97faae4e6776 +f2eee97e3fd560567c2c2ab101a2d9eebb11239977f7401c1e8c7721bec985bc0722de60933ffd +5bcdee80bc5f1abbb71558f889e6302621653e0c408c62ac0aacc00581ad0aac08f1904688211b +45dfabc0d2f9fce7225104cb21a5fbb2fb3e294da087cc63eef6728b3a5027fd73b9f55c6e3d97 +5bffd3728bdc516eb94fd4aa0962b17e5f01108e1d65d53806d471086021b32362f310d2477de5 +72dd9ecde3f5c1f67c4bc9b566cfcf25d773c9f5c554f6c6548e926e515eca64f254ff38453685 +34e2007102010e7004021707c00e2248781c85c4ff0e6fb5b2ae2fb9d6fe42c1fe9df5ad196d5e +a96f9876b322eb57cb9c1085247080e3710eb0cb19601ea2c00999cf3d1fc71ec11fc68f0459d2 +892e2f05cf4f16521c2c3a43e15521596dd9858548aa8ba4ee7621d9b29d2db5d57425291583e1 +bdca5e2732d10fb02b727c88e0e82838bef8f4d73b9117a25a179df74445e7c754f92d26803387 +011c3355e9fb5005837ddfc5c40e9cc07d7cd1cd3a7953a10fbff05ef53ec2fbb66cb30bb6eb22 +1755b5284b212f114e9fea271a18ba14c608408c6c802971008331040e610ea7be1b70481e9ff0 +b6c8f617e58d9c7fe185cd83cc268a238fc4dc0521d12a673c06018a42c0ed18514eb8eb427661 +366d91ab725745b7a9c77cfef8f7bedcfafcf19f6f6031e6307edb1cf7ddb406f504012328a401 +082056be19310ff89cb880bb0ec66140fdd089b57a1a88afab475ddc4c3d4d7d2a6453e7e6fb2f +b407012d135d1c104821a29e33d679bd4a56d16aea0ff5fad5b190bf24cdc1d2c8a42f974273a9 +d1d2ecbbaebae8b58f1fbc77ff030000ffff0300504b030414000600080000002100ccacc02fe8 +030000060c0000210000007070742f736c6964654c61796f7574732f736c6964654c61796f7574 +362e786d6ccc965d6edc3610c7df0bf40e82deb99228ea6b9175a02f16455ddba8dd03d012d72b +445fa5a88dd74180dca4e7685f7b939ca4434af23ab10b18850df8654991437266fe3fcef2ddfb +dba636f65c0c55d76e4c67659b066f8baeacda9b8df9fb1545a1690c92b525abbb966fcc031fcc +f7273ffef0ae5f0f7579ca0edd280dd8a31dd66c63eea4ecd79635143bdeb061d5f5bc85b96d27 +1a26e153dc58a5601f61efa6b6b06dfb56c3aad69cd78be7acefb6dbaae059578c0d6fe5b489e0 +3593e0ffb0abfa61d9ad7fce6ebde0036ca3577feb923cf410adac64cdcfdbfa601ada54ec61d0 +314f20fae2b22e8d96353070360ae3aa92bcd613437f253857bd76ff93e82ffb0ba1edcff617c2 +a84ab57e5e675af3c46ca63fdbbdee58df2dbf59ba6c7dbb158d6a2115c6edc604c50eead75263 +fc561ac534581c478bddf913b6c52e7fc2da5a0eb01e1caaa29a9c7b1c0e5ec2d129305476b41f +a7835c3c1a45b5313f518a132fa70451e82162270425398910c56e98e380a6d8f53fabd58ebf2e +04d7a2fc5c2e7039fe23419baa10ddd06de5aae89a998c0530d0d221b396cacb4f9e9bb9244e1d +383df211f1220725419e202fc9529bb84e8629fe3c27007c5e5a1d8535c73b07be0831f4a75df1 +6130da0e8452ba4ebadd5b4c62aab6df3d046ab69b2675e798e59902799b74e5411d720dad1e64 +eb7a9097f25073fdd1ab1fed8600216aa6ee6bc951964fe2ca132d07a4497231216f94a32876c6 +2f75557ce0ad71cd99b8e660d4aa50a780953f7a6bebe882b588ffdf08b80b0219936333f4701d +ef76ac86930dfc4671080312e0cc0951846984484a429424294636f5e20c7b180711797d1c4a09 +d5f50e2261f556390677d1996ee18be0b18512a5a38ddc14a77ee22237a014e08790a30087c84d +a3980631c9031fa25d9c6292cbaae1b4ba19053f1fa596f07bca8ca19169cd597b5f4fe489e3af +6c7705a90e8f48810f5af7b6bc6082fdf698d5ff031c5980a3e33f7fdef1aae6ed43e8dc370a9d +9f7a4ee48514e511f046803314274184322ff0314eb06be3e4f5a1db4a3151f7c7c804a46b016f +59fb02e0bdacdadebdda5d5df1b61d9b868b6f04276f54f028a7d48b888f704c1d440212a3d84e +63e4e7506c6896789e475f5f7078a89d8dcd939ae3572836599e057e4e3d94fa2e94d688e628c1 +598aa89de390fad4834b705f6c86ba2a3928faec1af3f5cb5f6762f5f5cbdf2f506274b3bcd696 +bcebde4c4f92443e4ec304250e81ba9945018aa9ef21eab984a44918a76eaee8e91df2981e187c +1e3d7df7918bbeabf47bd6b16780f6acde98010e5cecfb6130eb3441727456297fa9c287b616bf +b2fe7caf2999fef7533dd42b3227d3a3890a7d79bf9ffc0b0000ffff0300504b03041400060008 +00000021005632cb5c8e030000fa090000210000007070742f736c6964654c61796f7574732f73 +6c6964654c61796f7574372e786d6ccc56db6edc36107d2fd07f10f4ce952851b745d6c1eac2a2 +806b1b75fa018cc4f50ad185a5a88dd78181fc49bfa37ded9fe44b3aa4a47512bb801f6c202fe2 +6834339c33e788d29bb7b76d631db81ceabedbd878e5da16efcabeaabb9b8dfdc73b8a62db1a14 +eb2ad6f41ddfd8473ed86fcf7efee98d580f4d75ce8efda82ca8d10d6bb6b1f74a89b5e30ce59e +b76c58f58277f06cd7cb9629b895374e25d947a8dd368ee7baa1d3b2bab3e77cf99cfc7eb7ab4b +9ef7e5d8f24e4d45246f9882fe877d2d86a59a784e3521f900654cf6b72da9a300b4ef1bd67db0 +2d13260fe0c0f619202faf9bcaea580b8e73cea5f10de29de45c5bdde11729aec59534a117872b +69d5954e9d536c677e308799dbee600ce7bbf49bc564ebdb9d6cf50a13b06e37361075d45747fb +f8adb2cac9593e78cbfde513b1e5be7822da593670beda54a39a9a7b0cc75be0e44c8ded208082 +bb3d6b1497961e92e9e97c504b77a3ac37f6274abd34282841142c44dc94a0b42009a29e1f175e +4433cf0fef75360ed7a5e486975fab455f387cc4695b97b21ffa9d5a957d3b8b63d118d089c94c +a7eef893efe55b9ce42e0a039c21e247054a709ea2304db334247980497c3f0f037a5e5683c299 +b1cf43584819c4795f7e18acae07d234c71387a7888958bd8afdaca94ac11b75074858b3d38d01 +1178a2600936c60303b342d46dda5747bde97b588d93ad9b415dab63c3cd8dd0971d48d3a04dfc +cccbc2d4477e442922014d50127931f2b3644ba32d29a290dc2f42af98e2aa6e39ad6f46c92f47 +652894c035bc017012541ce505f4ddaaace1ac3b89499de170e5fa2b1875acc7350d0d7a30bc77 +d51593ecf7efaa4c031606e702ca59a4f6ff82f317c1d1f1dfbfee78ddf0ee6bd1793faae870e6 +82dc02443105d181c6509283951152b884d028f5ddd717dd4ec949757f8e4cc2b816e12db92f20 +bc97659b9cd8ee9b9a77ddd8b65c7e43b8ff83125e64dbc0755d0f45599cc0ee31415b976e5192 +6e53d7a52e2952fafa84c3c7f9626c9fe4dc7b85c3262ff2282c6880b2d007d0092d50eae519a2 +6ee1c534a4418093d361333475c581d1679f315f3eff7d21575f3efff302478c59964ff5327763 +cdea49d324f4b238452926706ee64984b63484f737f009c9d2789bf985568fc0e4b17ac0f93cf5 +88fe2397a2afcd3f0c7667011d58b3b163cfc7d88b4f3c4d22796856337fade1c3dac8df98b83c +1895c05ec072665c422b730a7d08d1d0977fb6b3ff000000ffff0300504b030414000600080000 +0021004ba90907dd05000065170000210000007070742f736c6964654c61796f7574732f736c69 +64654c61796f7574382e786d6ccc58dd6edb3618bd1fb077107ccf58147f44054d0afd0ec5b2b4 +58b35dec4e91e858abfe46d1aed3a2401f64c09e63c3eefa267d92919494384e6a3b6983e5c6fa +241f1ef2e3777848e9d9f355555a4b2ebaa2a98f26f0c09e58bcce9abca82f8e26bf9c25804dac +4ea6759e964dcd8f2697bc9b3c3ffefebb67ed6157e627e965b39096e2a8bbc3f4683297b23d9c +4ebb6cceabb43b685a5eabff668da852a96ec5c53417e95bc55d9553c7b6e9b44a8b7a32b417fb +b46f66b322e351932d2a5ecb9e44f032956afcddbc68bb91addd87ad15bc5334a6f5cd21c9cb56 +65db9cff7eb69a58062696ea019c1cabccb3d7656ed569a51ebca8e76929adaa90d6a73fcfd53c +667351cca48175ed99e05c47f5f207d1be6e5f09d3fa74f94a5845aed90696c974f8638099db7a +6982e946f38b314c0f573351e9ab9a146b753451b5bbd4bf53fd8cafa495f50fb3eba7d9fce51d +d86c1edf819e8e1d4cd73ad559f583bb9d8e33a67356485e5a7aaecc384e3a398e68218aa3c9fb +247102122718242a02d80e300862ec81c4412c76dc247410fda05b437a98096ecaf3221f6506e9 +add25645269aae99c983aca9068d8c5253558578a8aa1ee57b4451e8138a419c7821c01123c0f3 +690430756c1af8ae8d08fc304c801af37835594c877c87c4c74274ed4993bde9acba5185d275ed +eb7685e88ba9afed7c90962c64c9075cffa709ae67f9ce1233e4b98c99da61e22abdde2c36f290 +e320b72f22a4b63d20d64bd933b787721534f9a56e7daeaeaa84699dcd1bb508cf7bceb293afe5 +65c94dbc2ce130a09ccf7e56e0ee9deaed9afd0aa0e3b586adfe31ed846a54a6da55720ea2b8ef +431e1ba9a8124a2efa8569e50b91cdad1fcb227bc36beb9ca7e29c2b50ada9fb62f4ddb4269b31 +0b93d87679a2519efd9aed5ae51aef74c485e53c51ad629220db097d90b82c0038f12960ae4b40 +ecfbd40f3c27b4fde031b55ae4ab6bc8fe3225902138e8d4632e76c84d9d52e83a5a3c46a798b9 +88f6887d74fa15e234a1731bebb075ec085021ba038bd7b1234085f80eacbd8e1d012a24bbb023 +408574177604a8d0dd851d012a64bbb0234085de2e6c0fb86bf1b77add2fcbabbd669b1924c601 +968d28d30bb5f673de59674a32bd3d74dbbd60b33b23daedddfdf6569359f139aff91e8cce6ec6 +4814f21e8c6837e3af0517f760c47b4cf2a77febd916cafb992abedaf355a1d61d153d51478551 +0423162010464cf5ae364cc0087501c13026288e022f208fbffb6b2b9b9875a4a66ba687b61a04 +f6d0e380631377b0a62f9c0710839028f457faac55a5e2c49c148b3a5787671d9a568b53f58660 +5aadd9843e847cd18607aae124b31fdf0dfbddb0ea81cf8358a3f6e3bbb14d6cd8f9c007916bd2 +d88f709be78f84cc617acb7900e1c6c630103a0ea31af600c28ddd632474b1d9401f40b8b1c50c +849a6dffa26cdb8746424adc0716e5ffdfaceee7b164f4d828958beac6b9153f5197a5b6134342 +88ea0eaa77ac043210501a8018d9110a023f0ce9a39e5b7b97cde52d8f85bd0ebe68b2e6cd7bab +159a1ba3965999f7d97a2874544208203749803ab37bc0731d0650e8f989ebe3d8a5f8c3f84d21 +4f259745c593e26221f8cb85fe56705b645657c9b0e4697da545790ce9818d0ed454b36b49a931 +98bad7f9ab54a45aef1b527d88e0e828b864f1e9af77bc2879bd2e3af2545fec632f26ccc300ba +0155aff328019ee30780529810cf61811fb3c717dd4c8a5e757f2c52757413a3f076bc45dd4778 +dfb6daee55b59bb2e075bda82a2e6e149c3ed182c7a167275ee0e985a6de8eb11f032f8c95d504 +3689f4279e80fa8f5ff0aecc4f17d59d35df71a27b90d94471e4d2382120a4c85307d824068113 +8520b16387253421047a5766d39585da1dd5e8f6f598cf1fff3e15079f3ffef30d2cc65cc64fa0 +e3bc9b68504f1078d40959000288956f469e0bfc84aa4d83208cc380f9218ab57a5a886fab473d +dc4f3d6df3968bb629cce762680f025aa6fa25d1231e830cd3a14ebd48ae07ab2bff5aa7afaea5 +f8296d5f2e8d4afa4d3e348f5aadcc1e7a0dd1a98f9fc78fff030000ffff0300504b0304140006 +000800000021004a0963b7a105000020170000210000007070742f736c6964654c61796f757473 +2f736c6964654c61796f7574392e786d6ccc585b6edc3614fd2fd03d08f34f8ff892282376307a +15455d27a8dd05c812c72344af529a899d20401652a0eb687fb393aca49794348fd84ea6ceb8f0 +cf88e25c1ef2f21c1e927af1f2a62cac95546d5e5727137c644f2c59a5759657d72793df2f6324 +2656db2555961475254f26b7b29dbc3cfdf18717cd715b6467c96dbdec2cc0a8dae3e464b2e8ba +e6783a6dd3852c93f6a86e6405ffcd6b55261dbcaaeb69a692b7805d165362dbceb44cf26a32b4 +57fbb4afe7f33c95619d2e4b59753d889245d2c1f8db45deb4235ab30f5aa3640b30a6f5ee90ba +db06b26df2f4f266629930b5820a3c3985ccd38b22b3aaa4840a3f87629977d6a73faf6016d385 +cae79d096a9b4b25a52e55ab9f5473d1bc56a6edf9eab5b2f24c630d1893e9f0c710665eab9529 +4cbf687e3d1693e39bb92af513a6c4ba39990073b7fa77aaebe44d67a57d65baa94d17afee894d +17d13dd1d3b183e956a73aab7e7077d321633a9779270b4bcf9419c759db8d235aaafc64f23e8e +89cfa398a1184a88d93e437ec43c14132a22e2c601a1ce07dd1a3bc7a992869c9fb35164d8b943 +6c99a7aa6eeb797794d6e5a0905168c0296603a77a94ef83d0f1ec68e622416008ccb567c8e371 +84dc90ba11091d9f87e187610260cce3d364311df21d121f89689bb33a7dd35a550d44695e7bde +d6113d99fad92c0661757957c821aeffd31436b37c2fc5827aae10863bc65d50eb2ed9d4a38450 +b727113bb63d446c53d92337c7dd8d5f67b7baf5153c81c2a44a17352cc1ab1eb368bb8beeb690 +a6bc2af030a04cce7f83e0f61df4b6415f07e8f256c346ff98760a1a1589f6944ca230eafbe84e +8d5480c24eaa7e595ad952a50beb97224fdfc8caba9289ba92105469e89e8cbe9bc66433666112 +fbba3ce9284fbd621b308c778ba4807e2df24c85ea792ce0cc27280c08f4ee0518cd6838433ea7 +d80e621e304e9e5ea8e0807a3c379be8fde5cab1a078d0ab275c46f8ae5e1dec122d22a357265c +eaf411fbe8f521915a65a2ce8c93e55506d6ae8ba6d5f21cf62fd3ea1b1a3645b2811a56da5e78 +446ce36990018f6ef03cccd8de783a728da741063cb6c1c3d4d56b7d4f407b1b50a30c807c0b50 +10a1f37804a04619009d0d2021c2d1618f00d42803a0bb05e832c3dc230035ca002836801a6d7f +52760035ca00e86d013adc7d24291ae57e279555f63a51896ef685973ec610d97abf86f5b86d88 +f4991a62446c4fe0d841946a438c848344180924dc59e4c296ce4cef4f6d88da7e26863698aef9 +e08de47bb67262737758e70fece55460cc21fa7ff546632a07f446bce365dfef8d78c7bb0fe08d +f8d0deb80b78006fdc053c8037ee021ec01b77010fe08dbb800f7ba3868780f5a5e66ba7ced81c +3557b52a926b386466b2b5b407f6e7d0f690874e3e7a6c9874cbb2dd7659f65c5d96c738b07d07 +f199c7e17e147a70ec9c11b8245127b44341a3103fbdcb66dd1d8fc5bd0e1e3459736bfeaa159a +17a396395cdafb43360d48e0f81451378e11e3b1873c970844036f16bb3316b90efb307e0dc892 +4e767929e3fc7aa9e4aba5bee7df1599d5965d50c8a45a6bb13bc5ce914d8f60aac546523086c3 +6feace28b878f9e9af77322f64b52d3afe4c456787b120918f6143c73662b398237f16f8681607 +a117c4ccf56cfef4a29b77aa57dd1fcb44c1748dc2fbc6cde7bf08efb06cbb6bb6eb229755b52c +4ba97608779e29e19c128f78314521c61e104e29f2fd50c06028f3b0270413f4e9096f8bec7c59 +decbf9374e748f329b300a5d27026d070e85a4bd38423e090314db1111b113738ebdb5d9b4450e +bb238c6e5f8ff9fcf1ef7375f4f9e33f07b018f3183f5f8ef36e4a837a7cdf7348207ce46306be +197a2eac5587a39853c6025fcc021a69f53498dd550f54eea79ea67e2b5553e7e6432fb60701ad +92c21c9a31713927e3aed0ab64335a4dfd85ce1f9e85fa35695ead8c4cfa5d3e30558d96661fba +09d1b98f5fb64fff050000ffff0300504b030414000600080000002100d5d192f1bc0000003701 +00002c0000007070742f736c6964654c61796f7574732f5f72656c732f736c6964654c61796f75 +74352e786d6c2e72656c738ccfbd0ac2301007f05df01dc2ed26ad8388347511c1c145f4018ee4 +da06db24e4a2e8db9bd18283e37dfdfe5cb37f4da378526217bc865a5620c89b609def35dcaec7 +d5160467f416c7e049c39b18f6ed72d15c68c45c8e78709145513c6b18728e3ba5d80c3421cb10 +c9974917d284b994a95711cd1d7b52ebaadaa8f46d403b33c5c96a48275b83b8be23fd6387ae73 +860ec13c26f2f94784e2d1593a23674a85c5d453d620e5777fb654cb1201aa6dd4ecddf6030000 +ffff0300504b03041400060008000000210068b9a05cc3060000c9200000140000007070742f74 +68656d652f7468656d65312e786d6cec59cd8b1b3714bf17fa3f0c7377fc35e38f25de608fed6c +92dd64899d941ce5b13ca3b566642479774d0894e4d44ba190965e0abdf5504a030d34f4d23f66 +21a14dff884a1adb33b235dd7c6c42a0eb055bd2fcded34fef3d3dbdd55cbd761a61eb18528648 +dcb2cb574ab605639f8c511cb4ec7bc37ea1615b8c83780c308961cb5e40665fdbfdfcb3ab6087 +87308296908fd90e68d921e7b39d6291f96218b02b640663f16c426804b8e8d2a038a6e044e88d +70b1522ad58a1140b16dc520126aef4c26c887f6ee4a6d0f8baf983339e0633a904ae136763c2d +cb1fb6601ea6d631c02d5bcc3026274378ca6d0b03c6c583965d521fbbb87bb5b816c23c473623 +d7579fa5dc52603cad28391a8cd6828ee33ab5f65abf0260be8debd57bb55e6dad4f0180ef8b95 +265c749df58ae72cb11950d234e8eed6bbd5b286cfe8af6ee1dbaefcd3f00a94349d2d7cbfefa5 +36cc8092a6bb85773bcd4e57d7af4049b3b685af97da5da7aee11528c4289e6ea14b6eadeaad56 +bb864c08de33c29baed3af5796f01455cc4457221ff3bc588bc011a17d0150ce051cc5165fcce0 +04f802e7018c461459fb280845e0cd404c98182e554afd52557ccb3f47b59447c10e0419e964c8 +675b43928fc57c8a66bc65df145aed0ce4e58b17678f9f9f3dfefdecc993b3c7bf2ee7de96db03 +7190957bfdd337fffcf0a5f5f76f3fbe7efaad19cfb2f857bf7cf5ea8f3fff4b3dd7687df7ecd5 +f3672fbffffaaf9f9f1ae06d0a4659f810459059b7e18975974462818609e088be9dc43004282b +d18e03066220650ce81e0f35f4ed05c0c080eb40dd8ef7a9481726e0f5f991467810d2394706e0 +ad30d2800784e00ea1c635dd927365ad308f03f3e4749ec5dd05e0d834b7b7e1e5de7c26e21e99 +547a21d4681e62e17210c018724b3e2353080d620f10d2ec7a807c4a189970eb01b23a00194d32 +44232d9a52a13d1409bf2c4c0485bf35db1cdcb73a049bd477e1b18e147b0360934a8835335e07 +730e22236310e12c721ff0d04472b0a0be6670c685a7038889d51b43c64c3277e842a37b4ba419 +b3db0ff022d29194a3a909b90f08c922bb64ea85209a1939a338cc626fb0a90851601d126e2441 +f41d22fbc20f20ce75f77d0435779fbfb7ef8934640e10f9644e4d5b02127d3f2ef0044093f236 +8db414dba6c8181d9d79a085f63e84189c803184d6bd1b263c9969364f49df0c4556d98326dbdc +047aacca7e0c19b4547163702c625ac80e604072f81c2c3612cf02c411a0799a6f4ff590e989a3 +2e32c62bf6a75a2a45546e5a33893b2cd2d697abf530045a58c93e33c7eb826afe7b933d26648e +de4106beb58c48ec6f6c9b21c0da0469c00c81a8324ce9568868ee4f45e476526273a3dc44dfb4 +a91b8a1b454f84e2732ba08ddac7fd38b5cf07ab7a2ebedec94b299b554e1e6eb3b6f1081da34f +bfb4e982797c08c5697259d95c5636ffc7ca266f3f5fd63397f5cc653df3d1ea99b484511741ab +eb1ea525cabdfb99208c077c81e13e53c50f137b7fdc1783aaa384d6574db3503497d369b88002 +d5b628e15f201e0e423013d394d50c015baa0e9835234c944f6ad8a85b955ff3e8808c93d17279 +75bb2904004fc745f9b51a17c51a4f466bf5f41a6fad5ef50275ddba222065df864466329d44d5 +40a2be1a3c87845ad985b0681a5834a4fa5c16ea67e915713859405e89bb4ec248849b08e9b1f4 +5322bff2ee857b3acf98fab22b86e53525d78bf1b44622136e3a894c1886e2f0d81cbe605f3753 +976af4a429b669d41b1fc2d732896ce4061ceb3deb44ecb9aa2bd4f860d6b227e21f27d18c6642 +1f93990ae0206ed93e5f1afa5d32cb8c32de052c4c60ea51b2fe0871482d8c2211eb5937e038e5 +56aed4e51a3f5172cdd2a76739f59375329c4ca0cf7346d2ae789628313e7d4fb0ec90b9203d08 +c727d608cfe95d200ce5d6cbd28063c4f8da9a634433c19d5a71235d2db7a2f6d625dda200cf42 +b03c51b2c93c81abf69a4e661d8ae9e6aaf4fe7231a3403ae9bd4fddf385369266ce01224f4d73 +fef870877c86559af7355649eadecc75cd55aecb3b25deff40c8504b27d3a849c6066a7967c705 +160499e9d6a19977465cf469b019b5f28058d595aab7f57a9b8c8e44e47745b53ac79c251764a7 +a2fcf6562f26934ca04657d9e5945b738a5af6c392db76bc8aeb154a0db75770aa4ea9d070dbd5 +42db75abe59e5b2e753b9547c2283c8cca6e32775ffcb38f17cbf7f66a7cebdd7db42ab5aff824 +2a1255071795b07a775fae18dedd5b43f9dcb690b0ccc35aa5dfac363bb542b3daee179c6ea751 +687ab54ea15bf3eadd7ed7731bcdfe23db3a5660a75df59c5aaf51a8953dafe0d44a927ea359a8 +3b954adba9b71b3da7fd68696bb1f2d5efcabc8ad7eebf000000ffff0300504b03040a00000000 +000000210015e9f115040900000409000017000000646f6350726f70732f7468756d626e61696c +2e6a706567ffd8ffe000104a46494600010101006000600000ffdb004300030202030202030303 +0304030304050805050404050a070706080c0a0c0c0b0a0b0b0d0e12100d0e110e0b0b10161011 +13141515150c0f171816141812141514ffdb00430103040405040509050509140d0b0d14141414 +141414141414141414141414141414141414141414141414141414141414141414141414141414 +14141414141414ffc00011080090010003012200021101031101ffc4001f000001050101010101 +0100000000000000000102030405060708090a0bffc400b5100002010303020403050504040000 +017d01020300041105122131410613516107227114328191a1082342b1c11552d1f02433627282 +090a161718191a25262728292a3435363738393a434445464748494a535455565758595a636465 +666768696a737475767778797a838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aa +b2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae1e2e3e4e5e6e7e8e9eaf1f2 +f3f4f5f6f7f8f9faffc4001f010003010101010101010101000000000000010203040506070809 +0a0bffc400b5110002010204040304070504040001027700010203110405213106124151076171 +1322328108144291a1b1c109233352f0156272d10a162434e125f11718191a262728292a353637 +38393a434445464748494a535455565758595a636465666768696a737475767778797a82838485 +868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8 +c9cad2d3d4d5d6d7d8d9dae2e3e4e5e6e7e8e9eaf2f3f4f5f6f7f8f9faffda000c030100021103 +11003f00fd53a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a2 +8a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800 +a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a28 +00a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a +2800a28a2800a28a2800a28a2800a2b83f03fc61d17c6be2af11f86637fb26bba2ddcb04969230 +ccd1ab6d12a7a8e991d54fb104f795ad4a73a52e59ab322338cd5e2ee145145645851451400514 +514005145140051451400514514005145140051451400d7758d19dd82aa8c96638007ad53fedcd +37fe8216bff7f97fc6b13e2b7fc92ff187fd81af3ff443d7e52d7d2e5393acd23393a9cbcb6e97 +fd51e4e3b1ff0053715cb7bf99faebfdb9a6ff00d042d7feff002ff8d1fdb9a6ff00d042d7feff +002ff8d7e45515ef7faa6bfe7fff00e4bff04f33fb6dff00cfbfc7fe01faebfdb9a6ff00d042d7 +feff002ff8d1fdb9a6ff00d042d7feff002ff8d7e455147faa6bfe7fff00e4bff043fb6dff00cf +bfc7fe01faebfdb9a6ff00d042d7feff002ff8d1fdb9a6ff00d042d7feff002ff8d7e455147faa +6bfe7fff00e4bff043fb6dff00cfbfc7fe01faebfdb9a6ff00d042d7feff002ff8d1fdb9a6ff00 +d042d7feff002ff8d7e455147faa6bfe7fff00e4bff043fb6dff00cfbfc7fe01faebfdb9a6ff00 +d042d7feff002ff8d1fdb9a6ff00d042d7feff002ff8d7e455147faa6bfe7fff00e4bff043fb6d +ff00cfbfc7fe01faebfdb9a6ff00d042d7feff002ff8d1fdb9a6ff00d042d7feff002ff8d7e455 +147faa6bfe7fff00e4bff043fb6dff00cfbfc7fe01e95f15bc497de1cf8fde28d6745be7b4bdb6 +d627960bab76e41de7f0208e08e84120f15f6bfecf3fb4369df19b46fb2dd79763e29b4406eac8 +1c2cabd3cd8b3d54f71d549c1e304fe6f568787fc41a8f85b59b4d5b49bb92c751b490490dc447 +0cadfd41e841e08241af7f1f93d3c6e1a34ef69c5593f4efe5f91e661b1f3c3d573fb2dea8fd73 +a2bc77f679fda1b4ef8cda37d96ebcbb1f14da20375640e1655e9e6c59eaa7b8eaa4e0f1827d8a +bf25c461ea616a3a5555a48fb7a75215a0a70774c28a28ae7350a28a2800a28a2800a28a2800a2 +8a2800a28a2800a28a280396f8adff0024bfc61ff606bcff00d10f5f94b5fab5f1514b7c30f178 +0324e8f78001ff005c1ebf2afec73ffcf093fef835fa370ab4a955bf747ca6757e787a321a2a6f +b1cfff003c24ff00be0d1f639ffe7849ff007c1afbbe65dcf9bb321a2a6fb1cfff003c24ff00be +0d1f639ffe7849ff007c1a399770b321a2a6fb1cff00f3c24ffbe0d1f639ff00e7849ff7c1a399 +770b321a2a6fb1cfff003c24ff00be0d1f639ffe7849ff007c1a399770b321a2a6fb1cff00f3c2 +4ffbe0d1f639ff00e7849ff7c1a399770b321a2a6fb1cfff003c24ff00be0d1f639ffe7849ff00 +7c1a399770b321a29594ab1041047506b57c2be15d57c6dafd9e8ba2d9c97da8dd3ec8e18ff524 +f40a07249e00144a518c5ca4ec9028b93b2dcd0f86b6be25bcf1c6911f8405c7fc245e7036ad6c +70cac3a927a05c677678c673c57ea7e86ba8268d62bab3dbcbaa08505d3daa9588cb81b8a03ced +ce719af38f809f0134bf82ba0607977de21ba41f6dd436fe3e5c79e4203f8b1193d80f55afc8f3 +ccca9e61592a51f763d7abff0081d8fb9cbb092c2d37cef57d3b0514515f347ac1451450014514 +500145145001451450014514500145145001451450014514500145145001451450014514500145 +14500145145007e67fc50f0aeabe36fda23c55a2e8b6725f6a375ac5c2470c7fef9c927a050392 +4f000afb6fe027c04d2fe0ae8181e5df7886e907db750dbf8f971e79080fe2c464f603a3f067c2 +bd13c13e20f106bb6b0f9daceb77725cdcde4a06f0acdb8449fdd51c7d4f27b01d957d26639c4f +154a186a5a42295fcda5f97fc39e4e17031a339559eb26dfc828a28af9b3d60a28a2800a28a280 +0a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2 +800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28 +a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a +28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a280 +0a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2800a28a2 +800a28a2800a28a2803fffd9504b030414000600080000002100a364236b8d0100003203000011 +0000007070742f7072657350726f70732e786d6cacd2516fdb201000e0f749fb0f16ef0430368e +ad38951d1c69d21ea6aafd01c8c6099a310848dba9ea7f1f73d22add34a99af6742074c777709b +9b273d250fd27965e61a901506899c7b33a8f95083fbbb3d5c83c407310f6232b3acc10fe9c1cd +f6f3a78dadac935ece418498facd25b1d0ec2b51836308b642c8f747a9855f192be778361aa745 +885b774083138ff1023da1146386b45033b8e4bb8fe49b7154bde4a63fe908381771725a24fea8 +ac7fad663f52edba8f77a46d6c523e85af3e5c56c9c9a91a3c7705db7565d64086e90e66244b61 +5b762d649cd00263829bb478f9954db26a50be176ef8a2c54176830a5c04f18a23d91f3cad7a67 +bc19c3aa37fad227b2e6513a6bd4d22ac197f77a10530d3040db0d5a70ef8d9c9206b3b48145b9 +6e6046d312362de7b06d9b75ce588a7382df8c7214a7292c466ed57fe4d1b460c5df887b9e77fb +a6e11077bb0e6639ed60b9a60466ac4d69dbc540b33331affaa370e1ce89fe7b9c9b5b39b6c2cb +e10d9aff0b34bd86926be4392edf8e7e1ff3ed4f000000ffff0300504b03041400060008000000 +2100d8fd8d8fac000000b6000000130000007070742f7461626c655374796c65732e786d6c0ccc +490e82301840e1bd897768fe7d2d43512414c2202b77ea012a9421e94068a312e3dd65f9f2922f +cd3f4aa29758ec643403ffe00112ba35dda407068f7b836340d671dd7169b460b00a0b79b6dfa5 +3c714f7973ab1457ebd0a6689b7006a3737342886d47a1b83d9859e8edf56651dc6db90ca45bf8 +7bd3952481e71d89e29306d4899ec137aa8220a2b4c0a7cbe5886948035c7a34c67154d6d5b9a9 +fd2a2c7e40b23f000000ffff0300504b0304140006000800000021006720e9636d010000c60200 +00110000007070742f7669657750726f70732e786d6c8c52c96ec23010bd57ea3f58be978434a4 +3422e152950b874ad0de2dc7492c39b6e5314bf8fa4e365ac485db2c6fdebc5956eb73a3c85138 +904667743e0b29119a9b42ea2aa3dffbcf972525e0992e98325a64b41540d7f9f3d3caa647294e +5f8e2081869465b4f6dea64100bc160d8399b14263ae34ae611e5d5705856327246e5410856112 +344c6a3ad6bb47ea4d594a2e3e0c3f3442fb81c409c53c8a875a5a98d8ec236cd609409abefa46 +528ec3e90ea87efa113b1fb1de38516c45e9095c70558b240a69f03fb737b64fbdc749d2a7827b +1e50b2107f2edfa962f0086866f766e3649151bc02d4e6b4392018b0572f898fc023733bce9498 +e2d039f98aa5702678c345440952ccc35e0246dbfb6870adb2a971b2929a9c331a23a6cd68148f +90b16107aa3a255bf0579b60192e0ff76cdc85126b5066341fc69e207df075194f2dff483af2eb +e4839cdbbd54b8869d651cbf857094f686d7c14fe4ed640e8cc30be6bf000000ffff0300504b03 +04140006000800000021007749ef2667010000b202000011000801646f6350726f70732f636f72 +652e786d6c20a2040128a000010000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000008c92d14e +c2301486ef4d7c87a5d76edd980a59b692a8e18248422246e35dd31e46e3d62e6d61f03ebe892f +6637d800e5c2cbe6ffce97d3bf4dc7dbb2f036a08d5032435110220f24535cc83c43af8b893f42 +9eb154725a280919da814163727d95b22a614ac35cab0ab415603c67922661558656d65609c686 +ada0a426708474e152e9925a77d439ae28fba439e04118dee3122ce5d452dc08fdaa37a28392b3 +5e59ad75d10a38c3504009d21a1c05113eb21674692e0eb4c909590abbabe022da853dbd35a207 +ebba0eeab845ddfe117e9f3dbfb457f5856cba628048ca5962852d80cc550d7aae84b4fe5c7f7f +19b732b5aeed14f74803330dd42a4da66b99df78d37521e81ee982a6f1821a3b738fb314c01f76 +bfd8bf7933a261239ac7258396e88fe9a1a9bd1fb8e76e98ecfbe892b7f8f1693141641046233f +8cfde87e110e93284eee861fcd6a67f347617958e0ffc6db241a9d183b0169373eff65e4070000 +ffff0300504b030414000600080000002100e329ddaa0f0200000705000010000801646f635072 +6f70732f6170702e786d6c20a2040128a000010000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000a454c16edb300cbd0fd83f18be274eba2d180245459720c8a1590dc44dcf8a45dbc414c990 +b8b4ddf7ec4ff66393e5da4dd6a040579f1ec9e727fa9132bb7cd8abe800d6a1d1b3783c1cc511 +e8dc48d4e52cbecd9683af71e448682994d1308b1fc1c597fce307965a53832504177909ed6671 +45544f93c4e515ec851bfab2f695c2d8bd201fda32314581392c4cfe730f9a928bd16892c00381 +962007752f18b78ad303fdafa83479d39fdb668fb5d7e32c332454867be023963c07ecce58e99a +5c0bd8555d2bcc057937f81a736b9c2928ba094744a9b9079b1ad4c49263a2f7029c3f3b44cbd0 +1aff660169874ab2e44c95a5c28ad28aba0a871f456ca35082e363963c21f6dd10045a0bd80aa5 +04fd54f5e99398add77385752874906d72a160ee0de185500ebc749f602b10cdb05381d6330f34 +3d404ec6460e7ff9714fe268271c3436cee283b02834c52dad0d0256b523cbb760ef9b5112449b +bcb25890b07eb62ce919011ebf788cf133ff14081ebc4a6cb516e0b07c8bf8f80de24ba3d08f0c +09d4fb4f084130d5e353bb332405eea6f00b4067dcff72ec7ee8a1f5be6de7caeb9fb4d7a3b950 +b8b3f85a2dbac6b2a2b38c76dbcf969e6fc020b57f7ef76bfdc2a4ee73fff9c06bd43fdc6d9d99 +8520e896f134c93695b020fd7dee97b54fb09577c2aa863faf842e41769c9785e62a6fdbff1a1f +4f8623ff845bdbe59a7bd9fd70f85f000000ffff0300504b01022d0014000600080000002100df +cc18f5ad010000460c00001300000000000000000000000000000000005b436f6e74656e745f54 +797065735d2e786d6c504b01022d001400060008000000210068f874a103010000e20200000b00 +000000000000000000000000e60300005f72656c732f2e72656c73504b01022d00140006000800 +00002100635c23b4c00000003701000020000000000000000000000000001a0700007070742f73 +6c696465732f5f72656c732f736c696465312e786d6c2e72656c73504b01022d00140006000800 +000021001b2e35070c010000d00300001f00000000000000000000000000180800007070742f5f +72656c732f70726573656e746174696f6e2e786d6c2e72656c73504b01022d0014000600080000 +002100bcd1a735de0200002c0e00001400000000000000000000000000690a00007070742f7072 +6573656e746174696f6e2e786d6c504b01022d0014000600080000002100303a84e5ea0200006c +0600001500000000000000000000000000790d00007070742f736c696465732f736c696465312e +786d6c504b01022d0014000600080000002100d5d192f1bc000000370100002c00000000000000 +000000000000961000007070742f736c6964654c61796f7574732f5f72656c732f736c6964654c +61796f7574362e786d6c2e72656c73504b01022d0014000600080000002100d5d192f1bc000000 +370100002c000000000000000000000000009c1100007070742f736c6964654c61796f7574732f +5f72656c732f736c6964654c61796f7574372e786d6c2e72656c73504b01022d00140006000800 +00002100d5d192f1bc000000370100002c00000000000000000000000000a21200007070742f73 +6c6964654c61796f7574732f5f72656c732f736c6964654c61796f7574392e786d6c2e72656c73 +504b01022d0014000600080000002100d5d192f1bc000000370100002d00000000000000000000 +000000a81300007070742f736c6964654c61796f7574732f5f72656c732f736c6964654c61796f +757431302e786d6c2e72656c73504b01022d0014000600080000002100d5d192f1bc0000003701 +00002c00000000000000000000000000af1400007070742f736c6964654c61796f7574732f5f72 +656c732f736c6964654c61796f7574382e786d6c2e72656c73504b01022d001400060008000000 +2100d5d192f1bc000000370100002d00000000000000000000000000b51500007070742f736c69 +64654c61796f7574732f5f72656c732f736c6964654c61796f757431312e786d6c2e72656c7350 +4b01022d0014000600080000002100d5d192f1bc000000370100002c0000000000000000000000 +0000bc1600007070742f736c6964654c61796f7574732f5f72656c732f736c6964654c61796f75 +74312e786d6c2e72656c73504b01022d0014000600080000002100d5d192f1bc00000037010000 +2c00000000000000000000000000c21700007070742f736c6964654c61796f7574732f5f72656c +732f736c6964654c61796f7574322e786d6c2e72656c73504b01022d0014000600080000002100 +d5d192f1bc000000370100002c00000000000000000000000000c81800007070742f736c696465 +4c61796f7574732f5f72656c732f736c6964654c61796f7574332e786d6c2e72656c73504b0102 +2d0014000600080000002100d5d192f1bc000000370100002c00000000000000000000000000ce +1900007070742f736c6964654c61796f7574732f5f72656c732f736c6964654c61796f7574342e +786d6c2e72656c73504b01022d001400060008000000210069a25f2115010000c70700002c0000 +0000000000000000000000d41a00007070742f736c6964654d6173746572732f5f72656c732f73 +6c6964654d6173746572312e786d6c2e72656c73504b01022d0014000600080000002100e40b4c +2ac6040000891000002200000000000000000000000000331c00007070742f736c6964654c6179 +6f7574732f736c6964654c61796f757431312e786d6c504b01022d0014000600080000002100ee +0bf3bf90040000a70f00002200000000000000000000000000392100007070742f736c6964654c +61796f7574732f736c6964654c61796f757431302e786d6c504b01022d00140006000800000021 +005a9d379569050000671500002100000000000000000000000000092600007070742f736c6964 +654c61796f7574732f736c6964654c61796f7574332e786d6c504b01022d001400060008000000 +21008f55c3fd730400006b0f00002100000000000000000000000000b12b00007070742f736c69 +64654c61796f7574732f736c6964654c61796f7574322e786d6c504b01022d0014000600080000 +0021007555dfd224050000701200002100000000000000000000000000633000007070742f736c +6964654c61796f7574732f736c6964654c61796f7574312e786d6c504b01022d00140006000800 +00002100fd00fcd1320800004e3600002100000000000000000000000000c63500007070742f73 +6c6964654d6173746572732f736c6964654d6173746572312e786d6c504b01022d001400060008 +00000021009119fff8d4040000951300002100000000000000000000000000373e00007070742f +736c6964654c61796f7574732f736c6964654c61796f7574342e786d6c504b01022d0014000600 +080000002100d60634cc2e060000371f000021000000000000000000000000004a430000707074 +2f736c6964654c61796f7574732f736c6964654c61796f7574352e786d6c504b01022d00140006 +00080000002100ccacc02fe8030000060c00002100000000000000000000000000b74900007070 +742f736c6964654c61796f7574732f736c6964654c61796f7574362e786d6c504b01022d001400 +06000800000021005632cb5c8e030000fa0900002100000000000000000000000000de4d000070 +70742f736c6964654c61796f7574732f736c6964654c61796f7574372e786d6c504b01022d0014 +0006000800000021004ba90907dd050000651700002100000000000000000000000000ab510000 +7070742f736c6964654c61796f7574732f736c6964654c61796f7574382e786d6c504b01022d00 +140006000800000021004a0963b7a1050000201700002100000000000000000000000000c75700 +007070742f736c6964654c61796f7574732f736c6964654c61796f7574392e786d6c504b01022d +0014000600080000002100d5d192f1bc000000370100002c00000000000000000000000000a75d +00007070742f736c6964654c61796f7574732f5f72656c732f736c6964654c61796f7574352e78 +6d6c2e72656c73504b01022d001400060008000000210068b9a05cc3060000c920000014000000 +00000000000000000000ad5e00007070742f7468656d652f7468656d65312e786d6c504b01022d +000a00000000000000210015e9f11504090000040900001700000000000000000000000000a265 +0000646f6350726f70732f7468756d626e61696c2e6a706567504b01022d001400060008000000 +2100a364236b8d010000320300001100000000000000000000000000db6e00007070742f707265 +7350726f70732e786d6c504b01022d0014000600080000002100d8fd8d8fac000000b600000013 +00000000000000000000000000977000007070742f7461626c655374796c65732e786d6c504b01 +022d00140006000800000021006720e9636d010000c60200001100000000000000000000000000 +747100007070742f7669657750726f70732e786d6c504b01022d00140006000800000021007749 +ef2667010000b2020000110000000000000000000000000010730000646f6350726f70732f636f +72652e786d6c504b01022d0014000600080000002100e329ddaa0f020000070500001000000000 +000000000000000000ae750000646f6350726f70732f6170702e786d6c504b0506000000002500 +25004d0b0000f37800000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000002004f006c00650050007200650073003000300030000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000001800020103 +00000005000000ffffffff00000000000000000000000000000000000000000000000000000000 +000000000000000003000000fc010000000000005200690063006800450064006900740046006c +006100670073000000000000000000000000000000000000000000000000000000000000000000 +0000000000001c000200ffffffffffffffffffffffff0000000000000000000000000000000000 +000000000000000000000000000000000000000b0000000c000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000ffffffffffffff +ffffffffff00000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000fa020000040000002f528f00040000002d010400070000 +00fc020100000000000000040000002d010500120000002403070065026a03e4086a03e408af02 +5a0a2504e4089b05e408e0046502e004040000002d010200040000002d01030004000000f00104 +00040000002701ffff040000002c010000070000001604cf08a80f00000000030000001e000400 +00002c010000040000002701ffff0300000000000000000000000000000000000000000000004e +414e49000000000000000001000008000000000100000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000 +01050000 +05000000 +0d000000 +4d45544146494c455049435400 +0a450000 +28d9ffff +c2010000 +08000a45d8260000 +010009000003dd00000006001200000000000400000003010800050000000b0200000000050000 +000c02cf08a80f030000001e0007000000fc020000ffffff000000040000002d01000008000000 +fa02050000000000ffffff00040000002d0101000e00000024030500ffffffffffffcf08a80fcf +08a80fffffffffffff08000000fa0200000000000000000000040000002d01020007000000fc02 +0000ffffff000000040000002d01030004000000f001000007000000fc0200004472c400000004 +0000002d0100000400000006010100040000002d010100120000002403070065026a03e4086a03 +e408af025a0a2504e4089b05e408e0046502e004040000002d0102000400000006010100040000 +002d01030008000000fa020000040000002f528f00040000002d01040007000000fc0201000000 +00000000040000002d010500120000002403070065026a03e4086a03e408af025a0a2504e4089b +05e408e0046502e004040000002d010200040000002d01030004000000f0010400040000002701 +ffff040000002c010000070000001604cf08a80f00000000030000001e00040000002c01000004 +0000002701ffff030000000000 +}{\result{\pict\wmetafile8\picw10020\pich5638\picwgoal10020\pichgoal5638 +010009000003dd00000006001200000000000400000003010800050000000b0200000000050000 +000c02cf08a80f030000001e0007000000fc020000ffffff000000040000002d01000008000000 +fa02050000000000ffffff00040000002d0101000e00000024030500ffffffffffffcf08a80fcf +08a80fffffffffffff08000000fa0200000000000000000000040000002d01020007000000fc02 +0000ffffff000000040000002d01030004000000f001000007000000fc0200004472c400000004 +0000002d0100000400000006010100040000002d010100120000002403070065026a03e4086a03 +e408af025a0a2504e4089b05e408e0046502e004040000002d0102000400000006010100040000 +002d01030008000000fa020000040000002f528f00040000002d01040007000000fc0201000000 +00000000040000002d010500120000002403070065026a03e4086a03e408af025a0a2504e4089b +05e408e0046502e004040000002d010200040000002d01030004000000f0010400040000002701 +ffff040000002c010000070000001604cf08a80f00000000030000001e00040000002c01000004 +0000002701ffff030000000000 +}}} \ No newline at end of file Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/sw/qa/filter/html/data/ole2.png and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/sw/qa/filter/html/data/ole2.png differ diff -Nru libreoffice-7.4.1~rc2/sw/qa/filter/html/data/relative-keep-aspect-image.xhtml libreoffice-7.4.2~rc3/sw/qa/filter/html/data/relative-keep-aspect-image.xhtml --- libreoffice-7.4.1~rc2/sw/qa/filter/html/data/relative-keep-aspect-image.xhtml 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/filter/html/data/relative-keep-aspect-image.xhtml 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libreoffice-7.4.1~rc2/sw/qa/filter/html/data/relative-keep-aspect.xhtml libreoffice-7.4.2~rc3/sw/qa/filter/html/data/relative-keep-aspect.xhtml --- libreoffice-7.4.1~rc2/sw/qa/filter/html/data/relative-keep-aspect.xhtml 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/filter/html/data/relative-keep-aspect.xhtml 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libreoffice-7.4.1~rc2/sw/qa/filter/html/html.cxx libreoffice-7.4.2~rc3/sw/qa/filter/html/html.cxx --- libreoffice-7.4.1~rc2/sw/qa/filter/html/html.cxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/qa/filter/html/html.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -0,0 +1,112 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include + +#include + +#include +#include +#include +#include + +namespace +{ +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/filter/html/data/"; + +/** + * Covers sw/source/filter/html/ fixes. + * + * Note that these tests are meant to be simple: either load a file and assert some result or build + * a document model with code, export and assert that result. + * + * Keep using the various sw_import/export suites for multiple filter calls inside a single + * test. + */ +class Test : public SwModelTestBase +{ +}; + +CPPUNIT_TEST_FIXTURE(Test, testEmptyParagraph) +{ + // Given a document with 2 paragraphs, the second is empty: + OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "empty-paragraph.xhtml"; + uno::Sequence aLoadArgs = { + comphelper::makePropertyValue("FilterName", OUString("HTML (StarWriter)")), + comphelper::makePropertyValue("FilterOptions", OUString("xhtmlns=reqif-xhtml")), + }; + + // When loading that file: + mxComponent = loadFromDesktop(aURL, OUString(), aLoadArgs); + + // Then make sure that the resulting document has a 2nd empty paragraph: + getParagraph(1, "a"); + // Without the accompanying fix in place, this test would have failed with: + // An uncaught exception of type com.sun.star.container.NoSuchElementException + // i.e. the 2nd paragraph was lost. + getParagraph(2); +} + +CPPUNIT_TEST_FIXTURE(Test, testRelativeKeepAspect) +{ + // Given a document with an OLE object, width set to 100%, height is not set: + OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "relative-keep-aspect.xhtml"; + uno::Sequence aLoadArgs = { + comphelper::makePropertyValue("FilterName", OUString("HTML (StarWriter)")), + comphelper::makePropertyValue("FilterOptions", OUString("xhtmlns=reqif-xhtml")), + }; + + // When loading that file: + mxComponent = loadFromDesktop(aURL, OUString(), aLoadArgs); + + // Then make sure that the aspect ratio of the image is kept: + auto pTextDocument = dynamic_cast(mxComponent.get()); + SwDoc* pDoc = pTextDocument->GetDocShell()->GetDoc(); + const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats(); + const SwFrameFormat* pFormat = rFormats[0]; + const SwFormatFrameSize& rSize = pFormat->GetFrameSize(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 255 + // - Actual : 0 + // i.e. the height had a fixed value, not "keep aspect". + CPPUNIT_ASSERT_EQUAL(static_cast(SwFormatFrameSize::SYNCED), + static_cast(rSize.GetHeightPercent())); +} + +CPPUNIT_TEST_FIXTURE(Test, testRelativeKeepAspectImage) +{ + // Given a document with an image, width set to 100%, height is not set: + OUString aURL + = m_directories.getURLFromSrc(DATA_DIRECTORY) + "relative-keep-aspect-image.xhtml"; + uno::Sequence aLoadArgs = { + comphelper::makePropertyValue("FilterName", OUString("HTML (StarWriter)")), + comphelper::makePropertyValue("FilterOptions", OUString("xhtmlns=reqif-xhtml")), + }; + + // When loading that file: + mxComponent = loadFromDesktop(aURL, OUString(), aLoadArgs); + + // Then make sure that the aspect ratio of the image is kept: + auto pTextDocument = dynamic_cast(mxComponent.get()); + SwDoc* pDoc = pTextDocument->GetDocShell()->GetDoc(); + const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats(); + const SwFrameFormat* pFormat = rFormats[0]; + const SwFormatFrameSize& rSize = pFormat->GetFrameSize(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 255 + // - Actual : 0 + // i.e. the height had a fixed value, not "keep aspect". + CPPUNIT_ASSERT_EQUAL(static_cast(SwFormatFrameSize::SYNCED), + static_cast(rSize.GetHeightPercent())); +} +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-7.4.1~rc2/sw/source/core/crsr/crsrsh.cxx libreoffice-7.4.2~rc3/sw/source/core/crsr/crsrsh.cxx --- libreoffice-7.4.1~rc2/sw/source/core/crsr/crsrsh.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/crsr/crsrsh.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -3642,6 +3642,19 @@ pStartCursor->DeleteMark(); bChanged = true; } + if (pStartCursor->GetPoint()->nNode.GetNode().IsTableNode()) + { + // tdf#106959: When cursor points to start of a table, the proper content + // node is the first one inside the table, not the previous one + SwNodes& aNodes = GetDoc()->GetNodes(); + SwNodeIndex aIdx(pStartCursor->GetPoint()->nNode); + if (SwNode* pNode = aNodes.GoNext(&aIdx)) + { + SwPaM aTmpPam(*pNode); + *pStartCursor = aTmpPam; + bChanged = true; + } + } if( !sw_PosOk( *pStartCursor->GetPoint() ) ) { SwNodes & aNodes = GetDoc()->GetNodes(); diff -Nru libreoffice-7.4.1~rc2/sw/source/core/doc/docredln.cxx libreoffice-7.4.2~rc3/sw/source/core/doc/docredln.cxx --- libreoffice-7.4.1~rc2/sw/source/core/doc/docredln.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/doc/docredln.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -924,7 +924,11 @@ { aPam.GetPoint()->nNode--; SwContentNode* pNode = aPam.GetPoint()->nNode.GetNode().GetContentNode(); - aPam.GetPoint()->nContent.Assign( pNode, pNode->Len() ); + if ( pNode ) + aPam.GetPoint()->nContent.Assign( pNode, pNode->Len() ); + else + // tdf#147507 set it back to a content node to avoid of crashing + aPam.GetPoint()->nNode++; } else if (aPam.GetPoint()->nNode < aPam.GetMark()->nNode) { diff -Nru libreoffice-7.4.1~rc2/sw/source/core/doc/fmtcol.cxx libreoffice-7.4.2~rc3/sw/source/core/doc/fmtcol.cxx --- libreoffice-7.4.1~rc2/sw/source/core/doc/fmtcol.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/doc/fmtcol.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -113,6 +113,19 @@ { if(m_bInSwFntCache) pSwFontCache->Delete( this ); + + if (GetDoc()->IsInDtor()) + { + return; + } + + for (const auto& pCharFormat : *GetDoc()->GetCharFormats()) + { + if (pCharFormat->GetLinkedParaFormat() == this) + { + pCharFormat->SetLinkedParaFormat(nullptr); + } + } } void SwTextFormatColl::SwClientNotify(const SwModify& rModify, const SfxHint& rHint) { @@ -316,7 +329,7 @@ SwFormatColl::SwClientNotify(rModify, rHint); } -void SwTextFormatColl::SetLinkedCharFormat(SwCharFormat& rLink) { mpLinkedCharFormat = &rLink; } +void SwTextFormatColl::SetLinkedCharFormat(SwCharFormat* pLink) { mpLinkedCharFormat = pLink; } const SwCharFormat* SwTextFormatColl::GetLinkedCharFormat() const { return mpLinkedCharFormat; } diff -Nru libreoffice-7.4.1~rc2/sw/source/core/doc/tblrwcl.cxx libreoffice-7.4.2~rc3/sw/source/core/doc/tblrwcl.cxx --- libreoffice-7.4.1~rc2/sw/source/core/doc/tblrwcl.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/doc/tblrwcl.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -599,7 +599,7 @@ SwPaM aPaM(aInsPos); pDoc->getIDocumentContentOperations().InsertString( aPaM, OUStringChar(CH_TXT_TRACKED_DUMMY_CHAR) ); - pDoc->SetRowNotTracked( aCursor, aSetTracking ); + pDoc->SetRowNotTracked( aCursor, aSetTracking, /*bAll=*/false, /*bIns=*/true ); } } } diff -Nru libreoffice-7.4.1~rc2/sw/source/core/docnode/ndtbl1.cxx libreoffice-7.4.2~rc3/sw/source/core/docnode/ndtbl1.cxx --- libreoffice-7.4.1~rc2/sw/source/core/docnode/ndtbl1.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/docnode/ndtbl1.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -52,6 +52,7 @@ #include #include #include +#include using ::editeng::SvxBorderLine; using namespace ::com::sun::star; @@ -540,6 +541,7 @@ return bRet; } +// has a table row, which is not a tracked deletion bool SwDoc::HasRowNotTracked( const SwCursor& rCursor ) { SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); @@ -552,17 +554,32 @@ if( aRowArr.empty() ) return false; + SwRedlineTable::size_type nRedlinePos = 0; + SwDoc* pDoc = aRowArr[0]->GetFrameFormat()->GetDoc(); + const IDocumentRedlineAccess& rIDRA = pDoc->getIDocumentRedlineAccess(); + for( auto pLn : aRowArr ) { auto pHasTextChangesOnlyProp = pLn->GetFrameFormat()->GetAttrSet().GetItem(RES_PRINT); if ( !pHasTextChangesOnlyProp || pHasTextChangesOnlyProp->GetValue() ) - // there is a not deleted row in the table selection + // there is a not tracked row in the table selection return true; + + // tdf#150666 examine tracked row: it's possible to delete a tracked insertion + SwRedlineTable::size_type nPos = pLn->UpdateTextChangesOnly(nRedlinePos); + if ( nPos != SwRedlineTable::npos ) + { + const SwRedlineTable& aRedlineTable = rIDRA.GetRedlineTable(); + SwRangeRedline* pTmp = aRedlineTable[ nPos ]; + if ( RedlineType::Insert == pTmp->GetType() ) + return true; + } } return false; } -void SwDoc::SetRowNotTracked( const SwCursor& rCursor, const SvxPrintItem &rNew, bool bAll ) +void SwDoc::SetRowNotTracked( const SwCursor& rCursor, + const SvxPrintItem &rNew, bool bAll, bool bIns ) { SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( !pTableNd ) @@ -585,19 +602,43 @@ GetIDocumentUndoRedo().AppendUndo(std::make_unique(*pTableNd)); } + bool bInsertDummy = !bAll && !bIns && + // HasTextChangesOnly == false, i.e. a tracked row change (deletion, if bIns == false) + !rNew.GetValue(); std::vector> aFormatCmp; aFormatCmp.reserve( std::max( 255, static_cast(aRowArr.size()) ) ); + SwRedlineTable::size_type nRedlinePos = 0; for( auto pLn : aRowArr ) { + // tdf#150666 deleting row insertion from the same author needs special handling, + // because removing redlines of the author can result an empty line, + // which doesn't contain any redline for the tracked row + bool bDeletionOfOwnRowInsertion = false; + if ( bInsertDummy ) + { + SwRedlineTable::size_type nPos = pLn->UpdateTextChangesOnly(nRedlinePos); + if ( nPos != SwRedlineTable::npos ) + { + SwDoc* pDoc = pLn->GetFrameFormat()->GetDoc(); + IDocumentRedlineAccess& rIDRA = pDoc->getIDocumentRedlineAccess(); + const SwRedlineTable& aRedlineTable = rIDRA.GetRedlineTable(); + SwRangeRedline* pTmp = aRedlineTable[ nPos ]; + if ( RedlineType::Insert == pTmp->GetType() && + rIDRA.GetRedlineAuthor() == pTmp->GetRedlineData().GetAuthor() && + pTmp->GetText()[0] == CH_TXT_TRACKED_DUMMY_CHAR ) + { + bDeletionOfOwnRowInsertion = true; + } + } + } + ::lcl_ProcessRowAttr( aFormatCmp, pLn, rNew ); // as a workaround for the rows without text content, // add a redline with invisible text CH_TXT_TRACKED_DUMMY_CHAR // (unless the table is part of a bigger deletion, where the // new redline can cause a problem) - if ( !bAll && - // HasTextChangesOnly == false, i.e. a tracked row insertion or deletion - !rNew.GetValue() && pLn->IsEmpty() ) + if ( bInsertDummy && (pLn->IsEmpty() || bDeletionOfOwnRowInsertion ) ) { SwNodeIndex aInsPos( *(pLn->GetTabBoxes()[0]->GetSttNd()), 1 ); RedlineFlags eOld = getIDocumentRedlineAccess().GetRedlineFlags(); @@ -1629,7 +1670,8 @@ } fTotalWish += aWish[i]; } - const sal_uInt16 nEqualWidth = nSelectedWidth / nCols; + assert(nCols); + const sal_uInt16 nEqualWidth = nCols ? nSelectedWidth / nCols : 0; // bBalance: Distribute the width evenly for (sal_uInt16 & rn : aWish) if ( rn && bBalance ) diff -Nru libreoffice-7.4.1~rc2/sw/source/core/frmedt/fetab.cxx libreoffice-7.4.2~rc3/sw/source/core/frmedt/fetab.cxx --- libreoffice-7.4.1~rc2/sw/source/core/frmedt/fetab.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/frmedt/fetab.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -417,6 +417,16 @@ } SwTableBox* pNextBox = pDelLine->FindNextBox( pTableNd->GetTable(), pDelBox ); + // skip deleted lines in Hide Changes mode with enabled change tracking + if ( bRecordAndHideChanges ) + { + SwRedlineTable::size_type nRedlinePos = 0; + while( pNextBox && pNextBox->GetUpper()->IsDeleted(nRedlinePos) ) + pNextBox = pNextBox->GetUpper()->FindNextBox( pTableNd->GetTable(), + pNextBox->GetUpper()->GetTabBoxes().back() ); + } + + // skip protected cells while( pNextBox && pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() ) pNextBox = pNextBox->FindNextBox( pTableNd->GetTable(), pNextBox ); @@ -429,6 +439,19 @@ pDelBox = pDelBox->GetTabLines()[0]->GetTabBoxes()[0]; pNextBox = pDelLine->FindPreviousBox( pTableNd->GetTable(), pDelBox ); + // skip previous deleted lines in Hide Changes mode with enabled change tracking + if ( bRecordAndHideChanges ) + { + SwRedlineTable::size_type nRedlinePos = 0; + while( pNextBox && pNextBox->GetUpper()->IsDeleted(nRedlinePos) ) + { + pNextBox = pNextBox->GetUpper()->FindPreviousBox( pTableNd->GetTable(), + pNextBox->GetUpper()->GetTabBoxes()[0] ); + nRedlinePos = 0; + } + } + + // skip previous protected cells while( pNextBox && pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() ) pNextBox = pNextBox->FindPreviousBox( pTableNd->GetTable(), pNextBox ); @@ -471,18 +494,11 @@ if( !pCNd ) pCNd = GetDoc()->GetNodes().GoNext( &aIdx ); - if( pCNd ) - { - SwPaM* pPam = GetCursor(); - pPam->GetPoint()->nNode = aIdx; - pPam->GetPoint()->nContent.Assign( pCNd, 0 ); - pPam->SetMark(); // both want something - pPam->DeleteMark(); - } - // remove row frames in Hide Changes mode (and table frames, if needed) if ( bRecordAndHideChanges ) { + // remove all frames of the table, and make them again without the deleted ones + // TODO remove only the deleted frames pTableNd->DelFrames(); if ( !pTableNd->GetTable().IsDeleted() ) { @@ -491,9 +507,28 @@ } EndAllActionAndCall(); + + // put cursor + SwPaM* pPam = GetCursor(); + pPam->GetPoint()->nNode = aIdx; + pPam->GetPoint()->nContent.Assign( pCNd, 0 ); + pPam->SetMark(); // both want something + pPam->DeleteMark(); + if ( SwWrtShell* pWrtShell = dynamic_cast(this) ) + pWrtShell->UpdateCursor(); + EndUndo(bCompleteTable ? SwUndoId::UI_TABLE_DELETE : SwUndoId::ROW_DELETE); return true; } + else if( pCNd ) + { + // put cursor + SwPaM* pPam = GetCursor(); + pPam->GetPoint()->nNode = aIdx; + pPam->GetPoint()->nContent.Assign( pCNd, 0 ); + pPam->SetMark(); // both want something + pPam->DeleteMark(); + } } // now delete the lines diff -Nru libreoffice-7.4.1~rc2/sw/source/core/layout/calcmove.cxx libreoffice-7.4.2~rc3/sw/source/core/layout/calcmove.cxx --- libreoffice-7.4.1~rc2/sw/source/core/layout/calcmove.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/layout/calcmove.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -977,7 +977,7 @@ setFramePrintAreaValid(false); SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this); - if (IsNeighbourFrame()) + if (IsNeighbourFrame() && !bVert) { SwTwips nPrtHeight = (GetUpper()->getFramePrintArea().*fnRect->fnGetHeight)(); const tools::Long nDiff = nPrtHeight - (getFrameArea().*fnRect->fnGetHeight)(); diff -Nru libreoffice-7.4.1~rc2/sw/source/core/txtnode/chrfmt.cxx libreoffice-7.4.2~rc3/sw/source/core/txtnode/chrfmt.cxx --- libreoffice-7.4.1~rc2/sw/source/core/txtnode/chrfmt.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/txtnode/chrfmt.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -21,6 +21,7 @@ #include #include +#include void SwCharFormat::dumpAsXml(xmlTextWriterPtr pWriter) const { @@ -38,10 +39,26 @@ (void)xmlTextWriterEndElement(pWriter); } -void SwCharFormat::SetLinkedParaFormat(SwTextFormatColl& rLink) { mpLinkedParaFormat = &rLink; } +void SwCharFormat::SetLinkedParaFormat(SwTextFormatColl* pLink) { mpLinkedParaFormat = pLink; } const SwTextFormatColl* SwCharFormat::GetLinkedParaFormat() const { return mpLinkedParaFormat; } +SwCharFormat::~SwCharFormat() +{ + if (GetDoc()->IsInDtor()) + { + return; + } + + for (const auto& pTextFormat : *GetDoc()->GetTextFormatColls()) + { + if (pTextFormat->GetLinkedCharFormat() == this) + { + pTextFormat->SetLinkedCharFormat(nullptr); + } + } +} + void SwCharFormats::dumpAsXml(xmlTextWriterPtr pWriter) const { (void)xmlTextWriterStartElement(pWriter, BAD_CAST("SwCharFormats")); diff -Nru libreoffice-7.4.1~rc2/sw/source/core/unocore/unoportenum.cxx libreoffice-7.4.2~rc3/sw/source/core/unocore/unoportenum.cxx --- libreoffice-7.4.1~rc2/sw/source/core/unocore/unoportenum.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/unocore/unoportenum.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -337,7 +337,11 @@ SwXTextPortionEnumeration::~SwXTextPortionEnumeration() { SolarMutexGuard aGuard; - m_pUnoCursor.reset(nullptr); + if( m_pUnoCursor ) + { + m_pUnoCursor->GetDoc().cleanupUnoCursorTable(); + m_pUnoCursor.reset(nullptr); + } } sal_Bool SwXTextPortionEnumeration::hasMoreElements() diff -Nru libreoffice-7.4.1~rc2/sw/source/core/unocore/unoredline.cxx libreoffice-7.4.2~rc3/sw/source/core/unocore/unoredline.cxx --- libreoffice-7.4.1~rc2/sw/source/core/unocore/unoredline.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/core/unocore/unoredline.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -90,6 +90,11 @@ return css::uno::Sequence(); } +uno::Reference SwXRedlineText::CreateCursor() +{ + return createTextCursor(); +} + uno::Reference SwXRedlineText::createTextCursor() { SolarMutexGuard aGuard; diff -Nru libreoffice-7.4.1~rc2/sw/source/filter/html/htmlgrin.cxx libreoffice-7.4.2~rc3/sw/source/filter/html/htmlgrin.cxx --- libreoffice-7.4.1~rc2/sw/source/filter/html/htmlgrin.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/filter/html/htmlgrin.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -527,10 +527,30 @@ if (!bHeightProvided) nHeight = aPixelSize.Height(); // tdf#142781 - calculate the width/height keeping the aspect ratio - if (!bPercentWidth && bWidthProvided && !bHeightProvided && aPixelSize.Width()) - nHeight = nWidth * aPixelSize.Height() / aPixelSize.Width(); - else if (!bPercentHeight && !bWidthProvided && bHeightProvided && aPixelSize.Height()) - nWidth = nHeight * aPixelSize.Width() / aPixelSize.Height(); + if (bWidthProvided && !bHeightProvided && aPixelSize.Width()) + { + if (bPercentWidth) + { + nHeight = SwFormatFrameSize::SYNCED; + bPercentHeight = true; + } + else + { + nHeight = nWidth * aPixelSize.Height() / aPixelSize.Width(); + } + } + else if (!bWidthProvided && bHeightProvided && aPixelSize.Height()) + { + if (bPercentHeight) + { + nWidth = SwFormatFrameSize::SYNCED; + bPercentWidth = true; + } + else + { + nWidth = nHeight * aPixelSize.Width() / aPixelSize.Height(); + } + } } SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() ); @@ -648,7 +668,11 @@ // bPercentWidth / bPercentHeight means we have a percent size. If that's not the case and we have no // size from nWidth / nHeight either, then inspect the image header. - if ((!bPercentWidth && !nWidth) && (!bPercentHeight && !nHeight) && !m_bFuzzing && allowAccessLink(*m_xDoc)) + bool bRelWidthScale = bPercentWidth && nWidth == SwFormatFrameSize::SYNCED; + bool bNeedWidth = (!bPercentWidth && !nWidth) || bRelWidthScale; + bool bRelHeightScale = bPercentHeight && nHeight == SwFormatFrameSize::SYNCED; + bool bNeedHeight = (!bPercentHeight && !nHeight) || bRelHeightScale; + if ((bNeedWidth || bNeedHeight) && !m_bFuzzing && allowAccessLink(*m_xDoc)) { GraphicDescriptor aDescriptor(aGraphicURL); if (aDescriptor.Detect(/*bExtendedInfo=*/true)) @@ -657,12 +681,18 @@ // HTML_DFLT_IMG_WIDTH/HEIGHT. aTwipSz = Application::GetDefaultDevice()->PixelToLogic(aDescriptor.GetSizePixel(), MapMode(MapUnit::MapTwip)); - nWidth = aTwipSz.getWidth(); - nHeight = aTwipSz.getHeight(); + if (!bPercentWidth && !nWidth) + { + nWidth = aTwipSz.getWidth(); + } + if (!bPercentHeight && !nHeight) + { + nHeight = aTwipSz.getHeight(); + } } } - if( !nWidth || !nHeight ) + if( !(nWidth && !bRelWidthScale) || !(nHeight && !bRelHeightScale) ) { // When the graphic is in a table, it will be requested immediately, // so that it is available before the table is layouted. @@ -753,9 +783,10 @@ } // observe minimum values !! + bool bRelSizeScale = bRelWidthScale || bRelHeightScale; if( nPercentWidth ) { - OSL_ENSURE( !aTwipSz.Width(), + OSL_ENSURE( !aTwipSz.Width() || bRelSizeScale, "Why is a width set if we already have percentage value?" ); aTwipSz.setWidth( aGrfSz.Width() ? aGrfSz.Width() : HTML_DFLT_IMG_WIDTH ); @@ -768,7 +799,7 @@ } if( nPercentHeight ) { - OSL_ENSURE( !aTwipSz.Height(), + OSL_ENSURE( !aTwipSz.Height() || bRelSizeScale, "Why is a height set if we already have percentage value?" ); aTwipSz.setHeight( aGrfSz.Height() ? aGrfSz.Height() : HTML_DFLT_IMG_HEIGHT ); diff -Nru libreoffice-7.4.1~rc2/sw/source/filter/html/htmlplug.cxx libreoffice-7.4.2~rc3/sw/source/filter/html/htmlplug.cxx --- libreoffice-7.4.1~rc2/sw/source/filter/html/htmlplug.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/filter/html/htmlplug.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -192,7 +192,7 @@ else if( bPercentWidth && rPixSize.Width() ) { nPercentWidth = static_cast(rPixSize.Width()); - if( nPercentWidth > 100 ) + if (nPercentWidth > 100 && nPercentWidth != SwFormatFrameSize::SYNCED) nPercentWidth = 100; aTwipSz.setWidth( rTwipDfltSize.Width() ); @@ -219,7 +219,7 @@ else if( bPercentHeight && rPixSize.Height() ) { nPercentHeight = static_cast(rPixSize.Height()); - if( nPercentHeight > 100 ) + if (nPercentHeight > 100 && nPercentHeight != SwFormatFrameSize::SYNCED) nPercentHeight = 100; aTwipSz.setHeight( rTwipDfltSize.Height() ); @@ -524,6 +524,20 @@ aAttrSet.ClearItem(RES_CNTNT); OutputDevice* pDevice = Application::GetDefaultDevice(); Size aDefaultTwipSize(pDevice->PixelToLogic(aGraphic.GetSizePixel(pDevice), MapMode(MapUnit::MapTwip))); + + if (aSize.Width() == USHRT_MAX && bPercentHeight) + { + // Height is relative, width is not set: keep aspect ratio. + aSize.setWidth(SwFormatFrameSize::SYNCED); + bPercentWidth = true; + } + if (aSize.Height() == USHRT_MAX && bPercentWidth) + { + // Width is relative, height is not set: keep aspect ratio. + aSize.setHeight(SwFormatFrameSize::SYNCED); + bPercentHeight = true; + } + SetFixSize(aSize, aDefaultTwipSize, bPercentWidth, bPercentHeight, aPropInfo, aAttrSet); pOLENode->GetDoc().SetFlyFrameAttr(*pFormat, aAttrSet); return true; diff -Nru libreoffice-7.4.1~rc2/sw/source/filter/html/htmlreqifreader.cxx libreoffice-7.4.2~rc3/sw/source/filter/html/htmlreqifreader.cxx --- libreoffice-7.4.1~rc2/sw/source/filter/html/htmlreqifreader.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/filter/html/htmlreqifreader.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -550,6 +550,12 @@ BitmapEx aBitmapEx = rGraphic.GetBitmapEx(); Bitmap aBitmap = aBitmapEx.GetBitmap(/*aTransparentReplaceColor=*/COL_WHITE); + if (aBitmap.getPixelFormat() != vcl::PixelFormat::N24_BPP) + { + // More exotic pixel formats cause trouble for ms paint. + aBitmap.Convert(BmpConversion::N24Bit); + } + if (GraphicConverter::Export(aNativeData, BitmapEx(aBitmap), ConvertDataFormat::BMP) != ERRCODE_NONE) { diff -Nru libreoffice-7.4.1~rc2/sw/source/filter/html/swhtml.cxx libreoffice-7.4.2~rc3/sw/source/filter/html/swhtml.cxx --- libreoffice-7.4.1~rc2/sw/source/filter/html/swhtml.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/filter/html/swhtml.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -4032,10 +4032,11 @@ #endif } - // Netscape skips empty paragraphs, we do the same. + // Netscape skips empty paragraphs, we do the same; unless in XHTML mode, which prefers mapping + // the source document to the doc model 1:1 if possible. if( bReal ) { - if( m_pPam->GetPoint()->nContent.GetIndex() ) + if( m_pPam->GetPoint()->nContent.GetIndex() || m_bXHTML) AppendTextNode( AM_SPACE ); else AddParSpace(); diff -Nru libreoffice-7.4.1~rc2/sw/source/filter/html/wrthtml.cxx libreoffice-7.4.2~rc3/sw/source/filter/html/wrthtml.cxx --- libreoffice-7.4.1~rc2/sw/source/filter/html/wrthtml.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/filter/html/wrthtml.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1334,7 +1334,8 @@ { // Link is not started from "#", so looks like external link. Encode this URL. INetURLObject aURL(sURL); - sURL = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); + if (!aURL.HasError()) + sURL = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); } return URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), sURL ); } diff -Nru libreoffice-7.4.1~rc2/sw/source/filter/ww8/docxattributeoutput.cxx libreoffice-7.4.2~rc3/sw/source/filter/ww8/docxattributeoutput.cxx --- libreoffice-7.4.1~rc2/sw/source/filter/ww8/docxattributeoutput.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/filter/ww8/docxattributeoutput.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -6806,6 +6806,8 @@ rContext.m_bStartedParaSdt = m_aParagraphSdt.m_bStartedSdt; m_aParagraphSdt.m_bStartedSdt = false; + rContext.m_bStartedRunSdt = m_aRunSdt.m_bStartedSdt; + m_aRunSdt.m_bStartedSdt = false; } void DocxAttributeOutput::popFromTableExportContext(DocxTableExportContext const & rContext) @@ -6814,6 +6816,7 @@ m_tableReference->m_bTableCellOpen = rContext.m_bTableCellOpen; m_tableReference->m_nTableDepth = rContext.m_nTableDepth; m_aParagraphSdt.m_bStartedSdt = rContext.m_bStartedParaSdt; + m_aRunSdt.m_bStartedSdt = rContext.m_bStartedRunSdt; } void DocxAttributeOutput::WriteTextBox(uno::Reference xShape) diff -Nru libreoffice-7.4.1~rc2/sw/source/filter/ww8/docxattributeoutput.hxx libreoffice-7.4.2~rc3/sw/source/filter/ww8/docxattributeoutput.hxx --- libreoffice-7.4.1~rc2/sw/source/filter/ww8/docxattributeoutput.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/filter/ww8/docxattributeoutput.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -1102,6 +1102,7 @@ ww8::WW8TableInfo::Pointer_t m_pTableInfo; bool m_bTableCellOpen; bool m_bStartedParaSdt; + bool m_bStartedRunSdt; sal_uInt32 m_nTableDepth; DocxTableExportContext(DocxAttributeOutput& rOutput) : m_rOutput(rOutput) { m_rOutput.pushToTableExportContext(*this); } ~DocxTableExportContext() { m_rOutput.popFromTableExportContext(*this); } diff -Nru libreoffice-7.4.1~rc2/sw/source/filter/xml/xmltble.cxx libreoffice-7.4.2~rc3/sw/source/filter/xml/xmltble.cxx --- libreoffice-7.4.1~rc2/sw/source/filter/xml/xmltble.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/filter/xml/xmltble.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1173,6 +1173,30 @@ } } +void SwXMLTextParagraphExport::CollectTableLinesAutoStyles(const SwTableLines& rLines, + SwFrameFormat& rFormat, bool _bProgress) +{ + // Follow SwXMLExport::ExportTableLines/ExportTableLine/ExportTableBox + for (const SwTableLine* pLine : rLines) + { + for (SwTableBox* pBox : pLine->GetTabBoxes()) + { + if (pBox->getRowSpan() <= 0) + continue; + if (pBox->GetSttNd()) + { + if (rtl::Reference xCell = SwXCell::CreateXCell(&rFormat, pBox)) + exportText(xCell, true /*bAutoStyles*/, _bProgress, true /*bExportParagraph*/); + } + else + { + // no start node -> merged cells: export subtable in cell + CollectTableLinesAutoStyles(pBox->GetTabLines(), rFormat, _bProgress); + } + } + } +} + void SwXMLTextParagraphExport::exportTable( const Reference < XTextContent > & rTextContent, bool bAutoStyles, bool _bProgress ) @@ -1209,21 +1233,7 @@ maTableNodes.push_back(pTableNd); m_TableFormats.emplace(pTableNd, ::std::make_pair(SwXMLTextParagraphExport::FormatMap(), SwXMLTextParagraphExport::FormatMap())); // Collect all tables inside cells of this table, too - const auto aCellNames = pXTable->getCellNames(); - for (const OUString& rCellName : aCellNames) - { - css::uno::Reference xCell( - pXTable->getCellByName(rCellName), css::uno::UNO_QUERY); - if (!xCell) - continue; - auto xEnumeration = xCell->createEnumeration(); - while (xEnumeration->hasMoreElements()) - { - if (css::uno::Reference xInnerTable{ - xEnumeration->nextElement(), css::uno::UNO_QUERY }) - exportTable(xInnerTable, bAutoStyles, _bProgress); - } - } + CollectTableLinesAutoStyles(pTable->GetTabLines(), *pFormat, _bProgress); } } else diff -Nru libreoffice-7.4.1~rc2/sw/source/filter/xml/xmltexte.hxx libreoffice-7.4.2~rc3/sw/source/filter/xml/xmltexte.hxx --- libreoffice-7.4.1~rc2/sw/source/filter/xml/xmltexte.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/filter/xml/xmltexte.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -32,6 +32,7 @@ class SvXMLAutoStylePoolP; class SwNoTextNode; class SwTableNode; +class SwTableLines; namespace com::sun::star::style { class XStyle; } class SwXMLTextParagraphExport : public XMLTextParagraphExport @@ -50,6 +51,9 @@ static SwNoTextNode *GetNoTextNode( const css::uno::Reference < css::beans::XPropertySet >& rPropSet ); + void CollectTableLinesAutoStyles(const SwTableLines& rLines, SwFrameFormat& rFormat, + bool bProgress); + protected: virtual void _collectTextEmbeddedAutoStyles( const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override; diff -Nru libreoffice-7.4.1~rc2/sw/source/ui/chrdlg/numpara.cxx libreoffice-7.4.2~rc3/sw/source/ui/chrdlg/numpara.cxx --- libreoffice-7.4.1~rc2/sw/source/ui/chrdlg/numpara.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/ui/chrdlg/numpara.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -309,10 +309,15 @@ } // Internal: Perform functions through the Dispatcher -bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl( +void SwParagraphNumTabPage::ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString &rStr, SfxStyleFamily nFamily) { - SfxDispatcher &rDispatcher = *SfxViewShell::Current()->GetDispatcher(); + SfxViewShell* pViewShell = SfxViewShell::Current(); + + if( !pViewShell) + return; + + SfxDispatcher* pDispatcher = pViewShell->GetDispatcher(); SfxStringItem aItem(nId, rStr); SfxUInt16Item aFamily(SID_STYLE_FAMILY, static_cast(nFamily)); const SfxPoolItem* pItems[ 3 ]; @@ -331,12 +336,9 @@ pInternalItems[ 0 ] = &aDialogParent; pInternalItems[ 1 ] = nullptr; - const SfxPoolItem* pItem = rDispatcher.Execute( + pDispatcher->Execute( nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, pItems, 0, pInternalItems); - - return pItem != nullptr; - } IMPL_LINK(SwParagraphNumTabPage, StyleHdl_Impl, weld::ComboBox&, rBox, void) diff -Nru libreoffice-7.4.1~rc2/sw/source/ui/misc/bookmark.cxx libreoffice-7.4.2~rc3/sw/source/ui/misc/bookmark.cxx --- libreoffice-7.4.1~rc2/sw/source/ui/misc/bookmark.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/ui/misc/bookmark.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -362,7 +362,8 @@ { // tdf#146261 - Remember size of bookmark dialog SvtViewOptions aDlgOpt(EViewType::Dialog, "BookmarkDialog"); - OString sWindowState = m_xDialog->get_window_state(vcl::WindowDataMask::PosSize); + OString sWindowState + = m_xDialog->get_window_state(WindowStateMask::Pos | WindowStateMask::Size); aDlgOpt.SetWindowState(OUString::fromUtf8(sWindowState)); } diff -Nru libreoffice-7.4.1~rc2/sw/source/ui/misc/pggrid.cxx libreoffice-7.4.2~rc3/sw/source/ui/misc/pggrid.cxx --- libreoffice-7.4.1~rc2/sw/source/ui/misc/pggrid.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/ui/misc/pggrid.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -458,15 +458,18 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, rButton, void) { - bool bEnable = m_xNoGridRB.get() != &rButton; - m_xLayoutFL->set_sensitive(bEnable); - m_xDisplayFL->set_sensitive(bEnable); + if (!rButton.get_active()) + return; + + const bool bNoGrid = m_xNoGridRB.get() == &rButton; + m_xLayoutFL->set_sensitive(!bNoGrid); + m_xDisplayFL->set_sensitive(!bNoGrid); //one special case - if (bEnable) + if (!bNoGrid) DisplayGridHdl(*m_xDisplayCB); - bEnable = m_xCharsGridRB.get() == &rButton; + bool bEnable = m_xCharsGridRB.get() == &rButton; m_xSnapToCharsCB->set_sensitive(bEnable); bEnable = m_xLinesGridRB.get() == &rButton; @@ -479,6 +482,10 @@ m_xCharWidthMF->set_sensitive(false); } + //recalc which dependencies are sensitive + if (!bNoGrid) + TextSizeChangedHdl(*m_xTextSizeMF); + GridModifyHdl(); } diff -Nru libreoffice-7.4.1~rc2/sw/source/uibase/app/docstyle.cxx libreoffice-7.4.2~rc3/sw/source/uibase/app/docstyle.cxx --- libreoffice-7.4.1~rc2/sw/source/uibase/app/docstyle.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/uibase/app/docstyle.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -744,7 +744,7 @@ SwCharFormat* pLink = lcl_FindCharFormat(m_rDoc, rStr); if (pLink) { - m_pColl->SetLinkedCharFormat(*pLink); + m_pColl->SetLinkedCharFormat(pLink); } } break; @@ -756,7 +756,7 @@ SwTextFormatColl* pLink = lcl_FindParaFormat(m_rDoc, rStr); if (pLink) { - m_pCharFormat->SetLinkedParaFormat(*pLink); + m_pCharFormat->SetLinkedParaFormat(pLink); } } break; diff -Nru libreoffice-7.4.1~rc2/sw/source/uibase/envelp/syncbtn.cxx libreoffice-7.4.2~rc3/sw/source/uibase/envelp/syncbtn.cxx --- libreoffice-7.4.1~rc2/sw/source/uibase/envelp/syncbtn.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/uibase/envelp/syncbtn.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -53,10 +53,11 @@ else aPos = _pParent->OutputToScreenPixel(Point(0, 0)); - vcl::WindowData aState; - aState.setMask(vcl::WindowDataMask::Pos); - aState.setPos(aPos); - pDlg->set_window_state(aState.toStr()); + WindowStateData aState; + aState.SetMask(WindowStateMask::Pos); + aState.SetX(aPos.X()); + aState.SetY(aPos.Y()); + pDlg->set_window_state(aState.ToStr()); pInfo->aPos = pDlg->get_position(); pInfo->aSize = pDlg->get_size(); diff -Nru libreoffice-7.4.1~rc2/sw/source/uibase/inc/numpara.hxx libreoffice-7.4.2~rc3/sw/source/uibase/inc/numpara.hxx --- libreoffice-7.4.1~rc2/sw/source/uibase/inc/numpara.hxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/uibase/inc/numpara.hxx 2022-10-10 10:15:14.000000000 +0000 @@ -58,7 +58,7 @@ static const WhichRangesContainer aPageRg; - bool ExecuteEditNumStyle_Impl(sal_uInt16 nId, const OUString& rStr, + void ExecuteEditNumStyle_Impl(sal_uInt16 nId, const OUString& rStr, SfxStyleFamily nFamily); public: diff -Nru libreoffice-7.4.1~rc2/sw/source/uibase/uiview/view.cxx libreoffice-7.4.2~rc3/sw/source/uibase/uiview/view.cxx --- libreoffice-7.4.1~rc2/sw/source/uibase/uiview/view.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/uibase/uiview/view.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -1647,7 +1647,7 @@ : GetWrtShell().HasSelection(); } -OUString SwView::GetSelectionText( bool bCompleteWrds ) +OUString SwView::GetSelectionText( bool bCompleteWrds, bool /*bOnlyASample*/ ) { return GetSelectionTextParam( bCompleteWrds, true ); } diff -Nru libreoffice-7.4.1~rc2/sw/source/uibase/utlui/content.cxx libreoffice-7.4.2~rc3/sw/source/uibase/utlui/content.cxx --- libreoffice-7.4.1~rc2/sw/source/uibase/utlui/content.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/sw/source/uibase/utlui/content.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -364,7 +364,7 @@ break; case ContentTypeId::INDEX: m_bEdit = true; - m_bDelete = false; + m_bDelete = true; break; case ContentTypeId::REFERENCE: m_bEdit = false; Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/curl-7.83.1.tar.xz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/curl-7.83.1.tar.xz differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/curl-7.85.0.tar.xz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/curl-7.85.0.tar.xz differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/expat-2.4.6.tar.xz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/expat-2.4.6.tar.xz differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/expat-2.4.9.tar.xz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/expat-2.4.9.tar.xz differ diff -Nru libreoffice-7.4.1~rc2/tarballs/fetch.log libreoffice-7.4.2~rc3/tarballs/fetch.log --- libreoffice-7.4.1~rc2/tarballs/fetch.log 2022-09-09 20:40:48.000000000 +0000 +++ libreoffice-7.4.2~rc3/tarballs/fetch.log 2022-10-06 10:17:46.000000000 +0000 @@ -1,933 +1,933 @@ -Fr 9. Sep 22:34:13 CEST 2022 ---2022-09-09 22:34:13-- https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz +Do 6. Okt 12:08:34 CEST 2022 +--2022-10-06 12:08:34-- https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 318808 (311K) [application/octet-stream] Wird in ‘./libabw-0.1.3.tar.xz’ gespeichert. - 0K .... 100% 2,07M=0,1s + 0K .... 100% 1,74M=0,2s -2022-09-09 22:34:17 (2,07 MB/s) - ‘./libabw-0.1.3.tar.xz’ gespeichert [318808/318808] +2022-10-06 12:08:40 (1,74 MB/s) - ‘./libabw-0.1.3.tar.xz’ gespeichert [318808/318808] ---2022-09-09 22:34:17-- https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz +--2022-10-06 12:08:40-- https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 17688504 (17M) [application/octet-stream] Wird in ‘./boost_1_79_0.tar.xz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 17% 2,87M 5s - 3072K ........ ........ ........ ........ ........ ........ 35% 3,01M 4s - 6144K ........ ........ ........ ........ ........ ........ 53% 2,38M 3s - 9216K ........ ........ ........ ........ ........ ........ 71% 1,17M 2s - 12288K ........ ........ ........ ........ ........ ........ 88% 1,57M 1s - 15360K ........ ........ ........ ..... 100% 2,26M=8,6s + 0K ........ ........ ........ ........ ........ ........ 17% 2,52M 6s + 3072K ........ ........ ........ ........ ........ ........ 35% 2,23M 5s + 6144K ........ ........ ........ ........ ........ ........ 53% 1,30M 4s + 9216K ........ ........ ........ ........ ........ ........ 71% 1,71M 3s + 12288K ........ ........ ........ ........ ........ ........ 88% 1,98M 1s + 15360K ........ ........ ........ ..... 100% 874K=10s -2022-09-09 22:34:25 (1,96 MB/s) - ‘./boost_1_79_0.tar.xz’ gespeichert [17688504/17688504] +2022-10-06 12:08:51 (1,64 MB/s) - ‘./boost_1_79_0.tar.xz’ gespeichert [17688504/17688504] ---2022-09-09 22:34:26-- https://dev-www.libreoffice.org/src/box2d-2.4.1.tar.gz +--2022-10-06 12:08:51-- https://dev-www.libreoffice.org/src/box2d-2.4.1.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1224516 (1,2M) [application/octet-stream] Wird in ‘./box2d-2.4.1.tar.gz’ gespeichert. - 0K ........ ........ .. 100% 1,79M=0,7s + 0K ........ ........ .. 100% 767K=1,6s -2022-09-09 22:34:26 (1,79 MB/s) - ‘./box2d-2.4.1.tar.gz’ gespeichert [1224516/1224516] +2022-10-06 12:08:53 (767 KB/s) - ‘./box2d-2.4.1.tar.gz’ gespeichert [1224516/1224516] ---2022-09-09 22:34:26-- https://dev-www.libreoffice.org/src/breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz +--2022-10-06 12:08:53-- https://dev-www.libreoffice.org/src/breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 5000956 (4,8M) [application/octet-stream] Wird in ‘./breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 62% 2,34M 1s - 3072K ........ ........ ........ .... 100% 1,81M=2,3s + 0K ........ ........ ........ ........ ........ ........ 62% 1,76M 1s + 3072K ........ ........ ........ .... 100% 1,72M=2,7s -2022-09-09 22:34:29 (2,11 MB/s) - ‘./breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz’ gespeichert [5000956/5000956] +2022-10-06 12:08:56 (1,74 MB/s) - ‘./breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz’ gespeichert [5000956/5000956] ---2022-09-09 22:34:29-- https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip +--2022-10-06 12:08:56-- https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1997625 (1,9M) [application/zip] Wird in ‘./beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip’ gespeichert. - 0K ........ ........ ........ ...... 100% 2,34M=0,8s + 0K ........ ........ ........ ...... 100% 2,06M=0,9s -2022-09-09 22:34:30 (2,34 MB/s) - ‘./beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip’ gespeichert [1997625/1997625] +2022-10-06 12:08:57 (2,06 MB/s) - ‘./beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip’ gespeichert [1997625/1997625] ---2022-09-09 22:34:30-- https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz +--2022-10-06 12:08:57-- https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 810029 (791K) [application/octet-stream] Wird in ‘./bzip2-1.0.8.tar.gz’ gespeichert. - 0K ........ .... 100% 2,09M=0,4s + 0K ........ .... 100% 2,11M=0,4s -2022-09-09 22:34:31 (2,09 MB/s) - ‘./bzip2-1.0.8.tar.gz’ gespeichert [810029/810029] +2022-10-06 12:08:57 (2,11 MB/s) - ‘./bzip2-1.0.8.tar.gz’ gespeichert [810029/810029] ---2022-09-09 22:34:31-- https://dev-www.libreoffice.org/src/cairo-1.17.6.tar.xz +--2022-10-06 12:08:58-- https://dev-www.libreoffice.org/src/cairo-1.17.6.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 35055900 (33M) [application/octet-stream] Wird in ‘./cairo-1.17.6.tar.xz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 8% 1,34M 23s - 3072K ........ ........ ........ ........ ........ ........ 17% 1,54M 19s - 6144K ........ ........ ........ ........ ........ ........ 26% 1,56M 17s - 9216K ........ ........ ........ ........ ........ ........ 35% 1,68M 14s - 12288K ........ ........ ........ ........ ........ ........ 44% 1,78M 12s - 15360K ........ ........ ........ ........ ........ ........ 53% 1,65M 10s - 18432K ........ ........ ........ ........ ........ ........ 62% 1,50M 8s - 21504K ........ ........ ........ ........ ........ ........ 71% 1,60M 6s - 24576K ........ ........ ........ ........ ........ ........ 80% 1,97M 4s - 27648K ........ ........ ........ ........ ........ ........ 89% 2,30M 2s - 30720K ........ ........ ........ ........ ........ ........ 98% 1,79M 0s - 33792K ...... 100% 2,02M=20s + 0K ........ ........ ........ ........ ........ ........ 8% 1,12M 27s + 3072K ........ ........ ........ ........ ........ ........ 17% 1,43M 22s + 6144K ........ ........ ........ ........ ........ ........ 26% 1,20M 20s + 9216K ........ ........ ........ ........ ........ ........ 35% 1,51M 17s + 12288K ........ ........ ........ ........ ........ ........ 44% 2,15M 13s + 15360K ........ ........ ........ ........ ........ ........ 53% 2,67M 10s + 18432K ........ ........ ........ ........ ........ ........ 62% 1,08M 9s + 21504K ........ ........ ........ ........ ........ ........ 71% 1,02M 7s + 24576K ........ ........ ........ ........ ........ ........ 80% 1,03M 5s + 27648K ........ ........ ........ ........ ........ ........ 89% 1,08M 3s + 30720K ........ ........ ........ ........ ........ ........ 98% 991K 0s + 33792K ...... 100% 476K=27s -2022-09-09 22:34:51 (1,67 MB/s) - ‘./cairo-1.17.6.tar.xz’ gespeichert [35055900/35055900] +2022-10-06 12:09:25 (1,23 MB/s) - ‘./cairo-1.17.6.tar.xz’ gespeichert [35055900/35055900] ---2022-09-09 22:34:51-- https://dev-www.libreoffice.org/src/pixman-0.40.0.tar.gz +--2022-10-06 12:09:25-- https://dev-www.libreoffice.org/src/pixman-0.40.0.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 913976 (893K) [application/octet-stream] Wird in ‘./pixman-0.40.0.tar.gz’ gespeichert. - 0K ........ ..... 100% 1,59M=0,5s + 0K ........ ..... 100% 651K=1,4s -2022-09-09 22:34:52 (1,59 MB/s) - ‘./pixman-0.40.0.tar.gz’ gespeichert [913976/913976] +2022-10-06 12:09:27 (651 KB/s) - ‘./pixman-0.40.0.tar.gz’ gespeichert [913976/913976] ---2022-09-09 22:34:52-- https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz +--2022-10-06 12:09:27-- https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 618528 (604K) [application/octet-stream] Wird in ‘./libcdr-0.1.7.tar.xz’ gespeichert. - 0K ........ . 100% 1,66M=0,4s + 0K ........ . 100% 478K=1,3s -2022-09-09 22:34:53 (1,66 MB/s) - ‘./libcdr-0.1.7.tar.xz’ gespeichert [618528/618528] +2022-10-06 12:09:29 (478 KB/s) - ‘./libcdr-0.1.7.tar.xz’ gespeichert [618528/618528] ---2022-09-09 22:34:53-- https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz +--2022-10-06 12:09:29-- https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2241498 (2,1M) [application/octet-stream] Wird in ‘./48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ .. 100% 2,16M=1,0s + 0K ........ ........ ........ ........ .. 100% 942K=2,3s -2022-09-09 22:34:54 (2,16 MB/s) - ‘./48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz’ gespeichert [2241498/2241498] +2022-10-06 12:09:31 (942 KB/s) - ‘./48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz’ gespeichert [2241498/2241498] ---2022-09-09 22:34:54-- https://dev-www.libreoffice.org/src/dragonbox-1.1.0.tar.gz +--2022-10-06 12:09:31-- https://dev-www.libreoffice.org/src/dragonbox-1.1.0.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2837666 (2,7M) [application/octet-stream] Wird in ‘./dragonbox-1.1.0.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ........ ... 100% 2,72M=1,0s + 0K ........ ........ ........ ........ ........ ... 100% 1,93M=1,4s -2022-09-09 22:34:55 (2,72 MB/s) - ‘./dragonbox-1.1.0.tar.gz’ gespeichert [2837666/2837666] +2022-10-06 12:09:33 (1,93 MB/s) - ‘./dragonbox-1.1.0.tar.gz’ gespeichert [2837666/2837666] ---2022-09-09 22:34:55-- https://dev-www.libreoffice.org/src/dtoa-20180411.tgz +--2022-10-06 12:09:33-- https://dev-www.libreoffice.org/src/dtoa-20180411.tgz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 48893 (48K) [application/octet-stream] Wird in ‘./dtoa-20180411.tgz’ gespeichert. - 0K 100% 1,20M=0,04s + 0K 100% 1,26M=0,04s -2022-09-09 22:34:55 (1,20 MB/s) - ‘./dtoa-20180411.tgz’ gespeichert [48893/48893] +2022-10-06 12:09:33 (1,26 MB/s) - ‘./dtoa-20180411.tgz’ gespeichert [48893/48893] ---2022-09-09 22:34:55-- https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz +--2022-10-06 12:09:33-- https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 484404 (473K) [application/octet-stream] Wird in ‘./libcmis-0.5.2.tar.xz’ gespeichert. - 0K ....... 100% 2,04M=0,2s + 0K ....... 100% 2,17M=0,2s -2022-09-09 22:34:56 (2,04 MB/s) - ‘./libcmis-0.5.2.tar.xz’ gespeichert [484404/484404] +2022-10-06 12:09:34 (2,17 MB/s) - ‘./libcmis-0.5.2.tar.xz’ gespeichert [484404/484404] ---2022-09-09 22:34:56-- https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz +--2022-10-06 12:09:34-- https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 10343849 (9,9M) [application/octet-stream] Wird in ‘./CoinMP-1.7.6.tgz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 30% 2,77M 2s - 3072K ........ ........ ........ ........ ........ ........ 60% 3,02M 1s - 6144K ........ ........ ........ ........ ........ ........ 91% 2,98M 0s - 9216K ........ ..... 100% 2,07M=3,5s + 0K ........ ........ ........ ........ ........ ........ 30% 2,73M 3s + 3072K ........ ........ ........ ........ ........ ........ 60% 1,50M 2s + 6144K ........ ........ ........ ........ ........ ........ 91% 1,04M 1s + 9216K ........ ..... 100% 1,34M=6,6s -2022-09-09 22:35:00 (2,82 MB/s) - ‘./CoinMP-1.7.6.tgz’ gespeichert [10343849/10343849] +2022-10-06 12:09:41 (1,49 MB/s) - ‘./CoinMP-1.7.6.tgz’ gespeichert [10343849/10343849] ---2022-09-09 22:35:00-- https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz +--2022-10-06 12:09:41-- https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 814363 (795K) [application/octet-stream] Wird in ‘./cppunit-1.15.1.tar.gz’ gespeichert. - 0K ........ .... 100% 1,87M=0,4s + 0K ........ .... 100% 1,49M=0,5s -2022-09-09 22:35:00 (1,87 MB/s) - ‘./cppunit-1.15.1.tar.gz’ gespeichert [814363/814363] +2022-10-06 12:09:41 (1,49 MB/s) - ‘./cppunit-1.15.1.tar.gz’ gespeichert [814363/814363] ---2022-09-09 22:35:00-- https://dev-www.libreoffice.org/src/curl-7.83.1.tar.xz +--2022-10-06 12:09:41-- https://dev-www.libreoffice.org/src/curl-7.85.0.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK -Länge: 2474940 (2,4M) [application/octet-stream] -Wird in ‘./curl-7.83.1.tar.xz’ gespeichert. +Länge: 2480648 (2,4M) [application/octet-stream] +Wird in ‘./curl-7.85.0.tar.xz’ gespeichert. - 0K ........ ........ ........ ........ ..... 100% 2,36M=1,0s + 0K ........ ........ ........ ........ ..... 100% 1,32M=1,8s -2022-09-09 22:35:02 (2,36 MB/s) - ‘./curl-7.83.1.tar.xz’ gespeichert [2474940/2474940] +2022-10-06 12:09:43 (1,32 MB/s) - ‘./curl-7.85.0.tar.xz’ gespeichert [2480648/2480648] ---2022-09-09 22:35:02-- https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz +--2022-10-06 12:09:43-- https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 416268 (407K) [application/octet-stream] Wird in ‘./libe-book-0.1.3.tar.xz’ gespeichert. - 0K ...... 100% 2,15M=0,2s + 0K ...... 100% 999K=0,4s -2022-09-09 22:35:02 (2,15 MB/s) - ‘./libe-book-0.1.3.tar.xz’ gespeichert [416268/416268] +2022-10-06 12:09:44 (999 KB/s) - ‘./libe-book-0.1.3.tar.xz’ gespeichert [416268/416268] ---2022-09-09 22:35:02-- https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz +--2022-10-06 12:09:44-- https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 463264 (452K) [application/octet-stream] Wird in ‘./3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz’ gespeichert. - 0K ....... 100% 2,17M=0,2s + 0K ....... 100% 1,09M=0,4s -2022-09-09 22:35:03 (2,17 MB/s) - ‘./3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz’ gespeichert [463264/463264] +2022-10-06 12:09:45 (1,09 MB/s) - ‘./3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz’ gespeichert [463264/463264] ---2022-09-09 22:35:03-- https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz +--2022-10-06 12:09:45-- https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 324380 (317K) [application/octet-stream] Wird in ‘./libepubgen-0.1.1.tar.xz’ gespeichert. - 0K .... 100% 1,98M=0,2s + 0K .... 100% 1,03M=0,3s -2022-09-09 22:35:03 (1,98 MB/s) - ‘./libepubgen-0.1.1.tar.xz’ gespeichert [324380/324380] +2022-10-06 12:09:45 (1,03 MB/s) - ‘./libepubgen-0.1.1.tar.xz’ gespeichert [324380/324380] ---2022-09-09 22:35:03-- https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz +--2022-10-06 12:09:45-- https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1494000 (1,4M) [application/octet-stream] Wird in ‘./libetonyek-0.1.10.tar.xz’ gespeichert. - 0K ........ ........ ...... 100% 2,08M=0,7s + 0K ........ ........ ...... 100% 878K=1,7s -2022-09-09 22:35:04 (2,08 MB/s) - ‘./libetonyek-0.1.10.tar.xz’ gespeichert [1494000/1494000] +2022-10-06 12:09:47 (878 KB/s) - ‘./libetonyek-0.1.10.tar.xz’ gespeichert [1494000/1494000] ---2022-09-09 22:35:04-- https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz +--2022-10-06 12:09:47-- https://dev-www.libreoffice.org/src/expat-2.4.9.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK -Länge: 452468 (442K) [application/octet-stream] -Wird in ‘./expat-2.4.6.tar.xz’ gespeichert. +Länge: 459284 (449K) [application/octet-stream] +Wird in ‘./expat-2.4.9.tar.xz’ gespeichert. - 0K ...... 100% 698K=0,6s + 0K ....... 100% 960K=0,5s -2022-09-09 22:35:05 (698 KB/s) - ‘./expat-2.4.6.tar.xz’ gespeichert [452468/452468] +2022-10-06 12:09:48 (960 KB/s) - ‘./expat-2.4.9.tar.xz’ gespeichert [459284/459284] ---2022-09-09 22:35:05-- https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2 +--2022-10-06 12:09:48-- https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 9841457 (9,4M) [application/octet-stream] Wird in ‘./Firebird-3.0.7.33374-0.tar.bz2’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 31% 1,32M 5s - 3072K ........ ........ ........ ........ ........ ........ 63% 1,13M 3s - 6144K ........ ........ ........ ........ ........ ........ 95% 804K 0s - 9216K ...... 100% 1,27M=9,1s + 0K ........ ........ ........ ........ ........ ........ 31% 841K 8s + 3072K ........ ........ ........ ........ ........ ........ 63% 673K 5s + 6144K ........ ........ ........ ........ ........ ........ 95% 1,23M 0s + 9216K ...... 100% 1,04M=11s -2022-09-09 22:35:14 (1,04 MB/s) - ‘./Firebird-3.0.7.33374-0.tar.bz2’ gespeichert [9841457/9841457] +2022-10-06 12:09:59 (871 KB/s) - ‘./Firebird-3.0.7.33374-0.tar.bz2’ gespeichert [9841457/9841457] ---2022-09-09 22:35:14-- https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz +--2022-10-06 12:09:59-- https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1416832 (1,4M) [application/octet-stream] Wird in ‘./fontconfig-2.13.94.tar.xz’ gespeichert. - 0K ........ ........ ..... 100% 1,42M=1,0s + 0K ........ ........ ..... 100% 1,38M=1,0s -2022-09-09 22:35:16 (1,42 MB/s) - ‘./fontconfig-2.13.94.tar.xz’ gespeichert [1416832/1416832] +2022-10-06 12:10:01 (1,38 MB/s) - ‘./fontconfig-2.13.94.tar.xz’ gespeichert [1416832/1416832] ---2022-09-09 22:35:16-- https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz +--2022-10-06 12:10:01-- https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 516132 (504K) [application/octet-stream] Wird in ‘./libfreehand-0.1.2.tar.xz’ gespeichert. - 0K ....... 100% 1,44M=0,3s + 0K ....... 100% 1,46M=0,3s -2022-09-09 22:35:16 (1,44 MB/s) - ‘./libfreehand-0.1.2.tar.xz’ gespeichert [516132/516132] +2022-10-06 12:10:01 (1,46 MB/s) - ‘./libfreehand-0.1.2.tar.xz’ gespeichert [516132/516132] ---2022-09-09 22:35:16-- https://dev-www.libreoffice.org/src/freetype-2.11.1.tar.xz +--2022-10-06 12:10:01-- https://dev-www.libreoffice.org/src/freetype-2.11.1.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2270728 (2,2M) [application/octet-stream] Wird in ‘./freetype-2.11.1.tar.xz’ gespeichert. - 0K ........ ........ ........ ........ .. 100% 1,11M=1,9s + 0K ........ ........ ........ ........ .. 100% 1,11M=2,0s -2022-09-09 22:35:18 (1,11 MB/s) - ‘./freetype-2.11.1.tar.xz’ gespeichert [2270728/2270728] +2022-10-06 12:10:03 (1,11 MB/s) - ‘./freetype-2.11.1.tar.xz’ gespeichert [2270728/2270728] ---2022-09-09 22:35:18-- https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz +--2022-10-06 12:10:03-- https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 221924 (217K) [application/octet-stream] Wird in ‘./libepoxy-1.5.9.tar.xz’ gespeichert. - 0K ... 100% 1,08M=0,2s + 0K ... 100% 621K=0,3s -2022-09-09 22:35:19 (1,08 MB/s) - ‘./libepoxy-1.5.9.tar.xz’ gespeichert [221924/221924] +2022-10-06 12:10:04 (621 KB/s) - ‘./libepoxy-1.5.9.tar.xz’ gespeichert [221924/221924] ---2022-09-09 22:35:19-- https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip +--2022-10-06 12:10:04-- https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 5856665 (5,6M) [application/zip] Wird in ‘./glm-0.9.9.8.zip’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 53% 1,27M 2s - 3072K ........ ........ ........ ........ ........ . 100% 1,52M=4,1s + 0K ........ ........ ........ ........ ........ ........ 53% 697K 4s + 3072K ........ ........ ........ ........ ........ . 100% 1,42M=6,2s -2022-09-09 22:35:23 (1,38 MB/s) - ‘./glm-0.9.9.8.zip’ gespeichert [5856665/5856665] +2022-10-06 12:10:10 (920 KB/s) - ‘./glm-0.9.9.8.zip’ gespeichert [5856665/5856665] ---2022-09-09 22:35:23-- https://dev-www.libreoffice.org/src/gpgme-1.16.0.tar.bz2 +--2022-10-06 12:10:11-- https://dev-www.libreoffice.org/src/gpgme-1.16.0.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1718913 (1,6M) [application/octet-stream] Wird in ‘./gpgme-1.16.0.tar.bz2’ gespeichert. - 0K ........ ........ ........ .. 100% 1,09M=1,5s + 0K ........ ........ ........ .. 100% 1,68M=1,0s -2022-09-09 22:35:25 (1,09 MB/s) - ‘./gpgme-1.16.0.tar.bz2’ gespeichert [1718913/1718913] +2022-10-06 12:10:12 (1,68 MB/s) - ‘./gpgme-1.16.0.tar.bz2’ gespeichert [1718913/1718913] ---2022-09-09 22:35:25-- https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz +--2022-10-06 12:10:12-- https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 149974 (146K) [application/octet-stream] Wird in ‘./graphite2-minimal-1.3.14.tgz’ gespeichert. - 0K .. 100% 1,19M=0,1s + 0K .. 100% 1,64M=0,09s -2022-09-09 22:35:25 (1,19 MB/s) - ‘./graphite2-minimal-1.3.14.tgz’ gespeichert [149974/149974] +2022-10-06 12:10:12 (1,64 MB/s) - ‘./graphite2-minimal-1.3.14.tgz’ gespeichert [149974/149974] ---2022-09-09 22:35:25-- https://dev-www.libreoffice.org/src/harfbuzz-4.3.0.tar.xz +--2022-10-06 12:10:12-- https://dev-www.libreoffice.org/src/harfbuzz-4.3.0.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 15036020 (14M) [application/octet-stream] Wird in ‘./harfbuzz-4.3.0.tar.xz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 20% 1,22M 9s - 3072K ........ ........ ........ ........ ........ ........ 41% 2,08M 5s - 6144K ........ ........ ........ ........ ........ ........ 62% 2,69M 3s - 9216K ........ ........ ........ ........ ........ ........ 83% 2,53M 1s - 12288K ........ ........ ........ ........ ..... 100% 2,07M=7,3s + 0K ........ ........ ........ ........ ........ ........ 20% 2,22M 5s + 3072K ........ ........ ........ ........ ........ ........ 41% 1,35M 5s + 6144K ........ ........ ........ ........ ........ ........ 62% 1,42M 3s + 9216K ........ ........ ........ ........ ........ ........ 83% 2,26M 1s + 12288K ........ ........ ........ ........ ..... 100% 1,69M=8,4s -2022-09-09 22:35:33 (1,95 MB/s) - ‘./harfbuzz-4.3.0.tar.xz’ gespeichert [15036020/15036020] +2022-10-06 12:10:21 (1,71 MB/s) - ‘./harfbuzz-4.3.0.tar.xz’ gespeichert [15036020/15036020] ---2022-09-09 22:35:33-- https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +--2022-10-06 12:10:21-- https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 3519470 (3,4M) [application/zip] Wird in ‘./17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 89% 1,53M 0s - 3072K ..... 100% 1,65M=2,2s + 0K ........ ........ ........ ........ ........ ........ 89% 1,98M 0s + 3072K ..... 100% 1,42M=1,8s -2022-09-09 22:35:35 (1,55 MB/s) - ‘./17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip’ gespeichert [3519470/3519470] +2022-10-06 12:10:23 (1,90 MB/s) - ‘./17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip’ gespeichert [3519470/3519470] ---2022-09-09 22:35:36-- https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz +--2022-10-06 12:10:23-- https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 938142 (916K) [application/octet-stream] Wird in ‘./hunspell-1.7.0.tar.gz’ gespeichert. - 0K ........ ...... 100% 1,69M=0,5s + 0K ........ ...... 100% 1,21M=0,7s -2022-09-09 22:35:36 (1,69 MB/s) - ‘./hunspell-1.7.0.tar.gz’ gespeichert [938142/938142] +2022-10-06 12:10:24 (1,21 MB/s) - ‘./hunspell-1.7.0.tar.gz’ gespeichert [938142/938142] ---2022-09-09 22:35:36-- https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz +--2022-10-06 12:10:24-- https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 638369 (623K) [application/octet-stream] Wird in ‘./5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz’ gespeichert. - 0K ........ . 100% 1,42M=0,4s + 0K ........ . 100% 1,17M=0,5s -2022-09-09 22:35:37 (1,42 MB/s) - ‘./5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz’ gespeichert [638369/638369] +2022-10-06 12:10:25 (1,17 MB/s) - ‘./5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz’ gespeichert [638369/638369] ---2022-09-09 22:35:37-- https://dev-www.libreoffice.org/src/icu4c-71_1-src.tgz +--2022-10-06 12:10:25-- https://dev-www.libreoffice.org/src/icu4c-71_1-src.tgz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 25701340 (25M) [application/octet-stream] Wird in ‘./icu4c-71_1-src.tgz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 12% 2,05M 10s - 3072K ........ ........ ........ ........ ........ ........ 24% 1,11M 13s - 6144K ........ ........ ........ ........ ........ ........ 36% 1,40M 11s - 9216K ........ ........ ........ ........ ........ ........ 48% 1,65M 8s - 12288K ........ ........ ........ ........ ........ ........ 61% 1,44M 6s - 15360K ........ ........ ........ ........ ........ ........ 73% 1,87M 4s - 18432K ........ ........ ........ ........ ........ ........ 85% 1,69M 2s - 21504K ........ ........ ........ ........ ........ ........ 97% 1,51M 0s - 24576K ........ 100% 1,55M=16s + 0K ........ ........ ........ ........ ........ ........ 12% 792K 28s + 3072K ........ ........ ........ ........ ........ ........ 24% 1,21M 20s + 6144K ........ ........ ........ ........ ........ ........ 36% 1,76M 14s + 9216K ........ ........ ........ ........ ........ ........ 48% 1,37M 11s + 12288K ........ ........ ........ ........ ........ ........ 61% 1,03M 8s + 15360K ........ ........ ........ ........ ........ ........ 73% 1,19M 6s + 18432K ........ ........ ........ ........ ........ ........ 85% 1,33M 3s + 21504K ........ ........ ........ ........ ........ ........ 97% 1,16M 0s + 24576K ........ 100% 1,48M=21s -2022-09-09 22:35:53 (1,54 MB/s) - ‘./icu4c-71_1-src.tgz’ gespeichert [25701340/25701340] +2022-10-06 12:10:46 (1,17 MB/s) - ‘./icu4c-71_1-src.tgz’ gespeichert [25701340/25701340] ---2022-09-09 22:35:53-- https://dev-www.libreoffice.org/src/icu4c-71_1-data.zip +--2022-10-06 12:10:46-- https://dev-www.libreoffice.org/src/icu4c-71_1-data.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 19057953 (18M) [application/zip] Wird in ‘./icu4c-71_1-data.zip’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 16% 1,27M 12s - 3072K ........ ........ ........ ........ ........ ........ 33% 2,08M 8s - 6144K ........ ........ ........ ........ ........ ........ 49% 1,62M 6s - 9216K ........ ........ ........ ........ ........ ........ 66% 1,23M 4s - 12288K ........ ........ ........ ........ ........ ........ 82% 1,63M 2s - 15360K ........ ........ ........ ........ ........ ........ 99% 2,08M 0s - 18432K .. 100% 1,65M=11s + 0K ........ ........ ........ ........ ........ ........ 16% 1,52M 10s + 3072K ........ ........ ........ ........ ........ ........ 33% 1,70M 8s + 6144K ........ ........ ........ ........ ........ ........ 49% 1,79M 6s + 9216K ........ ........ ........ ........ ........ ........ 66% 1,87M 4s + 12288K ........ ........ ........ ........ ........ ........ 82% 1,19M 2s + 15360K ........ ........ ........ ........ ........ ........ 99% 866K 0s + 18432K .. 100% 837K=13s -2022-09-09 22:36:05 (1,58 MB/s) - ‘./icu4c-71_1-data.zip’ gespeichert [19057953/19057953] +2022-10-06 12:11:00 (1,37 MB/s) - ‘./icu4c-71_1-data.zip’ gespeichert [19057953/19057953] ---2022-09-09 22:36:05-- https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +--2022-10-06 12:11:00-- https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 743031 (726K) [application/zip] Wird in ‘./ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip’ gespeichert. - 0K ........ ... 100% 667K=1,1s + 0K ........ ... 100% 563K=1,3s -2022-09-09 22:36:07 (667 KB/s) - ‘./ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip’ gespeichert [743031/743031] +2022-10-06 12:11:01 (563 KB/s) - ‘./ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip’ gespeichert [743031/743031] ---2022-09-09 22:36:07-- https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip +--2022-10-06 12:11:01-- https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 207563 (203K) [application/zip] Wird in ‘./d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip’ gespeichert. - 0K ... 100% 749K=0,3s + 0K ... 100% 504K=0,4s -2022-09-09 22:36:07 (749 KB/s) - ‘./d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip’ gespeichert [207563/207563] +2022-10-06 12:11:02 (504 KB/s) - ‘./d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip’ gespeichert [207563/207563] ---2022-09-09 22:36:07-- https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip +--2022-10-06 12:11:02-- https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 427800 (418K) [application/zip] Wird in ‘./eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip’ gespeichert. - 0K ...... 100% 799K=0,5s + 0K ...... 100% 609K=0,7s -2022-09-09 22:36:08 (799 KB/s) - ‘./eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip’ gespeichert [427800/427800] +2022-10-06 12:11:03 (609 KB/s) - ‘./eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip’ gespeichert [427800/427800] ---2022-09-09 22:36:08-- https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip +--2022-10-06 12:11:03-- https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 5750610 (5,5M) [application/zip] Wird in ‘./3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 54% 1,71M 1s - 3072K ........ ........ ........ ........ ....... 100% 2,04M=3,0s + 0K ........ ........ ........ ........ ........ ........ 54% 874K 3s + 3072K ........ ........ ........ ........ ....... 100% 1,03M=5,9s -2022-09-09 22:36:11 (1,84 MB/s) - ‘./3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip’ gespeichert [5750610/5750610] +2022-10-06 12:11:09 (948 KB/s) - ‘./3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip’ gespeichert [5750610/5750610] ---2022-09-09 22:36:11-- https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip +--2022-10-06 12:11:09-- https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1180582 (1,1M) [application/zip] Wird in ‘./3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip’ gespeichert. - 0K ........ ........ .. 100% 1,74M=0,6s + 0K ........ ........ .. 100% 1,46M=0,8s -2022-09-09 22:36:12 (1,74 MB/s) - ‘./3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip’ gespeichert [1180582/1180582] +2022-10-06 12:11:10 (1,46 MB/s) - ‘./3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip’ gespeichert [1180582/1180582] ---2022-09-09 22:36:12-- https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip +--2022-10-06 12:11:10-- https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1396007 (1,3M) [application/zip] Wird in ‘./db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip’ gespeichert. - 0K ........ ........ ..... 100% 1,85M=0,7s + 0K ........ ........ ..... 100% 1,57M=0,8s -2022-09-09 22:36:13 (1,85 MB/s) - ‘./db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip’ gespeichert [1396007/1396007] +2022-10-06 12:11:11 (1,57 MB/s) - ‘./db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip’ gespeichert [1396007/1396007] ---2022-09-09 22:36:13-- https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip +--2022-10-06 12:11:11-- https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2938721 (2,8M) [application/zip] Wird in ‘./97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip’ gespeichert. - 0K ........ ........ ........ ........ ........ .... 100% 1,40M=2,0s + 0K ........ ........ ........ ........ ........ .... 100% 1,62M=1,7s -2022-09-09 22:36:16 (1,40 MB/s) - ‘./97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip’ gespeichert [2938721/2938721] +2022-10-06 12:11:13 (1,62 MB/s) - ‘./97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip’ gespeichert [2938721/2938721] ---2022-09-09 22:36:16-- https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip +--2022-10-06 12:11:13-- https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 762419 (745K) [application/zip] Wird in ‘./8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip’ gespeichert. - 0K ........ ... 100% 1,30M=0,6s + 0K ........ ... 100% 1,71M=0,4s -2022-09-09 22:36:16 (1,30 MB/s) - ‘./8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip’ gespeichert [762419/762419] +2022-10-06 12:11:14 (1,71 MB/s) - ‘./8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip’ gespeichert [762419/762419] ---2022-09-09 22:36:16-- https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip +--2022-10-06 12:11:14-- https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 211919 (207K) [application/zip] Wird in ‘./f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip’ gespeichert. - 0K ... 100% 1,28M=0,2s + 0K ... 100% 1,65M=0,1s -2022-09-09 22:36:17 (1,28 MB/s) - ‘./f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip’ gespeichert [211919/211919] +2022-10-06 12:11:14 (1,65 MB/s) - ‘./f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip’ gespeichert [211919/211919] ---2022-09-09 22:36:17-- https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip +--2022-10-06 12:11:14-- https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2929311 (2,8M) [application/zip] Wird in ‘./ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip’ gespeichert. - 0K ........ ........ ........ ........ ........ .... 100% 1,34M=2,1s + 0K ........ ........ ........ ........ ........ .... 100% 2,05M=1,4s -2022-09-09 22:36:19 (1,34 MB/s) - ‘./ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip’ gespeichert [2929311/2929311] +2022-10-06 12:11:16 (2,05 MB/s) - ‘./ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip’ gespeichert [2929311/2929311] ---2022-09-09 22:36:19-- https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip +--2022-10-06 12:11:16-- https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 153157 (150K) [application/zip] Wird in ‘./39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip’ gespeichert. - 0K .. 100% 1,17M=0,1s + 0K .. 100% 1,33M=0,1s -2022-09-09 22:36:20 (1,17 MB/s) - ‘./39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip’ gespeichert [153157/153157] +2022-10-06 12:11:16 (1,33 MB/s) - ‘./39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip’ gespeichert [153157/153157] ---2022-09-09 22:36:20-- https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.2.tar.gz +--2022-10-06 12:11:16-- https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.2.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2257645 (2,2M) [application/octet-stream] Wird in ‘./libjpeg-turbo-2.1.2.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ .. 100% 1,89M=1,1s + 0K ........ ........ ........ ........ .. 100% 728K=3,0s -2022-09-09 22:36:21 (1,89 MB/s) - ‘./libjpeg-turbo-2.1.2.tar.gz’ gespeichert [2257645/2257645] +2022-10-06 12:11:19 (728 KB/s) - ‘./libjpeg-turbo-2.1.2.tar.gz’ gespeichert [2257645/2257645] ---2022-09-09 22:36:21-- https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz +--2022-10-06 12:11:20-- https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 7419126 (7,1M) [application/octet-stream] Wird in ‘./lcms2-2.12.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 42% 2,65M 2s - 3072K ........ ........ ........ ........ ........ ........ 84% 2,82M 0s - 6144K ........ ........ . 100% 2,91M=2,6s + 0K ........ ........ ........ ........ ........ ........ 42% 1,03M 4s + 3072K ........ ........ ........ ........ ........ ........ 84% 1,46M 1s + 6144K ........ ........ . 100% 1,08M=6,0s -2022-09-09 22:36:24 (2,76 MB/s) - ‘./lcms2-2.12.tar.gz’ gespeichert [7419126/7419126] +2022-10-06 12:11:26 (1,19 MB/s) - ‘./lcms2-2.12.tar.gz’ gespeichert [7419126/7419126] ---2022-09-09 22:36:24-- https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz +--2022-10-06 12:11:26-- https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 503550 (492K) [application/octet-stream] Wird in ‘./libatomic_ops-7.6.8.tar.gz’ gespeichert. - 0K ....... 100% 1,69M=0,3s + 0K ....... 100% 964K=0,5s -2022-09-09 22:36:24 (1,69 MB/s) - ‘./libatomic_ops-7.6.8.tar.gz’ gespeichert [503550/503550] +2022-10-06 12:11:27 (964 KB/s) - ‘./libatomic_ops-7.6.8.tar.gz’ gespeichert [503550/503550] ---2022-09-09 22:36:24-- https://dev-www.libreoffice.org/src/libassuan-2.5.5.tar.bz2 +--2022-10-06 12:11:27-- https://dev-www.libreoffice.org/src/libassuan-2.5.5.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 572263 (559K) [application/octet-stream] Wird in ‘./libassuan-2.5.5.tar.bz2’ gespeichert. - 0K ........ 100% 1,89M=0,3s + 0K ........ 100% 1011K=0,6s -2022-09-09 22:36:25 (1,89 MB/s) - ‘./libassuan-2.5.5.tar.bz2’ gespeichert [572263/572263] +2022-10-06 12:11:27 (1011 KB/s) - ‘./libassuan-2.5.5.tar.bz2’ gespeichert [572263/572263] ---2022-09-09 22:36:25-- https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2 +--2022-10-06 12:11:27-- https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 260288 (254K) [application/octet-stream] Wird in ‘./libeot-0.01.tar.bz2’ gespeichert. - 0K ... 100% 1,64M=0,2s + 0K ... 100% 1,09M=0,2s -2022-09-09 22:36:25 (1,64 MB/s) - ‘./libeot-0.01.tar.bz2’ gespeichert [260288/260288] +2022-10-06 12:11:28 (1,09 MB/s) - ‘./libeot-0.01.tar.bz2’ gespeichert [260288/260288] ---2022-09-09 22:36:25-- https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz +--2022-10-06 12:11:28-- https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1111320 (1,1M) [application/octet-stream] Wird in ‘./libexttextcat-3.4.6.tar.xz’ gespeichert. - 0K ........ ........ 100% 2,14M=0,5s + 0K ........ ........ 100% 1,34M=0,8s -2022-09-09 22:36:26 (2,14 MB/s) - ‘./libexttextcat-3.4.6.tar.xz’ gespeichert [1111320/1111320] +2022-10-06 12:11:29 (1,34 MB/s) - ‘./libexttextcat-3.4.6.tar.xz’ gespeichert [1111320/1111320] ---2022-09-09 22:36:26-- https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz +--2022-10-06 12:11:29-- https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1305466 (1,2M) [application/octet-stream] Wird in ‘./libffi-3.3.tar.gz’ gespeichert. - 0K ........ ........ ... 100% 2,28M=0,5s + 0K ........ ........ ... 100% 2,01M=0,6s -2022-09-09 22:36:27 (2,28 MB/s) - ‘./libffi-3.3.tar.gz’ gespeichert [1305466/1305466] +2022-10-06 12:11:30 (2,01 MB/s) - ‘./libffi-3.3.tar.gz’ gespeichert [1305466/1305466] ---2022-09-09 22:36:27-- https://dev-www.libreoffice.org/src/libgpg-error-1.43.tar.bz2 +--2022-10-06 12:11:30-- https://dev-www.libreoffice.org/src/libgpg-error-1.43.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 999006 (976K) [application/octet-stream] Wird in ‘./libgpg-error-1.43.tar.bz2’ gespeichert. - 0K ........ ....... 100% 1,89M=0,5s + 0K ........ ....... 100% 1,05M=0,9s -2022-09-09 22:36:28 (1,89 MB/s) - ‘./libgpg-error-1.43.tar.bz2’ gespeichert [999006/999006] +2022-10-06 12:11:31 (1,05 MB/s) - ‘./libgpg-error-1.43.tar.bz2’ gespeichert [999006/999006] ---2022-09-09 22:36:28-- https://dev-www.libreoffice.org/src/language-subtag-registry-2021-12-29.tar.bz2 +--2022-10-06 12:11:31-- https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK -Länge: 76945 (75K) [application/octet-stream] -Wird in ‘./language-subtag-registry-2021-12-29.tar.bz2’ gespeichert. +Länge: 77580 (76K) [application/octet-stream] +Wird in ‘./language-subtag-registry-2022-08-08.tar.bz2’ gespeichert. - 0K . 100% 1,56M=0,05s + 0K . 100% 1,05M=0,07s -2022-09-09 22:36:28 (1,56 MB/s) - ‘./language-subtag-registry-2021-12-29.tar.bz2’ gespeichert [76945/76945] +2022-10-06 12:11:31 (1,05 MB/s) - ‘./language-subtag-registry-2022-08-08.tar.bz2’ gespeichert [77580/77580] ---2022-09-09 22:36:28-- https://dev-www.libreoffice.org/src/liblangtag-0.6.3.tar.bz2 +--2022-10-06 12:11:31-- https://dev-www.libreoffice.org/src/liblangtag-0.6.3.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 755492 (738K) [application/octet-stream] Wird in ‘./liblangtag-0.6.3.tar.bz2’ gespeichert. - 0K ........ ... 100% 1,96M=0,4s + 0K ........ ... 100% 1,00M=0,7s -2022-09-09 22:36:29 (1,96 MB/s) - ‘./liblangtag-0.6.3.tar.bz2’ gespeichert [755492/755492] +2022-10-06 12:11:32 (1,00 MB/s) - ‘./liblangtag-0.6.3.tar.bz2’ gespeichert [755492/755492] ---2022-09-09 22:36:29-- https://dev-www.libreoffice.org/src/libnumbertext-1.0.10.tar.xz +--2022-10-06 12:11:32-- https://dev-www.libreoffice.org/src/libnumbertext-1.0.10.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 292852 (286K) [application/octet-stream] Wird in ‘./libnumbertext-1.0.10.tar.xz’ gespeichert. - 0K .... 100% 1,67M=0,2s + 0K .... 100% 1,07M=0,3s -2022-09-09 22:36:29 (1,67 MB/s) - ‘./libnumbertext-1.0.10.tar.xz’ gespeichert [292852/292852] +2022-10-06 12:11:33 (1,07 MB/s) - ‘./libnumbertext-1.0.10.tar.xz’ gespeichert [292852/292852] ---2022-09-09 22:36:29-- https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz +--2022-10-06 12:11:33-- https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1012272 (989K) [application/octet-stream] Wird in ‘./libpng-1.6.37.tar.xz’ gespeichert. - 0K ........ ....... 100% 1,75M=0,6s + 0K ........ ....... 100% 1,37M=0,7s -2022-09-09 22:36:30 (1,75 MB/s) - ‘./libpng-1.6.37.tar.xz’ gespeichert [1012272/1012272] +2022-10-06 12:11:34 (1,37 MB/s) - ‘./libpng-1.6.37.tar.xz’ gespeichert [1012272/1012272] ---2022-09-09 22:36:30-- https://dev-www.libreoffice.org/src/tiff-4.4.0.tar.xz +--2022-10-06 12:11:34-- https://dev-www.libreoffice.org/src/tiff-4.4.0.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1929292 (1,8M) [application/octet-stream] Wird in ‘./tiff-4.4.0.tar.xz’ gespeichert. - 0K ........ ........ ........ ..... 100% 1,14M=1,6s + 0K ........ ........ ........ ..... 100% 1,73M=1,1s -2022-09-09 22:36:32 (1,14 MB/s) - ‘./tiff-4.4.0.tar.xz’ gespeichert [1929292/1929292] +2022-10-06 12:11:35 (1,73 MB/s) - ‘./tiff-4.4.0.tar.xz’ gespeichert [1929292/1929292] ---2022-09-09 22:36:32-- https://dev-www.libreoffice.org/src/ltm-1.0.zip +--2022-10-06 12:11:35-- https://dev-www.libreoffice.org/src/ltm-1.0.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2542693 (2,4M) [application/zip] Wird in ‘./ltm-1.0.zip’ gespeichert. - 0K ........ ........ ........ ........ ...... 100% 1,81M=1,3s + 0K ........ ........ ........ ........ ...... 100% 2,36M=1,0s -2022-09-09 22:36:33 (1,81 MB/s) - ‘./ltm-1.0.zip’ gespeichert [2542693/2542693] +2022-10-06 12:11:36 (2,36 MB/s) - ‘./ltm-1.0.zip’ gespeichert [2542693/2542693] ---2022-09-09 22:36:33-- https://dev-www.libreoffice.org/src/libwebp-1.2.2.tar.gz +--2022-10-06 12:11:36-- https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK -Länge: 4117468 (3,9M) [application/octet-stream] -Wird in ‘./libwebp-1.2.2.tar.gz’ gespeichert. +Länge: 4141376 (3,9M) [application/octet-stream] +Wird in ‘./libwebp-1.2.4.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 76% 1,77M 1s - 3072K ........ ...... 100% 2,29M=2,1s + 0K ........ ........ ........ ........ ........ ........ 75% 1,60M 1s + 3072K ........ ....... 100% 1,29M=2,6s -2022-09-09 22:36:36 (1,87 MB/s) - ‘./libwebp-1.2.2.tar.gz’ gespeichert [4117468/4117468] +2022-10-06 12:11:39 (1,51 MB/s) - ‘./libwebp-1.2.4.tar.gz’ gespeichert [4141376/4141376] ---2022-09-09 22:36:36-- https://dev-www.libreoffice.org/src/libxml2-2.9.14.tar.xz +--2022-10-06 12:11:39-- https://dev-www.libreoffice.org/src/libxml2-2.10.2.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK -Länge: 3129968 (3,0M) [application/octet-stream] -Wird in ‘./libxml2-2.9.14.tar.xz’ gespeichert. +Länge: 2636304 (2,5M) [application/octet-stream] +Wird in ‘./libxml2-2.10.2.tar.xz’ gespeichert. - 0K ........ ........ ........ ........ ........ ....... 100% 1,30M=2,3s + 0K ........ ........ ........ ........ ........ 100% 1,46M=1,7s -2022-09-09 22:36:38 (1,30 MB/s) - ‘./libxml2-2.9.14.tar.xz’ gespeichert [3129968/3129968] +2022-10-06 12:11:41 (1,46 MB/s) - ‘./libxml2-2.10.2.tar.xz’ gespeichert [2636304/2636304] ---2022-09-09 22:36:38-- https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz +--2022-10-06 12:11:41-- https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1991505 (1,9M) [application/octet-stream] Wird in ‘./xmlsec1-1.2.34.tar.gz’ gespeichert. - 0K ........ ........ ........ ...... 100% 1,71M=1,1s + 0K ........ ........ ........ ...... 100% 883K=2,2s -2022-09-09 22:36:40 (1,71 MB/s) - ‘./xmlsec1-1.2.34.tar.gz’ gespeichert [1991505/1991505] +2022-10-06 12:11:44 (883 KB/s) - ‘./xmlsec1-1.2.34.tar.gz’ gespeichert [1991505/1991505] ---2022-09-09 22:36:40-- https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz +--2022-10-06 12:11:44-- https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1827548 (1,7M) [application/octet-stream] Wird in ‘./libxslt-1.1.35.tar.xz’ gespeichert. - 0K ........ ........ ........ ... 100% 2,18M=0,8s + 0K ........ ........ ........ ... 100% 1,19M=1,5s -2022-09-09 22:36:41 (2,18 MB/s) - ‘./libxslt-1.1.35.tar.xz’ gespeichert [1827548/1827548] +2022-10-06 12:11:45 (1,19 MB/s) - ‘./libxslt-1.1.35.tar.xz’ gespeichert [1827548/1827548] ---2022-09-09 22:36:41-- https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz +--2022-10-06 12:11:45-- https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 769268 (751K) [application/octet-stream] Wird in ‘./26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz’ gespeichert. - 0K ........ ... 100% 1,63M=0,5s + 0K ........ ... 100% 983K=0,8s -2022-09-09 22:36:42 (1,63 MB/s) - ‘./26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz’ gespeichert [769268/769268] +2022-10-06 12:11:46 (983 KB/s) - ‘./26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz’ gespeichert [769268/769268] ---2022-09-09 22:36:42-- https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz +--2022-10-06 12:11:47-- https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2380804 (2,3M) [application/octet-stream] Wird in ‘./lxml-4.1.1.tgz’ gespeichert. - 0K ........ ........ ........ ........ .... 100% 1,41M=1,6s + 0K ........ ........ ........ ........ .... 100% 1020K=2,3s -2022-09-09 22:36:43 (1,41 MB/s) - ‘./lxml-4.1.1.tgz’ gespeichert [2380804/2380804] +2022-10-06 12:11:49 (1020 KB/s) - ‘./lxml-4.1.1.tgz’ gespeichert [2380804/2380804] ---2022-09-09 22:36:44-- https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz +--2022-10-06 12:11:49-- https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 744745 (727K) [application/octet-stream] Wird in ‘./mariadb-connector-c-3.1.8-src.tar.gz’ gespeichert. - 0K ........ ... 100% 1,43M=0,5s + 0K ........ ... 100% 1,34M=0,5s -2022-09-09 22:36:44 (1,43 MB/s) - ‘./mariadb-connector-c-3.1.8-src.tar.gz’ gespeichert [744745/744745] +2022-10-06 12:11:50 (1,34 MB/s) - ‘./mariadb-connector-c-3.1.8-src.tar.gz’ gespeichert [744745/744745] ---2022-09-09 22:36:44-- https://dev-www.libreoffice.org/src/mdds-2.0.3.tar.bz2 +--2022-10-06 12:11:50-- https://dev-www.libreoffice.org/src/mdds-2.0.3.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 516540 (504K) [application/octet-stream] Wird in ‘./mdds-2.0.3.tar.bz2’ gespeichert. - 0K ....... 100% 958K=0,5s + 0K ....... 100% 1,22M=0,4s -2022-09-09 22:36:45 (958 KB/s) - ‘./mdds-2.0.3.tar.bz2’ gespeichert [516540/516540] +2022-10-06 12:11:50 (1,22 MB/s) - ‘./mdds-2.0.3.tar.bz2’ gespeichert [516540/516540] ---2022-09-09 22:36:45-- https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz +--2022-10-06 12:11:50-- https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 97942494 (93M) [application/octet-stream] Wird in ‘./zxing-cpp-1.2.0.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 3% 814K 1m54s - 3072K ........ ........ ........ ........ ........ ........ 6% 1,67M 81s - 6144K ........ ........ ........ ........ ........ ........ 9% 1,78M 68s - 9216K ........ ........ ........ ........ ........ ........ 12% 811K 75s - 12288K ........ ........ ........ ........ ........ ........ 16% 1,06M 73s - 15360K ........ ........ ........ ........ ........ ........ 19% 1,06M 70s - 18432K ........ ........ ........ ........ ........ ........ 22% 1,26M 66s - 21504K ........ ........ ........ ........ ........ ........ 25% 1,53M 61s - 24576K ........ ........ ........ ........ ........ ........ 28% 1,35M 57s - 27648K ........ ........ ........ ........ ........ ........ 32% 1,44M 54s - 30720K ........ ........ ........ ........ ........ ........ 35% 1,42M 50s - 33792K ........ ........ ........ ........ ........ ........ 38% 1,94M 46s - 36864K ........ ........ ........ ........ ........ ........ 41% 2,64M 42s - 39936K ........ ........ ........ ........ ........ ........ 44% 2,32M 38s - 43008K ........ ........ ........ ........ ........ ........ 48% 1,88M 36s - 46080K ........ ........ ........ ........ ........ ........ 51% 2,35M 32s - 49152K ........ ........ ........ ........ ........ ........ 54% 2,26M 30s - 52224K ........ ........ ........ ........ ........ ........ 57% 1,82M 27s - 55296K ........ ........ ........ ........ ........ ........ 61% 1,70M 25s - 58368K ........ ........ ........ ........ ........ ........ 64% 2,31M 22s - 61440K ........ ........ ........ ........ ........ ........ 67% 2,33M 20s - 64512K ........ ........ ........ ........ ........ ........ 70% 1,81M 18s - 67584K ........ ........ ........ ........ ........ ........ 73% 2,09M 16s - 70656K ........ ........ ........ ........ ........ ........ 77% 1,71M 14s - 73728K ........ ........ ........ ........ ........ ........ 80% 1,91M 12s - 76800K ........ ........ ........ ........ ........ ........ 83% 1,95M 10s - 79872K ........ ........ ........ ........ ........ ........ 86% 2,32M 8s - 82944K ........ ........ ........ ........ ........ ........ 89% 2,21M 6s - 86016K ........ ........ ........ ........ ........ ........ 93% 1,40M 4s - 89088K ........ ........ ........ ........ ........ ........ 96% 711K 2s - 92160K ........ ........ ........ ........ ........ ........ 99% 902K 0s - 95232K ...... 100% 821K=63s + 0K ........ ........ ........ ........ ........ ........ 3% 2,03M 44s + 3072K ........ ........ ........ ........ ........ ........ 6% 1,86M 45s + 6144K ........ ........ ........ ........ ........ ........ 9% 1,06M 56s + 9216K ........ ........ ........ ........ ........ ........ 12% 1,57M 53s + 12288K ........ ........ ........ ........ ........ ........ 16% 949K 58s + 15360K ........ ........ ........ ........ ........ ........ 19% 1,13M 57s + 18432K ........ ........ ........ ........ ........ ........ 22% 1,58M 54s + 21504K ........ ........ ........ ........ ........ ........ 25% 1,37M 52s + 24576K ........ ........ ........ ........ ........ ........ 28% 1,28M 50s + 27648K ........ ........ ........ ........ ........ ........ 32% 1,44M 47s + 30720K ........ ........ ........ ........ ........ ........ 35% 1,66M 44s + 33792K ........ ........ ........ ........ ........ ........ 38% 1,28M 42s + 36864K ........ ........ ........ ........ ........ ........ 41% 985K 41s + 39936K ........ ........ ........ ........ ........ ........ 44% 960K 40s + 43008K ........ ........ ........ ........ ........ ........ 48% 1,09M 38s + 46080K ........ ........ ........ ........ ........ ........ 51% 861K 37s + 49152K ........ ........ ........ ........ ........ ........ 54% 917K 35s + 52224K ........ ........ ........ ........ ........ ........ 57% 794K 34s + 55296K ........ ........ ........ ........ ........ ........ 61% 1,15M 31s + 58368K ........ ........ ........ ........ ........ ........ 64% 1,50M 28s + 61440K ........ ........ ........ ........ ........ ........ 67% 1,63M 25s + 64512K ........ ........ ........ ........ ........ ........ 70% 1,37M 23s + 67584K ........ ........ ........ ........ ........ ........ 73% 1,22M 20s + 70656K ........ ........ ........ ........ ........ ........ 77% 871K 18s + 73728K ........ ........ ........ ........ ........ ........ 80% 1,38M 15s + 76800K ........ ........ ........ ........ ........ ........ 83% 1,05M 13s + 79872K ........ ........ ........ ........ ........ ........ 86% 790K 11s + 82944K ........ ........ ........ ........ ........ ........ 89% 756K 8s + 86016K ........ ........ ........ ........ ........ ........ 93% 707K 6s + 89088K ........ ........ ........ ........ ........ ........ 96% 868K 3s + 92160K ........ ........ ........ ........ ........ ........ 99% 1014K 0s + 95232K ...... 100% 952K=85s -2022-09-09 22:37:48 (1,49 MB/s) - ‘./zxing-cpp-1.2.0.tar.gz’ gespeichert [97942494/97942494] +2022-10-06 12:13:16 (1,10 MB/s) - ‘./zxing-cpp-1.2.0.tar.gz’ gespeichert [97942494/97942494] ---2022-09-09 22:37:49-- https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz +--2022-10-06 12:13:16-- https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2537410 (2,4M) [application/octet-stream] Wird in ‘./mDNSResponder-878.200.35.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ...... 100% 1,47M=1,7s + 0K ........ ........ ........ ........ ...... 100% 1,17M=2,1s -2022-09-09 22:37:51 (1,47 MB/s) - ‘./mDNSResponder-878.200.35.tar.gz’ gespeichert [2537410/2537410] +2022-10-06 12:13:19 (1,17 MB/s) - ‘./mDNSResponder-878.200.35.tar.gz’ gespeichert [2537410/2537410] ---2022-09-09 22:37:51-- https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz +--2022-10-06 12:13:19-- https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 112756 (110K) [application/octet-stream] Wird in ‘./368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz’ gespeichert. - 0K . 100% 1,38M=0,08s + 0K . 100% 968K=0,1s -2022-09-09 22:37:51 (1,38 MB/s) - ‘./368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz’ gespeichert [112756/112756] +2022-10-06 12:13:19 (968 KB/s) - ‘./368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz’ gespeichert [112756/112756] ---2022-09-09 22:37:51-- https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz +--2022-10-06 12:13:19-- https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1169488 (1,1M) [application/octet-stream] Wird in ‘./c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz’ gespeichert. - 0K ........ ........ . 100% 1,39M=0,8s + 0K ........ ........ . 100% 791K=1,4s -2022-09-09 22:37:52 (1,39 MB/s) - ‘./c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz’ gespeichert [1169488/1169488] +2022-10-06 12:13:21 (791 KB/s) - ‘./c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz’ gespeichert [1169488/1169488] ---2022-09-09 22:37:52-- https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip +--2022-10-06 12:13:21-- https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 5522795 (5,3M) [application/zip] Wird in ‘./33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 56% 1,40M 2s - 3072K ........ ........ ........ ........ .... 100% 1,03M=4,3s + 0K ........ ........ ........ ........ ........ ........ 56% 940K 2s + 3072K ........ ........ ........ ........ .... 100% 1020K=5,5s -2022-09-09 22:37:57 (1,21 MB/s) - ‘./33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip’ gespeichert [5522795/5522795] +2022-10-06 12:13:27 (973 KB/s) - ‘./33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip’ gespeichert [5522795/5522795] ---2022-09-09 22:37:57-- https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip +--2022-10-06 12:13:27-- https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 811606 (793K) [application/zip] Wird in ‘./1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip’ gespeichert. - 0K ........ .... 100% 915K=0,9s + 0K ........ .... 100% 1,31M=0,6s -2022-09-09 22:37:58 (915 KB/s) - ‘./1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip’ gespeichert [811606/811606] +2022-10-06 12:13:28 (1,31 MB/s) - ‘./1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip’ gespeichert [811606/811606] ---2022-09-09 22:37:58-- https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz +--2022-10-06 12:13:28-- https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 300832 (294K) [application/octet-stream] Wird in ‘./liberation-narrow-fonts-ttf-1.07.6.tar.gz’ gespeichert. - 0K .... 100% 961K=0,3s + 0K .... 100% 1,12M=0,3s -2022-09-09 22:37:58 (961 KB/s) - ‘./liberation-narrow-fonts-ttf-1.07.6.tar.gz’ gespeichert [300832/300832] +2022-10-06 12:13:28 (1,12 MB/s) - ‘./liberation-narrow-fonts-ttf-1.07.6.tar.gz’ gespeichert [300832/300832] ---2022-09-09 22:37:58-- https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz +--2022-10-06 12:13:28-- https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2388283 (2,3M) [application/octet-stream] Wird in ‘./liberation-fonts-ttf-2.1.4.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ .... 100% 1,77M=1,3s + 0K ........ ........ ........ ........ .... 100% 1,08M=2,1s -2022-09-09 22:38:00 (1,77 MB/s) - ‘./liberation-fonts-ttf-2.1.4.tar.gz’ gespeichert [2388283/2388283] +2022-10-06 12:13:30 (1,08 MB/s) - ‘./liberation-fonts-ttf-2.1.4.tar.gz’ gespeichert [2388283/2388283] ---2022-09-09 22:38:00-- https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip +--2022-10-06 12:13:31-- https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 6651982 (6,3M) [application/zip] Wird in ‘./e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 47% 1,52M 2s - 3072K ........ ........ ........ ........ ........ ........ 94% 1,13M 0s - 6144K ..... 100% 1,43M=4,9s + 0K ........ ........ ........ ........ ........ ........ 47% 1007K 3s + 3072K ........ ........ ........ ........ ........ ........ 94% 775K 0s + 6144K ..... 100% 1,17M=7,3s -2022-09-09 22:38:05 (1,30 MB/s) - ‘./e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip’ gespeichert [6651982/6651982] +2022-10-06 12:13:38 (889 KB/s) - ‘./e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip’ gespeichert [6651982/6651982] ---2022-09-09 22:38:05-- https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz +--2022-10-06 12:13:38-- https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK @@ -936,561 +936,561 @@ 0K ........ ........ .... 100% 1,10M=1,2s -2022-09-09 22:38:07 (1,10 MB/s) - ‘./907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz’ gespeichert [1338551/1338551] +2022-10-06 12:13:40 (1,10 MB/s) - ‘./907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz’ gespeichert [1338551/1338551] ---2022-09-09 22:38:07-- https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz +--2022-10-06 12:13:40-- https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1098827 (1,0M) [application/octet-stream] Wird in ‘./edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz’ gespeichert. - 0K ........ ........ 100% 1,47M=0,7s + 0K ........ ........ 100% 956K=1,1s -2022-09-09 22:38:08 (1,47 MB/s) - ‘./edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz’ gespeichert [1098827/1098827] +2022-10-06 12:13:41 (956 KB/s) - ‘./edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz’ gespeichert [1098827/1098827] ---2022-09-09 22:38:08-- https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz +--2022-10-06 12:13:41-- https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1135588 (1,1M) [application/octet-stream] Wird in ‘./source-serif-pro-3.000R.tar.gz’ gespeichert. - 0K ........ ........ . 100% 1008K=1,1s + 0K ........ ........ . 100% 787K=1,4s -2022-09-09 22:38:09 (1008 KB/s) - ‘./source-serif-pro-3.000R.tar.gz’ gespeichert [1135588/1135588] +2022-10-06 12:13:43 (787 KB/s) - ‘./source-serif-pro-3.000R.tar.gz’ gespeichert [1135588/1135588] ---2022-09-09 22:38:09-- https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz +--2022-10-06 12:13:43-- https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2961759 (2,8M) [application/octet-stream] Wird in ‘./EmojiOneColor-SVGinOT-1.3.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ........ ..... 100% 1,13M=2,5s + 0K ........ ........ ........ ........ ........ ..... 100% 1,20M=2,4s -2022-09-09 22:38:12 (1,13 MB/s) - ‘./EmojiOneColor-SVGinOT-1.3.tar.gz’ gespeichert [2961759/2961759] +2022-10-06 12:13:45 (1,20 MB/s) - ‘./EmojiOneColor-SVGinOT-1.3.tar.gz’ gespeichert [2961759/2961759] ---2022-09-09 22:38:12-- https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz +--2022-10-06 12:13:45-- https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 6646182 (6,3M) [application/octet-stream] Wird in ‘./noto-fonts-20171024.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 47% 1,22M 3s - 3072K ........ ........ ........ ........ ........ ........ 94% 1,03M 0s - 6144K ..... 100% 1,24M=5,6s + 0K ........ ........ ........ ........ ........ ........ 47% 1,32M 3s + 3072K ........ ........ ........ ........ ........ ........ 94% 1,08M 0s + 6144K ..... 100% 1,04M=5,4s -2022-09-09 22:38:18 (1,12 MB/s) - ‘./noto-fonts-20171024.tar.gz’ gespeichert [6646182/6646182] +2022-10-06 12:13:51 (1,18 MB/s) - ‘./noto-fonts-20171024.tar.gz’ gespeichert [6646182/6646182] ---2022-09-09 22:38:18-- https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz +--2022-10-06 12:13:51-- https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1174687 (1,1M) [application/octet-stream] Wird in ‘./culmus-0.133.tar.gz’ gespeichert. - 0K ........ ........ . 100% 1,54M=0,7s + 0K ........ ........ . 100% 1,23M=0,9s -2022-09-09 22:38:19 (1,54 MB/s) - ‘./culmus-0.133.tar.gz’ gespeichert [1174687/1174687] +2022-10-06 12:13:52 (1,23 MB/s) - ‘./culmus-0.133.tar.gz’ gespeichert [1174687/1174687] ---2022-09-09 22:38:19-- https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz +--2022-10-06 12:13:52-- https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 531276 (519K) [application/octet-stream] Wird in ‘./libre-hebrew-1.0.tar.gz’ gespeichert. - 0K ........ 100% 1,45M=0,4s + 0K ........ 100% 1,48M=0,3s -2022-09-09 22:38:19 (1,45 MB/s) - ‘./libre-hebrew-1.0.tar.gz’ gespeichert [531276/531276] +2022-10-06 12:13:53 (1,48 MB/s) - ‘./libre-hebrew-1.0.tar.gz’ gespeichert [531276/531276] ---2022-09-09 22:38:19-- https://dev-www.libreoffice.org/src/alef-1.001.tar.gz +--2022-10-06 12:13:53-- https://dev-www.libreoffice.org/src/alef-1.001.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 93498 (91K) [application/octet-stream] Wird in ‘./alef-1.001.tar.gz’ gespeichert. - 0K . 100% 1,19M=0,07s + 0K . 100% 1,24M=0,07s -2022-09-09 22:38:20 (1,19 MB/s) - ‘./alef-1.001.tar.gz’ gespeichert [93498/93498] +2022-10-06 12:13:53 (1,24 MB/s) - ‘./alef-1.001.tar.gz’ gespeichert [93498/93498] ---2022-09-09 22:38:20-- https://dev-www.libreoffice.org/src/Amiri-0.117.zip +--2022-10-06 12:13:53-- https://dev-www.libreoffice.org/src/Amiri-0.117.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2744270 (2,6M) [application/zip] Wird in ‘./Amiri-0.117.zip’ gespeichert. - 0K ........ ........ ........ ........ ........ . 100% 1,43M=1,8s + 0K ........ ........ ........ ........ ........ . 100% 2,26M=1,2s -2022-09-09 22:38:22 (1,43 MB/s) - ‘./Amiri-0.117.zip’ gespeichert [2744270/2744270] +2022-10-06 12:13:54 (2,26 MB/s) - ‘./Amiri-0.117.zip’ gespeichert [2744270/2744270] ---2022-09-09 22:38:22-- https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz +--2022-10-06 12:13:54-- https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 407400 (398K) [application/octet-stream] Wird in ‘./ttf-kacst_2.01+mry.tar.gz’ gespeichert. - 0K ...... 100% 1,39M=0,3s + 0K ...... 100% 1,99M=0,2s -2022-09-09 22:38:22 (1,39 MB/s) - ‘./ttf-kacst_2.01+mry.tar.gz’ gespeichert [407400/407400] +2022-10-06 12:13:55 (1,99 MB/s) - ‘./ttf-kacst_2.01+mry.tar.gz’ gespeichert [407400/407400] ---2022-09-09 22:38:22-- https://dev-www.libreoffice.org/src/ReemKufi-1.2.zip +--2022-10-06 12:13:55-- https://dev-www.libreoffice.org/src/ReemKufi-1.2.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 450612 (440K) [application/zip] Wird in ‘./ReemKufi-1.2.zip’ gespeichert. - 0K ...... 100% 1,38M=0,3s + 0K ...... 100% 1,68M=0,3s -2022-09-09 22:38:23 (1,38 MB/s) - ‘./ReemKufi-1.2.zip’ gespeichert [450612/450612] +2022-10-06 12:13:55 (1,68 MB/s) - ‘./ReemKufi-1.2.zip’ gespeichert [450612/450612] ---2022-09-09 22:38:23-- https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip +--2022-10-06 12:13:55-- https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1114645 (1,1M) [application/zip] Wird in ‘./Scheherazade-2.100.zip’ gespeichert. - 0K ........ ........ . 100% 1,69M=0,6s + 0K ........ ........ . 100% 872K=1,2s -2022-09-09 22:38:24 (1,69 MB/s) - ‘./Scheherazade-2.100.zip’ gespeichert [1114645/1114645] +2022-10-06 12:13:57 (872 KB/s) - ‘./Scheherazade-2.100.zip’ gespeichert [1114645/1114645] ---2022-09-09 22:38:24-- https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz +--2022-10-06 12:13:57-- https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 377472 (369K) [application/octet-stream] Wird in ‘./libmspub-0.1.4.tar.xz’ gespeichert. - 0K ..... 100% 1,37M=0,3s + 0K ..... 100% 1,08M=0,3s -2022-09-09 22:38:24 (1,37 MB/s) - ‘./libmspub-0.1.4.tar.xz’ gespeichert [377472/377472] +2022-10-06 12:13:57 (1,08 MB/s) - ‘./libmspub-0.1.4.tar.xz’ gespeichert [377472/377472] ---2022-09-09 22:38:24-- https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz +--2022-10-06 12:13:57-- https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1457212 (1,4M) [application/octet-stream] Wird in ‘./libmwaw-0.3.21.tar.xz’ gespeichert. - 0K ........ ........ ...... 100% 1,90M=0,7s + 0K ........ ........ ...... 100% 1,24M=1,1s -2022-09-09 22:38:25 (1,90 MB/s) - ‘./libmwaw-0.3.21.tar.xz’ gespeichert [1457212/1457212] +2022-10-06 12:13:59 (1,24 MB/s) - ‘./libmwaw-0.3.21.tar.xz’ gespeichert [1457212/1457212] ---2022-09-09 22:38:25-- https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz +--2022-10-06 12:13:59-- https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 4910303 (4,7M) [application/octet-stream] Wird in ‘./a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 64% 1,80M 1s - 3072K ........ ........ ........ .. 100% 1,09M=3,2s + 0K ........ ........ ........ ........ ........ ........ 64% 1,57M 1s + 3072K ........ ........ ........ .. 100% 1,76M=2,9s -2022-09-09 22:38:29 (1,45 MB/s) - ‘./a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz’ gespeichert [4910303/4910303] +2022-10-06 12:14:02 (1,63 MB/s) - ‘./a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz’ gespeichert [4910303/4910303] ---2022-09-09 22:38:29-- https://dev-www.libreoffice.org/src/nss-3.79-with-nspr-4.34.tar.gz +--2022-10-06 12:14:02-- https://dev-www.libreoffice.org/src/nss-3.83-with-nspr-4.34.1.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK -Länge: 86446447 (82M) [application/octet-stream] -Wird in ‘./nss-3.79-with-nspr-4.34.tar.gz’ gespeichert. - - 0K ........ ........ ........ ........ ........ ........ 3% 1,09M 73s - 3072K ........ ........ ........ ........ ........ ........ 7% 1,55M 60s - 6144K ........ ........ ........ ........ ........ ........ 10% 2,32M 49s - 9216K ........ ........ ........ ........ ........ ........ 14% 1,36M 48s - 12288K ........ ........ ........ ........ ........ ........ 18% 1,57M 45s - 15360K ........ ........ ........ ........ ........ ........ 21% 2,08M 41s - 18432K ........ ........ ........ ........ ........ ........ 25% 891K 44s - 21504K ........ ........ ........ ........ ........ ........ 29% 1,19M 43s - 24576K ........ ........ ........ ........ ........ ........ 32% 2,11M 39s - 27648K ........ ........ ........ ........ ........ ........ 36% 1,84M 36s - 30720K ........ ........ ........ ........ ........ ........ 40% 1,24M 34s - 33792K ........ ........ ........ ........ ........ ........ 43% 1,13M 33s - 36864K ........ ........ ........ ........ ........ ........ 47% 1,05M 32s - 39936K ........ ........ ........ ........ ........ ........ 50% 1,25M 30s - 43008K ........ ........ ........ ........ ........ ........ 54% 749K 29s - 46080K ........ ........ ........ ........ ........ ........ 58% 1,19M 27s - 49152K ........ ........ ........ ........ ........ ........ 61% 1,43M 24s - 52224K ........ ........ ........ ........ ........ ........ 65% 1,32M 22s - 55296K ........ ........ ........ ........ ........ ........ 69% 1,98M 19s - 58368K ........ ........ ........ ........ ........ ........ 72% 1,77M 17s - 61440K ........ ........ ........ ........ ........ ........ 76% 1,26M 15s - 64512K ........ ........ ........ ........ ........ ........ 80% 1,57M 12s - 67584K ........ ........ ........ ........ ........ ........ 83% 1,81M 10s - 70656K ........ ........ ........ ........ ........ ........ 87% 2,50M 8s - 73728K ........ ........ ........ ........ ........ ........ 90% 2,78M 5s - 76800K ........ ........ ........ ........ ........ ........ 94% 1,30M 3s - 79872K ........ ........ ........ ........ ........ ........ 98% 1,67M 1s - 82944K ........ ........ ....... 100% 1,94M=58s +Länge: 86464335 (82M) [application/octet-stream] +Wird in ‘./nss-3.83-with-nspr-4.34.1.tar.gz’ gespeichert. + + 0K ........ ........ ........ ........ ........ ........ 3% 999K 81s + 3072K ........ ........ ........ ........ ........ ........ 7% 1,74M 61s + 6144K ........ ........ ........ ........ ........ ........ 10% 711K 74s + 9216K ........ ........ ........ ........ ........ ........ 14% 1,04M 71s + 12288K ........ ........ ........ ........ ........ ........ 18% 877K 70s + 15360K ........ ........ ........ ........ ........ ........ 21% 897K 68s + 18432K ........ ........ ........ ........ ........ ........ 25% 909K 65s + 21504K ........ ........ ........ ........ ........ ........ 29% 791K 64s + 24576K ........ ........ ........ ........ ........ ........ 32% 761K 62s + 27648K ........ ........ ........ ........ ........ ........ 36% 798K 60s + 30720K ........ ........ ........ ........ ........ ........ 40% 773K 57s + 33792K ........ ........ ........ ........ ........ ........ 43% 676K 55s + 36864K ........ ........ ........ ........ ........ ........ 47% 667K 53s + 39936K ........ ........ ........ ........ ........ ........ 50% 908K 49s + 43008K ........ ........ ........ ........ ........ ........ 54% 907K 45s + 46080K ........ ........ ........ ........ ........ ........ 58% 783K 42s + 49152K ........ ........ ........ ........ ........ ........ 61% 619K 39s + 52224K ........ ........ ........ ........ ........ ........ 65% 1,33M 34s + 55296K ........ ........ ........ ........ ........ ........ 69% 1,14M 30s + 58368K ........ ........ ........ ........ ........ ........ 72% 732K 27s + 61440K ........ ........ ........ ........ ........ ........ 76% 988K 23s + 64512K ........ ........ ........ ........ ........ ........ 80% 870K 20s + 67584K ........ ........ ........ ........ ........ ........ 83% 650K 16s + 70656K ........ ........ ........ ........ ........ ........ 87% 669K 13s + 73728K ........ ........ ........ ........ ........ ........ 90% 645K 9s + 76800K ........ ........ ........ ........ ........ ........ 94% 843K 6s + 79872K ........ ........ ........ ........ ........ ........ 98% 926K 2s + 82944K ........ ........ ....... 100% 1,41M=1m41s -2022-09-09 22:39:27 (1,42 MB/s) - ‘./nss-3.79-with-nspr-4.34.tar.gz’ gespeichert [86446447/86446447] +2022-10-06 12:15:43 (839 KB/s) - ‘./nss-3.83-with-nspr-4.34.1.tar.gz’ gespeichert [86464335/86464335] ---2022-09-09 22:39:28-- https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz +--2022-10-06 12:15:43-- https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 386156 (377K) [application/octet-stream] Wird in ‘./libodfgen-0.1.8.tar.xz’ gespeichert. - 0K ..... 100% 1,62M=0,2s + 0K ..... 100% 1,06M=0,3s -2022-09-09 22:39:28 (1,62 MB/s) - ‘./libodfgen-0.1.8.tar.xz’ gespeichert [386156/386156] +2022-10-06 12:15:44 (1,06 MB/s) - ‘./libodfgen-0.1.8.tar.xz’ gespeichert [386156/386156] ---2022-09-09 22:39:28-- https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz +--2022-10-06 12:15:44-- https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 5886272 (5,6M) [application/octet-stream] Wird in ‘./openldap-2.4.59.tgz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 53% 2,47M 1s - 3072K ........ ........ ........ ........ ........ . 100% 2,17M=2,4s + 0K ........ ........ ........ ........ ........ ........ 53% 2,06M 1s + 3072K ........ ........ ........ ........ ........ . 100% 2,72M=2,4s -2022-09-09 22:39:31 (2,32 MB/s) - ‘./openldap-2.4.59.tgz’ gespeichert [5886272/5886272] +2022-10-06 12:15:47 (2,32 MB/s) - ‘./openldap-2.4.59.tgz’ gespeichert [5886272/5886272] ---2022-09-09 22:39:31-- https://dev-www.libreoffice.org/src/openssl-1.1.1q.tar.gz +--2022-10-06 12:15:47-- https://dev-www.libreoffice.org/src/openssl-1.1.1q.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 9864061 (9,4M) [application/octet-stream] Wird in ‘./openssl-1.1.1q.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 31% 2,03M 3s - 3072K ........ ........ ........ ........ ........ ........ 63% 921K 3s - 6144K ........ ........ ........ ........ ........ ........ 95% 1,38M 0s - 9216K ...... 100% 2,03M=7,2s + 0K ........ ........ ........ ........ ........ ........ 31% 2,31M 3s + 3072K ........ ........ ........ ........ ........ ........ 63% 1,62M 2s + 6144K ........ ........ ........ ........ ........ ........ 95% 857K 0s + 9216K ...... 100% 1,34M=7,0s -2022-09-09 22:39:38 (1,31 MB/s) - ‘./openssl-1.1.1q.tar.gz’ gespeichert [9864061/9864061] +2022-10-06 12:15:54 (1,34 MB/s) - ‘./openssl-1.1.1q.tar.gz’ gespeichert [9864061/9864061] ---2022-09-09 22:39:38-- https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2 +--2022-10-06 12:15:54-- https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2123970 (2,0M) [application/octet-stream] Wird in ‘./liborcus-0.17.2.tar.bz2’ gespeichert. - 0K ........ ........ ........ ........ 100% 1002K=2,1s + 0K ........ ........ ........ ........ 100% 950K=2,2s -2022-09-09 22:39:41 (1002 KB/s) - ‘./liborcus-0.17.2.tar.bz2’ gespeichert [2123970/2123970] +2022-10-06 12:15:57 (950 KB/s) - ‘./liborcus-0.17.2.tar.bz2’ gespeichert [2123970/2123970] ---2022-09-09 22:39:41-- https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz +--2022-10-06 12:15:57-- https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 306496 (299K) [application/octet-stream] Wird in ‘./libpagemaker-0.0.4.tar.xz’ gespeichert. - 0K .... 100% 886K=0,3s + 0K .... 100% 725K=0,4s -2022-09-09 22:39:41 (886 KB/s) - ‘./libpagemaker-0.0.4.tar.xz’ gespeichert [306496/306496] +2022-10-06 12:15:57 (725 KB/s) - ‘./libpagemaker-0.0.4.tar.xz’ gespeichert [306496/306496] ---2022-09-09 22:39:41-- https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2 +--2022-10-06 12:15:57-- https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 9771391 (9,3M) [application/octet-stream] Wird in ‘./pdfium-5058.tar.bz2’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 32% 1,85M 3s - 3072K ........ ........ ........ ........ ........ ........ 64% 2,95M 1s - 6144K ........ ........ ........ ........ ........ ........ 96% 2,62M 0s - 9216K ..... 100% 1,98M=3,9s + 0K ........ ........ ........ ........ ........ ........ 32% 1,03M 6s + 3072K ........ ........ ........ ........ ........ ........ 64% 952K 3s + 6144K ........ ........ ........ ........ ........ ........ 96% 867K 0s + 9216K ..... 100% 837K=10s -2022-09-09 22:39:46 (2,36 MB/s) - ‘./pdfium-5058.tar.bz2’ gespeichert [9771391/9771391] +2022-10-06 12:16:08 (949 KB/s) - ‘./pdfium-5058.tar.bz2’ gespeichert [9771391/9771391] ---2022-09-09 22:39:46-- https://dev-www.libreoffice.org/src/poppler-22.01.0.tar.xz +--2022-10-06 12:16:08-- https://dev-www.libreoffice.org/src/poppler-22.09.0.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK -Länge: 1801984 (1,7M) [application/octet-stream] -Wird in ‘./poppler-22.01.0.tar.xz’ gespeichert. +Länge: 1842704 (1,8M) [application/octet-stream] +Wird in ‘./poppler-22.09.0.tar.xz’ gespeichert. - 0K ........ ........ ........ ... 100% 2,44M=0,7s + 0K ........ ........ ........ .... 100% 1,46M=1,2s -2022-09-09 22:39:47 (2,44 MB/s) - ‘./poppler-22.01.0.tar.xz’ gespeichert [1801984/1801984] +2022-10-06 12:16:09 (1,46 MB/s) - ‘./poppler-22.09.0.tar.xz’ gespeichert [1842704/1842704] ---2022-09-09 22:39:47-- https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz +--2022-10-06 12:16:09-- https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 4497282 (4,3M) [application/octet-stream] Wird in ‘./poppler-data-0.4.11.tar.gz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 69% 2,67M 0s - 3072K ........ ........ .... 100% 3,05M=1,5s + 0K ........ ........ ........ ........ ........ ........ 69% 1,83M 1s + 3072K ........ ........ .... 100% 1,52M=2,5s -2022-09-09 22:39:48 (2,78 MB/s) - ‘./poppler-data-0.4.11.tar.gz’ gespeichert [4497282/4497282] +2022-10-06 12:16:12 (1,72 MB/s) - ‘./poppler-data-0.4.11.tar.gz’ gespeichert [4497282/4497282] ---2022-09-09 22:39:48-- https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2 +--2022-10-06 12:16:12-- https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 21186674 (20M) [application/octet-stream] Wird in ‘./postgresql-13.5.tar.bz2’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 14% 2,46M 7s - 3072K ........ ........ ........ ........ ........ ........ 29% 2,93M 5s - 6144K ........ ........ ........ ........ ........ ........ 44% 1,84M 5s - 9216K ........ ........ ........ ........ ........ ........ 59% 1,55M 4s - 12288K ........ ........ ........ ........ ........ ........ 74% 921K 3s - 15360K ........ ........ ........ ........ ........ ........ 89% 1,52M 1s - 18432K ........ ........ ........ ........ ... 100% 1,31M=13s + 0K ........ ........ ........ ........ ........ ........ 14% 728K 24s + 3072K ........ ........ ........ ........ ........ ........ 29% 794K 19s + 6144K ........ ........ ........ ........ ........ ........ 44% 1,05M 14s + 9216K ........ ........ ........ ........ ........ ........ 59% 931K 10s + 12288K ........ ........ ........ ........ ........ ........ 74% 1,01M 6s + 15360K ........ ........ ........ ........ ........ ........ 89% 694K 3s + 18432K ........ ........ ........ ........ ... 100% 873K=24s -2022-09-09 22:40:01 (1,58 MB/s) - ‘./postgresql-13.5.tar.bz2’ gespeichert [21186674/21186674] +2022-10-06 12:16:36 (853 KB/s) - ‘./postgresql-13.5.tar.bz2’ gespeichert [21186674/21186674] ---2022-09-09 22:40:02-- https://dev-www.libreoffice.org/src/Python-3.8.13.tar.xz +--2022-10-06 12:16:37-- https://dev-www.libreoffice.org/src/Python-3.8.14.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK -Länge: 19023016 (18M) [application/octet-stream] -Wird in ‘./Python-3.8.13.tar.xz’ gespeichert. +Länge: 19031932 (18M) [application/octet-stream] +Wird in ‘./Python-3.8.14.tar.xz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 16% 2,26M 7s - 3072K ........ ........ ........ ........ ........ ........ 33% 3,00M 5s - 6144K ........ ........ ........ ........ ........ ........ 49% 1,38M 5s - 9216K ........ ........ ........ ........ ........ ........ 66% 1,14M 4s - 12288K ........ ........ ........ ........ ........ ........ 82% 1,29M 2s - 15360K ........ ........ ........ ........ ........ ........ 99% 1,05M 0s - 18432K .. 100% 1,20M=12s + 0K ........ ........ ........ ........ ........ ........ 16% 758K 20s + 3072K ........ ........ ........ ........ ........ ........ 33% 1,26M 13s + 6144K ........ ........ ........ ........ ........ ........ 49% 1,16M 9s + 9216K ........ ........ ........ ........ ........ ........ 66% 924K 6s + 12288K ........ ........ ........ ........ ........ ........ 82% 1,47M 3s + 15360K ........ ........ ........ ........ ........ ........ 99% 1,06M 0s + 18432K .. 100% 1,21M=17s -2022-09-09 22:40:14 (1,46 MB/s) - ‘./Python-3.8.13.tar.xz’ gespeichert [19023016/19023016] +2022-10-06 12:16:54 (1,05 MB/s) - ‘./Python-3.8.14.tar.xz’ gespeichert [19031932/19031932] ---2022-09-09 22:40:14-- https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz +--2022-10-06 12:16:54-- https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 341760 (334K) [application/octet-stream] Wird in ‘./libqxp-0.0.2.tar.xz’ gespeichert. - 0K ..... 100% 1,06M=0,3s + 0K ..... 100% 895K=0,4s -2022-09-09 22:40:15 (1,06 MB/s) - ‘./libqxp-0.0.2.tar.xz’ gespeichert [341760/341760] +2022-10-06 12:16:55 (895 KB/s) - ‘./libqxp-0.0.2.tar.xz’ gespeichert [341760/341760] ---2022-09-09 22:40:15-- https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz +--2022-10-06 12:16:55-- https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1886657 (1,8M) [application/octet-stream] Wird in ‘./a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz’ gespeichert. - 0K ........ ........ ........ .... 100% 1,43M=1,3s + 0K ........ ........ ........ .... 100% 1,05M=1,7s -2022-09-09 22:40:17 (1,43 MB/s) - ‘./a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz’ gespeichert [1886657/1886657] +2022-10-06 12:16:57 (1,05 MB/s) - ‘./a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz’ gespeichert [1886657/1886657] ---2022-09-09 22:40:17-- https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz +--2022-10-06 12:16:57-- https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1595647 (1,5M) [application/octet-stream] Wird in ‘./1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz’ gespeichert. - 0K ........ ........ ........ 100% 2,11M=0,7s + 0K ........ ........ ........ 100% 1,63M=0,9s -2022-09-09 22:40:17 (2,11 MB/s) - ‘./1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz’ gespeichert [1595647/1595647] +2022-10-06 12:16:58 (1,63 MB/s) - ‘./1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz’ gespeichert [1595647/1595647] ---2022-09-09 22:40:18-- https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz +--2022-10-06 12:16:58-- https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1621566 (1,5M) [application/octet-stream] Wird in ‘./e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz’ gespeichert. - 0K ........ ........ ........ 100% 2,23M=0,7s + 0K ........ ........ ........ 100% 2,37M=0,7s -2022-09-09 22:40:18 (2,23 MB/s) - ‘./e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz’ gespeichert [1621566/1621566] +2022-10-06 12:16:59 (2,37 MB/s) - ‘./e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz’ gespeichert [1621566/1621566] ---2022-09-09 22:40:19-- https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2 +--2022-10-06 12:16:59-- https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2 Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 529833 (517K) [application/octet-stream] Wird in ‘./librevenge-0.0.4.tar.bz2’ gespeichert. - 0K ........ 100% 1,80M=0,3s + 0K ........ 100% 2,22M=0,2s -2022-09-09 22:40:19 (1,80 MB/s) - ‘./librevenge-0.0.4.tar.bz2’ gespeichert [529833/529833] +2022-10-06 12:16:59 (2,22 MB/s) - ‘./librevenge-0.0.4.tar.bz2’ gespeichert [529833/529833] ---2022-09-09 22:40:19-- https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +--2022-10-06 12:16:59-- https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1521926 (1,5M) [application/zip] Wird in ‘./798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip’ gespeichert. - 0K ........ ........ ....... 100% 2,17M=0,7s + 0K ........ ........ ....... 100% 736K=2,0s -2022-09-09 22:40:20 (2,17 MB/s) - ‘./798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip’ gespeichert [1521926/1521926] +2022-10-06 12:17:02 (736 KB/s) - ‘./798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip’ gespeichert [1521926/1521926] ---2022-09-09 22:40:20-- https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +--2022-10-06 12:17:02-- https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 9796 (9,6K) [application/zip] Wird in ‘./35c94d2df8893241173de1d16b6034c0-swingExSrc.zip’ gespeichert. - 0K 100% 285M=0s + 0K 100% 297M=0s -2022-09-09 22:40:20 (285 MB/s) - ‘./35c94d2df8893241173de1d16b6034c0-swingExSrc.zip’ gespeichert [9796/9796] +2022-10-06 12:17:02 (297 MB/s) - ‘./35c94d2df8893241173de1d16b6034c0-swingExSrc.zip’ gespeichert [9796/9796] ---2022-09-09 22:40:20-- https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz +--2022-10-06 12:17:02-- https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 11079112 (11M) [application/octet-stream] Wird in ‘./skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 28% 2,36M 3s - 3072K ........ ........ ........ ........ ........ ........ 56% 2,70M 2s - 6144K ........ ........ ........ ........ ........ ........ 85% 2,20M 1s - 9216K ........ ........ ........ . 100% 1,78M=4,6s + 0K ........ ........ ........ ........ ........ ........ 28% 1,18M 6s + 3072K ........ ........ ........ ........ ........ ........ 56% 1,10M 4s + 6144K ........ ........ ........ ........ ........ ........ 85% 1,40M 1s + 9216K ........ ........ ........ . 100% 1,59M=8,4s -2022-09-09 22:40:25 (2,28 MB/s) - ‘./skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz’ gespeichert [11079112/11079112] +2022-10-06 12:17:11 (1,26 MB/s) - ‘./skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz’ gespeichert [11079112/11079112] ---2022-09-09 22:40:25-- https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz +--2022-10-06 12:17:11-- https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 707920 (691K) [application/octet-stream] Wird in ‘./libstaroffice-0.0.7.tar.xz’ gespeichert. - 0K ........ .. 100% 1,28M=0,5s + 0K ........ .. 100% 1,65M=0,4s -2022-09-09 22:40:26 (1,28 MB/s) - ‘./libstaroffice-0.0.7.tar.xz’ gespeichert [707920/707920] +2022-10-06 12:17:11 (1,65 MB/s) - ‘./libstaroffice-0.0.7.tar.xz’ gespeichert [707920/707920] ---2022-09-09 22:40:26-- https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz +--2022-10-06 12:17:11-- https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 96939 (95K) [application/octet-stream] Wird in ‘./0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz’ gespeichert. - 0K . 100% 1,20M=0,08s + 0K . 100% 1,29M=0,07s -2022-09-09 22:40:26 (1,20 MB/s) - ‘./0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz’ gespeichert [96939/96939] +2022-10-06 12:17:12 (1,29 MB/s) - ‘./0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz’ gespeichert [96939/96939] ---2022-09-09 22:40:26-- https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz +--2022-10-06 12:17:12-- https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 854296 (834K) [application/octet-stream] Wird in ‘./libvisio-0.1.7.tar.xz’ gespeichert. - 0K ........ ..... 100% 1,52M=0,5s + 0K ........ ..... 100% 795K=1,0s -2022-09-09 22:40:27 (1,52 MB/s) - ‘./libvisio-0.1.7.tar.xz’ gespeichert [854296/854296] +2022-10-06 12:17:13 (795 KB/s) - ‘./libvisio-0.1.7.tar.xz’ gespeichert [854296/854296] ---2022-09-09 22:40:27-- https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz +--2022-10-06 12:17:13-- https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 534712 (522K) [application/octet-stream] Wird in ‘./libwpd-0.10.3.tar.xz’ gespeichert. - 0K ........ 100% 1,36M=0,4s + 0K ........ 100% 956K=0,5s -2022-09-09 22:40:28 (1,36 MB/s) - ‘./libwpd-0.10.3.tar.xz’ gespeichert [534712/534712] +2022-10-06 12:17:14 (956 KB/s) - ‘./libwpd-0.10.3.tar.xz’ gespeichert [534712/534712] ---2022-09-09 22:40:28-- https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz +--2022-10-06 12:17:14-- https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 328664 (321K) [application/octet-stream] Wird in ‘./libwpg-0.3.3.tar.xz’ gespeichert. - 0K ..... 100% 1,32M=0,2s + 0K ..... 100% 869K=0,4s -2022-09-09 22:40:28 (1,32 MB/s) - ‘./libwpg-0.3.3.tar.xz’ gespeichert [328664/328664] +2022-10-06 12:17:14 (869 KB/s) - ‘./libwpg-0.3.3.tar.xz’ gespeichert [328664/328664] ---2022-09-09 22:40:28-- https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz +--2022-10-06 12:17:14-- https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 713008 (696K) [application/octet-stream] Wird in ‘./libwps-0.4.12.tar.xz’ gespeichert. - 0K ........ .. 100% 1,48M=0,5s + 0K ........ .. 100% 1,03M=0,7s -2022-09-09 22:40:29 (1,48 MB/s) - ‘./libwps-0.4.12.tar.xz’ gespeichert [713008/713008] +2022-10-06 12:17:15 (1,03 MB/s) - ‘./libwps-0.4.12.tar.xz’ gespeichert [713008/713008] ---2022-09-09 22:40:29-- https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +--2022-10-06 12:17:15-- https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 23150 (23K) [application/zip] Wird in ‘./a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip’ gespeichert. - 0K 100% 11,2M=0,002s + 0K 100% 11,5M=0,002s -2022-09-09 22:40:29 (11,2 MB/s) - ‘./a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip’ gespeichert [23150/23150] +2022-10-06 12:17:16 (11,5 MB/s) - ‘./a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip’ gespeichert [23150/23150] ---2022-09-09 22:40:29-- https://dev-www.libreoffice.org/src/zlib-1.2.12.tar.xz +--2022-10-06 12:17:16-- https://dev-www.libreoffice.org/src/zlib-1.2.12.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 1288864 (1,2M) [application/octet-stream] Wird in ‘./zlib-1.2.12.tar.xz’ gespeichert. - 0K ........ ........ ... 100% 1,73M=0,7s + 0K ........ ........ ... 100% 677K=1,9s -2022-09-09 22:40:30 (1,73 MB/s) - ‘./zlib-1.2.12.tar.xz’ gespeichert [1288864/1288864] +2022-10-06 12:17:18 (677 KB/s) - ‘./zlib-1.2.12.tar.xz’ gespeichert [1288864/1288864] ---2022-09-09 22:40:30-- https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz +--2022-10-06 12:17:18-- https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 320952 (313K) [application/octet-stream] Wird in ‘./libzmf-0.0.2.tar.xz’ gespeichert. - 0K .... 100% 1,77M=0,2s + 0K .... 100% 733K=0,4s -2022-09-09 22:40:31 (1,77 MB/s) - ‘./libzmf-0.0.2.tar.xz’ gespeichert [320952/320952] +2022-10-06 12:17:18 (733 KB/s) - ‘./libzmf-0.0.2.tar.xz’ gespeichert [320952/320952] ---2022-09-09 22:40:31-- https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf +--2022-10-06 12:17:18-- https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 207992 (203K) [application/octet-stream] Wird in ‘./f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf’ gespeichert. - 0K ... 100% 1,60M=0,1s + 0K ... 100% 697K=0,3s -2022-09-09 22:40:31 (1,60 MB/s) - ‘./f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf’ gespeichert [207992/207992] +2022-10-06 12:17:19 (697 KB/s) - ‘./f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf’ gespeichert [207992/207992] ---2022-09-09 22:40:31-- https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar +--2022-10-06 12:17:19-- https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 27397202 (26M) [application/java-archive] Wird in ‘./odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar’ gespeichert. - 0K ........ ........ ........ ........ ........ ........ 11% 1,59M 15s - 3072K ........ ........ ........ ........ ........ ........ 22% 1,44M 13s - 6144K ........ ........ ........ ........ ........ ........ 34% 1,49M 11s - 9216K ........ ........ ........ ........ ........ ........ 45% 1,90M 9s - 12288K ........ ........ ........ ........ ........ ........ 57% 1,70M 7s - 15360K ........ ........ ........ ........ ........ ........ 68% 1,76M 5s - 18432K ........ ........ ........ ........ ........ ........ 80% 1,81M 3s - 21504K ........ ........ ........ ........ ........ ........ 91% 2,06M 1s - 24576K ........ ........ ........ ........ .. 100% 2,15M=15s + 0K ........ ........ ........ ........ ........ ........ 11% 1,20M 19s + 3072K ........ ........ ........ ........ ........ ........ 22% 1,15M 17s + 6144K ........ ........ ........ ........ ........ ........ 34% 1,33M 14s + 9216K ........ ........ ........ ........ ........ ........ 45% 963K 12s + 12288K ........ ........ ........ ........ ........ ........ 57% 1,57M 9s + 15360K ........ ........ ........ ........ ........ ........ 68% 744K 7s + 18432K ........ ........ ........ ........ ........ ........ 80% 742K 5s + 21504K ........ ........ ........ ........ ........ ........ 91% 1,49M 2s + 24576K ........ ........ ........ ........ .. 100% 1,56M=24s -2022-09-09 22:40:46 (1,72 MB/s) - ‘./odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar’ gespeichert [27397202/27397202] +2022-10-06 12:17:43 (1,08 MB/s) - ‘./odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar’ gespeichert [27397202/27397202] ---2022-09-09 22:40:47-- https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar +--2022-10-06 12:17:44-- https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar Auflösen des Hostnamens dev-www.libreoffice.org (dev-www.libreoffice.org) … 89.238.68.201, 2a00:1828:a012:201::1 Verbindungsaufbau zu dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443 … verbunden. HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK Länge: 2448421 (2,3M) [application/java-archive] Wird in ‘./8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar’ gespeichert. - 0K ........ ........ ........ ........ ..... 100% 1,39M=1,7s + 0K ........ ........ ........ ........ ..... 100% 1,12M=2,1s -2022-09-09 22:40:48 (1,39 MB/s) - ‘./8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar’ gespeichert [2448421/2448421] +2022-10-06 12:17:46 (1,12 MB/s) - ‘./8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar’ gespeichert [2448421/2448421] Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/language-subtag-registry-2021-12-29.tar.bz2 and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/language-subtag-registry-2021-12-29.tar.bz2 differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/language-subtag-registry-2022-08-08.tar.bz2 and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/language-subtag-registry-2022-08-08.tar.bz2 differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/libwebp-1.2.2.tar.gz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/libwebp-1.2.2.tar.gz differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/libwebp-1.2.4.tar.gz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/libwebp-1.2.4.tar.gz differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/libxml2-2.10.2.tar.xz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/libxml2-2.10.2.tar.xz differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/libxml2-2.9.14.tar.xz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/libxml2-2.9.14.tar.xz differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/poppler-22.01.0.tar.xz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/poppler-22.01.0.tar.xz differ Binary files /tmp/tmpvo5rh7gm/lFrZeG0Dvv/libreoffice-7.4.1~rc2/tarballs/poppler-22.09.0.tar.xz and /tmp/tmpvo5rh7gm/2HqA0aEoVS/libreoffice-7.4.2~rc3/tarballs/poppler-22.09.0.tar.xz differ diff -Nru libreoffice-7.4.1~rc2/test/source/xmltesttools.cxx libreoffice-7.4.2~rc3/test/source/xmltesttools.cxx --- libreoffice-7.4.1~rc2/test/source/xmltesttools.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/test/source/xmltesttools.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -148,9 +148,11 @@ xmlXPathFreeObject(pXmlObj); return convertedVal; } +#if LIBXML_VERSION < 21000 || defined(LIBXML_XPTR_LOCS_ENABLED) case XPATH_POINT: case XPATH_RANGE: case XPATH_LOCATIONSET: +#endif case XPATH_USERS: case XPATH_XSLT_TREE: xmlXPathFreeObject(pXmlObj); diff -Nru libreoffice-7.4.1~rc2/toolkit/source/controls/unocontrols.cxx libreoffice-7.4.2~rc3/toolkit/source/controls/unocontrols.cxx --- libreoffice-7.4.1~rc2/toolkit/source/controls/unocontrols.cxx 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/toolkit/source/controls/unocontrols.cxx 2022-10-10 10:15:14.000000000 +0000 @@ -269,11 +269,23 @@ void UnoEditControl::addTextListener(const uno::Reference< awt::XTextListener > & l) { + // tdf#150974 some extensions pass null + if (!l) + { + SAL_WARN("toolkit", "null XTextListener"); + return; + } maTextListeners.addInterface( l ); } void UnoEditControl::removeTextListener(const uno::Reference< awt::XTextListener > & l) { + // tdf#150974 some extensions pass null + if (!l) + { + SAL_WARN("toolkit", "null XTextListener"); + return; + } maTextListeners.removeInterface( l ); } @@ -766,6 +778,13 @@ void UnoButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) { + // tdf#150974 some extensions pass null + if (!l) + { + SAL_WARN("toolkit", "null XActionListener"); + return; + } + maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -776,6 +795,13 @@ void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) { + // tdf#150974 some extensions pass null + if (!l) + { + SAL_WARN("toolkit", "null XActionListener"); + return; + } + if( getPeer().is() && maActionListeners.getLength() == 1 ) { uno::Reference < awt::XButton > xButton( getPeer(), uno::UNO_QUERY ); diff -Nru libreoffice-7.4.1~rc2/translations/source/ab/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/ab/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/ab/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ab/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-10-21 19:13+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -2892,7 +2892,7 @@ msgstr "Мап" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4832,139 +4832,139 @@ msgstr "ма иаҧҵатәуп иҿыцу" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Ашаблонқәа" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Аҧшаара" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "" #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Аел. таблицақәа" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Апрезентациақәа" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Акатегориақәа зегьы" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Афильтр" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Ашаблонқәа рыхьӡынҵа" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/af/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/af/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/af/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/af/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2022-02-04 11:39+0000\n" "Last-Translator: Paul Roos \n" "Language-Team: Afrikaans \n" @@ -2964,7 +2964,7 @@ msgstr "Nee" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "Soek bevel" @@ -4904,139 +4904,139 @@ msgstr "of skep ’n nuwe kategorie" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Sjablone" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "Wys die dialoog by programbegin" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Soek" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Soek..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "_Bestuur" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "Voorsien opdragte vir die skep, hernoem en verwydering van kategorieë, die herstel van standaard sjablone en die vernuwing van die sjabloonbeheerder." #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "Filtreer volgens toepassing" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "Alle toepassings" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "Teks dokumente" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Sigblaaie" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Voorleggings" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Tekeninge" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "Filtreer volgens kategorie" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Alle kategorieë" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Filtreer" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "Naam" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "Kategorie" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "Toepassing" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "Aangepas" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "Grootte" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Lys van sjablone" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "Duimnael weergawe" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "Lys weergawe" diff -Nru libreoffice-7.4.1~rc2/translations/source/am/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/am/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/am/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/am/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2020-02-01 14:30+0000\n" "Last-Translator: Samson B \n" "Language-Team: Amharic \n" @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "የተለያዩ" diff -Nru libreoffice-7.4.1~rc2/translations/source/am/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/am/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/am/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/am/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2022-06-06 17:37+0000\n" "Last-Translator: Samson B \n" "Language-Team: Amharic \n" @@ -2950,7 +2950,7 @@ msgstr "አይ" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "ትእዛዝ መፈለጊያ" @@ -4881,139 +4881,139 @@ msgstr "ወይንም አዲስ ምድብ ይፍጠሩ" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "ቴምፕሌቶች" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "በሚጀምር ጊዜ ይህን ንግግር ማሳያ" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "መፈለጊያ" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "መፈለጊያ..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "በ መተግበሪያ ማጣሪያ" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "ሁሉም መፈጸሚያዎች" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "የ ጽሁፍ ሰነዶች" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "ሰንጠረዦች" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "ማቅረቢያዎች" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "መሳያዎች" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "በ ምድብ ማጣሪያ" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "ሁሉም ምድቦች" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "ማጣሪያ" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "ስም" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "ምድብ" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "መተግበሪያ" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "የ ተሻሻለ" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "መጠን" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "የ ቴምፕሌት ዝርዝር" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "በ አውራ ጥፍር ልክ መመልከቻ" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "ዝርዝር መመልከቻ" diff -Nru libreoffice-7.4.1~rc2/translations/source/an/dbaccess/messages.po libreoffice-7.4.2~rc3/translations/source/an/dbaccess/messages.po --- libreoffice-7.4.1~rc2/translations/source/an/dbaccess/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/an/dbaccess/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-05-25 12:36+0200\n" -"PO-Revision-Date: 2022-01-17 16:38+0000\n" +"PO-Revision-Date: 2022-09-21 09:48+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Aragonese \n" "Language: an\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1524566312.000000\n" #. BiN6g @@ -2545,7 +2545,7 @@ #: dbaccess/inc/templwin.hrc:44 msgctxt "STRARY_SVT_DOCINFO" msgid "Date" -msgstr "" +msgstr "Calendata" #. eHFA4 #: dbaccess/inc/templwin.hrc:45 diff -Nru libreoffice-7.4.1~rc2/translations/source/an/sc/messages.po libreoffice-7.4.2~rc3/translations/source/an/sc/messages.po --- libreoffice-7.4.1~rc2/translations/source/an/sc/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/an/sc/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-08-08 14:37+0200\n" -"PO-Revision-Date: 2022-05-10 13:19+0000\n" +"PO-Revision-Date: 2022-09-21 09:48+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Aragonese \n" "Language: an\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1542022406.000000\n" #. kBovX @@ -22087,7 +22087,7 @@ #: sc/uiconfig/scalc/ui/conflictsdialog.ui:175 msgctxt "conflictsdialog|date" msgid "Date" -msgstr "" +msgstr "Calendata" #. tgZHu #: sc/uiconfig/scalc/ui/conflictsdialog.ui:189 diff -Nru libreoffice-7.4.1~rc2/translations/source/an/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/an/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/an/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/an/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" -"PO-Revision-Date: 2022-07-26 09:17+0000\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" +"PO-Revision-Date: 2022-09-21 09:47+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Aragonese \n" "Language: an\n" @@ -1241,7 +1241,7 @@ #: include/sfx2/strings.hrc:233 msgctxt "STR_PDF_EXPORT_SEND" msgid "Send" -msgstr "" +msgstr "Ninviar" #. 9HHQw #: include/sfx2/strings.hrc:234 @@ -2901,7 +2901,7 @@ msgstr "" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4849,141 +4849,141 @@ msgstr "" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "" #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 #, fuzzy msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Fuella de calculo" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Presentacions" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 #, fuzzy msgctxt "templatedlg|applist" msgid "Drawings" msgstr "~Debuxo" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/an/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po libreoffice-7.4.2~rc3/translations/source/an/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po --- libreoffice-7.4.1~rc2/translations/source/an/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/an/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2019-07-11 18:38+0200\n" -"PO-Revision-Date: 2013-06-22 20:57+0000\n" -"Last-Translator: Anonymous Pootle User\n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2022-09-21 09:48+0000\n" +"Last-Translator: Adolfo Jayme Barrientos \n" +"Language-Team: Aragonese \n" "Language: an\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1371934654.000000\n" #. sc9Hg @@ -194,7 +194,7 @@ "Dlg_SendButton\n" "value.text" msgid "~Send" -msgstr "" +msgstr "~Ninviar" #. j2hBK #: WikiExtension.xcu diff -Nru libreoffice-7.4.1~rc2/translations/source/an/vcl/messages.po libreoffice-7.4.2~rc3/translations/source/an/vcl/messages.po --- libreoffice-7.4.1~rc2/translations/source/an/vcl/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/an/vcl/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-08-24 12:29+0200\n" -"PO-Revision-Date: 2022-05-03 12:41+0000\n" +"PO-Revision-Date: 2022-09-21 09:47+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Aragonese \n" "Language: an\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1542022411.000000\n" #. k5jTM @@ -142,19 +142,19 @@ #: vcl/inc/print.hrc:53 msgctxt "RID_STR_PAPERNAMES" msgid "C" -msgstr "" +msgstr "C" #. Yfrzk #: vcl/inc/print.hrc:54 msgctxt "RID_STR_PAPERNAMES" msgid "D" -msgstr "" +msgstr "D" #. Ahd2X #: vcl/inc/print.hrc:55 msgctxt "RID_STR_PAPERNAMES" msgid "E" -msgstr "" +msgstr "E" #. 9quGe #: vcl/inc/print.hrc:56 diff -Nru libreoffice-7.4.1~rc2/translations/source/ar/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/ar/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/ar/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ar/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2021-06-04 11:14+0000\n" "Last-Translator: Riyadh Talal \n" "Language-Team: Arabic \n" @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "متنوع" diff -Nru libreoffice-7.4.1~rc2/translations/source/ar/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/ar/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/ar/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ar/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2022-07-04 16:15+0000\n" "Last-Translator: Riyadh Talal \n" "Language-Team: Arabic \n" @@ -2973,7 +2973,7 @@ msgstr "لا" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "أمر البحث" @@ -4913,139 +4913,139 @@ msgstr "أو أنشئ صنفًا جديداً" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "قوالب" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "أظهر هذا الحوار عند البدء" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "ابحث" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "ابحث..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "أ_دِر" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "يوفّر أوامر لإنشاء وإعادة تسمية وحذف الأصناف وتصفير القوالب المبدئية وإعادة تحميل مدير القوالب." #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "رشّح بحسب التطبيق" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "كل التطبيقات" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "مستندات نصية" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "الجداول الممتدّة" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "العروض التقديمية" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "الرسومات" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "رشّح حسب الصنف" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "كلّ الفئات" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "رشّح" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "الاسم" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "الصنف" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "التطبيق" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "التعديل" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "الحجم" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "قائمة القوالب" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "عَرض مصغّرات" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "عَرض لائحة" diff -Nru libreoffice-7.4.1~rc2/translations/source/as/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/as/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/as/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/as/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2021-05-12 07:37+0000\n" "Last-Translator: Mondeep Kalita \n" "Language-Team: Assamese \n" @@ -2979,7 +2979,7 @@ msgstr "নহয়" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4969,142 +4969,142 @@ msgstr "" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 #, fuzzy msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "নমুনা:" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 #, fuzzy msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "সন্ধান" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "সন্ধান..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "স্প্ৰেডশ্বীটসমূহ" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "পৰিৱেশনসমূহ" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 #, fuzzy msgctxt "templatedlg|applist" msgid "Drawings" msgstr "অঙ্কণ" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "ফিল্টাৰ" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/cui/messages.po libreoffice-7.4.2~rc3/translations/source/ast/cui/messages.po --- libreoffice-7.4.1~rc2/translations/source/ast/cui/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/cui/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-08 12:15+0200\n" -"PO-Revision-Date: 2022-09-09 11:26+0000\n" +"PO-Revision-Date: 2022-09-21 09:48+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -7029,7 +7029,7 @@ #: cui/uiconfig/ui/colorconfigwin.ui:1182 msgctxt "colorconfigwin|protectedcells" msgid "Protected cells background" -msgstr "" +msgstr "Fondu de les caxelles protexíes" #. pqHBt #: cui/uiconfig/ui/colorconfigwin.ui:1193 @@ -7059,7 +7059,7 @@ #: cui/uiconfig/ui/colorconfigwin.ui:1307 msgctxt "colorconfigwin|draw" msgid "Drawing / Presentation" -msgstr "Dibuxu / Presentación" +msgstr "Dibuxu/presentación" #. yELpi #: cui/uiconfig/ui/colorconfigwin.ui:1359 @@ -8317,7 +8317,7 @@ #: cui/uiconfig/ui/dimensionlinestabpage.ui:452 msgctxt "dimensionlinestabpage|TSB_SHOW_UNIT" msgid "Show _measurement units" -msgstr "Ver les unidaes de _midida" +msgstr "Amosar les unidaes de _midida" #. KQGtM #: cui/uiconfig/ui/dimensionlinestabpage.ui:461 @@ -21427,13 +21427,13 @@ #: cui/uiconfig/ui/textflowpage.ui:213 msgctxt "textflowpage|labelMaxNum" msgid "_Maximum consecutive hyphenated lines" -msgstr "Ringleres guionaes consecutives _máximes" +msgstr "Ringleres guionaes consecutives má_ximes" #. JkHBB #: cui/uiconfig/ui/textflowpage.ui:227 msgctxt "textflowpage|labelMinLen" msgid "_Minimum word length in characters" -msgstr "" +msgstr "Llonxitú mín_ima de pallabra en caráuteres" #. GgHhP #: cui/uiconfig/ui/textflowpage.ui:238 @@ -21445,7 +21445,7 @@ #: cui/uiconfig/ui/textflowpage.ui:253 msgctxt "textflowpage|checkNoLastWord" msgid "Don't hyphenate the last word" -msgstr "" +msgstr "Nun guionar la cabera pallabra" #. 582fA #: cui/uiconfig/ui/textflowpage.ui:292 @@ -21670,25 +21670,25 @@ #: cui/uiconfig/ui/themetabpage.ui:121 msgctxt "themetabpage|lbDk1" msgid "Background - Dark 1:" -msgstr "" +msgstr "Fondu escuru 1:" #. J3qNF #: cui/uiconfig/ui/themetabpage.ui:136 msgctxt "themetabpage|lbLt1" msgid "Text - Light 1:" -msgstr "" +msgstr "Testu claru 1:" #. zFCDe #: cui/uiconfig/ui/themetabpage.ui:151 msgctxt "themetabpage|lbDk2" msgid "Background - Dark 2:" -msgstr "" +msgstr "Fondu escuru 2:" #. RVZjG #: cui/uiconfig/ui/themetabpage.ui:166 msgctxt "themetabpage|lbLt2" msgid "Text - Light 2:" -msgstr "" +msgstr "Testu claru 2:" #. kwdwQ #: cui/uiconfig/ui/themetabpage.ui:181 diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/desktop/messages.po libreoffice-7.4.2~rc3/translations/source/ast/desktop/messages.po --- libreoffice-7.4.1~rc2/translations/source/ast/desktop/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/desktop/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-05-25 12:36+0200\n" -"PO-Revision-Date: 2022-07-06 16:24+0000\n" +"PO-Revision-Date: 2022-09-21 09:48+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -1079,7 +1079,7 @@ #: desktop/uiconfig/ui/licensedialog.ui:160 msgctxt "licensedialog|label5" msgid "Accept the License Agreement for the extension by pressing the 'Accept' button." -msgstr "Aceutar l'alcuerdu de llicencia de la estensión primiendo'l botón «Aceutar»." +msgstr "Aceuta l'alcuerdu de llicencia de la estensión calcando'l botón «Aceutar»." #. ydBcE #: desktop/uiconfig/ui/licensedialog.ui:173 diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/fpicker/messages.po libreoffice-7.4.2~rc3/translations/source/ast/fpicker/messages.po --- libreoffice-7.4.1~rc2/translations/source/ast/fpicker/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/fpicker/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-06-09 11:50+0200\n" -"PO-Revision-Date: 2022-07-06 16:24+0000\n" +"PO-Revision-Date: 2022-09-28 08:39+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -425,7 +425,7 @@ #: include/fpicker/strings.hrc:18 msgctxt "STR_SVT_FILEPICKER_FILTER_OPTIONS" msgid "~Edit filter settings" -msgstr "~Editar la configuración de peñeres" +msgstr "~Editar los axustes de peñeres" #. k7Sdb #: include/fpicker/strings.hrc:19 @@ -509,7 +509,7 @@ msgstr "" "Yá esiste un ficheru nomáu «$filename$».\n" "\n" -"¿Quier trocalu?" +"¿Quies trocalu?" #. t4wDh #: include/fpicker/strings.hrc:32 diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" -"PO-Revision-Date: 2022-04-25 17:41+0000\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.11.2\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1532004324.000000\n" #. fEEXD @@ -86,7 +86,7 @@ "07010305\n" "node.text" msgid "ScriptForge Library" -msgstr "" +msgstr "Biblioteca ScriptForge" #. Vkt9E #: sbasic.tree @@ -185,7 +185,7 @@ "0803\n" "node.text" msgid "Functions Types and Operators" -msgstr "Tipos de funciones y operadores" +msgstr "Tribes de funciones y operadores" #. DSUE2 #: scalc.tree @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "Entemez" @@ -356,7 +356,7 @@ "0901\n" "node.text" msgid "General Information" -msgstr "" +msgstr "Información xeneral" #. xU49Q #: sdraw.tree @@ -428,7 +428,7 @@ "1105\n" "node.text" msgid "Printing" -msgstr "Imprentar" +msgstr "Imprentación" #. G8GoF #: sdraw.tree diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/guide.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/guide.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/guide.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/guide.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -1076,7 +1076,7 @@ "tit\n" "help.text" msgid "Changing the Properties of Controls in the Dialog Editor" -msgstr "Cambéu de les propiedaes de los campos de control nel Editor de diálogos" +msgstr "Cambéu de les propiedaes de los controles nel Editor de diálogos" #. PDQCc #: control_properties.xhp @@ -1094,7 +1094,7 @@ "hd_id3145786\n" "help.text" msgid "Changing the Properties of Controls in the Dialog Editor" -msgstr "Cambéu de les propiedaes de los campos de control nel Editor de diálogos" +msgstr "Cambéu de les propiedaes de los controles nel Editor de diálogos" #. Es8Xy #: control_properties.xhp @@ -1193,7 +1193,7 @@ "tit\n" "help.text" msgid "Creating Controls in the Dialog Editor" -msgstr "Creación de campos de control nel Editor de diálogos" +msgstr "Creación controles nel Editor de diálogos" #. yeHTt #: insert_control.xhp @@ -1202,7 +1202,7 @@ "bm_id3149182\n" "help.text" msgid "controls; creating in the dialog editordialog editor;creating controls" -msgstr "campos de control;crear nel editor de diálogoseditor de diálogos;crear campos de control" +msgstr "controles;crear nel editor de diálogoseditor de diálogos;crear controles" #. UAc5k #: insert_control.xhp @@ -1679,7 +1679,7 @@ "hd_id3150042\n" "help.text" msgid "Read or Edit Properties of Controls in the Program" -msgstr "Lleer o editar propiedaes de los campos de control nel programa" +msgstr "Lleer o editar propiedaes de los controles nel programa" #. SahL8 #: sample_code.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/python.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/python.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/python.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/python.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-04-11 15:28+0200\n" -"PO-Revision-Date: 2022-04-25 17:42+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.11.2\n" +"X-Generator: Weblate 4.12.2\n" #. naSFZ #: main0000.xhp @@ -3613,4 +3613,4 @@ "par_id351633599611244\n" "help.text" msgid "PythonShell function in ScriptForge.Exception service" -msgstr "" +msgstr "Función PythonShell del serviciu ScriptForge.Exception" diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/shared/02.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/shared/02.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/shared/02.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/shared/02.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2021-10-04 19:51+0200\n" -"PO-Revision-Date: 2020-08-04 11:16+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Asturian \n" +"Language-Team: Asturian \n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1494863184.000000\n" #. 6Kkin @@ -1004,7 +1004,7 @@ "tit\n" "help.text" msgid "Insert Controls" -msgstr "Inxertar campos de control" +msgstr "Inxertar controles" #. F2psp #: 20000000.xhp @@ -1022,7 +1022,7 @@ "hd_id3150402\n" "help.text" msgid "Insert Controls" -msgstr "Inxertar campos de control" +msgstr "Inxertar controles" #. jnfj9 #: 20000000.xhp @@ -1049,7 +1049,7 @@ "par_id3153749\n" "help.text" msgid "Insert Controls" -msgstr "Inxertar campos de control" +msgstr "Inxertar controles" #. BjneK #: 20000000.xhp @@ -1391,7 +1391,7 @@ "hd_id3149330\n" "help.text" msgid "Progress Bar" -msgstr "Barra de progresión" +msgstr "Barra de progresu" #. SDEqL #: 20000000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/shared/03.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/shared/03.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/shared/03.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/shared/03.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Asturian \n" +"Language-Team: Asturian \n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19031,7 +19031,7 @@ "hd_id141618777179310\n" "help.text" msgid "Additional examples" -msgstr "" +msgstr "Más exemplos" #. JopFS #: sf_formcontrol.xhp @@ -22406,7 +22406,7 @@ "tit\n" "help.text" msgid "ScriptForge.Region service" -msgstr "" +msgstr "Serviciu ScriptForge.Region" #. SYtNX #: sf_region.xhp @@ -22415,7 +22415,7 @@ "bm_id681600788076499\n" "help.text" msgid "ScriptForge.Region service" -msgstr "" +msgstr "Serviciu ScriptForge.Region" #. w3WgP #: sf_region.xhp @@ -23000,7 +23000,7 @@ "par_id651606319520519\n" "help.text" msgid "List of Methods in the Region Service" -msgstr "" +msgstr "Llista de métodos nel serviciu Region" #. szpDY #: sf_region.xhp @@ -25736,7 +25736,7 @@ "par_id861612377611438\n" "help.text" msgid "\"*\" represents zero, one, or multiple characters." -msgstr "" +msgstr "«*» representa ceru, un o dellos caráuteres." #. eLYBF #: sf_string.xhp @@ -26420,7 +26420,7 @@ "bas_id551612386931680\n" "help.text" msgid "' An example with a ScriptForge Dictionary" -msgstr "" +msgstr "' Un exemplu con un diccionariu de ScriptForge" #. vvADG #: sf_string.xhp @@ -29327,7 +29327,7 @@ "par_id49160078807654\n" "help.text" msgid "Yes" -msgstr "" +msgstr "Sí" #. diGQ4 #: sf_unittest.xhp @@ -29399,7 +29399,7 @@ "par_id651606319520519\n" "help.text" msgid "List of Methods in the UnitTest Service" -msgstr "" +msgstr "Llista de métodos nel serviciu UnitTest" #. d4CFS #: sf_unittest.xhp @@ -29408,7 +29408,7 @@ "hd_id201656428230690\n" "help.text" msgid "Arguments of the AssertX methods" -msgstr "" +msgstr "Argumentos de los métodos AssertX" #. ArRiA #: sf_unittest.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/shared.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/shared.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sbasic/shared.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sbasic/shared.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-10-05 08:58+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Asturian \n" +"Language-Team: Asturian \n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -2318,7 +2318,7 @@ "hd_id3154614\n" "help.text" msgid "Variable Types" -msgstr "Tipos de variable" +msgstr "Tribes de variables" #. T5to5 #: 01020100.xhp @@ -36608,7 +36608,7 @@ "par_id3154216\n" "help.text" msgid "AutoText" -msgstr "AutoTestu" +msgstr "Testu automáticu" #. uhEms #: 05060700.xhp @@ -36986,7 +36986,7 @@ "tit\n" "help.text" msgid "CallByName Function" -msgstr "" +msgstr "Función CallByName" #. 3957Y #: CallByName.xhp @@ -36995,7 +36995,7 @@ "hd_id3150669\n" "help.text" msgid "CallByName Function" -msgstr "" +msgstr "Función CallByName" #. 7EWyG #: CallByName.xhp @@ -41954,7 +41954,7 @@ "hd_id401544551916353\n" "help.text" msgid "ThisDatabaseDocument object" -msgstr "" +msgstr "Oxetu ThisDatabaseDocument" #. CT58E #: thisdbdoc.xhp @@ -42008,7 +42008,7 @@ "par_id251622800540402\n" "help.text" msgid "ThisComponent object" -msgstr "" +msgstr "Oxetu ThisComponent" #. 7k6AR #: thisdbdoc.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/scalc/00.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/scalc/00.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/scalc/00.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/scalc/00.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-03-21 12:31+0100\n" -"PO-Revision-Date: 2022-04-25 17:42+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.11.2\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1542196264.000000\n" #. E9tti @@ -1445,7 +1445,7 @@ "par_id3149401\n" "help.text" msgid "AutoFilter" -msgstr "Filtru automáticu" +msgstr "Peñera automática" #. MLpCL #: 00000412.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/scalc/01.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/scalc/01.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/scalc/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/scalc/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:35+0000\n" +"PO-Revision-Date: 2022-10-05 08:58+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Asturian \n" +"Language-Team: Asturian \n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -3156,7 +3156,7 @@ "hd_id3155067\n" "help.text" msgid "Add Print Range" -msgstr "Amestar área d'impresión" +msgstr "Amestar estaya d'imprentación" #. 6CE3V #: 03100000.xhp @@ -47868,7 +47868,7 @@ "par_id3156385\n" "help.text" msgid " Click here and then select the custom sort order that you want." -msgstr " Faiga clic equí y escueya l'orde de clasificación personalizáu que deseye." +msgstr "Calca equí y escueyi l'orde de clasificación personalizáu que deseyes." #. AB5C5 #: 12030200.xhp @@ -48048,7 +48048,7 @@ "tit\n" "help.text" msgid "AutoFilter" -msgstr "Filtru automáticu" +msgstr "Peñera automática" #. pGfbC #: 12040100.xhp @@ -58119,7 +58119,7 @@ "par_id545825775819166\n" "help.text" msgid "Oil barrel" -msgstr "" +msgstr "Barril de petroleu" #. a3nDk #: func_convert.xhp @@ -58398,7 +58398,7 @@ "hd_id731620426688645\n" "help.text" msgid "Decimal prefixes" -msgstr "" +msgstr "Prefixos decimales" #. cjDA7 #: func_convert.xhp @@ -58425,7 +58425,7 @@ "hd_id91620427193950\n" "help.text" msgid "Binary prefixes" -msgstr "" +msgstr "Prefixos binarios" #. X7TD3 #: func_convert.xhp @@ -72015,7 +72015,7 @@ "par_id8523819\n" "help.text" msgid "You can select a fixed width and then click the ruler on the preview to set cell breakup positions." -msgstr "Pue escoyer un anchu fixu y entós faiga clik na regla de la Prevista pa configurar les posiciones de saltos de caxelles." +msgstr "Pues escoyer un anchor fixu y calcar na regla de la prevista pa configurar les posiciones de saltos de caxelles." #. DjifN #: text2columns.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/scalc/guide.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/scalc/guide.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/scalc/guide.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/scalc/guide.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: guide\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-08-10 13:23+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -3498,7 +3498,7 @@ "par_idN107DE\n" "help.text" msgid "Additional Settings" -msgstr "Configuración adicional" +msgstr "Axustes adicionales" #. BSAXP #: consolidate.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/schart.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/schart.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/schart.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/schart.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2019-07-11 18:38+0200\n" -"PO-Revision-Date: 2022-06-06 18:31+0000\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -644,7 +644,7 @@ "hd_id0810200911433792\n" "help.text" msgid "Formatting Bar" -msgstr "Barra de formatu" +msgstr "Barra Formatu" #. bGXHw #: main0202.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sdatabase.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sdatabase.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/sdatabase.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/sdatabase.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-05-25 12:36+0200\n" -"PO-Revision-Date: 2022-08-03 22:48+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -2803,7 +2803,7 @@ "hd_id3156003\n" "help.text" msgid "Form Controls" -msgstr "" +msgstr "Controles del formulariu" #. CyFwA #: 04000000.xhp @@ -5899,7 +5899,7 @@ "hd_id3154071\n" "help.text" msgid "Execute" -msgstr "" +msgstr "Executar" #. 6UCdY #: 11080000.xhp @@ -5953,7 +5953,7 @@ "hd_id841652479655639\n" "help.text" msgid "Output" -msgstr "" +msgstr "Salida" #. pEFoq #: 11080000.xhp @@ -5962,7 +5962,7 @@ "par_id511652479714010\n" "help.text" msgid "Displays the results of the SQL command that you ran." -msgstr "" +msgstr "Amuesa los resultaos del comandu SQL qu'executasti." #. 93Xfs #: 11090000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/01.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/01.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:35+0000\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -11993,7 +11993,7 @@ "hd_id3153966\n" "help.text" msgid "Macro" -msgstr "" +msgstr "Macro" #. MZbHo #: 02220000.xhp @@ -12011,7 +12011,7 @@ "par_id3145769\n" "help.text" msgid "Icon Macro" -msgstr "" +msgstr "Iconu Macro" #. cVL5D #: 02220000.xhp @@ -12020,7 +12020,7 @@ "par_id3149239\n" "help.text" msgid "Macro" -msgstr "" +msgstr "Macro" #. mUiNF #: 02220000.xhp @@ -12047,7 +12047,7 @@ "par_id3159104\n" "help.text" msgid "Icon Properties" -msgstr "" +msgstr "Iconu Propiedaes" #. imNDz #: 02220000.xhp @@ -12083,7 +12083,7 @@ "hd_id3146132\n" "help.text" msgid "Text Alternative" -msgstr "" +msgstr "Alternativa testual" #. ccR9n #: 02220000.xhp @@ -12227,7 +12227,7 @@ "hd_id3153827\n" "help.text" msgid "Text Alternative" -msgstr "" +msgstr "Alternativa testual" #. dgZr8 #: 02220100.xhp @@ -12263,7 +12263,7 @@ "hd_id3147530\n" "help.text" msgid "Name:" -msgstr "" +msgstr "Nome:" #. UHija #: 02220100.xhp @@ -12362,7 +12362,7 @@ "par_id3155599\n" "help.text" msgid "Tracks each change that is made in the current document by author and date." -msgstr "" +msgstr "Rexistra tolos cambeos fechos nel documentu actual, per autor y per data." #. FCvXm #: 02230100.xhp @@ -13739,7 +13739,7 @@ "hd_id3155511\n" "help.text" msgid "AutoFilter" -msgstr "" +msgstr "Peñera automática" #. VbBBf #: 02250000.xhp @@ -15278,7 +15278,7 @@ "hd_id3155555\n" "help.text" msgid "Character block" -msgstr "" +msgstr "Bloque de caráuteres" #. swAqc #: 04100000.xhp @@ -15386,7 +15386,7 @@ "hd_id3149760\n" "help.text" msgid "Style" -msgstr "" +msgstr "Estilu" #. bzFsD #: 04140000.xhp @@ -26690,7 +26690,7 @@ "par_id441608302065414\n" "help.text" msgid "For all style categories:" -msgstr "" +msgstr "Pa toles categoríes d'estilos:" #. ZCV8q #: 05140100.xhp @@ -26771,7 +26771,7 @@ "hd_id3154682\n" "help.text" msgid "Custom Styles for Current Document" -msgstr "" +msgstr "Estilos personalizaos pal documentu actual" #. wWSGE #: 05140100.xhp @@ -26789,7 +26789,7 @@ "par_id401608258192415\n" "help.text" msgid "Styles in Calc" -msgstr "" +msgstr "Estilos en Calc" #. whwZY #: 05140100.xhp @@ -26798,7 +26798,7 @@ "par_id641608263698887\n" "help.text" msgid "Styles in Impress" -msgstr "" +msgstr "Estilos n'Impress" #. CCTFZ #: 05140100.xhp @@ -26807,7 +26807,7 @@ "par_id641369863698831\n" "help.text" msgid "Styles" -msgstr "" +msgstr "Estilos" #. CJiJX #: 05190000.xhp @@ -26924,7 +26924,7 @@ "hd_id2576982\n" "help.text" msgid "Text Alternative" -msgstr "" +msgstr "Alternativa testual" #. uQ5RY #: 05190100.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/02.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/02.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/02.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/02.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-06-09 11:50+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -51,7 +51,7 @@ "par_id3154398\n" "help.text" msgid "Click the Print File Directly icon to print the active document with the current default print settings. These can be found in the Printer Setup dialog, which you can call with the Printer Settings menu command." -msgstr "Faiga clic nel iconu Imprentar pa imprentar el documentu activu colos parámetros d'impresión predeterminaos. Atopar nel diálogu Configuración d'imprentadora, que s'executa col comandu de menú Configuración d'imprentadora." +msgstr "Calca l'iconu Imprentar pa imprentar el documentu activu colos axustes d'imprentación predeterminaos. Atópase nel diálogu Axustes d'imprentadora, que s'executa col comandu de menú Axustes d'imprentadora." #. EqERF #: 01110000.xhp @@ -654,7 +654,7 @@ "tit\n" "help.text" msgid "Form Controls" -msgstr "Campos de control de formulariu" +msgstr "Controles de formulariu" #. bFKGY #: 01170000.xhp @@ -672,7 +672,7 @@ "hd_id3154142\n" "help.text" msgid "Form Controls" -msgstr "Campos de control de formulariu" +msgstr "Controles de formulariu" #. wU73F #: 01170000.xhp @@ -726,7 +726,7 @@ "par_idN10B21\n" "help.text" msgid "XML Form documents (XForms) use the same controls." -msgstr "Los documentos de formulariu XML (XForms) utilicen el mesmu conxuntu de campos de control." +msgstr "Los documentos de formulariu XML (XForms) utilicen el mesmu conxuntu de controles." #. k5YfJ #: 01170000.xhp @@ -2607,7 +2607,7 @@ "hd_id3147102\n" "help.text" msgid "Control Properties" -msgstr "Propiedaes de campos de control" +msgstr "Propiedaes del control" #. BJAGR #: 01170100.xhp @@ -14154,7 +14154,7 @@ "tit\n" "help.text" msgid "AutoFilter" -msgstr "Filtru automáticu" +msgstr "Peñera automática" #. eFhvE #: 12030000.xhp @@ -14163,7 +14163,7 @@ "hd_id3149495\n" "help.text" msgid "AutoFilter" -msgstr "Filtru automáticu" +msgstr "Peñera automática" #. jkAzj #: 12030000.xhp @@ -14181,7 +14181,7 @@ "par_id3151234\n" "help.text" msgid "Icon AutoFilter" -msgstr "" +msgstr "Iconu Peñera automática" #. qhCWv #: 12030000.xhp @@ -14190,7 +14190,7 @@ "par_id3147043\n" "help.text" msgid "AutoFilter" -msgstr "Filtru automáticu" +msgstr "Peñera automática" #. 5Fdaj #: 12030000.xhp @@ -16566,7 +16566,7 @@ "hd_id3147389\n" "help.text" msgid "Search/Cancel" -msgstr "" +msgstr "Guetar/Encaboxar" #. duEJs #: 12100200.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/autopi.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/autopi.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/autopi.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/autopi.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: autopi\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-01-31 18:19+0100\n" -"PO-Revision-Date: 2022-05-25 10:44+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-Poedit-SourceCharset: utf-8\n" "X-POOTLE-MTIME: 1524568663.000000\n" @@ -7728,7 +7728,7 @@ "tit\n" "help.text" msgid "Additional Settings" -msgstr "Configuración adicional" +msgstr "Axustes adicionales" #. jmEGH #: 01170200.xhp @@ -7737,7 +7737,7 @@ "hd_id3154094\n" "help.text" msgid "Additional Settings" -msgstr "Configuración adicional" +msgstr "Axustes adicionales" #. DFBck #: 01170200.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/guide.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/guide.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/guide.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/guide.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -7214,7 +7214,7 @@ "par_idN1065F\n" "help.text" msgid "A new text document opens. Use the Form Controls to insert form controls." -msgstr "Ábrese un nuevu documentu de testu. Utilice los Campos de control de formulariu pa inxertar controles de formulariu." +msgstr "Ábrese un nuevu documentu de testu. Utiliza los Controles de formulariu pa inxertar controles de formulariu." #. BABjs #: data_forms.xhp @@ -13856,7 +13856,7 @@ "par_id3154046\n" "help.text" msgid "A link to a web page, for example, \"www.example.com\" or \"www.myprovider.com/mypage/index.html\" is an absolute link." -msgstr "Un enllaz a una páxina web, por exemplu, \"www.example.com\" o \"www.myprovider.com/mypage/index.html\" ye un enllaz absolute." +msgstr "Un enllaz a una páxina web, por exemplu, «www.exemplu.com» o «www.elmiofornidor.com/lamiopaxina/index.html» ye un enllaz absolutu." #. bTRZi #: hyperlink_rel_abs.xhp @@ -13892,7 +13892,7 @@ "par_id3153897\n" "help.text" msgid "When you rest your mouse on a hyperlink, a help tip displays the absolute reference, since $[officename] uses absolute path names internally. The complete path and address can only be seen when you view the result of the HTML export, by loading the HTML file as \"Text\" or opening it with a text editor." -msgstr "Na ayuda emerxente d'un hiperenllaz y nel Editor de testu fonte HTML va ver siempres la referencia absoluta yá que $[officename] utiliza rutes absolutes (nel so sistema internu). La direición y ruta completa del ficheru va vese namái al visualizar la resultancia de la esportación HTML, por exemplu: al cargar el ficheru HTML como \"testu\" o al abrir con un editor de testu." +msgstr "Na ayuda emerxente d'un hiperenllaz vas poder ver la referencia absoluta, yá que $[officename] utiliza caminos absolutos (nel so sistema internu). Les señes y el camín completos del ficheru van vese namái al visualizar el resultáu de la esportación HTML, por exemplu: al cargar el ficheru HTML como «testu» o al abrilu con un editor de testu." #. qxJsq #: imagemap.xhp @@ -14711,7 +14711,7 @@ "par_id3155535\n" "help.text" msgid "To view a repertoire of all characters, choose Insert - Special Character." -msgstr "" +msgstr "Pa ver un repertoriu de tolos caráuteres, escueyi Inxertar - Caráuter especial." #. fFAT9 #: insert_specialchar.xhp @@ -17042,7 +17042,7 @@ "par_id3144436\n" "help.text" msgid "You can incorporate lines into your text with custom angles, width, color, and other attributes." -msgstr "Puen incorporase al testu llinies con ángulos, anchu, color y otros atributos personalizaos." +msgstr "Puen incorporase al testu llinies con ángulos, anchor, color y otros atributos personalizaos." #. DJVXk #: line_intext.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/optionen.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/optionen.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/shared/optionen.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/shared/optionen.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:35+0000\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -1382,7 +1382,7 @@ "par_id4494766\n" "help.text" msgid "AutoText" -msgstr "Autotestu" +msgstr "Testu automáticu" #. SnqLB #: 01010300.xhp @@ -1391,7 +1391,7 @@ "par_id7858516\n" "help.text" msgid "{user profile}/user/autotext{user profile}/user/autotext{user profile}\\user\\autotext" -msgstr "" +msgstr "{perfil d'usuariu}/user/autotext{perfil d'usuariu}/user/autotext{perfil d'usuariu}\\user\\autotext" #. UkYUE #: 01010300.xhp @@ -2363,7 +2363,7 @@ "par_id3148663\n" "help.text" msgid "Only one sub-module can be activated under Hyphenation." -msgstr "Namái pue activase un submódulo en Separtamientu silábicu." +msgstr "Namái pue activase un somódulu en Guionáu." #. svUFH #: 01010401.xhp @@ -2444,7 +2444,7 @@ "hd_id3161832\n" "help.text" msgid "Back" -msgstr "Aviesu" +msgstr "Atrás" #. dEDZC #: 01010401.xhp @@ -2453,7 +2453,7 @@ "par_id3155307\n" "help.text" msgid "Click here to undo the current changes in the list box." -msgstr "Faiga clic equí pa desfacer los cambeos actuales nel cuadru de llista." +msgstr "Calca equí pa desfacer los cambeos actuales nel cuadru de llista." #. M3rSX #: 01010501.xhp @@ -2579,7 +2579,7 @@ "par_id9701528\n" "help.text" msgid "%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation." -msgstr "%PRODUCTNAME usa namái el modelu de color RGB pa la impresión en color. Los controles CMYK apurrir pa facilitar la entrada de valores de color usando la notación CMYK." +msgstr "%PRODUCTNAME usa namái el modelu de color RGB pa la imprentación en color. Los controles CMYK úfrense pa facilitar la entrada de valores de color usando la notación CMYK." #. ycsex #: 01010501.xhp @@ -2678,7 +2678,7 @@ "hd_id3151076\n" "help.text" msgid "Hex #" -msgstr "" +msgstr "Nᵘ hex." #. YhKYN #: 01010501.xhp @@ -2957,7 +2957,7 @@ "par_id3145800\n" "help.text" msgid "Specifies whether the printing of the document counts as a modification. When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change." -msgstr "Especifica si la impresión del documentu considérase una cambéu. Si esta opción ta escoyida, la siguiente vegada que zarru'l documentu va solicitáse-y si tienen de guardase los cambeos. La fecha d'impresión introduzse entós como cambéu nes propiedaes del documentu." +msgstr "Especifica si la imprentación del documentu se considera un cambéu. Si esta opción ta escoyida, la siguiente vegada que'l documentu zarre va solicitáse-y si tienen de guardase los cambeos. La fecha d'imprentación introduzse entós como cambéu nes propiedaes del documentu." #. 3rs5u #: 01010600.xhp @@ -4001,7 +4001,7 @@ "hd_id3148946\n" "help.text" msgid "Print Options" -msgstr "Opciones d'impresión" +msgstr "Opciones d'imprentación" #. AeGFc #: 01010900.xhp @@ -4073,7 +4073,7 @@ "par_id3156444\n" "help.text" msgid "Transparency cannot be output directly to a printer. The areas of the document in which transparency is to be visible must therefore always be calculated as bitmaps and sent to the printer. Depending on the size of the bitmaps and the print resolution a large amount of data may result." -msgstr "La tresparencia nun pue unviase direutamente a la imprentadora. Les zones del documentu nes que la tresparencia tien de ser visible tienen de calculase siempres como bitmaps y unviase a la imprentadora. En función del tamañu de los bitmaps y del resolvimientu d'impresión, el tamañu de la resultancia pue ser bien grande." +msgstr "La tresparencia nun pue unviase direutamente a la imprentadora. Les zones del documentu nes que la tresparencia tien de ser visible tienen de calculase siempres como mapes de bits y unviase a la imprentadora. En función del tamañu de los mapes de bits y de la resolución d'imprentación, el tamañu del resultáu pue ser bien grande." #. HLYND #: 01010900.xhp @@ -4136,7 +4136,7 @@ "hd_id3149400\n" "help.text" msgid "High/normal print quality" -msgstr "Calidá d'impresión óptima/Calidá normal d'impresión" +msgstr "Calidá d'imprentació óptima/normal" #. exxtC #: 01010900.xhp @@ -5549,7 +5549,7 @@ "par_id3156276\n" "help.text" msgid "The HTML filter supports CSS2 (Cascading Style Sheets Level 2) for printing documents. These capabilities are only effective if print layout export is activated." -msgstr "El filtru HTML almiti CSS2 (Cascading Style Sheets Level 2) pa la impresión de documentos. Estes capacidaes namái tán disponibles si activó la esportación del diseñu d'impresión." +msgstr "El filtru HTML almite CSS2 (Cascading Style Sheets Level 2) pa la imprentación de documentos. Estes capacidaes namái tán disponibles si activasti la esportación del diseñu d'imprentación." #. i7jxE #: 01030500.xhp @@ -5810,7 +5810,7 @@ "hd_id3149018\n" "help.text" msgid "Drawings and controls" -msgstr "Dibuxos y campos de control" +msgstr "Dibuxos y controles" #. MUz2Z #: 01040200.xhp @@ -5819,7 +5819,7 @@ "par_id3151249\n" "help.text" msgid "Displays the drawings and controls contained in your document." -msgstr "Amuesa los dibuxos y campos de control del documentu." +msgstr "Amuesa los dibuxos y controles del documentu." #. xFt8H #: 01040200.xhp @@ -6044,7 +6044,7 @@ "hd_id3149926\n" "help.text" msgid "Measurement unit" -msgstr "" +msgstr "Unidá de midida" #. hG7QC #: 01040200.xhp @@ -6332,7 +6332,7 @@ "par_id3158408\n" "help.text" msgid "Specifies whether the form control fields of the text document are printed." -msgstr "Indica si tienen d'imprimise los campos de control de formulariu del documentu de testu." +msgstr "Indica si tienen d'imprimise los controles de formulariu del documentu de testu." #. yLUpZ #: 01040400.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/swriter/00.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/swriter/00.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/swriter/00.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/swriter/00.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:05+0200\n" -"PO-Revision-Date: 2022-07-19 20:03+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -284,7 +284,7 @@ "par_id3150536\n" "help.text" msgid "AutoText" -msgstr "AutoTestu" +msgstr "Testu automáticu" #. F7ALF #: 00000402.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/swriter/01.po libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/swriter/01.po --- libreoffice-7.4.1~rc2/translations/source/ast/helpcontent2/source/text/swriter/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/helpcontent2/source/text/swriter/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:05+0200\n" -"PO-Revision-Date: 2022-09-09 14:35+0000\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -2255,7 +2255,7 @@ "tit\n" "help.text" msgid "AutoText" -msgstr "AutoTestu" +msgstr "Testu automáticu" #. qH4A3 #: 02120000.xhp @@ -2291,7 +2291,7 @@ "hd_id3148982\n" "help.text" msgid "AutoText" -msgstr "AutoTestu" +msgstr "Testu automáticu" #. E8EtV #: 02120000.xhp @@ -2426,7 +2426,7 @@ "hd_id3150039\n" "help.text" msgid "AutoText" -msgstr "AutoTestu" +msgstr "Testu automáticu" #. k4QpP #: 02120000.xhp @@ -2552,7 +2552,7 @@ "hd_id3155555\n" "help.text" msgid "Macro" -msgstr "Macro..." +msgstr "Macro" #. PpSwY #: 02120000.xhp @@ -6800,7 +6800,7 @@ "par_id3145784\n" "help.text" msgid "Enter the amount to shift the print area to the right." -msgstr "Especifique un valor pa mover a la derecha l'intervalu d'impresión." +msgstr "Introduz un valor pa mover a la derecha la estaya d'imprentación." #. DYARU #: 04070300.xhp @@ -8402,7 +8402,7 @@ "hd_id3148877\n" "help.text" msgid "Macro" -msgstr "Macro..." +msgstr "Macro" #. 7TTJC #: 04090003.xhp @@ -15782,7 +15782,7 @@ "hd_id3153926\n" "help.text" msgid "Don't hyphenate the last word" -msgstr "" +msgstr "Nun guionar la cabera pallabra" #. UYKar #: 05030200.xhp @@ -15872,7 +15872,7 @@ "hd_id3149818\n" "help.text" msgid "Hyphenation zone" -msgstr "" +msgstr "Zona de guionáu" #. iKBAb #: 05030200.xhp @@ -19841,7 +19841,7 @@ "tit\n" "help.text" msgid "Macro" -msgstr "Macro..." +msgstr "Macro" #. 3WnuD #: 05060700.xhp @@ -19940,7 +19940,7 @@ "par_id3154473\n" "help.text" msgid "AutoText" -msgstr "AutoTestu" +msgstr "Testu automáticu" #. BgXvW #: 05060700.xhp @@ -19949,7 +19949,7 @@ "par_id3149684\n" "help.text" msgid "ImageMap area" -msgstr "Área ImageMap" +msgstr "Área del mapa d'imaxe" #. RbJ5R #: 05060700.xhp @@ -23846,7 +23846,7 @@ "par_id3147407\n" "help.text" msgid "To reverse the last AutoCorrect action, choose Edit - Undo." -msgstr "P'anular la última aición del Formateáu automáticu, escueya Editar - Desfacer." +msgstr "P'anular la última aición de la Correición automática, escueyi Editar - Desfacer." #. c9yUj #: 05150100.xhp @@ -23864,7 +23864,7 @@ "hd_id3155625\n" "help.text" msgid "AutoCorrect for Headings" -msgstr "" +msgstr "Correición automática pa títulos" #. GKSGD #: 05150100.xhp @@ -27617,7 +27617,7 @@ "tit\n" "help.text" msgid "Accessibility Check" -msgstr "" +msgstr "Inspeición d'accesibilidá" #. bFVzE #: accessibility_check.xhp @@ -27635,7 +27635,7 @@ "hd_id771630940172827\n" "help.text" msgid "Accessibility Check" -msgstr "" +msgstr "Inspeición d'accesibilidá" #. yT4uv #: accessibility_check.xhp @@ -27842,7 +27842,7 @@ "hd_id1001603128268578\n" "help.text" msgid "Reference" -msgstr "" +msgstr "Referencia" #. 6LFFX #: edit_reference_submenu.xhp @@ -31388,7 +31388,7 @@ "par_id2962126\n" "help.text" msgid "Choose the selection mode from the submenu: normal selection mode, or block selection mode." -msgstr "Escoyer el mou de seleición del submenú: mou Normal o el mou d'escueya en Bloque." +msgstr "Escoyer el mou d'esbilla del somenú: mou Normal o el mou d'esbilla en bloque." #. mPBN4 #: selection_mode.xhp @@ -31496,7 +31496,7 @@ "par_id721641335152918\n" "help.text" msgid "Icon Style Inspector on the Sidebar" -msgstr "" +msgstr "Iconu Inspeutor d'estilos na barra llateral" #. uhQin #: style_inspector.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-7.4.2~rc3/translations/source/ast/instsetoo_native/inc_openoffice/windows/msi_languages.po --- libreoffice-7.4.1~rc2/translations/source/ast/instsetoo_native/inc_openoffice/windows/msi_languages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/instsetoo_native/inc_openoffice/windows/msi_languages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-03-21 12:32+0100\n" -"PO-Revision-Date: 2022-06-15 20:37+0000\n" +"PO-Revision-Date: 2022-09-21 09:47+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -1022,7 +1022,7 @@ "OOO_ACTIONTEXT_116\n" "LngText.text" msgid "ProgID: [1]" -msgstr "IdProg: [1]" +msgstr "Id. prog.: [1]" #. mFnav #: ActionTe.ulf @@ -3020,7 +3020,7 @@ "OOO_CONTROL_305\n" "LngText.text" msgid "To continue, click Next." -msgstr "Pa siguir, pulsia Siguiente." +msgstr "Pa siguir, calca Siguiente." #. E5kBg #: Control.ulf diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-7.4.2~rc3/translations/source/ast/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-7.4.1~rc2/translations/source/ast/officecfg/registry/data/org/openoffice/Office/UI.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/officecfg/registry/data/org/openoffice/Office/UI.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-06-09 11:50+0200\n" -"PO-Revision-Date: 2022-09-09 11:26+0000\n" +"PO-Revision-Date: 2022-09-21 09:48+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -1648,14 +1648,13 @@ #. p8JoC #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Commands..uno:DefinePrintArea\n" "TooltipLabel\n" "value.text" msgid "Define Print Area" -msgstr "~Definir área d'impresión" +msgstr "Definir estaya d'imprentación" #. ZKFGB #: CalcCommands.xcu @@ -1716,7 +1715,7 @@ "TooltipLabel\n" "value.text" msgid "Edit Print Ranges" -msgstr "Editar los rangos d'impresión" +msgstr "Editar les estayes d'imprentación" #. t8Rwk #: CalcCommands.xcu @@ -1740,14 +1739,13 @@ #. RxtBq #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Commands..uno:AddPrintArea\n" "TooltipLabel\n" "value.text" msgid "Add Print Range" -msgstr "Editar los rangos d'impresión" +msgstr "Amestar estaya d'imprentación" #. qwxGD #: CalcCommands.xcu @@ -17780,7 +17778,7 @@ "Label\n" "value.text" msgid "Vertical Scroll" -msgstr "Desplazamientu vertical" +msgstr "Pergamín vertical" #. kUmYD #: GenericCommands.xcu @@ -17790,7 +17788,7 @@ "Label\n" "value.text" msgid "Horizontal Scroll" -msgstr "Desplazamientu horizontal" +msgstr "Pergamín horizontal" #. ix6Fr #: GenericCommands.xcu @@ -27927,7 +27925,7 @@ "UIName\n" "value.text" msgid "Outline" -msgstr "Fuera de llinia" +msgstr "Esquema" #. tBpp5 #: ImpressWindowState.xcu @@ -28067,7 +28065,7 @@ "UIName\n" "value.text" msgid "Slide View" -msgstr "Vista diapositiva" +msgstr "Vista de diapositives" #. 6xE8P #: ImpressWindowState.xcu diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/sc/messages.po libreoffice-7.4.2~rc3/translations/source/ast/sc/messages.po --- libreoffice-7.4.1~rc2/translations/source/ast/sc/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/sc/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-08-08 14:37+0200\n" -"PO-Revision-Date: 2022-09-09 11:26+0000\n" +"PO-Revision-Date: 2022-09-26 19:50+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -1172,7 +1172,7 @@ #: sc/inc/globstr.hrc:202 msgctxt "STR_PRINT_INVALID_AREA" msgid "Invalid print range" -msgstr "Estaya d'impresión inválida" +msgstr "Nun val la estaya d'imprentación" #. 2HpWz #: sc/inc/globstr.hrc:203 @@ -1518,13 +1518,13 @@ #: sc/inc/globstr.hrc:268 msgctxt "STR_IMPORT_DBF" msgid "Import dBASE files" -msgstr "" +msgstr "Importar ficheros de dBASE" #. uyTFS #: sc/inc/globstr.hrc:269 msgctxt "STR_EXPORT_DBF" msgid "dBASE export" -msgstr "" +msgstr "Esportación a dBASE" #. CtHUj #: sc/inc/globstr.hrc:270 @@ -31517,10 +31517,9 @@ #. aDYdR #: sc/uiconfig/scalc/ui/sortoptionspage.ui:190 -#, fuzzy msgctxt "sortoptionspage|extended_tip|sortuser" msgid "Click here and then select the custom sort order that you want." -msgstr " Faiga clic equí y escueya l'orde de clasificación personalizáu que deseye." +msgstr "Calca equí y escueyi l'orde de clasificación personalizáu que deseyes." #. iWcGs #: sc/uiconfig/scalc/ui/sortoptionspage.ui:209 diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/ast/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/ast/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" -"PO-Revision-Date: 2022-09-09 11:26+0000\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" +"PO-Revision-Date: 2022-09-21 09:47+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.12.2\n" +"X-Generator: LibreOffice\n" "X-POOTLE-MTIME: 1540149375.000000\n" #. bHbFE @@ -2967,7 +2967,7 @@ msgstr "Non" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "Guetar una orde" @@ -4240,7 +4240,7 @@ #: sfx2/uiconfig/ui/optprintpage.ui:363 msgctxt "optprintpage|reducebitmapnormal" msgid "N_ormal print quality" -msgstr "Calidá _normal d'impresión" +msgstr "Calidá d'imprentación _normal" #. i5T3j #: sfx2/uiconfig/ui/optprintpage.ui:372 @@ -4307,7 +4307,7 @@ #: sfx2/uiconfig/ui/optprintpage.ui:438 msgctxt "optprintpage|reducebitmapoptimal" msgid "_High print quality" -msgstr "_Calidá d'impresión óptima" +msgstr "_Calidá d'imprentación óptima" #. BdCpv #: sfx2/uiconfig/ui/optprintpage.ui:447 @@ -4365,10 +4365,9 @@ #. GAFzh #: sfx2/uiconfig/ui/optprintpage.ui:600 -#, fuzzy msgctxt "optprintpage|pdf" msgid "_PDF as standard print job format" -msgstr "_PDF como formatu de xera d'impresión estándar" +msgstr "_PDF como formatu de xera d'imprentación estándar" #. wm7C7 #: sfx2/uiconfig/ui/optprintpage.ui:614 @@ -4947,140 +4946,140 @@ msgstr "" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Plantíes" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 #, fuzzy msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Guetar" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Guetar..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "Peñerar por aplicación" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "Toles aplicaciones" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "Documentos de testu" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Fueyes de cálculu" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Presentaciones" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Dibuxos" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "Peñerar por categoría" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Toles categoríes" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Peñera" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "Nome" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "Categoría" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "Aplicación" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "Tamañu" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Llista de plantíes" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/ast/sw/messages.po libreoffice-7.4.2~rc3/translations/source/ast/sw/messages.po --- libreoffice-7.4.1~rc2/translations/source/ast/sw/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ast/sw/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-08-08 14:37+0200\n" -"PO-Revision-Date: 2022-09-09 11:26+0000\n" +"PO-Revision-Date: 2022-09-21 09:48+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Asturian \n" "Language: ast\n" @@ -20850,7 +20850,7 @@ #: sw/uiconfig/swriter/ui/navigatorcontextmenu.ui:242 msgctxt "navigatorcontextmenu|STR_FRAME_TRACKING" msgid "Frame Tracking" -msgstr "" +msgstr "Siguimientu de marcos" #. vhxX5 #: sw/uiconfig/swriter/ui/navigatorcontextmenu.ui:250 diff -Nru libreoffice-7.4.1~rc2/translations/source/az/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/az/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/az/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/az/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-10-21 19:16+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -2899,7 +2899,7 @@ msgstr "Yox" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4854,139 +4854,139 @@ msgstr "" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "" #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/be/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/be/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/be/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/be/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-10-21 19:17+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -2941,7 +2941,7 @@ msgstr "Не" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4873,139 +4873,139 @@ msgstr "або стварыце новую катэгорыю" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Шаблоны" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "Паказваць пры запуску" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Пошук" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Шукаць..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "Фільтр па праграме" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "Усе праграмы" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Разліковыя аркушы" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Прэзентацыі" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Рысункі" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "Фільтр па катэгорыі" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Усе катэгорыі" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Фільтр" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Спіс шаблонаў" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/bg/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/bg/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/bg/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bg/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2021-10-23 00:37+0000\n" "Last-Translator: Mihail Balabanov \n" "Language-Team: Bulgarian \n" @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "Писане на макроси за Calc" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "Разни" diff -Nru libreoffice-7.4.1~rc2/translations/source/bg/helpcontent2/source/text/scalc.po libreoffice-7.4.2~rc3/translations/source/bg/helpcontent2/source/text/scalc.po --- libreoffice-7.4.1~rc2/translations/source/bg/helpcontent2/source/text/scalc.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bg/helpcontent2/source/text/scalc.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2021-11-16 12:09+0100\n" -"PO-Revision-Date: 2021-11-17 12:39+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Mihail Balabanov \n" -"Language-Team: Bulgarian \n" +"Language-Team: Bulgarian \n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.8.1\n" +"X-Generator: Weblate 4.12.2\n" "X-Project-Style: openoffice\n" "X-POOTLE-MTIME: 1562356855.000000\n" @@ -258,7 +258,7 @@ "hd_id241636195404363\n" "help.text" msgid "Comments" -msgstr "" +msgstr "Коментари" #. oPaHx #: main0103.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/bg/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/bg/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/bg/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bg/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2022-07-15 17:09+0000\n" "Last-Translator: Mihail Balabanov \n" "Language-Team: Bulgarian \n" @@ -2964,7 +2964,7 @@ msgstr "Не" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "Търсена команда" @@ -4904,139 +4904,139 @@ msgstr "или създаване на нова категория" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Шаблони" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "Показване на диалога при стартиране" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Търсене" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Търсене..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "Управление" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "Предлага команди за създаване, преименуване и изтриване на категории, нулиране на подразбираните шаблони и опресняване на диспечера на шаблони." #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "Филтър по приложение" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "Всички приложения" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "Текстови документи" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Електронни таблици" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Презентации" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Рисунки" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "Филтър по категория" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Всички категории" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Филтър" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "Име" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "Категория" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "Приложение" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "Променен" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "Размер" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Списък на шаблоните" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "Изглед с миниатюри" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "Списъчен изглед" diff -Nru libreoffice-7.4.1~rc2/translations/source/bn/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/bn/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/bn/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bn/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-07-19 12:45+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "বিবিধ" diff -Nru libreoffice-7.4.1~rc2/translations/source/bn/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/bn/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/bn/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bn/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-10-21 19:18+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -2977,7 +2977,7 @@ msgstr "না" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4985,140 +4985,140 @@ msgstr "" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "ফর্মা" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 #, fuzzy msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "অনুসন্ধান" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "অনুসন্ধান..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "স্প্রেডশীট" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "উপস্থাপনা" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "অঙ্কন" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "পরিশোধক" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/bn-IN/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/bn-IN/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/bn-IN/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bn-IN/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2021-11-14 09:36+0000\n" "Last-Translator: Shaunak Basu \n" "Language-Team: Bengali (India) \n" @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "বিবিধ" diff -Nru libreoffice-7.4.1~rc2/translations/source/bn-IN/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/bn-IN/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/bn-IN/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bn-IN/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2021-08-25 05:04+0000\n" "Last-Translator: Shaunak Basu \n" "Language-Team: Bengali (India) \n" @@ -2937,7 +2937,7 @@ msgstr "না" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4874,139 +4874,139 @@ msgstr "অথবা একটি নতুন বিভাগ তৈরি করুন" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "টেমপ্লেট" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "প্রারম্ভে এই ডায়ালগ প্রদর্শন করুন" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "অনুসন্ধান" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "অনুসন্ধান..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "অ্যাপ্লিকেশন দ্বারা ফিল্টার করুন" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "সমস্ত অ্যাপ্লিকেশন" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "স্প্রেডশীট" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "উপস্থাপনা" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "অঙ্কন" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "বিভাগ দ্বারা ফিল্টার করুন" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "সকল বিভাগ" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "পরিশোধক" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "টেমপ্লেট তালিকা" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/bo/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/bo/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/bo/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bo/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-07-19 12:46+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "གཞན་དག་" diff -Nru libreoffice-7.4.1~rc2/translations/source/bo/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/bo/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/bo/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bo/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-10-21 19:18+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -2976,7 +2976,7 @@ msgstr "མིན།" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4981,142 +4981,142 @@ msgstr "" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "ཡིག་ཚགས་མ་པང་རིགས་དབྱེ།" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 #, fuzzy msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "འཚོལ་བ།" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "འཚོལ་བ་དང་བརྗེ་བ།" #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "ལས་དེབ།" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "གསལ་སྟོན་ཡིག་ཟིན།" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 #, fuzzy msgctxt "templatedlg|applist" msgid "Drawings" msgstr "རི་མོ་འབྲི་བ།" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 #, fuzzy msgctxt "templatedlg|label1" msgid "Filter" msgstr "འཚགས་འདེམས།" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/br/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/br/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/br/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/br/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-10-21 19:19+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -2969,7 +2969,7 @@ msgstr "Ket" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4908,140 +4908,140 @@ msgstr "pe krouiñ ur rummad nevez" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Patromoù" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 #, fuzzy msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Klask" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Klask..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "An holl arloadoù" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Renkelloù" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Kinnigadennoù" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Tresadennoù" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "An holl rummadoù" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Silañ" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/brx/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/brx/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/brx/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/brx/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-10-21 19:19+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -2947,7 +2947,7 @@ msgstr "नङा" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4941,141 +4941,141 @@ msgstr "" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "टेमप्लेटफोर" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 #, fuzzy msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "नागिर" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "नायगिर..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "स्पेडशीटस" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "प्रेजेन्टेसनफोर" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 #, fuzzy msgctxt "templatedlg|applist" msgid "Drawings" msgstr "सावगारि" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "फिल्टार" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/bs/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/bs/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/bs/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bs/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-07-19 12:46+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "Razno" diff -Nru libreoffice-7.4.1~rc2/translations/source/bs/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/bs/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/bs/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/bs/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2018-10-21 19:19+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" @@ -2978,7 +2978,7 @@ msgstr "Ne" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4970,142 +4970,142 @@ msgstr "" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 #, fuzzy msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Š_abloni" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 #, fuzzy msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Pretraživanje" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Pretražujem..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Tabelarni dokumenti" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Prezentacije" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 #, fuzzy msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Crtež" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Filter" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/cui/messages.po libreoffice-7.4.2~rc3/translations/source/ca/cui/messages.po --- libreoffice-7.4.1~rc2/translations/source/ca/cui/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/cui/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-08 12:15+0200\n" -"PO-Revision-Date: 2022-09-09 11:26+0000\n" +"PO-Revision-Date: 2022-10-10 09:39+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3358,7 +3358,7 @@ #: cui/inc/tipoftheday.hrc:245 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Select options in Tools ▸ Options ▸ %PRODUCTNAME Writer ▸ Formatting Aids ▸ Display Formatting to specify which non-printing characters are displayed." -msgstr "" +msgstr "Seleccioneu les opcions a Eines ▸ Opcions ▸ %PRODUCTNAME Writer ▸ Ajudes a la formatació ▸ Formatació de la pantalla per a especificar quins caràcters no imprimibles es mostren." #. 9cyVB #: cui/inc/tipoftheday.hrc:246 @@ -3654,7 +3654,7 @@ #: cui/inc/toolbarmode.hrc:31 msgctxt "RID_CUI_TOOLBARMODES" msgid "The Contextual Groups interface focuses on beginners. It exposes the most frequently used functions on groups with the core action as large icon and a couple of small additional features. All functions have a label. Depending on the context, an additional section provides access to those functions." -msgstr "La interfície de grups contextuals s'orienta als principiants. Exposa les funcions més utilitzades en grups amb l'acció principal com a icona gran i un parell de petites característiques addicionals. Totes les funcions tenen una etiqueta. Depenent del context, una secció addicional proporciona accés a aquestes funcions." +msgstr "La interfície de grups contextuals s'orienta als principiants. Exposa les funcions més utilitzades en grups amb l'acció principal com a icona gran i un parell de petites característiques addicionals. Totes les funcions tenen una etiqueta. Depenent del context, una secció addicional proporciona accés a més funcions." #. Xnz8J #: cui/inc/treeopt.hrc:34 @@ -4408,7 +4408,7 @@ #: cui/uiconfig/ui/accelconfigpage.ui:164 msgctxt "accelconfigpage|extended_tip|office" msgid "Displays shortcut keys that are common to all the office suite applications." -msgstr "" +msgstr "Mostra les tecles de drecera comunes a totes les aplicacions del paquet ofimàtic." #. jjhUE #: cui/uiconfig/ui/accelconfigpage.ui:176 @@ -4420,7 +4420,7 @@ #: cui/uiconfig/ui/accelconfigpage.ui:185 msgctxt "accelconfigpage|extended_tip|module" msgid "Displays shortcut keys for the current office suite application." -msgstr "" +msgstr "Mostra les tecles de drecera per a l'aplicació actual del paquet ofimàtic." #. R2nhJ #: cui/uiconfig/ui/accelconfigpage.ui:212 @@ -4468,13 +4468,13 @@ #: cui/uiconfig/ui/accelconfigpage.ui:295 msgctxt "accelconfigpage|tooltip|reset" msgid "Unsaved modifications to shortcut keys are reverted." -msgstr "" +msgstr "Es revertiran les modificacions no desades a les tecles de drecera." #. stv4J #: cui/uiconfig/ui/accelconfigpage.ui:298 msgctxt "accelconfigpage|extended_tip|reset" msgid "Revert any changes made to keyboard shortcuts to the assignments that were present when this dialog was opened." -msgstr "" +msgstr "Reverteix els canvis fets a les dreceres de teclat a les assignacions que hi havia quan es va obrir aquest diàleg." #. BKAsD #: cui/uiconfig/ui/accelconfigpage.ui:349 @@ -4534,13 +4534,13 @@ #: cui/uiconfig/ui/accelconfigpage.ui:577 msgctxt "accelconfigpage|extended_tip|AccelConfigPage" msgid "Assigns or edits the shortcut keys for the office suite commands, or Basic macros." -msgstr "" +msgstr "Assigna o edita les tecles de drecera per a les ordres del paquet ofimàtic o macros de BASIC." #. 3zZvu #: cui/uiconfig/ui/acorexceptpage.ui:56 msgctxt "acorexceptpage|extended_tip|abbrev" msgid "Type an abbreviation followed by a period, and then click New. This prevents automatic capitalization of the first letter of the word that comes after the period at the end of the abbreviation." -msgstr "" +msgstr "Escriviu una abreviatura seguida d'un període i feu clic a Nou. Això evita la majúscula automàtica de la primera lletra de la paraula que ve després del punt al final de l'abreviatura." #. GUtft #: cui/uiconfig/ui/acorexceptpage.ui:67 @@ -4594,7 +4594,7 @@ #: cui/uiconfig/ui/acorexceptpage.ui:247 msgctxt "acorexceptpage|extended_tip|double" msgid "Type the word or abbreviation that starts with two capital letters or a small initial that you do not want automatically changed to one initial capital. For example, enter PC to prevent a change from PC to Pc, or enter eBook to prevent a change to Ebook." -msgstr "" +msgstr "Escriviu la paraula o abreviatura que comença amb dues majúscules o una inicial minúscula que no voleu canviar automàticament a una majúscula inicial. Per exemple, introduïu PC per a evitar un canvi de PC a Pc, o introduïu eBook per a evitar un canvi a Ebook." #. kAzxB #: cui/uiconfig/ui/acorexceptpage.ui:258 @@ -4648,7 +4648,7 @@ #: cui/uiconfig/ui/acorexceptpage.ui:412 msgctxt "acorexceptpage|extended_tip|AcorExceptPage" msgid "Specify the abbreviations or letter combinations that you do not want corrected automatically." -msgstr "" +msgstr "Indiqueu les abreviatures o combinacions de lletres que no voleu corregir automàticament." #. Cd7nJ #: cui/uiconfig/ui/acoroptionspage.ui:84 @@ -6347,7 +6347,7 @@ #: cui/uiconfig/ui/cellalignment.ui:132 msgctxt "cellalignment|extended_tip|checkVertStack" msgid "Text direction vertically." -msgstr "" +msgstr "Text en direcció vertical." #. XBFYt #: cui/uiconfig/ui/cellalignment.ui:143 @@ -6677,7 +6677,7 @@ #: cui/uiconfig/ui/charnamepage.ui:334 msgctxt "charnamepage|Tab_Western" msgid "Western" -msgstr "" +msgstr "Occidental" #. q4WZB #: cui/uiconfig/ui/charnamepage.ui:380 @@ -6725,7 +6725,7 @@ #: cui/uiconfig/ui/charnamepage.ui:610 msgctxt "charnamepage|Tab_Asian" msgid "Asian" -msgstr "" +msgstr "Asiàtic" #. FSm5y #: cui/uiconfig/ui/charnamepage.ui:660 @@ -6773,7 +6773,7 @@ #: cui/uiconfig/ui/charnamepage.ui:864 msgctxt "charnamepage|Tab_Complex" msgid "Complex" -msgstr "" +msgstr "Complex" #. RyyME #: cui/uiconfig/ui/charnamepage.ui:905 @@ -7043,7 +7043,7 @@ #: cui/uiconfig/ui/colorconfigwin.ui:1225 msgctxt "colorconfigwin|hiddencolrow_lb" msgid "Hidden row/column color" -msgstr "" +msgstr "Color de files i columnes amagades" #. mA6HV #: cui/uiconfig/ui/colorconfigwin.ui:1240 @@ -7061,7 +7061,7 @@ #: cui/uiconfig/ui/colorconfigwin.ui:1307 msgctxt "colorconfigwin|draw" msgid "Drawing / Presentation" -msgstr "Dibuix / Presentació" +msgstr "Dibuix/presentació" #. yELpi #: cui/uiconfig/ui/colorconfigwin.ui:1359 @@ -7109,7 +7109,7 @@ #: cui/uiconfig/ui/colorconfigwin.ui:1566 msgctxt "colorconfigwin|basic" msgid "Basic Syntax Highlighting" -msgstr "Realçament bàsic de la sintaxi" +msgstr "Realçament de la sintaxi BASIC" #. ERVJA #: cui/uiconfig/ui/colorconfigwin.ui:1618 @@ -7611,7 +7611,7 @@ #: cui/uiconfig/ui/colorpickerdialog.ui:812 msgctxt "extended tip | ColorPicker" msgid "Define custom colors using a two-dimensional graphic and numerical gradient chart of the Pick a Color dialog." -msgstr "" +msgstr "Defineix els colors personalitzats utilitzant un diagrama de degradats en dues dimensions i numèric del diàleg Tria un color." #. vDFei #: cui/uiconfig/ui/comment.ui:18 @@ -7995,19 +7995,19 @@ #: cui/uiconfig/ui/cuiimapdlg.ui:245 msgctxt "cuiimapdlg|label4" msgid "_Text Alternative:" -msgstr "" +msgstr "Alternativa de _text:" #. EP7Gk #: cui/uiconfig/ui/cuiimapdlg.ui:246 msgctxt "cuiimapdlg|label4" msgid "Enter a short description of essential features of the image map for persons who do not see the image." -msgstr "" +msgstr "Introduïu una breu descripció de les característiques essencials del mapa d'imatge per a les persones que no veuen la imatge." #. YrTXB #: cui/uiconfig/ui/cuiimapdlg.ui:266 msgctxt "cuiimapdlg|extended_tip|textentry" msgid "Enter the text that you want to display when the mouse rests on the hotspot in a browser. This text can also be used by assistive technologies." -msgstr "" +msgstr "Introduïu el text que voleu mostrar quan el ratolí es quedi en el punt actiu en un navegador. Aquest text també pot ser utilitzat per tecnologies d'assistència." #. bsgYj #: cui/uiconfig/ui/cuiimapdlg.ui:294 @@ -8019,7 +8019,7 @@ #: cui/uiconfig/ui/cuiimapdlg.ui:295 msgctxt "cuiimapdlg|label5" msgid "Give a longer explanation of the image map if it is too complex to be described briefly in “Text Alternative.”" -msgstr "" +msgstr "Doneu una explicació més llarga del mapa d'imatge si és massa complex per a ser descrit breument a «Alternativa de text»." #. mF6Pw #: cui/uiconfig/ui/cuiimapdlg.ui:324 @@ -8109,7 +8109,7 @@ #: cui/uiconfig/ui/databaselinkdialog.ui:180 msgctxt "extended_tip|name" msgid "Enter a name for the database. The office suite uses this name to access the database." -msgstr "" +msgstr "Introduïu un nom per a la base de dades. El paquet ofimàtic utilitza aquest nom per a accedir a la base de dades." #. FrRyU #: cui/uiconfig/ui/databaselinkdialog.ui:199 @@ -8313,7 +8313,7 @@ #: cui/uiconfig/ui/dimensionlinestabpage.ui:440 msgctxt "dimensionlinestabpage|extended_tip|TSB_PARALLEL" msgid "If enabled, displays the text parallel to the dimension line. If disabled, the text is shown at 90 degrees to the dimension line." -msgstr "" +msgstr "Si s'activa, mostra el text paral·lelament a la línia de cota. Si es desactiva, el text es mostra a 90 graus de la línia de cota." #. QNscD #: cui/uiconfig/ui/dimensionlinestabpage.ui:452 @@ -8325,13 +8325,13 @@ #: cui/uiconfig/ui/dimensionlinestabpage.ui:461 msgctxt "dimensionlinestabpage|extended_tip|TSB_SHOW_UNIT" msgid "Shows or hides the dimension measurement unit. You can select a measurement unit you want to display from the list." -msgstr "" +msgstr "Mostra o amaga la unitat de mesura de la cota. Podeu seleccionar la unitat de mesura que voleu mostrar de la llista." #. EEaqi #: cui/uiconfig/ui/dimensionlinestabpage.ui:479 msgctxt "dimensionlinestabpage|extended_tip|LB_UNIT" msgid "Shows or hides the dimension measurement units. You can also select a measurement unit you want to display from the list." -msgstr "Mostra o amaga les unitats de mesura de dimensió. També podeu seleccionar a la llista la unitat de mesura que voleu visualitzar." +msgstr "Mostra o amaga les unitats de mesura de la cota. També podeu seleccionar a la llista la unitat de mesura que voleu visualitzar." #. gX83d #: cui/uiconfig/ui/dimensionlinestabpage.ui:495 @@ -9045,7 +9045,7 @@ #: cui/uiconfig/ui/eventassignpage.ui:237 msgctxt "eventassignpage|extended_tip|libraries" msgid "Lists the office suite program and any open documents." -msgstr "" +msgstr "Mostra el programa de paquet ofimàtic i els documents oberts." #. y7Vyi #: cui/uiconfig/ui/eventassignpage.ui:248 @@ -9111,7 +9111,7 @@ #: cui/uiconfig/ui/eventsconfigpage.ui:147 msgctxt "eventsconfigpage|extended_tip|savein" msgid "Select first where to save the event binding, in the current document or in the office suite." -msgstr "" +msgstr "Seleccioneu primer on desar l'associació de l'esdeveniment, en el document actual o en el paquet ofimàtic." #. C6KwW #: cui/uiconfig/ui/eventsconfigpage.ui:186 @@ -9177,7 +9177,7 @@ #: cui/uiconfig/ui/fmsearchdialog.ui:52 msgctxt "fmsearchdialog|extended_tip|close" msgid "Closes the dialog. The settings of the last search will be saved until you quit the office suite." -msgstr "" +msgstr "Tanca el diàleg. La configuració de l'última cerca es desarà fins que sortiu del paquet ofimàtic." #. UPeyv #: cui/uiconfig/ui/fmsearchdialog.ui:144 @@ -10336,7 +10336,7 @@ #: cui/uiconfig/ui/hangulhanjaoptdialog.ui:231 msgctxt "hangulhanjaoptdialog|extended_tip|dicts" msgid "Lists all user-defined dictionaries. Select the check box next to the dictionaries that you want to use. Clear the check box next to the dictionaries that you do not want to use." -msgstr "" +msgstr "Llista tots els diccionaris definits per l'usuari. Marqueu la casella de selecció al costat dels diccionaris que voleu usar. Desmarqueu la casella de selecció al costat dels diccionaris que no voleu utilitzar." #. DmfuX #: cui/uiconfig/ui/hangulhanjaoptdialog.ui:248 @@ -11282,7 +11282,7 @@ #: cui/uiconfig/ui/iconselectordialog.ui:168 msgctxt "iconselectordialog|extended_tip|importButton" msgid "Adds new icons to the list of icons. You see a file open dialog that imports the selected icon or icons into the internal icon directory of the office suite." -msgstr "" +msgstr "Afegeix icones noves a la llista d'icones. Veureu un diàleg d'obertura de fitxers que importa la icona o les icones seleccionades al directori d'icones intern del paquet ofimàtic." #. 46d7Z #: cui/uiconfig/ui/iconselectordialog.ui:180 @@ -11858,7 +11858,7 @@ #: cui/uiconfig/ui/javastartparametersdialog.ui:124 msgctxt "extended_tip|parameterfield" msgid "Enter a start parameter for a JRE as you would on a command line. Click Add to include the parameter to the list of available start parameters." -msgstr "" +msgstr "Introduïu un paràmetre d'inici per a un JRE tal com ho faríeu en una línia d'ordres. Feu clic a Afegeix per a incloure el paràmetre a la llista de paràmetres inicials disponibles." #. bbrtf #: cui/uiconfig/ui/javastartparametersdialog.ui:137 @@ -12032,13 +12032,13 @@ #: cui/uiconfig/ui/lineendstabpage.ui:152 msgctxt "lineendstabpage|extended_tip|BTN_ADD" msgid "To add a new Arrow Style, first select the shape in the document to be added, then open this dialog and press Add. If the selected shape is not permitted as an Arrow Style, then the Add button is not active." -msgstr "" +msgstr "Per a afegir un estil de fletxa nou, primer seleccioneu la forma del document a afegir, després obriu aquest diàleg i premeu Afegeix. Si la forma seleccionada no està permesa com a estil de fletxa, llavors el botó Afegeix no està actiu." #. hvDgC #: cui/uiconfig/ui/lineendstabpage.ui:164 msgctxt "lineendstabpage|BTN_MODIFY" msgid "_Rename" -msgstr "" +msgstr "_Canvia el nom" #. cQTAi #: cui/uiconfig/ui/lineendstabpage.ui:168 @@ -12604,7 +12604,7 @@ #: cui/uiconfig/ui/menuassignpage.ui:445 msgctxt "menuassignpage|extended_tip|savein" msgid "Select the location where the menu is to be attached. If attached to an office suite module, the menu is available for all files opened in that module. If attached to the file, the menu will be available only when that file is opened and active." -msgstr "" +msgstr "Seleccioneu la ubicació on s'adjuntarà el menú. Si s'adjunta a un mòdul del paquet ofimàtic, el menú estarà disponible per a tots els fitxers oberts en aquest mòdul. Si s'adjunta al fitxer, el menú només estarà disponible quan aquest fitxer estigui obert i actiu." #. D35vJ #: cui/uiconfig/ui/menuassignpage.ui:456 @@ -12742,7 +12742,7 @@ #: cui/uiconfig/ui/menuassignpage.ui:998 msgctxt "menuassignpage|extended_tip|MenuAssignPage" msgid "Lets you customize the office suite menus for all modules." -msgstr "" +msgstr "Permet personalitzar els menús del paquet ofimàtic per a tots els mòduls." #. Mcir5 #: cui/uiconfig/ui/mosaicdialog.ui:21 @@ -13706,7 +13706,7 @@ #: cui/uiconfig/ui/objecttitledescdialog.ui:94 msgctxt "objecttitledescdialog|object_title_label|tooltip_text" msgid "Give a short description of non-text content for users who do not see this object." -msgstr "" +msgstr "Doneu una breu descripció del contingut no textual per als usuaris que no veuen aquest objecte." #. mMZoM #: cui/uiconfig/ui/objecttitledescdialog.ui:113 @@ -13802,7 +13802,7 @@ #: cui/uiconfig/ui/optaccessibilitypage.ui:148 msgctxt "extended_tip|autodetecthc" msgid "Switches the office suite into high contrast mode when the system background color is very dark." -msgstr "" +msgstr "Canvia el paquet ofimàtic al mode d'alt contrast quan el color de fons del sistema és molt fosc." #. Sc8Cq #: cui/uiconfig/ui/optaccessibilitypage.ui:160 @@ -13814,7 +13814,7 @@ #: cui/uiconfig/ui/optaccessibilitypage.ui:168 msgctxt "extended_tip|autofontcolor" msgid "Displays fonts in the office suite using the system color settings. This option only affects the screen display." -msgstr "" +msgstr "Mostra les lletres tipogràfiques en el paquet ofimàtic utilitzant la configuració de color del sistema. Aquesta opció només afecta la pantalla." #. n24Cd #: cui/uiconfig/ui/optaccessibilitypage.ui:180 @@ -13838,7 +13838,7 @@ #: cui/uiconfig/ui/optaccessibilitypage.ui:219 msgctxt "extended_tip|OptAccessibilityPage" msgid "Sets options that make the office suite programs more accessible for users with reduced sight, limited dexterity or other disabilities." -msgstr "" +msgstr "Estableix opcions que fan que els programes del paquet ofimàtic siguin més accessibles per als usuaris amb visió reduïda, destresa limitada o altres discapacitats." #. kishx #: cui/uiconfig/ui/optadvancedpage.ui:55 @@ -13850,7 +13850,7 @@ #: cui/uiconfig/ui/optadvancedpage.ui:64 msgctxt "extended_tip|javaenabled" msgid "Allows you to run extensions written with Java." -msgstr "" +msgstr "Us permet executar extensions escrites amb Java." #. DFVFw #: cui/uiconfig/ui/optadvancedpage.ui:90 @@ -13910,7 +13910,7 @@ #: cui/uiconfig/ui/optadvancedpage.ui:257 msgctxt "extended_tip|javas" msgid "Select the JRE that you want to use. On some systems, you must wait a minute until the list gets populated. On some systems, you must restart the office suite to use your changed setting." -msgstr "" +msgstr "Seleccioneu el JRE que voleu utilitzar. En alguns sistemes, heu d'esperar un minut fins que la llista s'ompli. En alguns sistemes, heu de reiniciar el paquet ofimàtic per a usar la configuració canviada." #. erNBk #: cui/uiconfig/ui/optadvancedpage.ui:285 @@ -13964,7 +13964,7 @@ #: cui/uiconfig/ui/optadvancedpage.ui:412 msgctxt "extended_tip|expertconfig" msgid "Opens the Expert Configuration dialog for advanced settings and configuration." -msgstr "" +msgstr "Obre el diàleg de Configuració avançada per a configuracions i preferències avançats." #. ZLtrh #: cui/uiconfig/ui/optadvancedpage.ui:427 @@ -14036,7 +14036,7 @@ #: cui/uiconfig/ui/optappearancepage.ui:257 msgctxt "extended_tip|OptAppearancePage" msgid "Sets the colors for the user interface." -msgstr "" +msgstr "Estableix els colors per a la interfície d'usuari." #. nRFne #: cui/uiconfig/ui/optasianpage.ui:27 @@ -21194,13 +21194,13 @@ #: cui/uiconfig/ui/textflowpage.ui:213 msgctxt "textflowpage|labelMaxNum" msgid "_Maximum consecutive hyphenated lines" -msgstr "Línies partides consecutives _màximes" +msgstr "Línies partides consecutives mà_ximes" #. JkHBB #: cui/uiconfig/ui/textflowpage.ui:227 msgctxt "textflowpage|labelMinLen" msgid "_Minimum word length in characters" -msgstr "" +msgstr "Longitud de mot mín_ima en caràcters" #. GgHhP #: cui/uiconfig/ui/textflowpage.ui:238 @@ -21212,7 +21212,7 @@ #: cui/uiconfig/ui/textflowpage.ui:253 msgctxt "textflowpage|checkNoLastWord" msgid "Don't hyphenate the last word" -msgstr "" +msgstr "No parteixis l'últim mot" #. 582fA #: cui/uiconfig/ui/textflowpage.ui:292 @@ -21434,25 +21434,25 @@ #: cui/uiconfig/ui/themetabpage.ui:121 msgctxt "themetabpage|lbDk1" msgid "Background - Dark 1:" -msgstr "" +msgstr "Fons fosc 1:" #. J3qNF #: cui/uiconfig/ui/themetabpage.ui:136 msgctxt "themetabpage|lbLt1" msgid "Text - Light 1:" -msgstr "" +msgstr "Text clar 1:" #. zFCDe #: cui/uiconfig/ui/themetabpage.ui:151 msgctxt "themetabpage|lbDk2" msgid "Background - Dark 2:" -msgstr "" +msgstr "Fons fosc 2:" #. RVZjG #: cui/uiconfig/ui/themetabpage.ui:166 msgctxt "themetabpage|lbLt2" msgid "Text - Light 2:" -msgstr "" +msgstr "Text clar 2:" #. kwdwQ #: cui/uiconfig/ui/themetabpage.ui:181 diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/fpicker/messages.po libreoffice-7.4.2~rc3/translations/source/ca/fpicker/messages.po --- libreoffice-7.4.1~rc2/translations/source/ca/fpicker/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/fpicker/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-06-09 11:50+0200\n" -"PO-Revision-Date: 2022-06-06 17:37+0000\n" +"PO-Revision-Date: 2022-09-28 08:39+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1538496751.000000\n" #. SJGCw @@ -500,9 +500,9 @@ "\n" "Do you want to replace it?" msgstr "" -"Ja existeix un disseny amb el nom \"$filename$\".\n" +"Ja existeix un fitxer amb el nom «$filename$».\n" "\n" -"Voleu sobreescriure'l?" +"El voleu reemplaçar?" #. t4wDh #: include/fpicker/strings.hrc:32 diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" -"PO-Revision-Date: 2022-02-17 11:39+0000\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.8.1\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1559826240.000000\n" #. fEEXD @@ -311,13 +311,13 @@ "0815\n" "node.text" msgid "Writing Calc Macros" -msgstr "Escriure macros a Calc" +msgstr "Escritura de macros al Calc" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "Miscel·lània" diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/sbasic/python.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/sbasic/python.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/sbasic/python.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/sbasic/python.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-04-11 15:28+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -3644,7 +3644,7 @@ "par_id81632760673283\n" "help.text" msgid "Use APSO extension console as an alternative:" -msgstr "" +msgstr "Feu servir la consola de l'extensió APSO com a alternativa:" #. 6h9CS #: python_shell.xhp @@ -3662,4 +3662,4 @@ "par_id351633599611244\n" "help.text" msgid "PythonShell function in ScriptForge.Exception service" -msgstr "" +msgstr "Funció PythonShell del servei ScriptForge.Exception" diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/sbasic/shared/03.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/sbasic/shared/03.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/sbasic/shared/03.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/sbasic/shared/03.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2157,7 +2157,7 @@ "par_id151582649200088\n" "help.text" msgid "Returns a random permutation of a one-dimensional array." -msgstr "" +msgstr "Retorna una permutació aleatòria d'una matriu unidimensional." #. xFwWY #: sf_array.xhp @@ -19032,7 +19032,7 @@ "hd_id141618777179310\n" "help.text" msgid "Additional examples" -msgstr "" +msgstr "Més exemples" #. JopFS #: sf_formcontrol.xhp @@ -22407,7 +22407,7 @@ "tit\n" "help.text" msgid "ScriptForge.Region service" -msgstr "" +msgstr "Servei ScriptForge.Region" #. SYtNX #: sf_region.xhp @@ -22416,7 +22416,7 @@ "bm_id681600788076499\n" "help.text" msgid "ScriptForge.Region service" -msgstr "" +msgstr "Servei ScriptForge.Region" #. w3WgP #: sf_region.xhp @@ -23001,7 +23001,7 @@ "par_id651606319520519\n" "help.text" msgid "List of Methods in the Region Service" -msgstr "" +msgstr "Llista de mètodes del servei Region" #. szpDY #: sf_region.xhp @@ -25620,7 +25620,7 @@ "par_id991612372824234\n" "help.text" msgid "The default value is the current operating system on which the script is running." -msgstr "" +msgstr "El valor per defecte és el sistema operatiu on s'executa l'script." #. FPuAV #: sf_string.xhp @@ -25737,7 +25737,7 @@ "par_id861612377611438\n" "help.text" msgid "\"*\" represents zero, one, or multiple characters." -msgstr "" +msgstr "«*» representa zero, un o diversos caràcters." #. eLYBF #: sf_string.xhp @@ -26421,7 +26421,7 @@ "bas_id551612386931680\n" "help.text" msgid "' An example with a ScriptForge Dictionary" -msgstr "" +msgstr "' Un exemple amb un diccionari de l'ScriptForge" #. vvADG #: sf_string.xhp @@ -29400,7 +29400,7 @@ "par_id651606319520519\n" "help.text" msgid "List of Methods in the UnitTest Service" -msgstr "" +msgstr "Llista de mètodes del servei UnitTest" #. d4CFS #: sf_unittest.xhp @@ -29409,7 +29409,7 @@ "hd_id201656428230690\n" "help.text" msgid "Arguments of the AssertX methods" -msgstr "" +msgstr "Arguments dels mètodes AssertX" #. ArRiA #: sf_unittest.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/sbasic/shared.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/sbasic/shared.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/sbasic/shared.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/sbasic/shared.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-10-05 08:58+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2319,7 +2319,7 @@ "hd_id3154614\n" "help.text" msgid "Variable Types" -msgstr "Tipus de variable" +msgstr "Tipus de variables" #. T5to5 #: 01020100.xhp @@ -37323,7 +37323,7 @@ "tit\n" "help.text" msgid "CallByName Function" -msgstr "" +msgstr "Funció CallByName" #. 3957Y #: CallByName.xhp @@ -37332,7 +37332,7 @@ "hd_id3150669\n" "help.text" msgid "CallByName Function" -msgstr "" +msgstr "Funció CallByName" #. 7EWyG #: CallByName.xhp @@ -37534,7 +37534,6 @@ #. Ug7AF #: Compiler_options.xhp -#, fuzzy msgctxt "" "Compiler_options.xhp\n" "tit\n" @@ -37903,13 +37902,12 @@ #. hzLgR #: ErrVBA.xhp -#, fuzzy msgctxt "" "ErrVBA.xhp\n" "N0079\n" "help.text" msgid "' your code goes here …" -msgstr "El codi va aquí" +msgstr "' el vostre codi va aquí…" #. wEaa3 #: ErrVBA.xhp @@ -38170,13 +38168,12 @@ #. VCDS3 #: Resume.xhp -#, fuzzy msgctxt "" "Resume.xhp\n" "bas_id451586093122848\n" "help.text" msgid "' routine code goes here" -msgstr "' el codi de rutina va aquí" +msgstr "' el codi de la rutina va aquí" #. BFzfG #: Resume.xhp @@ -38362,7 +38359,7 @@ "bas_id521629988250997\n" "help.text" msgid "' Looks up the data array" -msgstr "" +msgstr "' Cerca la matriu de dades" #. dbNrF #: calc_functions.xhp @@ -42527,7 +42524,7 @@ "hd_id401544551916353\n" "help.text" msgid "ThisDatabaseDocument object" -msgstr "" +msgstr "Objecte ThisDatabaseDocument" #. CT58E #: thisdbdoc.xhp @@ -42581,7 +42578,7 @@ "par_id251622800540402\n" "help.text" msgid "ThisComponent object" -msgstr "" +msgstr "Objecte ThisComponent" #. 7k6AR #: thisdbdoc.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/scalc/01.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/scalc/01.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/scalc/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/scalc/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:35+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6615,7 +6615,7 @@ "par_id3159204\n" "help.text" msgid "Par (optional) is the par value of the security. If omitted, a default value of 1000 is used." -msgstr "Par (opcional) és el valor par de seguretat. Si s'omet, s'utilitza el valor predeterminat de 1000." +msgstr "Paritat (opcional) és el valor a la par del títol. Si s'omet, s'empra un valor per defecte de 1000." #. EJaKm #: 04060103.xhp @@ -45326,7 +45326,7 @@ "par_id3163711\n" "help.text" msgid "You can enter several conditions that query the cell values or results of formulas. The conditions are evaluated from first to the last. If Condition 1 is true based on the current cell contents, the corresponding cell style is applied. Otherwise, Condition 2 is evaluated to determine if its corresponding style will be applied. If none of the conditions match cell contents, then no changes are made to the cell format." -msgstr "" +msgstr "Podeu introduir diverses condicions que consultin els valors de les cel·les o els resultats de les fórmules. Les condicions es calculen de la primera a l'última. Si la condició 1 és certa segons el contingut actual d'una cel·la, s'hi aplica l'estil de cel·la corresponent. Si no, s'executa la condició 2 per a determinar si s'ha d'aplicar l'estil corresponent. Si cap de les condicions concorda amb el contingut de la cel·la, no se'n fa cap canvi en la formatació." #. GNdvU #: 05120000.xhp @@ -53244,13 +53244,12 @@ #. AZNrM #: common_func.xhp -#, fuzzy msgctxt "" "common_func.xhp\n" "tit\n" "help.text" msgid "Common Syntax and example" -msgstr "Common i exemple" +msgstr "Sintaxi comú i exemples" #. GSbiK #: common_func.xhp @@ -58053,7 +58052,7 @@ "par_id246972715165395\n" "help.text" msgid "International mile" -msgstr "" +msgstr "Milla internacional" #. 6TCBR #: func_convert.xhp @@ -58062,7 +58061,7 @@ "par_id664674443288268\n" "help.text" msgid "Nautical mile" -msgstr "" +msgstr "Milla nàutica" #. rUVPA #: func_convert.xhp @@ -58161,7 +58160,7 @@ "par_id219736221925573\n" "help.text" msgid "Gram" -msgstr "" +msgstr "Gram" #. Pcwzj #: func_convert.xhp @@ -58170,7 +58169,7 @@ "par_id613363919875679\n" "help.text" msgid "Grain" -msgstr "" +msgstr "Gra" #. HfoFq #: func_convert.xhp @@ -58179,7 +58178,7 @@ "par_id961199633533431\n" "help.text" msgid "Pound" -msgstr "" +msgstr "Lliura" #. TtiGk #: func_convert.xhp @@ -58188,7 +58187,7 @@ "par_id655456352143671\n" "help.text" msgid "Ounce" -msgstr "" +msgstr "Unça" #. pmsEB #: func_convert.xhp @@ -58701,7 +58700,7 @@ "par_id545825775819166\n" "help.text" msgid "Oil barrel" -msgstr "" +msgstr "Barril de petroli" #. a3nDk #: func_convert.xhp @@ -58728,7 +58727,7 @@ "par_id278184952564879\n" "help.text" msgid "Cubic foot" -msgstr "" +msgstr "Peu cúbic" #. Be5Nc #: func_convert.xhp @@ -58755,7 +58754,7 @@ "par_id471177863127144\n" "help.text" msgid "Gross register tonnage" -msgstr "" +msgstr "Tonatge d'arqueig brut" #. tM2GH #: func_convert.xhp @@ -58773,7 +58772,7 @@ "par_id995576717914988\n" "help.text" msgid "Cubic inch" -msgstr "" +msgstr "Polzada cúbica" #. t8skx #: func_convert.xhp @@ -58782,7 +58781,7 @@ "par_id842329689485738\n" "help.text" msgid "Liter" -msgstr "" +msgstr "Litre" #. ZgERp #: func_convert.xhp @@ -58791,7 +58790,7 @@ "par_id236636296681258\n" "help.text" msgid "Cubic light-year" -msgstr "" +msgstr "Any de llum cúbic" #. xbjLF #: func_convert.xhp @@ -58809,7 +58808,7 @@ "par_id463843338576911\n" "help.text" msgid "Cubic international mile" -msgstr "" +msgstr "Milla internacional cúbica" #. apJka #: func_convert.xhp @@ -58890,7 +58889,7 @@ "par_id912821548196546\n" "help.text" msgid "Six pack (2 liters)" -msgstr "" +msgstr "Paquet de sis (2 litres)" #. GNQxR #: func_convert.xhp @@ -58998,7 +58997,7 @@ "par_id448471762246791\n" "help.text" msgid "Multiplier" -msgstr "" +msgstr "Multiplicador" #. zByEE #: func_convert.xhp @@ -59007,7 +59006,7 @@ "hd_id91620427193950\n" "help.text" msgid "Binary prefixes" -msgstr "" +msgstr "Prefixos binaris" #. X7TD3 #: func_convert.xhp @@ -59025,7 +59024,7 @@ "par_id553637738674151\n" "help.text" msgid "Multiplier" -msgstr "" +msgstr "Multiplicador" #. gc56z #: func_convert.xhp @@ -66634,7 +66633,7 @@ "par_id321641927458888\n" "help.text" msgid "The rounding method used by this function is known as rounding towards zero. The resulting number will always be smaller than or equal to the original number." -msgstr "" +msgstr "El mètode d'arrodoniment que utilitza aquesta funció es coneix com a arrodoniment cap a zero. El nombre resultant sempre serà més petit que, o igual a, l'original." #. SqCQv #: func_trunc.xhp @@ -73298,7 +73297,7 @@ "par_id6334116\n" "help.text" msgid "You see the Text to Columns dialog." -msgstr "Veureu el diàleg Text a columnes" +msgstr "Veureu el diàleg Text a columnes." #. BpH4f #: text2columns.xhp @@ -73549,10 +73548,9 @@ #. SqFAe #: xml_source.xhp -#, fuzzy msgctxt "" "xml_source.xhp\n" "par_id240920171007419799\n" "help.text" msgid "Wiki page on XML Source" -msgstr "Pàgina Wiki del sobre la font XML" +msgstr "Pàgina del wiki sobre la funcionalitat Font XML (en anglès)" diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/scalc/guide.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/scalc/guide.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/scalc/guide.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/scalc/guide.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-07-15 17:19+0000\n" +"PO-Revision-Date: 2022-10-04 12:14+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5031,7 +5031,7 @@ "par_id121656099297641\n" "help.text" msgid "You can format pivot tables cells using specific cell styles." -msgstr "" +msgstr "És possible formatar les taules dinàmiques mitjançant estils de cel·la específics." #. V3B9U #: datapilot_formatting.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/schart/01.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/schart/01.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/schart/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/schart/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2021-09-10 23:11+0200\n" -"PO-Revision-Date: 2022-06-15 20:39+0000\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -5904,7 +5904,7 @@ "par_id1842097\n" "help.text" msgid "You can insert a second y-axis with Insert - Axes after you finish the wizard." -msgstr "Podeu inserir un segon eix Y triant Insereix - Eixos després de finalitzar l'auxiliar." +msgstr "Podeu inserir un segon eix Y triant Insereix ▸ Eixos després de finalitzar l'auxiliar." #. F4KnA #: type_column_line.xhp @@ -5913,7 +5913,7 @@ "hd_id8297677\n" "help.text" msgid "To specify a data range" -msgstr "Per indicar un interval de dades" +msgstr "Per a indicar un interval de dades" #. o6dS4 #: type_column_line.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/schart.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/schart.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/schart.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/schart.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2019-07-11 18:38+0200\n" -"PO-Revision-Date: 2022-04-25 17:42+0000\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.11.2\n" +"X-Generator: Weblate 4.12.2\n" "X-Language: ca\n" "X-POOTLE-MTIME: 1527509883.000000\n" @@ -645,7 +645,7 @@ "hd_id0810200911433792\n" "help.text" msgid "Formatting Bar" -msgstr "Barra de formatació" +msgstr "Barra Formatació" #. bGXHw #: main0202.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/sdatabase.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/sdatabase.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/sdatabase.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/sdatabase.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-05-25 12:36+0200\n" -"PO-Revision-Date: 2022-08-03 22:48+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -391,7 +391,7 @@ "hd_id3153394\n" "help.text" msgid "Query Design" -msgstr "" +msgstr "Disseny de la consulta" #. GU8Jd #: 02010100.xhp @@ -2488,7 +2488,7 @@ "par_id3153596\n" "help.text" msgid "The Parameter Input dialog asks the user to enter the parameter values. Enter a value for each query parameter and confirm by clicking OK or typing Enter." -msgstr "El diàleg entrada del paràmetre demana a l'usuari que introdueixi els valors del paràmetre. Introduïu un valor per a cada paràmetre de consulta i confirmeu-los clicant OK o escrivint Entrar." +msgstr "El diàleg Entrada de paràmetres demana a l'usuari que introdueixi els valors del paràmetre. Introduïu un valor per a cada paràmetre de consulta i confirmeu-los fent clic a D'acord o prement Retorn." #. eGETM #: 02010100.xhp @@ -5514,7 +5514,7 @@ "hd_id3154011\n" "help.text" msgid "Use Catalog for file-based databases" -msgstr "Utilitzeu Catàleg per a bases de dades basades en fitxers" +msgstr "Usa el Catàleg per a bases de dades basades en fitxers" #. BaWgu #: 11020000.xhp @@ -5622,7 +5622,7 @@ "par_id3161656\n" "help.text" msgid "Opens the Indexes dialog, where you can organize the table indexes in the current dBASE database." -msgstr "Obre el diàleg Indexes, on podeu organitzar els índexs de taula a la base de dades dBASE actual." +msgstr "Obre el diàleg Índexs, on podeu organitzar els índexs de taula a la base de dades dBASE actual." #. vMA8w #: 11030100.xhp @@ -5739,7 +5739,7 @@ "par_id3145315\n" "help.text" msgid "Moves all of the free indexes to the Table Indexes list." -msgstr "Mou tots els índexs lliures a la llista Taula índexs." +msgstr "Mou tots els índexs lliures a la llista Índexs de la taula." #. Ba8Z9 #: 11030100.xhp @@ -5757,7 +5757,7 @@ "par_id3149795\n" "help.text" msgid "Moves the selected table indexes to the Free Indexes list." -msgstr "Mou els índexs seleccionats de la taula a la llista Índexs lliures." +msgstr "Mou els índexs de la taula seleccionats a la llista Índexs lliures." #. sAASQ #: 11030100.xhp @@ -5892,7 +5892,7 @@ "par_id281652481037143\n" "help.text" msgid "Show the result of the SQL SELECT command in the Output box." -msgstr "" +msgstr "Mostra el resultat de l'ordre SQL SELECT al quadre Sortida." #. uaXF8 #: 11080000.xhp @@ -5901,7 +5901,7 @@ "hd_id3154071\n" "help.text" msgid "Execute" -msgstr "" +msgstr "Executa" #. 6UCdY #: 11080000.xhp @@ -5955,7 +5955,7 @@ "hd_id841652479655639\n" "help.text" msgid "Output" -msgstr "" +msgstr "Sortida" #. pEFoq #: 11080000.xhp @@ -5964,7 +5964,7 @@ "par_id511652479714010\n" "help.text" msgid "Displays the results of the SQL command that you ran." -msgstr "" +msgstr "Mostra els resultats de l'ordre SQL que heu executat." #. 93Xfs #: 11090000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/00.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/00.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/00.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/00.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-09-28 08:47+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -7247,7 +7247,7 @@ "par_id3163722\n" "help.text" msgid "Choose File - Printer Settings." -msgstr "Trieu Fitxer ▸ Configuració de la impressora." +msgstr "Trieu Fitxer ▸ Paràmetres de la impressora." #. Dpv6i #: 00000401.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/01.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/01.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-07-26 09:21+0000\n" +"PO-Revision-Date: 2022-09-28 08:47+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -1311,7 +1311,7 @@ "par_id3144438\n" "help.text" msgid "Opens the Printer Setup dialog." -msgstr "Obre el diàleg Configuració de la impressora." +msgstr "Obre el diàleg Paràmetres de la impressora." #. pcasA #: 01010300.xhp @@ -4643,7 +4643,7 @@ "par_id0818200912285064\n" "help.text" msgid "On the General tab page, you find the most important control elements for printing. You can define which contents of your document are to be printed. You can select the printer and open the Printer Settings dialog." -msgstr "A la pestanya General s'hi troben els elements de control més importants de la impressió. Podeu definir quin contingut del document s'ha d'imprimir. Podeu seleccionar la impressora i obrir el diàleg Configuració de la impressora." +msgstr "A la pestanya General s'hi troben els elements de control més importants de la impressió. Podeu definir quin contingut del document s'ha d'imprimir. Podeu seleccionar la impressora i obrir el diàleg Paràmetres de la impressora." #. 5cGHt #: 01130000.xhp @@ -5894,7 +5894,7 @@ "par_id3150449\n" "help.text" msgid "You can also use the Printer Settings to specify additional printer options." -msgstr "També podeu utilitzar Configuració de la impressora per a configurar altres opcions d'impressió." +msgstr "També podeu utilitzar Paràmetres de la impressora per a configurar altres opcions d'impressió." #. 7rEyC #: 01140000.xhp @@ -5903,7 +5903,7 @@ "tit\n" "help.text" msgid "Printer Setup" -msgstr "Configuració de la impressora" +msgstr "Paràmetres de la impressora" #. hcFtG #: 01140000.xhp @@ -5921,7 +5921,7 @@ "hd_id3147294\n" "help.text" msgid "Printer Settings" -msgstr "Configuració de la impressora" +msgstr "Paràmetres de la impressora" #. ebHsp #: 01140000.xhp @@ -12212,13 +12212,12 @@ #. xMabR #: 02220000.xhp -#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3159104\n" "help.text" msgid "Icon Properties" -msgstr "Propietats de la icona " +msgstr "Icona Propietats" #. imNDz #: 02220000.xhp @@ -12254,7 +12253,7 @@ "hd_id3146132\n" "help.text" msgid "Text Alternative" -msgstr "" +msgstr "Text alternatiu" #. ccR9n #: 02220000.xhp @@ -12398,7 +12397,7 @@ "hd_id3153827\n" "help.text" msgid "Text Alternative" -msgstr "" +msgstr "Text alternatiu" #. dgZr8 #: 02220100.xhp @@ -15519,7 +15518,7 @@ "hd_id3155555\n" "help.text" msgid "Character block" -msgstr "" +msgstr "Bloc de caràcters" #. swAqc #: 04100000.xhp @@ -15528,7 +15527,7 @@ "par_id3145090\n" "help.text" msgid "Select a Unicode block for the current font. The special characters for the selected Unicode block are displayed in the character table." -msgstr "" +msgstr "Seleccioneu un bloc Unicode per a la lletra actual. Els caràcters especials del bloc Unicode seleccionat es mostren a la taula de caràcters." #. 8EHHz #: 04100000.xhp @@ -15630,7 +15629,7 @@ "hd_id3149760\n" "help.text" msgid "Style" -msgstr "" +msgstr "Estil" #. bzFsD #: 04140000.xhp @@ -27178,7 +27177,7 @@ "par_id841608260799161\n" "help.text" msgid "Press Shift+F11" -msgstr "" +msgstr "Premeu Maj+F11" #. KhFGr #: 05140100.xhp @@ -27205,7 +27204,7 @@ "par_id441608302065414\n" "help.text" msgid "For all style categories:" -msgstr "" +msgstr "Per a totes les categories d'estils:" #. ZCV8q #: 05140100.xhp @@ -27286,7 +27285,7 @@ "hd_id3154682\n" "help.text" msgid "Custom Styles for Current Document" -msgstr "" +msgstr "Estils personalitzats per al document actual" #. wWSGE #: 05140100.xhp @@ -27304,7 +27303,7 @@ "par_id401608258192415\n" "help.text" msgid "Styles in Calc" -msgstr "" +msgstr "Estils al Calc" #. whwZY #: 05140100.xhp @@ -27313,7 +27312,7 @@ "par_id641608263698887\n" "help.text" msgid "Styles in Impress" -msgstr "" +msgstr "Estils a l'Impress" #. CCTFZ #: 05140100.xhp @@ -27322,7 +27321,7 @@ "par_id641369863698831\n" "help.text" msgid "Styles" -msgstr "" +msgstr "Estils" #. CJiJX #: 05190000.xhp @@ -27440,7 +27439,7 @@ "hd_id2576982\n" "help.text" msgid "Text Alternative" -msgstr "" +msgstr "Text alternatiu" #. uQ5RY #: 05190100.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/02.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/02.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/02.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/02.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-06-09 11:50+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-09-28 08:47+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -51,7 +51,7 @@ "par_id3154398\n" "help.text" msgid "Click the Print File Directly icon to print the active document with the current default print settings. These can be found in the Printer Setup dialog, which you can call with the Printer Settings menu command." -msgstr "Feu clic a la icona Imprimeix el fitxer directament per a imprimir el document actiu amb els paràmetres d'impressió actuals per defecte. Aquests paràmetres es poden trobar al diàleg Configuració de la impressora que podeu cridar amb l'ordre Paràmetres de la impressora." +msgstr "Feu clic a la icona Imprimeix el fitxer directament per a imprimir el document actiu amb els paràmetres d'impressió actuals per defecte. Aquests paràmetres es poden trobar al diàleg Paràmetres de la impressora que podeu cridar amb l'ordre Paràmetres de la impressora." #. EqERF #: 01110000.xhp @@ -14419,7 +14419,7 @@ "par_id3151234\n" "help.text" msgid "Icon AutoFilter" -msgstr "" +msgstr "Icona Filtre automàtic" #. qhCWv #: 12030000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/06.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/06.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/06.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/06.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-05-25 12:36+0200\n" -"PO-Revision-Date: 2022-02-21 10:39+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1543496889.000000\n" #. EUcrc @@ -365,7 +365,7 @@ "par_id231414783735360\n" "help.text" msgid "Slide Design Dialog" -msgstr "Diàleg de disseny de diapositiva" +msgstr "Diàleg Disseny de diapositiva" #. dgGzF #: simpress_screenshots.xhp @@ -374,7 +374,7 @@ "par_id231414780735360\n" "help.text" msgid "Header Footer Dialog" -msgstr "Diàleg de capçalera i peu de pàgina" +msgstr "Diàleg Capçalera i peu de pàgina" #. cxPnD #: simpress_screenshots.xhp @@ -446,7 +446,7 @@ "par_id431634783034366\n" "help.text" msgid "Impress Remote: initial thumbnail shown" -msgstr "Impress remot: es mostra una miniatura inicial" +msgstr "Telecomanda de l'Impress: es mostra una miniatura inicial" #. 9viDm #: svx_screenshots.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/guide.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/guide.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/guide.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/guide.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-07-01 16:24+0000\n" +"PO-Revision-Date: 2022-09-28 08:47+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-Language: ca\n" "X-POOTLE-MTIME: 1564412548.000000\n" @@ -6702,7 +6702,7 @@ "par_id3145786\n" "help.text" msgid "%PRODUCTNAME - PreferencesTools - Options - Language Settings - Languages" -msgstr "%PRODUCTNAME - PreferènciesEines - Opcions - Paràmetres de la llengua - Llengües" +msgstr "%PRODUCTNAME ▸ PreferènciesEines ▸ Opcions ▸ Paràmetres de la llengua ▸ Llengües" #. C5ALR #: ctl.xhp @@ -6711,7 +6711,7 @@ "par_id3153770\n" "help.text" msgid "%PRODUCTNAME - PreferencesTools - Options - Language Settings - Complex Text Layout" -msgstr "%PRODUCTNAME - PreferènciesEines - Opcions - Paràmetres de la llengua - Disposició complexa de text" +msgstr "%PRODUCTNAME ▸ PreferènciesEines ▸ Opcions ▸ Paràmetres de la llengua ▸ Disposició complexa de text" #. E7xSj #: data_addressbook.xhp @@ -13989,7 +13989,7 @@ "par_id3154046\n" "help.text" msgid "A link to a web page, for example, \"www.example.com\" or \"www.myprovider.com/mypage/index.html\" is an absolute link." -msgstr "Un enllaç a una pàgina web, com ara \"www.exemple.com\" o \"www.elmeuproveïdor.com/lamevapàgina/index.html\", és un enllaç absolut." +msgstr "Un enllaç a una pàgina web, com ara «www.exemple.com» o «www.elmeuproveïdor.com/lamevapàgina/index.html», és un enllaç absolut." #. bTRZi #: hyperlink_rel_abs.xhp @@ -14025,7 +14025,7 @@ "par_id3153897\n" "help.text" msgid "When you rest your mouse on a hyperlink, a help tip displays the absolute reference, since $[officename] uses absolute path names internally. The complete path and address can only be seen when you view the result of the HTML export, by loading the HTML file as \"Text\" or opening it with a text editor." -msgstr "Quan poseu el ratolí a sobre d'un enllaç, un indicador d'ajuda mostra la referència absoluta, ja que el $[officename] utilitza noms de camins absoluts internament. L'adreça i el camí complets només són visibles quan visualitzeu el resultat de l'exportació HTML, carregant el fitxer HTML com un \"Text\" o obrint-lo amb un editor de text." +msgstr "Quan poseu el ratolí a sobre d'un enllaç, un indicador d'ajuda mostra la referència absoluta, ja que el $[officename] utilitza noms de camins absoluts internament. L'adreça i el camí complets només són visibles quan visualitzeu el resultat de l'exportació HTML, carregant el fitxer HTML com un «Text» o obrint-lo amb un editor de text." #. qxJsq #: imagemap.xhp @@ -17143,7 +17143,7 @@ "par_id3150043\n" "help.text" msgid "%PRODUCTNAME - PreferencesTools - Options - Language Settings - Languages" -msgstr "%PRODUCTNAME - PreferènciesEines - Opcions - Paràmetres de la llengua - Llengües" +msgstr "%PRODUCTNAME ▸ PreferènciesEines ▸ Opcions ▸ Paràmetres de la llengua ▸ Llengües" #. 4frEL #: language_select.xhp @@ -17314,7 +17314,7 @@ "par_id3153748\n" "help.text" msgid "You can draw a line above, beside or below a paragraph in a Writer text document by choosing Format - Paragraph - Borders." -msgstr "Podeu dibuixar una línia a sobre, a sota o al costat d'un paràgraf en un document de text del Writer si trieu Format - Paràgraf - Vores." +msgstr "Podeu dibuixar una línia a sobre, a sota o al costat d'un paràgraf en un document de text del Writer si trieu Format ▸ Paràgraf ▸ Vores." #. ED6cS #: line_intext.xhp @@ -21417,7 +21417,7 @@ "par_id3159233\n" "help.text" msgid "Make sure that your printer has been setup under File - Printer Settings." -msgstr "Assegureu-vos que s'ha configurat la impressora a Fitxer ▸ Configuració de la impressora." +msgstr "Assegureu-vos que s'ha configurat la impressora a Fitxer ▸ Paràmetres de la impressora." #. MyG4n #: pageformat_max.xhp @@ -23165,13 +23165,12 @@ #. 2w5mE #: redaction.xhp -#, fuzzy msgctxt "" "redaction.xhp\n" "par_id961562796947231\n" "help.text" msgid "Direct Export to PDF icon" -msgstr "GADirect Exporta a la icona PDF" +msgstr "Icona Exporta directament a PDF" #. wqjEG #: redaction.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/optionen.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/optionen.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/shared/optionen.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/shared/optionen.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:35+0000\n" +"PO-Revision-Date: 2022-09-21 09:55+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -1414,7 +1414,7 @@ "par_id973540\n" "help.text" msgid "This folder stores your own AutoText texts." -msgstr "Aquesta carpeta emmagatzema els textos de text automàtic." +msgstr "Aquesta carpeta emmagatzema els vostres textos de text automàtic." #. vGjc8 #: 01010300.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/swriter/01.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/swriter/01.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/swriter/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/swriter/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:05+0200\n" -"PO-Revision-Date: 2022-08-03 22:48+0000\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -15911,7 +15911,7 @@ "hd_id3153926\n" "help.text" msgid "Don't hyphenate the last word" -msgstr "" +msgstr "No parteixis l'últim mot" #. UYKar #: 05030200.xhp @@ -16001,7 +16001,7 @@ "hd_id3149818\n" "help.text" msgid "Hyphenation zone" -msgstr "" +msgstr "Zona de partició de mots" #. iKBAb #: 05030200.xhp @@ -17057,7 +17057,6 @@ #. 4CSvr #: 05040500.xhp -#, fuzzy msgctxt "" "05040500.xhp\n" "hd_id3155775\n" @@ -24020,7 +24019,7 @@ "par_id3147407\n" "help.text" msgid "To reverse the last AutoCorrect action, choose Edit - Undo." -msgstr "Per invertir l'última acció de correcció automàtica, trieu Edita ▸ Desfés." +msgstr "Per a revertir l'última acció de correcció automàtica, trieu Edita ▸ Desfés." #. c9yUj #: 05150100.xhp @@ -24038,7 +24037,7 @@ "hd_id3155625\n" "help.text" msgid "AutoCorrect for Headings" -msgstr "" +msgstr "Correcció automàtica per a encapçalaments" #. GKSGD #: 05150100.xhp @@ -24083,7 +24082,7 @@ "hd_id3152941\n" "help.text" msgid "AutoCorrect for Separator Lines" -msgstr "" +msgstr "Correcció automàtica per a línies separadores" #. wk6vb #: 05150100.xhp @@ -27874,7 +27873,7 @@ "hd_id271630943848307\n" "help.text" msgid "The Accessibility Check dialog" -msgstr "" +msgstr "El diàleg Inspecció d'accessibilitat" #. FAFuD #: accessibility_check.xhp @@ -28102,7 +28101,7 @@ "par_idN10558\n" "help.text" msgid "Opens a submenu to edit the properties of the selected textbox or shape." -msgstr "" +msgstr "Obre un submenú per a editar les propietats del quadre de text o la forma que hàgiu seleccionat." #. UWnvc #: format_object.xhp @@ -31768,7 +31767,7 @@ "par_id721641335152918\n" "help.text" msgid "Icon Style Inspector on the Sidebar" -msgstr "" +msgstr "Icona Inspector d'estils a la barra lateral" #. uhQin #: style_inspector.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/swriter.po libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/swriter.po --- libreoffice-7.4.1~rc2/translations/source/ca/helpcontent2/source/text/swriter.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/helpcontent2/source/text/swriter.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:05+0200\n" -"PO-Revision-Date: 2022-05-12 09:11+0000\n" +"PO-Revision-Date: 2022-09-27 10:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-Language: ca\n" "X-POOTLE-MTIME: 1557994516.000000\n" @@ -681,7 +681,7 @@ "hd_id3145784\n" "help.text" msgid "Bullets and Numbering" -msgstr "Numeració i pics" +msgstr "Pics i numeració" #. E6Eut #: main0105.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-7.4.2~rc3/translations/source/ca/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-7.4.1~rc2/translations/source/ca/officecfg/registry/data/org/openoffice/Office/UI.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/officecfg/registry/data/org/openoffice/Office/UI.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,8 +4,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-06-09 11:50+0200\n" -"PO-Revision-Date: 2022-08-19 12:58+0000\n" -"Last-Translator: Joan Montané \n" +"PO-Revision-Date: 2022-09-21 09:48+0000\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -17614,7 +17614,7 @@ "Label\n" "value.text" msgid "Vertical Scroll" -msgstr "Desplaçament vertical" +msgstr "Pergamí vertical" #. kUmYD #: GenericCommands.xcu @@ -17624,7 +17624,7 @@ "Label\n" "value.text" msgid "Horizontal Scroll" -msgstr "Desplaçament horitzontal" +msgstr "Pergamí horitzontal" #. ix6Fr #: GenericCommands.xcu @@ -23696,7 +23696,7 @@ "Label\n" "value.text" msgid "Export Directly as PDF" -msgstr "Exporta directament com a PDF" +msgstr "Exporta directament a PDF" #. 8eSWp #: GenericCommands.xcu @@ -27656,7 +27656,7 @@ "UIName\n" "value.text" msgid "Outline" -msgstr "Contorn" +msgstr "Esquema" #. tBpp5 #: ImpressWindowState.xcu diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/officecfg/registry/data/org/openoffice/Office.po libreoffice-7.4.2~rc3/translations/source/ca/officecfg/registry/data/org/openoffice/Office.po --- libreoffice-7.4.1~rc2/translations/source/ca/officecfg/registry/data/org/openoffice/Office.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/officecfg/registry/data/org/openoffice/Office.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,8 +4,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:05+0200\n" -"PO-Revision-Date: 2022-08-19 12:58+0000\n" -"Last-Translator: Joan Montané \n" +"PO-Revision-Date: 2022-09-26 19:50+0000\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -10114,7 +10114,7 @@ "Name\n" "value.text" msgid "CommonName" -msgstr "NomComú" +msgstr "NomVernacle" #. 23DVu #: TableWizard.xcu @@ -10124,7 +10124,7 @@ "ShortName\n" "value.text" msgid "CommonName" -msgstr "NomComú" +msgstr "NomVernacle" #. QEn6m #: TableWizard.xcu diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/sc/messages.po libreoffice-7.4.2~rc3/translations/source/ca/sc/messages.po --- libreoffice-7.4.1~rc2/translations/source/ca/sc/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/sc/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,8 +4,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-08-08 14:37+0200\n" -"PO-Revision-Date: 2022-08-19 12:58+0000\n" -"Last-Translator: Joan Montané \n" +"PO-Revision-Date: 2022-09-26 19:50+0000\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -1516,7 +1516,7 @@ #: sc/inc/globstr.hrc:268 msgctxt "STR_IMPORT_DBF" msgid "Import dBASE files" -msgstr "Importa fitxers dBASE" +msgstr "Importa fitxers del dBASE" #. uyTFS #: sc/inc/globstr.hrc:269 diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/sd/messages.po libreoffice-7.4.2~rc3/translations/source/ca/sd/messages.po --- libreoffice-7.4.1~rc2/translations/source/ca/sd/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/sd/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,8 +4,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:05+0200\n" -"PO-Revision-Date: 2022-08-19 12:58+0000\n" -"Last-Translator: Joan Montané \n" +"PO-Revision-Date: 2022-09-28 08:39+0000\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -1444,7 +1444,7 @@ "Do you want to replace it?" msgstr "" "Ja existeix un disseny amb aquest nom.\n" -"Voleu sobreescriure'l?" +"El voleu reemplaçar?" #. bnA2v #: sd/inc/strings.hrc:201 @@ -1576,7 +1576,7 @@ #: sd/inc/strings.hrc:222 msgctxt "STR_PRES_SOFTEND" msgid "Click to exit presentation..." -msgstr "Feu clic aquí per a acabar la presentació..." +msgstr "Feu clic per a sortir de la presentació..." #. EzUVJ #: sd/inc/strings.hrc:223 @@ -1604,7 +1604,7 @@ "is not a valid audio file !" msgstr "" "El fitxer %\n" -"no és un fitxer d'àudio vàlid!" +"no és un fitxer d'àudio vàlid." #. SRWpo #: sd/inc/strings.hrc:227 diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/ca/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/ca/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2022-09-09 11:26+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.12.2\n" +"X-Generator: LibreOffice\n" "X-POOTLE-MTIME: 1559651981.000000\n" #. bHbFE @@ -2963,7 +2963,7 @@ msgstr "No" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "Cerca d'ordres" @@ -4903,139 +4903,139 @@ msgstr "o creeu una categoria nova" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Plantilles" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "Mostra aquest diàleg en iniciar" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Cerca" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Cerca..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "_Gestiona" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "Proporciona ordres per a crear, canvia de nom i suprimir categories, restablir les plantilles predeterminades i actualitzar el gestor de plantilles." #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "Filtra per aplicació" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "Totes les aplicacions" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "Documents de text" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Fulls de càlcul" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Presentacions" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Dibuixos" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "Filtra per categoria" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Totes les categories" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Filtre" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "Nom" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "Categoria" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "Aplicació" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "Modificació" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "Mida" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Llista de plantilles" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "Visualització de miniatures" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "Visualització de llista" diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/svtools/messages.po libreoffice-7.4.2~rc3/translations/source/ca/svtools/messages.po --- libreoffice-7.4.1~rc2/translations/source/ca/svtools/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/svtools/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,8 +4,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-06 20:19+0200\n" -"PO-Revision-Date: 2022-08-19 12:59+0000\n" -"Last-Translator: Joan Montané \n" +"PO-Revision-Date: 2022-09-28 08:39+0000\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -5634,7 +5634,7 @@ #: svtools/uiconfig/ui/printersetupdialog.ui:8 msgctxt "printersetupdialog|PrinterSetupDialog" msgid "Printer Setup" -msgstr "Configuració de la impressora" +msgstr "Paràmetres de la impressora" #. ZNAnC #: svtools/uiconfig/ui/printersetupdialog.ui:40 diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/svx/messages.po libreoffice-7.4.2~rc3/translations/source/ca/svx/messages.po --- libreoffice-7.4.1~rc2/translations/source/ca/svx/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/svx/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,8 +4,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-08 12:15+0200\n" -"PO-Revision-Date: 2022-08-19 12:59+0000\n" -"Last-Translator: Joan Montané \n" +"PO-Revision-Date: 2022-09-21 09:48+0000\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -4780,7 +4780,7 @@ #: include/svx/strings.hrc:840 msgctxt "RID_SVXSTR_BMP79" msgid "Invoice Paper" -msgstr "Paper de factura" +msgstr "Paper d'estrassa" #. x5eiA #: include/svx/strings.hrc:841 diff -Nru libreoffice-7.4.1~rc2/translations/source/ca/sw/messages.po libreoffice-7.4.2~rc3/translations/source/ca/sw/messages.po --- libreoffice-7.4.1~rc2/translations/source/ca/sw/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca/sw/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,8 +4,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-08-08 14:37+0200\n" -"PO-Revision-Date: 2022-08-19 12:58+0000\n" -"Last-Translator: Joan Montané \n" +"PO-Revision-Date: 2022-09-28 08:39+0000\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -18345,7 +18345,7 @@ #: sw/uiconfig/swriter/ui/labeloptionspage.ui:248 msgctxt "labeloptionspage|extended_tip|setup" msgid "Opens the Printer Setup dialog." -msgstr "Obre el diàleg Configuració de la impressora." +msgstr "Obre el diàleg Paràmetres de la impressora." #. ePWUe #: sw/uiconfig/swriter/ui/labeloptionspage.ui:262 @@ -29354,7 +29354,7 @@ #: sw/uiconfig/swriter/ui/tocindexpage.ui:943 msgctxt "tocindexpage|extended_tip|combinesame" msgid "Replaces identical index entries with a single entry that lists the page numbers where the entry occurs in the document. For example, the entries \"View 10, View 43\" are combined as \"View 10, 43\"." -msgstr "Reemplaça les entrades d'índex idèntiques amb una entrada única que llista els números de pàgina allà on apareix l'entrada en el document. Per exemple, les entrades \"Visualitza 10, Visualitza 43\" es combinen com a \"Visualitza 10, 43\"." +msgstr "Reemplaça les entrades d'índex idèntiques amb una sola entrada que mostra els números de pàgina on apareix l'entrada en el document. Per exemple, les entrades «Vegeu 10, Vegeu 43» es combinen com a «Vegeu 10, 43»." #. AVAFm #: sw/uiconfig/swriter/ui/tocindexpage.ui:954 diff -Nru libreoffice-7.4.1~rc2/translations/source/ca-valencia/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/ca-valencia/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/ca-valencia/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca-valencia/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2020-05-24 12:32+0000\n" "Last-Translator: Joan Montané \n" "Language-Team: Catalan \n" @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "Miscel·lània" diff -Nru libreoffice-7.4.1~rc2/translations/source/ca-valencia/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/ca-valencia/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/ca-valencia/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ca-valencia/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2021-01-12 09:36+0000\n" "Last-Translator: Joan Montané \n" "Language-Team: Catalan \n" @@ -2959,7 +2959,7 @@ msgstr "No" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4899,139 +4899,139 @@ msgstr "o creeu una categoria nova" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Plantilles" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "Mostra este diàleg en iniciar" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Busca" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Busca..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "Filtra per aplicació" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "Totes les aplicacions" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Fulls de càlcul" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Presentacions" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Dibuixos" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "Filtra per categoria" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Totes les categories" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Filtre" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Llista de plantilles" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/ckb/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/ckb/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/ckb/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/ckb/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2021-02-05 14:07+0000\n" "Last-Translator: jwtiyar ali nariman \n" "Language-Team: Central Kurdish \n" @@ -2883,7 +2883,7 @@ msgstr "نەخێر" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "" @@ -4814,139 +4814,139 @@ msgstr "" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "داڕێژەکان" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "گه‌ڕان" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "گه‌ڕان…" #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "" #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "شیتی خشتەیی" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "پێشکەشکردن" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "کێشان" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "هەموو هاوپۆلەکان" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "پاڵاوتن" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "لیستی داڕێژەکان" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "" diff -Nru libreoffice-7.4.1~rc2/translations/source/cs/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/cs/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/cs/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/cs/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2021-10-23 00:37+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: Czech \n" @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "Psaní maker Calcu" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "Ostatní" diff -Nru libreoffice-7.4.1~rc2/translations/source/cs/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/cs/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/cs/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/cs/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2022-07-08 10:43+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: Czech \n" @@ -2964,7 +2964,7 @@ msgstr "Ne" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "Vyhledat příkaz" @@ -4904,139 +4904,139 @@ msgstr "nebo vytvořte novou kategorii" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Šablony" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "Zobrazit toto dialogové okno při spuštění" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Hledat" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Hledat…" #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "_Spravovat" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "Nabízí příkazy pro vytvoření, přejmenování a smazání kategorie, obnovení výchozích šablon a obnovení správce šablon." #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "Filtrovat podle aplikace" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "Všechny aplikace" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "Textové dokumenty" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Sešity" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Prezentace" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Kresby" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "Filtrovat podle kategorie" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Všechny kategorie" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Filtrovat" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "Název" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "Kategorie" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "Aplikace" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "Změněno" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "Velikost" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Seznam šablon" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "Zobrazení náhledů" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "Zobrazení seznamu" diff -Nru libreoffice-7.4.1~rc2/translations/source/cy/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/cy/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/cy/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/cy/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2022-07-12 03:33+0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: Welsh \n" @@ -2962,7 +2962,7 @@ msgstr "Na" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "Gorchymyn chwilio" @@ -4902,139 +4902,139 @@ msgstr "neu Greu Categori Newydd" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Templedi" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "Dangos y ddeialog hon wrth gychwyn" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Chwilio" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Chwilio..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "_Rheoli" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "Yn darparu gorchmynion i greu, ailenwi a dileu categorïau, ailosod templedi rhagosodedig, ac adnewyddu rheolwr y templed." #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "Hidlo yn erbyn Rhaglenni" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "Pob Rhaglen" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "Dogfennau Testun" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Taenlenni" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Cyflwyniadau" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Lluniadau" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "Hidlo yn ôl Categori" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Pob Categori" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Hidl" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "Enw" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "Categori" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "Rhaglen" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "Newidiwyd" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "Maint" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Rhestr Templedi" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "Golygfa Llun Bach" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "Golwg Rhestr" diff -Nru libreoffice-7.4.1~rc2/translations/source/da/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/da/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/da/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/da/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2022-01-14 20:38+0000\n" "Last-Translator: SteenRønnow \n" "Language-Team: Danish \n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.8.1\n" +"X-Generator: LibreOffice\n" "X-POOTLE-MTIME: 1562523768.000000\n" #. fEEXD @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "Skrivning af Calc-makroer" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "Diverse" diff -Nru libreoffice-7.4.1~rc2/translations/source/da/helpcontent2/source/text/sbasic/shared/03.po libreoffice-7.4.2~rc3/translations/source/da/helpcontent2/source/text/sbasic/shared/03.po --- libreoffice-7.4.1~rc2/translations/source/da/helpcontent2/source/text/sbasic/shared/03.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/da/helpcontent2/source/text/sbasic/shared/03.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-07-15 17:19+0000\n" -"Last-Translator: SteenRønnow \n" -"Language-Team: Danish \n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" +"Last-Translator: Jørgen Madsen \n" +"Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -185,7 +185,7 @@ "par_id901528999850603\n" "help.text" msgid "• Basic macros require to load ScriptForge library using the following statement:
GlobalScope.BasicLibraries.loadLibrary(\"ScriptForge\")

• Python scripts require an import from scriptforge module:
from scriptforge import CreateScriptService" -msgstr "" +msgstr "• Basic-makroer kræver, at biblioteket ScriptForge indlæses med følgende udtryk:
GlobalScope.BasicLibraries.loadLibrary(\"ScriptForge\")

• Python-scripts kræver import af scriptforge-modulet:
from scriptforge import CreateScriptService" #. eotwE #: lib_ScriptForge.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/da/helpcontent2/source/text/sdatabase.po libreoffice-7.4.2~rc3/translations/source/da/helpcontent2/source/text/sdatabase.po --- libreoffice-7.4.1~rc2/translations/source/da/helpcontent2/source/text/sdatabase.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/da/helpcontent2/source/text/sdatabase.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-05-25 12:36+0200\n" -"PO-Revision-Date: 2022-04-11 13:28+0000\n" -"Last-Translator: SteenRønnow \n" -"Language-Team: Danish \n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" +"Last-Translator: Jørgen Madsen \n" +"Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" #. ugSgG #: 02000000.xhp @@ -391,7 +391,7 @@ "hd_id3153394\n" "help.text" msgid "Query Design" -msgstr "" +msgstr "Forespørgelsessdesign" #. GU8Jd #: 02010100.xhp @@ -427,7 +427,7 @@ "par_id8307138\n" "help.text" msgid "The Query Design window layout is stored with a created query, but cannot be stored with a created view." -msgstr "Vinduet Forespørgselsdesigns layout lagres sammen med en oprette forespørgsel, men kan ikke lagres med en oprettet visning," +msgstr "Vinduet Forespørgselsdesignslayout lagres sammen med en oprettet forespørgsel, men kan ikke lagres med en oprettet visning," #. TEBj6 #: 02010100.xhp @@ -454,7 +454,7 @@ "par_id3150255\n" "help.text" msgid "The lower pane of the Design View is where you define the query. To define a query, specify the database field names to include and the criteria for displaying the fields. To rearrange the columns in the lower pane of the Design View, drag a column header to a new location, or select the column and press CommandCtrl+arrow key." -msgstr "" +msgstr "Den nederste rude i Designvisning er stedet, hvor du definerer forespørgslen. For at definere en forespørgsel angiver du de databasefeltnavne, som skal medtages og kriterierne for visning af felterne. For at omarrangere kolonnerne i den nederste rude i Designvisning trækker du en kolonneoverskrift til den nye placering eller vælger kolonnen og trykker på KommandoCtrl+piletast." #. GMVkG #: 02010100.xhp @@ -994,7 +994,7 @@ "par_id3145134\n" "help.text" msgid "Specifies a first criteria by which the content of the data field is to be filtered." -msgstr "" +msgstr "Angiver det første kriterie, som indholdet i datafeltet skal filtreres efter." #. qpADC #: 02010100.xhp @@ -2450,6 +2450,8 @@ "help.text" msgid "In the simplest case, where the user enters a value which is matched for equality, the parameter name with its preceding colon is simply entered in the Criterion row. In SQL mode this should be typed as WHERE \"Field\" = :Parameter_name" msgstr "" +"I det enkleste tilfælde, hvor brugeren skriver en værdi, som matches for lighed, skrives parameternavnet med dets indledende kolon simpelthen \n" +"ind i rækken Kriterier. I SQL-tilstand bør det skrives som WHERE \"Field\" = :Parameter_name" #. DZCXm #: 02010100.xhp @@ -2467,7 +2469,7 @@ "par_id191120151931441881\n" "help.text" msgid "A useful construction for selecting records based on parts of a text field's content is to add a hidden column with \"LIKE '%' || :Part_of_field || '%'\" as the criterion. This will select records with an exact match. If a case-insensitive test is wanted, one solution is to use LOWER (Field_Name) as the field and LIKE LOWER ( '%' || :Part_of_field || '%' ) as the criterion. Note that the spaces in the criterion are important; if they are left out the SQL parser interprets the entire criterion as a string to be matched. In SQL mode this should be typed as LOWER ( \"Field_Name\" ) LIKE LOWER ( '%' || :Part_of_field || '%' )." -msgstr "" +msgstr "En nyttig fremgangsmåde til valg af poster baseret på dele af et felts indhold er at tilføje en skjult kolonne med \"LIKE '%' || :Part_of_field || '%'\" som kriterie. Dette vil udvælge poster med et præcist match. Hvis der ønskes en test uden hensyn til Stort-og-småt, er en løsning at bruge LOWER (Field_Name) som felt og LIKE LOWER ( '%' || :Part_of_field || '%' ) som kriterie. Bemærk, at mellemrummene i kriteriet er vigtige; hvis de udelades, læser SQL-fortolkeren hele kriteriet som en streng, der skal matches. I SQL-tilstand bør dette indtastes som LOWER ( \"Field_Name\" ) LIKE LOWER ( '%' || :Part_of_field || '%' )." #. sSSB9 #: 02010100.xhp @@ -5897,7 +5899,7 @@ "hd_id91652478785999\n" "help.text" msgid "Show output of \"select\" statements" -msgstr "" +msgstr "Vis uddata fra \"select\"-udtryk" #. nB4gp #: 11080000.xhp @@ -5906,7 +5908,7 @@ "par_id281652481037143\n" "help.text" msgid "Show the result of the SQL SELECT command in the Output box." -msgstr "" +msgstr "Vis resultatet af SQL-kommandoen SELECT i feltet Uddata." #. uaXF8 #: 11080000.xhp @@ -5915,7 +5917,7 @@ "hd_id3154071\n" "help.text" msgid "Execute" -msgstr "" +msgstr "Udfør" #. 6UCdY #: 11080000.xhp @@ -5924,7 +5926,7 @@ "par_id3151210\n" "help.text" msgid "Runs the command that you entered in the Command to execute box." -msgstr "" +msgstr "Udfører den kommando, du skrev i feltet Kommando, der skal udføres." #. BQmT9 #: 11080000.xhp @@ -5942,7 +5944,7 @@ "par_id3149045\n" "help.text" msgid "Lists the previously executed SQL commands. To run a command again, click the command, and then click Execute." -msgstr "" +msgstr "Oplister de tidligere udførte SQL-kommandoer. For at udføre en kommando igen, klikker du på kommandoen og derefter på Udfør." #. AvXck #: 11080000.xhp @@ -5960,7 +5962,7 @@ "par_id3151054\n" "help.text" msgid "Displays the status, including errors, of the SQL command that you ran." -msgstr "" +msgstr "Viser status, herunder fejl, for den SQL-kommando, du har udført" #. 8qcm5 #: 11080000.xhp @@ -5969,7 +5971,7 @@ "hd_id841652479655639\n" "help.text" msgid "Output" -msgstr "" +msgstr "Output" #. pEFoq #: 11080000.xhp @@ -5978,7 +5980,7 @@ "par_id511652479714010\n" "help.text" msgid "Displays the results of the SQL command that you ran." -msgstr "" +msgstr "Viser resultaterne af den SQL-kommando, du udførte." #. 93Xfs #: 11090000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/da/sfx2/messages.po libreoffice-7.4.2~rc3/translations/source/da/sfx2/messages.po --- libreoffice-7.4.1~rc2/translations/source/da/sfx2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/da/sfx2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2022-08-24 12:29+0200\n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" "PO-Revision-Date: 2022-04-25 17:32+0000\n" "Last-Translator: SteenRønnow \n" "Language-Team: Danish \n" @@ -2963,7 +2963,7 @@ msgstr "Nej" #. kDKBB -#: sfx2/uiconfig/ui/commandpopup.ui:36 +#: sfx2/uiconfig/ui/commandpopup.ui:35 msgctxt "commandpopup|entry" msgid "Search command" msgstr "Søgekommando" @@ -4903,139 +4903,139 @@ msgstr "eller opret en ny kategori" #. eUWTy -#: sfx2/uiconfig/ui/templatedlg.ui:46 +#: sfx2/uiconfig/ui/templatedlg.ui:44 msgctxt "templatedlg|TemplateDialog" msgid "Templates" msgstr "Skabeloner" #. rhuYP -#: sfx2/uiconfig/ui/templatedlg.ui:77 +#: sfx2/uiconfig/ui/templatedlg.ui:76 msgctxt "templatedlg|hidedialogcb" msgid "Show this dialog at startup" msgstr "Vis dialog ved opstart" #. 32zsB -#: sfx2/uiconfig/ui/templatedlg.ui:144 +#: sfx2/uiconfig/ui/templatedlg.ui:143 msgctxt "templatedlg|search_filter|tooltip_text" msgid "Search" msgstr "Søg" #. sGZMC -#: sfx2/uiconfig/ui/templatedlg.ui:148 +#: sfx2/uiconfig/ui/templatedlg.ui:147 msgctxt "templatedlg|search_filter" msgid "Search..." msgstr "Søg..." #. DF5YC -#: sfx2/uiconfig/ui/templatedlg.ui:167 +#: sfx2/uiconfig/ui/templatedlg.ui:166 msgctxt "templatedlg|action_menu|label" msgid "_Manage" msgstr "Administrer" #. LUs2m -#: sfx2/uiconfig/ui/templatedlg.ui:181 +#: sfx2/uiconfig/ui/templatedlg.ui:180 msgctxt "templatedlg|extended_tip|action_menu" msgid "Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager." msgstr "Indeholder kommandoer til at oprette, omdøbe og slette kategorier, nulstille standardskabeloner og genopfriske skabelonhåndteringen." #. fXVNY -#: sfx2/uiconfig/ui/templatedlg.ui:208 +#: sfx2/uiconfig/ui/templatedlg.ui:207 msgctxt "templatedlg|filter_application|tooltip_text" msgid "Filter by Application" msgstr "Filtrér efter program" #. tqVhJ -#: sfx2/uiconfig/ui/templatedlg.ui:210 +#: sfx2/uiconfig/ui/templatedlg.ui:209 msgctxt "templatedlg|applist" msgid "All Applications" msgstr "Alle programmer" #. pD6pU -#: sfx2/uiconfig/ui/templatedlg.ui:211 +#: sfx2/uiconfig/ui/templatedlg.ui:210 msgctxt "templatedlg|applist" msgid "Text Documents" msgstr "Tekstdokumenter" #. eECt7 -#: sfx2/uiconfig/ui/templatedlg.ui:212 +#: sfx2/uiconfig/ui/templatedlg.ui:211 msgctxt "templatedlg|applist" msgid "Spreadsheets" msgstr "Regneark" #. ajLbV -#: sfx2/uiconfig/ui/templatedlg.ui:213 +#: sfx2/uiconfig/ui/templatedlg.ui:212 msgctxt "templatedlg|applist" msgid "Presentations" msgstr "Præsentationer" #. LfUzB -#: sfx2/uiconfig/ui/templatedlg.ui:214 +#: sfx2/uiconfig/ui/templatedlg.ui:213 msgctxt "templatedlg|applist" msgid "Drawings" msgstr "Tegninger" #. t7zE7 -#: sfx2/uiconfig/ui/templatedlg.ui:228 +#: sfx2/uiconfig/ui/templatedlg.ui:227 msgctxt "templatedlg|filter_folder|tooltip_text" msgid "Filter by Category" msgstr "Filtrér efter kategori" #. 93CGw -#: sfx2/uiconfig/ui/templatedlg.ui:230 +#: sfx2/uiconfig/ui/templatedlg.ui:229 msgctxt "templatedlg|folderlist" msgid "All Categories" msgstr "Alle kategorier" #. NF9wE -#: sfx2/uiconfig/ui/templatedlg.ui:251 +#: sfx2/uiconfig/ui/templatedlg.ui:250 msgctxt "templatedlg|label1" msgid "Filter" msgstr "Filter" #. ewTL3 -#: sfx2/uiconfig/ui/templatedlg.ui:357 +#: sfx2/uiconfig/ui/templatedlg.ui:356 msgctxt "templatedlg|treeviewcolumn1" msgid "Name" msgstr "Navn" #. 7EJRA -#: sfx2/uiconfig/ui/templatedlg.ui:374 +#: sfx2/uiconfig/ui/templatedlg.ui:373 msgctxt "templatedlg|treeviewcolumn2" msgid "Category" msgstr "Kategori" #. AC27i -#: sfx2/uiconfig/ui/templatedlg.ui:389 +#: sfx2/uiconfig/ui/templatedlg.ui:388 msgctxt "templatedlg|treeviewcolumn3" msgid "Application" msgstr "Program" #. eSaBw -#: sfx2/uiconfig/ui/templatedlg.ui:404 +#: sfx2/uiconfig/ui/templatedlg.ui:403 msgctxt "templatedlg|treeviewcolumn4" msgid "Modified" msgstr "Ændret" #. pNzYA -#: sfx2/uiconfig/ui/templatedlg.ui:419 +#: sfx2/uiconfig/ui/templatedlg.ui:418 msgctxt "templatedlg|treeviewcolumn5" msgid "Size" msgstr "Størrelse" #. j39jM -#: sfx2/uiconfig/ui/templatedlg.ui:445 +#: sfx2/uiconfig/ui/templatedlg.ui:444 msgctxt "templatedlg|thumbnailviewlabel" msgid "Template List" msgstr "Skabelonliste" #. yEhgP -#: sfx2/uiconfig/ui/templatedlg.ui:464 +#: sfx2/uiconfig/ui/templatedlg.ui:463 msgctxt "templatedlg|thumbnail_view_btn|tooltip_text" msgid "Thumbnail View" msgstr "Miniaturevisning" #. j76ke -#: sfx2/uiconfig/ui/templatedlg.ui:481 +#: sfx2/uiconfig/ui/templatedlg.ui:480 msgctxt "templatedlg|list_view_btn|tooltip_text" msgid "List View" msgstr "LIstevisning" diff -Nru libreoffice-7.4.1~rc2/translations/source/de/basctl/messages.po libreoffice-7.4.2~rc3/translations/source/de/basctl/messages.po --- libreoffice-7.4.1~rc2/translations/source/de/basctl/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/basctl/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-06 20:18+0200\n" -"PO-Revision-Date: 2022-07-18 04:43+0000\n" -"Last-Translator: Annabelle Wübbelsmann \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-03 15:40+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -656,7 +656,7 @@ #: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:167 msgctxt "basicmacrodialog|existingmacrosft" msgid "Existing Macros In:" -msgstr "Vorhandene Makros in:" +msgstr "Vorhandene Makros in" #. 8Bfcg #: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:230 @@ -968,7 +968,7 @@ #: basctl/uiconfig/basicide/ui/exportdialog.ui:8 msgctxt "exportdialog|ExportDialog" msgid "Export Basic library" -msgstr "Basic-Bibliothek exportieren" +msgstr "BASIC-Bibliothek exportieren" #. hvm9y #: basctl/uiconfig/basicide/ui/exportdialog.ui:90 @@ -1100,7 +1100,7 @@ #: basctl/uiconfig/basicide/ui/libpage.ui:244 msgctxt "libpage|extended_tip|import" msgid "Locate the Basic library that you want to add to the current list, and then click Open." -msgstr "Suchen Sie die Basic-Bibliothek, die Sie der aktuellen Liste hinzufügen möchten, und klicken Sie dann auf »Öffnen«." +msgstr "Suchen Sie die BASIC-Bibliothek, die Sie der aktuellen Liste hinzufügen möchten, und klicken Sie dann auf »Öffnen«." #. GhHRH #: basctl/uiconfig/basicide/ui/libpage.ui:257 @@ -1280,7 +1280,7 @@ #: basctl/uiconfig/basicide/ui/modulepage.ui:226 msgctxt "modulepage|extended_tip|import" msgid "Locate the Basic library that you want to add to the current list, and then click Open." -msgstr "Suchen Sie die Basic-Bibliothek, die Sie der aktuellen Liste hinzufügen möchten, und klicken Sie dann auf »Öffnen«." +msgstr "Suchen Sie die BASIC-Bibliothek, die Sie der aktuellen Liste hinzufügen möchten, und klicken Sie dann auf »Öffnen«." #. GAYBh #: basctl/uiconfig/basicide/ui/modulepage.ui:238 diff -Nru libreoffice-7.4.1~rc2/translations/source/de/basic/messages.po libreoffice-7.4.2~rc3/translations/source/de/basic/messages.po --- libreoffice-7.4.1~rc2/translations/source/de/basic/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/basic/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-01-31 18:18+0100\n" -"PO-Revision-Date: 2021-10-27 03:31+0000\n" -"Last-Translator: Ettore Atalan \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-03 15:40+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1507236530.000000\n" #. CacXi @@ -230,7 +230,7 @@ #: basic/inc/basic.hrc:67 msgctxt "RID_BASIC_START" msgid "Renaming on different drives impossible." -msgstr "Umbenennen auf unterschiedlichen Laufwerken nicht möglich." +msgstr "Umbenennen auf verschiedenen Laufwerken nicht möglich." #. 8gEYf #: basic/inc/basic.hrc:68 diff -Nru libreoffice-7.4.1~rc2/translations/source/de/chart2/messages.po libreoffice-7.4.2~rc3/translations/source/de/chart2/messages.po --- libreoffice-7.4.1~rc2/translations/source/de/chart2/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/chart2/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-01-31 18:18+0100\n" -"PO-Revision-Date: 2022-07-26 09:17+0000\n" -"Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-10 09:39+0000\n" +"Last-Translator: Annabelle Wübbelsmann \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1403,7 +1403,7 @@ #: chart2/uiconfig/ui/dlg_DataLabel.ui:322 msgctxt "dlg_DataLabel|FT_LABEL_PLACEMENT" msgid "Place_ment" -msgstr "Platz_ierung" +msgstr "Platz_ierung:" #. RBvRC #: chart2/uiconfig/ui/dlg_DataLabel.ui:338 @@ -1493,7 +1493,7 @@ #: chart2/uiconfig/ui/dlg_DataLabel.ui:367 msgctxt "dlg_DataLabel|FT_TEXT_SEPARATOR" msgid "_Separator" -msgstr "_Trenner" +msgstr "_Trennzeichen:" #. m8qsr #: chart2/uiconfig/ui/dlg_DataLabel.ui:383 @@ -1559,7 +1559,7 @@ #: chart2/uiconfig/ui/dlg_DataLabel.ui:518 msgctxt "dlg_DataLabel|FT_LABEL_TEXTDIR" msgid "Te_xt direction" -msgstr "Te_xtrichtung" +msgstr "Te_xtrichtung:" #. tjcHp #: chart2/uiconfig/ui/dlg_DataLabel.ui:535 @@ -2627,7 +2627,7 @@ #: chart2/uiconfig/ui/sidebartype.ui:85 msgctxt "sidebartype|3dlook" msgid "_3D Look" -msgstr "_3D-Darstellung" +msgstr "_3D-Darstellung:" #. mjrkY #: chart2/uiconfig/ui/sidebartype.ui:104 @@ -2675,7 +2675,7 @@ #: chart2/uiconfig/ui/sidebartype.ui:263 msgctxt "sidebartype|linetypeft" msgid "_Line type" -msgstr "Linien_typ" +msgstr "Linien_typ:" #. Hqc3N #: chart2/uiconfig/ui/sidebartype.ui:278 @@ -3179,7 +3179,7 @@ #: chart2/uiconfig/ui/tp_AxisPositions.ui:44 msgctxt "tp_AxisPositions|FT_CROSSES_OTHER_AXIS_AT" msgid "_Cross other axis at" -msgstr "Andere Achse schneiden _bei" +msgstr "Andere Achse schneiden _bei:" #. Z734o #: chart2/uiconfig/ui/tp_AxisPositions.ui:60 @@ -3269,7 +3269,7 @@ #: chart2/uiconfig/ui/tp_AxisPositions.ui:258 msgctxt "tp_AxisPositions|FT_PLACE_LABELS" msgid "_Place labels" -msgstr "_Position" +msgstr "_Position:" #. GDk2L #: chart2/uiconfig/ui/tp_AxisPositions.ui:274 @@ -3443,7 +3443,7 @@ #: chart2/uiconfig/ui/tp_ChartType.ui:48 msgctxt "tp_ChartType|FT_CAPTION_FOR_WIZARD" msgid "Choose a Chart Type" -msgstr "Diagrammtyp wählen" +msgstr "Wählen Sie einen Diagrammtyp" #. wBFXQ #: chart2/uiconfig/ui/tp_ChartType.ui:94 @@ -3455,7 +3455,7 @@ #: chart2/uiconfig/ui/tp_ChartType.ui:123 msgctxt "tp_ChartType|3dlook" msgid "_3D Look" -msgstr "_3D-Darstellung" +msgstr "_3D-Darstellung:" #. EB95g #: chart2/uiconfig/ui/tp_ChartType.ui:133 @@ -3719,7 +3719,7 @@ #: chart2/uiconfig/ui/tp_DataLabel.ui:254 msgctxt "tp_DataLabel|FT_LABEL_PLACEMENT" msgid "Place_ment" -msgstr "Platz_ierung" +msgstr "Platz_ierung:" #. L2MYb #: chart2/uiconfig/ui/tp_DataLabel.ui:270 @@ -3809,7 +3809,7 @@ #: chart2/uiconfig/ui/tp_DataLabel.ui:299 msgctxt "tp_DataLabel|FT_TEXT_SEPARATOR" msgid "_Separator" -msgstr "_Trenner" +msgstr "_Trenner:" #. oPhGH #: chart2/uiconfig/ui/tp_DataLabel.ui:315 @@ -3875,7 +3875,7 @@ #: chart2/uiconfig/ui/tp_DataLabel.ui:450 msgctxt "tp_DataLabel|FT_LABEL_TEXTDIR" msgid "Te_xt direction" -msgstr "Te_xtrichtung" +msgstr "Te_xtrichtung:" #. MYXZo #: chart2/uiconfig/ui/tp_DataLabel.ui:467 @@ -4349,7 +4349,7 @@ #: chart2/uiconfig/ui/tp_LegendPosition.ui:142 msgctxt "tp_LegendPosition|FT_LEGEND_TEXTDIR" msgid "Te_xt direction" -msgstr "Te_xtrichtung" +msgstr "Te_xtrichtung:" #. PSPoQ #: chart2/uiconfig/ui/tp_LegendPosition.ui:158 @@ -4571,7 +4571,7 @@ #: chart2/uiconfig/ui/tp_Scale.ui:102 msgctxt "tp_Scale|TXT_AXIS_TYPE" msgid "T_ype" -msgstr "A_rt" +msgstr "A_rt:" #. D6Bre #: chart2/uiconfig/ui/tp_Scale.ui:118 @@ -4601,13 +4601,13 @@ #: chart2/uiconfig/ui/tp_Scale.ui:159 msgctxt "tp_Scale|TXT_MIN" msgid "_Minimum" -msgstr "_Minimum" +msgstr "_Minimum:" #. XUKzj #: chart2/uiconfig/ui/tp_Scale.ui:173 msgctxt "tp_Scale|TXT_MAX" msgid "Ma_ximum" -msgstr "Ma_ximum" +msgstr "Ma_ximum:" #. 4jRuB #: chart2/uiconfig/ui/tp_Scale.ui:185 @@ -4673,7 +4673,7 @@ #: chart2/uiconfig/ui/tp_Scale.ui:328 msgctxt "tp_Scale|TXT_STEP_MAIN" msgid "Ma_jor interval" -msgstr "Hau_ptintervall" +msgstr "Hau_ptintervall:" #. AtZ6D #: chart2/uiconfig/ui/tp_Scale.ui:358 @@ -4727,7 +4727,7 @@ #: chart2/uiconfig/ui/tp_Scale.ui:473 msgctxt "tp_Scale|TXT_STEP_HELP_COUNT" msgid "Minor inter_val count" -msgstr "Hil_fsintervall Schritte" +msgstr "Hil_fsintervall Schritte:" #. c9m8j #: chart2/uiconfig/ui/tp_Scale.ui:500 @@ -4811,13 +4811,13 @@ #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:123 msgctxt "tp_SeriesToAxis|FT_GAP" msgid "_Spacing" -msgstr "Ab_stand" +msgstr "Ab_stand:" #. 27wWb #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:136 msgctxt "tp_SeriesToAxis|FT_OVERLAP" msgid "_Overlap" -msgstr "Ü_berlappung" +msgstr "Ü_berlappung:" #. NKaBT #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:153 @@ -5501,7 +5501,7 @@ #: chart2/uiconfig/ui/wizelementspage.ui:391 msgctxt "wizelementspage|Axe" msgid "Choose Titles, Legend, and Grid Settings" -msgstr "Wählen Sie Titel-, Legenden- und Gitter-Einstellungen" +msgstr "Wählen Sie die Titel-, Legenden- und Gitter-Einstellungen" #. wp2DC #: chart2/uiconfig/ui/wizelementspage.ui:421 diff -Nru libreoffice-7.4.1~rc2/translations/source/de/cui/messages.po libreoffice-7.4.2~rc3/translations/source/de/cui/messages.po --- libreoffice-7.4.1~rc2/translations/source/de/cui/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/cui/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-08 12:15+0200\n" -"PO-Revision-Date: 2022-08-07 18:13+0000\n" +"PO-Revision-Date: 2022-10-10 09:39+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -315,7 +315,7 @@ #: cui/inc/strings.hrc:52 msgctxt "RID_SVXSTR_SUBMENU_NAME" msgid "Submenu name" -msgstr "Name des Untermenüs" +msgstr "Name des Untermenüs:" #. qJgZw #: cui/inc/strings.hrc:53 @@ -655,13 +655,13 @@ #: cui/inc/strings.hrc:117 msgctxt "RID_SVXSTR_EVENT_STARTAPP" msgid "Start Application" -msgstr "Programmstart" +msgstr "Anwendung starten" #. 6tUvx #: cui/inc/strings.hrc:118 msgctxt "RID_SVXSTR_EVENT_CLOSEAPP" msgid "Close Application" -msgstr "Programmende" +msgstr "Anwendung schließen" #. 6NsQz #: cui/inc/strings.hrc:119 @@ -2169,7 +2169,7 @@ #: cui/inc/tipoftheday.hrc:50 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "%PRODUCTNAME offers a variety of user interface options to make you feel at home" -msgstr "%PRODUCTNAME bietet eine Vielzahl von Optionen für die Benutzeroberfläche, damit Sie sich wie zu Hause fühlen" +msgstr "%PRODUCTNAME bietet eine Vielzahl von Optionen für die Benutzeroberfläche, damit Sie sich wie zu Hause fühlen." #. m8rYd #: cui/inc/tipoftheday.hrc:51 @@ -2214,7 +2214,9 @@ #: cui/inc/tipoftheday.hrc:57 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to sum a cell through several sheets? Refer to the range of sheets e.g. =SUM(Sheet1.A1:Sheet3.A1)." -msgstr "Um in Calc eine Zelle über mehrere Tabellen zu summieren, beziehen Sie sich auf den Bereich der Tabellen, beispielsweise =SUMME('Tabelle 1'.A1:'Tabelle 3'.A1)." +msgstr "" +"Um in Calc eine Zelle über mehrere Tabellen zu summieren, beziehen Sie sich auf den Bereich der Tabellen,\n" +"beispielsweise =SUMME('Tabelle 1'.A1:'Tabelle 3'.A1)." #. AxXYW #: cui/inc/tipoftheday.hrc:58 @@ -2292,7 +2294,7 @@ #: cui/inc/tipoftheday.hrc:70 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use View ▸ Value Highlighting to display cell contents in colors: Text/black, Formulas/green, Numbers/blue, Protected cells/grey background." -msgstr "Um Zellinhalte in Calc farbig anzuzeigen, wählen Sie »Ansicht ▸ Werte hervorheben«: Text in schwarz, Formeln in grün, Zahlen in blau und geschützte Zellen mit grauem Hintergrund." +msgstr "Um in Calc Zellinhalte farbig anzuzeigen, wählen Sie »Ansicht ▸ Werte hervorheben«: Text in Schwarz, Formeln in Grün, Zahlen in Blau und geschützte Zellen mit grauem Hintergrund." #. kKdqp #. local help missing @@ -2317,7 +2319,7 @@ #: cui/inc/tipoftheday.hrc:74 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use Page/Slide ▸ Properties ▸ “Fit object to paper format” in Draw/Impress to resize the objects so that they fit on your chosen paper format." -msgstr "Um die Größe von Objekten so anzupassen, dass Sie zu Ihrem gewählten Papierformat passen, wählen Sie in Draw/Impress »Folie ▸ Eigenschaften… ▸ Objekt an Papierformat anpassen«." +msgstr "Um in Draw/Impress die Größe von Objekten so anzupassen, dass Sie zu Ihrem gewählten Papierformat passen, wählen Sie »Folie ▸ Folieneigenschaften… ▸ Objekt an Papierformat anpassen«." #. hj7H4 #: cui/inc/tipoftheday.hrc:75 @@ -2342,7 +2344,7 @@ #: cui/inc/tipoftheday.hrc:78 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "To automatically number table rows in Writer, select the relevant column, then apply a List Style." -msgstr "Um Tabellenzeilen in Writer automatisch zu nummerieren, wählen Sie die entsprechende Spalte aus und wenden dann ein Listenvorlage an." +msgstr "Um in Writer Tabellenzeilen automatisch zu nummerieren, wählen Sie die entsprechende Spalte aus und wenden dann eine Listenvorlage an." #. AzNEm #. no local help URI @@ -2355,7 +2357,7 @@ #: cui/inc/tipoftheday.hrc:80 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to sort a series in %PRODUCTNAME Calc such as A1, A2, A3, A11, A15, not in alphabetical order but on the number? Enable natural sort in the Options tab." -msgstr "Um Reihen wie A1, A2, A3, A11, A15 in %PRODUCTNAME Calc nicht in alphabetischer, sondern in numerischer Folge zu sortieren, aktivieren Sie das Markierfeld \"Natürliche Sortierung verwenden\" unter »Daten ▸ Sortieren… ▸ Register: Optionen«." +msgstr "Um in %PRODUCTNAME Calc Reihen wie A1, A2, A3, A11, A15 nicht in alphabetischer, sondern in numerischer Folge zu sortieren, aktivieren Sie das Markierfeld \"Natürliche Sortierung verwenden\" unter »Daten ▸ Sortieren… ▸ Register: Optionen«." #. Wx8QG #. https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/12030200.html @@ -2386,25 +2388,25 @@ #: cui/inc/tipoftheday.hrc:85 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use the Backspace key instead of Delete in Calc. You can choose what to delete." -msgstr "Um in Calc auszuwählen, was gelöscht werden soll, verwenden Sie die Taste »Rückschritt« anstelle von »Entf«." +msgstr "Um in Calc auszuwählen, was gelöscht werden soll, verwenden Sie [Rückschritt] anstelle von [Entf]." #. UuWHK #: cui/inc/tipoftheday.hrc:86 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Best way to fix bad-looking MS Word table cells via Table ▸ Size ▸ Optimal Row Height / Column Width." -msgstr "Um schlecht aussehende MS Word-Tabellenzellen zu beheben, wählen Sie »Tabelle ▸ Größe ▸ Optimale Zeilenhöhe/Spaltenbreite«." +msgstr "Um schlecht aussehende MS Word-Tabellenzellen zu korrigieren, wählen Sie »Tabelle ▸ Größe ▸ Optimale Zeilenhöhe/Spaltenbreite«." #. HEfCq #: cui/inc/tipoftheday.hrc:87 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "To repeat a table heading when a table spans over a page, use Table ▸ Table Properties ▸ Text Flow ▸ Repeat heading." -msgstr "Um eine Tabellenüberschrift in Writer zu wiederholen, wenn sich eine Tabelle über mehr als eine Seite erstreckt, wählen Sie »Tabelle ▸ Tabelleneigenschaften… ▸ Register: Textfluss ▸ Markierfeld: Überschrift wiederholen«." +msgstr "Um in Writer eine Tabellenüberschrift zu wiederholen, wenn sich eine Tabelle über mehr als eine Seite erstreckt, wählen Sie »Tabelle ▸ Tabelleneigenschaften… ▸ Register: Textfluss ▸ Markierfeld: Überschrift wiederholen«." #. 7rb58 #: cui/inc/tipoftheday.hrc:88 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to quickly insert or delete rows? Select the desired number of rows (or columns) and press %MOD1+Plus sign (+) to add or %MOD1+Minus sign (-) to delete." -msgstr "Um in Calc Zeilen (oder Spalten) schnell einzufügen oder zu löschen, wählen Sie die gewünschte Anzahl an Zeilen (oder Spalten) aus und drücken Sie %MOD1+Plus (+) zum Hinzufügen (oberhalb beziehungsweise links) oder %MOD1+Minus (-) zum Löschen." +msgstr "Um in Calc Zeilen (oder Spalten) schnell einzufügen oder zu löschen, wählen Sie die gewünschte Anzahl an Zeilen (oder Spalten) aus und drücken Sie [%MOD1+Plus (+)] zum Hinzufügen (oberhalb beziehungsweise links) oder [%MOD1+Minus (-)] zum Löschen." #. gEysu #: cui/inc/tipoftheday.hrc:89 @@ -2416,19 +2418,19 @@ #: cui/inc/tipoftheday.hrc:90 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Insert images and photos into shapes in Draw and Impress. Right-click on a shape, choose Area ▸ Image ▸ Add / Import, and use Options to adjust appearance." -msgstr "Um Bilder und Fotos in Draw oder Impress in Formen einzufügen, klicken Sie mit der rechten Maustaste auf eine Form, wählen Sie »Fläche… ▸ Register: Fläche ▸ Schaltfläche: Bild ▸ Schaltfläche: Hinzufügen / Importieren« und verwenden Sie Einstellungen im Bereich »Optionen«, um das Erscheinungsbild anzupassen." +msgstr "Um in Draw oder Impress Bilder und Fotos in Formen einzufügen, rechtsklicken Sie auf eine Form, wählen Sie »Fläche… ▸ Register: Fläche ▸ Schaltfläche: Bild ▸ Schaltfläche: Hinzufügen / Importieren…« und verwenden Sie Einstellungen im Bereich »Optionen«, um das Erscheinungsbild anzupassen." #. W6E2A #: cui/inc/tipoftheday.hrc:91 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Need to insert the date in a spreadsheet cell? Type %MOD1+; or Shift+%MOD1+; to insert the time." -msgstr "Um die aktuelle Zeit in eine Tabellenzelle in Calc einzufügen, verwenden Sie %MOD1+; oder Umschalt+%MOD1+;." +msgstr "Um in Calc das aktuelle Datum in eine Tabellenzelle einzufügen, verwenden Sie [%MOD1+,], für die aktuelle Uhrzeit [%MOD1+Umschalt+,]." #. vAFKt #: cui/inc/tipoftheday.hrc:92 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Insert your metadata in your document with Insert ▸ Fields ▸ More Fields… ▸ Document or DocInformation." -msgstr "Fügen Sie Ihre Metadaten mit »Einfügen ▸ Feldbefehl ▸ Weitere Feldbefehle… ▸ Register: Dokument« oder »Register: Dokumentinfo« in Ihr Writer-Dokument ein." +msgstr "Fügen Sie in Writer Ihre Metadaten mit »Einfügen ▸ Feldbefehl ▸ Weitere Feldbefehle… ▸ Register: Dokument« oder »Register: Dokumentinfo« ein." #. FHorg #: cui/inc/tipoftheday.hrc:93 @@ -2440,26 +2442,26 @@ #: cui/inc/tipoftheday.hrc:94 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use Shift+Space to select the current row and %MOD1+Space to select the current column." -msgstr "Verwenden Sie in Calc Umschalt+Leertaste zur Auswahl der aktuellen Zeile und %MOD1+Leertaste zur Auswahl der aktuellen Spalte." +msgstr "Verwenden Sie in Calc [Umschalt+Leertaste] zur Auswahl der aktuellen Zeile und [%MOD1+Leertaste] zur Auswahl der aktuellen Spalte." #. MFv5S #: cui/inc/tipoftheday.hrc:95 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "You can move an object to another layer by holding it until its edges flash, then drag it to the tab of the layer you want to move it to." -msgstr "Sie können ein Objekt in Draw auf eine andere Ebene verschieben, indem Sie es so lange angeklickt halten, bis die Kanten blinken. Ziehen Sie es dann auf die Registerkarte der Ebene, auf die Sie es verschieben möchten." +msgstr "Sie können in Draw ein Objekt auf eine andere Ebene verschieben, indem Sie es so lange angeklickt halten, bis die Kanten blinken. Ziehen Sie es dann auf die Registerkarte der Ebene, auf die Sie es verschieben möchten." #. 3NRDt #: cui/inc/tipoftheday.hrc:96 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Data ▸ Validity allows you to create drop-down lists where the user selects a value instead of typing." -msgstr "Um in Calc eine Dropdown-Liste zu erstellen, aus welcher der Benutzer einen Wert auswählen kann anstatt diesen einzugeben, wählen Sie »Daten ▸ Gültigkeit…«." +msgstr "Um in Calc Dropdown-Listen zu erstellen, in denen der Benutzer einen Wert auswählt, statt ihn einzugeben, wählen Sie »Daten ▸ Gültigkeit…«." #. uikxZ #. local help missing #: cui/inc/tipoftheday.hrc:97 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Hold down %MOD1 and turn the mouse wheel to change the zoom factor." -msgstr "Halten Sie die Taste %MOD1 gedrückt und rollen Sie mit dem Mausrad, um den Maßstab zu verändern." +msgstr "Halten Sie [%MOD1] gedrückt und rollen Sie mit dem Mausrad, um den Maßstab zu verändern." #. 7QLxF #: cui/inc/tipoftheday.hrc:98 @@ -2471,7 +2473,7 @@ #: cui/inc/tipoftheday.hrc:99 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to count words for just one particular paragraph style? Use Edit ▸ Find and Replace, click Paragraph Styles, select the style in Find, and click Find All. Read the result in the status bar." -msgstr "Um in Writer nur für eine bestimmte Absatzvorlage die Wörter zu ermitteln, wählen Sie »Bearbeiten ▸ Suchen und Ersetzen… ▸ Markierfeld: Absatzvorlagen«, wählen die gewünschte Vorlage im Bereich „Suchen“ aus und klicken auf die Schaltfläche »Alle suchen«. Lesen Sie nun die Zahl in der Statusleiste ab." +msgstr "Um in Writer nur für eine bestimmte Absatzvorlage die Wörter zu ermitteln, wählen Sie »Bearbeiten ▸ Suchen und ersetzen… ▸ Markierfeld: Absatzvorlagen«, wählen die gewünschte Vorlage im Bereich „Suchen“ aus und klicken auf die Schaltfläche »Alle suchen«. Lesen Sie nun das Ergebnis in der Statusleiste ab." #. VBCF7 #: cui/inc/tipoftheday.hrc:100 @@ -2489,7 +2491,7 @@ #: cui/inc/tipoftheday.hrc:104 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Construct your own 2D shapes in Draw. Select two or more objects, and explore possibilities with Shape ▸ Combine, Shape ▸ Merge, Shape ▸ Subtract, and Shape ▸ Intersect." -msgstr "Um Ihre eigenen 2D-Formen in Draw zu erstellen, wählen Sie zwei oder mehr Objekte aus und experimentieren Sie mit den Möglichkeiten, die Ihnen »Form ▸ Kombinieren«, »Form ▸ Verschmelzen«, »Form ▸ Subtrahieren« und »Form ▸ Schneiden« bieten." +msgstr "Um in Draw Ihre eigenen 2D-Formen zu erstellen, wählen Sie zwei oder mehr Objekte aus und experimentieren Sie mit den Möglichkeiten, die Ihnen »Form ▸ Kombinieren«, »Form ▸ Verschmelzen«, »Form ▸ Subtrahieren« und »Form ▸ Schneiden« bieten." #. f6Lan #: cui/inc/tipoftheday.hrc:105 @@ -2501,7 +2503,7 @@ #: cui/inc/tipoftheday.hrc:106 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "You can toggle between the field names and the actual value with View ▸ Fields Names (or %MOD1+F9)." -msgstr "Wählen Sie »Ansicht ▸ Feldnamen« (oder [%MOD1+F9]), um in Writer zwischen den Feldnamen und dem tatsächlichen Wert zu wechseln." +msgstr "Um in Writer zwischen den Feldnamen und dem tatsächlichen Wert zu wechseln, wählen Sie »Ansicht ▸ Feldnamen« (oder [%MOD1+F9])." #. 5ZVTy #: cui/inc/tipoftheday.hrc:107 @@ -2532,13 +2534,13 @@ #: cui/inc/tipoftheday.hrc:111 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Did you know that you can attach comments to portions of text? Just use the shortcut %MOD1+%MOD2+C." -msgstr "Sie können in Writer auch Textabschnitte mit Kommentaren versehen. Verwenden Sie dazu einfach die Tastenkombination »%MOD1+%MOD2+C«." +msgstr "Sie können in Writer auch Textabschnitte mit Kommentaren versehen. Verwenden Sie dazu einfach [%MOD1+%MOD2+C]." #. wZDsJ #: cui/inc/tipoftheday.hrc:112 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Need to move one or more paragraphs? No need to cut and paste: Use the keyboard shortcut %MOD1+%MOD2+Arrow (Up/Down)" -msgstr "Um einen oder mehrere Absätze in Writer ohne Ausschneiden und Einfügen zu verschieben, verwenden Sie %MOD1+%MOD2+Pfeil nach oben/unten." +msgstr "Um in Writer einen oder mehrere Absätze ohne Ausschneiden und Einfügen zu verschieben, verwenden Sie [%MOD1+%MOD2+Pfeil nach oben/unten]." #. JDGDc #: cui/inc/tipoftheday.hrc:113 @@ -2563,13 +2565,13 @@ #: cui/inc/tipoftheday.hrc:116 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Typing in bold, italics, or underlined in Writer you can continue with the default attributes using just the shortcut %MOD1+Shift+X (remove direct character formats)." -msgstr "Wenn Sie in Writer Text in fett, kursiv oder unterstrichen eingegeben haben, können Sie mit den Standardattributen fortfahren, indem Sie die Tastenkombination [%MOD1+Umschalt+X] verwenden (Direkte Zeichenformatierung entfernen)." +msgstr "Wenn Sie in Writer Text fett, kursiv oder unterstrichen eingegeben haben, können Sie mit den Standardattributen fortfahren, indem Sie [%MOD1+Umschalt+X] verwenden (Direkte Formatierung löschen)." #. iXjDF #: cui/inc/tipoftheday.hrc:117 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use %MOD1+%MOD2+Shift+V to paste the contents of the clipboard as unformatted text." -msgstr "Um den Inhalt der Zwischenablage als unformatierten Text in Writer einzufügen, verwenden Sie %MOD1+%MOD2+Umschalt+V." +msgstr "Um in Writer den Inhalt der Zwischenablage als unformatierten Text einzufügen, verwenden Sie [%MOD1+%MOD2+Umschalt+V]." #. TD8Ux #: cui/inc/tipoftheday.hrc:118 @@ -2581,7 +2583,7 @@ #: cui/inc/tipoftheday.hrc:119 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "With Slide Show ▸ Custom Slide Show, reorder and pick slides to fit a slideshow to the needs of your viewers." -msgstr "Um in Impress Folien neu anzuordnen oder welche auszuwählen, damit die Präsentation an die Bedürfnisse Ihrer Zuschauer angepasst wird, wählen Sie »Bildschirmpräsentation ▸ Individuelle Präsentation«." +msgstr "Sie können in Impress »Bildschirmpräsentation ▸ Individuelle Präsentation« wählen und Folien neu anordnen oder auswählen, um die Präsentation an die Bedürfnisse Ihrer Zuschauer anzupassen." #. ZZZZo #: cui/inc/tipoftheday.hrc:120 @@ -2623,19 +2625,19 @@ #: cui/inc/tipoftheday.hrc:126 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Right-click in the status bar in %PRODUCTNAME Calc and select “Selection count” to display the number of selected cells." -msgstr "Rechtsklicken Sie in die Statusleiste in %PRODUCTNAME Calc und wählen Sie »Anzahl Zellen«, um die Anzahl ausgewählter Zellen anzuzeigen." +msgstr "Rechtsklicken Sie in %PRODUCTNAME Calc in die Statusleiste und wählen Sie »Anzahl Zellen«, um die Anzahl ausgewählter Zellen anzuzeigen." #. h7afF #: cui/inc/tipoftheday.hrc:127 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to have two or more columns for just a part of a %PRODUCTNAME Writer page? Insert ▸ Section, set with Columns tab, and place text in that section." -msgstr "Um in %PRODUCTNAME Writer zwei oder mehr Spalten für lediglich einen Teil einer Seite festzulegen, wählen Sie »Einfügen ▸ Bereich… ▸ Register: Spalten« legen die Anzahl der Spalten fest und fügen Text in diesen Bereich ein." +msgstr "Um in %PRODUCTNAME Writer zwei oder mehr Spalten für lediglich einen Teil einer Seite festzulegen, wählen Sie »Einfügen ▸ Bereich… ▸ Register: Spalten«, legen die Anzahl der Spalten fest und fügen Text in diesen Bereich ein." #. DmbfV #: cui/inc/tipoftheday.hrc:128 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use Data ▸ Statistics for sampling, descriptive statistics, analysis of variance, correlation, and much more in %PRODUCTNAME Calc." -msgstr "Um Stichproben, beschreibende Statistiken, Varianzanalysen, Korrelationen und vieles mehr mit %PRODUCTNAME Calc zu verwenden, wählen Sie »Daten ▸ Statistiken«." +msgstr "Um in %PRODUCTNAME Calc Stichproben, beschreibende Statistiken, Varianzanalysen, Korrelationen und vieles mehr zu verwenden, wählen Sie »Daten ▸ Statistiken«." #. cVaQ3 #: cui/inc/tipoftheday.hrc:129 @@ -2653,13 +2655,13 @@ #: cui/inc/tipoftheday.hrc:131 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "In %PRODUCTNAME Impress, use Insert ▸ Media ▸ Photo Album to create a slideshow from a series of pictures with the “Photo Album” feature." -msgstr "Um eine Präsentation aus einer Reihe von Bildern mit der Funktion \"Fotoalbum\" zu erstellen, wählen Sie in %PRODUCTNAME Impress »Einfügen ▸ Medien ▸ Fotoalbum«." +msgstr "Um in %PRODUCTNAME Impress eine Präsentation aus einer Reihe von Bildern mit der Funktion \"Fotoalbum\" zu erstellen, wählen Sie »Einfügen ▸ Medien ▸ Fotoalbum«." #. BcK3A #: cui/inc/tipoftheday.hrc:132 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "You can show formulas instead of results with View ▸ Show Formula (or Tools ▸ Options ▸ %PRODUCTNAME Calc ▸ View ▸ Display ▸ Formulas)." -msgstr "Um Formeln anstelle von Ergebnissen in Calc anzuzeigen, wählen Sie »Ansicht ▸ Formel anzeigen« (oder »Extras ▸ Optionen… ▸ %PRODUCTNAME Calc ▸ Ansicht ▸ Bereich: Anzeige ▸ Markierfeld: Formeln«)." +msgstr "Um in Calc Formeln anstelle von Ergebnissen anzuzeigen, wählen Sie »Ansicht ▸ Formel anzeigen« (oder »Extras ▸ Optionen… ▸ %PRODUCTNAME Calc ▸ Ansicht ▸ Bereich: Anzeige ▸ Markierfeld: Formeln«)." #. bY8ve #: cui/inc/tipoftheday.hrc:133 @@ -2671,13 +2673,13 @@ #: cui/inc/tipoftheday.hrc:134 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Left-handed? Enable Tools ▸ Options ▸ Language Settings ▸ Languages ▸ Asian and check Tools ▸ Options ▸ %PRODUCTNAME Writer ▸ View ▸ Ruler ▸ Right-aligned, which displays the scrollbar to the left." -msgstr "Wenn Sie Linkshänder sind, wählen Sie »Extras ▸ Optionen… ▸ Spracheinstellungen ▸ Sprachen ▸ Markierfeld: Asiatisch« und bestätigen mit \"OK\". Anschließend wählen Sie »Extras ▸ Optionen… ▸ %PRODUCTNAME Writer ▸ Ansicht ▸ Lineal ▸ Markierfeld: Rechts ausgerichtet«, wodurch das Lineal in Writer rechts und die Bildlaufleiste links angezeigt wird." +msgstr "Als Linkshänder wählen Sie »Extras ▸ Optionen… ▸ Spracheinstellungen ▸ Sprachen ▸ Markierfeld: Asiatisch« und »Extras ▸ Optionen… ▸ %PRODUCTNAME Writer ▸ Ansicht ▸ Lineal ▸ Markierfelder: Vertikales Lineal und Rechts ausgerichtet«, um das Lineal in Writer rechts und die Bildlaufleiste links anzuzeigen." #. Bs9w9 #: cui/inc/tipoftheday.hrc:135 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want your chapter titles to always begin a page? Edit Heading1 (paragraph style) ▸ Text Flow ▸ Breaks and check Insert ▸ Page ▸ Before." -msgstr "Um Ihre Kapitelüberschriften in Writer immer mit einer neuen Seite zu beginnen, klicken Sie in den Formatvorlagen mit der rechten Maustaste auf die Absatzvorlage Überschrift 1 und wählen »Ändern… ▸ Register: Textfluss ▸ Abschnitt: Umbrüche ▸ Markierfeld: Einfügen ▸ Typ: Seite ▸ Position: Vor«." +msgstr "Um in Writer Kapitelüberschriften immer mit einer neuen Seite zu beginnen, klicken Sie in den Formatvorlagen mit der rechten Maustaste auf die Absatzvorlage Überschrift 1 und wählen »Ändern… ▸ Register: Textfluss ▸ Abschnitt: Umbrüche ▸ Markierfeld: Einfügen ▸ Typ: Seite ▸ Position: Vor«." #. UVRgV #: cui/inc/tipoftheday.hrc:136 @@ -2689,7 +2691,7 @@ #: cui/inc/tipoftheday.hrc:137 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Shift+%MOD1+Del deletes from cursor to the end of the current sentence." -msgstr "»Umschalt+%MOD1+Entf« löscht in Writer vom Cursor bis zum Ende des aktuellen Satzes." +msgstr "In Writer löscht [%MOD1+Umschalt+Entf] vom Cursor bis zum Ende des aktuellen Satzes." #. XDhNo #: cui/inc/tipoftheday.hrc:138 @@ -2701,7 +2703,7 @@ #: cui/inc/tipoftheday.hrc:139 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Annoyed by the “marching ants” around cells in Calc? Press escape to stop them; the copied content will remain available for pasting." -msgstr "Um die marschierenden Ameisen um Zellen in Calc zu stoppen, drücken Sie die Taste [Esc]. Der kopierte Inhalt bleibt zum Einfügen verfügbar." +msgstr "Um in Calc die „marschierenden Ameisen“ um Zellen zu stoppen, drücken Sie [Esc]. Der kopierte Inhalt bleibt zum Einfügen verfügbar." #. fsDVc #: cui/inc/tipoftheday.hrc:140 @@ -2731,13 +2733,13 @@ #: cui/inc/tipoftheday.hrc:144 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "You can use styles to make the tables in your document consistent. Choose one from the predefined per Styles (F11) or via Table ▸ AutoFormat Styles..." -msgstr "Um Tabellen in Ihrem Writer-Dokument einheitlich zu gestalten, können Sie Formatvorlagen verwenden. Wählen Sie eine der vordefinierten Formatvorlagen (F11) oder »Tabelle ▸ AutoFormat…«." +msgstr "Um in Writer Tabellen einheitlich zu gestalten, können Sie Formatvorlagen verwenden. Wählen Sie eine der vordefinierten Formatvorlagen ([F11]) oder »Tabelle ▸ AutoFormat…«." #. XBYtT #: cui/inc/tipoftheday.hrc:145 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to open hyperlinks without pressing the %MOD1 key? Uncheck “%MOD1+click required to open hyperlinks” in Tools ▸ Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ Security Options." -msgstr "Um Hyperlinks zu öffnen, ohne die [%MOD1] zu drücken, wählen Sie »Extras ▸ Optionen… ▸ %PRODUCTNAME ▸ Sicherheit«, klicken im Bereich „Sicherheitsoptionen und -warnungen“ auf die Schaltfläche »Optionen…« und entfernen das Häkchen bei „%MOD1 beim Klicken gedrückt halten, um Hyperlinks zu folgen“." +msgstr "Um Hyperlinks zu öffnen, ohne [%MOD1] zu drücken, wählen Sie »Extras ▸ Optionen… ▸ %PRODUCTNAME ▸ Sicherheit«, klicken im Bereich „Sicherheitsoptionen und -warnungen“ auf die Schaltfläche »Optionen…« und entfernen das Häkchen bei „%MOD1 beim Klicken gedrückt halten, um Hyperlinks zu folgen“." #. cCnpG #: cui/inc/tipoftheday.hrc:146 @@ -2768,19 +2770,19 @@ #: cui/inc/tipoftheday.hrc:150 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "To remove the page number from your table of contents go to Insert ▸ Table of Contents and Index (or right-click and Edit Index to edit a previously inserted index). In the Entries tab delete the page number (#) from Structure line." -msgstr "Um die Seitenzahl aus Ihrem Inhaltsverzeichnis zu entfernen, wählen Sie »Einfügen ▸ Verzeichnis ▸ Verzeichnis…« (oder klicken Sie mit der rechten Maustaste und wählen Sie »Verzeichnis bearbeiten«, um ein zuvor eingefügtes Verzeichnis zu bearbeiten). Löschen Sie im Register »Einträge« aus der Zeile »Struktur« den Eintrag Seitennummer (#)." +msgstr "Um die Seitenzahl aus Ihrem Inhaltsverzeichnis zu entfernen, wählen Sie »Einfügen ▸ Verzeichnis ▸ Verzeichnis…« (oder rechtsklicken und wählen Sie »Verzeichnis bearbeiten«, um ein zuvor eingefügtes Verzeichnis zu bearbeiten). Löschen Sie im Register »Einträge« in der Zeile »Struktur« den Eintrag Seitennummer (#)." #. JPu6C #: cui/inc/tipoftheday.hrc:151 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "With the Navigator you can select & move up/down headings and the text below the heading, in the Navigator and in the document." -msgstr "Im Navigator können Sie Überschriften und den zugehörigen Text im Writer-Dokument auswählen und verschieben." +msgstr "Mit dem Navigator können Sie in Writer Überschriften und den zugehörigen Text sowohl im Navigator als auch im Dokument auswählen und nach oben/unten verschieben." #. y8B2s #: cui/inc/tipoftheday.hrc:152 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to get a math object into Writer quickly? Type your formula, select it, and use Insert ▸ OLE Object ▸ Formula to convert the text." -msgstr "Um ein mathematisches Objekt schnell in Writer einzufügen, geben Sie Ihre Formel ein, markieren diese und wählen Sie »Einfügen ▸ OLE-Objekt ▸ Formel…«, um den Text zu konvertieren." +msgstr "Um in Writer ein mathematisches Objekt schnell einzufügen, geben Sie Ihre Formel ein, markieren diese und wählen »Einfügen ▸ OLE-Objekt ▸ Formel…«, um den Text zu konvertieren." #. Zj7NA #: cui/inc/tipoftheday.hrc:153 @@ -2804,7 +2806,7 @@ #: cui/inc/tipoftheday.hrc:156 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Your Writer document does not reopen with the text cursor at the same editing position it was when you saved it? Add First or Last name in Tools ▸ Options ▸ %PRODUCTNAME ▸ User Data ▸ First/last name." -msgstr "Um Ihr Writer-Dokument mit dem Textcursor an der gleichen Bearbeitungsposition zu öffnen, an der Sie es gespeichert haben, wählen Sie »Extras ▸ Optionen… ▸ %PRODUCTNAME ▸ Benutzerdaten« und überprüfen Sie, dass Vor-/Nachname nicht leer ist." +msgstr "Um Ihr Writer-Dokument mit dem Textcursor an der gleichen Bearbeitungsposition zu öffnen, an der Sie es gespeichert haben, wählen Sie »Extras ▸ Optionen… ▸ %PRODUCTNAME ▸ Benutzerdaten« und überprüfen Sie, dass Vor- oder Nachname nicht leer ist." #. udDRb #: cui/inc/tipoftheday.hrc:157 @@ -2853,7 +2855,7 @@ #: cui/inc/tipoftheday.hrc:164 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Define texts that you often use as AutoText. You will be able to insert them by their name, shortcut or toolbar in any Writer document." -msgstr "Legen Sie häufig verwendete Texte in Writer als AutoText fest. Fügen Sie diese anschließend mittels Namen, Tastenkombination oder Symbolleiste in jedes Writer-Dokument ein." +msgstr "Legen Sie in Writer häufig verwendete Texte als AutoText fest. Fügen Sie diese anschließend mittels Namen, Tastenkombination oder Symbolleiste in jedes Writer-Dokument ein." #. 7CjmG #. https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/autotext.html @@ -2891,20 +2893,20 @@ #: cui/inc/tipoftheday.hrc:170 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to manage the presentation of hyperlinks in a spreadsheet? Insert them with the HYPERLINK function." -msgstr "Um die Darstellung von Hyperlinks in Calc zu verwalten, fügen Sie diese mittels »Einfügen ▸ Hyperlink…« ein." +msgstr "Um in Calc die Darstellung von Hyperlinks zu verwalten, fügen Sie diese mittels »Einfügen ▸ Hyperlink…« ein." #. qyyJ4 #. local help missing #: cui/inc/tipoftheday.hrc:171 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Uncheck Tools ▸ Options ▸ %PRODUCTNAME Calc ▸ View ▸ Zoom: “Synchronize sheets” so that each sheet in Calc has its own zoom factor." -msgstr "Damit jede Tabelle in Calc ihren eigenen Maßstab hat, deaktivieren Sie das Markierfeld „Tabellen synchronisieren“ unter »Extras ▸ Optionen… ▸ %PRODUCTNAME Calc ▸ Ansicht ▸ Maßstab«." +msgstr "Damit in Calc jede Tabelle ihren eigenen Maßstab hat, deaktivieren Sie das Markierfeld „Tabellen synchronisieren“ unter »Extras ▸ Optionen… ▸ %PRODUCTNAME Calc ▸ Ansicht ▸ Maßstab«." #. qK7Xz #: cui/inc/tipoftheday.hrc:172 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "You can set a color for each tab: right-click the tab or use Sheet ▸ Sheet Tab Color." -msgstr "Sie können für jedes Tabellenregister in Calc eine Farbe festlegen: Klicken Sie mit der rechten Maustaste auf das Tabellenregister oder wählen Sie »Tabelle ▸ Registerfarbe…«." +msgstr "Sie können in Calc für jedes Tabellenregister eine Farbe festlegen: Klicken Sie mit der rechten Maustaste auf das Tabellenregister und dann auf »Registerfarbe…« oder wählen Sie »Tabelle ▸ Registerfarbe…«." #. YGUAo #: cui/inc/tipoftheday.hrc:173 @@ -2917,7 +2919,7 @@ #: cui/inc/tipoftheday.hrc:174 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Insert and number your formulas in one step: type fn then F3. An AutoText is inserted with formula and number aligned in a table." -msgstr "Um Formeln in Writer zu nummerieren, geben Sie fn ein und drücken dann F3. Ein Autotext wird eingefügt, wobei Formel und Nummer in einer Tabelle ausgerichtet sind." +msgstr "Um Formeln in Writer zu nummerieren, geben Sie fn ein und drücken dann [F3]. Ein AutoText wird eingefügt, wobei Formel und Nummer in einer Tabelle ausgerichtet sind." #. 8rA8u #: cui/inc/tipoftheday.hrc:175 @@ -2943,20 +2945,20 @@ #: cui/inc/tipoftheday.hrc:178 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Your numbers are displayed as ### in your spreadsheet? The column is too narrow to display all digits." -msgstr "Wenn Ihre Zahlen in Ihrer Calc-Tabelle als ### angezeigt werden, ist die Spalte zu schmal, um alle Ziffern anzuzeigen." +msgstr "Wenn in Calc Ihre Zahlen als ### angezeigt werden, ist die Spalte zu schmal, um alle Ziffern anzuzeigen." #. vanqG #: cui/inc/tipoftheday.hrc:179 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Enable massive parallel calculations of formula cells via Tools ▸ Options ▸ %PRODUCTNAME ▸ OpenCL." -msgstr "Um massive parallele Berechnungen von Formelzellen in Calc zu ermöglichen, wählen Sie »Extras ▸ Optionen… ▸ %PRODUCTNAME ▸ OpenCL« und aktivieren das Markierfeld „Das Verwenden von OpenCL zulassen“." +msgstr "Um in Calc massive parallele Berechnungen von Formelzellen zu ermöglichen, wählen Sie »Extras ▸ Optionen… ▸ %PRODUCTNAME ▸ OpenCL« und aktivieren das Markierfeld „Verwendung von OpenCL zulassen“." #. zAqfX #. https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/opencl.html #: cui/inc/tipoftheday.hrc:180 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use the Connector tool from the Drawing toolbar in Draw/Impress to create nice flow charts and optionally copy/paste the object into Writer." -msgstr "Um Flussdiagramme zu erstellen, verwenden Sie in Draw/Impress die Verbinder in der Symbolleiste Zeichnung und kopieren das fertige Objekt in Writer." +msgstr "Um in Calc/Impress Flussdiagramme zu erstellen, verwenden Sie die Verbinder in der Symbolleiste Zeichnung und kopieren das fertige Objekt in Writer." #. Uq3tZ #: cui/inc/tipoftheday.hrc:181 @@ -2975,19 +2977,19 @@ #: cui/inc/tipoftheday.hrc:183 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "To select a contiguous range of cells containing data and bounded by empty row and columns use %MOD1+* (numeric key pad)." -msgstr "Verwenden Sie in Calc %MOD1+Stern (*) (auf dem Ziffernblock), um einen zusammenhängenden Bereich von Zellen auszuwählen, die Daten enthalten und durch leere Zeilen und Spalten begrenzt sind." +msgstr "Verwenden Sie in Calc [%MOD1+* (Stern auf dem Ziffernblock)], um einen zusammenhängenden Bereich von Zellen auszuwählen, die Daten enthalten und durch leere Zeilen und Spalten begrenzt sind." #. CHFPV #: cui/inc/tipoftheday.hrc:184 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Your date acceptance pattern is inappropriate? Use Tools ▸ Options ▸ Language Settings ▸ Languages ▸ Date acceptance patterns to tweak the pattern." -msgstr "Um das Datumserkennungsmuster anzupassen, wählen Sie »Extras ▸ Optionen… ▸ Spracheinstellungen ▸ Sprachen« und ergänzen „Datumserkenungsmuster“, um die Muster zu optimieren." +msgstr "Um das Datumserkennungsmuster anzupassen, wählen Sie »Extras ▸ Optionen… ▸ Spracheinstellungen ▸ Sprachen« und ergänzen „Datumserkennungsmuster“, um die Muster zu optimieren." #. MZyXB #: cui/inc/tipoftheday.hrc:185 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to export formulas to CSV? File ▸ Save As ▸ Type:Text CSV, check “Edit filter settings”, and check “Save cell formulas” in the next dialog." -msgstr "Um Formeln aus Calc in CSV zu exportieren, wählen Sie »Datei ▸ Speichern unter… ▸ Typ: Text CSV«, aktivieren Sie \"Filtereinstellungen bearbeiten\" und aktivieren Sie im nächsten Dialog \"Formeln anstatt berechneter Werte speichern\"." +msgstr "Um Formeln aus Calc in CSV zu exportieren, wählen Sie »Datei ▸ Speichern unter… ▸ Dateityp: CSV (*.csv)«, aktivieren Sie \"Filtereinstellungen bearbeiten\" und aktivieren Sie im übernächsten Dialog \"Formeln anstatt berechneter Werte speichern\"." #. XLN9z #: cui/inc/tipoftheday.hrc:186 @@ -3012,7 +3014,7 @@ #: cui/inc/tipoftheday.hrc:189 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to select a large range of cells without scrolling? Type the range reference (e.g. A1:A1000) in the name box then Enter." -msgstr "Um in Calc einen großen Zellenbereich auszuwählen, ohne einen Bildlauf durchzuführen, geben Sie die Bereichsreferenz (beispielsweise A1:A1000) in das Namensfeld ein und drücken die Eingabetaste." +msgstr "Um in Calc einen großen Zellenbereich auszuwählen, ohne einen Bildlauf durchzuführen, geben Sie die Bereichsreferenz (beispielsweise A1:A1000) in das Namensfeld ein und drücken die [Eingabetaste]." #. Tc7Nf #: cui/inc/tipoftheday.hrc:190 @@ -3049,7 +3051,7 @@ #: cui/inc/tipoftheday.hrc:195 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Move a column in Calc between two others in one step? Click the header then a cell in the column, keep mouse button and move to the target with %MOD2 key." -msgstr "Um eine Spalte in Calc in einem Schritt zwischen zwei andere zu verschieben, klicken Sie auf die Überschrift und halten Sie die Taste [%MOD2] gedrückt, während sie auf eine Zelle in der Spalte klicken und diese an das Ziel ziehen." +msgstr "Um in Calc eine Spalte in einem Schritt zwischen zwei andere zu verschieben, klicken Sie auf die Überschrift und halten [%MOD2] gedrückt, während sie auf eine Zelle in der Spalte klicken und diese an das Ziel ziehen." #. 3xJeA #: cui/inc/tipoftheday.hrc:196 @@ -3062,13 +3064,13 @@ #: cui/inc/tipoftheday.hrc:197 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use Format ▸ Align Objects in Impress or Shape ▸ Align Objects in Draw (or the context menu) for precise positioning of objects: it centers on the page if one object is selected or works on the group respectively." -msgstr "Um Objekte genau zu positionieren, wählen Sie in Impress »Format ▸ Objekte ausrichten« oder in Draw »Form ▸ Objekte ausrichten« (oder das Kontextmenü): Wenn ein Objekt ausgewählt ist, wird es auf der Seite zentriert, sonst entsprechend die Gruppe." +msgstr "Um in Impress Objekte genau zu positionieren, wählen Sie »Format ▸ Objekte ausrichten« oder in Draw »Form ▸ Objekte ausrichten« (oder das Kontextmenü): Wenn ein Objekt ausgewählt ist, wird es auf der Seite zentriert, sonst entsprechend die Gruppe." #. TijVG #: cui/inc/tipoftheday.hrc:198 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Do not use tabs to space items on a Writer document. Depending on what you are trying to do, a borderless table can be a better choice." -msgstr "Um Elemente in einem Writer-Dokument anzuordnen, kann, je nach dem, was Sie erreichen möchten, eine rahmenlose Tabelle die bessere Wahl gegenüber der Verwendung von Tabulatoren sein." +msgstr "Um in Writer Elemente zu trennen, kann eine rahmenlose Tabelle die bessere Wahl gegenüber der Verwendung von Tabulatoren sein." #. 6GtGH #: cui/inc/tipoftheday.hrc:199 @@ -3080,7 +3082,7 @@ #: cui/inc/tipoftheday.hrc:200 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "%PRODUCTNAME can automatically add a numbered caption when you insert objects. See Tools ▸ Options ▸ %PRODUCTNAME Writer ▸ AutoCaption." -msgstr "Um %PRODUCTNAME beim Einfügen von Objekten in Writer automatisch eine nummerierte Beschriftung hinzufügen zu lassen, wählen Sie »Extras ▸ Optionen… ▸ %PRODUCTNAME Writer ▸ Automatische Beschriftung«." +msgstr "Um in %PRODUCTNAME Writer beim Einfügen von Objekten automatisch eine nummerierte Beschriftung hinzuzufügen, wählen Sie »Extras ▸ Optionen… ▸ %PRODUCTNAME Writer ▸ Automatische Beschriftung«." #. 8kpGG #. https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01041100.html @@ -3094,7 +3096,7 @@ #: cui/inc/tipoftheday.hrc:202 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Keep column headers of a sheet visible when scrolling lines via View ▸ Freeze Cells ▸ Freeze First Row." -msgstr "Um die Spaltenüberschriften einer Calc-Tabelle beim rollen durch Zeilen sichtbar zu behalten, wählen Sie »Ansicht ▸ Zellen fixieren ▸ Erste Zeile fixieren«." +msgstr "Die Spaltenüberschriften einer Calc-Tabelle bleiben beim Rollen durch Zeilen sichtbar, wenn Sie »Ansicht ▸ Zellen fixieren ▸ Erste Zeile fixieren« wählen." #. mCfdK #: cui/inc/tipoftheday.hrc:203 @@ -3106,7 +3108,7 @@ #: cui/inc/tipoftheday.hrc:204 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Apply Heading paragraph styles in Writer with shortcut keys: %MOD1+1 applies Heading 1, %MOD1+2 applies Heading 2, etc." -msgstr "Wenden Sie in Writer Absatzvorlagen für Überschriften an, indem Sie %MOD1+1 für Überschrift 1, %MOD1+2 für Überschrift 2 und so weiter drücken." +msgstr "Wenden Sie in Writer Absatzvorlagen für Überschriften an, indem Sie [%MOD1+1] für Überschrift 1, [%MOD1+2] für Überschrift 2 und so weiter drücken." #. DA82R #: cui/inc/tipoftheday.hrc:205 @@ -3118,7 +3120,7 @@ #: cui/inc/tipoftheday.hrc:206 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Edit ▸ Find and Replace lets you insert special characters directly: right click in input fields or press Shift+%MOD1+S." -msgstr "Um im Dialog unter »Bearbeiten ▸ Suchen und Ersetzen…« Sonderzeichen direkt einzufügen, klicken Sie mit rechts in das Eingabefeld oder drücken Sie [Umschalt+%MOD1+S]." +msgstr "Um im Dialog unter »Bearbeiten ▸ Suchen und ersetzen…« Sonderzeichen direkt einzufügen, klicken Sie mit rechts in das Eingabefeld oder drücken Sie [Umschalt+%MOD1+S]." #. vNBR3 #: cui/inc/tipoftheday.hrc:207 @@ -3130,7 +3132,7 @@ #: cui/inc/tipoftheday.hrc:208 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to see, but not print, an object in Draw? Draw it on a layer for which the “Printable” flag is not set (right-click the layer’s tab and choose “Modify Layer”)." -msgstr "Um ein Objekt in Draw zu sehen, aber nicht zu drucken, zeichnen Sie es auf einer Ebene, für welche die Eigenschaft „Druckbar“ nicht gesetzt ist (klicken Sie mit der rechten Maustaste auf das Register der Ebene und wählen Sie »Ebene ändern…«)." +msgstr "Um in Draw ein Objekt zu sehen, aber nicht zu drucken, zeichnen Sie es auf einer Ebene, für welche die Eigenschaft „Druckbar“ nicht gesetzt ist (klicken Sie mit der rechten Maustaste auf das Register der Ebene und wählen Sie »Ebene ändern…«)." #. CGQaY #: cui/inc/tipoftheday.hrc:209 @@ -3142,13 +3144,13 @@ #: cui/inc/tipoftheday.hrc:210 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Got many images in your Writer document? Speed up the display by disabling View ▸ Images and charts." -msgstr "Um die Anzeige in Ihrem Writer-Dokument bei vielen Bildern zu beschleunigen, deaktivieren Sie »Ansicht ▸ Bilder und Diagramme«." +msgstr "Um in Writer die Anzeige bei vielen Bildern zu beschleunigen, deaktivieren Sie »Ansicht ▸ Bilder und Diagramme«." #. Y85ij #: cui/inc/tipoftheday.hrc:211 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use Sheet ▸ Fill Cells ▸ Random Number to generate a random series based on various distributions." -msgstr "Um eine zufällige, auf verschiedenen Verteilungen basierende Reihe in Calc zu erstellen, wählen Sie »Tabelle ▸ Zellen ausfüllen ▸ Zufallszahlen…«." +msgstr "Um in Calc eine zufällige, auf verschiedenen Verteilungen basierende Reihe zu erstellen, wählen Sie »Tabelle ▸ Zellen ausfüllen ▸ Zufallszahlen…«." #. Y24mZ #. https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/02140700.html @@ -3161,7 +3163,7 @@ #: cui/inc/tipoftheday.hrc:213 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Chapter numbering dialog lets you set text to be displayed before the chapter number. For example, type “Chapter ” to display “Chapter 1”" -msgstr "Um festzulegen, dass Text vor der Kapitelnummer in Writer angezeigt wird, wählen Sie »Extras ▸ Kapitelnummerierung… ▸ Register: Nummerierung« und geben Sie beispielsweise \"Kapitel\" im Feld „Davor“ ein, um „Kapitel 1“ anzuzeigen." +msgstr "Um in Writer festzulegen, dass Text vor der Kapitelnummer angezeigt wird, wählen Sie »Extras ▸ Kapitelnummerierung… ▸ Register: Nummerierung« und geben beispielsweise \"Kapitel\" im Feld „Davor“ ein, um „Kapitel 1“ anzuzeigen." #. z3rPd #: cui/inc/tipoftheday.hrc:214 @@ -3173,7 +3175,7 @@ #: cui/inc/tipoftheday.hrc:215 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "To get the “Vertical Text” tool in the Drawing toolbar, check Tools ▸ Options ▸ Language Settings ▸ Languages ▸ Default languages for Documents ▸ Asian (and make the button visible with right-click and then Visible Buttons ▸ Vertical Text)." -msgstr "Um das Werkzeug „Vertikaler Text“ in der Symbolleiste Zeichnen zu erhalten, wählen Sie »Extras ▸ Optionen… ▸ Spracheinstellungen ▸ Sprachen ▸ Standardsprachen für Dokumente ▸ Asiatisch« (und machen Sie die Schaltfläche sichtbar, indem Sie mit der rechten Maustaste klicken und dann auf »Sichtbare Schaltflächen ▸ Vertikaler Text« klicken)." +msgstr "Um das Werkzeug „Vertikaler Text“ in der Symbolleiste Zeichnen zu erhalten, wählen Sie »Extras ▸ Optionen… ▸ Spracheinstellungen ▸ Sprachen ▸ Standardsprachen für Dokumente ▸ Asiatisch« (und machen die Schaltfläche mit Rechtsklick und dann »Sichtbare Schaltflächen ▸ Vertikaler Text« sichtbar)." #. mmG7g #: cui/inc/tipoftheday.hrc:216 @@ -3185,7 +3187,7 @@ #: cui/inc/tipoftheday.hrc:217 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "You can sign existing PDF files and also verify those signatures." -msgstr "Es lassen sich bestehende PDF-Dateien signieren und deren Signaturen überprüfen." +msgstr "Sie können vorhandene PDF-Dateien signieren und diese Signaturen auch überprüfen." #. hDiRV #. local help missing @@ -3198,7 +3200,7 @@ #: cui/inc/tipoftheday.hrc:219 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Use Format ▸ Conditional Formatting ▸ Manage in Calc to find out which cells have been defined with conditional formatting." -msgstr "Um herauszufinden, für welche Zellen in Calc bedingte Formatierungen definiert sind, wählen Sie »Format ▸ Bedingte Formatierung ▸ Verwalten…«." +msgstr "Um in Calc herauszufinden, für welche Zellen bedingte Formatierungen definiert sind, wählen Sie »Format ▸ Bedingte Formatierung ▸ Verwalten…«." #. tWQPD #. https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/05120000.html @@ -3248,7 +3250,7 @@ #: cui/inc/tipoftheday.hrc:227 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "To copy a comment without losing the content of the target cell you should use Paste Special and uncheck everything except “Comments” in dialog. Use Operations “Add” to not override existing content." -msgstr "Um in Calc nur einen Kommentar zu kopieren ohne den Inhalt des Ziels zu verlieren, verwenden Sie den Befehl Inhalte einfügen, demarkieren im Dialog alles bis auf \"Kommentare\" und verwenden die Rechenoperation \"Addieren\"." +msgstr "Um in Calc nur einen Kommentar zu kopieren, ohne den Inhalt des Ziels zu verlieren, verwenden Sie den Befehl Inhalte einfügen, demarkieren im Dialog alles bis auf \"Kommentare\" und verwenden die Rechenoperation \"Addieren\"." #. rexFB #: cui/inc/tipoftheday.hrc:228 @@ -3260,25 +3262,25 @@ #: cui/inc/tipoftheday.hrc:229 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "When editing a cell in place, you can right click and Insert fields: Date, Sheet name, Document title, etc." -msgstr "Sie können, wenn Sie gerade eine Zelle in Calc bearbeiten, Feldbefehle wie Datum, Tabellenname, Dokumenttitel und so weiter einfügen, indem Sie mit der rechten Maustaste klicken und Feldbefehl wählen." +msgstr "In Calc können Sie, wenn Sie gerade eine Zelle bearbeiten, Feldbefehle wie Datum, Tabellenname, Dokumenttitel und so weiter einfügen, indem Sie mit der rechten Maustaste klicken und Feldbefehl wählen." #. qAVmk #: cui/inc/tipoftheday.hrc:230 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Need to move a Writer table? Table ▸ Select ▸ Table and Insert ▸ Frame ▸ Frame and move where you want." -msgstr "Um die Seitenzahl aus Ihrem Inhaltsverzeichnis in Writer zu entfernen, wählen Sie »Einfügen ▸ Verzeichnis ▸ Verzeichnis…« (oder klicken mit der rechten Maustaste und bearbeiten das zuvor eingefügte Verzeichnis). Löschen Sie auf der Registerkarte „Einträge“ die Seitenzahl (#) aus der Zeile Struktur." +msgstr "Um in Writer die Seitenzahl aus Ihrem Inhaltsverzeichnis zu entfernen, wählen Sie »Einfügen ▸ Verzeichnis ▸ Verzeichnis…« (oder klicken mit der rechten Maustaste und bearbeiten das zuvor eingefügte Verzeichnis). Löschen Sie auf der Registerkarte „Einträge“ die Seitenzahl (#) aus der Zeile Struktur." #. TmaSP #: cui/inc/tipoftheday.hrc:231 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "With Tools ▸ AutoText ▸ AutoText ▸ Import you can select a Word document or a template containing the AutoText entries that you want to import." -msgstr "Um Autotexteinträge aus einem Word-Dokument oder eine Vorlage zu importieren, wählen Sie »Extras ▸ AutoText… ▸ Schaltfläche: AutoText ▸ Importieren…«." +msgstr "Um Autotexteinträge aus einem Word-Dokument oder einer Vorlage zu importieren, wählen Sie »Extras ▸ AutoText… ▸ Schaltfläche: AutoText ▸ Importieren…«." #. kwxqQ #: cui/inc/tipoftheday.hrc:232 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Do not insert manual breaks to separate two paragraphs. Rather change Indents & Spacing ▸ Spacing ▸ Below paragraph at the style/paragraph properties." -msgstr "Anstatt in Writer Leerzeilen einzufügen, um zwei Absätze zu trennen, wählen Sie besser »Format ▸ Absatz… ▸ Register: Einzüge und Abstände ▸ Bereich: Abstand ▸ Eigenschaft: Unter Absatz« und ändern Sie dort den Wert ab oder passen Sie an gleicher Stelle die Absatzvorlage an." +msgstr "Anstatt in Writer Leerzeilen einzufügen, um zwei Absätze zu trennen, wählen Sie besser »Format ▸ Absatz… ▸ Register: Einzüge und Abstände ▸ Bereich: Abstand ▸ Eigenschaft: Unter Absatz« und ändern dort den Wert ab oder passen an gleicher Stelle die Absatzvorlage an." #. rxTGc #: cui/inc/tipoftheday.hrc:233 @@ -3302,7 +3304,7 @@ #: cui/inc/tipoftheday.hrc:236 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Add background images to spreadsheets via Insert ▸ Image or drag a background from the Gallery, then Format ▸ Arrange ▸ To Background." -msgstr "Um ein Hintergrundbild zu einer Calc-Tabelle hinzuzufügen, wählen Sie »Einfügen ▸ Bild…« oder ziehen Sie es aus der Gallery in die Tabelle, wählen Sie dann »Format ▸ Anordnung ▸ Im Hintergrund«." +msgstr "Um ein Hintergrundbild zu einer Calc-Tabelle hinzuzufügen, wählen Sie »Einfügen ▸ Bild…« oder ziehen Sie es aus der Gallery in die Tabelle und wählen dann »Format ▸ Anordnung ▸ Im Hintergrund«." #. khFDu #: cui/inc/tipoftheday.hrc:237 @@ -3339,7 +3341,7 @@ #: cui/inc/tipoftheday.hrc:242 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to center cells on a printed page in Calc? Format ▸ Page, Page ▸ Layout settings ▸ Table alignment." -msgstr "Um Zellen auf einer gedruckten Seite in Calc zu zentrieren, wählen Sie »Format ▸ Seitenvorlage… ▸ Register: Seite ▸ Bereich: Layout-Einstellungen ▸ Markierfelder: Tabellenausrichtung«." +msgstr "Um in Calc Zellen auf einer gedruckten Seite zu zentrieren, wählen Sie »Format ▸ Seitenvorlage… ▸ Register: Seite ▸ Bereich: Layout-Einstellungen ▸ Markierfelder: Tabellenausrichtung«." #. dpyeU #: cui/inc/tipoftheday.hrc:243 @@ -3382,14 +3384,14 @@ #: cui/inc/tipoftheday.hrc:249 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to find the words in bold in a Writer document? Edit ▸ Find and Replace ▸ Other options ▸ Attributes ▸ Font weight." -msgstr "Um fett geschriebene Wörter in einem Writer-Dokument zu finden, wählen Sie »Bearbeiten ▸ Suchen und Ersetzen… ▸ Weitere Optionen… ▸ Attribute… ▸ Schriftstärke«." +msgstr "Um in Writer fett geschriebene Wörter zu finden, wählen Sie »Bearbeiten ▸ Suchen und ersetzen… ▸ Weitere Optionen… ▸ Attribute… ▸ Schriftstärke«." #. ppAeT #. local help missing #: cui/inc/tipoftheday.hrc:250 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "You can sort paragraphs or table rows alphabetically or numerically per Tools ▸ Sort." -msgstr "Mittels »Extras ▸ Sortieren…« lassen sich Absätze oder Tabellenzeilen in Writer alphabetisch oder numerisch sortieren." +msgstr "In Writer lassen sich Absätze oder Tabellenzeilen mit »Extras ▸ Sortieren…« alphabetisch oder numerisch sortieren." #. 26HAu #. https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/06100000.html @@ -3408,7 +3410,7 @@ #: cui/inc/tipoftheday.hrc:253 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Calculate loan repayments with Calc: eg. PMT(2%/12;36;2500) interest rate per payment period 2%/12, 36 months, loan amount 2500." -msgstr "Berechnen Sie Darlehnsrückzahlungen mit Calc, beispielsweise =RMZ(2%/12;36;2500) für einen Zinssatz pro Periode von 2%/12, 36 Perioden und einen Darlehnsbetrag von 2500." +msgstr "Mit Calc berechnen Sie Darlehnsrückzahlungen, beispielsweise =RMZ(2%/12;36;2500) für einen Zinssatz pro Periode von 2%/12, 36 Perioden und einen Darlehnsbetrag von 2500." #. QZAFw #. local help missing @@ -3428,7 +3430,7 @@ #: cui/inc/tipoftheday.hrc:256 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "To change the number of a page in Writer, go to the properties of the first paragraph and at the Text Flow tab check Break ▸ Insert and enter the number." -msgstr "Um die Seitennummer in Writer zu ändern, klicken Sie in den ersten Absatz der Seite und wählen »Format ▸ Absatz… ▸ Register: Textfluss ▸ Abschnitt: Umbrüche ▸ Markierfeld: Einfügen« und geben Sie die Nummer ein." +msgstr "Um in Writer die Seitennummer zu ändern, klicken Sie in den ersten Absatz der Seite und wählen »Format ▸ Absatz… ▸ Register: Textfluss ▸ Abschnitt: Umbrüche ▸ Markierfeld: Einfügen« und geben Sie die Nummer ein." #. AgQyA #: cui/inc/tipoftheday.hrc:257 @@ -3440,7 +3442,7 @@ #: cui/inc/tipoftheday.hrc:258 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Strange error code in Calc, Err: followed by a number? This page gives the explanation:" -msgstr "Wenn Sie einen merkwürdigen Fehlercode in Calc sehen, Fehler: gefolgt von einer Zahl, gibt folgende Seite die Erklärung:" +msgstr "Wenn Sie in Calc einen merkwürdigen Fehlercode sehen, Fehler: gefolgt von einer Zahl, gibt folgende Seite die Erklärung:" #. BJ5aN #. local help missing @@ -3460,7 +3462,7 @@ #: cui/inc/tipoftheday.hrc:261 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Unable to modify or delete a custom cell style? Check all sheets, none should be protected." -msgstr "Falls Sie eine benutzerdefinierte Zellvorlage in Calc nicht löschen können, überprüfen Sie alle Tabellen, dass keine geschützt ist." +msgstr "Falls Sie in Calc eine benutzerdefinierte Zellvorlage nicht löschen können, überprüfen Sie alle Tabellen, keine sollte geschützt sein." #. 55Nfb #: cui/inc/tipoftheday.hrc:262 @@ -3473,7 +3475,7 @@ #: cui/inc/tipoftheday.hrc:263 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want to know if a cell is referred in formulas of other cells? Tools ▸ Detective ▸ Trace Dependents (Shift+F5)." -msgstr "Um herauszufinden, ob auf eine Zelle in Calc ein Bezug in Formeln anderer Zellen besteht, wählen Sie »Extras ▸ Detektiv ▸ Spur zum Nachfolger« [Umschalt+F5]." +msgstr "Um in Calc herauszufinden, ob auf eine Zelle ein Bezug in Formeln anderer Zellen besteht, wählen Sie »Extras ▸ Detektiv ▸ Spur zum Nachfolger« [Umschalt+F5]." #. QeBjt #: cui/inc/tipoftheday.hrc:264 @@ -3503,19 +3505,19 @@ #: cui/inc/tipoftheday.hrc:268 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "%PRODUCTNAME helps you not to enter two or more spaces in Writer. Check Tools ▸ AutoCorrect ▸ AutoCorrect Options ▸ Options ▸ Ignore double spaces." -msgstr "%PRODUCTNAME hilft Ihnen dabei, in Writer zwei oder mehr aufeinanderfolgende Leerzeichen zu vermeiden. Wählen Sie »Extras ▸ AutoKorrektur ▸ Autokorrektur-Optionen… ▸ Register: Optionen ▸ Markierfeld: Doppelte Leerzeichen ignorieren«." +msgstr "In %PRODUCTNAME Writer können Sie zwei oder mehr aufeinanderfolgende Leerzeichen vermeiden. Wählen Sie »Extras ▸ AutoKorrektur ▸ Autokorrektur-Optionen… ▸ Register: Optionen ▸ Markierfeld: Doppelte Leerzeichen ignorieren«." #. 3Fjtd #: cui/inc/tipoftheday.hrc:269 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Want the cursor to go into the cell to the right, after entering a value in Calc? Use the Tab key instead of Enter." -msgstr "Um den Cursor nach Eingabe eines Wertes in Calc in die Zelle rechts springen zu lassen, verwenden Sie die Tabulatortaste anstelle der Eingabetaste." +msgstr "Um in Calc den Cursor nach Eingabe eines Wertes in die Zelle rechts daneben springen zu lassen, verwenden Sie die Tabulatortaste anstelle der Eingabetaste." #. 5Cvhv #: cui/inc/tipoftheday.hrc:270 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "To display the scrollbar to the left, enable Tools ▸ Options ▸ Language Settings ▸ Languages ▸ Complex text and right click a sheet in Sheet tabs above Status bar ▸ Right-To-Left." -msgstr "Um die Bildlaufleiste auf der linken Seite anzuzeigen, aktivieren Sie »Extras ▸ Optionen… ▸ Spracheinstellungen ▸ Sprachen ▸ Komplexer Text«, klicken Sie mit der rechten Maustaste auf ein Register in den Tabellenregistern über der Statusleiste und wählen »Von rechts nach links« aus." +msgstr "Um die Bildlaufleiste auf der linken Seite anzuzeigen, aktivieren Sie »Extras ▸ Optionen… ▸ Spracheinstellungen ▸ Sprachen ▸ Komplexer Text«, klicken mit der rechten Maustaste auf ein Register in den Tabellenregistern über der Statusleiste und wählen »Von rechts nach links« aus." #. gqs9W #: cui/inc/tipoftheday.hrc:271 @@ -3606,7 +3608,7 @@ #: cui/inc/toolbarmode.hrc:23 msgctxt "RID_CUI_TOOLBARMODES" msgid "Standard user interface with menu, toolbar, and collapsed sidebar. Intended for users who are familiar with the classic interface." -msgstr "Die Benutzeroberfläche \"Standard\" mit Menü, Symbolleiste und eingeklappter Seitenleiste. Vorgesehen für Benutzer, die mit der klassischen Oberfläche vertraut sind." +msgstr "Die standardmäßige Benutzeroberfläche \"Symbolleisten\" mit Menüleiste, Symbolleisten und eingeklappter Seitenleiste. Vorgesehen für Benutzer, die mit der klassischen Oberfläche vertraut sind." #. BoVy3 #: cui/inc/toolbarmode.hrc:24 @@ -3618,43 +3620,43 @@ #: cui/inc/toolbarmode.hrc:25 msgctxt "RID_CUI_TOOLBARMODES" msgid "Standard user interface but with single-line toolbar. Intended for use on small screens." -msgstr "Die Benutzeroberfläche \"Kompakt\" ist ähnlich wie \"Standard\", kommt jedoch mit einer einzelnen Symbolleiste aus. Vorgesehen ist sie für die Verwendung auf kleinen Bildschirmen." +msgstr "Die Benutzeroberfläche \"Symbolleisten kompakt\" ist ähnlich wie \"Symbolleisten\", kommt jedoch mit einer einzelnen Symbolleiste aus. Sie ist für die Verwendung auf kleinen Bildschirmen vorgesehen." #. wKg2Q #: cui/inc/toolbarmode.hrc:26 msgctxt "RID_CUI_TOOLBARMODES" msgid "Standard user interface with expanded sidebar. Expert users who want to quickly change many different properties are advised to use this UI." -msgstr "Benutzeroberfläche Standard mit erweiterter Seitenleiste. Geeignet für erfahrene Benutzer, die schnell viele verschiedene Eigenschaften ändern möchten." +msgstr "Wie die Benutzeroberfläche \"Symbolleisten\" mit erweiterter Seitenleiste. Geeignet für erfahrene Benutzer, die schnell viele verschiedene Eigenschaften ändern möchten." #. qXq4A #: cui/inc/toolbarmode.hrc:27 msgctxt "RID_CUI_TOOLBARMODES" msgid "The Tabbed Compact variant aims to be familiar with the Microsoft Office interface, yet occupying less space for smaller screens." -msgstr "Die Variante \"In Registern kompakt\" orientiert sich an der Microsoft Office-Oberfläche, nimmt aber weniger Platz für kleinere Bildschirme ein." +msgstr "Die Benutzeroberfläche \"In Registern kompakt\" orientiert sich an der Microsoft Office-Oberfläche, nimmt aber weniger Platz für kleinere Bildschirme ein." #. oZV6K #: cui/inc/toolbarmode.hrc:28 msgctxt "RID_CUI_TOOLBARMODES" msgid "The Groupedbar interface provides access to functions in groups, with icons for most-frequently used features, and dropdown menus for others. This full variant favors functions and is slightly larger than others." -msgstr "Die Oberfläche \"Gruppiert\" bietet Zugriff auf Funktionen in Gruppen, mit Symbolen für die am häufigsten verwendeten Funktionen und Dropdown-Menüs für andere. Diese Vollvariante begünstigt Funktionen und ist etwas größer als andere." +msgstr "Die Benutzeroberfläche \"Gruppiert\" bietet Zugriff auf Funktionen in Gruppen, mit Symbolen für die am häufigsten verwendeten Funktionen und Dropdown-Menüs für andere. Diese Vollvariante begünstigt Funktionen und ist etwas größer als andere." #. acQKG #: cui/inc/toolbarmode.hrc:29 msgctxt "RID_CUI_TOOLBARMODES" msgid "The Groupedbar interface provides access to functions in groups, with icons for most-frequently used features, and dropdown menus for others. This compact variant favors vertical space." -msgstr "Die Oberfläche \"Gruppiert\" bietet Zugriff auf Funktionen in Gruppen, mit Symbolen für die am häufigsten verwendeten Funktionen und Dropdown-Menüs für andere. Diese kompakte Variante bevorzugt den vertikalen Raum." +msgstr "Die Benutzeroberfläche \"Gruppiert kompakt\" bietet Zugriff auf Funktionen in Gruppen, mit Symbolen für die am häufigsten verwendeten Funktionen und Dropdown-Menüs für andere. Diese kompakte Variante bevorzugt den vertikalen Raum." #. eGMCZ #: cui/inc/toolbarmode.hrc:30 msgctxt "RID_CUI_TOOLBARMODES" msgid "The Contextual Single interface shows functions in a single-line toolbar with context-dependent content." -msgstr "Die Oberfläche \"Kontextabhängig kompakt\" zeigt Funktionen in einer einzeiligen Symbolleiste mit kontextabhängigem Inhalt an." +msgstr "Die Benutzeroberfläche \"Kontextabhängig kompakt\" zeigt Funktionen in einer einzeiligen Symbolleiste mit kontextabhängigem Inhalt an." #. KFPmR #: cui/inc/toolbarmode.hrc:31 msgctxt "RID_CUI_TOOLBARMODES" msgid "The Contextual Groups interface focuses on beginners. It exposes the most frequently used functions on groups with the core action as large icon and a couple of small additional features. All functions have a label. Depending on the context, an additional section provides access to those functions." -msgstr "Die Oberfläche \"Kontextabhängig gruppiert\" richtet sich an Einsteiger. Sie stellt die am häufigsten verwendeten Funktionen für Gruppen mit der Kernaktion als großes Symbol und ein paar kleinen Zusatzfunktionen dar. Alle Funktionen haben eine Beschriftung. Je nach Kontext bietet ein zusätzlicher Abschnitt Zugriff auf diese Funktionen." +msgstr "Die Benutzeroberfläche \"Kontextabhängig gruppiert\" richtet sich an Einsteiger. Sie stellt die am häufigsten verwendeten Funktionen für Gruppen mit der Kernaktion als großes Symbol und ein paar kleinen Zusatzfunktionen dar. Alle Funktionen haben eine Beschriftung. Je nach Kontext bietet ein zusätzlicher Abschnitt Zugriff auf diese Funktionen." #. Xnz8J #: cui/inc/treeopt.hrc:34 @@ -5819,7 +5821,7 @@ #: cui/uiconfig/ui/bulletandposition.ui:89 msgctxt "bulletandposition|DrawPRTLDialog" msgid "Bullets and Numbering" -msgstr "Nummerierung und Aufzählung" +msgstr "Aufzählungszeichen und Nummerierung" #. aatWZ #: cui/uiconfig/ui/bulletandposition.ui:220 @@ -5867,7 +5869,7 @@ #: cui/uiconfig/ui/bulletandposition.ui:340 msgctxt "bulletandposition|bullet" msgid "Select..." -msgstr "Auswahl…" +msgstr "Auswählen…" #. sNFJM #: cui/uiconfig/ui/bulletandposition.ui:346 @@ -6677,7 +6679,7 @@ #: cui/uiconfig/ui/charnamepage.ui:334 msgctxt "charnamepage|Tab_Western" msgid "Western" -msgstr "Western" +msgstr "Westlich" #. q4WZB #: cui/uiconfig/ui/charnamepage.ui:380 @@ -8379,7 +8381,7 @@ #: cui/uiconfig/ui/editdictionarydialog.ui:185 msgctxt "replace" msgid "This input field is only available if you are editing an exception dictionary or a language-dependent custom dictionary. In exception dictionaries, the field shows the alternative suggestion for the current word in the \"Word\" text box. In language-dependent custom dictionaries, the field contains a known root word, as a model of affixation of the new word or its usage in compound words. For example, in a German custom dictionary, the new word “Litschi” (lychee) with the model word “Gummi” (gum) will result recognition of “Litschis” (lychees), “Litschibaum” (lychee tree), “Litschifrucht” (lychee fruit) etc." -msgstr "Dieses Eingabefeld ist nur verfügbar, wenn Sie ein Ausnahmenwörterbuch oder ein sprachabhängiges benutzerdefiniertes Wörterbuch bearbeiten. In Ausnahmenwörterbüchern zeigt das Feld den alternativen Vorschlag für das aktuelle Wort im Textfeld \"Wort\". In sprachabhängigen benutzerdefinierten Wörterbüchern enthält das Feld ein bekanntes Stammwort als Modell für die Anbringung des neuen Wortes oder dessen Verwendung in zusammengesetzten Wörtern. Beispielsweise führt in einem deutschen benutzerdefinierten Wörterbuch das neue Wort „Litschi“ mit dem Modellwort „Gummi“ zur Erkennung von „Litschis“, „Litschibaum“, „Litschifrucht“ und so weiter." +msgstr "Dieses Eingabefeld ist nur verfügbar, wenn Sie ein Ausnahmewörterbuch oder ein sprachabhängiges benutzerdefiniertes Wörterbuch bearbeiten. In Ausnahmewörterbüchern zeigt das Feld den alternativen Vorschlag für das aktuelle Wort im Textfeld \"Wort\". In sprachabhängigen benutzerdefinierten Wörterbüchern enthält das Feld ein bekanntes Stammwort als Modell für die Anbringung des neuen Wortes oder dessen Verwendung in zusammengesetzten Wörtern. Beispielsweise führt in einem deutschen benutzerdefinierten Wörterbuch das neue Wort „Litschi“ mit dem Modellwort „Gummi“ zur Erkennung von „Litschis“, „Litschibaum“, „Litschifrucht“ und so weiter." #. 5EwBs #: cui/uiconfig/ui/editdictionarydialog.ui:203 @@ -8427,7 +8429,7 @@ #: cui/uiconfig/ui/editdictionarydialog.ui:415 msgctxt "EditDictionaryDialog" msgid "In the Edit Custom Dictionary dialog you have the option to enter new terms or edit existing entries." -msgstr "Im Dialog „Benutzerdefiniertes Wörterbuch bearbeiten“ haben Sie die Möglichkeit, neue Begriffe einzugeben oder vorhandene Einträge zu bearbeiten." +msgstr "Im Dialog „Benutzerwörterbuch bearbeiten“ haben Sie die Möglichkeit, neue Begriffe einzugeben oder vorhandene Einträge zu bearbeiten." #. XEUyG #: cui/uiconfig/ui/editmodulesdialog.ui:34 @@ -8439,7 +8441,7 @@ #: cui/uiconfig/ui/editmodulesdialog.ui:109 msgctxt "editmodulesdialog|moredictslink" msgid "Get more dictionaries online..." -msgstr "Hier erhalten Sie online weitere Wörterbücher…" +msgstr "Hier erhalten Sie online weitere Wörterbücher" #. ibDJj #: cui/uiconfig/ui/editmodulesdialog.ui:131 @@ -10480,7 +10482,7 @@ #: cui/uiconfig/ui/hatchpage.ui:328 msgctxt "hatchpage|backgroundcolor" msgid "Background Color" -msgstr "Hintergrundfarbe" +msgstr "Hintergrundfarbe:" #. uvmDA #: cui/uiconfig/ui/hatchpage.ui:372 @@ -15138,7 +15140,7 @@ #: cui/uiconfig/ui/opthtmlpage.ui:508 msgctxt "extended_tip|starbasic" msgid "Check this box to include the BASIC instructions when exporting to HTML format." -msgstr "Aktivieren Sie dieses Markierfeld, um die Basic-Anweisungen beim Exportieren in das HTML-Format zu berücksichtigen." +msgstr "Aktivieren Sie dieses Markierfeld, um die BASIC-Anweisungen beim Exportieren in das HTML-Format zu berücksichtigen." #. sEnBN #: cui/uiconfig/ui/opthtmlpage.ui:523 @@ -15672,7 +15674,7 @@ #: cui/uiconfig/ui/optlingupage.ui:344 msgctxt "lingudictsedit" msgid "Opens the Edit custom dictionary dialog, in which you can add to your custom dictionary or edit existing entries." -msgstr "Öffnet den Dialog „Benutzerdefiniertes Wörterbuch bearbeiten“, in dem Sie Ihrem benutzerdefinierten Wörterbuch Einträge hinzufügen oder vorhandene Einträge bearbeiten können." +msgstr "Öffnet den Dialog „Benutzerwörterbuch bearbeiten“, in dem Sie Ihrem benutzerdefinierten Wörterbuch Einträge hinzufügen oder vorhandene Einträge bearbeiten können." #. WCFD5 #: cui/uiconfig/ui/optlingupage.ui:356 @@ -15720,7 +15722,7 @@ #: cui/uiconfig/ui/optlingupage.ui:536 msgctxt "optlingupage|moredictslink" msgid "Get more dictionaries online..." -msgstr "Hier erhalten Sie online weitere Wörterbücher…" +msgstr "Hier erhalten Sie online weitere Wörterbücher" #. gardH #: cui/uiconfig/ui/optlingupage.ui:577 @@ -15954,7 +15956,7 @@ #: cui/uiconfig/ui/optopenclpage.ui:24 msgctxt "optopenclpage|useopencl" msgid "Allow use of OpenCL" -msgstr "Das Verwenden von OpenCL zulassen" +msgstr "Verwendung von OpenCL zulassen" #. MAc4P #: cui/uiconfig/ui/optopenclpage.ui:41 @@ -16200,7 +16202,7 @@ #: cui/uiconfig/ui/optsavepage.ui:111 msgctxt "optsavepage|autosave" msgid "Save _AutoRecovery information every:" -msgstr "S_peichern von Autowiederherstellungsinfos alle:" +msgstr "A_utowiederherstellungs-Informationen speichern alle:" #. a9xDP #: cui/uiconfig/ui/optsavepage.ui:119 @@ -16236,7 +16238,7 @@ #: cui/uiconfig/ui/optsavepage.ui:184 msgctxt "optsavepage|relative_fsys" msgid "Save URLs relative to file system" -msgstr "URLs relativ zum Dateisystem speichern" +msgstr "_URLs relativ zum Dateisystem speichern" #. jDKxF #: cui/uiconfig/ui/optsavepage.ui:192 @@ -16260,7 +16262,7 @@ #: cui/uiconfig/ui/optsavepage.ui:222 msgctxt "optsavepage|relative_inet" msgid "Save URLs relative to internet" -msgstr "URLs relativ zum Internet speichern" +msgstr "UR_Ls relativ zum Internet speichern" #. WYrQB #: cui/uiconfig/ui/optsavepage.ui:230 @@ -16290,7 +16292,7 @@ #: cui/uiconfig/ui/optsavepage.ui:293 msgctxt "optsavepage|warnalienformat" msgid "Warn when not saving in ODF or default format" -msgstr "Immer warnen, wenn nicht im ODF- oder Standardformat gespeichert wird" +msgstr "I_mmer warnen, wenn nicht im ODF- oder Standardformat gespeichert wird" #. zGBEu #: cui/uiconfig/ui/optsavepage.ui:301 @@ -16351,7 +16353,7 @@ #: cui/uiconfig/ui/optsavepage.ui:374 msgctxt "optsavepage|label5" msgid "ODF format version:" -msgstr "ODF-Formatversion:" +msgstr "O_DF-Formatversion:" #. bF5dA #: cui/uiconfig/ui/optsavepage.ui:388 @@ -17425,7 +17427,7 @@ #: cui/uiconfig/ui/optviewpage.ui:738 msgctxt "optviewpage|btn_rungptest" msgid "Run Graphics Tests" -msgstr "Grafiktests ausführen" +msgstr "Grafiktests ausführen…" #. 872fQ #: cui/uiconfig/ui/pageformatpage.ui:41 @@ -17931,7 +17933,7 @@ #: cui/uiconfig/ui/paraindentspacing.ui:397 msgctxt "paraindentspacing|labelFT_LINEDIST" msgid "of" -msgstr "von" +msgstr "von:" #. Bga6L #: cui/uiconfig/ui/paraindentspacing.ui:460 diff -Nru libreoffice-7.4.1~rc2/translations/source/de/desktop/messages.po libreoffice-7.4.2~rc3/translations/source/de/desktop/messages.po --- libreoffice-7.4.1~rc2/translations/source/de/desktop/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/desktop/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-05-25 12:36+0200\n" -"PO-Revision-Date: 2022-07-12 03:39+0000\n" -"Last-Translator: Mister Update \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-03 15:40+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -116,7 +116,7 @@ #: desktop/inc/strings.hrc:43 msgctxt "RID_STR_CANNOT_DETERMINE_LIBNAME" msgid "The library name could not be determined." -msgstr "Bibliotheks-Name konnte nicht ermittelt werden." +msgstr "Bibliotheksname konnte nicht ermittelt werden." #. G6SqW #: desktop/inc/strings.hrc:45 @@ -995,7 +995,7 @@ #: desktop/uiconfig/ui/extensionmanager.ui:359 msgctxt "extensionmanager|getextensions" msgid "Get more extensions online..." -msgstr "Laden Sie weitere Extensions aus dem Internet herunter…" +msgstr "Laden Sie weitere Extensions aus dem Internet herunter" #. FBvRd #: desktop/uiconfig/ui/extensionmanager.ui:367 diff -Nru libreoffice-7.4.1~rc2/translations/source/de/extensions/messages.po libreoffice-7.4.2~rc3/translations/source/de/extensions/messages.po --- libreoffice-7.4.1~rc2/translations/source/de/extensions/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/extensions/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-05-25 12:36+0200\n" -"PO-Revision-Date: 2022-07-04 16:15+0000\n" +"PO-Revision-Date: 2022-10-03 15:40+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1363,7 +1363,7 @@ #: extensions/inc/strings.hrc:118 msgctxt "RID_STR_STRINGITEMLIST" msgid "List entries" -msgstr "Listen-Einträge" +msgstr "Listeneinträge" #. FNaAE #: extensions/inc/strings.hrc:119 diff -Nru libreoffice-7.4.1~rc2/translations/source/de/filter/messages.po libreoffice-7.4.2~rc3/translations/source/de/filter/messages.po --- libreoffice-7.4.1~rc2/translations/source/de/filter/messages.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/filter/messages.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,8 +4,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-06-15 22:28+0200\n" -"PO-Revision-Date: 2022-07-26 09:17+0000\n" -"Last-Translator: Mister Update \n" +"PO-Revision-Date: 2022-09-21 09:47+0000\n" +"Last-Translator: Annabelle Wübbelsmann \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -616,7 +616,7 @@ #: filter/uiconfig/ui/pdfgeneralpage.ui:581 msgctxt "pdfgeneralpage|extended_tip|allowdups" msgid "Allows you to use the same field name for multiple fields in the generated PDF file. If disabled, field names will be exported using generated unique names." -msgstr "Erlaubt den Gebrauch des selben Feldname für mehrere Felder in der generierten PDF-Datei. Falls deaktiviert, werden Feldnamen mit generierten eindeutigen Namen exportiert." +msgstr "Erlaubt den Gebrauch desselben Feldnamen für mehrere Felder in der generierten PDF-Datei. Falls deaktiviert, werden Feldnamen mit generierten eindeutigen Namen exportiert." #. tkPCH #: filter/uiconfig/ui/pdfgeneralpage.ui:597 diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/auxiliary.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/auxiliary.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/auxiliary.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/auxiliary.po 2022-10-10 10:15:01.000000000 +0000 @@ -3,17 +3,17 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2021-11-25 19:33+0100\n" -"PO-Revision-Date: 2021-12-13 06:38+0000\n" -"Last-Translator: Ettore Atalan \n" -"Language-Team: German \n" +"POT-Creation-Date: 2022-09-21 11:43+0200\n" +"PO-Revision-Date: 2022-10-05 08:58+0000\n" +"Last-Translator: Annabelle Wübbelsmann \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.8.1\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1562560629.000000\n" #. fEEXD @@ -313,11 +313,11 @@ msgid "Writing Calc Macros" msgstr "Calc-Makros schreiben" -#. Q59GN +#. vBXqp #: scalc.tree msgctxt "" "scalc.tree\n" -"0815\n" +"0816\n" "node.text" msgid "Miscellaneous" msgstr "Verschiedenes" @@ -482,7 +482,7 @@ "01\n" "help_section.text" msgid "%PRODUCTNAME Installation" -msgstr "%PRODUCTNAME Installation" +msgstr "%PRODUCTNAME-Installation" #. 3EUAC #: shared.tree @@ -518,7 +518,7 @@ "1004\n" "node.text" msgid "%PRODUCTNAME Options" -msgstr "%PRODUCTNAME Optionen" +msgstr "%PRODUCTNAME-Optionen" #. d4gAD #: shared.tree diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sbasic/guide.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sbasic/guide.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sbasic/guide.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sbasic/guide.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-09-09 14:35+0000\n" +"PO-Revision-Date: 2022-10-04 12:14+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -59,7 +59,7 @@ "par_idA2B004\n" "help.text" msgid "Access2Base is a %PRODUCTNAME BASIC library of macros for (business or personal) application developers and advanced users. It is one of the libraries stored in \"Application macros and dialogs\"." -msgstr "" +msgstr "Access2Base ist eine %PRODUCTNAME-Basic-Bibliothek mit Makros für (geschäftliche oder private) Anwendungsentwickler und fortgeschrittene Benutzer. Sie ist eine der Bibliotheken, die in \"Anwendungsmakros und -dialoge\" gespeichert sind." #. CE5QB #: access2base.xhp @@ -68,7 +68,7 @@ "par_idA2B005\n" "help.text" msgid "The functionalities provided by the implemented macros are all directly inspired by Microsoft Access. The macros are callable mainly from a %PRODUCTNAME Base application, but also from any %PRODUCTNAME document (Writer, Calc, ...) where access to data stored in a database makes sense." -msgstr "" +msgstr "Die Funktionen der implementierten Makros sind alle direkt von Microsoft Access inspiriert. Die Makros können überwiegend direkt aus %PRODUCTNAME-Base heraus aufgerufen werden, aber auch von jedem %PRODUCTNAME-Dokument (Writer, Calc, …), aus dem heraus ein Zugriff auf eine Datenbank Sinn macht." #. tmNkV #: access2base.xhp @@ -878,7 +878,7 @@ "par_id261630541889040\n" "help.text" msgid "The Python code presented above uses the ScriptForge library that is available since %PRODUCTNAME 7.2." -msgstr "Der oben vorgestellte Python-Code verwendet die Bibliothek ScriptForge, welche seit %PRODUCTNAME 7.2 verfügbar ist." +msgstr "Der oben vorgestellte Python-Code verwendet die Bibliothek ScriptForge, die seit %PRODUCTNAME 7.2 verfügbar ist." #. FfECT #: calc_borders.xhp @@ -1013,7 +1013,7 @@ "par_id11630542436346\n" "help.text" msgid "Range objects have a property named TableBorder2 that can be used to format range borders as it is done in the Format - Cells - Borders dialog in the Line Arrangement section." -msgstr "Bereichsobjekte haben eine Eigenschaft namens TableBorder2, welche zum Formatieren der Bereichsumrandungen verwendet werden kann, genauso wie Sie sie im Dialog Format – Zellen… – Register: Umrandungen im Bereich Linienanordnung formatieren können." +msgstr "Bereichsobjekte haben eine Eigenschaft namens TableBorder2, die zum Formatieren der Bereichsumrandungen verwendet werden kann, genauso wie Sie sie im Dialog Format – Zellen… – Register: Umrandungen im Bereich Linienanordnung formatieren können." #. A25aA #: calc_borders.xhp @@ -1355,7 +1355,7 @@ "hd_id411633215666257\n" "help.text" msgid "Values, Strings and Formulas" -msgstr "Werte, Zeichenfolgen und Formulare" +msgstr "Werte, Zeichenfolgen und Formeln" #. MBHDg #: read_write_values.xhp @@ -1472,7 +1472,7 @@ "par_id291633264880172\n" "help.text" msgid "In Basic, instead of using the getByName method, use Sheets(sheetIndex) as shown next:" -msgstr "Verwenden Sie in Basic anstelle der Methode getByName die Methode Sheets(sheetIndex) wie unten gezeigt:" +msgstr "In Basic verwenden Sie anstelle der Methode getByName die Methode Sheets(sheetIndex), wie unten gezeigt:" #. svDuj #: read_write_values.xhp @@ -1652,7 +1652,7 @@ "par_id3153032\n" "help.text" msgid "LoadDialog function is stored in Tools.ModuleControls available from Application Macros and Dialogs." -msgstr "" +msgstr "Die Funktion LoadDialog ist in Tools.ModuleControls gespeichert, welche unter Anwendungsmakros und -dialoge verfügbar ist." #. kBLFU #: sample_code.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sbasic/python.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sbasic/python.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sbasic/python.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sbasic/python.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-04-11 15:28+0200\n" -"PO-Revision-Date: 2022-07-15 17:18+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -518,7 +518,7 @@ "par_id461630582396782\n" "help.text" msgid "Control the processing of document save, document copy, print or mailmerge requests." -msgstr "" +msgstr "Steuern Sie die Verarbeitung von Dokumentenspeicher-, Dokumentkopier-, Druck- oder Seriendruckanforderungen." #. xrRHB #: python_document_events.xhp @@ -563,7 +563,7 @@ "N0530\n" "help.text" msgid "Monitoring is illustrated herewith for Basic and Python languages using object-oriented programming. Assigning OnLoad script, to the Open Document event, suffices to initiate and terminate document event monitoring. Tools - Customize menu Events tab is used to assign either scripts." -msgstr "" +msgstr "Die Überwachung wird für Basic- und Python-Sprachen unter Verwendung objektorientierter Programmierung veranschaulicht. Das Zuweisen des Skripts OnLoad zum Ereignis Open Document reicht aus, um die Dokumentereignis-Überwachung zu beginnen und zu beenden. Wählen Sie Extras – Anpassen… Register: Ereignisse, um Skripte zuzuweisen." #. KgWvt #: python_document_events.xhp @@ -608,7 +608,7 @@ "N0534\n" "help.text" msgid "OnLoad and OnUnload events can be used to respectively set and unset Python programs path. They are described as Open document and Document closed." -msgstr "" +msgstr "Die Ereignisse OnLoad und OnUnload können verwendet werden, um den Python-Programmpfad festzulegen beziehungsweise aufzuheben. Sie werden als Dokument öffnen und Dokument geschlossen bezeichnet." #. i7waD #: python_document_events.xhp @@ -779,7 +779,7 @@ "N0602\n" "help.text" msgid "listener = UiDocument() # Initiates listening" -msgstr "" +msgstr "listener = UiDocument() # Beginnt die Überwachung" #. CkJg4 #: python_document_events.xhp @@ -851,7 +851,7 @@ "N0638\n" "help.text" msgid "''' Grab application-based Basic script '''" -msgstr "" +msgstr "''' Anwendungsbasiertes Basic-Skript abrufen '''" #. 2dfeg #: python_document_events.xhp @@ -869,7 +869,7 @@ "N0648\n" "help.text" msgid "Start application and Close application events can respectively be used to set and to unset Python path for user scripts or %PRODUCTNAME scripts. In a similar fashion, document based Python libraries or modules can be loaded and released using Open document and Document closed events. Refer to Importing Python Modules for more information." -msgstr "" +msgstr "Mit den Ereignissen Anwendung starten und Anwendung schließen können Sie den Python-Pfad für Benutzerskripte oder %PRODUCTNAME-Skripte festlegen und deaktivieren. In ähnlicher Weise können dokumentbasierte Python-Bibliotheken oder -Module mit den Ereignissen Dokument öffnen und Dokument geschlossen geladen und freigegeben werden. Weitere Informationen finden Sie unter Importieren von Python-Modulen." #. 8pHCg #: python_document_events.xhp @@ -896,7 +896,7 @@ "N0650\n" "help.text" msgid "Using Tools - Customize menu Events tab, the Open document event fires a ConsoleLogger initialisation. _documentEventOccured routine - set by ConsoleLogger - serves as a unique entry point to trap all document events." -msgstr "" +msgstr "Bei der Verwendung des Menüs Extras – Anpassen… – Register: Ereignisse startet das Ereignis Dokument öffnen die Initialisierung von ConsoleLogger. Die Routine _documentEventOccured – festgelegt von ConsoleLogger – dient als eindeutiger Einstiegspunkt, um alle Dokumentereignisse abzufangen." #. gGpkW #: python_document_events.xhp @@ -905,7 +905,7 @@ "hd_id421630510141729\n" "help.text" msgid "controller.Events module" -msgstr "" +msgstr "Modul controller.Events" #. rJX92 #: python_document_events.xhp @@ -914,7 +914,7 @@ "bas_id431630567378062\n" "help.text" msgid "Global _obj As Object ' controller.ConsoleLogger instance" -msgstr "" +msgstr "Global _obj As Object ' Instanz controller.ConsoleLogger" #. PfRq6 #: python_document_events.xhp @@ -932,7 +932,7 @@ "bas_id371630509596674\n" "help.text" msgid "''' ConsoleLogger unique entry point '''" -msgstr "" +msgstr "''' Eindeutiger Einstiegspunkt für ConsoleLogger '''" #. upGWH #: python_document_events.xhp @@ -941,7 +941,7 @@ "hd_id721630511986813\n" "help.text" msgid "controller.ConsoleLogger class module" -msgstr "" +msgstr "Klassenmodul controller.ConsoleLogger" #. AN8tn #: python_document_events.xhp @@ -950,7 +950,7 @@ "par_id901630509435225\n" "help.text" msgid "Events monitoring starts from the moment a ConsoleLogger object is instantiated and ultimately stops upon document closure. StartAdapter routine loads necessary Basic libraries, while caught events are reported using Access2Base.Trace module." -msgstr "" +msgstr "Die Überwachung von Ereignissen beginnt in dem Moment, in dem ein Objekt ConsoleLogger erzeugt wird, und endet schließlich mit dem Schließen des Dokuments. Die Routine StartAdapter lädt die benötigten Basic-Bibliotheken, während abgefangene Ereignisse mithilfe des Moduls Access2Base.Trace angezeigt werden." #. 2jXHB #: python_document_events.xhp @@ -968,7 +968,7 @@ "N0666\n" "help.text" msgid "Private Const UI_NOPROMPT = False ' Set it to True to visualise documents events" -msgstr "" +msgstr "Private Const UI_NOPROMPT = False ' Legen Sie es auf \"True\" fest, um Dokumentereignisse anzuzeigen" #. EQG8C #: python_document_events.xhp @@ -986,7 +986,7 @@ "bas_id131630510956418\n" "help.text" msgid "Private _txtMsg As String ' text message to log in console" -msgstr "" +msgstr "Private _txtMsg As String ' Textnachricht zum Aufzeichnen in der Konsole" #. JaEhY #: python_document_events.xhp @@ -995,7 +995,7 @@ "N0677\n" "help.text" msgid "' PROPERTIES" -msgstr "" +msgstr "' EIGENSCHAFTEN" #. aGuEg #: python_document_events.xhp @@ -1040,7 +1040,7 @@ "N0705\n" "help.text" msgid "Access2Base.Trace.TraceLog(\"INFO\", _txtMsg & \"Document events are being logged\", UI_PROMPT)" -msgstr "" +msgstr "Access2Base.Trace.TraceLog(\"INFO\", _txtMsg & \"Dokumentereignisse werden aufgezeichnet\", UI_PROMPT)" #. NkHa4 #: python_document_events.xhp @@ -1058,7 +1058,7 @@ "N0717\n" "help.text" msgid "Access2Base.Trace.TraceLog(\"INFO\", _txtMsg & \"Document events have been logged\", UI_PROMPT)" -msgstr "" +msgstr "Access2Base.Trace.TraceLog(\"INFO\", _txtMsg & \"Dokumentereignisse wurden aufgezeichnet\", UI_PROMPT)" #. GAD2E #: python_document_events.xhp @@ -1067,7 +1067,7 @@ "N0719\n" "help.text" msgid "Access2Base.Trace.TraceConsole() ' Captured events dialog" -msgstr "" +msgstr "Access2Base.Trace.TraceConsole() ' Dialog für aufgezeichnete Ereignisse" #. X8Kdh #: python_document_events.xhp @@ -1076,7 +1076,7 @@ "N0722\n" "help.text" msgid "' EVENTS" -msgstr "" +msgstr "' EREIGNISSE" #. uVpJf #: python_document_events.xhp @@ -2174,7 +2174,7 @@ "par_id481636114810038\n" "help.text" msgid "%PRODUCTNAME macros are grouped in module files, modules are usually grouped in library folders, and libraries are grouped in library containers although containers can contain modules too." -msgstr "" +msgstr "%PRODUCTNAME-Makros werden in Moduldateien gruppiert, Module werden normalerweise in Bibliotheksordnern gruppiert, und Bibliotheken werden in Bibliothekscontainern gruppiert, die sowohl Container als auch Module enthalten können." #. wGWz9 #: python_locations.xhp @@ -2183,7 +2183,7 @@ "par_id771543358231022\n" "help.text" msgid "A library is used as a major grouping for either an entire category of macros, or for an entire application. Modules usually split functionality, such as user interaction and calculations. Individual macros are subroutines and functions. The Figure below shows an example of the hierarchical structure of macro libraries in %PRODUCTNAME." -msgstr "" +msgstr "Eine Bibliothek wird als Hauptgruppierung für eine ganze Kategorie von Makros oder für eine gesamte Anwendung verwendet. Module teilen in der Regel die Funktionen wie Benutzerinteraktion und Berechnungen auf. Einzelne Makros sind Unterroutinen und Funktionen. Die folgende Abbildung zeigt ein Beispiel für die hierarchische Struktur von Makrobibliotheken in %PRODUCTNAME." #. b8iEG #: python_locations.xhp @@ -2192,7 +2192,7 @@ "par_id771636279690940\n" "help.text" msgid "Library Container diagram" -msgstr "" +msgstr "Abbildung Makrobibliotheken" #. JqG95 #: python_locations.xhp @@ -2201,7 +2201,7 @@ "par_id171636114787810\n" "help.text" msgid "Figure: Macro Library hierarchy" -msgstr "" +msgstr "Abbildung: Hierarchie von Makrobibliotheken" #. dbwvM #: python_locations.xhp @@ -2210,7 +2210,7 @@ "par_id801636114790638\n" "help.text" msgid "The containers are accessible in all %PRODUCTNAME programs through the user interface. Go to Tools > Macros > Organize Macros > Python, to open the Python Macros dialog." -msgstr "" +msgstr "Die Container sind alle über die %PRODUCTNAME-Benutzeroberfläche erreichbar. Wählen Sie dazu Extras – Makros – Makros verwalten – Python…, um den Dialog Python-Makros zu öffnen." #. FU5EC #: python_locations.xhp @@ -2219,7 +2219,7 @@ "par_id801636114808666\n" "help.text" msgid "Three library containers are shown in the Macro From list:" -msgstr "" +msgstr "In der Liste Makros werden drei Bibliothekscontainer angezeigt:" #. RnBRr #: python_locations.xhp @@ -2228,7 +2228,7 @@ "par_id321636114854594\n" "help.text" msgid "My Macros: personal macros available for the %PRODUCTNAME user" -msgstr "" +msgstr "Meine Makros: Persönliche Makros, die für den %PRODUCTNAME-Benutzer verfügbar sind" #. bDXrr #: python_locations.xhp @@ -2246,7 +2246,7 @@ "par_id191636114858218\n" "help.text" msgid "Document macros: every document can contain macro libraries available in that document for all users" -msgstr "" +msgstr "Dokument-Makros: Jedes Dokument kann Makrobibliotheken enthalten, die in diesem Dokument für alle Benutzer verfügbar sind" #. iEtmS #: python_locations.xhp @@ -2390,7 +2390,7 @@ "par_id181544209916707\n" "help.text" msgid "Python macros can be organized in libraries, modules and macros. Use the Macro Library hierarchy as a guide when creating or installing new macros in module files, new module files in library folders or new library folders in containers." -msgstr "" +msgstr "Python-Makros können in Bibliotheken, Modulen und Makros organisiert werden. Verwenden Sie die Hierarchie von Makrobibliotheken als Leitfaden, wenn Sie neue Makros in Moduldateien, neue Moduldateien in Bibliotheksordnern oder neue Bibliotheksordner in Containern erstellen oder installieren." #. Zcfxg #: python_platform.xhp @@ -3515,7 +3515,7 @@ "par_id851633601202270\n" "help.text" msgid "From a full-featured %PRODUCTNAME installed package, use either Basic or Python:" -msgstr "" +msgstr "Verwenden Sie in einem vollständig installiertem %PRODUCTNAME entweder Basic oder Python:" #. 5HhXz #: python_shell.xhp @@ -3524,7 +3524,7 @@ "N0121\n" "help.text" msgid "Using a Basic macro" -msgstr "" +msgstr "Ein Basic-Makro verwenden" #. KhWLk #: python_shell.xhp @@ -3533,7 +3533,7 @@ "N0127\n" "help.text" msgid "Using a Python macro" -msgstr "" +msgstr "Ein Python-Makro verwenden" #. 3FCJH #: python_shell.xhp @@ -3542,7 +3542,7 @@ "N0141\n" "help.text" msgid "Example output" -msgstr "" +msgstr "Beispiel einer Ausgabe" #. MxDtE #: python_shell.xhp @@ -3551,7 +3551,7 @@ "N0142\n" "help.text" msgid "Python Interactive Console" -msgstr "" +msgstr "Interaktive Python-Konsole" #. fk6sx #: python_shell.xhp @@ -3560,7 +3560,7 @@ "hd_id381633446811095\n" "help.text" msgid "Using the Terminal" -msgstr "" +msgstr "Das Terminal verwenden" #. CNFdD #: python_shell.xhp @@ -3569,7 +3569,7 @@ "par_id801633601715910\n" "help.text" msgid "From a %PRODUCTNAME copy included in a GNU/Linux platform, use the terminal as shown:" -msgstr "" +msgstr "Verwenden Sie das in einer GNU/Linux-Plattform der %PRODUCTNAME-Kopie enthaltende Terminal wie folgt:" #. vWPwe #: python_shell.xhp @@ -3578,7 +3578,7 @@ "par_id531633444780190\n" "help.text" msgid "whereis or type terminal commands help locate Python interactive console:" -msgstr "" +msgstr "Die Terminal-Befehle whereis oder type helfen bei der Suche nach der interaktiven Python-Konsole:" #. 8Ei5d #: python_shell.xhp @@ -3587,7 +3587,7 @@ "hd_id311633513620803\n" "help.text" msgid "Alternative console" -msgstr "" +msgstr "Alternative Konsole" #. d8DCA #: python_shell.xhp @@ -3596,7 +3596,7 @@ "par_id81632760673283\n" "help.text" msgid "Use APSO extension console as an alternative:" -msgstr "" +msgstr "Verwenden Sie die Konsole APSO-Extension als eine Alternative:" #. 6h9CS #: python_shell.xhp @@ -3605,7 +3605,7 @@ "N0144\n" "help.text" msgid "APSO console" -msgstr "" +msgstr "APSO-Konsole" #. MxGkV #: python_shell.xhp @@ -3614,4 +3614,4 @@ "par_id351633599611244\n" "help.text" msgid "PythonShell function in ScriptForge.Exception service" -msgstr "" +msgstr "Funktion PythonShell im Dienst ScriptForge.Exception" diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sbasic/shared/02.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sbasic/shared/02.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sbasic/shared/02.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sbasic/shared/02.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2021-10-04 19:51+0200\n" -"PO-Revision-Date: 2022-09-09 14:35+0000\n" +"PO-Revision-Date: 2022-10-04 12:14+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -914,7 +914,7 @@ "par_id0929200903505383\n" "help.text" msgid "If the imported dialog contains additional languages compared to the library, or if the library is not localized at all, then you see a message box with Add, Omit, and Cancel buttons." -msgstr "Wenn der zu importierende Dialog zusätzliche Sprachen zu denen der Bibliothek enthält, oder die Bibliothek überhaupt lokalisiert ist, erscheint ein Meldungsfeld mit den Schaltflächen Hinzufügen, Auslassen und Abbrechen." +msgstr "Wenn der importierte Dialog zusätzliche Sprachen im Vergleich zur Bibliothek enthält oder die Bibliothek überhaupt nicht lokalisiert ist, erscheint ein Meldungsfeld mit den Schaltflächen Hinzufügen, Auslassen und Abbrechen." #. XrhtD #: 11180000.xhp @@ -1769,7 +1769,7 @@ "par_id1261940\n" "help.text" msgid "Opens a dialog to enable or manage multiple sets of dialog resources for multiple languages." -msgstr "Öffnet einen Dialog, in welchem Sie mehrere Sätze von Sprachressourcen hinzufügen und verwalten können." +msgstr "Öffnet einen Dialog, in dem Sie mehrere Sätze von Sprachressourcen hinzufügen und verwalten können." #. vbEQt #: 20000000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sbasic/shared.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sbasic/shared.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sbasic/shared.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sbasic/shared.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-07-26 09:21+0000\n" -"Last-Translator: Mister Update \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -6692,7 +6692,7 @@ "hd_id3145221\n" "help.text" msgid "List entries" -msgstr "Listen-Einträge" +msgstr "Listeneinträge" #. Ga3fT #: 01170101.xhp @@ -8456,7 +8456,7 @@ "par_id051220170242005479\n" "help.text" msgid "sVar = MsgBox(\"Las Vegas\", MB_DEFBUTTON2 + MB_ICONSTOP + MB_ABORTRETRYIGNORE, \"Dialog title\")" -msgstr "" +msgstr "sVar = MsgBox(\"Las Vegas\", MB_DEFBUTTON2 + MB_ICONSTOP + MB_ABORTRETRYIGNORE, \"Dialogtitel\")" #. BaStC #: 03010103.xhp @@ -16349,7 +16349,7 @@ "hd_id3149346\n" "help.text" msgid "Timer Function" -msgstr "" +msgstr "Funktion Timer" #. AKDaG #: 03030303.xhp @@ -16385,7 +16385,7 @@ "par_id3145748\n" "help.text" msgid "MsgBox lSec, 0, \"Seconds since midnight\"" -msgstr "" +msgstr "MsgBox lSec, 0, \"Zeit in Sekunden\"" #. E5DAZ #: 03030303.xhp @@ -16394,7 +16394,7 @@ "par_id3156283\n" "help.text" msgid "MsgBox Right(\"00\" & lHour , 2) & \":\"& Right(\"00\" & lMin , 2) & \":\" & Right(\"00\" & lSec , 2), 0, \"The time is\"" -msgstr "" +msgstr "MsgBox Right(\"00\" & lHour , 2) & \":\"& Right(\"00\" & lMin , 2) & \":\" & Right(\"00\" & lSec , 2), 0, \"Uhrzeit\"" #. oYudq #: 03030303.xhp @@ -16493,7 +16493,7 @@ "bm_id131554200364170\n" "help.text" msgid "Basic Mathematical constantsPi;Basic constantBasic constant;Pi" -msgstr "Mathematische Basic-KonstantenPi; Basic-KonstanteBasic-Konstanten; Pi" +msgstr "Mathematische BasiskonstantenPi; BasiskonstanteBasiskonstanten; Pi" #. DLv8z #: 03040000.xhp @@ -16610,7 +16610,7 @@ "par_id051620171114577052\n" "help.text" msgid "Print IsEmpty(sVar) ' Returns True" -msgstr "" +msgstr "Print IsEmpty(sVar) ' Gibt \"True\" zurück" #. YK88J #: 03040000.xhp @@ -16619,7 +16619,7 @@ "par_id051720170824106132\n" "help.text" msgid "Print oDoc ' Error" -msgstr "" +msgstr "Print oDoc ' Fehler" #. UDTHw #: 03040000.xhp @@ -16628,7 +16628,7 @@ "hd_id31634909394554\n" "help.text" msgid "MsgBox Named Constants" -msgstr "" +msgstr "Benannte Konstanten für MsgBox" #. CABUt #: 03040000.xhp @@ -16637,7 +16637,7 @@ "hd_id881634911199058\n" "help.text" msgid "GetAttr Named Constants" -msgstr "" +msgstr "Benannte Konstanten für GetAttr" #. FWBQE #: 03040000.xhp @@ -16646,7 +16646,7 @@ "hd_id611634911996367\n" "help.text" msgid "VarType Named Constants" -msgstr "" +msgstr "Benannte Konstanten für VarType" #. Xtpvq #: 03040000.xhp @@ -16682,7 +16682,7 @@ "bm_id391624288823741\n" "help.text" msgid "VBA Variable Type Named Constants" -msgstr "" +msgstr "VBA-Variable; Benannte Konstanten" #. XSqq4 #: 03040000.xhp @@ -16691,7 +16691,7 @@ "hd_id941628842567829\n" "help.text" msgid "VBA Color Named Constants" -msgstr "" +msgstr "Benannte VBA-Konstanten für Color" #. GX7VB #: 03040000.xhp @@ -16700,7 +16700,7 @@ "par_id611634907471277\n" "help.text" msgid "Named constant" -msgstr "" +msgstr "Benannte Konstante" #. 4wBCk #: 03040000.xhp @@ -16709,7 +16709,7 @@ "par_id861634907471277\n" "help.text" msgid "Red, Green, Blue
composition" -msgstr "" +msgstr "Rot, Grün, Blau
Zusammenstellung" #. y4iia #: 03040000.xhp @@ -16718,7 +16718,7 @@ "hd_id941624288567829\n" "help.text" msgid "Variable Type Named Constants" -msgstr "" +msgstr "Benannte Konstante für Variable Type" #. AzBpy #: 03040000.xhp @@ -16727,7 +16727,7 @@ "par_id31624288363725\n" "help.text" msgid "Named constant" -msgstr "" +msgstr "Benannte Konstante" #. SrPWN #: 03040000.xhp @@ -16736,7 +16736,7 @@ "par_id951624288363725\n" "help.text" msgid "Decimal value" -msgstr "" +msgstr "Dezimalwert" #. PVJr3 #: 03040000.xhp @@ -16745,7 +16745,7 @@ "hd_id881634911195890\n" "help.text" msgid "FormatDateTime VBA Named Constants" -msgstr "" +msgstr "Benannte VBA-Konstanten für FormatDateTime" #. jUhTB #: 03040000.xhp @@ -16754,7 +16754,7 @@ "hd_id801634912153888\n" "help.text" msgid "StrConv VBA Named Constants" -msgstr "" +msgstr "Benannte VBA-Konstanten für StrConv" #. pU993 #: 03040000.xhp @@ -16763,7 +16763,7 @@ "hd_id131634910758620\n" "help.text" msgid "WeekDayName VBA Named Constants" -msgstr "" +msgstr "Benannte VBA-Konstanten für WeekDayName" #. Y5GhB #: 03040000.xhp @@ -16772,7 +16772,7 @@ "hd_id531634913323423\n" "help.text" msgid "Miscellaneous VBA Named Constants" -msgstr "" +msgstr "Weitere benannte VBA-Konstanten" #. SHFCr #: 03040000.xhp @@ -19184,7 +19184,7 @@ "hd_id3150616\n" "help.text" msgid "Atn Function" -msgstr "" +msgstr "Funktion Atn" #. yugFQ #: 03080101.xhp @@ -19202,7 +19202,7 @@ "par_id3143271\n" "help.text" msgid "The arctangent is the inverse of the tangent function. The Atn Function returns the angle \"Alpha\", expressed in radians, using the tangent of this angle. The function can also return the angle \"Alpha\" by comparing the ratio of the length of the side that is opposite of the angle to the length of the side that is adjacent to the angle in a right-angled triangle." -msgstr "" +msgstr "Der Arkustangens ist die Umkehrung der Tangensfunktion. Die Funktion Atn gibt den Winkel „Alpha“ zurück, ausgedrückt in Bogenmaß, wobei der Tangens dieses Winkels verwendet wird. Die Funktion kann auch den Winkel „Alpha“ zurückgeben, indem sie das Verhältnis der Länge der Seite, die dem Winkel gegenüberliegt, mit der Länge der Seite, die dem Winkel benachbart ist, in einem rechtwinkligen Dreieck vergleicht." #. HbFxP #: 03080101.xhp @@ -19211,7 +19211,7 @@ "par_id3145315\n" "help.text" msgid "Atn(side opposite the angle/side adjacent to angle)= Alpha" -msgstr "" +msgstr "Atn(Seite gegenüber/neben dem Winkel)=Alpha" #. Wo87E #: 03080101.xhp @@ -19220,7 +19220,7 @@ "par_id3148947\n" "help.text" msgid "Atn (Number As Double) As Double" -msgstr "" +msgstr "Atn (Zahl As Double) As Double" #. rLBjg #: 03080101.xhp @@ -19229,7 +19229,7 @@ "par_id3156212\n" "help.text" msgid "Number: Any numerical expression that represents the ratio of two sides of a right triangle. The Atn function returns the corresponding angle in radians (arctangent)." -msgstr "" +msgstr "Number: Ein numerischer Ausdruck, der das Verhältnis zweier Seiten eines rechtwinkligen Dreiecks darstellt. Die Funktion Atn gibt den entsprechenden Winkel im Bogenmaß aus" #. qhMAk #: 03080101.xhp @@ -19265,7 +19265,7 @@ "par_id3159252\n" "help.text" msgid "Pi is here the fixed circle constant with the rounded value 3.14159. Pi is a Basic mathematical constant." -msgstr "" +msgstr "Pi ist die feste Kreiskonstante mit dem gerundeten Wert 3,14159. Pi ist eine Mathematische Basiskonstante." #. BBQTN #: 03080101.xhp @@ -19346,7 +19346,7 @@ "hd_id3154923\n" "help.text" msgid "Cos Function" -msgstr "" +msgstr "Funktion Cos" #. EEVjg #: 03080102.xhp @@ -19364,7 +19364,7 @@ "par_id3150358\n" "help.text" msgid "Using the angle Alpha, the Cos function calculates the ratio of the length of the side that is adjacent to the angle, divided by the length of the hypotenuse in a right-angled triangle." -msgstr "" +msgstr "Unter Verwendung des Winkels Alpha berechnet Cos das Verhältnis der Länge der Seite, die an den Winkel angrenzt, geteilt durch die Länge der Hypotenuse in einem rechtwinkligen Dreieck." #. eEzRP #: 03080102.xhp @@ -19373,7 +19373,7 @@ "par_id3154141\n" "help.text" msgid "Cos(Alpha) = Adjacent/Hypotenuse" -msgstr "" +msgstr "Cos(Alpha) = Gegenkathete/Hypotenuse" #. zfq28 #: 03080102.xhp @@ -19382,7 +19382,7 @@ "par_id3145172\n" "help.text" msgid "Cos (Number As Double) As Double" -msgstr "" +msgstr "Cos (Zahl As Double) As Double" #. jbCKb #: 03080102.xhp @@ -19427,7 +19427,7 @@ "par_id3152885\n" "help.text" msgid "Pi is here the fixed circle constant with the rounded value 3.14159..." -msgstr "" +msgstr "Pi ist hier die feste Kreiskonstante mit dem gerundeten Wert 3,14159…" #. 4K6RE #: 03080102.xhp @@ -19508,7 +19508,7 @@ "hd_id3153896\n" "help.text" msgid "Sin Function" -msgstr "" +msgstr "Funktion Sin" #. fEasV #: 03080103.xhp @@ -19526,7 +19526,7 @@ "par_id3153379\n" "help.text" msgid "Using the angle Alpha, the Sin function returns the ratio of the length of the opposite side of an angle to the length of the hypotenuse in a right-angled triangle." -msgstr "" +msgstr "Unter Verwendung des Winkels Alpha gibt die Funktion Sin das Verhältnis der Länge der gegenüberliegenden Seite eines Winkels zur Länge der Hypotenuse in einem rechtwinkligen Dreieck zurück." #. k3iCL #: 03080103.xhp @@ -19535,7 +19535,7 @@ "par_id3148798\n" "help.text" msgid "Sin(Alpha) = side opposite the angle/hypotenuse" -msgstr "" +msgstr "Sin(Alpha) = Seite gegenüber dem Winkel/Hypotenuse" #. EYMBG #: 03080103.xhp @@ -19544,7 +19544,7 @@ "par_id3154909\n" "help.text" msgid "Sin (Number As Double) As Double" -msgstr "" +msgstr "Sin (Zahl As Double) As Double" #. VeDqk #: 03080103.xhp @@ -19562,7 +19562,7 @@ "par_id3155413\n" "help.text" msgid "To convert degrees to radians, multiply degrees by Pi/180, and to convert radians to degrees, multiply radians by 180/Pi." -msgstr "" +msgstr "Um Grad in Radiant umzurechnen, multiplizieren Sie Grad mit Pi/180, und um Radiant in Grad umzurechnen, multiplizieren Sie Radiant mit 180/Pi." #. yescR #: 03080103.xhp @@ -19571,7 +19571,7 @@ "par_id3149664\n" "help.text" msgid "degrees=(radians*180)/Pi" -msgstr "" +msgstr "Grad=(Radiant*180)/Pi" #. PZTcG #: 03080103.xhp @@ -19580,7 +19580,7 @@ "par_id3153143\n" "help.text" msgid "radians=(degrees*Pi)/180" -msgstr "" +msgstr "Radiant=(Grad*Pi)/180" #. EFgfE #: 03080103.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc/01.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc/01.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-08-24 10:48+0000\n" -"Last-Translator: Annabelle Wübbelsmann \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -10436,7 +10436,7 @@ "hd_id631520887352751\n" "help.text" msgid "Handling non-logical arguments in logical functions" -msgstr "Handhabung nicht-logischer Argumente in logischen Funktionen" +msgstr "Handhabung nicht logischer Argumente in logischen Funktionen" #. DRkRS #: 04060105.xhp @@ -70736,7 +70736,7 @@ "par_id1701201620340168\n" "help.text" msgid "Logarithmic regression: finds a logarithmic curve in the form of y = b + a1.ln[x1] + a2.ln[x2] + a3.ln[x3] ..., where ai is the i-th coefficient, b is the intercept and ln[xi] is the natural logarithm of the i-th independent variable, that best fits the data." -msgstr "Logarithmische Regression: Ermittelt eine Logarithmusfunktion in Form von y = b + a1·ln[x1] + a2·ln[x2] + a3·ln[x3] …, wobei ai der i-te Koeffizient ist, b ist der Schnittpunkt und ln[xi] der natürliche Logarithmus von der i-ten unabhänigen Variable, die am besten zu den Daten passt." +msgstr "Logarithmische Regression: Ermittelt eine Logarithmusfunktion in Form von y = b + a1·ln[x1] + a2·ln[x2] + a3·ln[x3] …, wobei ai der i-te Koeffizient ist, b ist der Schnittpunkt und ln[xi] der natürliche Logarithmus von der i-ten unabhängigen Variable, die am besten zu den Daten passt." #. YfNEL #: statistics_regression.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc/04.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc/04.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc/04.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc/04.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2021-11-24 12:02+0100\n" -"PO-Revision-Date: 2022-05-10 09:32+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.11.2\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1565271348.000000\n" #. NQkD7 @@ -662,7 +662,7 @@ "par_id681630625395135\n" "help.text" msgid "If cell contents have just been copied to the clipboard and no additional editing has been done in the current file, then pressing Enter will paste clipboard contents to the current cursor position." -msgstr "Wenn der Zelleninhalt gerade in die Zwischenablage kopiert wurde und keine zusätzliche Bearbeitung in der aktuellen Datei vorgenommen wurde, wird durch Drücken der Eingabetaste der Inhalt an der aktuellen Position des Cursor eingefügt." +msgstr "Wenn der Zelleninhalt gerade in die Zwischenablage kopiert wurde und keine zusätzliche Bearbeitung in der aktuellen Datei vorgenommen wurde, wird durch Drücken der Eingabetaste der Inhalt an der aktuellen Position des Cursors eingefügt." #. 2MKS8 #: 01020000.xhp @@ -725,7 +725,7 @@ "par_id8070314\n" "help.text" msgid "The ` key is located next to the \"1\" key on most English keyboards. If your keyboard does not show this key, you can assign another key: Choose Tools - Customize, click the Keyboard tab. Select the \"View\" category and the \"Toggle Formula\" function." -msgstr "Das ` ist auf den meisten deutschen Tastaturen neben dem \"ß\". Wenn Ihre Tastatur diese Taste nicht hat, können Sie eine andere Taste auswählen: Wählen Sie \"Extras – Anpassen…\" und wechseln Sie in das Register \"Tastatur\". Wählen Sie die Kategorie \"Ansicht\" und die Funktion \"Formel umschalten\"." +msgstr "Das ` ist auf den meisten deutschen Tastaturen neben dem \"ß\". Wenn Ihre Tastatur diese Taste nicht hat, können Sie eine andere Taste auswählen: Wählen Sie \"Extras – Anpassen…\" und wechseln Sie in das Register \"Tastatur\". Wählen Sie den Bereich \"Ansicht\" und die Funktion \"Formel\"." #. De3Yx #: 01020000.xhp @@ -806,7 +806,7 @@ "par_id981637247123114\n" "help.text" msgid "Makes the sheet name editable. Edit the sheet name and press Enter when finished." -msgstr "Der Tabellenname wird bearbeitbar. Bearbeiten Sie den Tabellennamen und drücken Sie nach Beendigung die Eingabetaste." +msgstr "Der Tabellenname wird bearbeitbar. Bearbeiten Sie den Tabellennamen und drücken Sie die Eingabetaste, wenn Sie fertig sind." #. TDGrd #: 01020000.xhp @@ -1292,7 +1292,7 @@ "par_id3153155\n" "help.text" msgid "Increases the height of current row (only in OpenOffice.org legacy compatibility mode)." -msgstr "Vergrößert die Höhe der aktuellen Zeile (nur im Kompatibilitätsmodus für veraltete OpenOffice.org Dokumente)." +msgstr "Vergrößert die Höhe der aktuellen Zeile (nur im veralteten OpenOffice.org-Kompatibilitätsmodus)." #. v7V4h #: 01020000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc/05.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc/05.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc/05.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc/05.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-01-31 18:19+0100\n" -"PO-Revision-Date: 2022-07-01 16:23+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -329,7 +329,7 @@ "par_id3145635\n" "help.text" msgid "Compiler: an identifier in the formula exceeds 64 kB in size. Interpreter: a result of a string operation exceeds 64 kB in size." -msgstr "Compiler: ein Bezeichner in der Formel überschreitet die Größe von 64 kB. Interpreter: ein Ergebnis einer Zeichenkettenverarbeitung überschreitet die Größe von 64 kB." +msgstr "Compiler: Ein Bezeichner in der Formel überschreitet die Größe von 64 kB. Interpreter: Ein Ergebnis einer Zeichenkettenverarbeitung überschreitet die Größe von 64 kB." #. E7ohJ #: 02140000.xhp @@ -617,7 +617,7 @@ "par_id4152967\n" "help.text" msgid "No AddIn" -msgstr "Kein Plug-In" +msgstr "Kein Plug-in" #. zaCCw #: 02140000.xhp @@ -626,7 +626,7 @@ "par_id3149710\n" "help.text" msgid "Interpreter: AddIn not found." -msgstr "Interpreter: Plug-In nicht gefunden." +msgstr "Interpreter: Plug-in nicht gefunden." #. kAqvA #: 02140000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc/guide.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc/guide.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc/guide.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc/guide.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-07-26 09:21+0000\n" -"Last-Translator: Mister Update \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -1877,7 +1877,7 @@ "par_id2011780\n" "help.text" msgid "Select the area where you want to input values. Now you can start to input values from the cursor position in the selected area. Press the Tab key to advance to the next cell or Shift + Tab to move backward. At the edges of the selected area the tab key jumps inside the selected area. You will not leave the selected area." -msgstr "" +msgstr "Wählen Sie den Bereich aus, in den Sie Werte eingeben möchten. Jetzt können Sie mit der Eingabe von Werten an der Cursorposition im ausgewählten Bereich beginnen. Drücken Sie Tabulator, um zur nächsten Zelle zu springen, oder Umschalt+Tabulator, um rückwärts zu springen. An den Rändern des ausgewählten Bereichs springt die Tabulatortaste innerhalb des ausgewählten Bereichs. Sie werden den ausgewählten Bereich nicht verlassen." #. HbCtq #: cell_enter.xhp @@ -1895,7 +1895,7 @@ "par_id3232520\n" "help.text" msgid "Select the area from B3 to E7. Now B3 is waiting for your input. Press Tab to advance to the next cell within the selected area." -msgstr "" +msgstr "Wählen Sie den Bereich von B3 bis E7 aus. Nun können Sie in B3 einen Wert eingeben. Drücken Sie Tabulator, um zur nächsten Zelle zu springen." #. pbEDF #: cell_enter.xhp @@ -2282,7 +2282,7 @@ "par_id3154371\n" "help.text" msgid "By default, all cells of the selection, including the hidden cells, are copied, deleted, moved, or formatted. Restrict the selection to visible rows choosing Edit - Select - Select Visible Rows Only or to visible columns choosing Edit - Select - Select Visible Columns Only." -msgstr "" +msgstr "Standardmäßig werden alle Zellen der Auswahl, einschließlich der ausgeblendeten Zellen, kopiert, gelöscht, verschoben oder formatiert. Beschränken Sie die Auswahl auf sichtbare Zeilen durch Auswählen von Bearbeiten – Auswählen – Nur sichtbare Zeilen auswählen oder auf sichtbare Spalten durch Bearbeiten – Auswählen – Nur sichtbare Spalten auswählen." #. rBtUY #: cellreference_dragdrop.xhp @@ -2642,7 +2642,7 @@ "par_id3145384\n" "help.text" msgid "Choose Sheet - External Links. The External Data dialog appears." -msgstr "" +msgstr "Wählen Sie Tabelle – Verknüpfung zu externen Daten…. Der Dialog Externe Daten öffnet sich." #. EQzxX #: cellreferences_url.xhp @@ -2759,7 +2759,7 @@ "par_id3148797\n" "help.text" msgid "Select the menu command Edit - Find & Replace." -msgstr "Wählen Sie Bearbeiten – Suchen und Ersetzen…." +msgstr "Wählen Sie Bearbeiten – Suchen und ersetzen…." #. STxmA #: cellstyle_by_formula.xhp @@ -5846,7 +5846,7 @@ "tit\n" "help.text" msgid "Finding and Replacing in Calc" -msgstr "Suchen und Ersetzen in Calc" +msgstr "Suchen und ersetzen in Calc" #. qSAcB #: finding.xhp @@ -5864,7 +5864,7 @@ "hd_id3149204\n" "help.text" msgid "Finding and Replacing in Calc" -msgstr "Suchen und Ersetzen in Calc" +msgstr "Suchen und ersetzen in Calc" #. uzefv #: finding.xhp @@ -5882,7 +5882,7 @@ "hd_id3610644\n" "help.text" msgid "The Find & Replace dialog" -msgstr "Der Dialog Suchen und Ersetzen" +msgstr "Der Dialog „Suchen und ersetzen“" #. iACsJ #: finding.xhp @@ -5909,7 +5909,7 @@ "par_id2569658\n" "help.text" msgid "You can specify in the Find & Replace dialog either to find the parts of a formula or the results of a calculation." -msgstr "Im Dialog Suchen und Ersetzen können Sie angeben, ob entweder die Teile einer Formel oder die Ergebnisse einer Berechnung gesucht werden sollen." +msgstr "Im Dialog „Suchen und ersetzen“ können Sie angeben, ob entweder die Teile einer Formel oder die Ergebnisse einer Berechnung gesucht werden sollen." #. C6cDQ #: finding.xhp @@ -5918,7 +5918,7 @@ "par_id6394238\n" "help.text" msgid "Choose Edit - Find & Replace to open the Find & Replace dialog." -msgstr "Wählen Sie Bearbeiten – Suchen und Ersetzen…, um den Dialog Suchen und Ersetzen zu öffnen." +msgstr "Wählen Sie Bearbeiten – Suchen und ersetzen…, um den Dialog „Suchen und ersetzen“ zu öffnen." #. cAUtG #: finding.xhp @@ -5981,7 +5981,7 @@ "par_id6549272\n" "help.text" msgid "Choose Edit - Find & Replace to open the Find & Replace dialog." -msgstr "Wählen Sie Bearbeiten – Suchen und Ersetzen…, um den Dialog Suchen und Ersetzen zu öffnen." +msgstr "Wählen Sie Bearbeiten – Suchen und ersetzen…, um den Dialog „Suchen und ersetzen“ zu öffnen." #. 5DY4k #: finding.xhp @@ -7511,7 +7511,7 @@ "par_id3154944\n" "help.text" msgid "Choose Edit - Find & Replace" -msgstr "Wählen Sie Bearbeiten – Suchen und Ersetzen…" +msgstr "Wählen Sie Bearbeiten – Suchen und ersetzen…" #. MJUjm #: integer_leading_zero.xhp @@ -8483,7 +8483,7 @@ "par_id2805566\n" "help.text" msgid "CommandCtrl+Shift keys" -msgstr "Option+BefehlAlt+Strg+Umschalt" +msgstr "Option+BefehlStrg+Alt+Umschalt" #. HMLtJ #: move_dragdrop.xhp @@ -8528,7 +8528,7 @@ "par_id2783898\n" "help.text" msgid "Option+Command Alt+Ctrl keys" -msgstr "Option+BefehlAlt+Strg" +msgstr "Option+BefehlStrg+Alt" #. FAxCD #: move_dragdrop.xhp @@ -8546,7 +8546,7 @@ "par_id584124\n" "help.text" msgid "Option+CommandAlt+Ctrl+Shift keys" -msgstr "Option+BefehlAlt+Strg+Umschalt" +msgstr "Option+BefehlStrg+Alt+Umschalt" #. VpQTf #: move_dragdrop.xhp @@ -9158,7 +9158,7 @@ "par_id3149958\n" "help.text" msgid "To edit a permanently visible comment, just click in it. If you delete the entire text of the comment, the comment itself is deleted." -msgstr "Einen ständig sichtbaren Kommentar bearbeiten Sie, indem Sie einfach hinein klicken. Wenn Sie den ganzen Text des Kommentars löschen, wird der Kommentar gelöscht." +msgstr "Einen ständig sichtbaren Kommentar bearbeiten Sie, indem Sie einfach hineinklicken. Wenn Sie den ganzen Text des Kommentars löschen, wird auch der Kommentar selbst gelöscht." #. hWoCg #: note_insert.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/scalc.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/scalc.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2021-11-16 12:09+0100\n" -"PO-Revision-Date: 2022-02-10 16:37+0000\n" -"Last-Translator: Annabelle Wübbelsmann \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-04 12:14+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.8.1\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1513085807.000000\n" #. ZxQeC @@ -419,7 +419,7 @@ "par_id391577296078546\n" "help.text" msgid "Opens a submenu for selecting the date, sheet name or document title in the cell." -msgstr "Öffnet ein Untermenü, in welchem Sie Datum, Tabellenname oder Dokumenttitel zum Einfügen in die Zelle auswählen können." +msgstr "Öffnet ein Untermenü, in dem Sie Datum, Tabellenname oder Dokumenttitel zum Einfügen in die Zelle auswählen können." #. JP4tR #: main0105.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/schart/01.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/schart/01.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/schart/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/schart/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2021-09-10 23:11+0200\n" -"PO-Revision-Date: 2022-05-03 12:46+0000\n" -"Last-Translator: Mister Update \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-04 12:14+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.11.2\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1565410144.000000\n" #. DsZFP @@ -689,7 +689,7 @@ "par_id3154684\n" "help.text" msgid "Opens the Data Labels dialog, which enables you to set the data labels." -msgstr "Öffnet den Dialog Datenbeschriftung, in welchem Sie das Aussehen der Datenbeschriftung festlegen." +msgstr "Öffnet den Dialog Datenbeschriftung, in dem Sie das Aussehen der Datenbeschriftung festlegen." #. EwAhi #: 04030000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sdatabase.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sdatabase.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sdatabase.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sdatabase.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-05-25 12:36+0200\n" -"PO-Revision-Date: 2022-09-09 14:36+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2794,7 +2794,7 @@ "hd_id3157910\n" "help.text" msgid "FormWizard" -msgstr "Formular-Assistent" +msgstr "Formularassistent" #. GDZow #: 04000000.xhp @@ -2920,7 +2920,7 @@ "par_id3154924\n" "help.text" msgid "The Form Navigator iconIcon on the Form Design bar opens the Form Navigator." -msgstr "Das Symbol Formular-Navigator Symbol für Formular-Navigator auf der Symbolleiste Formular-Entwurf öffnet den Formular-Navigator." +msgstr "Das Symbol Formularnavigator Symbol für Formularnavigator auf der Symbolleiste Formular-Entwurf öffnet den Formularnavigator." #. 5wdwF #: 04030000.xhp @@ -5422,7 +5422,7 @@ "par_id3154366\n" "help.text" msgid "Enter the SQL command specifier that instructs the data source to auto-increment a specified Integer data field. For example, a typical SQL statement to create a data field is:" -msgstr "Geben Sie den SQL-Befehlsbezeichner ein, der die Datenquelle anweist, ein angegebenes Integer-Datenfeld automatisch zu inkrementieren. Zum Beispiel eine typische SQL-Anweisung zum Erstellen eines Datenfelds ist:" +msgstr "Geben Sie den SQL-Befehlsbezeichner ein, der die Datenquelle anweist, ein angegebenes Integer-Datenfeld automatisch zu inkrementieren. Eine typische SQL-Anweisung zum Erstellen eines Datenfelds ist beispielsweise:" #. C5Mvn #: 11020000.xhp @@ -8635,7 +8635,7 @@ "hd_id171587405349438\n" "help.text" msgid "Port number" -msgstr "Port-Nummer" +msgstr "Portnummer" #. J2SR3 #: dabawiz02mysql.xhp @@ -8995,7 +8995,7 @@ "par_idN10616\n" "help.text" msgid "Port number" -msgstr "Port-Nummer" +msgstr "Portnummer" #. PBuEW #: dabawiz02oracle.xhp @@ -9364,7 +9364,7 @@ "par_idN1061A\n" "help.text" msgid "Click to access txt files." -msgstr "Klicken Sie hier, um auf txt-Dateien zuzugreifen." +msgstr "Klicken Sie hier, um auf TXT-Dateien zuzugreifen." #. E5S76 #: dabawiz02text.xhp @@ -9382,7 +9382,7 @@ "par_idN10647\n" "help.text" msgid "Click to access csv files." -msgstr "Klicken Sie hier, um auf csv-Dateien zuzugreifen." +msgstr "Klicken Sie hier, um auf CSV-Dateien zuzugreifen." #. EVBCK #: dabawiz02text.xhp @@ -9832,7 +9832,7 @@ "par_id3147209\n" "help.text" msgid "Opens a window where you can edit the selected table, query, form, or report." -msgstr "Öffnet ein Fenster, in dem Sie die ausgewählte Tabelle, Abfrage, das Formular oder den Bericht bearbeiten können." +msgstr "Öffnet ein Fenster, in dem Sie die ausgewählte Tabelle, die Abfrage, das Formular oder den Bericht bearbeiten können." #. NCnUw #: menuedit.xhp @@ -9850,7 +9850,7 @@ "par_id3153666\n" "help.text" msgid "Deletes the selected table, query, form, or report." -msgstr "Löscht die ausgewählte Tabelle, Abfrage, das Formular oder den Bericht." +msgstr "Löscht die ausgewählte Tabelle, die Abfrage, das Formular oder den Bericht." #. uuDM2 #: menuedit.xhp @@ -9913,7 +9913,7 @@ "par_idN105AA\n" "help.text" msgid "Most databases use queries to filter or to sort database tables to display records on your computer. Views offer the same functionality as queries, but on the server side. If your database is on a server that supports views, you can use views to filter the records on the server to speed up the display time." -msgstr "Die meisten Datenbanken verwenden Abfragen, um Datenbanktabellen zu filtern oder zu sortieren, um Datensätze auf Ihrem Computer anzuzeigen. Ansichten bieten dieselbe Funktionalität wie Abfragen, jedoch serverseitig. Wenn sich Ihre Datenbank auf einem Server befindet, der Ansichten unterstützt, können Sie Ansichten verwenden, um die Datensätze auf dem Server zu filtern, um die Anzeigezeit zu verkürzen." +msgstr "Die meisten Datenbanken verwenden Abfragen zum Filtern oder Sortieren von Datenbanktabellen, um Datensätze auf Ihrem Computer anzuzeigen. Ansichten bieten dieselbe Funktionalität wie Abfragen, jedoch serverseitig. Wenn sich Ihre Datenbank auf einem Server befindet, der Ansichten unterstützt, können Sie Ansichten zum Filtern der Datensätze auf dem Server verwenden, um die Anzeigezeit zu verkürzen." #. 7NDGC #: menuedit.xhp @@ -10066,7 +10066,7 @@ "par_idN105C4\n" "help.text" msgid "Saves the current database file, query, form or report. For the database file, you see the file save dialog. For the other objects, you see the Save dialog." -msgstr "Speichert die aktuelle Datenbankdatei, Abfrage, das Formular oder den Bericht. Für die Datenbankdatei sehen Sie den Dialog Datei speichern. Für die anderen Objekte sehen Sie den Dialog Speichern." +msgstr "Speichert die aktuelle Datenbankdatei, die Abfrage, das Formular oder den Bericht. Für die Datenbankdatei sehen Sie den Dialog Datei speichern. Für die anderen Objekte sehen Sie den Dialog Speichern." #. FAvuD #: menufile.xhp @@ -11173,7 +11173,7 @@ "par_idN1055C\n" "help.text" msgid "Ascending" -msgstr "" +msgstr "Aufsteigend" #. aSXt6 #: querywizard02.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sdraw/04.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sdraw/04.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sdraw/04.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sdraw/04.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2019-07-11 18:38+0200\n" -"PO-Revision-Date: 2022-01-08 14:38+0000\n" +"PO-Revision-Date: 2022-10-04 12:14+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.8.1\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1532496289.000000\n" #. XCKCk @@ -401,7 +401,7 @@ "hd_id3150867\n" "help.text" msgid "CommandCtrl+Shift+G" -msgstr "BefehlStrg +Umschalt+G" +msgstr "BefehlStrg+Umschalt+G" #. xdhfv #: 01020000.xhp @@ -419,7 +419,7 @@ "hd_id3149955\n" "help.text" msgid "Shift+Command+OptionCtrl+Alt+A" -msgstr "Umschalt+Befehl+OptionStrg+Alt +A" +msgstr "Befehl+OptionStrg+Alt+Umschalt+A" #. Vpa4M #: 01020000.xhp @@ -437,7 +437,7 @@ "hd_id3146852\n" "help.text" msgid "CommandCtrl+Shift+K" -msgstr "Befehl Strg +Umschalt+K" +msgstr "Befehl Strg+Umschalt+K" #. CCwzy #: 01020000.xhp @@ -455,7 +455,7 @@ "hd_id3153567\n" "help.text" msgid "Command+OptionCtrl+Alt+Shift+K" -msgstr "Befehl+OptionStrg+Alt +Umschalt+K" +msgstr "Befehl+OptionStrg+Alt+Umschalt+K" #. gscGJ #: 01020000.xhp @@ -473,7 +473,7 @@ "hd_id3153730\n" "help.text" msgid "CommandCtrl+Shift+ +" -msgstr "Befehl Strg +Umschalt+ +" +msgstr "BefehlStrg +Umschalt+ +" #. rXBFC #: 01020000.xhp @@ -509,7 +509,7 @@ "hd_id3150928\n" "help.text" msgid "CommandCtrl+ -" -msgstr "BefehlStrg +Minus (-)" +msgstr "BefehlStrg+Minus (-)" #. xs2NW #: 01020000.xhp @@ -527,7 +527,7 @@ "hd_id3145298\n" "help.text" msgid "CommandCtrl+Shift+ -" -msgstr "BefehlStrg +Umschalt+Minus (-)" +msgstr "BefehlStrg+Umschalt+Minus (-)" #. ECARZ #: 01020000.xhp @@ -608,7 +608,7 @@ "par_idN10AED\n" "help.text" msgid "CommandCtrl+Page Up" -msgstr "BefehlStrg +Bild nach oben" +msgstr "BefehlStrg+Bild nach oben" #. qH8YG #: 01020000.xhp @@ -626,7 +626,7 @@ "par_idN10AF8\n" "help.text" msgid "CommandCtrl+Page Down" -msgstr "BefehlStrg +Bild nach unten" +msgstr "BefehlStrg+Bild nach unten" #. hTrtc #: 01020000.xhp @@ -662,7 +662,7 @@ "hd_id3156259\n" "help.text" msgid "CommandCtrl+Arrow Key" -msgstr "BefehlStrg +Pfeiltasten" +msgstr "BefehlStrg+Pfeiltasten" #. 8G82c #: 01020000.xhp @@ -770,7 +770,7 @@ "hd_id3155851\n" "help.text" msgid "CommandCtrl+Enter" -msgstr "BefehlStrg +Eingabetaste" +msgstr "BefehlStrg+Eingabetaste" #. 2HVcw #: 01020000.xhp @@ -824,7 +824,7 @@ "hd_id3147252\n" "help.text" msgid "OptionAlt+Shift+click an object" -msgstr "OptionAlt +Umschalt und Mausklick auf ein Objekt" +msgstr "OptionAlt+Umschalt und Mausklick auf ein Objekt" #. HKrSi #: 01020000.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sdraw/guide.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sdraw/guide.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/sdraw/guide.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/sdraw/guide.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2021-09-10 23:11+0200\n" -"PO-Revision-Date: 2022-02-13 05:19+0000\n" -"Last-Translator: Annabelle Wübbelsmann \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Weblate 4.8.1\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1552452870.000000\n" #. cZbDh @@ -2696,7 +2696,7 @@ "par_id3166424\n" "help.text" msgid "To change the pivot point, drag the small circle in the center of the object to a new location." -msgstr "Klicken Sie noch einmal in das Objekt, sehen Sie wieder die normalen acht Griffe. Wenn Sie aber doppelt hinein klicken, verändern sich die acht Griffe und Sie sehen einen Textcursor in der Mitte des Objekts. Sie können jetzt einen Text eingeben, der automatisch mit dem Objekt verbunden ist." +msgstr "Klicken Sie noch einmal in das Objekt, sehen Sie wieder die normalen acht Griffe. Wenn Sie aber doppelt hineinklicken, verändern sich die acht Griffe und Sie sehen einen Textcursor in der Mitte des Objekts. Sie können jetzt einen Text eingeben, der automatisch mit dem Objekt verbunden ist." #. 7Sjf8 #: rotate_object.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/shared/00.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/shared/00.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/shared/00.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/shared/00.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-07-01 16:23+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Weblate 4.12.2\n" "X-POOTLE-MTIME: 1563509840.000000\n" #. 3B8ZN @@ -3389,7 +3389,7 @@ "bm_id3152952\n" "help.text" msgid "import filtersexport filtersfilters; for import and exportfiles; filters and formatsformats; on opening and savingimporting; HTML and text documentsexporting;HTML and text documentstext documents; importing/exportingHTML documents; importing/exportingUTF-8/UCS2 supportHTML; export character setPostScript; creating filesexporting;to PostScript format" -msgstr "ImportfilterExportfilterFilter; für Im- und ExportDateien; Filter und FormateFormate; beim Öffnen und SpeichernImportieren; HTML- und TextdokumenteExportieren; HTML- und TextdokumenteTextdokumente; Importieren und ExportierenHTML-Dokumente; Importieren und ExportierenUTF-8/UCS2-UnterstützungHTML; Export-ZeichensatzPostScript; Dateien erstellenExportieren; in das PostScript-Format" +msgstr "ImportfilterExportfilterFilter; für Im- und ExportDateien; Filter und FormateFormate; beim Öffnen und SpeichernImportieren; HTML- und TextdokumenteExportieren; HTML- und TextdokumenteTextdokumente; Importieren und ExportierenHTML-Dokumente; Importieren und ExportierenUTF-8/UCS-2-UnterstützungHTML; Export-ZeichensatzPostScript; Dateien erstellenExportieren; in das PostScript-Format" #. MZo3K #: 00000020.xhp @@ -3542,7 +3542,7 @@ "par_id3149734\n" "help.text" msgid "The HTML import of $[officename] Writer is able to read files that have UTF-8 or UCS2 character coding. All characters that are contained in the ANSI character set or in the system's character set can be displayed." -msgstr "Der HTML-Import des $[officename] Writer ist in der Lage, Dateien zu lesen, die in der UTF-8- beziehungsweise UCS2-Zeichencodierung vorliegen. Dabei werden alle Zeichen dargestellt, die sich im ANSI-Zeichensatz beziehungsweise im Zeichensatz des Systems befinden." +msgstr "Der HTML-Import des $[officename] Writer ist in der Lage, Dateien zu lesen, die in der UTF-8- beziehungsweise UCS-2-Zeichencodierung vorliegen. Dabei werden alle Zeichen dargestellt, die sich im ANSI-Zeichensatz beziehungsweise im Zeichensatz des Systems befinden." #. EKQe3 #: 00000020.xhp @@ -4280,7 +4280,7 @@ "par_id9756157\n" "help.text" msgid "%PRODUCTNAME Extension" -msgstr "%PRODUCTNAME Extension" +msgstr "%PRODUCTNAME-Extension" #. vrtDD #: 00000021.xhp @@ -4379,7 +4379,7 @@ "par_id0519200811530455\n" "help.text" msgid "OpenOffice.org 1.1.5 or StarOffice 7" -msgstr "OpenOffice.org 1.1.5 oder StarOffice 7" +msgstr "OpenOffice.org 1.1.5, StarOffice 7" #. qnHF4 #: 00000021.xhp @@ -4406,7 +4406,7 @@ "par_id0519200811530467\n" "help.text" msgid "OpenOffice.org 2.2 or StarOffice 8 Update 4" -msgstr "OpenOffice.org 2.2 oder StarOffice 8 Update 4" +msgstr "OpenOffice.org 2.2, StarOffice 8 Update 4" #. ENFwJ #: 00000021.xhp @@ -4469,7 +4469,7 @@ "par_id1001200912381174\n" "help.text" msgid "OpenOffice.org 3.2 or StarOffice 9.2" -msgstr "OpenOffice.org 3.2 oder StarOffice 9.2" +msgstr "OpenOffice.org 3.2, StarOffice 9.2" #. GGUsk #: 00000021.xhp @@ -4559,7 +4559,7 @@ "par_id3153178\n" "help.text" msgid "The text content of the document is located in content.xml." -msgstr "Der Text-Inhalt des Dokuments steht in content.xml." +msgstr "Der Textinhalt des Dokuments steht in content.xml." #. Zhydi #: 00000021.xhp @@ -7853,7 +7853,7 @@ "par_id3149525\n" "help.text" msgid "Choose Format - Bullets and Numbering - Customize - Character button." -msgstr "Wählen Sie Format – Nummerierung und Aufzählungszeichen… – Register: Anpassen – Schaltfläche: Auswahl…." +msgstr "Wählen Sie Format – Aufzählungszeichen und Nummerierung… – Register: Anpassen – Schaltfläche: Auswahl…." #. sB3e2 #: 00000404.xhp @@ -7862,7 +7862,7 @@ "par_id3152372\n" "help.text" msgid "Choose Format - Bullets and Numbering - Customize - Character button." -msgstr "Wählen Sie Format – Nummerierung und Aufzählungszeichen… – Register: Anpassen – Schaltfläche: Auswahl…." +msgstr "Wählen Sie Format – Aufzählungszeichen und Nummerierung… – Register: Anpassen – Schaltfläche: Auswahl…." #. L5Fu9 #: 00000404.xhp @@ -9185,7 +9185,7 @@ "par_id3149825\n" "help.text" msgid "Open a text document, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - AutoCaption." -msgstr "Öffnen Sie ein Textdokument, wählen Sie %PRODUCTNAME … EinstellungenExtras – Optionen… – %PRODUCTNAME Writer – Automatische Bildbeschriftung." +msgstr "Öffnen Sie ein Textdokument, wählen Sie %PRODUCTNAME … EinstellungenExtras – Optionen… – %PRODUCTNAME Writer – Automatische Beschriftung." #. B2n4N #: 00000406.xhp @@ -9221,7 +9221,7 @@ "par_id3155961\n" "help.text" msgid "Open a text document, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Basic Fonts (Western)." -msgstr "Öffnen Sie ein Textdokument, wählen Sie %PRODUCTNAME – EinstellungenExtras – Optionen… – %PRODUCTNAME Writer – Grundschriftarten (Westlich)." +msgstr "Öffnen Sie ein Textdokument, wählen Sie %PRODUCTNAME – EinstellungenExtras – Optionen… – %PRODUCTNAME Writer – Grundschriftarten (westlich)." #. Ub9ts #: 00000406.xhp @@ -9230,7 +9230,7 @@ "par_id3159313\n" "help.text" msgid "Open a text document, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Basic Fonts (Asian). Asian language support must be enabled." -msgstr "Öffnen Sie ein Textdokument, wählen Sie %PRODUCTNAME – EinstellungenExtras – Optionen… – %PRODUCTNAME Writer – Grundschriftarten (Asiatisch). Die Unterstützung für asiatische Sprachen muss aktiviert sein." +msgstr "Öffnen Sie ein Textdokument, wählen Sie %PRODUCTNAME – EinstellungenExtras – Optionen… – %PRODUCTNAME Writer – Grundschriftarten (asiatisch). Die Unterstützung für asiatische Sprachen muss aktiviert sein." #. MZAYL #: 00000406.xhp @@ -11489,7 +11489,7 @@ "par_id3150749\n" "help.text" msgid "Icon Form Navigator" -msgstr "Symbol für Formular-Navigator" +msgstr "Symbol für Formularnavigator" #. QEjGP #: 00040501.xhp @@ -11498,7 +11498,7 @@ "par_id3147237\n" "help.text" msgid "Form Navigator" -msgstr "Formular-Navigator" +msgstr "Formularnavigator" #. Paybb #: 00040501.xhp @@ -11534,7 +11534,7 @@ "par_id3148828\n" "help.text" msgid "Open Form Navigator - select form - open context menu - choose Open in Design Mode." -msgstr "Öffnen Sie den Formular-Navigator – wählen Sie den Eintrag Formular aus – öffnen Sie das Kontextmenü – wählen Sie Im Entwurfsmodus öffnen." +msgstr "Öffnen Sie den Formularnavigator – wählen Sie den Eintrag Formular aus – öffnen Sie das Kontextmenü – wählen Sie Im Entwurfsmodus öffnen." #. mRTG5 #: 00040501.xhp @@ -12515,7 +12515,7 @@ "par_id3149317\n" "help.text" msgid "Choose Format - Text Box and Shape - Line - Arrow Styles tab." -msgstr "" +msgstr "Wählen Sie Format – Textfeld und Form – Linie… – Register: Linienspitzen." #. Bs2oC #: 00040502.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/shared/01.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/shared/01.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/shared/01.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/shared/01.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-07-04 18:04+0200\n" -"PO-Revision-Date: 2022-08-10 13:23+0000\n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" "Last-Translator: Christian Kühl \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -9032,7 +9032,7 @@ "par_id3152576\n" "help.text" msgid "Represents a nonprinting character." -msgstr "Steht für ein nicht-druckbares Zeichen." +msgstr "Steht für ein nicht druckbares Zeichen." #. YCGiZ #: 02100001.xhp @@ -11075,7 +11075,7 @@ "par_id3154840\n" "help.text" msgid "Lets you edit a selected OLE object that you inserted from the Insert - OLE Object submenu." -msgstr "" +msgstr "Ermöglicht die Bearbeitung eines ausgewählten OLE-Objekts, das Sie über das Menü Einfügen – OLE-Objekt eingefügt haben." #. HB6iE #: 02200000.xhp @@ -11120,7 +11120,7 @@ "par_id3150008\n" "help.text" msgid "Lets you edit a selected OLE object that you inserted with the Insert – OLE Object command." -msgstr "" +msgstr "Ermöglicht die Bearbeitung eines ausgewählten OLE-Objekts, das Sie über das Menü Einfügen – OLE-Objekt eingefügt haben." #. PXv8N #: 02200200.xhp diff -Nru libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/shared/02.po libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/shared/02.po --- libreoffice-7.4.1~rc2/translations/source/de/helpcontent2/source/text/shared/02.po 2022-09-09 18:45:51.000000000 +0000 +++ libreoffice-7.4.2~rc3/translations/source/de/helpcontent2/source/text/shared/02.po 2022-10-10 10:15:01.000000000 +0000 @@ -4,9 +4,9 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2022-06-09 11:50+0200\n" -"PO-Revision-Date: 2022-07-26 09:21+0000\n" -"Last-Translator: Mister Update \n" -"Language-Team: German \n" +"PO-Revision-Date: 2022-10-10 09:37+0000\n" +"Last-Translator: Christian Kühl \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -68,7 +68,7 @@ "par_id721649333208955\n" "help.text" msgid "Print File Directly Icon" -msgstr "" +msgstr "Symbol für Direkt drucken" #. UDgk9 #: 01110000.xhp @@ -77,7 +77,7 @@ "par_id891649333208955\n" "help.text" msgid "Print File Directly" -msgstr "" +msgstr "Direkt drucken" #. 9hSsM #: 01110000.xhp @@ -707,7 +707,7 @@ "par_id3155341\n" "help.text" msgid "Icon Select" -msgstr "" +msgstr "Symbol für Auswahl" #. Dbydo #: 01170000.xhp @@ -779,7 +779,7 @@ "par_idN10C50\n" "help.text" msgid "To create a square control, hold down the Shift key while you drag." -msgstr "" +msgstr "Um ein quadratisches Steuerelement zu erstellen, halten Sie beim Ziehen Umschalt gedrückt." #. muefe #: 01170000.xhp @@ -842,7 +842,7 @@ "par_id3156106\n" "help.text" msgid "Icon Select" -msgstr "" +msgstr "Symbol für Auswahl" #. G4itx #: 01170000.xhp @@ -860,7 +860,7 @@ "par_idN11B57\n" "help.text" msgid "Wizards On/Off" -msgstr "Assistenten ein/aus" +msgstr "Steuerelement-Assistenten ein/aus" #. fhDwK #: 01170000.xhp @@ -869,7 +869,7 @@ "par_idN11B65\n" "help.text" msgid "Icon Toggle Form Control Wizards" -msgstr "" +msgstr "Symbol für Steuerelement-Assistenten umschalten" #. ySzEv #: 01170000.xhp @@ -878,7 +878,7 @@ "par_idN11B76\n" "help.text" msgid "Turns on and turns off the automatic form controls wizards." -msgstr "Schaltet die Assistenten für automatische Formular-Steuerelemente ein beziehungsweise aus." +msgstr "Schaltet den Assistenten für automatische Formular-Steuerelemente ein beziehungsweise aus." #. DAjtU #: 01170000.xhp @@ -2768,7 +2768,7 @@ "par_id3156422\n" "help.text" msgid "As with list boxes or combo boxes, you can open or close the list with a mouse click at the arrow on the right end of the field. However, the input here can be entered either in the opened list or in the top text field. An exception is the properties that expect a list representation, for example, the property \"List Entries\", which can be set for the control fields List Box and Combo Box. Here, you can only edit the entries when the field is opened." -msgstr "Wie bei Kombinationsfeldern können Sie die Liste mit einem Klick auf den Pfeil am rechten Rand des Feldes mit einem Mausklick auf- und zuklappen. Die Eingabe kann hier allerdings sowohl in der aufgeklappten Liste als auch im oberen Textfeld erfolgen. Eine Ausnahme bilden die Eigenschaften, die eine Listendarstellung erwarten, wie beispielsweise die Eigenschaft \"Listen-Einträge\", die für die Steuerelemente Listenfeld und Kombinationsfeld gesetzt werden kann. Hier können Sie die Einträge nur im aufgeklappten Zustand bearbeiten." +msgstr "Wie bei Kombinationsfeldern können Sie die Liste mit einem Klick auf den Pfeil am rechten Rand des Feldes mit einem Mausklick auf- und zuklappen. Die Eingabe kann hier allerdings sowohl in der aufgeklappten Liste als auch im oberen Textfeld erfolgen. Eine Ausnahme bilden die Eigenschaften, die eine Listendarstellung erwarten, wie beispielsweise die Eigenschaft \"Listeneinträge\", die für die Steuerelemente Listenfeld und Kombinationsfeld gesetzt werden kann. Hier können Sie die Einträge nur im aufgeklappten Zustand bearbeiten." #. RBV9J #: 01170101.xhp @@ -2804,7 +2804,7 @@ "par_id3155342\n" "help.text" msgid "If you export the current form document to HTML format, the default control values are exported, not the current control values. Default values are determined - depending on the type of control - by the properties' Default value (for example, in text fields), Default status (for check boxes and option fields), and Default selection (for list boxes)." -msgstr "Wenn Sie das aktuelle Formular-Dokument in das HTML-Format exportieren, werden nur die Standardwerte der Steuerelemente exportiert, nicht die aktuellen. Die Standardwerte sind - je nach Art des Steuerelements - durch die Eigenschaften Standardwert (beispielsweise in Textfeldern), Standardstatus (für Auswahl- und Optionsfelder) und Standardauswahl (für Listenfelder) festgelegt." +msgstr "Wenn Sie das aktuelle Formulardokument in das HTML-Format exportieren, werden nur die Standardwerte der Steuerelemente exportiert, nicht die aktuellen. Die Standardwerte sind - je nach Art des Steuerelements - durch die Eigenschaften Standardwert (beispielsweise in Textfeldern), Standardstatus (für Auswahl- und Optionsfelder) und Standardauswahl (für Listenfelder) festgelegt." #. FbjBr #: 01170101.xhp @@ -3920,7 +3920,7 @@ "hd_id3145756\n" "help.text" msgid "List entries" -msgstr "Listen-Einträge" +msgstr "Listeneinträge" #. 5FGGc #: 01170101.xhp @@ -3929,7 +3929,7 @@ "par_id3151300\n" "help.text" msgid "Defines the list entries visible in the document. Open this list and type your text. Use Shift+Enter for a new line. With list and combo boxes, you can define the list entries that will be visible in the document. Open the List entries field and type your text. Please note the tips referring to the keyboard controls." -msgstr "Bestimmt die im Dokument sichtbaren Listeneinträge. Öffnen Sie diese Liste und geben Sie Ihren Text ein. Verwenden Sie Umschalt+Eingabetaste für eine neue Zeile. Bei Listen- und Kombinationsfeldern können Sie die im Dokument sichtbaren Listeneinträge vorgeben. Öffnen Sie das Feld Listen-Einträge und geben Sie den Text ein. Beachten Sie bitte die Tipps bezogen auf die Tastatur-Steuerung." +msgstr "Bestimmt die im Dokument sichtbaren Listeneinträge. Öffnen Sie diese Liste und geben Sie Ihren Text ein. Verwenden Sie Umschalt+Eingabetaste für eine neue Zeile. Bei Listen- und Kombinationsfeldern können Sie die im Dokument sichtbaren Listeneinträge vorgeben. Öffnen Sie das Feld Listeneinträge und geben Sie den Text ein. Beachten Sie bitte die Tipps bezogen auf die Tastatursteuerung." #. ELF5e #: 01170101.xhp @@ -3965,7 +3965,7 @@ "par_id3150511\n" "help.text" msgid "For HTML documents, a list entry entered on the General tab corresponds to the HTML tag