|
 |
f325b2 |
From 91e8213dde243c9acf18ffe2bcdce489d0fcbd8b Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f325b2 |
Date: Mon, 7 Mar 2016 13:19:55 +0000
|
|
|
f325b2 |
Subject: [PATCH 396/398] gtktiledviewer needs gtk3 not gtk2
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Iede2008139cb570ff65202762e92f6694548a065
|
|
|
f325b2 |
(cherry picked from commit e451b03e8c21ad23cb1abfd6dd68b6d1e8188121)
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/22982
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
|
f325b2 |
(cherry picked from commit 13ee59bf851b60a50d679a153641343206d58474)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
Repository.mk | 4 ++--
|
|
|
f325b2 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/Repository.mk b/Repository.mk
|
|
|
f325b2 |
index dd0afca39b7a..fad426921935 100644
|
|
|
f325b2 |
--- a/Repository.mk
|
|
|
f325b2 |
+++ b/Repository.mk
|
|
|
f325b2 |
@@ -67,13 +67,13 @@ $(eval $(call gb_Helper_register_executables,NONE, \
|
|
|
f325b2 |
svptest \
|
|
|
f325b2 |
svpclient \
|
|
|
f325b2 |
pixelctl ) \
|
|
|
f325b2 |
- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
|
|
|
f325b2 |
+ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
|
|
|
f325b2 |
$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \
|
|
|
f325b2 |
outdevgrind) \
|
|
|
f325b2 |
vcldemo \
|
|
|
f325b2 |
tiledrendering \
|
|
|
f325b2 |
mtfdemo \
|
|
|
f325b2 |
- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
|
|
|
f325b2 |
+ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
|
|
|
f325b2 |
))
|
|
|
f325b2 |
|
|
|
f325b2 |
$(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|