[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk scp2/source

[Miklos Vajna]

 scp2/InstallModule_ooo.mk                 |    1 +
 scp2/source/ooo/module_libreofficekit.scp |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 8373ae58eb0dfb57d5145afaf6830ec9f05849de
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Tue Jan 19 22:03:39 2016 +0100

    scp2: fix --disable-gtk3 build
    
    Change-Id: I231cb935f1d0a4e69bc3f970e48aece8305ab2b3

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 77b865c..47c8cc6 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
        ENABLE_GTK \
+       ENABLE_GTK3 \
        ENABLE_MACOSX_SANDBOX \
        ENABLE_ONLINE_UPDATE \
        ENABLE_TDE \
diff --git a/scp2/source/ooo/module_libreofficekit.scp 
b/scp2/source/ooo/module_libreofficekit.scp
index e66331f..09b3220 100644
--- a/scp2/source/ooo/module_libreofficekit.scp
+++ b/scp2/source/ooo/module_libreofficekit.scp
@@ -28,6 +28,7 @@ Directory gid_Dir_Share_Libreofficekit
     DosName = "libreofficekit";
 End
 
+#ifdef ENABLE_GTK3
 File gid_File_Dat_HandleImageStart
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Libreofficekit;
@@ -55,5 +56,6 @@ File gid_File_Dat_HandleGraphic
     Name = "handle_graphic.png";
     Styles = (PACKED);
 End
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits