gentoo auto-resync : 26:04:2024 - 23:59:36

4 files changed, 48 insertions, 294 deletions

diff --git a/sys-libs/snapd-glib/Manifest b/sys-libs/snapd-glib/Manifest
index c52477f57851..a48588dc6a61 100644
--- a/sys-libs/snapd-glib/Manifest
+++ b/sys-libs/snapd-glib/Manifest
@@ -1,7 +1,8 @@
-AUX snapd-glib-1.64-qt6.patch 17595 BLAKE2B c6718840e33ad2c1b5aca2f38f9508bcfe49e083892eecfe1987b17f9c87b313309575d90996eb514cc6008e173a0a37d0263d695850ea4feff0a7cc5c0344f1 SHA512 a325ef62d0294643204826c3cb244e21fba65e23dd5dc17bd7197637f01fde8a32bb82921f7b5d7cf8422d60d98fb268eb9d6c79585ffbadf8e21d6b5209b45c
+AUX snapd-glib-1.65-install-missing-header.patch 372 BLAKE2B b2cd1bc66ff14d3adfb62f15f69b85e5be5c8f658835ac657ef7645d4256876f2fd7d6ae760c7b6fc25dd714f6e4cc497bbabd5445ca253101c351aac8170977 SHA512 7c2afe6558afbf94ce208eb0367f6e9f499f4f409555ba2357b7ab2af53c1b04a42fd1925cfef1c6701ac205d1696f5dad68fb009ce31008d7229e31e957287b
 DIST snapd-glib-1.63.tar.xz 187676 BLAKE2B a212f826ee35ef5458b716ce64d8f4b32474f991938bc314fcdb0feb5c803f93880a517fe5e1550bc82bc4992bee7467dc0d8cf5cb260712e83b8a1fe6b75743 SHA512 94a2f46e4e066270ea5492cb00fd44da247686a354cbe6766fe3e8974e6bb51f4cf1ca95027533417ec8c8117fc9d3866cb173a113b89d789b6ba518489a314f
 DIST snapd-glib-1.64.tar.xz 195580 BLAKE2B 1c6e958033c2b98dd72b5bfb6f1a44739a79d5d9a289fded9756cf3031a1fe62cccbf3ba4ce4c4f34d3c7e48b945b481ff6c3ae245d205a49e37845dd3efbb27 SHA512 a3fa101bcc64b750c170ccd433dbbfaa306354dc6c66d5ab62911c866b7e65f6aefc7e9c82f84f5d16b8b96174edf4bef771a4839ef6e5acd15399a84b93aec4
+DIST snapd-glib-1.65.tar.xz 205948 BLAKE2B e5253cd6f8ac908236a89bf8fa3ec2252d2e4bb0875c6860b63808663d80d59d0a5397a5170ac959492e720e1c8fe77d9674a6469cc58556073cf93888da9a8b SHA512 6bae381c6b5a83312004026228ee76e7b8722a5a561c991ceda35aaf104eaf84451f5a7ba299cad6b1f82e3dbcb16cc4780ac393cadb2ca58478b59a809fc613
 EBUILD snapd-glib-1.63.ebuild 1149 BLAKE2B dd24a67001aad8070a2d59d74b7c6631f81f887d098379a59cbd8cbca79fec6af48e72494f44d382d195b889df4734216eb1a99a7d38a070d3f08a9d2c0c0ee1 SHA512 6767b4e61361089372012b35c8cfc57bf622b66d2a0a52fdffbacd81bdc3704696a69676dddda2d029c8ce8fc1988d2646be249e09e8a72d9bd847407063ab08
-EBUILD snapd-glib-1.64-r100.ebuild 1171 BLAKE2B 4a043007a275d01c4ebc24eed4a1812b7a3eeaabcee88f1fa5d544d60b7a57cf814ee81a6bb12296069ba3fa3c8c3b510cc0cd6ecfb853c872108da1285c9f23 SHA512 4b55af754777aeea131c963c3cf6837645088258894c4c69ab3d838973ad7a28ed5425390ba26332cd7a649e97c7816117c411a061ea54625c079b0b03cfdaae
 EBUILD snapd-glib-1.64.ebuild 1150 BLAKE2B d766bca4abdb1fc8913e483159e6831e060a148bdc51ae60144072671b83b27ea6be416f0fec150bf148742f570a0d70d817b0fbfc3bb9d440e4ce20a6437031 SHA512 b883fd6d734203d4ed35f1c9a98331236f7d74ffacb77d20985f114a63eb73f9f91ca9aba8da4784782bb62b9393668e5dcf56cd34cb861ef64e6fffd53cbb57
