- 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

diff --git a/multiple-x-screens-workaround.patch b/multiple-x-screens-workaround.patch
new file mode 100644 (file)
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

diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index c6f710b97e23fcec70ca706cb1bc6d1bd802eb67..8c7f936c179d4edc3367d5103c4f7c5da9b98c85 100644 (file)
--- 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}