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

Caolán McNamara caolanm at redhat.com
Mon Mar 7 19:07:37 UTC 2016


 Repository.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 13ee59bf851b60a50d679a153641343206d58474
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 7 13:19:55 2016 +0000

    gtktiledviewer needs gtk3 not gtk2
    
    Change-Id: Iede2008139cb570ff65202762e92f6694548a065
    (cherry picked from commit e451b03e8c21ad23cb1abfd6dd68b6d1e8188121)
    Reviewed-on: https://gerrit.libreoffice.org/22982
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/Repository.mk b/Repository.mk
index a786b04..04519cb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -68,13 +68,13 @@ $(eval $(call gb_Helper_register_executables,NONE, \
         svptest \
         svpclient \
         pixelctl ) \
-	$(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
+	$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
 	$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \
 	    outdevgrind) \
 	vcldemo \
 	tiledrendering \
     mtfdemo \
-	$(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
+	$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
 ))
 
 $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \


More information about the Libreoffice-commits mailing list