Merge branch 'wip/wjt/more-gtk4' into 'main'

Fix some build system leftovers from the GTK 4 port

See merge request pwithnall/malcontent!144

NEWS

@@ -1,3 +1,19 @@
+Overview of changes in malcontent 0.11.0
+========================================
+
+* libmalcontent-ui, and the malcontent-control application, now use
+  libappstream rather than appstream-glib. (#51)
+
+* libmalcontent-ui, and the malcontent-control application, now use GTK 4 and
+  libadwaita rather than GTK+ 3. (!141)
+
+* As a result of these changes, the pkg-config name has been bumped to
+  libmalcontent-ui-1, and the gobject-introspection name to MalcontentUi-1.
+
+* Translation updates:
+ - Italian
+ - Russian
+
 Overview of changes in malcontent 0.10.5
 ========================================
 

libmalcontent-ui/meson.build

@@ -1,4 +1,4 @@
-libmalcontent_ui_api_version = '0'
+libmalcontent_ui_api_version = '1'
 libmalcontent_ui_api_name = 'malcontent-ui-' + libmalcontent_ui_api_version
 
 if not cc.has_function('atexit')
@@ -28,7 +28,7 @@ libmalcontent_ui_public_deps = [
   dependency('gio-2.0', version: '>= 2.44'),
   dependency('glib-2.0', version: '>= 2.54.2'),
   dependency('gobject-2.0', version: '>= 2.54'),
-  dependency('gtk4', version: '>= 4.6'),
+  gtk_dep,
   libadwaita_dep,
   libmalcontent_dep,
 ]
@@ -75,14 +75,14 @@ libmalcontent_ui_gir = gnome.generate_gir(libmalcontent_ui,
   symbol_prefix: 'mct_',
   identifier_prefix: 'Mct',
   export_packages: 'libmalcontent-ui',
-  includes: ['AccountsService-1.0', 'Gio-2.0', 'GObject-2.0', 'Gtk-3.0', libmalcontent_gir[0]],
+  includes: ['AccountsService-1.0', 'Gio-2.0', 'GObject-2.0', 'Gtk-4.0', 'Adw-1', libmalcontent_gir[0]],
   install: true,
   dependencies: libmalcontent_ui_dep,
 )
 
 xmllint = find_program('xmllint', required: false)
 if xmllint.found()
-  gtk_prefix = dependency('gtk+-3.0').get_variable(pkgconfig: 'prefix')
+  gtk_prefix = gtk_dep.get_variable(pkgconfig: 'prefix')
   test(
     'validate-ui', xmllint,
     args: [

malcontent-control/meson.build

@@ -27,7 +27,7 @@ malcontent_control = executable('malcontent-control',
     dependency('gio-2.0', version: '>= 2.44'),
     dependency('glib-2.0', version: '>= 2.54.2'),
     dependency('gobject-2.0', version: '>= 2.54'),
-    dependency('gtk4', version: '>= 4.6'),
+    gtk_dep,
     dependency('polkit-gobject-1'),
     libadwaita_dep,
     libmalcontent_dep,
@@ -79,7 +79,7 @@ endif
 
 xmllint = find_program('xmllint', required: false)
 if xmllint.found()
-  gtk_prefix = dependency('gtk+-3.0').get_variable(pkgconfig: 'prefix')
+  gtk_prefix = gtk_dep.get_variable(pkgconfig: 'prefix')
   test(
     'validate-ui', xmllint,
     args: [

meson.build

@@ -1,5 +1,5 @@
 project('malcontent', 'c',
-  version : '0.10.5',
+  version : '0.11.0',
   meson_version : '>= 0.57.0',
   license: ['LGPL-2.1-or-later', 'GPL-2.0-or-later'],
   default_options : [
@@ -134,6 +134,7 @@ else
                        'Malcontent-' + libmalcontent_api_version + '.typelib']
 endif
 if get_option('ui').enabled()
+  gtk_dep = dependency('gtk4', version: '>= 4.6')
   libadwaita_dep = dependency(
     'libadwaita-1',
     version: '>= 1.1',