Attachment 909817 Details for Bug 1106182 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-gnome-settings-daemon-3.7.3-913945-99.patch (text/plain), 5.05 KB, created by Yaakov Selkowitz on 2014-06-18 02:13:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-18 02:13:02 UTC

Size: 5.05 KB

patch

obsolete

>From 17118b717d616892f98fd03ec657b325374944b4 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Tue, 17 Jun 2014 21:10:33 -0500
>Subject: [PATCH] Fix FTBFS with gnome-settings-daemon >= 3.7.3 (#913945,
> #992154, #1106182)
>
>---
> drwright-3.2.5-gsd37.patch | 95 ++++++++++++++++++++++++++++++++++++++++++++++
> drwright.spec              |  9 ++++-
> 2 files changed, 102 insertions(+), 2 deletions(-)
> create mode 100644 drwright-3.2.5-gsd37.patch
>
>diff --git a/drwright-3.2.5-gsd37.patch b/drwright-3.2.5-gsd37.patch
>new file mode 100644
>index 0000000..9938971
>--- /dev/null
>+++ b/drwright-3.2.5-gsd37.patch
>@@ -0,0 +1,95 @@
>+Upstream commits 6fb8014 and 75d30f3
>+
>+diff --git a/src/gsd-typing-break-plugin.c b/src/gsd-typing-break-plugin.c
>+index ceb5e88..4cf81c8 100644
>+--- a/src/gsd-typing-break-plugin.c
>++++ b/src/gsd-typing-break-plugin.c
>+@@ -23,86 +23,7 @@
>+ #include <glib/gi18n-lib.h>
>+ #include <gmodule.h>
>+ 
>+-#include "gsd-typing-break-plugin.h"
>++#include <gnome-settings-daemon/gnome-settings-plugin.h>
>+ #include "gsd-typing-break-manager.h"
>+ 
>+-struct GsdTypingBreakPluginPrivate {
>+-        GsdTypingBreakManager *manager;
>+-};
>+-
>+-#define GSD_TYPING_BREAK_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_TYPING_BREAK_PLUGIN, GsdTypingBreakPluginPrivate))
>+-
>+-GNOME_SETTINGS_PLUGIN_REGISTER (GsdTypingBreakPlugin, gsd_typing_break_plugin)
>+-
>+-static void
>+-gsd_typing_break_plugin_class_finalize (GsdTypingBreakPluginClass *klass)
>+-{
>+-}
>+-
>+-static void
>+-gsd_typing_break_plugin_init (GsdTypingBreakPlugin *plugin)
>+-{
>+-        plugin->priv = GSD_TYPING_BREAK_PLUGIN_GET_PRIVATE (plugin);
>+-
>+-        g_debug ("GsdTypingBreakPlugin initializing");
>+-
>+-        plugin->priv->manager = gsd_typing_break_manager_new ();
>+-}
>+-
>+-static void
>+-gsd_typing_break_plugin_finalize (GObject *object)
>+-{
>+-        GsdTypingBreakPlugin *plugin;
>+-
>+-        g_return_if_fail (object != NULL);
>+-        g_return_if_fail (GSD_IS_TYPING_BREAK_PLUGIN (object));
>+-
>+-        g_debug ("GsdTypingBreakPlugin finalizing");
>+-
>+-        plugin = GSD_TYPING_BREAK_PLUGIN (object);
>+-
>+-        g_return_if_fail (plugin->priv != NULL);
>+-
>+-        if (plugin->priv->manager != NULL) {
>+-                g_object_unref (plugin->priv->manager);
>+-        }
>+-
>+-        G_OBJECT_CLASS (gsd_typing_break_plugin_parent_class)->finalize (object);
>+-}
>+-
>+-static void
>+-impl_activate (GnomeSettingsPlugin *plugin)
>+-{
>+-        gboolean res;
>+-        GError  *error;
>+-
>+-        g_debug ("Activating typing_break plugin");
>+-
>+-        error = NULL;
>+-        res = gsd_typing_break_manager_start (GSD_TYPING_BREAK_PLUGIN (plugin)->priv->manager, &error);
>+-        if (! res) {
>+-                g_warning ("Unable to start typing_break manager: %s", error->message);
>+-                g_error_free (error);
>+-        }
>+-}
>+-
>+-static void
>+-impl_deactivate (GnomeSettingsPlugin *plugin)
>+-{
>+-        g_debug ("Deactivating typing_break plugin");
>+-        gsd_typing_break_manager_stop (GSD_TYPING_BREAK_PLUGIN (plugin)->priv->manager);
>+-}
>+-
>+-static void
>+-gsd_typing_break_plugin_class_init (GsdTypingBreakPluginClass *klass)
>+-{
>+-        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
>+-        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
>+-
>+-        object_class->finalize = gsd_typing_break_plugin_finalize;
>+-
>+-        plugin_class->activate = impl_activate;
>+-        plugin_class->deactivate = impl_deactivate;
>+-
>+-        g_type_class_add_private (klass, sizeof (GsdTypingBreakPluginPrivate));
>+-}
>++GNOME_SETTINGS_PLUGIN_REGISTER (GsdTypingBreak, gsd_typing_break)
>diff --git a/drwright.spec b/drwright.spec
>index 759853b..2ad437c 100644
>--- a/drwright.spec
>+++ b/drwright.spec
>@@ -1,16 +1,17 @@
> Name:           drwright
> Version:        3.2.5
>-Release:        5%{?dist}
>+Release:        6%{?dist}
> Summary:        Typing monitor to force typing breaks
> 
> License:        GPLv2+
> URL:            http://www.gnome.org/
> Source0:        http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz
>+Patch0:         drwright-3.2.5-gsd37.patch
> 
> BuildRequires:  glib2-devel >= 2.26.0
> BuildRequires:  gtk3-devel >= 3.0.0
> BuildRequires:  control-center-devel >= 2.91.6
>-BuildRequires:  gnome-settings-daemon-devel >= 2.91.8
>+BuildRequires:  gnome-settings-daemon-devel >= 3.7.3
> BuildRequires:  libnotify-devel >= 0.7
> BuildRequires:  pkgconfig(libcanberra-gtk3)
> BuildRequires:  libXScrnSaver-devel
>@@ -23,6 +24,7 @@ BuildRequires:  intltool
> 
> %prep
> %setup -q
>+%patch0 -p1 -b .gsd37
> 
> %build
> %configure --disable-static
>@@ -65,6 +67,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
> %{_libdir}/gnome-settings-daemon-3.0/typing-break.gnome-settings-plugin
> 
> %changelog
>+* Tue Jun 17 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 3.2.5-6
>+- Fix FTBFS with gnome-settings-daemon >= 3.7.3 (#913945, #992154, #1106182)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1106182: 904112 | 904113 | 904114 | 909817