[Lunar-commits] <moonbase> Subject: tvtime: compilation fix

[Duncan Gibson]

commit 625c7a709d75304d14af55afe986a6d609adf502
Author: Guillaume <sirocco at gmx.fr>
Date:   Mon Nov 9 21:39:06 2009 +0100

    Subject: tvtime: compilation fix
    
    One more patch is required to compile tvtime with glibc 2.10+
    
    I get the patch from this location
    http://sourceforge.net/tracker/?func=detail&aid=2808113&group_id=64301&atid=506987
    
    As I don't know how to make a direct link to sf.net for the patch url
    maybe you could do as you have already done for previous patch : put
    tvtime-1.0.2-locale_t.patch in lunar patch folder
    
    Guillaume
---
 video/tvtime/BUILD                       |    1 +
 video/tvtime/DETAILS                     |    5 ++++-
 video/tvtime/tvtime-1.0.2-locale_t.patch |   23 +++++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/video/tvtime/BUILD b/video/tvtime/BUILD
index 3845cc1..cbe13e1 100644
--- a/video/tvtime/BUILD
+++ b/video/tvtime/BUILD
@@ -5,6 +5,7 @@ patch_it $SOURCE2 1 &&
 patch_it $SOURCE3 1 &&
 patch_it $SOURCE4 1 &&
 patch_it $SOURCE5 1 &&
+patch_it $SOURCE6 1 &&
 default_build
 
 ) > $C_FIFO 2>&1
diff --git a/video/tvtime/DETAILS b/video/tvtime/DETAILS
index 227229a..deb957e 100644
--- a/video/tvtime/DETAILS
+++ b/video/tvtime/DETAILS
@@ -5,19 +5,22 @@
          SOURCE3=$MODULE-$VERSION-xinerama.patch
          SOURCE4=$MODULE-pic.patch
          SOURCE5=$MODULE-$VERSION-gcc41.patch
+         SOURCE6=$MODULE-$VERSION-locale_t.patch
       SOURCE_URL=$SFORGE_URL/$MODULE/
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
      SOURCE4_URL=$PATCH_URL
      SOURCE5_URL=$PATCH_URL
+     SOURCE6_URL=$PATCH_URL
       SOURCE_VFY=sha1:ea609876084b2d627a84a1f77bf81cc2175ee58e
      SOURCE2_VFY=sha1:ca287bed793e153027f071f9153cd9a06c9a7dc6
      SOURCE3_VFY=sha1:39c51a9f264111b6ca400778113d008231613551
      SOURCE4_VFY=sha1:3d90369da57861933b7cb99597d85de60416a358
      SOURCE5_VFY=sha1:79d97ba94d2832584f55ccfc7b2e1edf609151eb
+     SOURCE6_VFY=sha1:7d1f6f0d2ea23f0a4f4d40d8b06e79ec5c167091
         WEB_SITE=http://tvtime.sourceforge.net
          ENTERED=20040414
-         UPDATED=20071031
+         UPDATED=20090926
            SHORT="A high quality TV viewing app for X"
 
 cat << EOF
diff --git a/video/tvtime/tvtime-1.0.2-locale_t.patch b/video/tvtime/tvtime-1.0.2-locale_t.patch
new file mode 100644
index 0000000..163ee62
--- /dev/null
+++ b/video/tvtime/tvtime-1.0.2-locale_t.patch
@@ -0,0 +1,23 @@
+--- tvtime-1.0.2/src/xmltv.c.orig	2009-06-18 02:28:04.000000000 +0100
++++ tvtime-1.0.2/src/xmltv.c	2009-06-18 02:28:12.000000000 +0100
+@@ -118,9 +118,9 @@
+ typedef struct {
+     const char *code;
+     const char *name;
+-} locale_t;
++} tv_locale_t;
+ 
+-static locale_t locale_table[] = {
++static tv_locale_t locale_table[] = {
+     {"AA", "Afar"},           {"AB", "Abkhazian"},      {"AF", "Afrikaans"},
+     {"AM", "Amharic"},        {"AR", "Arabic"},         {"AS", "Assamese"},
+     {"AY", "Aymara"},         {"AZ", "Azerbaijani"},    {"BA", "Bashkir"},
+@@ -168,7 +168,7 @@
+     {"XH", "Xhosa"},          {"YO", "Yoruba"},         {"ZH", "Chinese"},
+     {"ZU", "Zulu"} };
+ 
+-const int num_locales = sizeof( locale_table ) / sizeof( locale_t );
++const int num_locales = sizeof( locale_table ) / sizeof( tv_locale_t );
+ 
+ /**
+  * Timezone parsing code based loosely on the algorithm in