[Libreoffice-commits] .: 2 commits - desktop/unx distro-configs/LibreOfficeLinux.conf

[Libreoffice Gerrit user]

 desktop/unx/source/splashx.c         |    3 +++
 distro-configs/LibreOfficeLinux.conf |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit 2a6980107015a30e01873a45f8798b8a20ccfd73
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 3 13:34:05 2012 +0100

    --without-system-libpng for "universal" Linux builds
    
    ...so that e.g. Fedora 17 does not require installation of libpng-compat package
    for old libpng12.so.
    
    Change-Id: I45cf3928b30dbbb815f70cde1972dc4972007c05

diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 244bffd..4ed55ee 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -7,6 +7,7 @@
 --without-system-openssl
 --without-system-mozilla
 --without-system-mesa-headers
+--without-system-libpng
 --without-system-libxml
 --without-system-jpeg
 --without-system-jars
commit c2500a004dbb4830202b49d8031e35e66c7c739d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 3 13:33:52 2012 +0100

    -Werror=unused-parameter
    
    Change-Id: If1aad98965a90ac6b2e5488f21fe0d84c9b4af47

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index b08ba48..6dd2fa2 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -798,14 +798,17 @@ struct splash
 /* Stubs that will never be called in this case */
 void splash_draw_progress( struct splash* splash, int progress )
 {
+    (void)splash; (void)progress;
 }
 
 void splash_destroy(struct splash* splash)
 {
+    (void)splash;
 }
 
 struct splash* splash_create(rtl_uString* pAppPath, int argc, char** argv)
 {
+    (void)pAppPath; (void)argc; (void)argv;
     return NULL;
 }