- updated to 0.18.6

- removed obsolete missing files and patch

diff --git a/e-module-wl_desktop_shell.edj b/e-module-wl_desktop_shell.edj
deleted file mode 100644 (file)
index 2c1f4d2..0000000
Binary files a/e-module-wl_desktop_shell.edj and /dev/null differ

diff --git a/e-module-wl_screenshot.edj b/e-module-wl_screenshot.edj
deleted file mode 100644 (file)
index eaf667a..0000000
Binary files a/e-module-wl_screenshot.edj and /dev/null differ

diff --git a/enlightenment-missing.patch b/enlightenment-missing.patch
deleted file mode 100644 (file)
index 2f8d6f0..0000000
--- a/enlightenment-missing.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- enlightenment-0.18.3/src/modules/wl_desktop_shell/e_desktop_shell_protocol.h.orig  1970-01-01 01:00:00.000000000 +0100
-+++ enlightenment-0.18.3/src/modules/wl_desktop_shell/e_desktop_shell_protocol.h       2014-02-03 19:04:06.967929065 +0100
-@@ -0,0 +1,131 @@
-+#ifndef DESKTOP_SERVER_PROTOCOL_H
-+#define DESKTOP_SERVER_PROTOCOL_H
-+
-+#ifdef  __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <stdint.h>
-+#include <stddef.h>
-+#include "wayland-util.h"
-+
-+struct wl_client;
-+struct wl_resource;
-+
-+/* struct e_desktop_shell; */
-+/* struct screensaver; */
-+
-+extern const struct wl_interface e_desktop_shell_interface;
-+extern const struct wl_interface screensaver_interface;
-+
-+#ifndef E_DESKTOP_SHELL_CURSOR_ENUM
-+#define E_DESKTOP_SHELL_CURSOR_ENUM
-+enum e_desktop_shell_cursor {
-+      E_DESKTOP_SHELL_CURSOR_NONE = 0,
-+      E_DESKTOP_SHELL_CURSOR_RESIZE_TOP = 1,
-+      E_DESKTOP_SHELL_CURSOR_RESIZE_BOTTOM = 2,
-+      E_DESKTOP_SHELL_CURSOR_ARROW = 3,
-+      E_DESKTOP_SHELL_CURSOR_RESIZE_LEFT = 4,
-+      E_DESKTOP_SHELL_CURSOR_RESIZE_TOP_LEFT = 5,
-+      E_DESKTOP_SHELL_CURSOR_RESIZE_BOTTOM_LEFT = 6,
-+      E_DESKTOP_SHELL_CURSOR_MOVE = 7,
-+      E_DESKTOP_SHELL_CURSOR_RESIZE_RIGHT = 8,
-+      E_DESKTOP_SHELL_CURSOR_RESIZE_TOP_RIGHT = 9,
-+      E_DESKTOP_SHELL_CURSOR_RESIZE_BOTTOM_RIGHT = 10,
-+      E_DESKTOP_SHELL_CURSOR_BUSY = 11,
-+};
-+#endif /* E_DESKTOP_SHELL_CURSOR_ENUM */
-+
-+struct e_desktop_shell_interface {
-+      /**
-+       * set_background - (none)
-+       * @output: (none)
-+       * @surface: (none)
-+       */
-+      void (*set_background)(struct wl_client *client,
-+                             struct wl_resource *resource,
-+                             struct wl_resource *output,
-+                             struct wl_resource *surface);
-+      /**
-+       * set_panel - (none)
-+       * @output: (none)
-+       * @surface: (none)
-+       */
-+      void (*set_panel)(struct wl_client *client,
-+                        struct wl_resource *resource,
-+                        struct wl_resource *output,
-+                        struct wl_resource *surface);
-+      /**
-+       * set_lock_surface - (none)
-+       * @surface: (none)
-+       */
-+      void (*set_lock_surface)(struct wl_client *client,
-+                               struct wl_resource *resource,
-+                               struct wl_resource *surface);
-+      /**
-+       * unlock - (none)
-+       */
-+      void (*unlock)(struct wl_client *client,
-+                     struct wl_resource *resource);
-+      /**
-+       * set_grab_surface - (none)
-+       * @surface: (none)
-+       */
-+      void (*set_grab_surface)(struct wl_client *client,
-+                               struct wl_resource *resource,
-+                               struct wl_resource *surface);
-+
-+      /**
-+       * desktop_ready - desktop is ready to be shown
-+       *
-+       * Tell the server, that enough desktop elements have been drawn
-+       * to make the desktop look ready for use. During start-up, the
-+       * server can wait for this request with a black screen before
-+       * starting to fade in the desktop, for instance. If the client
-+       * parts of a desktop take a long time to initialize, we avoid
-+       * showing temporary garbage.
-+       * @since: 2
-+       */
-+      void (*desktop_ready)(struct wl_client *client,
-+                            struct wl_resource *resource);
-+};
-+
-+#define E_DESKTOP_SHELL_CONFIGURE     0
-+#define E_DESKTOP_SHELL_PREPARE_LOCK_SURFACE  1
-+#define E_DESKTOP_SHELL_GRAB_CURSOR   2
-+
-+static inline void
-+e_desktop_shell_send_configure(struct wl_resource *resource_, uint32_t edges, struct wl_resource *surface, int32_t width, int32_t height)
-+{
-+      wl_resource_post_event(resource_, E_DESKTOP_SHELL_CONFIGURE, edges, surface, width, height);
-+}
-+
-+static inline void
-+e_desktop_shell_send_prepare_lock_surface(struct wl_resource *resource_)
-+{
-+      wl_resource_post_event(resource_, E_DESKTOP_SHELL_PREPARE_LOCK_SURFACE);
-+}
-+
-+static inline void
-+e_desktop_shell_send_grab_cursor(struct wl_resource *resource_, uint32_t cursor)
-+{
-+      wl_resource_post_event(resource_, E_DESKTOP_SHELL_GRAB_CURSOR, cursor);
-+}
-+
-+struct screensaver_interface {
-+      /**
-+       * set_surface - (none)
-+       * @surface: (none)
-+       * @output: (none)
-+       */
-+      void (*set_surface)(struct wl_client *client,
-+                          struct wl_resource *resource,
-+                          struct wl_resource *surface,
-+                          struct wl_resource *output);
-+};
-+
-+#ifdef  __cplusplus
-+}
-+#endif
-+
-+#endif

