[libnma] build: un-mark libnma-gtk4 as experimental



commit 54d313c2ea1455d3762a9aa4ef1babf4d509ca69
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Mar 30 13:09:16 2022 +0200

    build: un-mark libnma-gtk4 as experimental
    
    As GNOME 42 uses this, it's no longer an experiment.
    
    Leave gcr-gtk4 marged EXPERIMENTAL since there's no release of Gtk4-enabled
    version GCR and therefore we don't know what for sure what will the API
    be like or even what will the library name be. The .ui files for PKCS#11
    probably won't work with Gtk4 either.
    
    https://gitlab.gnome.org/GNOME/libnma/-/merge_requests/30

 configure.ac      | 6 +++---
 meson.build       | 2 +-
 meson_options.txt | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 76316717..ffcafe02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
 PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.12)
 GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_12 
-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_12"
 
-AC_ARG_WITH(libnma-gtk4, AS_HELP_STRING([--with-libnma-gtk4], [build EXPERIMENTAL libnma-gtk4 library for 
use with GTK4]))
+AC_ARG_WITH(libnma-gtk4, AS_HELP_STRING([--with-libnma-gtk4], [build libnma-gtk4 library for use with GTK4]))
 if test "$with_libnma_gtk4" == yes; then
        PKG_CHECK_MODULES(GTK4, gtk4 >= 4.0)
        GTK4_CFLAGS="$GTK4_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_0 
-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_0"
@@ -299,9 +299,9 @@ src/nma-version.h
 AC_OUTPUT
 
 echo ""
-echo "  Build EXPERIMENTAL libnma-gtk4 library for use with GTK4: --with-libnma-gtk4=${with_libnma_gtk4}"
+echo "  Build libnma-gtk4 library for use with GTK4: --with-libnma-gtk4=${with_libnma_gtk4}"
 echo "  GCR: --with-gcr=$have_gcr"
-echo "  GCR_GTK4: --with-gcr-gtk4=$have_gcr_gtk4"
+echo "  GCR_GTK4 (EXPERIMENTAL): --with-gcr-gtk4=$have_gcr_gtk4"
 echo "  LTO: --enable-lto=$enable_lto"
 echo "  Linker garbage collection: --enable-ld-gc=$enable_ld_gc"
 echo ""
diff --git a/meson.build b/meson.build
index 422e403f..d2396d0d 100644
--- a/meson.build
+++ b/meson.build
@@ -410,7 +410,7 @@ configure_file(
 )
 
 output = '\n'
-output += '  Build EXPERIMENTAL library libnm-gtk4 for use with GTK4: ' + enable_libnma_gtk4.to_string() + 
'\n'
+output += '  Build library libnm-gtk4 for use with GTK4: ' + enable_libnma_gtk4.to_string() + '\n'
 output += '  GCR: ' + enable_gcr.to_string() + '\n'
 output += '  LTO: ' + get_option('b_lto').to_string() + '\n'
 output += '  Linker garbage collection: ' + enable_ld_gc.to_string() + '\n'
diff --git a/meson_options.txt b/meson_options.txt
index 1dd1354c..3882407e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('libnma_gtk4', type: 'boolean', value: false, description: 'build EXPERIMENTAL library libnma-gtk4 
for use with GTK4')
+option('libnma_gtk4', type: 'boolean', value: false, description: 'build library libnma-gtk4 for use with 
GTK4')
 option('gcr', type: 'boolean', value: true, description: 'Enable advanced certificate chooser.')
 option('gcr_gtk4', type: 'boolean', value: false, description: 'Enable advanced certificate chooser for 
EXPERIMENTAL library libnma-gtk4.')
 option('more_asserts', type: 'string', value: '0', description: 'Enable more assertions for debugging.')


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