[meego-commits] 7517: Changes to devel:packagemanagement/gnome-packagekit

Zhang Qiang no_reply at build.meego.com
Wed Sep 15 05:55:44 UTC 2010 

Hi,
I have made the following changes to gnome-packagekit in project devel:packagemanagement. Please review and accept ASAP.

Thank You,
Zhang Qiang

[This message was auto-generated]

---

Request #7517:

  submit:   home:xiaoqiang:branches:devel:packagemanagement/gnome-packagekit(r10)(cleanup) -> devel:packagemanagement/gnome-packagekit


Message:
    None

State:   new          2010-09-14T22:55:43 xiaoqiang
Comment: None



changes files:
--------------
--- gnome-packagekit.changes
+++ gnome-packagekit.changes
@@ -0,0 +1,10 @@
+* Tue Sep 14 2010 Zhang Qiang <qiang.z.zhang at intel.com> - 2.30.3
+- Add gpk-get-detail-for-dependency-packages.patch to get details
+  info and package size for dependency packages. fix BMC#6616,6617
+- Add gpk-application-call-pk-task-in-refresh.patch to call
+  pk_task_* instead of pk_client_* to show dialog to accept 
+  user confirmation, this is necessary to fix BMC#6615
+- Add gpk-show-error-dialog-for-transaction-error.patch
+  to show error dialog when transaction error occurs.
+  This patch can help to fix BMC#1030.
+
@@ -5 +15 @@
-
+    

new:
----
  gpk-application-call-pk-task-in-refresh.patch
  gpk-get-detail-for-dependency-packages.patch
  gpk-show-error-dialog-for-transaction-error.patch

spec files:
-----------
--- gnome-packagekit.spec
+++ gnome-packagekit.spec
@@ -37,6 +37,9 @@
 Patch10:     gpk-disable-install-button-while-downloading-metadata.patch
 Patch11:     gpk-update-dialog-offline.patch
 Patch12:     gpk-2.30.0-translation.patch
+Patch13:     gpk-get-detail-for-dependency-packages.patch
+Patch14:     gpk-application-call-pk-task-in-refresh.patch
+Patch15:     gpk-show-error-dialog-for-transaction-error.patch
 Requires:   glib2 >= %{glib2_version}
 Requires:   gtk2 >= %{gtk2_version}
 Requires:   gnome-icon-theme
@@ -131,11 +134,26 @@
 %patch11 -p1
 # gpk-2.30.0-translation.patch
 %patch12 -p1
