- 4.6.5, XFCE 4.6.2

Changed files:
    xfce4-settings-XI2.patch -> 1.2
    xfce4-settings-libxklavier4.patch -> 1.2
    xfce4-settings-libxklavier5.patch -> 1.2
    xfce4-settings.spec -> 1.12

diff --git a/xfce4-settings-XI2.patch b/xfce4-settings-XI2.patch
deleted file mode 100644 (file)
index 67ecc4a..0000000
--- a/xfce4-settings-XI2.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -dur -x '*~' -x '*.orig' xfce4-settings-4.6.1.orig/dialogs/mouse-settings/main.c xfce4-settings-4.6.1/dialogs/mouse-settings/main.c
---- xfce4-settings-4.6.1.orig/dialogs/mouse-settings/main.c    2009-03-28 10:57:59.000000000 +0100
-+++ xfce4-settings-4.6.1/dialogs/mouse-settings/main.c 2010-05-05 09:18:12.000000000 +0200
-@@ -60,6 +60,10 @@
- #define IsXExtensionPointer 4
- #endif
- 
-+/* Xi 1.4 is required */
-+#define MIN_XI_VERS_MAJOR 1
-+#define MIN_XI_VERS_MINOR 4
-+
- /* settings */
- #ifdef HAVE_XCURSOR
- #define PREVIEW_ROWS    (3)
-@@ -1222,12 +1226,19 @@
-         return EXIT_FAILURE;
-     }
-     
--    /* check for Xi 1.4 */
-+    /* check for Xi */
-     version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
--    if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
-+    if (version == NULL || !version->present) {
-+        g_critical ("XI is not present.");
-+        return EXIT_FAILURE;
-+    }
-+    else if (version->major_version < MIN_XI_VERS_MAJOR
-+             || (version->major_version == MIN_XI_VERS_MAJOR
-+                 && version->minor_version < MIN_XI_VERS_MINOR))
-     {
--        g_critical ("XI is not present or too old.");
--        
-+        g_critical ("Your XI is too old (%d.%d) version %d.%d is required.",
-+                    version->major_version, version->minor_version,
-+                    MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
-         return EXIT_FAILURE;
-     }
- 
-diff -dur -x '*~' -x '*.orig' xfce4-settings-4.6.1.orig/xfce4-settings-helper/pointers.c xfce4-settings-4.6.1/xfce4-settings-helper/pointers.c
---- xfce4-settings-4.6.1.orig/xfce4-settings-helper/pointers.c 2009-03-28 10:57:59.000000000 +0100
-+++ xfce4-settings-4.6.1/xfce4-settings-helper/pointers.c      2010-05-05 09:18:12.000000000 +0200
-@@ -42,6 +42,10 @@
- 
- #define MAX_DENOMINATOR (100.00)
- 
-+/* Xi 1.4 is required */
-+#define MIN_XI_VERS_MAJOR 1
-+#define MIN_XI_VERS_MINOR 4
-+
- /* test if the required version of inputproto (1.4.2) is available */
- #if XI_Add_DevicePresenceNotify_Major >= 1 && defined (DeviceRemoved)
- #define HAS_DEVICE_HOTPLUGGING
-@@ -133,18 +137,22 @@
- 
-     /* get the default display */
-     xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
--    
-+
-     /* query the extension version */
-     version = XGetExtensionVersion (xdisplay, INAME);
--    
--    /* check for Xi 1.4 */
--    if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
--    {
--        /* print error */
--        g_critical ("XI is not present or too old.");
- 
--        /* no channel */
--        helper->channel = NULL;
-+    /* check for Xi */
-+    if (version == NULL || !version->present)
-+    {
-+        g_critical ("XI is not present.");
-+    }
-+    else if (version->major_version < MIN_XI_VERS_MAJOR
-+             || (version->major_version == MIN_XI_VERS_MAJOR
-+                 && version->minor_version < MIN_XI_VERS_MINOR))
-+    {
-+        g_critical ("Your XI is too old (%d.%d) version %d.%d is required.",
-+                    version->major_version, version->minor_version,
-+                    MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
-     }
-     else
-     {

diff --git a/xfce4-settings-libxklavier4.patch b/xfce4-settings-libxklavier4.patch
deleted file mode 100644 (file)
index 7ea85c3..0000000
--- a/xfce4-settings-libxklavier4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c~   2009-09-27 23:55:33.835021249 +0200
-+++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c    2009-09-27 23:55:38.032312529 +0200
-@@ -378,7 +378,7 @@
-   xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine);
- 
-   settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine);
--  xkl_config_registry_load (settings->priv->xkl_registry);
-+  xkl_config_registry_load (settings->priv->xkl_registry, FALSE);
- 
-   /* Tab */
-   xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox");

diff --git a/xfce4-settings-libxklavier5.patch b/xfce4-settings-libxklavier5.patch
deleted file mode 100644 (file)
index 544906c..0000000
--- a/xfce4-settings-libxklavier5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./dialogs/keyboard-settings/xfce-keyboard-settings.c.org   2010-04-30 18:29:46.201317308 +0200
-+++ ./dialogs/keyboard-settings/xfce-keyboard-settings.c       2010-04-30 18:30:34.551318908 +0200
-@@ -453,7 +453,7 @@ xfce_keyboard_settings_finalize (GObject
- 
- #ifdef HAVE_LIBXKLAVIER
-   /* Stop xklavier engine */
--  xkl_engine_stop_listen (settings->priv->xkl_engine);
-+  xkl_engine_stop_listen (settings->priv->xkl_engine,XKLL_TRACK_KEYBOARD_STATE);
- #endif /* HAVE_LIBXKLAVIER */
- 
-   g_object_unref (settings->priv->provider);

diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index 417cc264443ade6a4a13459bb18e5aa7a5ea5a3d..6e1229c27220014916b7c34403b6079cb9d2e391 100644 (file)
--- a/xfce4-settings.spec
+++ b/xfce4-settings.spec
@@ -1,16 +1,14 @@
+%define                xfce_version    4.6.2
 Summary:       Settings manager for the Xfce desktop environment
 Summary(pl.UTF-8):     Menadżer ustawień dla środowiska Xfce
 Name:          xfce4-settings
-Version:       4.6.1
-Release:       6
+Version:       4.6.5
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: dc1c8704471c5b0104fa10c30eb60cb6
+Source0:       http://www.xfce.org/archive/xfce-%{xfce_version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: f988cb732913b5fbc115ad7105d2231e
 Patch0:                %{name}-default-icon-theme.patch
-Patch1:                %{name}-libxklavier4.patch
-Patch2:                %{name}-libxklavier5.patch
-Patch3:                %{name}-XI2.patch
 URL:           http://www.xfce.org/projects/xfce4-settings/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.8
@@ -24,13 +22,13 @@ BuildRequires:      libglade2-devel >= 1:2.6.0
 BuildRequires: libnotify-devel
 BuildRequires: libtool
 BuildRequires: libwnck-devel >= 2.12.0
-BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxfce4util-devel >= %{xfce_version}
+BuildRequires: libxfcegui4-devel >= %{xfce_version}
 BuildRequires: libxklavier-devel
 BuildRequires: pkgconfig
 BuildRequires: xfce4-dev-tools >= 4.6.0
-BuildRequires: xfconf-devel >= %{version}
-Requires:      xfconf >= %{version}
+BuildRequires: xfconf-devel >= %{xfce_version}
+Requires:      xfconf >= %{xfce_version}
 Obsoletes:     xfce-mcs-manager
 Obsoletes:     xfce-mcs-plugins
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,9 +44,6 @@ Menadżer ustawień pozwala w łatwy i intuicyjny sposób dostosowywać
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__intltoolize}