[SCM] kodi-pvr-nextpvr/master: Fix enum representation of char_class_e to fix FTBFS on many architectures

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Tue Mar 8 16:22:50 UTC 2016


The following commit has been merged in the master branch:
commit e434cc9b869e21c63a83f8e37aa1bc2f4d7366c4
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Mar 8 16:03:38 2016 +0100

    Fix enum representation of char_class_e to fix FTBFS on many architectures

diff --git a/debian/patches/0003-Sync-enum-representation-of-char_class_e-in-struct-t.patch b/debian/patches/0003-Sync-enum-representation-of-char_class_e-in-struct-t.patch
new file mode 100644
index 0000000..6733420
--- /dev/null
+++ b/debian/patches/0003-Sync-enum-representation-of-char_class_e-in-struct-t.patch
@@ -0,0 +1,42 @@
+From 39fde947ed3a095103000c3736a3c84f3aa3838c Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Tue, 8 Mar 2016 16:00:22 +0100
+Subject: [PATCH] Sync enum representation of char_class_e in struct traits
+ with definition
+
+---
+ src/uri.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/uri.h b/src/uri.h
+index 2757cf0..f0aa930 100644
+--- a/src/uri.h
++++ b/src/uri.h
+@@ -21,13 +21,13 @@
+ namespace uri
+ {
+   /// Char class.
+-  enum char_class_e
++  typedef enum char_class_e: signed char
+   {
+     CINV = -2, ///< invalid
+     CEND = -1, ///< end delimitor
+     CVAL = 0,  ///< valid any position
+     CVA2 = 1,  ///< valid anywhere but 1st position
+-  };
++  } char_class_e_type;
+ 
+   /// Traits used for parsing and encoding components.
+   struct traits
+@@ -35,7 +35,7 @@ namespace uri
+     const char* begin_cstring; ///< begin cstring (or 0 if none)
+     const char begin_char;     ///< begin char (or 0 if none)
+     const char end_char;       ///< end char (or 0 if none)
+-    char char_class[256];      ///< map of char to class
++    char_class_e_type char_class[256];      ///< map of char to class
+   };
+ 
+   /**
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index da7fc4f..42572f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-src-Update-to-p8-platform.patch
 0002-cmake-Update-to-p8-platform.patch
+0003-Sync-enum-representation-of-char_class_e-in-struct-t.patch

-- 
kodi-pvr-nextpvr packaging



More information about the pkg-multimedia-commits mailing list