+EBUILD snapd-glib-1.65-r1.ebuild 1570 BLAKE2B 56dc163a4e4f591e99a21c5fdb4647627d1840df0d12df5c4bc9da0f8fc56889119ec32cf77c729fca362b23a1b68a5d06ea231f033bc030f685787608e71890 SHA512 5b937d97cb209fa87996aa0858d38f3edb042641de26167c5e0451660917ac1b485c6b2aafe943cf8d139055e46c2ebfb87c90cb789f4305748ae9778de89ecc
 MISC metadata.xml 406 BLAKE2B ee1d1cdc33311cea7a3bcc4288fb8ec0148327eaa6fc59fd7c18ff3b34d9624a9e42a85f47254205a3d078651012d52ddc5f2dbf693f0250afc4194e389ba4be SHA512 1331657e9efe50b9901b2acc60694edf2c9f518a37f2a0d346969b78ceffe75d88a0503bb43fdac9a75eb81706440d99d8ce3eb6b9b112163438474b823338e1
diff --git a/sys-libs/snapd-glib/files/snapd-glib-1.64-qt6.patch b/sys-libs/snapd-glib/files/snapd-glib-1.64-qt6.patch
deleted file mode 100644
index de6b4bbdec5c..000000000000
--- a/sys-libs/snapd-glib/files/snapd-glib-1.64-qt6.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-From 5377f5d01adce209b9a148018cab100d5d5a1d4c Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Tue, 13 Feb 2024 01:25:39 +0100
-Subject: [PATCH] qt: Port to Qt 6
-
-It's what we are using in Discover now.
-diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
-index 8a8668f2..58700c2f 100644
---- a/.github/workflows/test.yaml
-+++ b/.github/workflows/test.yaml
-@@ -55,7 +55,7 @@ jobs:
-       - name: Install dependencies (Fedora)
-         if: startsWith(matrix.image, 'fedora:')
-         run: |
--          dnf install -y gcc gcc-c++ gobject-introspection-devel glib2-devel gtk-doc json-glib-devel libsoup3-devel ninja-build python3-pip qt5-qtbase-devel qt5-qtdeclarative-devel redhat-rpm-config vala
-+          dnf install -y gcc gcc-c++ gobject-introspection-devel glib2-devel gtk-doc json-glib-devel libsoup3-devel ninja-build python3-pip qt6-qtbase-devel qt6-qtdeclarative-devel redhat-rpm-config vala
- 
-       - name: Install meson
-         if: matrix.image != 'ubuntu:rolling'
-diff --git a/meson.build b/meson.build
-index b9f98d37..26951e9c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,7 +1,7 @@
- project ('snapd-glib', [ 'c', 'cpp' ],
-          version: '1.64',
--         meson_version: '>= 0.43.0',
--         default_options : [ 'c_std=c11', 'cpp_std=c++11' ])
-+         meson_version: '>= 0.57.0',
-+         default_options : [ 'c_std=c11' ])
- 
- glib_dep = dependency ('glib-2.0', version: '>= 2.46')
- gio_dep = dependency ('gio-2.0', version: '>= 2.46')
-@@ -14,9 +14,9 @@ endif
- json_glib_dep = dependency ('json-glib-1.0', version: '>= 1.1.2')
- 
- if get_option ('qt-bindings')
--  qt5_core_dep = dependency ('qt5', modules: [ 'Core' ])
--  qt5_network_dep = dependency ('qt5', modules: [ 'Network' ])
--  qml_dep = dependency ('qt5', modules: [ 'Qml' ])
-+  qt6_core_dep = dependency ('qt6', modules: [ 'Core' ])
-+  qt6_network_dep = dependency ('qt6', modules: [ 'Network' ])
-+  qml_dep = dependency ('qt6', modules: [ 'Qml' ])
- endif
- 
- datadir = join_paths (get_option ('prefix'), get_option ('datadir'))
-diff --git a/snapd-qt/markdown-node.cpp b/snapd-qt/markdown-node.cpp
-index 2be1751e..2e87707b 100644
---- a/snapd-qt/markdown-node.cpp
-+++ b/snapd-qt/markdown-node.cpp
-@@ -62,3 +62,14 @@ QSnapdMarkdownNode *QSnapdMarkdownNode::child (int n) const
-         return NULL;
-     return new QSnapdMarkdownNode (children->pdata[n]);
- }
-+
-+QSnapdMarkdownNode & QSnapdMarkdownNode::operator=(const QSnapdMarkdownNode& node)
-+{
-+    if (&node == this) {
-+        return *this;
-+    }
-+    g_object_unref(wrapped_object);
-+    wrapped_object = node.wrapped_object;
-+    g_object_ref(wrapped_object);
-+    return *this;
-+}
-diff --git a/snapd-qt/markdown-parser.cpp b/snapd-qt/markdown-parser.cpp
-index 751592c3..1a305ad9 100644
---- a/snapd-qt/markdown-parser.cpp
-+++ b/snapd-qt/markdown-parser.cpp
-@@ -56,7 +56,7 @@ bool QSnapdMarkdownParser::preserveWhitespace () const
- QList<QSnapdMarkdownNode> QSnapdMarkdownParser::parse (const QString &text) const
- {
-     Q_D(const QSnapdMarkdownParser);
--    g_autoptr(GPtrArray) nodes = snapd_markdown_parser_parse (d->parser, text.toStdString ().c_str ());
-+    g_autoptr(GPtrArray) nodes = snapd_markdown_parser_parse (d->parser, text.toUtf8().constData());
-     QList<QSnapdMarkdownNode> nodes_list;
-     for (uint i = 0; i < nodes->len; i++) {
-         SnapdMarkdownNode *node = (SnapdMarkdownNode *) g_ptr_array_index (nodes, i);
-diff --git a/snapd-qt/meson.build b/snapd-qt/meson.build
-index 74687852..48fe650c 100644
---- a/snapd-qt/meson.build
-+++ b/snapd-qt/meson.build
-@@ -9,7 +9,7 @@ if not get_option('soup2')
- endif
- 
- install_header_dir = join_paths (includedir, library_name, 'Snapd')
--qml_dir = join_paths (libdir, 'qt5', 'qml', qt_name)
-+qml_dir = join_paths (libdir, 'qt6', 'qml', qt_name)
- cmake_dir = join_paths (libdir, 'cmake', qt_name)
- 
- source_cpp = [
-@@ -114,19 +114,19 @@ source_private_h = [
- ]
- 
- if get_option ('qt-bindings')
--  qt5 = import ('qt5')
--  moc_files = qt5.preprocess (moc_headers: [ source_h, source_private_h ],
--                              dependencies: [ qt5_core_dep, qt5_network_dep ])
-+  qt6 = import ('qt6')
-+  moc_files = qt6.preprocess (moc_headers: [ source_h, source_private_h ],
-+                              dependencies: [ qt6_core_dep, qt6_network_dep ])
- 
-   snapd_qt_lib = library (library_name,
-                           source_cpp, moc_files,
-                           version: '1.0.0',
--                          dependencies: [ qt5_core_dep, qt5_network_dep, glib_dep, gio_dep, snapd_glib_dep ],
-+                          dependencies: [ qt6_core_dep, qt6_network_dep, glib_dep, gio_dep, snapd_glib_dep ],
-                           cpp_args: [ '-DQT_NO_SIGNALS_SLOTS_KEYWORDS' ],
-                           install: true)
- 
-   snapd_qt_dep = declare_dependency (link_with: snapd_qt_lib,
--                                     dependencies: [ qt5_network_dep ],
-+                                     dependencies: [ qt6_network_dep ],
-                                      include_directories: include_directories ('.'))
- 
-   install_headers (source_h + source_alias_h,
-@@ -160,7 +160,7 @@ if get_option ('qt-bindings')
-     install_data ('qmldir',
-                   install_dir: qml_dir)
- 
--    qml_moc_files = qt5.preprocess (moc_headers: 'qml-plugin.h',
-+    qml_moc_files = qt6.preprocess (moc_headers: 'qml-plugin.h',
-                                     dependencies: qml_dep)
-     library (qt_name,
-              'qml-plugin.cpp', qml_moc_files,
-diff --git a/tests/meson.build b/tests/meson.build
-index dd4ac7ef..4207244b 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -39,7 +39,7 @@ test_file = configure_file (input: 'test-markdown-glib.test.in',
- install_data (test_file, install_dir: installed_tests_data_dir)
- 
- if get_option ('qt-bindings')
--  moc_files = qt5.preprocess (moc_headers: [ 'test-qt.h' ])
-+  moc_files = qt6.preprocess (moc_headers: [ 'test-qt.h' ])
- 
-   test_executable = executable ('test-qt',
-                                 'test-qt.cpp', moc_files,
-diff --git a/tests/test-qt.cpp b/tests/test-qt.cpp
-index 04243a51..2bd225cf 100644
---- a/tests/test-qt.cpp
-+++ b/tests/test-qt.cpp
-@@ -2918,32 +2918,32 @@ test_get_connections_attributes ()
- 
-     check_names_match (connection->plugAttributeNames (), QStringList () << "plug-string-key" << "plug-int-key" << "plug-bool-key" << "plug-number-key");
-     g_assert_true (connection->hasPlugAttribute ("plug-string-key"));
--    g_assert_true (connection->plugAttribute ("plug-string-key").type () == (QVariant::Type) QMetaType::QString);
-+    g_assert_true (connection->plugAttribute ("plug-string-key").metaType().id () == QMetaType::QString);
-     g_assert_true (connection->plugAttribute ("plug-string-key").toString () == "value");
-     g_assert_true (connection->hasPlugAttribute ("plug-int-key"));
--    g_assert_true (connection->plugAttribute ("plug-int-key").type () == (QVariant::Type) QMetaType::LongLong);
-+    g_assert_true (connection->plugAttribute ("plug-int-key").metaType().id () == QMetaType::LongLong);
-     g_assert_cmpint (connection->plugAttribute ("plug-int-key").toLongLong (), ==, 42);
-     g_assert_true (connection->hasPlugAttribute ("plug-bool-key"));
--    g_assert_true (connection->plugAttribute ("plug-bool-key").type () == (QVariant::Type) QMetaType::Bool);
-+    g_assert_true (connection->plugAttribute ("plug-bool-key").metaType().id () == QMetaType::Bool);
-     g_assert_true (connection->plugAttribute ("plug-bool-key").toBool ());
-     g_assert_true (connection->hasPlugAttribute ("plug-number-key"));
--    g_assert_true (connection->plugAttribute ("plug-number-key").type () == (QVariant::Type) QMetaType::Double);
-+    g_assert_true (connection->plugAttribute ("plug-number-key").metaType().id () == QMetaType::Double);
-     g_assert_cmpfloat (connection->plugAttribute ("plug-number-key").toDouble (), ==, 1.25);
-     g_assert_false (connection->hasPlugAttribute ("plug-invalid-key"));
-     g_assert_false (connection->plugAttribute ("plug-invalid-key").isValid ());
- 
-     check_names_match (connection->slotAttributeNames (), QStringList () << "slot-string-key" << "slot-int-key" << "slot-bool-key" << "slot-number-key");
-     g_assert_true (connection->hasSlotAttribute ("slot-string-key"));
--    g_assert_true (connection->slotAttribute ("slot-string-key").type () == (QVariant::Type) QMetaType::QString);
-+    g_assert_true (connection->slotAttribute ("slot-string-key").metaType().id () == QMetaType::QString);
-     g_assert_true (connection->slotAttribute ("slot-string-key").toString () == "value");
-     g_assert_true (connection->hasSlotAttribute ("slot-int-key"));
--    g_assert_true (connection->slotAttribute ("slot-int-key").type () == (QVariant::Type) QMetaType::LongLong);
-+    g_assert_true (connection->slotAttribute ("slot-int-key").metaType().id () == QMetaType::LongLong);
-     g_assert_cmpint (connection->slotAttribute ("slot-int-key").toLongLong (), ==, 42);
-     g_assert_true (connection->hasSlotAttribute ("slot-bool-key"));
--    g_assert_true (connection->slotAttribute ("slot-bool-key").type () == (QVariant::Type) QMetaType::Bool);
-+    g_assert_true (connection->slotAttribute ("slot-bool-key").metaType().id () == QMetaType::Bool);
-     g_assert_true (connection->slotAttribute ("slot-bool-key").toBool ());
-     g_assert_true (connection->hasSlotAttribute ("slot-number-key"));
--    g_assert_true (connection->slotAttribute ("slot-number-key").type () == (QVariant::Type) QMetaType::Double);
-+    g_assert_true (connection->slotAttribute ("slot-number-key").metaType().id () == QMetaType::Double);
-     g_assert_cmpfloat (connection->slotAttribute ("slot-number-key").toDouble (), ==, 1.25);
-     g_assert_false (connection->hasSlotAttribute ("slot-invalid-key"));
-     g_assert_false (connection->slotAttribute ("slot-invalid-key").isValid ());
-@@ -2952,16 +2952,16 @@ test_get_connections_attributes ()
-     QScopedPointer<QSnapdPlug> plug (getConnectionsRequest->plug (0));
-     check_names_match (plug->attributeNames (), QStringList () << "plug-string-key" << "plug-int-key" << "plug-bool-key" << "plug-number-key");
-     g_assert_true (plug->hasAttribute ("plug-string-key"));
--    g_assert_true (plug->attribute ("plug-string-key").type () == (QVariant::Type) QMetaType::QString);
-+    g_assert_true (plug->attribute ("plug-string-key").metaType().id () == QMetaType::QString);
-     g_assert_true (plug->attribute ("plug-string-key").toString () == "value");
-     g_assert_true (plug->hasAttribute ("plug-int-key"));
--    g_assert_true (plug->attribute ("plug-int-key").type () == (QVariant::Type) QMetaType::LongLong);
-+    g_assert_true (plug->attribute ("plug-int-key").metaType().id () == QMetaType::LongLong);
-     g_assert_cmpint (plug->attribute ("plug-int-key").toLongLong (), ==, 42);
-     g_assert_true (plug->hasAttribute ("plug-bool-key"));
--    g_assert_true (plug->attribute ("plug-bool-key").type () == (QVariant::Type) QMetaType::Bool);
-+    g_assert_true (plug->attribute ("plug-bool-key").metaType().id () == QMetaType::Bool);
-     g_assert_true (plug->attribute ("plug-bool-key").toBool ());
-     g_assert_true (plug->hasAttribute ("plug-number-key"));
--    g_assert_true (plug->attribute ("plug-number-key").type () == (QVariant::Type) QMetaType::Double);
-+    g_assert_true (plug->attribute ("plug-number-key").metaType().id () == QMetaType::Double);
-     g_assert_cmpfloat (plug->attribute ("plug-number-key").toDouble (), ==, 1.25);
-     g_assert_false (plug->hasAttribute ("plug-invalid-key"));
-     g_assert_false (plug->attribute ("plug-invalid-key").isValid ());
-@@ -2970,16 +2970,16 @@ test_get_connections_attributes ()
-     QScopedPointer<QSnapdSlot> slot (getConnectionsRequest->slot (0));
-     check_names_match (slot->attributeNames (), QStringList () << "slot-string-key" << "slot-int-key" << "slot-bool-key" << "slot-number-key");
-     g_assert_true (slot->hasAttribute ("slot-string-key"));
--    g_assert_true (slot->attribute ("slot-string-key").type () == (QVariant::Type) QMetaType::QString);
-+    g_assert_true (slot->attribute ("slot-string-key").metaType().id () == QMetaType::QString);
-     g_assert_true (slot->attribute ("slot-string-key").toString () == "value");
-     g_assert_true (slot->hasAttribute ("slot-int-key"));
--    g_assert_true (slot->attribute ("slot-int-key").type () == (QVariant::Type) QMetaType::LongLong);
-+    g_assert_true (slot->attribute ("slot-int-key").metaType().id () == QMetaType::LongLong);
-     g_assert_cmpint (slot->attribute ("slot-int-key").toLongLong (), ==, 42);
-     g_assert_true (slot->hasAttribute ("slot-bool-key"));
--    g_assert_true (slot->attribute ("slot-bool-key").type () == (QVariant::Type) QMetaType::Bool);
-+    g_assert_true (slot->attribute ("slot-bool-key").metaType().id () == QMetaType::Bool);
-     g_assert_true (slot->attribute ("slot-bool-key").toBool ());
-     g_assert_true (slot->hasAttribute ("slot-number-key"));
--    g_assert_true (slot->attribute ("slot-number-key").type () == (QVariant::Type) QMetaType::Double);
-+    g_assert_true (slot->attribute ("slot-number-key").metaType().id () == QMetaType::Double);
-     g_assert_cmpfloat (slot->attribute ("slot-number-key").toDouble (), ==, 1.25);
-     g_assert_false (slot->hasAttribute ("slot-invalid-key"));
-     g_assert_false (slot->attribute ("slot-invalid-key").isValid ());
-@@ -3123,13 +3123,13 @@ test_get_interfaces_attributes ()
-     QScopedPointer<QSnapdPlug> plug (getInterfacesRequest->plug (0));
-     check_names_match (plug->attributeNames (), QStringList () << "plug-string-key" << "plug-int-key" << "plug-bool-key");
-     g_assert_true (plug->hasAttribute ("plug-string-key"));
--    g_assert_true (plug->attribute ("plug-string-key").type () == (QVariant::Type) QMetaType::QString);
-+    g_assert_true (plug->attribute ("plug-string-key").metaType().id () == QMetaType::QString);
-     g_assert_true (plug->attribute ("plug-string-key").toString () == "value");
-     g_assert_true (plug->hasAttribute ("plug-int-key"));
--    g_assert_true (plug->attribute ("plug-int-key").type () == (QVariant::Type) QMetaType::LongLong);
-+    g_assert_true (plug->attribute ("plug-int-key").metaType().id () == QMetaType::LongLong);
-     g_assert_cmpint (plug->attribute ("plug-int-key").toLongLong (), ==, 42);
-     g_assert_true (plug->hasAttribute ("plug-bool-key"));
--    g_assert_true (plug->attribute ("plug-bool-key").type () == (QVariant::Type) QMetaType::Bool);
-+    g_assert_true (plug->attribute ("plug-bool-key").metaType().id () == QMetaType::Bool);
-     g_assert_true (plug->attribute ("plug-bool-key").toBool ());
-     g_assert_false (plug->hasAttribute ("plug-invalid-key"));
-     g_assert_false (plug->attribute ("plug-invalid-key").isValid ());
-@@ -3138,13 +3138,13 @@ test_get_interfaces_attributes ()
-     QScopedPointer<QSnapdSlot> slot (getInterfacesRequest->slot (0));
-     check_names_match (slot->attributeNames (), QStringList () << "slot-string-key" << "slot-int-key" << "slot-bool-key");
-     g_assert_true (slot->hasAttribute ("slot-string-key"));
--    g_assert_true (slot->attribute ("slot-string-key").type () == (QVariant::Type) QMetaType::QString);
-+    g_assert_true (slot->attribute ("slot-string-key").metaType().id () == QMetaType::QString);
-     g_assert_true (slot->attribute ("slot-string-key").toString () == "value");
-     g_assert_true (slot->hasAttribute ("slot-int-key"));
--    g_assert_true (slot->attribute ("slot-int-key").type () == (QVariant::Type) QMetaType::LongLong);
-+    g_assert_true (slot->attribute ("slot-int-key").metaType().id () == QMetaType::LongLong);
-     g_assert_cmpint (slot->attribute ("slot-int-key").toLongLong (), ==, 42);
-     g_assert_true (slot->hasAttribute ("slot-bool-key"));
--    g_assert_true (slot->attribute ("slot-bool-key").type () == (QVariant::Type) QMetaType::Bool);
-+    g_assert_true (slot->attribute ("slot-bool-key").metaType().id () == QMetaType::Bool);
-     g_assert_true (slot->attribute ("slot-bool-key").toBool ());
-     g_assert_false (slot->hasAttribute ("slot-invalid-key"));
-     g_assert_false (slot->attribute ("slot-invalid-key").isValid ());
-@@ -3894,7 +3894,7 @@ test_find_channels ()
-         if (channel->name () == "stable") {
-             g_assert_true (channel->track () == "latest");
-             g_assert_true (channel->risk () == "stable");
--            g_assert_true (channel->branch () == NULL);
-+            g_assert_true (channel->branch ().isEmpty());
-             g_assert_true (channel->revision () == "REVISION");
-             g_assert_true (channel->version () == "VERSION");
-             g_assert_true (channel->epoch () == "0");
-@@ -3907,7 +3907,7 @@ test_find_channels ()
-             g_assert_true (channel->name () == "beta");
-             g_assert_true (channel->track () == "latest");
-             g_assert_true (channel->risk () == "beta");
--            g_assert_true (channel->branch () == NULL);
-+            g_assert_true (channel->branch ().isEmpty());
-             g_assert_true (channel->revision () == "BETA-REVISION");
-             g_assert_true (channel->version () == "BETA-VERSION");
-             g_assert_true (channel->epoch () == "1");
-@@ -3926,7 +3926,7 @@ test_find_channels ()
-         if (channel->name () == "insider/stable") {
-             g_assert_true (channel->track () == "insider");
-             g_assert_true (channel->risk () == "stable");
--            g_assert_true (channel->branch () == NULL);
-+            g_assert_true (channel->branch ().isEmpty());
-             g_assert_true (channel->releasedAt ().isNull ());
-             matched_track = TRUE;
-         }
diff --git a/sys-libs/snapd-glib/files/snapd-glib-1.65-install-missing-header.patch b/sys-libs/snapd-glib/files/snapd-glib-1.65-install-missing-header.patch
new file mode 100644
index 000000000000..71371795f865
--- /dev/null
+++ b/sys-libs/snapd-glib/files/snapd-glib-1.65-install-missing-header.patch
@@ -0,0 +1,13 @@
+https://github.com/snapcore/snapd-glib/pull/152
+diff --git a/snapd-qt/meson.build b/snapd-qt/meson.build
+index a767c6d..db2f5bf 100644
+--- a/snapd-qt/meson.build
++++ b/snapd-qt/meson.build
+@@ -131,6 +131,7 @@ source_alias_h = [
+   'Snapd/MarkdownNode',
+   'Snapd/MarkdownParser',
+   'Snapd/Media',
++  'Snapd/Notice',
+   'Snapd/Plug',
+   'Snapd/PlugRef',
+   'Snapd/Price',
diff --git a/sys-libs/snapd-glib/snapd-glib-1.64-r100.ebuild b/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild
index ca2dc1ebc3ed..558bca6c7442 100644
--- a/sys-libs/snapd-glib/snapd-glib-1.64-r100.ebuild
+++ b/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild
@@ -13,15 +13,16 @@ LICENSE="LGPL-3"
 SLOT="0/1"
 KEYWORDS="~amd64"
 
-IUSE="doc introspection qml qt6 vala"
+IUSE="doc introspection qml qt5 qt6 vala"
 REQUIRED_USE="
-	qml? ( qt6 )
+	qml? ( || ( qt5 qt6 ) )
 	vala? ( introspection )
 "
 
 BDEPEND="
 	virtual/pkgconfig
 	sys-devel/gettext
+	qt5? ( dev-qt/linguist-tools:5 )
 	qt6? ( dev-qt/qttools:6[linguist] )
 "
 
@@ -32,10 +33,18 @@ DEPEND="
 	net-libs/libsoup:3.0
 	doc? ( dev-util/gtk-doc )
 	introspection? ( dev-libs/gobject-introspection )
-	qml? ( dev-qt/qtdeclarative:6 )
+	qml? (
+		qt5? ( dev-qt/qtdeclarative:5 )
+		qt6? ( dev-qt/qtdeclarative:6 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
 	qt6? (
 		dev-qt/qtbase:6[network,widgets]
-		)
+	)
 	vala? ( $(vala_depend) )
 "
 
@@ -44,7 +53,8 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-qt6.patch"
+	# https://github.com/snapcore/snapd-glib/pull/152
+	"${FILESDIR}/${P}-install-missing-header.patch"
 )
 
 pkg_setup() {
@@ -56,10 +66,26 @@ src_configure() {
 		"$(meson_use doc docs)"
 		"$(meson_use introspection)"
 		"$(meson_use qml qml-bindings)"
-		"$(meson_use qt6 qt-bindings)"
 		"$(meson_use vala vala-bindings)"
 		-Dsoup2=false
 	)
 
+	if use qt5; then
+		emesonargs+=(
+			-Dqt5=true
+			-Dqt6=false
+		)
+	elif use qt6; then
+		emesonargs+=(
+			-Dqt5=false
+			-Dqt6=true
+		)
+	else
+		emesonargs+=(
+			-Dqt5=false
+			-Dqt6=false
+		)
+	fi
+
 	meson_src_configure
 }