[Pkg-sdl-commits] [libsdl1.2] 01/02: Remove patch check_SDL_NOKBD_environment_variable.diff

[Manuel A. Fernandez Montecelo]

This is an automated email from the git hooks/post-receive script.

mafm pushed a commit to branch master
in repository libsdl1.2.

commit 76cf18037da679cdb45a60e1d071d35849426f96
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Oct 20 01:19:11 2013 +0100

    Remove patch check_SDL_NOKBD_environment_variable.diff
---
 debian/changelog                                   |    8 +++
 .../check_SDL_NOKBD_environment_variable.diff      |   68 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2de056..1d7e003 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libsdl1.2 (1.2.15-8) UNRELEASED; urgency=low
+
+  * Remove permanently patch check_SDL_NOKBD_environment_variable.diff, it
+    was rejected explicitly by upstream and could not be applied cleanly,
+    was already disabled fore more than a year
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Sun, 20 Oct 2013 01:16:39 +0100
+
 libsdl1.2 (1.2.15-7) unstable; urgency=low
 
   * Drop the udeb package as it doesn't have any reverse dependencies anymore.
diff --git a/debian/patches/check_SDL_NOKBD_environment_variable.diff b/debian/patches/check_SDL_NOKBD_environment_variable.diff
deleted file mode 100644
index 6ad2e37..0000000
--- a/debian/patches/check_SDL_NOKBD_environment_variable.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: disable keyboard and mouse in fbcon
- Introduced in 1.2.13-5 (Thu, 01 Oct 2009 16:45:49 -0400).
- .
- Upstream will not include it:
-   Sam Lantinga 2012-01-22 10:50:19 PST
- .
-   I'm going to pass on this patch, but feel free to continue including it with
-   Debian.
-Author: Bernhard Kauer <kauer at os.inf.tu-dresden.de>
-Last-Update: 2012-01-22
-Bug-Debian: http://bugs.debian.org/438915
-Forwarded: http://bugzilla.libsdl.org/show_bug.cgi?id=1391
-
-Index: SDL-1.2.14/src/video/fbcon/SDL_fbvideo.c
-===================================================================
---- SDL-1.2.14.orig/src/video/fbcon/SDL_fbvideo.c	2009-10-12 19:07:15.000000000 -0400
-+++ SDL-1.2.14/src/video/fbcon/SDL_fbvideo.c	2009-11-28 09:20:05.000000000 -0500
-@@ -792,14 +792,19 @@
- 		} 
- 	}
- 
--	/* Enable mouse and keyboard support */
--	if ( FB_OpenKeyboard(this) < 0 ) {
--		FB_VideoQuit(this);
--		return(-1);
--	}
-+	if (!SDL_getenv("SDL_NOKBD"))
-+	  {
-+	    fprintf(stderr, "init kbd.\n");
-+	    /* Enable mouse and keyboard support */
-+	    if ( FB_OpenKeyboard(this) < 0 ) {
-+	      FB_VideoQuit(this);
-+	      return(-1);
-+	    }
-+	  }
- 	if ( FB_OpenMouse(this) < 0 ) {
- 		const char *sdl_nomouse;
- 
-+		fprintf(stderr, "init mouse failed.\n");
- 		sdl_nomouse = SDL_getenv("SDL_NOMOUSE");
- 		if ( ! sdl_nomouse ) {
- 			SDL_SetError("Unable to open mouse");
-@@ -1009,7 +1014,6 @@
- 
- 	/* Set the terminal into graphics mode */
- 	if ( FB_EnterGraphicsMode(this) < 0 ) {
--		return(NULL);
- 	}
- 
- 	/* Restore the original palette */
-@@ -1910,7 +1914,7 @@
- 
- 	if ( this->screen ) {
- 		/* Clear screen and tell SDL not to free the pixels */
--		if ( this->screen->pixels && FB_InGraphicsMode(this) ) {
-+	  if ( this->screen->pixels && (FB_InGraphicsMode(this) || SDL_getenv("SDL_NOKBD")) ) {
- #if defined(__powerpc__) || defined(__ia64__)	/* SIGBUS when using SDL_memset() ?? */
- 			Uint8 *rowp = (Uint8 *)this->screen->pixels;
- 			int left = this->screen->pitch*this->screen->h;
-@@ -1959,7 +1963,7 @@
- 		}
- 
- 		/* Restore the original video mode and palette */
--		if ( FB_InGraphicsMode(this) ) {
-+		if ( FB_InGraphicsMode(this) || SDL_getenv("SDL_NOKBD") ) {
- 			FB_RestorePalette(this);
- 			ioctl(console_fd, FBIOPUT_VSCREENINFO, &saved_vinfo);
- 		}
diff --git a/debian/patches/series b/debian/patches/series
index 749aced..91bc117 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 x11_keytounicode.diff
 dont_propagate_lpthread.diff
-#check_SDL_NOKBD_environment_variable.diff
 fix_build_joystick_freebsd.diff
 fix_window_resizing.diff
 fix_joystick_misc_axes.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl1.2.git