+# gpk-get-detail-for-dependency-packages.patch
+%patch13 -p1
+# gpk-application-call-pk-task-in-refresh.patch
+%patch14 -p1
+# gpk-show-error-dialog-for-transaction-error.patch
+%patch15 -p1
 # >> setup
 # << setup
 
 %build
 # >> build pre
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')
+export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
+
+MOZ_OPT_FLAGS=$(echo $CFLAGS| %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')
+export CFLAGS=$MOZ_OPT_FLAGS
+
+MOZ_OPT_FLAGS=$(echo $CXXFLAGS| %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')
+export CXXFLAGS=$MOZ_OPT_FLAGS
+
 # << build pre
 
 %reconfigure --disable-static \

other changes:
--------------

++++++ gnome-packagekit.yaml
--- gnome-packagekit.yaml
+++ gnome-packagekit.yaml
@@ -22,6 +22,9 @@
     - gpk-disable-install-button-while-downloading-metadata.patch
     - gpk-update-dialog-offline.patch
     - gpk-2.30.0-translation.patch
+    - gpk-get-detail-for-dependency-packages.patch
+    - gpk-application-call-pk-task-in-refresh.patch
+    - gpk-show-error-dialog-for-transaction-error.patch
 Description: |
     gnome-packagekit provides session applications for the PackageKit API.
     There are several utilities designed for installing, updating and

++++++ gpk-application-call-pk-task-in-refresh.patch (new)
--- gpk-application-call-pk-task-in-refresh.patch
+++ gpk-application-call-pk-task-in-refresh.patch
+diff -uNr gnome-packagekit-2.30.3/src/gpk-application.c gnome-packagekit-2.30.3.new/src/gpk-application.c
+--- gnome-packagekit-2.30.3/src/gpk-application.c	2010-07-20 16:00:27.000000000 +0800
++++ gnome-packagekit-2.30.3.new/src/gpk-application.c	2010-09-08 14:39:17.745447914 +0800
+@@ -2937,7 +2937,7 @@
+ gpk_application_menu_refresh_cb (GtkAction *action, GpkApplication *application)
+ {
+ 	g_return_if_fail (GPK_IS_APPLICATION (application));
+-	pk_client_refresh_cache_async (PK_CLIENT(application->priv->task), TRUE, application->priv->cancellable,
++	pk_task_refresh_cache_async (application->priv->task, TRUE, application->priv->cancellable,
+ 				       (PkProgressCallback) gpk_application_progress_cb, application,
+ 				       (GAsyncReadyCallback) gpk_application_refresh_cache_cb, application);
+ }

++++++ gpk-get-detail-for-dependency-packages.patch (new)
--- gpk-get-detail-for-dependency-packages.patch
+++ gpk-get-detail-for-dependency-packages.patch
+diff -uNr gnome-packagekit-2.30.0/src/gpk-update-viewer.c gnome-packagekit-2.30.0.new/src/gpk-update-viewer.c
+--- gnome-packagekit-2.30.0/src/gpk-update-viewer.c	2010-08-20 10:21:29.196635351 +0800
++++ gnome-packagekit-2.30.0.new/src/gpk-update-viewer.c	2010-09-14 19:24:01.599461102 +0800
+@@ -52,6 +52,9 @@
+ 
+ #define GPK_UPDATE_VIEWER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_UPDATE_VIEWER, GpkUpdateViewerPrivate))
+ 
++static void gpk_update_viewer_get_update_detail_cb (PkClient *client, GAsyncResult *res, GpkUpdateViewer *update_viewer);
++static void gpk_update_viewer_get_details_cb (PkClient *client, GAsyncResult *res, GpkUpdateViewer *update_viewer);
++
+ struct GpkUpdateViewerPrivate
+ {
+ 	gboolean		 ignore_updates_changed;
+@@ -946,9 +949,23 @@
+ 
+ 		/* if we are adding deps, then select the checkbox */
+ 		if (role == PK_ROLE_ENUM_SIMULATE_UPDATE_PACKAGES) {
++			gchar **package_ids;
++
+ 			gtk_tree_store_set (priv->array_store_updates, &iter,
+ 					    GPK_UPDATES_COLUMN_SELECT, TRUE,
+ 					    -1);
++
++			package_ids = pk_package_ids_from_string (package_id);
++
++			/* get the details of dependency packages */
++			pk_client_get_update_detail_async (PK_CLIENT(priv->task), package_ids, priv->cancellable,
++						   (PkProgressCallback) gpk_update_viewer_progress_cb, update_viewer,
++						   (GAsyncReadyCallback) gpk_update_viewer_get_update_detail_cb, update_viewer);
++
++			pk_client_get_details_async (PK_CLIENT(priv->task), package_ids, priv->cancellable,
++						     (PkProgressCallback) gpk_update_viewer_progress_cb, update_viewer,
++						     (GAsyncReadyCallback) gpk_update_viewer_get_details_cb, update_viewer);
++			g_strfreev(package_ids);
+ 		}
+ 
+ 		/* scroll to the active cell */

++++++ gpk-show-error-dialog-for-transaction-error.patch (new)
--- gpk-show-error-dialog-for-transaction-error.patch
+++ gpk-show-error-dialog-for-transaction-error.patch
+diff -uNr gnome-packagekit-2.30.3/src/gpk-application.c gnome-packagekit-2.30.3.new/src/gpk-application.c
+--- gnome-packagekit-2.30.3/src/gpk-application.c	2010-09-14 16:41:20.943447852 +0800
++++ gnome-packagekit-2.30.3.new/src/gpk-application.c	2010-09-14 16:44:50.221510451 +0800
+@@ -2024,6 +2024,9 @@
+ 	results = pk_task_generic_finish (task, res, &error);
+ 	if (results == NULL) {
+ 		egg_warning ("failed to install packages: %s", error->message);
++		window = GTK_WINDOW (gtk_builder_get_object (application->priv->builder, "window_manager"));
++		gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (error->code),
++					gpk_error_enum_to_localised_message (error->code), error->message);
+ 		g_error_free (error);
+ 		goto out;
+ 	}

More information about the MeeGo-commits mailing list