[ri-li] 03/05: Drop no-sdl-timers-for-makedat.patch again.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository ri-li.

commit ea2e43f1c84c5bcc88b10321a083f9bd4e51e2e2
Author: Markus Koschany <apo at debian.org>
Date:   Mon Feb 20 01:02:03 2017 +0100

    Drop no-sdl-timers-for-makedat.patch again.
    
    Apparently it is not sufficient to resolve the build failures.
---
 debian/patches/no-sdl-timers-for-makedat.patch | 28 --------------------------
 debian/patches/series                          |  1 -
 2 files changed, 29 deletions(-)

diff --git a/debian/patches/no-sdl-timers-for-makedat.patch b/debian/patches/no-sdl-timers-for-makedat.patch
deleted file mode 100644
index 3386a99..0000000
--- a/debian/patches/no-sdl-timers-for-makedat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Steve Cotton <steve at octalot.co.uk>
-Date: Sun, 19 Feb 2017 17:37:41 +0100
-Subject: Don't init SDL timers when running MakeDat
-
-MakeDat doesn't use timers (there are no calls to SDL_AddTimer), and the
-binaries generated and moved to the data directory are identical.
-
-When it initialised timers and was run with xvfb-run on a single-cpu buildd,
-SDL failed to initialise.
-
-Bug-Debian: https://bugs.debian.org/848063
----
- data-src/main.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data-src/main.cc b/data-src/main.cc
-index 0a04628..05f7ab0 100644
---- a/data-src/main.cc
-+++ b/data-src/main.cc
-@@ -193,7 +193,7 @@ int main(int narg,char *argv[])
-   unsigned char Buf[2];
-   
-   // Initilise SDL
--  if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
-+  if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
-     cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<endl;
-     exit(-1);
-   }
diff --git a/debian/patches/series b/debian/patches/series
index 14a10e9..ca64563 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-gcc4.3-ftbfs.patch
 fix-compiler-warnings.patch
-no-sdl-timers-for-makedat.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ri-li.git