From 65fb310f105b321f371e97e3f703de1489d27e650ad8d2f5ef430cacf14b8e03 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 25 Apr 2016 11:47:22 +0000
Subject: [PATCH] - removed u_fix-issue-with-gcc.patch   * patch was only
 necessary with gcc in 2013, when building     'awesome' against the static
 library; we do not ship the static     libary (did we ever?)    
 https://lists.freedesktop.org/archives/xcb/2016-April/010737.html

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xcb-util-cursor?expand=0&rev=8
---
 u_fix-issue-with-gcc.patch | 42 --------------------------------------
 xcb-util-cursor.changes    |  9 ++++++++
 xcb-util-cursor.spec       |  4 +---
 3 files changed, 10 insertions(+), 45 deletions(-)
 delete mode 100644 u_fix-issue-with-gcc.patch

diff --git a/u_fix-issue-with-gcc.patch b/u_fix-issue-with-gcc.patch
deleted file mode 100644
index 85c45fb..0000000
--- a/u_fix-issue-with-gcc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 3c6a5b2d1e1d0f5d09566ec8b3c2352a00007b73
-Author: Kristoffer Grönlund <krig@koru.se>
-Date:   Sun Oct 6 00:12:47 2013 +0200
-
-    cursor: Fix issue with gcc
-    
-    cursor_shape_to_id should not be declared const,
-    else it is not added to the static library.
-
-diff --git a/cursor/cursor.h b/cursor/cursor.h
-index 455dc34..3fe7096 100644
---- a/cursor/cursor.h
-+++ b/cursor/cursor.h
-@@ -161,7 +161,7 @@ typedef struct xcint_image_t {
- } __attribute__((packed)) xcint_image_t;
- 
- /* shape_to_id.c */
--const int cursor_shape_to_id(const char *name);
-+int cursor_shape_to_id(const char *name);
- 
- /* parse_cursor_file.c */
- int parse_cursor_file(xcb_cursor_context_t *c, const int fd, xcint_image_t **images, int *nimg);
-diff --git a/cursor/shape_to_id.gperf b/cursor/shape_to_id.gperf
-index 23615f9..6c8818e 100644
---- a/cursor/shape_to_id.gperf
-+++ b/cursor/shape_to_id.gperf
-@@ -1,5 +1,5 @@
- struct shape_mapping { const char *name; int number; };
--const int cursor_shape_to_id(const char *name);
-+int cursor_shape_to_id(const char *name);
- %%
- X_cursor,0
- arrow,1
-@@ -79,7 +79,7 @@ ur_angle,74
- watch,75
- xterm,76
- %%
--const int cursor_shape_to_id(const char *name) {
-+int cursor_shape_to_id(const char *name) {
- 	struct shape_mapping *mapping = in_word_set(name, strlen(name));
- 	return (mapping ? (mapping->number * 2) : -1);
- }
diff --git a/xcb-util-cursor.changes b/xcb-util-cursor.changes
index f74ceb9..6e6d431 100644
--- a/xcb-util-cursor.changes
+++ b/xcb-util-cursor.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Apr 25 11:40:51 UTC 2016 - sndirsch@suse.com
+
+- removed u_fix-issue-with-gcc.patch
+  * patch was only necessary with gcc in 2013, when building
+    'awesome' against the static library; we do not ship the static
+    libary (did we ever?)
+    https://lists.freedesktop.org/archives/xcb/2016-April/010737.html
+
 -------------------------------------------------------------------
 Mon Mar 30 09:32:56 UTC 2015 - sndirsch@suse.com
 
diff --git a/xcb-util-cursor.spec b/xcb-util-cursor.spec
index 79f3d17..ea43096 100644
--- a/xcb-util-cursor.spec
+++ b/xcb-util-cursor.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xcb-util-cursor
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,6 @@ Url:            http://xcb.freedesktop.org/
 #Git-Web:	http://cgit.freedesktop.org/xcb/util-cursor/
 Source:         http://xcb.freedesktop.org/dist/%name-%version.tar.bz2
 Source1:        baselibs.conf
-Patch11:        u_fix-issue-with-gcc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -80,7 +79,6 @@ in %lname.
 
 %prep
 %setup -q
-%patch11 -p1
 
 %build
 ./autogen.sh