[PATCH] configure: reguire libjpeg 8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3796
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/3796/1
configure: reguire libjpeg 8
b5a9cc71 introduced the use of JERR_BAD_CROP_SPEC which is available
since libjpeg8.
Change-Id: I19e4287b0c1a9ddc0baaa70ab61364f99571682c
---
M configure.ac
1 file changed, 14 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index af43cac..4f6a102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7175,6 +7175,20 @@
[AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
[AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
+AC_MSG_CHECKING([[libjpeg version is 8 or greater]])
+ AC_PREPROC_IFELSE([ AC_LANG_SOURCE(
+ [[
+#include stdio.h
+#include jpeglib.h
+#if JPEG_LIB_VERSION 80
+#error wrong version
+#endif
+int main(int c, char**v) { return 0; }
+ ]]) ],
+ [AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)
+ AC_MSG_ERROR(jpeg library version = 8 required)
+ ])
libo_MINGW_CHECK_DLL([libjpeg])
else
AC_MSG_RESULT([internal])
--
To view, visit https://gerrit.libreoffice.org/3796
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I19e4287b0c1a9ddc0baaa70ab61364f99571682c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] configure: with --enable-headless disable opengl by default
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3803 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/3803/1 configure: with --enable-headless disable opengl by default It makes no sense without a gui, one less one is forced to use with --enable-headless Issue fixed in master in 2ac38d1eac981a411f89b666c6f72aef88fa1f73 Change-Id: I28bd271ca1121070a331cd0a9b1d1ce823ce7c63 --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 89feb7f..9a89227 100644 --- a/configure.ac +++ b/configure.ac @@ -4356,6 +4356,7 @@ enable_unix_qstart_libpng=no enable_cairo_canvas=no enable_gnome_vfs=no +enable_opengl=no fi dnl === -- To view, visit https://gerrit.libreoffice.org/3803 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28bd271ca1121070a331cd0a9b1d1ce823ce7c63 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#61092: force ENABLE_QUICKSTART_LIBPNG to None with --ena...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3802 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/3802/1 fdo#61092: force ENABLE_QUICKSTART_LIBPNG to None with --enable-headless Fixes compile issues with --enable-headless if png headers are installed. Backport of 37690fe74c4c585564c67c1ff7b8be353cf68033 Change-Id: Ia16b38ae61f485ba62cd2b802a2e1239697be088 --- M configure.ac 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b196fe9..89feb7f 100644 --- a/configure.ac +++ b/configure.ac @@ -4353,7 +4353,7 @@ test_tde=no test_kde=no test_kde4=no -test_unix_quickstarter=no +enable_unix_qstart_libpng=no enable_cairo_canvas=no enable_gnome_vfs=no fi @@ -9446,7 +9446,12 @@ dnl === -PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG=TRUE, ENABLE_QUICKSTART_LIBPNG= ) +if test $enable_headless != yes; then +PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG=TRUE, ENABLE_QUICKSTART_LIBPNG= ) +else +LIBPNG_LIBS='' +LIBPNG_CFLAGS='' +fi AC_SUBST(LIBPNG_LIBS) AC_SUBST(LIBPNG_CFLAGS) -- To view, visit https://gerrit.libreoffice.org/3802 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia16b38ae61f485ba62cd2b802a2e1239697be088 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] configure: don't enable ENABLE_NPAPI_FROM_BROWSER with --ena...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3786 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3786/1 configure: don't enable ENABLE_NPAPI_FROM_BROWSER with --enable-headless This fix a build error since otherwise X libraries are required Backport of 759cc27530a5f58b43721f2d760c9429561a12fd Change-Id: Iba718969dca90563ba9e60aa16944e6de67c7141 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 390b3eb..b196fe9 100644 --- a/configure.ac +++ b/configure.ac @@ -8304,7 +8304,7 @@ dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents dnl === AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents]) -if test $_os != Android -a $_os != iOS +if test $_os != Android -a $_os != iOS -a $enable_headless != yes then AC_MSG_RESULT([yes]) ENABLE_NPAPI_FROM_BROWSER=YES -- To view, visit https://gerrit.libreoffice.org/3786 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba718969dca90563ba9e60aa16944e6de67c7141 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] desktop: add --pidfile switch
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2928
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/2928/1
desktop: add --pidfile switch
Store the soffice.bin pid to a file. Useful with --headless where
you may have libreoffice supervised by another process.
Change-Id: I6a3c6cb920fc7b8e659a01975b4d457ce5525b17
---
M desktop/source/app/app.cxx
M desktop/source/app/cmdlineargs.cxx
M desktop/source/app/cmdlineargs.hxx
M desktop/source/app/cmdlinehelp.cxx
4 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d3e7b26..aef2d1f 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -124,6 +124,14 @@
#endif
#endif //WNT
+#if defined WNT
+#include process.h
+#define GETPID _getpid
+#else
+#include unistd.h
+#define GETPID getpid
+#endif
+
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
@@ -1570,6 +1578,38 @@
impl_checkRecoveryState(bCrashed, bExistsRecoveryData,
bExistsSessionData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, } impl_checkRecoveryState );
+OUString pidfileName = rCmdLineArgs.GetPidfileName();
+if ( !pidfileName.isEmpty() )
+{
+OUString pidfileURL;
+
+if ( osl_getFileURLFromSystemPath(pidfileName.pData,
pidfileURL.pData) == osl_File_E_None )
+{
+osl::File pidfile( pidfileURL );
+osl::FileBase::RC rc;
+
+osl::File::remove( pidfileURL );
+if ( (rc = pidfile.open( osl_File_OpenFlag_Write |
osl_File_OpenFlag_Create ) ) == osl::File::E_None )
+{
+OString pid( OString::valueOf( static_castsal_Int32(
GETPID() ) ) );
+sal_uInt64 written = 0;
+if ( pidfile.write(pid.getStr(), pid.getLength(), written)
!= osl::File::E_None )
+{
+SAL_WARN(desktop, cannot write pidfile
pidfile.getURL());
+}
+pidfile.close();
+}
+else
+{
+SAL_WARN(desktop, cannot open pidfile
pidfile.getURL() osl::FileBase::RC(rc));
+}
+}
+else
+{
+SAL_WARN(desktop, cannot get pidfile URL from path
pidfileName);
+}
+}
+
if ( rCmdLineArgs.IsHeadless() )
{
// Ensure that we use not the system file dialogs as
@@ -1739,6 +1779,24 @@
if ( rCmdLineArgs.IsHeadless() )
SvtMiscOptions().SetUseSystemFileDialog(
pExecGlobals-bUseSystemFileDialog );
+OUString pidfileName = rCmdLineArgs.GetPidfileName();
+if ( !pidfileName.isEmpty() )
+{
+OUString pidfileURL;
+
+if ( osl_getFileURLFromSystemPath(pidfileName.pData,
pidfileURL.pData) == osl_File_E_None )
+{
+if ( osl::File::remove( pidfileURL ) != osl::FileBase::E_None )
+{
+SAL_WARN(desktop, shutdown: cannot remove pidfile
pidfileURL);
+}
+}
+else
+{
+SAL_WARN(desktop, shutdown: cannot get pidfile URL from path
pidfileName);
+}
+}
+
// remove temp directory
RemoveTemporaryDirectory();
FlushConfiguration();
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 83a251c..24de22a 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -525,6 +525,10 @@
{
m_language = oArg.copy(RTL_CONSTASCII_LENGTH(language=));
}
+else if ( oArg.matchIgnoreAsciiCase(pidfile=))
+{
+m_pidfile = oArg.copy(RTL_CONSTASCII_LENGTH(pidfile=));
+}
else if ( oArg == writer )
{
m_writer = true;
@@ -849,6 +853,11 @@
return m_bDocumentArgs;
}
+OUString CommandLineArgs::GetPidfileName() const
+{
+return m_pidfile;
+}
+
} // namespace desktop
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/cmdlineargs.hxx
b/desktop/source/app/cmdlineargs.hxx
index a9c2c48..4ea5e0d 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -105,6 +105,7 @@
std::vector rtl::OUString GetConversionList() const;
rtl::OUString GetConversionParams() const;
rtl::OUString GetConversionOut() const;
+OUString GetPidfileName() const;
// Special analyzed states (does not match directly to a command line
parameter!)
bool IsEmpty() const;
@@ -166,6 +167,7 @@
rtl::OUString m_conversionout; // contains external URIs
std::vector rtl::OUString m_infilter;
rtl::OUString m_language;
+OUString m_pidfile;
};
}
diff --git
Change in core[master]: configure: accept building without themes
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1879 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/1879/1 configure: accept building without themes If --with-theme=no is specified disallow any check for valid themes which would otherwise give an error. Change-Id: I45d2872145f3bd15e17beac4f69f8b4b1855d9a3 --- M configure.ac 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index dc13c15..7a29b48 100644 --- a/configure.ac +++ b/configure.ac @@ -10824,14 +10824,16 @@ fi WITH_THEMES= -for theme in $with_theme; do -case $theme in - crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;; -*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; -esac -WITH_THEMES=$WITH_THEMES $theme -SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'` -done +if test x$with_theme != xno; then +for theme in $with_theme; do +case $theme in + crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;; +*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; +esac +WITH_THEMES=$WITH_THEMES $theme +SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'` +done +fi AC_MSG_RESULT([$WITH_THEMES]) AC_SUBST([WITH_THEMES]) -- To view, visit https://gerrit.libreoffice.org/1879 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45d2872145f3bd15e17beac4f69f8b4b1855d9a3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Add ability to send SAL_* messages to syslog
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1417 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/1417/1 Add ability to send SAL_* messages to syslog Use environment variable SAL_LOG_SYSLOG=1 Change-Id: I0c260ca69fbeefb0c2e8cc46ca6955e92791c05b --- M config/config_global.h.in M configure.ac M sal/osl/all/log.cxx M sal/osl/unx/salinit.cxx 4 files changed, 56 insertions(+), 4 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1417 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c260ca69fbeefb0c2e8cc46ca6955e92791c05b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] vcl/headless: remove rtl namespace prefix from OUstring meth...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1422 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/1422/1 vcl/headless: remove rtl namespace prefix from OUstring methods Change-Id: Ic3948384bc1709d648507c41542c34437abea468 --- M vcl/headless/headlessinst.cxx M vcl/headless/svpdummies.cxx M vcl/headless/svpinst.cxx M vcl/headless/svpprn.cxx M vcl/headless/svptext.cxx 5 files changed, 22 insertions(+), 25 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1422 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3948384bc1709d648507c41542c34437abea468 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
