From: Graydon, Tracy <tracy.graydon@intel.com>
Date: Fri, 19 Jul 2013 01:13:11 +0000 (-0700)
Subject: Apply the patch to the local tizen branch. Has upstream branch
X-Git-Tag: submit/tizen/20130719.011323^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b9ab2205080a90aeb558d05f9a3d8c019e2deb7;p=platform%2Fupstream%2FSDL.git

Apply the patch to the local tizen branch. Has upstream branch
---

diff --git a/packaging/SDL-1.2.13-x11-keytounicode.patch b/packaging/SDL-1.2.13-x11-keytounicode.patch
deleted file mode 100644
index b96df60..0000000
--- a/packaging/SDL-1.2.13-x11-keytounicode.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/video/x11/SDL_x11events.c
-+++ src/video/x11/SDL_x11events.c
-@@ -1223,8 +1223,11 @@
-  * sequences (dead accents, compose key sequences) will not work since the
-  * state has been irrevocably lost.
-  */
-+extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod);
-+
- Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
- {
-+	static int warning = 1;
- 	struct SDL_VideoDevice *this = current_video;
- 	char keybuf[32];
- 	int i;
-@@ -1232,6 +1235,12 @@
- 	XKeyEvent xkey;
- 	Uint16 unicode;
- 
-+	if ( warning ) {
-+		warning = 0;
-+		fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n");
-+		fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n");
-+	}
-+
- 	if ( !this || !SDL_Display ) {
- 		return 0;
- 	}
diff --git a/packaging/SDL.spec b/packaging/SDL.spec
index 8314b68..272dd17 100644
--- a/packaging/SDL.spec
+++ b/packaging/SDL.spec
@@ -9,8 +9,6 @@ Url:            http://www.libsdl.org/
 Group:          System/Libraries
 Source:         http://www.libsdl.org/release/SDL-%{version}.tar.gz
 Source2:        baselibs.conf
-# PATCH-FIX-OPENSUSE SDL-1.2.13-x11-keytounicode.patch
-Patch0:         SDL-1.2.13-x11-keytounicode.patch
 BuildRequires:  autoconf
 BuildRequires:  gcc-c++
 BuildRequires:  libpulse-devel
@@ -59,7 +57,6 @@ library.
 
 %prep
 %setup -q
-%patch0
 
 # remove the file to provide sufficient evidence that we are
 # not using this file during the build [bnc#508111]
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index 559a001..607cc07 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -1246,8 +1246,11 @@ static void get_modifier_masks(Display *display)
  * sequences (dead accents, compose key sequences) will not work since the
  * state has been irrevocably lost.
  */
+extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod);
+
 Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
 {
+	static int warning = 1;
 	struct SDL_VideoDevice *this = current_video;
 	char keybuf[32];
 	int i;
@@ -1255,6 +1258,12 @@ Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
 	XKeyEvent xkey;
 	Uint16 unicode;
 
+	if ( warning ) {
+		warning = 0;
+		fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n");
+		fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n");
+	}
+
 	if ( !this || !SDL_Display ) {
 		return 0;
 	}