Keep middle click paste enabled for now

Backport upstream patch for enabling middle click paste by default. It
is not clear if the 3.9.91 release with middle click paste re-enabled
makes it in the for F20 Alpha, and diverging from upstream here would
give bad publicity for both GNOME and Fedora.
This commit is contained in:
Kalev Lember 2013-08-23 13:22:04 +02:00
parent 7aeda98fb7
commit c989439960
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From e204eddcdbfb9f8d722355fab1643330c7d10c25 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 22 Aug 2013 16:23:01 -0400
Subject: [PATCH] Keep middle click paste enabled for now
We're not really ready for this change, and we haven't
messaged it properly. After discussion with Allan Day and
Jakup Steiner, we'll defer this change until the next cycle.
---
plugins/xsettings/gsd-xsettings-manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
index cb018a0..c0f21fc 100644
--- a/plugins/xsettings/gsd-xsettings-manager.c
+++ b/plugins/xsettings/gsd-xsettings-manager.c
@@ -348,7 +348,7 @@ static FixedEntry fixed_entries [] = {
{ "Gtk/ShowInputMethodMenu", fixed_false_int },
{ "Gtk/ShowUnicodeMenu", fixed_false_int },
{ "Gtk/AutoMnemonics", fixed_true_int },
- { "Gtk/EnablePrimaryPaste", fixed_false_int },
+ { "Gtk/EnablePrimaryPaste", fixed_true_int },
};
static TranslationEntry translations [] = {
--
1.8.3.1

View File

@ -2,7 +2,7 @@
Name: gnome-settings-daemon Name: gnome-settings-daemon
Version: 3.9.90 Version: 3.9.90
Release: 1%{?dist} Release: 2%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons Group: System Environment/Daemons
@ -12,6 +12,8 @@ URL: http://download.gnome.org/sources/%{name}
Source: http://download.gnome.org/sources/%{name}/3.9/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/%{name}/3.9/%{name}-%{version}.tar.xz
# disable wacom for ppc/ppc64 (used on RHEL) # disable wacom for ppc/ppc64 (used on RHEL)
Patch0: %{name}-3.5.4-ppc-no-wacom.patch Patch0: %{name}-3.5.4-ppc-no-wacom.patch
# Backported from upstream
Patch1: 0001-Keep-middle-click-paste-enabled-for-now.patch
BuildRequires: dbus-glib-devel BuildRequires: dbus-glib-devel
BuildRequires: gtk3-devel >= 3.7.8 BuildRequires: gtk3-devel >= 3.7.8
@ -78,6 +80,7 @@ The %{name}-updates package contains the updates plugin for %{name}
%if 0%{?rhel} %if 0%{?rhel}
%patch0 -p1 -b .ppc-no-wacom %patch0 -p1 -b .ppc-no-wacom
%endif %endif
%patch1 -p1 -b .middle_click_paste
autoreconf -i -f autoreconf -i -f
@ -257,6 +260,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
%changelog %changelog
* Fri Aug 23 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.90-2
- Keep middle click paste enabled for now
* Thu Aug 22 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.90-1 * Thu Aug 22 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.90-1
- Update to 3.9.90 - Update to 3.9.90