[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-1' - Repository.mk

[Tor Lillqvist]

 Repository.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b7bf29eb0896eb2f431345e1a0c3515a3a13ecc6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 12 16:36:55 2016 +0200

    We need to mention the vcl_opengl_blacklist here
    
    Otherwise the file won't be included in the installer.
    
    Change-Id: I928144e666377f18efa3a66f1e8c3e4204a708dc
    (cherry picked from commit 98015cdcde77d23b66636591280463ae577246c0)
    Reviewed-on: https://gerrit.libreoffice.org/22319
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/Repository.mk b/Repository.mk
index 5e9bb48..a786b04 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -816,6 +816,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	xmlsec \
 	chart2_opengl_shader \
 	vcl_opengl_shader \
+	$(if $(filter WNT,$(OS)), \
+		vcl_opengl_blacklist \
+	) \
 	$(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
 ))