[network-manager-applet] build: temporarily allow building against libnma 1.22
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] build: temporarily allow building against libnma 1.22
- Date: Thu, 5 Mar 2020 13:52:28 +0000 (UTC)
commit 02f24fa5cae1f7a2e4094965534dda6d3740b6c0
Author: Thomas Haller <thaller redhat com>
Date: Thu Mar 5 14:50:22 2020 +0100
build: temporarily allow building against libnma 1.22
With the split of libnma to a new repository, we also moved the
"org.gnome.nm-applet.gschema.xml" file. For that (and maybe other
reasons), we really need to build master of applet against latest
libnma (1.8.28).
However, libnma is not yet widely packaged, so for development and testing
this is rather inconvenient. Relax the requirement to allow building against
older libnma.
This patch should eventually be reverted.
configure.ac | 4 ++--
meson.build | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2fb88de0..a3f3bffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,8 +73,8 @@ LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_16"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_16"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNMA_VERSION_MIN_REQUIRED=NMA_VERSION_1_8_28"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNMA_VERSION_MAX_ALLOWED=NMA_VERSION_1_8_28"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNMA_VERSION_MIN_REQUIRED=NMA_VERSION_1_8_22"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNMA_VERSION_MAX_ALLOWED=NMA_VERSION_1_8_22"
PKG_CHECK_MODULES(LIBNMA, libnma)
diff --git a/meson.build b/meson.build
index 7ef756e9..0823ede0 100644
--- a/meson.build
+++ b/meson.build
@@ -144,8 +144,8 @@ cflags = [
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38',
'-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_16',
'-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_16',
- '-DNMA_VERSION_MIN_REQUIRED=NMA_VERSION_1_8_28',
- '-DNMA_VERSION_MAX_ALLOWED=NMA_VERSION_1_8_28',
+ '-DNMA_VERSION_MIN_REQUIRED=NMA_VERSION_1_8_22',
+ '-DNMA_VERSION_MAX_ALLOWED=NMA_VERSION_1_8_22',
]
libnm_dep = declare_dependency(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]