Hello community,
here is the log from the commit of package cinnamon-control-center for
openSUSE:Factory checked in at 2018-07-26 10:17:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-control-center (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-control-center"
Thu Jul 26 10:17:54 2018 rev:13 rq:624424 version:3.8.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-control-center/cinnamon-control-center.changes
2018-06-05 12:53:20.976675382 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-control-center.new/cinnamon-control-center.changes
2018-07-26 10:17:59.995893447 +0200
@@ -1,0 +2,11 @@
+Fri Jul 20 09:32:54 UTC 2018 - [email protected]
+
+- Update to version 3.8.1:
+ * cc-color-panel.c: Use cinnamon-desktop packagekit methods to
+ install gnome-color-manager.
+ * Remove a stray "]" in configure.ac.
+- Remove the unneeded libnm-util build dependency.
+- Restore the systemd-timedated1 polkit policy as bsc#1090371 has
+ been resolved.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-control-center-3.8.0.tar.gz
New:
----
cinnamon-control-center-3.8.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-control-center.spec ++++++
--- /var/tmp/diff_new_pack.g5XOnC/_old 2018-07-26 10:18:00.731894781 +0200
+++ /var/tmp/diff_new_pack.g5XOnC/_new 2018-07-26 10:18:00.735894788 +0200
@@ -19,7 +19,7 @@
%define soname libcinnamon-control-center
%define sover 1
Name: cinnamon-control-center
-Version: 3.8.0
+Version: 3.8.1
Release: 0
Summary: Utilities to configure the Cinnamon desktop
License: GPL-2.0-only AND GPL-3.0-or-later AND MIT
@@ -79,7 +79,6 @@
Recommends: mousetweaks
%if 0%{?suse_version} >= 1500
BuildRequires: pkgconfig(libnm) >= 1.2.0
-BuildRequires: pkgconfig(libnm-util) >= 0.9.8
BuildRequires: pkgconfig(libnma) >= 1.2.0
BuildRequires: pkgconfig(mm-glib) >= 0.7
%endif
@@ -143,9 +142,6 @@
find %{buildroot} -type f -name "*.la" -delete -print
-# TODO: Remove when bsc#1090371 is resolved.
-rm
%{buildroot}%{_datadir}/polkit-1/actions/org.cinnamon.controlcenter.datetime.policy
-
%find_lang %{name}-timezones
%fdupes %{buildroot}%{_datadir}/
@@ -180,6 +176,7 @@
%dir %{_datadir}/desktop-directories/
%{_datadir}/desktop-directories/cinnamoncc.directory
%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/polkit-1/actions/org.cinnamon.controlcenter.datetime.policy
%files -n %{soname}%{sover}
%{_libdir}/%{name}-%{sover}/
++++++ cinnamon-control-center-3.8.0.tar.gz ->
cinnamon-control-center-3.8.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-3.8.0/configure.ac
new/cinnamon-control-center-3.8.1/configure.ac
--- old/cinnamon-control-center-3.8.0/configure.ac 2018-04-17
13:44:10.000000000 +0200
+++ new/cinnamon-control-center-3.8.1/configure.ac 2018-07-17
09:38:41.000000000 +0200
@@ -1,4 +1,4 @@
-m4_define([cinnamon_control_center_version], 3.8.0)
+m4_define([cinnamon_control_center_version], 3.8.1)
AC_INIT([cinnamon-control-center], [cinnamon_control_center_version],
[https://github.com/linuxmint/cinnamon-control-center/issues])
@@ -273,7 +273,7 @@
cinnamon-desktop
gtk+-3.0 >= 3.8.0])
build_wacom="true"
- AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
+ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])
fi
AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
AC_SUBST(WACOM_PANEL_CFLAGS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-3.8.0/debian/changelog
new/cinnamon-control-center-3.8.1/debian/changelog
--- old/cinnamon-control-center-3.8.0/debian/changelog 2018-04-17
13:44:10.000000000 +0200
+++ new/cinnamon-control-center-3.8.1/debian/changelog 2018-07-17
09:38:41.000000000 +0200
@@ -1,3 +1,13 @@
+cinnamon-control-center (3.8.1) tara; urgency=medium
+
+ [ Michael Webster ]
+ * cc-color-panel.c: Use cinnamon-desktop packagekit methods to install
gnome-color-manager.
+
+ [ Leigh Scott ]
+ * Remove stray ] (#211)
+
+ -- Clement Lefebvre <[email protected]> Tue, 17 Jul 2018 09:38:20 +0200
+
cinnamon-control-center (3.8.0) tara; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-3.8.0/panels/color/cc-color-panel.c
new/cinnamon-control-center-3.8.1/panels/color/cc-color-panel.c
--- old/cinnamon-control-center-3.8.0/panels/color/cc-color-panel.c
2018-04-17 13:44:10.000000000 +0200
+++ new/cinnamon-control-center-3.8.1/panels/color/cc-color-panel.c
2018-07-17 09:38:41.000000000 +0200
@@ -28,6 +28,8 @@
#include <glib/gi18n.h>
#include "cc-color-panel.h"
+#include <libcinnamon-desktop/gnome-installer.h>
+
#define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w)
CC_PANEL_REGISTER (CcColorPanel, cc_color_panel)
@@ -257,28 +259,38 @@
return file;
}
+typedef struct
+{
+ GPtrArray *argv;
+ guint xid;
+
+} ClosureData;
+
+static void free_data(ClosureData *data)
+{
+ g_ptr_array_unref (data->argv);
+ g_slice_free (ClosureData, data);
+}
+
static void
-gcm_packagekit_finished_cb (GObject *source, GAsyncResult *res, gpointer
user_data)
+installer_finished_cb (gboolean success, gpointer user_data)
{
- GPtrArray *argv = (GPtrArray *)user_data;
- GVariant *reply;
- GError *error = NULL;
+ ClosureData *data = (ClosureData *)user_data;
+ GError *error;
gboolean ret;
- reply = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, &error);
- g_variant_unref (reply);
-
- if (error != NULL)
+ if (!success)
{
- g_warning ("failed to install required component: %s", error->message);
- g_ptr_array_unref (argv);
- g_error_free (error);
+ g_warning ("failed to install required component");
+ free_data (data);
return;
}
- ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0,
+ error = NULL;
+
+ ret = g_spawn_async (NULL, (gchar**) data->argv->pdata, NULL, 0,
NULL, NULL, NULL, &error);
- g_ptr_array_unref (argv);
+ free_data (data);
if (!ret)
{
g_warning ("failed to run command: %s", error->message);
@@ -286,71 +298,22 @@
}
}
-struct gcm_packagekit_closure_data
-{
- GPtrArray *argv;
- guint xid;
-};
-
-static void
-gcm_packagekit_proxy_ready_cb (GObject *source, GAsyncResult *res, gpointer
user_data)
-{
- struct gcm_packagekit_closure_data *data =
- (struct gcm_packagekit_closure_data *)user_data;
- GDBusProxy *session_installer;
- GVariantBuilder *builder;
- GError *error = NULL;
-
- session_installer = g_dbus_proxy_new_for_bus_finish (res, &error);
- if (error != NULL)
- {
- g_warning ("failed to connect to PackageKit interface: %s",
- error->message);
- g_ptr_array_unref (data->argv);
- g_free (data);
- g_error_free (error);
- return;
- }
-
- builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
- g_variant_builder_add (builder, "s",
- g_ptr_array_index (data->argv, 0));
- g_dbus_proxy_call (session_installer,
- "InstallProvideFiles",
- g_variant_new ("(uass)",
- data->xid,
- builder,
- "hide-finished"
- ),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &gcm_packagekit_finished_cb,
- data->argv);
-
- g_free (data);
- g_variant_builder_unref (builder);
-}
-
static void
gcm_prefs_install_component (guint xid, GPtrArray *argv)
{
- struct gcm_packagekit_closure_data *data;
- data = g_malloc (sizeof (*data));
+ ClosureData *data;
+ data = g_slice_new(ClosureData);
data->argv = argv;
data->xid = xid;
g_ptr_array_ref (data->argv);
- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
- G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
- NULL,
- "org.freedesktop.PackageKit",
- "/org/freedesktop/PackageKit",
- "org.freedesktop.PackageKit.Modify",
- NULL,
- &gcm_packagekit_proxy_ready_cb,
- data);
+ const gchar *to_install[2];
+ to_install[0] = "gnome-color-manager";
+ to_install[1] = NULL;
+
+ gnome_installer_install_packages(to_install,
+ (GnomeInstallerClientCallback)
installer_finished_cb,
+ data);
}
static void