diff --git a/enlightenment.spec b/enlightenment.spec
index 2dd3474a005acfa138b48adf4970db19d660d802..f3d9e3568de596f02c844bc22558b3b977be434f 100644 (file)
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@ -12,16 +12,13 @@ Summary:    Enlightenment Window Manager
 Summary(hu.UTF-8):     Enlightenment ablakkezelő
 Summary(pl.UTF-8):     Zarządca okien X - Enlightenment
 Name:          enlightenment
-Version:       0.18.5
+Version:       0.18.6
 Release:       1
 License:       BSD
 Group:         X11/Window Managers
 Source0:       http://download.enlightenment.org/rel/apps/enlightenment/%{name}-%{version}.tar.bz2
-# Source0-md5: 444c1e57dacb45c0fa2c5abebc78b66d
+# Source0-md5: 5e165effb99522417203309d46ec00d6
 Source1:       %{name}-xsession.desktop
-Source2:       e-module-wl_desktop_shell.edj
-Source3:       e-module-wl_screenshot.edj
-Patch0:                %{name}-missing.patch
 URL:           http://enlightenment.org/
 BuildRequires: alsa-lib-devel >= 1.0.8
 BuildRequires: autoconf >= 2.59-9
@@ -173,10 +170,6 @@ Pliki nagłówkowe dla Enlightenmenta.
 
 %prep
 %setup -q
-# missing files
-%patch0 -p1
-cp -p %{SOURCE2} src/modules/wl_desktop_shell
-cp -p %{SOURCE3} src/modules/wl_screenshot
 
 %build
 %{__gettextize}