[packages/xfce4-settings] - make X calls synchronous to work around BadMatch error in Xi extension detection (xfsettingsd/po

baggins baggins at pld-linux.org
Thu Oct 25 12:30:03 CEST 2012


commit c59a3e0af885607c50a70846a14f510021f7b528
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Oct 25 12:28:31 2012 +0200

    - make X calls synchronous to work around BadMatch error in Xi extension
      detection (xfsettingsd/pointers.c) when multiple X screens are in use
    - rel 3

 multiple-x-screens-workaround.patch | 11 +++++++++++
 xfce4-settings.spec                 |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index c6f710b..8c7f936 100644
--- a/xfce4-settings.spec
+++ b/xfce4-settings.spec
@@ -3,11 +3,12 @@ Summary:	Settings manager for the Xfce desktop environment
 Summary(pl.UTF-8):	Menadżer ustawień dla środowiska Xfce
 Name:		xfce4-settings
 Version:	4.10.0
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/xfce/xfce4-settings/4.10/%{name}-%{version}.tar.bz2
 # Source0-md5:	cc4dd9179ead9046c056431f01a12000
+Patch0:		multiple-x-screens-workaround.patch
 URL:		http://www.xfce.org/projects/xfce4-settings/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.8
@@ -43,6 +44,7 @@ Menadżer ustawień pozwala w łatwy i intuicyjny sposób dostosowywać
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__intltoolize}
diff --git a/multiple-x-screens-workaround.patch b/multiple-x-screens-workaround.patch
new file mode 100644
index 0000000..e6ed8b6
--- /dev/null
+++ b/multiple-x-screens-workaround.patch
@@ -0,0 +1,11 @@
+--- xfce4-settings-4.10.0/xfsettingsd/xfsettingsd.desktop.in~	2012-04-28 22:48:30.000000000 +0200
++++ xfce4-settings-4.10.0/xfsettingsd/xfsettingsd.desktop.in	2012-10-25 12:26:32.725519167 +0200
+@@ -2,7 +2,7 @@
+ Version=1.0
+ Name=Xfsettingsd
+ _Comment=The Xfce Settings Daemon
+-Exec=xfsettingsd
++Exec=xfsettingsd --sync
+ Icon=applications-system
+ Terminal=false
+ Type=Application
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfce4-settings.git/commitdiff/c59a3e0af885607c50a70846a14f510021f7b528



More information about the pld-cvs-commit mailing list