From 0760ed93cbd764612ab79ee05bb561b8c60fd74b Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 26 Sep 2010 13:06:46 +0200 Subject: packagekit : moved unused files to obsolete dir Signed-off-by: Frans Meulenbroeks --- .../modify_summary_and_adding_reposi_info.patch | 69 ++++++++++++++++++++++ .../files/remove_search_memory_leak.patch | 51 ++++++++++++++++ .../modify_summary_and_adding_reposi_info.patch | 69 ---------------------- .../files/remove_search_memory_leak.patch | 51 ---------------- 4 files changed, 120 insertions(+), 120 deletions(-) create mode 100644 recipes/obsolete/packagekit/files/modify_summary_and_adding_reposi_info.patch create mode 100644 recipes/obsolete/packagekit/files/remove_search_memory_leak.patch delete mode 100644 recipes/packagekit/files/modify_summary_and_adding_reposi_info.patch delete mode 100644 recipes/packagekit/files/remove_search_memory_leak.patch diff --git a/recipes/obsolete/packagekit/files/modify_summary_and_adding_reposi_info.patch b/recipes/obsolete/packagekit/files/modify_summary_and_adding_reposi_info.patch new file mode 100644 index 0000000000..43da548d8e --- /dev/null +++ b/recipes/obsolete/packagekit/files/modify_summary_and_adding_reposi_info.patch @@ -0,0 +1,69 @@ +diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c +index 9e71b90..92da8b0 100644 +--- a/backends/opkg/pk-backend-opkg.c ++++ b/backends/opkg/pk-backend-opkg.c +@@ -281,6 +281,7 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) + { + SearchParams *params; + gchar *uid; ++ gchar *summary; + gchar *haystack; + gint status, match; + PkFilterEnum filters; +@@ -327,8 +328,14 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) + break; + } + +- uid = g_strdup_printf ("%s;%s;%s;", +- pkg->name, pkg->version, pkg->architecture); ++ uid = g_strdup_printf ("%s;%s;%s;%s", ++ pkg->name, pkg->version, pkg->architecture, pkg->repository); ++ ++ if (!pkg->tags) ++ summary = g_strdup_printf("%s", pkg->description); ++ else ++ summary = g_strdup_printf("%s ;; %s", pkg->tags, pkg->description); ++ + + if (pkg->installed) + status = PK_INFO_ENUM_INSTALLED; +@@ -350,10 +357,11 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) + if ((filters & PK_FILTER_ENUM_NOT_INSTALLED) && (pkg->installed)) + goto end_handle; + +- pk_backend_package (params->backend, status, uid, pkg->description); ++ pk_backend_package (params->backend, status, uid, summary); + + end_handle: + g_free(uid); ++ g_free(summary); + } + + static gboolean +@@ -713,6 +721,7 @@ backend_get_details_thread (PkBackend *backend) + int group_index; + PkGroupEnum group = 0; + opkg_package_t *pkg; ++ gchar *summary; + gchar *newid; + + package_id = pk_backend_get_string (backend, "package_id"); +@@ -746,13 +755,17 @@ backend_get_details_thread (PkBackend *backend) + if (opkg_check_tag(pkg, (gchar *)pk_group_enum_to_text(group))) + break; + } ++ summary = g_strdup_printf("%s ;; %s", pkg->tags, pkg->description); + } ++ else ++ summary = g_strdup_printf("%s", pkg->description); + +- pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size); ++ pk_backend_details (backend, newid, NULL, group, summary, pkg->url, pkg->size); + pk_backend_finished (backend); + opkg_thread_unlock(); + + g_free (newid); ++ g_free (summary); + opkg_package_free(pkg); + return TRUE; + } diff --git a/recipes/obsolete/packagekit/files/remove_search_memory_leak.patch b/recipes/obsolete/packagekit/files/remove_search_memory_leak.patch new file mode 100644 index 0000000000..bcc27adba7 --- /dev/null +++ b/recipes/obsolete/packagekit/files/remove_search_memory_leak.patch @@ -0,0 +1,51 @@ +diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c +index 0b9867e..a7b5244 100644 +--- a/backends/opkg/pk-backend-opkg.c ++++ b/backends/opkg/pk-backend-opkg.c +@@ -307,21 +307,23 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) + + /* check filters */ + +- if ((filters & PK_FILTER_ENUM_DEVELOPMENT) && !opkg_is_devel_pkg (pkg)) +- return; ++ if ((filters & PK_FILTER_ENUM_DEVELOPMENT) && !opkg_is_devel_pkg (pkg)) ++ goto end_handle; + if ((filters & PK_FILTER_ENUM_NOT_DEVELOPMENT) && opkg_is_devel_pkg (pkg)) +- return; ++ goto end_handle; + if ((filters & PK_FILTER_ENUM_GUI) && !opkg_is_gui_pkg (pkg)) +- return; ++ goto end_handle; + if ((filters & PK_FILTER_ENUM_NOT_GUI) && opkg_is_gui_pkg (pkg)) +- return; ++ goto end_handle; + if ((filters & PK_FILTER_ENUM_INSTALLED) && (!pkg->installed)) +- return; ++ goto end_handle; + if ((filters & PK_FILTER_ENUM_NOT_INSTALLED) && (pkg->installed)) +- return; ++ goto end_handle; + + pk_backend_package (params->backend, status, uid, pkg->description); + ++end_handle: ++ g_free(uid); + } + + static gboolean +@@ -616,6 +618,7 @@ pk_opkg_list_upgradable_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) + pkg->name, pkg->version, pkg->architecture); + + pk_backend_package (backend, status, uid, pkg->description); ++ g_free(uid); + } + + static gboolean +@@ -696,6 +699,7 @@ backend_get_details_thread (PkBackend *backend) + + pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size); + g_free (newid); ++ opkg_package_free(pkg); + pk_backend_finished (backend); + return TRUE; + } diff --git a/recipes/packagekit/files/modify_summary_and_adding_reposi_info.patch b/recipes/packagekit/files/modify_summary_and_adding_reposi_info.patch deleted file mode 100644 index 43da548d8e..0000000000 --- a/recipes/packagekit/files/modify_summary_and_adding_reposi_info.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c -index 9e71b90..92da8b0 100644 ---- a/backends/opkg/pk-backend-opkg.c -+++ b/backends/opkg/pk-backend-opkg.c -@@ -281,6 +281,7 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) - { - SearchParams *params; - gchar *uid; -+ gchar *summary; - gchar *haystack; - gint status, match; - PkFilterEnum filters; -@@ -327,8 +328,14 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) - break; - } - -- uid = g_strdup_printf ("%s;%s;%s;", -- pkg->name, pkg->version, pkg->architecture); -+ uid = g_strdup_printf ("%s;%s;%s;%s", -+ pkg->name, pkg->version, pkg->architecture, pkg->repository); -+ -+ if (!pkg->tags) -+ summary = g_strdup_printf("%s", pkg->description); -+ else -+ summary = g_strdup_printf("%s ;; %s", pkg->tags, pkg->description); -+ - - if (pkg->installed) - status = PK_INFO_ENUM_INSTALLED; -@@ -350,10 +357,11 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) - if ((filters & PK_FILTER_ENUM_NOT_INSTALLED) && (pkg->installed)) - goto end_handle; - -- pk_backend_package (params->backend, status, uid, pkg->description); -+ pk_backend_package (params->backend, status, uid, summary); - - end_handle: - g_free(uid); -+ g_free(summary); - } - - static gboolean -@@ -713,6 +721,7 @@ backend_get_details_thread (PkBackend *backend) - int group_index; - PkGroupEnum group = 0; - opkg_package_t *pkg; -+ gchar *summary; - gchar *newid; - - package_id = pk_backend_get_string (backend, "package_id"); -@@ -746,13 +755,17 @@ backend_get_details_thread (PkBackend *backend) - if (opkg_check_tag(pkg, (gchar *)pk_group_enum_to_text(group))) - break; - } -+ summary = g_strdup_printf("%s ;; %s", pkg->tags, pkg->description); - } -+ else -+ summary = g_strdup_printf("%s", pkg->description); - -- pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size); -+ pk_backend_details (backend, newid, NULL, group, summary, pkg->url, pkg->size); - pk_backend_finished (backend); - opkg_thread_unlock(); - - g_free (newid); -+ g_free (summary); - opkg_package_free(pkg); - return TRUE; - } diff --git a/recipes/packagekit/files/remove_search_memory_leak.patch b/recipes/packagekit/files/remove_search_memory_leak.patch deleted file mode 100644 index bcc27adba7..0000000000 --- a/recipes/packagekit/files/remove_search_memory_leak.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c -index 0b9867e..a7b5244 100644 ---- a/backends/opkg/pk-backend-opkg.c -+++ b/backends/opkg/pk-backend-opkg.c -@@ -307,21 +307,23 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) - - /* check filters */ - -- if ((filters & PK_FILTER_ENUM_DEVELOPMENT) && !opkg_is_devel_pkg (pkg)) -- return; -+ if ((filters & PK_FILTER_ENUM_DEVELOPMENT) && !opkg_is_devel_pkg (pkg)) -+ goto end_handle; - if ((filters & PK_FILTER_ENUM_NOT_DEVELOPMENT) && opkg_is_devel_pkg (pkg)) -- return; -+ goto end_handle; - if ((filters & PK_FILTER_ENUM_GUI) && !opkg_is_gui_pkg (pkg)) -- return; -+ goto end_handle; - if ((filters & PK_FILTER_ENUM_NOT_GUI) && opkg_is_gui_pkg (pkg)) -- return; -+ goto end_handle; - if ((filters & PK_FILTER_ENUM_INSTALLED) && (!pkg->installed)) -- return; -+ goto end_handle; - if ((filters & PK_FILTER_ENUM_NOT_INSTALLED) && (pkg->installed)) -- return; -+ goto end_handle; - - pk_backend_package (params->backend, status, uid, pkg->description); - -+end_handle: -+ g_free(uid); - } - - static gboolean -@@ -616,6 +618,7 @@ pk_opkg_list_upgradable_cb (opkg_t *opkg, opkg_package_t *pkg, void *data) - pkg->name, pkg->version, pkg->architecture); - - pk_backend_package (backend, status, uid, pkg->description); -+ g_free(uid); - } - - static gboolean -@@ -696,6 +699,7 @@ backend_get_details_thread (PkBackend *backend) - - pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size); - g_free (newid); -+ opkg_package_free(pkg); - pk_backend_finished (backend); - return TRUE; - } -- cgit 1.2.3-korg