[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - scp2/source vcl/Library_vcl.mk

[Riccardo Magliocchetti]

 scp2/source/ooo/file_ooo.scp |    2 +-
 vcl/Library_vcl.mk           |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 882f8dd06fba025177f8cc1e662c95b01075006d
Author: Riccardo Magliocchetti <riccardo.magliocche...@gmail.com>
Date:   Wed Jun 24 12:20:09 2015 +0200

    Fixup vcl build with --without-x
    
    Fix provided by Abhimanyu Singh
    
    Change-Id: I5d87aa76517b1cf9d7464f43b9be236de0e92039
    Reviewed-on: https://gerrit.libreoffice.org/16452
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    (cherry picked from commit d2d18465b027fc26af2a170959109d19f107d09b)

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7c99bed..542c8f52 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -605,6 +605,12 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/unx/generic/printer/ppdparser \
     vcl/null/printerinfomanager \
     vcl/headless/headlessinst \
+    $(vcl_headless_code) \
+    $(vcl_headless_freetype_code) \
+))
+
+$(eval $(call gb_Library_use_libraries,vcl,\
+       basebmp \
 ))
 
 $(eval $(call gb_Library_use_externals,vcl,\
commit 8b5e393e1be96bd2bbd41aa3dca881e1c07ccea9
Author: Riccardo Magliocchetti <riccardo.magliocche...@gmail.com>
Date:   Wed Jun 24 17:01:56 2015 +0200

    Avoid errors with stuff not build on --without-x
    
    Reported by by Abhimanyu Singh
    
    Change-Id: I02bd2a2b85b9d55f0b237d3a1141801245473cd2
    Reviewed-on: https://gerrit.libreoffice.org/16453
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    (cherry picked from commit 64b636b814ddd65b90459c75a49cc5e743a2785c)

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a682256..b0f3382 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -59,7 +59,7 @@ End
 
 #endif
 
-#if defined UNX && ! defined MACOSX
+#if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS
 
 File gid_File_Bin_Gnome_Open_Url
     BIN_FILE_BODY;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits