summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bonetti <sid77@slackware.it>2010-04-08 23:36:43 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-15 10:27:13 +0200
commit70a1aa314f051713510504432ae2f9ecff5ecdfa (patch)
treea423af3b7c51609c2e8fb25b961d8345cdd5c81d
parentb1eacc4adc19f34f866042fdecc2fe190127dc67 (diff)
downloadslackbuilds-70a1aa314f051713510504432ae2f9ecff5ecdfa.tar.gz
multimedia/tvtime: Updated build with glibc patch.
-rw-r--r--multimedia/tvtime/patches/glibc-2.10.patch24
-rw-r--r--multimedia/tvtime/tvtime.SlackBuild5
-rw-r--r--multimedia/tvtime/tvtime.info2
3 files changed, 28 insertions, 3 deletions
diff --git a/multimedia/tvtime/patches/glibc-2.10.patch b/multimedia/tvtime/patches/glibc-2.10.patch
new file mode 100644
index 0000000000..c3d8ad87d7
--- /dev/null
+++ b/multimedia/tvtime/patches/glibc-2.10.patch
@@ -0,0 +1,24 @@
+diff -Naur tvtime-1.0.2.org/src/xmltv.c tvtime-1.0.2/src/xmltv.c
+--- tvtime-1.0.2.org/src/xmltv.c 2009-07-02 21:48:49.426191088 +0200
++++ tvtime-1.0.2/src/xmltv.c 2009-07-02 21:50:20.842066085 +0200
+@@ -118,9 +118,9 @@
+ typedef struct {
+ const char *code;
+ const char *name;
+-} locale_t;
++} tvtime_locale_t;
+
+-static locale_t locale_table[] = {
++static tvtime_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( tvtime_locale_t );
+
+ /**
+ * Timezone parsing code based loosely on the algorithm in
diff --git a/multimedia/tvtime/tvtime.SlackBuild b/multimedia/tvtime/tvtime.SlackBuild
index 7d71cdd65d..88a9db5cae 100644
--- a/multimedia/tvtime/tvtime.SlackBuild
+++ b/multimedia/tvtime/tvtime.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=tvtime
VERSION=1.0.2
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -57,8 +57,9 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# Apply some bugfix patches from Pardus
+# Apply some bugfix patches from Pardus and Gentoo
# http://paketler.pardus.org.tr/2007/source/tvtime.html
+# http://bugs.gentoo.org/attachment.cgi?id=196423
for foo in $CWD/patches/* ; do
patch -p1 < $foo ;
done
diff --git a/multimedia/tvtime/tvtime.info b/multimedia/tvtime/tvtime.info
index 8edb503fd2..db0ba944ad 100644
--- a/multimedia/tvtime/tvtime.info
+++ b/multimedia/tvtime/tvtime.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Marco Bonetti"
EMAIL="sid77@slackware.it"
-APPROVED="rworkman"
+APPROVED="dsomero"