diff --git a/gnome-packagekit-BNC383261.patch b/gnome-packagekit-BNC383261.patch deleted file mode 100644 index fb3c95b..0000000 --- a/gnome-packagekit-BNC383261.patch +++ /dev/null @@ -1,189 +0,0 @@ -Index: gnome-packagekit-2.91.4/src/gpk-check-update.c -=================================================================== ---- gnome-packagekit-2.91.4.orig/src/gpk-check-update.c -+++ gnome-packagekit-2.91.4/src/gpk-check-update.c -@@ -453,6 +453,11 @@ gpk_check_update_show_error (GpkCheckUpd - g_object_unref (cupdate->priv->error_code); - cupdate->priv->error_code = g_object_ref (error_code); - -+ if (error_enum == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) { -+ gpk_error_dialog_modal_yast (NULL, title, message, pk_error_get_details (error_code)); -+ goto out; -+ } -+ - /* do the bubble */ - g_debug ("title=%s, message=%s", title, message); - notification = notify_notification_new (title, message, NULL); -Index: gnome-packagekit-2.91.4/src/gpk-dbus-task.c -=================================================================== ---- gnome-packagekit-2.91.4.orig/src/gpk-dbus-task.c -+++ gnome-packagekit-2.91.4/src/gpk-dbus-task.c -@@ -336,7 +336,7 @@ gpk_dbus_task_error_msg (GpkDbusTask *dt - - /* hide the main window */ - window = gpk_modal_dialog_get_window (dtask->priv->dialog); -- gpk_error_dialog_modal_with_time (window, title, message, details, dtask->priv->timestamp); -+ gpk_error_dialog_modal_with_time (window, title, message, details, dtask->priv->timestamp, FALSE); - } - - /** -Index: gnome-packagekit-2.91.4/src/gpk-error.c -=================================================================== ---- gnome-packagekit-2.91.4.orig/src/gpk-error.c -+++ gnome-packagekit-2.91.4/src/gpk-error.c -@@ -31,6 +31,32 @@ - #include "gpk-common.h" - #include "gpk-error.h" - -+static gboolean -+gpk_error_dialog_run_yast (gpointer unused) -+{ -+ gboolean retval; -+ GError *error = NULL; -+ -+ PkControl *control = pk_control_new (); -+ if (!pk_control_suggest_daemon_quit(control, NULL, &error)) -+ g_debug ("Failure calling pk_control_suggest_daemon_quit:%s", error->message); -+ g_object_unref (control); -+ -+ retval = g_spawn_command_line_async ("gnomesu -- /sbin/yast2 online_update", NULL); -+ if (!retval) -+ g_debug ("Failure launching yast2 online_update"); -+ return FALSE; -+} -+ -+static void -+gpk_error_dialog_yast_cb (GtkButton *button, gpointer data) -+{ -+ g_debug ("user wants to try YaST..."); -+ /* we want to make sure and finish up outstanding stuff before we launch yast so we can release the libzypp lock */ -+ g_timeout_add_seconds (2, gpk_error_dialog_run_yast, NULL); -+ gtk_main_quit (); -+} -+ - /** - * gpk_error_dialog_expanded_cb: - **/ -@@ -59,13 +85,15 @@ gpk_error_dialog_expanded_cb (GObject *o - * Shows a modal error, and blocks until the user clicks close - **/ - gboolean --gpk_error_dialog_modal_with_time (GtkWindow *window, const gchar *title, const gchar *message, const gchar *details, guint timestamp) -+gpk_error_dialog_modal_with_time (GtkWindow *window, const gchar *title, const gchar *message, const gchar *details, guint timestamp, gboolean prompt_yast) - { - GtkWidget *widget; -+ GtkWidget *button; - GtkBuilder *builder; - GtkTextBuffer *buffer = NULL; - guint retval; - GError *error = NULL; -+ gchar *full_message; - - g_return_val_if_fail (message != NULL, FALSE); - -@@ -108,8 +136,22 @@ gpk_error_dialog_modal_with_time (GtkWin - gtk_label_set_label (GTK_LABEL (widget), title); - - /* message */ -+ if (prompt_yast) { -+ g_debug ("DEP_RES failed - will ask if they want to try yast"); -+ full_message = g_strconcat (message, "\n\n", _("To try and manually resolve problems use the YaST \"Online Update\" module"), NULL); -+ button = gtk_button_new_with_label(_("Start YaST and install updates manually")); -+ g_signal_connect (button, "clicked", G_CALLBACK (gpk_error_dialog_yast_cb), NULL); -+ /* add to box */ -+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_error")); -+ widget = gtk_dialog_get_action_area (GTK_DIALOG(widget)); -+ gtk_box_pack_start (GTK_BOX (widget), button, TRUE, TRUE, 0); -+ gtk_widget_show (button); -+ } -+ else -+ full_message = g_strdup (message); - widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_message")); -- gtk_label_set_markup (GTK_LABEL (widget), message); -+ gtk_label_set_markup (GTK_LABEL (widget), full_message); -+ g_free (full_message); - - /* show text in the expander */ - if (details == NULL || details[0] == '\0') { -@@ -153,7 +195,13 @@ out_build: - gboolean - gpk_error_dialog_modal (GtkWindow *window, const gchar *title, const gchar *message, const gchar *details) - { -- return gpk_error_dialog_modal_with_time (window, title, message, details, 0); -+ return gpk_error_dialog_modal_with_time (window, title, message, details, 0, FALSE); -+} -+ -+gboolean -+gpk_error_dialog_modal_yast (GtkWindow *window, const gchar *title, const gchar *message, const gchar *details) -+{ -+ return gpk_error_dialog_modal_with_time (window, title, message, details, 0, TRUE); - } - - /** -Index: gnome-packagekit-2.91.4/src/gpk-error.h -=================================================================== ---- gnome-packagekit-2.91.4.orig/src/gpk-error.h -+++ gnome-packagekit-2.91.4/src/gpk-error.h -@@ -37,7 +37,12 @@ gboolean gpk_error_dialog_modal_with_ti - const gchar *title, - const gchar *message, - const gchar *details, -- guint timestamp); -+ guint timestamp, -+ gboolean prompt_yast); -+gboolean gpk_error_dialog_modal_yast (GtkWindow *window, -+ const gchar *title, -+ const gchar *message, -+ const gchar *details); - - G_END_DECLS - -Index: gnome-packagekit-2.91.4/src/gpk-update-viewer.c -=================================================================== ---- gnome-packagekit-2.91.4.orig/src/gpk-update-viewer.c -+++ gnome-packagekit-2.91.4/src/gpk-update-viewer.c -@@ -461,8 +461,12 @@ gpk_update_viewer_update_packages_cb (Pk - CA_PROP_EVENT_DESCRIPTION, _("Failed to update"), NULL); - - window = GTK_WINDOW(gtk_builder_get_object (builder, "dialog_updates")); -- gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)), -- gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code)); -+ if (pk_error_get_code (error_code) == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) { -+ gpk_error_dialog_modal_yast (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)), -+ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code)); -+ } else -+ gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)), -+ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code)); - - /* re-enable the package list */ - gpk_update_viewer_packages_set_sensitive (TRUE); -@@ -2108,8 +2112,12 @@ gpk_update_viewer_get_details_cb (PkClie - g_warning ("failed to get details: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code)); - - window = GTK_WINDOW(gtk_builder_get_object (builder, "dialog_updates")); -- gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)), -- gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code)); -+ if (pk_error_get_code (error_code) == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) { -+ gpk_error_dialog_modal_yast (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)), -+ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code)); -+ } else -+ gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)), -+ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code)); - goto out; - } - -@@ -3020,8 +3028,12 @@ gpk_update_viewer_get_distro_upgrades_cb - g_warning ("failed to get list of distro upgrades: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code)); - - window = GTK_WINDOW(gtk_builder_get_object (builder, "dialog_updates")); -- gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)), -- gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code)); -+ if (pk_error_get_code (error_code) == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) { -+ gpk_error_dialog_modal_yast (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)), -+ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code)); -+ } else -+ gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)), -+ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code)); - goto out; - } - diff --git a/gnome-settings-daemon-3.10.0.tar.xz b/gnome-settings-daemon-3.10.0.tar.xz new file mode 100644 index 0000000..0247dcf --- /dev/null +++ b/gnome-settings-daemon-3.10.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005 +size 1647248 diff --git a/gnome-settings-daemon-3.9.92.tar.xz b/gnome-settings-daemon-3.9.92.tar.xz deleted file mode 100644 index 6ab7179..0000000 --- a/gnome-settings-daemon-3.9.92.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29e593b4867bda78edf6f0979e74366d1c9b4042390674a098a59d0520d41d79 -size 1642816 diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 4afdf5f..6e699c7 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Sep 27 09:58:04 UTC 2013 - dimstar@opensuse.org + +- Drop gnome-packagekit-BNC383261.patch: patch has been disabled + for more than 2 years and nobody missed the feature (bnc#689592). + +------------------------------------------------------------------- +Tue Sep 24 12:10:20 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.10.0: + + Date & Time: + - Fix possible crasher due to clash between json-c and + json-glib. + + Mouse: + - Fix critical warning with touchpad settings. + + Power: + - Fix laptop suspend when lid is closed even if external + monitor is present. + - Test fixes, add test with a failing device battery. + + Smartcard: + - Fix run-time warning. + ------------------------------------------------------------------- Thu Sep 19 13:20:55 UTC 2013 - idonmez@suse.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 0da1c1c..df2e81b 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -34,19 +34,17 @@ %endif Name: gnome-settings-daemon -Version: 3.9.92 +Version: 3.10.0 Release: 0 Summary: Settings daemon for the GNOME desktop License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-settings-daemon/3.9/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-settings-daemon/3.10/%{name}-%{version}.tar.xz # PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff Patch2: gnome-settings-daemon-system-proxy-configuration.diff # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-bnc462640-mute-action.patch bnc462640 bgo572365 vuntz@novell.com -- Mute button should always mute sound instead of toggling mute status Patch10: gnome-settings-daemon-bnc462640-mute-action.patch -# PATCH-NEEDS-REBASE PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches -Patch15: gnome-packagekit-BNC383261.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep @@ -66,7 +64,7 @@ BuildRequires: pkgconfig(colord) >= 1.0.2 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1 BuildRequires: pkgconfig(geoclue-2.0) -BuildRequires: pkgconfig(geocode-glib-1.0) >= 0.99.3 +BuildRequires: pkgconfig(geocode-glib-1.0) >= 3.10.0 BuildRequires: pkgconfig(glib-2.0) >= 2.37.7 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.9.0 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.9.91 @@ -142,8 +140,6 @@ translation-update-upstream #gnome-patch-translation-prepare #%%patch2 -p0 %patch10 -p0 -# PATCH-NEEDS-REBASE -#%%patch15 -p0 %patch17 -p1 %patch19 -p1