[mupen64plus] 119/262: Fix FTBFS using g++-4.4 and glibc 2.10 due to missing const keywords

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit eed80c38a23d865708afc95602eece14c4030001
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Sep 7 13:15:43 2009 +0200

    Fix FTBFS using g++-4.4 and glibc 2.10 due to missing const keywords
---
 debian/changelog                        |  2 ++
 debian/patches/120-ftbfs-glibc210.patch | 45 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 48 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f24b6db..2102416 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mupen64plus (1.5+dfsg1-4) UNRELEASED; urgency=low
   * debian/patches;
     - Update 119-debian-archs.patch, Correct detection of armel cpu endianness
       (Closes: #545463)
+    - Add 120-ftbfs-glibc210, Fix FTBFS using g++-4.4 and glibc 2.10 due to
+      missing const keywords (Closes: #545462)
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 07 Sep 2009 11:44:11 +0200
 
diff --git a/debian/patches/120-ftbfs-glibc210.patch b/debian/patches/120-ftbfs-glibc210.patch
new file mode 100644
index 0000000..389275c
--- /dev/null
+++ b/debian/patches/120-ftbfs-glibc210.patch
@@ -0,0 +1,45 @@
+From c58fdbeeb23185c58471ed9578671cc404f62857 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven.eckelmann at gmx.de>
+Date: Mon, 7 Sep 2009 12:33:16 +0200
+Subject: [PATCH] Fix FTBFS using g++-4.4 and libc 2.10 due to missing const keywords
+
+G++ 4.4 checks correctly if a pointer is converted from const to
+non-const without an explicit cast. As glibc 2.10 provides a more
+strict declaration of strstr and mupen64plus doesn't use const in
+that places, it will fail hard.
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ glide64/Combine.cpp |    2 +-
+ glide64/Main.cpp    |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glide64/Combine.cpp b/glide64/Combine.cpp
+index 7033f60..a7cbba6 100644
+--- a/glide64/Combine.cpp
++++ b/glide64/Combine.cpp
+@@ -11873,7 +11873,7 @@ void InitCombine ()
+   LOG ("InitCombine() ");
+   memset(&cmb, 0, sizeof(cmb));
+   const char *extensions = grGetString (GR_EXTENSION);
+-  if (char * extstr = strstr(extensions, "COMBINE")) {
++  if (const char * extstr = strstr(extensions, "COMBINE")) {
+     if (!strncmp(extstr, "COMBINE", 7)) {
+       LOG ("extensions ");
+       cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt");
+diff --git a/glide64/Main.cpp b/glide64/Main.cpp
+index eb96438..d013f1d 100644
+--- a/glide64/Main.cpp
++++ b/glide64/Main.cpp
+@@ -784,7 +784,7 @@ BOOL InitGfx (BOOL evoodoo_using_window)
+   printf("bebefore2\n");
+   if (settings.fb_hires)
+   {
+-    if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) 
++    if (const char * extstr = strstr(extensions, "TEXTUREBUFFER"))
+     {
+       if (!strncmp(extstr, "TEXTUREBUFFER", 13)) 
+       {
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 0b8d650..630daa2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@
 117-ftbfs-kfreebsd.patch
 118-ftbfs-debugger.patch
 119-debian-archs.patch
+120-ftbfs-glibc210.patch

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