[Pkg-ocaml-maint-commits] r4887 - in /trunk/packages/liquidsoap/trunk/debian/patches: fix_camomile_file_leak.patch series

[toots at users.alioth.debian.org]

Author: toots
Date: Tue Dec 11 13:29:43 2007
New Revision: 4887

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4887
Log:
Add fix_camomile_file_leak.patch

Added:
    trunk/packages/liquidsoap/trunk/debian/patches/fix_camomile_file_leak.patch
Modified:
    trunk/packages/liquidsoap/trunk/debian/patches/series

Added: trunk/packages/liquidsoap/trunk/debian/patches/fix_camomile_file_leak.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_camomile_file_leak.patch?rev=4887&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_camomile_file_leak.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_camomile_file_leak.patch Tue Dec 11 13:29:43 2007
@@ -1,0 +1,44 @@
+Index: liquidsoap-0.3.5/configure.ac
+===================================================================
+--- liquidsoap-0.3.5.orig/configure.ac	2007-12-11 14:26:33.000000000 +0100
++++ liquidsoap-0.3.5/configure.ac	2007-12-11 14:27:02.000000000 +0100
+@@ -796,12 +796,16 @@
+   Dtools.Conf.list ~p:(conf_tag#plug "encodings") ~d:["UTF-8";"ISO-8859-1"]
+     "List of encodings to try for automatic encoding detection"
+ 
++let custom_encoding =
++  let encs = conf_encoding#get in
++    C.automatic "LIQ-TAGS" (List.map enc_of_name encs) C.utf8
++
+ let recode_tag ?encoding s =
+   let encs = conf_encoding#get in
+   let in_enc =
+     match encoding with
+       | Some e -> enc_of_name e
+-      | None -> C.automatic "LIQ-TAGS" (List.map enc_of_name encs) C.utf8
++      | None -> custom_encoding
+   in
+     C.recode_string ~in_enc ~out_enc:C.utf8 s
+ 
+Index: liquidsoap-0.3.5/configure
+===================================================================
+--- liquidsoap-0.3.5.orig/configure	2007-12-11 14:27:04.000000000 +0100
++++ liquidsoap-0.3.5/configure	2007-12-11 14:27:32.000000000 +0100
+@@ -4987,12 +4987,16 @@
+   Dtools.Conf.list ~p:(conf_tag#plug "encodings") ~d:["UTF-8";"ISO-8859-1"]
+     "List of encodings to try for automatic encoding detection"
+ 
++let custom_encoding =
++  let encs = conf_encoding#get in
++    C.automatic "LIQ-TAGS" (List.map enc_of_name encs) C.utf8
++
+ let recode_tag ?encoding s =
+   let encs = conf_encoding#get in
+   let in_enc =
+     match encoding with
+       | Some e -> enc_of_name e
+-      | None -> C.automatic "LIQ-TAGS" (List.map enc_of_name encs) C.utf8
++      | None -> custom_encoding
+   in
+     C.recode_string ~in_enc ~out_enc:C.utf8 s
+ 

Modified: trunk/packages/liquidsoap/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/series?rev=4887&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/series (original)
+++ trunk/packages/liquidsoap/trunk/debian/patches/series Tue Dec 11 13:29:43 2007
@@ -1,1 +1,2 @@
+fix_camomile_file_leak.patch
 add_http_timeout.patch