raveit65 pushed to mate-desktop (f22). "fix several issues"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Mar 25 23:21:00 UTC 2015
>From fa91554ffc7f4fd152d367018789bc45ca2e66e7 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Thu, 26 Mar 2015 00:18:00 +0100
Subject: fix several issues
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 87c5ace..62bf611 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -2,7 +2,7 @@ Summary: Shared code for mate-panel, mate-session, mate-file-manager, etc
Name: mate-desktop
License: GPLv2+ and LGPLv2+ and MIT
Version: 1.9.90
-Release: 2%{?dist}
+Release: 3%{?dist}
Source0: http://pub.mate-desktop.org/releases/1.9/%{name}-%{version}.tar.xz
URL: http://mate-desktop.org
@@ -10,6 +10,12 @@ Source1: mate-fedora-f22.gschema.override
Source2: mate-fedora-f20.gschema.override
Source3: mate-fedora-f21.gschema.override
+# rhbz (#972534)
+# https://github.com/mate-desktop/mate-desktop/pull/166
+Patch0: mate-desktop_fix-pkexec-wth-m_c_c.patch
+# http://git.mate-desktop.org/mate-desktop/commit/?id=b10f592
+Patch1: mate-desktop_fix-glib-2.43.patch
+
BuildRequires: dconf-devel
BuildRequires: desktop-file-utils
BuildRequires: mate-common
@@ -88,6 +94,9 @@ libmatedesktop.
%prep
%setup -q
+%patch0 -p1 -b .pkexec
+%patch1 -p1 -b .glib
+
%build
%configure \
--enable-desktop-docs \
@@ -173,6 +182,12 @@ fi
%changelog
+* Wed Mar 25 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.9.90.3
+- fix pkexec issues with mate-control-center
+- set side-by-side-tiling=false as default for marco
+- set enable-delete=true as default for caja
+- fix glib-2.43 gsettings breakage
+
* Wed Mar 04 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.9.90.2
- adjust gsettings override file for f22 default background
diff --git a/mate-desktop_fix-glib-2.43.patch b/mate-desktop_fix-glib-2.43.patch
new file mode 100644
index 0000000..6958396
--- /dev/null
+++ b/mate-desktop_fix-glib-2.43.patch
@@ -0,0 +1,40 @@
+From b10f5922f62c3936c4a7c7d809dda6f8497a926a Mon Sep 17 00:00:00 2001
+From: Monsta <monsta at inbox.ru>
+Date: Mon, 02 Mar 2015 13:57:42 +0000
+Subject: mate-thumbnail: first connect to settings, then read them.
+
+fixes the issue with GLib >= 2.43,
+https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
+
+Closes https://github.com/mate-desktop/mate-desktop/pull/162
+---
+diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
+index 4a4e5d6..02bcaf2 100644
+--- a/libmate-desktop/mate-desktop-thumbnail.c
++++ b/libmate-desktop/mate-desktop-thumbnail.c
+@@ -790,9 +790,7 @@ mate_desktop_thumbnail_factory_init (MateDesktopThumbnailFactory *factory)
+ g_mutex_init (&priv->lock);
+
+ priv->settings = g_settings_new ("org.mate.thumbnailers");
+- priv->disabled = g_settings_get_boolean (priv->settings, "disable-all");
+- if (!priv->disabled)
+- priv->disabled_types = g_settings_get_strv (priv->settings, "disable");
++
+ g_signal_connect (priv->settings, "changed::disable-all",
+ G_CALLBACK (external_thumbnailers_disabled_all_changed_cb),
+ factory);
+@@ -800,6 +798,11 @@ mate_desktop_thumbnail_factory_init (MateDesktopThumbnailFactory *factory)
+ G_CALLBACK (external_thumbnailers_disabled_changed_cb),
+ factory);
+
++ priv->disabled = g_settings_get_boolean (priv->settings, "disable-all");
++
++ if (!priv->disabled)
++ priv->disabled_types = g_settings_get_strv (priv->settings, "disable");
++
+ if (!priv->disabled)
+ mate_desktop_thumbnail_factory_load_thumbnailers (factory);
+ }
+--
+cgit
+
diff --git a/mate-desktop_fix-pkexec-wth-m_c_c.patch b/mate-desktop_fix-pkexec-wth-m_c_c.patch
new file mode 100644
index 0000000..6d29449
--- /dev/null
+++ b/mate-desktop_fix-pkexec-wth-m_c_c.patch
@@ -0,0 +1,50 @@
+diff --git a/libmate-desktop/mate-desktop-item.c b/libmate-desktop/mate-desktop-item.c
+index eb004d9..c0ee1da 100644
+--- a/libmate-desktop/mate-desktop-item.c
++++ b/libmate-desktop/mate-desktop-item.c
+@@ -1721,6 +1721,17 @@ make_environment_for_screen (GdkScreen *screen,
+ return retval;
+ }
+
++static void
++dummy_child_watch (GPid pid,
++ gint status,
++ gpointer user_data)
++{
++ /* Nothing, this is just to ensure we don't double fork
++ * and break pkexec:
++ * https://bugzilla.gnome.org/show_bug.cgi?id=675789
++ */
++}
++
+ static int
+ ditem_execute (const MateDesktopItem *item,
+ const char *exec,
+@@ -1749,6 +1760,7 @@ ditem_execute (const MateDesktopItem *item,
+ char *new_exec, *uris, *temp;
+ char *exec_locale;
+ int launched = 0;
++ GPid pid;
+ #ifdef HAVE_STARTUP_NOTIFICATION
+ GdkDisplay *gdkdisplay;
+ SnLauncherContext *sn_context;
+@@ -1957,14 +1969,17 @@ ditem_execute (const MateDesktopItem *item,
+ (do_not_reap_child ? G_SPAWN_DO_NOT_REAP_CHILD : 0) | G_SPAWN_SEARCH_PATH /* flags */,
+ NULL, /* child_setup_func */
+ NULL, /* child_setup_func_data */
+- &ret /* child_pid */,
++ (do_not_reap_child ? &pid : NULL) /* child_pid */,
+ error)) {
+ /* The error was set for us,
+ * we just can't launch this thingie */
+ ret = -1;
+ g_strfreev (real_argv);
+ break;
++ } else if (do_not_reap_child) {
++ g_child_watch_add (pid, dummy_child_watch, NULL);
+ }
++
+ launched ++;
+
+ g_strfreev (real_argv);
+
diff --git a/mate-fedora-f22.gschema.override b/mate-fedora-f22.gschema.override
index a74579c..ec47d36 100644
--- a/mate-fedora-f22.gschema.override
+++ b/mate-fedora-f22.gschema.override
@@ -25,3 +25,9 @@ cursor-theme='mate'
compatible-projects=['GNOME', 'KDE', 'XFCE', 'MATE']
require-appdata=false
+[org.mate.Marco.general]
+side-by-side-tiling=false
+
+[org.mate.caja.preferences]
+enable-delete=true
+
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mate-desktop.git/commit/?h=f22&id=fa91554ffc7f4fd152d367018789bc45ca2e66e7
More information about the scm-commits
mailing list