Commit bde21301 authored by Simon McVittie's avatar Simon McVittie
Browse files

Drop patch that was applied upstream

parent 9997375c
From 36d4b7f4f8779febd2408d590b85be5bb5c1519e Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Tue, 28 Aug 2018 12:43:15 +1200
Subject: [PATCH 21/24] details: Use custom icon for verified developers
......@@ -10,6 +9,9 @@ Subject: [PATCH 21/24] details: Use custom icon for verified developers
3 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 src/developer-verified.svg
diff --git a/src/developer-verified.svg b/src/developer-verified.svg
new file mode 100644
index 0000000..57c0f11
--- /dev/null
+++ b/src/developer-verified.svg
@@ -0,0 +1,12 @@
......@@ -26,15 +28,19 @@ Subject: [PATCH 21/24] details: Use custom icon for verified developers
+ </g>
+</svg>
\ No newline at end of file
diff --git a/src/gnome-software.gresource.xml b/src/gnome-software.gresource.xml
index 459ecf8..283cf35 100644
--- a/src/gnome-software.gresource.xml
+++ b/src/gnome-software.gresource.xml
@@ -37,5 +37,6 @@
@@ -38,5 +38,6 @@
<file preprocess="xml-stripblanks">org.freedesktop.PackageKit.xml</file>
<file>gtk-style.css</file>
<file>gtk-style-hc.css</file>
+ <file>developer-verified.svg</file>
</gresource>
</gresources>
diff --git a/src/gs-details-page.ui b/src/gs-details-page.ui
index f86674f..b6cba9e 100644
--- a/src/gs-details-page.ui
+++ b/src/gs-details-page.ui
@@ -948,7 +948,7 @@
......
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 23 Sep 2020 08:14:06 +0200
Subject: packagekit: Package details not found when not having 4 semicolons
Correct package_id_equal() to count also with packages, which do not have
4 semicolons in the ID (like `hedgewars;1.0.0-9.fc32;x86_64;updates`).
Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1069
Closes https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/517
---
plugins/packagekit/packagekit-common.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/packagekit/packagekit-common.c b/plugins/packagekit/packagekit-common.c
index 495960d..ed77b34 100644
--- a/plugins/packagekit/packagekit-common.c
+++ b/plugins/packagekit/packagekit-common.c
@@ -433,10 +433,10 @@ package_id_equal (gconstpointer a,
{
const gchar *package_id_a = a;
const gchar *package_id_b = b;
- gsize n_semicolons = 0;
+ gsize i, n_semicolons = 0;
/* compare up to and including the last semicolon */
- for (gsize i = 0; package_id_a[i] != '\0' && package_id_b[i] != '\0'; i++) {
+ for (i = 0; package_id_a[i] != '\0' && package_id_b[i] != '\0'; i++) {
if (package_id_a[i] != package_id_b[i])
return FALSE;
if (package_id_a[i] == ';')
@@ -445,7 +445,7 @@ package_id_equal (gconstpointer a,
return TRUE;
}
- return FALSE;
+ return package_id_a[i] == package_id_b[i];
}
GHashTable *
01_details-Use-custom-icon-for-verified-developers.patch
packagekit-Package-details-not-found-when-not-having-4-se.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment