diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-03-06 20:10:38 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-03-07 16:24:07 +0100 |
| commit | 91337dd4bdcd5193086484821b316d2847881361 (patch) | |
| tree | 6073d949a47c564d1f67879b59f023fcf4da9faf | |
| parent | 240da3ea68caa9eac516d5c2bd993c0eb7cc58be (diff) | |
| download | network-manager-applet-91337dd4bdcd5193086484821b316d2847881361.tar.gz | |
build: require libnma 1.8.28
Applet requires libnma-1.8.28 because "org.gnome.nm-applet.gschema.xml"
moved to libnma.
Now libnma 1.8.28 got released. Explicitly encode the dependency.
Note that it is still inconvenient at this point to bootstrap
and build applet as such.
It is inconvenient if you are on current Fedora 31 with
gnome-control-center. Then, gnome-control-center will require
nm-connection-editor (1.8.24) which will require libnma-1.8.24.
That means, even if you rebuild libnma-1.8.28 RPM, you cannot
install it (because you have no suitable nm-connection-editor
which gnome-control-center requires).
As workaround, build nm-connection-editor first in a build root
without Gnome, only libnma-1.8.28 present.
Still bump the dependency because it's right to do before release
and we will applet 1.16.0 shortly. While inconvenient to boot strap,
it's doable to have libnma-1.8.28 present for building applet.
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | meson.build | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index fb69d907..b7df1613 100644 --- a/configure.ac +++ b/configure.ac @@ -59,15 +59,15 @@ GETTEXT_PACKAGE=nm-applet AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0]) +PKG_CHECK_MODULES(LIBNM, [libnm >= 1.15 gio-2.0 >= 2.38 gmodule-export-2.0]) 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_22" -LIBNM_CFLAGS="$LIBNM_CFLAGS -DNMA_VERSION_MAX_ALLOWED=NMA_VERSION_1_8_22" -PKG_CHECK_MODULES(LIBNMA, libnma) +PKG_CHECK_MODULES(LIBNMA, libnma >= 1.8.27) +LIBNMA_CFLAGS="$LIBNMA_CFLAGS -DNMA_VERSION_MIN_REQUIRED=NMA_VERSION_1_8_28" +LIBNMA_CFLAGS="$LIBNMA_CFLAGS -DNMA_VERSION_MAX_ALLOWED=NMA_VERSION_1_8_28" PKG_CHECK_MODULES(LIBSECRET, [libsecret-1 >= 0.18]) diff --git a/meson.build b/meson.build index eeadd4c2..2fa36d3e 100644 --- a/meson.build +++ b/meson.build @@ -107,7 +107,7 @@ linker_script_ver = join_paths(meson.source_root(), 'linker-script-binary.ver') gio_dep = dependency('gio-2.0', version: '>= 2.38') gmodule_export_dep = dependency('gmodule-export-2.0') libsecret_dep = dependency('libsecret-1', version: '>= 0.18') -libnma_dep = dependency('libnma') +libnma_dep = dependency('libnma', version: '>= 1.8.27') m_dep = cc.find_library('m') @@ -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_22', - '-DNMA_VERSION_MAX_ALLOWED=NMA_VERSION_1_8_22', + '-DNMA_VERSION_MIN_REQUIRED=NMA_VERSION_1_8_28', + '-DNMA_VERSION_MAX_ALLOWED=NMA_VERSION_1_8_28', ] libnm_dep = declare_dependency( |