← Back to branch summary

~vanvugt/+junk/mediatomb

« back to all changes in this revision

Viewing changes to debian/patches/glibc-2.10_fix.patch

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-08-28 11:06:18 UTC
  • Revision ID: james.westby@ubuntu.com-20090828110618-02dt2svsn1v84g7e
Tags: 0.12.0~svn2018-4ubuntu1
https://launchpad.net/bugs/417533
* Merge from debian unstable, Ubuntu remaining changes:
  - Add OR depends on abrowser.
* Add glibc-2.10_fix.patch patch to prevent FTBFS with glibc-2.10.
* debian/config.xml.dist: Allow playing the mkv files that haven't
  "video/x-matroska" as mimetype (LP: #417533).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/glibc-2.10_fix.patch
 
1
Author: Alessio Treglia <quadrispro@ubuntu.com>
 
2
Description: Fix FTBFS with glibc 2.10.
 
3
Index: mediatomb-0.12.0~svn2018/src/tools.cc
 
4
===================================================================
 
5
--- mediatomb-0.12.0~svn2018.orig/src/tools.cc  2009-08-28 11:10:56.487660957 +0200
 
6
+++ mediatomb-0.12.0~svn2018/src/tools.cc       2009-08-28 11:11:59.543162385 +0200
 
7
@@ -303,8 +303,8 @@
 
8
     Ref<StringBuffer> buf(new StringBuffer(len / 2));
 
9
     for (int i = 0; i < len; i += 2)
 
10
     {
 
11
-        char *chi = strchr(HEX_CHARS, ptr[i]);
 
12
-        char *clo = strchr(HEX_CHARS, ptr[i + 1]);
 
13
+        const char *chi = strchr(HEX_CHARS, ptr[i]);
 
14
+        const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
 
15
         int hi, lo;
 
16
         
 
17
         if (chi)
 
18
@@ -397,7 +397,7 @@
 
19
             char clo = data[i++];
 
20
             int hi, lo;
 
21
 
 
22
-            char *pos;
 
23
+            const char *pos;
 
24
 
 
25
             pos = strchr(hex, chi);
 
26
             if (!pos)