|
 |
f325b2 |
From 1e080d37ad18059cbd2ca7d39ceafece5b826623 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Tor Lillqvist <tml@collabora.com>
|
|
|
f325b2 |
Date: Tue, 14 Jul 2015 11:01:48 +0300
|
|
|
f325b2 |
Subject: [PATCH 070/398] With --enable-gtk3 we need GLib >= 2.38
|
|
|
f325b2 |
|
|
|
f325b2 |
The G_ADD_PRIVATE used in libreofficekit/source/gtk/lokdocview.cxx is from
|
|
|
f325b2 |
2.38.
|
|
|
f325b2 |
|
|
|
f325b2 |
(cherry picked from commit f3df77accae2941ba9c6a5e48b84d661f7a87863)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I2058932f8252d2715f970f020160f4f960987125
|
|
|
f325b2 |
---
|
|
|
f325b2 |
configure.ac | 4 ++--
|
|
|
f325b2 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/configure.ac b/configure.ac
|
|
|
f325b2 |
index d1d82ea28cad..4e27231f6a5f 100644
|
|
|
f325b2 |
--- a/configure.ac
|
|
|
f325b2 |
+++ b/configure.ac
|
|
|
f325b2 |
@@ -9900,11 +9900,11 @@ if test "x$enable_gtk3" = "xyes"; then
|
|
|
f325b2 |
AC_MSG_ERROR([System cairo required for gtk3 support, do not combine --enable-gtk3 with --without-system-cairo])
|
|
|
f325b2 |
fi
|
|
|
f325b2 |
: ${with_system_cairo:=yes}
|
|
|
f325b2 |
- PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 gmodule-no-export-2.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
|
|
|
f325b2 |
+ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
|
|
|
f325b2 |
if test "x$ENABLE_GTK3" = "xTRUE"; then
|
|
|
f325b2 |
R="gtk3"
|
|
|
f325b2 |
else
|
|
|
f325b2 |
- AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
|
|
|
f325b2 |
+ AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not found])
|
|
|
f325b2 |
fi
|
|
|
f325b2 |
GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
|
|
|
f325b2 |
fi
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|