commit b72441823143e1cc9bbdccf98780740b700dafe5
Author: Jan Rękorajski <[email protected]>
Date: Fri Aug 15 22:07:28 2014 +0200
- up to 4.11.2
01_use-tango-icon-theme.patch | 2 +-
...tingsd-Check-for-NoSuchExtension-bug-9390.patch | 26 ----------------------
xfce4-settings.spec | 23 ++++++++++---------
3 files changed, 14 insertions(+), 37 deletions(-)
---
diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index 65df010..eaf5ee0 100644
--- a/xfce4-settings.spec
+++ b/xfce4-settings.spec
@@ -1,16 +1,15 @@
-%define xfce_version 4.10.0
+%define xfce_version 4.11.0
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: 5
+Version: 4.11.2
+Release: 1
License: GPL v2
Group: X11/Applications
-Source0:
http://archive.xfce.org/src/xfce/xfce4-settings/4.10/%{name}-%{version}.tar.bz2
-# Source0-md5: cc4dd9179ead9046c056431f01a12000
+Source0:
http://archive.xfce.org/src/xfce/xfce4-settings/4.11/%{name}-%{version}.tar.bz2
+# Source0-md5: 7f04161008e1c9fe8cb743f5a8c5a50b
Patch0: multiple-x-screens-workaround.patch
Patch1: 01_use-tango-icon-theme.patch
-Patch2: 02-Xfsettingsd-Check-for-NoSuchExtension-bug-9390.patch
URL: http://www.xfce.org/projects/xfce4-settings/
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.8
@@ -21,6 +20,7 @@ BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 1:2.16.0
BuildRequires: gtk+2-devel >= 2:2.14.0
BuildRequires: intltool
+BuildRequires: libcanberra-devel
BuildRequires: libnotify-devel
BuildRequires: libtool
BuildRequires: libxfce4ui-devel >= %{xfce_version}
@@ -28,11 +28,13 @@ BuildRequires: libxfce4util-devel >= %{xfce_version}
BuildRequires: libxklavier-devel
BuildRequires: pkgconfig
BuildRequires: xfce4-dev-tools >= %{xfce_version}
-BuildRequires: xfconf-devel >= %{xfce_version}
+#BuildRequires: xfconf-devel >= %{xfce_version}
+BuildRequires: xfconf-devel >= 4.10.0
BuildRequires: xorg-lib-libXcursor-devel >= 1.1.0
BuildRequires: xorg-lib-libXi-devel
BuildRequires: xorg-proto-inputproto-devel >= 1.4.0
-Requires: xfconf >= %{xfce_version}
+#Requires: xfconf >= %{xfce_version}
+Requires: xfconf >= 4.10.0
Obsoletes: xfce-mcs-manager
Obsoletes: xfce-mcs-plugins
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,7 +51,6 @@ Menadżer ustawień pozwala w łatwy i intuicyjny sposób
dostosowywać
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__intltoolize}
@@ -59,7 +60,8 @@ Menadżer ustawień pozwala w łatwy i intuicyjny sposób
dostosowywać
%{__autoheader}
%{__automake}
%configure \
- --disable-silent-rules
+ --disable-silent-rules \
+ --enable-sound-settings
%{__make}
@@ -101,3 +103,4 @@ rm -rf $RPM_BUILD_ROOT
%{_desktopdir}/xfce4-accessibility-settings.desktop
%{_desktopdir}/xfce4-mime-settings.desktop
%{_desktopdir}/xfce4-settings-editor.desktop
+%{_iconsdir}/hicolor/*x*/devices/xfce-display-*.png
diff --git a/01_use-tango-icon-theme.patch b/01_use-tango-icon-theme.patch
index ee25655..10eda52 100644
--- a/01_use-tango-icon-theme.patch
+++ b/01_use-tango-icon-theme.patch
@@ -10,6 +10,6 @@ index 049b4ed..0b72294 100644
- <property name="IconThemeName" type="empty"/>
+ <property name="ThemeName" type="string" value="Xfce"/>
+ <property name="IconThemeName" type="string" value="Tango"/>
- <property name="DoubleClickTime" type="int" value="250"/>
+ <property name="DoubleClickTime" type="int" value="400"/>
<property name="DoubleClickDistance" type="int" value="5"/>
<property name="DndDragThreshold" type="int" value="8"/>
diff --git a/02-Xfsettingsd-Check-for-NoSuchExtension-bug-9390.patch
b/02-Xfsettingsd-Check-for-NoSuchExtension-bug-9390.patch
deleted file mode 100644
index c18b667..0000000
--- a/02-Xfsettingsd-Check-for-NoSuchExtension-bug-9390.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1d62ea7fb76ce14c87c61dd4a41d6ccc5b9c6095 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <[email protected]>
-Date: Sun, 28 Oct 2012 17:11:13 +0100
-Subject: [PATCH] Xfsettingsd: Check for NoSuchExtension (bug #9390).
-
----
- xfsettingsd/pointers.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/xfsettingsd/pointers.c b/xfsettingsd/pointers.c
-index a060051..e7192e7 100644
---- a/xfsettingsd/pointers.c
-+++ b/xfsettingsd/pointers.c
-@@ -129,7 +129,8 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
- version = XGetExtensionVersion (xdisplay, INAME);
-
- /* check for Xi */
-- if (version == NULL || !version->present)
-+ if (version == NULL || ((long) version) == NoSuchExtension
-+ || !version->present)
- {
- g_critical ("XI is not present.");
- }
---
-1.8.3.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfce4-settings.git/commitdiff/b72441823143e1cc9bbdccf98780740b700dafe5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
