[neon/backports-jammy/packagekit/Neon/unstable] debian/patches: drop upstreamed patch
Carlos De Maine
null at kde.org
Wed Dec 20 07:10:16 GMT 2023
Git commit 0354200ad491c5d559fcd4196eeddb132970ff6f by Carlos De Maine.
Committed on 20/12/2023 at 08:10.
Pushed by carlosdem into branch 'Neon/unstable'.
drop upstreamed patch
M +0 -1 debian/patches/series
D +0 -131 debian/patches/upstream_appstream_abi_fix.patch
https://invent.kde.org/neon/backports-jammy/packagekit/-/commit/0354200ad491c5d559fcd4196eeddb132970ff6f
diff --git a/debian/patches/series b/debian/patches/series
index 0fedee61..78b2a415 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
restart-on-sddm
policy.diff
-upstream_appstream_abi_fix.patch
diff --git a/debian/patches/upstream_appstream_abi_fix.patch b/debian/patches/upstream_appstream_abi_fix.patch
deleted file mode 100644
index bbe04016..00000000
--- a/debian/patches/upstream_appstream_abi_fix.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-commit 825afa2a7cd9e99afa8352bd87e276997f888ee4
-Author: Matthias Klumpp <matthias at tenstral.net>
-Date: Thu Sep 21 05:15:48 2023 +0200
-
- apt/dnf: Adjust for upcoming AppStream 1.0 API
-
- AppStream 1.0 is not released yet, but this patch makes PackageKit
- already build with the changed API as well as the older API versions.
-
- Resolves: #670
-
-Index: PackageKit-1.2.7/backends/apt/apt-job.cpp
-===================================================================
---- PackageKit-1.2.7.orig/backends/apt/apt-job.cpp
-+++ PackageKit-1.2.7/backends/apt/apt-job.cpp
-@@ -1460,16 +1460,25 @@ void AptJob::providesMimeType(PkgList &o
-
- /* search for mimetypes for all values */
- for (guint i = 0; values[i] != NULL; i++) {
-+#if AS_CHECK_VERSION(1,0,0)
-+ g_autoptr(AsComponentBox) result = NULL;
-+#else
- g_autoptr(GPtrArray) result = NULL;
--
-+#endif
- if (m_cancel)
- break;
-
-+#if AS_CHECK_VERSION(1,0,0)
-+ result = as_pool_get_components_by_provided_item (pool, AS_PROVIDED_KIND_MEDIATYPE, values[i]);
-+ for (guint j = 0; j < as_component_box_len (result); j++) {
-+ const gchar *pkgname;
-+ AsComponent *cpt = as_component_box_index (result, j);
-+#else
- result = as_pool_get_components_by_provided_item (pool, AS_PROVIDED_KIND_MEDIATYPE, values[i]);
- for (guint j = 0; j < result->len; j++) {
- const gchar *pkgname;
- AsComponent *cpt = AS_COMPONENT (g_ptr_array_index (result, j));
--
-+#endif
- /* sanity check */
- pkgname = as_component_get_pkgname (cpt);
- if (pkgname == NULL) {
-Index: PackageKit-1.2.7/backends/dnf/meson.build
-===================================================================
---- PackageKit-1.2.7.orig/backends/dnf/meson.build
-+++ PackageKit-1.2.7/backends/dnf/meson.build
-@@ -1,4 +1,4 @@
--appstream_dep = dependency('appstream-glib')
-+appstream_dep = dependency('appstream', version: '>=0.14.0')
- dnf_dep = dependency('libdnf', version: '>=0.43.1')
- rpm_dep = dependency('rpm')
- c_args = ['-DG_LOG_DOMAIN="PackageKit-DNF"']
-Index: PackageKit-1.2.7/backends/dnf/pk-backend-dnf-common.c
-===================================================================
---- PackageKit-1.2.7.orig/backends/dnf/pk-backend-dnf-common.c
-+++ PackageKit-1.2.7/backends/dnf/pk-backend-dnf-common.c
-@@ -23,7 +23,7 @@
-
- #include <gmodule.h>
- #include <glib.h>
--#include <appstream-glib.h>
-+#include <appstream.h>
- #include <libdnf/libdnf.h>
-
- #include "pk-shared.h"
-@@ -92,18 +92,15 @@ dnf_utils_refresh_repo_appstream (DnfRep
- const gchar *as_basenames[] = { "appstream", "appstream-icons", NULL };
- for (guint i = 0; as_basenames[i] != NULL; i++) {
- const gchar *tmp = dnf_repo_get_filename_md (repo, as_basenames[i]);
-- if (tmp != NULL) {
--#if AS_CHECK_VERSION(0,3,4)
-- if (!as_utils_install_filename (AS_UTILS_LOCATION_CACHE,
-- tmp,
-- dnf_repo_get_id (repo),
-- NULL,
-- error)) {
-- return FALSE;
-- }
--#else
-- g_warning ("need to install AppStream metadata %s", tmp);
--#endif
-+ if (tmp == NULL)
-+ continue;
-+
-+ if (!as_utils_install_metadata_file (AS_METADATA_LOCATION_CACHE,
-+ tmp,
-+ dnf_repo_get_id (repo),
-+ NULL,
-+ error)) {
-+ return FALSE;
- }
- }
- return TRUE;
-Index: PackageKit-1.2.7/backends/dnf/pk-backend-dnf-refresh.c
-===================================================================
---- PackageKit-1.2.7.orig/backends/dnf/pk-backend-dnf-refresh.c
-+++ PackageKit-1.2.7/backends/dnf/pk-backend-dnf-refresh.c
-@@ -26,7 +26,6 @@
- #include <glib/gstdio.h>
- #include <glib/gi18n.h>
- #include <string.h>
--#include <appstream-glib.h>
- #include <unistd.h>
- #include <stdlib.h>
-
-Index: PackageKit-1.2.7/backends/dnf/pk-backend-dnf.c
-===================================================================
---- PackageKit-1.2.7.orig/backends/dnf/pk-backend-dnf.c
-+++ PackageKit-1.2.7/backends/dnf/pk-backend-dnf.c
-@@ -25,7 +25,6 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <string.h>
--#include <appstream-glib.h>
-
- #include <pk-backend.h>
- #include <packagekit-glib2/pk-common-private.h>
-Index: PackageKit-1.2.7/contrib/PackageKit.spec.in
-===================================================================
---- PackageKit-1.2.7.orig/contrib/PackageKit.spec.in
-+++ PackageKit-1.2.7/contrib/PackageKit.spec.in
-@@ -37,7 +37,7 @@ BuildRequires: bash-completion
-
- %if !0%{?rhel}
- BuildRequires: rpm-devel >= 4.11.0
--BuildRequires: libappstream-glib-devel
-+BuildRequires: appstream-devel
- BuildRequires: librepo-devel >= 1.1.5
- BuildRequires: libsolv-devel
- BuildRequires: libdnf-devel >= 0.7.0
More information about the Neon-commits
mailing list