[network-manager-applet/lr/meson-fixes: 1/4] build: fix required GTK3 version



commit a76c3336f31dfa1d8d00be05d2ed96377d699b91
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Feb 15 17:19:47 2019 +0100

    build: fix required GTK3 version
    
    The GtkBuilder files and the autoconf script all depend on 3.10.
    However, a few places were left where 3.4 was forgotten.

 configure.ac | 2 +-
 meson.build  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 10a92f56..6acac4ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,7 @@ fi
 PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3])
 
 PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10)
-GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 
-DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_4"
+GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10 
-DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_10"
 
 AC_ARG_WITH([appindicator],
             AS_HELP_STRING([--with-appindicator=no|yes|auto|ayatana|ubuntu], [Build with 
lib(ayatana-)appindicator support in addition to xembed systray support.]),
diff --git a/meson.build b/meson.build
index 7f226256..50881801 100644
--- a/meson.build
+++ b/meson.build
@@ -147,13 +147,13 @@ libsecret_dep = dependency('libsecret-1', version: '>= 0.18')
 m_dep = cc.find_library('m')
 
 # Check for gtk+
-gtk_req_version = '>= 3.4'
+gtk_req_version = '>= 3.10'
 
 gtk_dep = declare_dependency(
   dependencies: dependency('gtk+-3.0', version: gtk_req_version),
   compile_args: [
-    '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4',
-    '-DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_4'
+    '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10',
+    '-DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_10'
   ]
 )
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]