summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2013-05-11 21:38:22 +0000
committerjoerg <joerg@pkgsrc.org>2013-05-11 21:38:22 +0000
commit71773d19029a338530a2bd9e40ea2ae715ab2137 (patch)
tree091020c8b2e44185a7b07dc691ce5522a91d5bef /multimedia
parenta1ec7cf8dd5c79163fe229837c501a380c049991 (diff)
downloadpkgsrc-71773d19029a338530a2bd9e40ea2ae715ab2137.tar.gz
Rename "locale_t" to not conflict with locale.h.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/tvtime/distinfo3
-rw-r--r--multimedia/tvtime/patches/patch-src_xmltv.c25
2 files changed, 27 insertions, 1 deletions
diff --git a/multimedia/tvtime/distinfo b/multimedia/tvtime/distinfo
index 17515477536..595122404de 100644
--- a/multimedia/tvtime/distinfo
+++ b/multimedia/tvtime/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/01/26 23:13:47 wiz Exp $
+$NetBSD: distinfo,v 1.6 2013/05/11 21:38:22 joerg Exp $
SHA1 (tvtime-1.0.2.tar.gz) = ea609876084b2d627a84a1f77bf81cc2175ee58e
RMD160 (tvtime-1.0.2.tar.gz) = e7d9621054edba5833f4ea002be8979983fbf3dc
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = 4a97047148528d37245899cc396cbf0b7926350a
SHA1 (patch-aj) = 4200e919df91d2a29e577459a9056203b2074254
SHA1 (patch-ak) = 1b0bc021387b6ab31ff32b173b6897364dc7fa4c
SHA1 (patch-al) = b183822cff1f5b022e0509b33299f7b99ab57442
+SHA1 (patch-src_xmltv.c) = ba107c28eacb6967918cb074a23354eb6c2d2ea6
diff --git a/multimedia/tvtime/patches/patch-src_xmltv.c b/multimedia/tvtime/patches/patch-src_xmltv.c
new file mode 100644
index 00000000000..b0e2e7409ea
--- /dev/null
+++ b/multimedia/tvtime/patches/patch-src_xmltv.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_xmltv.c,v 1.1 2013/05/11 21:38:22 joerg Exp $
+
+--- src/xmltv.c.orig 2013-05-10 14:43:03.000000000 +0000
++++ src/xmltv.c
+@@ -118,9 +118,9 @@ const int num_timezones = sizeof( date_m
+ typedef struct {
+ const char *code;
+ const char *name;
+-} locale_t;
++} my_locale_t;
+
+-static locale_t locale_table[] = {
++static my_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 @@ static locale_t locale_table[] = {
+ {"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( *locale_table );
+
+ /**
+ * Timezone parsing code based loosely on the algorithm in