diff --git a/0001-Expose-FlatpakReferencesModel-to-QML.patch b/0001-Expose-FlatpakReferencesModel-to-QML.patch deleted file mode 100644 index 484fab1..0000000 --- a/0001-Expose-FlatpakReferencesModel-to-QML.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7315348966666340557f61bb0f25b3c9dc3a9f29 Mon Sep 17 00:00:00 2001 -From: ivan tkachenko -Date: Tue, 7 Feb 2023 03:01:38 +0300 -Subject: [PATCH 1/4] Expose FlatpakReferencesModel to QML - -We'll be needing its enum values soon, to request model data by role. - -(cherry picked from commit fc64ff4b8cc2f285ca99dc9d311d299b66780a95) - -This was actually required for 03f195ea353f0ca522e49aacc76eb74612d2d653. ---- - flatpakreference.h | 1 + - kcm.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/flatpakreference.h b/flatpakreference.h -index cc5d5e7..3a78878 100644 ---- a/flatpakreference.h -+++ b/flatpakreference.h -@@ -66,6 +66,7 @@ public: - explicit FlatpakReferencesModel(QObject *parent = nullptr); - - enum Roles { Name = Qt::UserRole + 1, Version, Icon, Ref }; -+ Q_ENUM(Roles) - - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; -diff --git a/kcm.cpp b/kcm.cpp -index a98c9c5..0e2b16d 100644 ---- a/kcm.cpp -+++ b/kcm.cpp -@@ -17,6 +17,7 @@ KCMFlatpak::KCMFlatpak(QObject *parent, const KPluginMetaData &data, const QVari - { - qmlRegisterUncreatableType("org.kde.plasma.kcm.flatpakpermissions", 1, 0, "KCMFlatpak", QString()); - qmlRegisterType("org.kde.plasma.kcm.flatpakpermissions", 1, 0, "FlatpakPermissionModel"); -+ qmlRegisterUncreatableType("org.kde.plasma.kcm.flatpakpermissions", 1, 0, "FlatpakReferencesModel", QStringLiteral("For enum access only")); - - connect(m_refsModel, &FlatpakReferencesModel::needsLoad, this, &KCMFlatpak::load); - connect(m_refsModel, &FlatpakReferencesModel::needsSaveChanged, this, &KCMFlatpak::refreshSaveNeeded); --- -2.39.2 - diff --git a/0002-Avoid-duplicating-connections-between-ref-and-its-re.patch b/0002-Avoid-duplicating-connections-between-ref-and-its-re.patch deleted file mode 100644 index 23de2d7..0000000 --- a/0002-Avoid-duplicating-connections-between-ref-and-its-re.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d852e44cb5e4ff7b49ba91921517cd0679431c28 Mon Sep 17 00:00:00 2001 -From: ivan tkachenko -Date: Wed, 1 Mar 2023 01:20:15 +0300 -Subject: [PATCH 2/4] Avoid duplicating connections between ref and its ref - model - -These two connections should be established once in constructor, not on -every call to setter. Because every time when the setter is called, a -new connections are established which are not bound to the lifetime of -model object being set. But, the model object assigned is not managed -by this Ref object, and will be destroyed without any notice, most -importantly without calling setter with null argument which would be -the only way to clean up these extra connections. - -Replaces https://invent.kde.org/plasma/flatpak-kcm/-/merge_requests/38 - -(cherry picked from commit b114d6e1e598c95ade68ef62c1a39ac32d38a29d) ---- - flatpakreference.cpp | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/flatpakreference.cpp b/flatpakreference.cpp -index a2b5d71..d95f496 100644 ---- a/flatpakreference.cpp -+++ b/flatpakreference.cpp -@@ -35,6 +35,9 @@ FlatpakReference::FlatpakReference(FlatpakReferencesModel *parent, - , m_refsModel(refsModel) - { - m_path.append(m_id); -+ -+ connect(this, &FlatpakReference::needsLoad, parent, &FlatpakReferencesModel::needsLoad); -+ connect(this, &FlatpakReference::needsSaveChanged, parent, &FlatpakReferencesModel::needsSaveChanged); - } - - QString FlatpakReference::name() const -@@ -78,16 +81,12 @@ void FlatpakReference::setPermsModel(FlatpakPermissionModel *permsModel) - if (permsModel != m_permsModel) { - if (m_permsModel) { - disconnect(m_permsModel, &FlatpakPermissionModel::referenceChanged, this, &FlatpakReference::needsLoad); -- disconnect(this, &FlatpakReference::needsLoad, m_refsModel, &FlatpakReferencesModel::needsLoad); - disconnect(m_permsModel, &FlatpakPermissionModel::dataChanged, this, &FlatpakReference::needsSaveChanged); -- disconnect(this, &FlatpakReference::needsSaveChanged, m_refsModel, &FlatpakReferencesModel::needsSaveChanged); - } - m_permsModel = permsModel; - if (m_permsModel) { - connect(m_permsModel, &FlatpakPermissionModel::referenceChanged, this, &FlatpakReference::needsLoad); -- connect(this, &FlatpakReference::needsLoad, m_refsModel, &FlatpakReferencesModel::needsLoad); - connect(m_permsModel, &FlatpakPermissionModel::dataChanged, this, &FlatpakReference::needsSaveChanged); -- connect(this, &FlatpakReference::needsSaveChanged, m_refsModel, &FlatpakReferencesModel::needsSaveChanged); - } - } - } --- -2.39.2 - diff --git a/0003-Port-from-NULL-to-nullptr.patch b/0003-Port-from-NULL-to-nullptr.patch deleted file mode 100644 index 49f448f..0000000 --- a/0003-Port-from-NULL-to-nullptr.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b4ea85ce701b3cac3f9e997d9cb391a34ff4d4bc Mon Sep 17 00:00:00 2001 -From: ivan tkachenko -Date: Mon, 13 Feb 2023 23:38:13 +0300 -Subject: [PATCH 3/4] Port from NULL to nullptr - -(cherry picked from commit 6363d6fca26b357ac4c988fcfb0eda5069093926) ---- - flatpakreference.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/flatpakreference.cpp b/flatpakreference.cpp -index d95f496..884a12f 100644 ---- a/flatpakreference.cpp -+++ b/flatpakreference.cpp -@@ -131,10 +131,10 @@ bool FlatpakReference::isDefaults() const - FlatpakReferencesModel::FlatpakReferencesModel(QObject *parent) - : QAbstractListModel(parent) - { -- g_autoptr(FlatpakInstallation) installation = flatpak_installation_new_system(NULL, NULL); -- g_autoptr(GPtrArray) installedApps = flatpak_installation_list_installed_refs_by_kind(installation, FLATPAK_REF_KIND_APP, NULL, NULL); -- g_autoptr(FlatpakInstallation) userInstallation = flatpak_installation_new_user(NULL, NULL); -- g_autoptr(GPtrArray) installedUserApps = flatpak_installation_list_installed_refs_by_kind(userInstallation, FLATPAK_REF_KIND_APP, NULL, NULL); -+ g_autoptr(FlatpakInstallation) installation = flatpak_installation_new_system(nullptr, nullptr); -+ g_autoptr(GPtrArray) installedApps = flatpak_installation_list_installed_refs_by_kind(installation, FLATPAK_REF_KIND_APP, nullptr, nullptr); -+ g_autoptr(FlatpakInstallation) userInstallation = flatpak_installation_new_user(nullptr, nullptr); -+ g_autoptr(GPtrArray) installedUserApps = flatpak_installation_list_installed_refs_by_kind(userInstallation, FLATPAK_REF_KIND_APP, nullptr, nullptr); - g_ptr_array_extend_and_steal(installedApps, installedUserApps); - QString path = FlatpakHelper::permDataFilePath(); - -@@ -147,7 +147,7 @@ FlatpakReferencesModel::FlatpakReferencesModel(QObject *parent) - } - QString appBasePath = QString::fromUtf8(flatpak_installed_ref_get_deploy_dir(FLATPAK_INSTALLED_REF(g_ptr_array_index(installedApps, i)))); - QString icon = FlatpakHelper::iconPath(name, id, appBasePath); -- g_autoptr(GBytes) data = flatpak_installed_ref_load_metadata(FLATPAK_INSTALLED_REF(g_ptr_array_index(installedApps, i)), NULL, NULL); -+ g_autoptr(GBytes) data = flatpak_installed_ref_load_metadata(FLATPAK_INSTALLED_REF(g_ptr_array_index(installedApps, i)), nullptr, nullptr); - gsize len = 0; - auto buff = g_bytes_get_data(data, &len); - const QByteArray metadata((const char *)buff, len); --- -2.39.2 - diff --git a/0004-Fix-GLib-memory-management-issue.patch b/0004-Fix-GLib-memory-management-issue.patch deleted file mode 100644 index 505348e..0000000 --- a/0004-Fix-GLib-memory-management-issue.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f0bf57cdb8436f357d0eedd3a306b9c9487f11cb Mon Sep 17 00:00:00 2001 -From: ivan tkachenko -Date: Wed, 1 Mar 2023 02:17:06 +0300 -Subject: [PATCH 4/4] Fix GLib memory management issue - -(process:81718): GLib-CRITICAL **: 03:12:47.357: g_atomic_ref_count_dec: assertion 'old_value > 0' failed - -(cherry picked from commit 44edeeb14685e34ba1a3d3793d6d09fcbc8f8041) ---- - flatpakreference.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/flatpakreference.cpp b/flatpakreference.cpp -index 884a12f..958efc5 100644 ---- a/flatpakreference.cpp -+++ b/flatpakreference.cpp -@@ -134,8 +134,10 @@ FlatpakReferencesModel::FlatpakReferencesModel(QObject *parent) - g_autoptr(FlatpakInstallation) installation = flatpak_installation_new_system(nullptr, nullptr); - g_autoptr(GPtrArray) installedApps = flatpak_installation_list_installed_refs_by_kind(installation, FLATPAK_REF_KIND_APP, nullptr, nullptr); - g_autoptr(FlatpakInstallation) userInstallation = flatpak_installation_new_user(nullptr, nullptr); -- g_autoptr(GPtrArray) installedUserApps = flatpak_installation_list_installed_refs_by_kind(userInstallation, FLATPAK_REF_KIND_APP, nullptr, nullptr); -+ // it's the only pointer, so extend_and_steal will destroy it. -+ GPtrArray *installedUserApps = flatpak_installation_list_installed_refs_by_kind(userInstallation, FLATPAK_REF_KIND_APP, nullptr, nullptr); - g_ptr_array_extend_and_steal(installedApps, installedUserApps); -+ installedUserApps = nullptr; - QString path = FlatpakHelper::permDataFilePath(); - - for (uint i = 0; i < installedApps->len; ++i) { --- -2.39.2 - diff --git a/flatpak-kcm-5.27.2.tar.xz b/flatpak-kcm-5.27.2.tar.xz deleted file mode 100644 index 655fede..0000000 --- a/flatpak-kcm-5.27.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae236b2143a8245731abf48878df96d557f5481b8a7313363ab23fbed1363c67 -size 204676 diff --git a/flatpak-kcm-5.27.2.tar.xz.sig b/flatpak-kcm-5.27.2.tar.xz.sig deleted file mode 100644 index 8566efc..0000000 --- a/flatpak-kcm-5.27.2.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmP98LIACgkQ11dEg7tX -sY0UAQ/8DcaQpMOyue6Y9yWobW6HKBPU3NrLfKFy7C1x35Wkms0wQU0vX8cKWFjo -djWonO+dg8V/mOWtjC1lx9C35pnNU4upBaVBx4+QBwXHa+wzDLfJj556WtAC+0Rp -3cgZHqjBwQr2jwTU2sNhp8GoRDmvNmZ3OT6lP6IaJ85aLxBe96ZQaDYSFowU/HkY -6Z/awn5YnrqFL1TyjQ7aw8iuvNIjmnfX3fWA1hO852A5Red+jBxD6KrjZvkqmRIV -7x4P5RV/Zq2VCMwChgLPiB9PldrND72l/wCJILeLXrEy3w3k3dBhUrmwZ+ETsM3g -gDhlYb3LgvkA0q0ORJhVePCNmMBXo6SUh88v5QlpmSKTbAKdWR2Pf4GdQOEeHP7Z -/UAGcnAFEfxyNZztWeawLBRbR8f6D0LOIOWyd3x/tuxmmJfnsEZ06/L2OpB6WF14 -dEvxFyKTA5+HORVwj8P7vU8o1/uQbhnpR11OObphsW7QxATXPdWUIp8CDYSKzK3O -L7OcClf8e/33tMfNyRUGLjfz9mK1tYMjJ3YLCrflZkjfc4cBEGaKzQfMmiBgNRd/ -yvfQnFyscVBepgAJe+jdVIzjlybmZTzQdTR7Xjih30Eb4UI752Yn2C2HexzuedQK -a0fI/GFYQ+1vr0gDFZJcDeWI51Z/g4jJAt4vEe2YVhPSmd7ZsUM= -=yy9E ------END PGP SIGNATURE----- diff --git a/flatpak-kcm-5.27.3.tar.xz b/flatpak-kcm-5.27.3.tar.xz new file mode 100644 index 0000000..911031d --- /dev/null +++ b/flatpak-kcm-5.27.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3691c87e639d4015affd800bb1eb69878c1754b2491845a74c2cae91d13d5bfe +size 215748 diff --git a/flatpak-kcm-5.27.3.tar.xz.sig b/flatpak-kcm-5.27.3.tar.xz.sig new file mode 100644 index 0000000..6e16413 --- /dev/null +++ b/flatpak-kcm-5.27.3.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmQQZvMACgkQ11dEg7tX +sY1lhBAAgWEJg55dT5qTZip0rVsh56FLEEd8ecS623w5RI4x6+BK4I6P5NFhc1v/ +X13waZBMKI1ABHaFc2/kv0DOJqEWTTffzTqbd56QyxfN5IN6hFKpZWh/CbAX2kqX +VNNYI4NkevQJxrgDrHTxvdHYZLMZCiM6MwE2xWvct5lIR1j39PE1IwPnG2VEw4Xe +gIqVsFJ2C4gfvV1oNnhGawUmUxOolD/iiMaNiiYvxGNTJ9vrcIrd+cuvvOzhKoKM +RpZAM0FvaI9l54x18NwIRfMdhT6BIfiEldnEhdU8TbDVvVf24DpaSNVqJpI7vG7V +3nAHmHDmvAczgips+VywnZ66eF4MOl7hZhOZzbTBE3IPkTTfEfnRGAaPbszBcomO +B8GN8Xbgca+pX8/cCjv/gk3q2qpZoBs4aDRw2hhpCTvbuGXxPJ+jjT7qHmBvvlBD +e/eiT22wr+hnpiWbuY1SmJZuROxbSbUYnGB66jHLKbjMFFODqcHT/VJdoGuC3RDG +Wy1OZWI0905dRH10/YQyXEm3aMJinkWPwl+j/2K+7x2W6bHbdrnn5b/uLCNH9Hzu +c2FYhWVi0vJwe457hPPkg7+ysrs+cDZyNjBqC2+4ysYN4eh0BKIxxlFrvY6aP2U1 +DnzrzbZr+4nxDTxQpapzpcwJjfJ9e50LYJKLILODZLYopxwPeMU= +=++ul +-----END PGP SIGNATURE----- diff --git a/kcm_flatpak.changes b/kcm_flatpak.changes index 6095438..d3bf812 100644 --- a/kcm_flatpak.changes +++ b/kcm_flatpak.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Mar 14 15:05:48 UTC 2023 - Fabian Vogt + +- Update to 5.27.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.27.3 +- Too many changes to list here +- Drop patches, now upstream: + * 0001-Expose-FlatpakReferencesModel-to-QML.patch + * 0002-Avoid-duplicating-connections-between-ref-and-its-re.patch + * 0003-Port-from-NULL-to-nullptr.patch + * 0004-Fix-GLib-memory-management-issue.patch + ------------------------------------------------------------------- Wed Mar 1 07:47:56 UTC 2023 - Fabian Vogt diff --git a/kcm_flatpak.spec b/kcm_flatpak.spec index 49d9e0d..21f363b 100644 --- a/kcm_flatpak.spec +++ b/kcm_flatpak.spec @@ -20,7 +20,7 @@ %bcond_without released Name: kcm_flatpak -Version: 5.27.2 +Version: 5.27.3 Release: 0 Summary: Flatpak Permissions Management KCM License: GPL-2.0-or-later @@ -32,10 +32,6 @@ Source1: https://download.kde.org/stable/plasma/%{version}/flatpak-kcm-%{ Source2: plasma.keyring %endif # PATCH-FIX-UPSTREAM -Patch1: 0001-Expose-FlatpakReferencesModel-to-QML.patch -Patch2: 0002-Avoid-duplicating-connections-between-ref-and-its-re.patch -Patch3: 0003-Port-from-NULL-to-nullptr.patch -Patch4: 0004-Fix-GLib-memory-management-issue.patch BuildRequires: extra-cmake-modules >= 5.98.0 BuildRequires: kf5-filesystem BuildRequires: pkgconfig