summaryrefslogtreecommitdiff
path: root/textproc/subtitleripper
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2010-01-09 12:25:20 +0000
committerobache <obache@pkgsrc.org>2010-01-09 12:25:20 +0000
commitec6fb4f82adf1ba0cec338acf0a8b617ec818340 (patch)
tree05afe2cc7c3c1669fdf2fb05a53c45ccdc0b5bfc /textproc/subtitleripper
parentd7014cf45738c0f635bde990514b9fc696154308 (diff)
downloadpkgsrc-ec6fb4f82adf1ba0cec338acf0a8b617ec818340.tar.gz
Add patch-ac to avoid conflict with getline(3) defined in IEEE Std 1003.1-2008.
PR#42595.
Diffstat (limited to 'textproc/subtitleripper')
-rw-r--r--textproc/subtitleripper/distinfo3
-rw-r--r--textproc/subtitleripper/patches/patch-ac30
2 files changed, 32 insertions, 1 deletions
diff --git a/textproc/subtitleripper/distinfo b/textproc/subtitleripper/distinfo
index 48bca742c76..1e51b7a9617 100644
--- a/textproc/subtitleripper/distinfo
+++ b/textproc/subtitleripper/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/09/06 09:19:02 wiz Exp $
+$NetBSD: distinfo,v 1.6 2010/01/09 12:25:20 obache Exp $
SHA1 (subtitleripper-0.3-4.tgz) = d93ff3578dd5f722c8f4ef16bc0903eec5781a0d
RMD160 (subtitleripper-0.3-4.tgz) = 141355960773ab2dfe3782522858273d197cf797
Size (subtitleripper-0.3-4.tgz) = 47299 bytes
SHA1 (patch-aa) = f99aad2fd864aeb3d051510e63b4bd96c580a4d3
SHA1 (patch-ab) = 22335a412899b7cdb552185ff051c7d2f2e1ba59
+SHA1 (patch-ac) = 98edef3e84b287ad64fb9054630b0b2aecf2953a
diff --git a/textproc/subtitleripper/patches/patch-ac b/textproc/subtitleripper/patches/patch-ac
new file mode 100644
index 00000000000..0c71b20a664
--- /dev/null
+++ b/textproc/subtitleripper/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2010/01/09 12:25:20 obache Exp $
+
+Add patch-ac to avoid conflict with getline(3) defined in IEEE Std 1003.1-2008.
+
+--- vobsub.c.orig 2003-12-08 09:28:02.000000000 +0000
++++ vobsub.c
+@@ -51,12 +51,12 @@ extern int vobsub_id;
+ extern int verbose;
+
+ #ifdef HAVE_GETLINE
+-extern ssize_t getline(char **, size_t *, FILE *);
++extern ssize_t get_line(char **, size_t *, FILE *);
+ #else
+ /* FIXME This should go into a general purpose library or even a
+ separate file. */
+ static ssize_t
+-getline (char **lineptr, size_t *n, FILE *stream)
++get_line (char **lineptr, size_t *n, FILE *stream)
+ {
+ size_t res = 0;
+ int c;
+@@ -753,7 +753,7 @@ vobsub_parse_one_line(vobsub_t *vob, FIL
+ do {
+ size_t line_reserve = 0;
+ char *line = NULL;
+- line_size = getline(&line, &line_reserve, fd);
++ line_size = get_line(&line, &line_reserve, fd);
+ if (line_size < 0) {
+ if (line)
+ free(line);