Attachment #110019 for bug #151114

View | Details | Raw Unified | Return to bug 151114
Collapse All | Expand All

Lines 6-13 Link Here

(-)Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= libmp3splt	8	PORTNAME= libmp3splt
9	PORTVERSION= 0.5.9	9	PORTVERSION= 0.6
10	PORTREVISION= 2
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= SF/mp3splt/${PORTNAME}/${PORTVERSION}	11	MASTER_SITES= SF/mp3splt/${PORTNAME}/${PORTVERSION}
13		12

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (libmp3splt-0.5.9.tar.gz) = 2a29c8a8965d45ae89582a3f112f48e3	1	MD5 (libmp3splt-0.6.tar.gz) = 92e2e51857588a1d5f967ffd9bf90c28
2	SHA256 (libmp3splt-0.5.9.tar.gz) = ea25c307ff5ceab720eb1ce03d14f7ade43dda6f0f1f08dfcbba5a05e25a248a	2	SHA256 (libmp3splt-0.6.tar.gz) = 2c23ba80b1334f30484f2e031224997f2b031193904ad49ddfdbe15203bba9f9
3	SIZE (libmp3splt-0.5.9.tar.gz) = 506810	3	SIZE (libmp3splt-0.6.tar.gz) = 502239




--- include/libmp3splt/splt.h.orig	2010-04-22 12:28:38.000000000 +0400
+++ include/libmp3splt/splt.h	2010-04-22 12:31:02.000000000 +0400
@@ -52,7 +52,9 @@
 #endif
 
 #include <limits.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <locale.h>
 
 #if !HAVE_FSEEKO
@@ -60,7 +62,11 @@
 #define ftello ftell
 #endif
 
+#ifdef ENABLE_NLS
 #define _(STR) dgettext(MP3SPLT_LIB_GETTEXT_DOMAIN, STR)
+#else
+#define _(STR) STR
+#endif
 
 /**********************************/
 /* splt normal or syncerror split */
--- src/mp3splt.c.orig	2010-04-22 12:48:29.000000000 +0400
+++ src/mp3splt.c	2010-04-22 12:49:02.000000000 +0400
@@ -58,11 +58,13 @@ splt_state *mp3splt_new_state(int *error
   }
   else
   {
+#ifdef ENABLE_NLS
 #ifndef __WIN32__
     bindtextdomain(MP3SPLT_LIB_GETTEXT_DOMAIN, LOCALEDIR);
 #endif
 
     bind_textdomain_codeset(MP3SPLT_LIB_GETTEXT_DOMAIN, "UTF-8");
+#endif
 
     state = splt_t_new_state(state, err);
   }

Added Link Here

(-)files/patch-src-oformat_parser.c (+11 lines)
1	--- src/oformat_parser.c.orig 2010-09-07 05:12:05.000000000 +0800
2	+++ src/oformat_parser.c 2010-09-29 16:12:11.000000000 +0800
3	@@ -760,7 +760,7 @@
4	if (total_time > 0)
5	{
6	long minutes = total_time / 100 / 60;
7	- int i = (int) (log10l((long double) minutes));
8	+ int i = (int) (log10(minutes));
9	char number_of_digits = (char) (i + '1');
10	if (number_of_digits == '1')
11	{

Return to bug 151114

Removed Link Here

(-)files/patch-disable-nls (-40 lines)
1	--- include/libmp3splt/splt.h.orig 2010-04-22 12:28:38.000000000 +0400
2	+++ include/libmp3splt/splt.h 2010-04-22 12:31:02.000000000 +0400
3	@@ -52,7 +52,9 @@
4	#endif
5
6	#include <limits.h>
7	+#ifdef ENABLE_NLS
8	#include <libintl.h>
9	+#endif
10	#include <locale.h>
11
12	#if !HAVE_FSEEKO
13	@@ -60,7 +62,11 @@
14	#define ftello ftell
15	#endif
16
17	+#ifdef ENABLE_NLS
18	#define _(STR) dgettext(MP3SPLT_LIB_GETTEXT_DOMAIN, STR)
19	+#else
20	+#define _(STR) STR
21	+#endif
22
23	/**********************************/
24	/* splt normal or syncerror split */
25	--- src/mp3splt.c.orig 2010-04-22 12:48:29.000000000 +0400
26	+++ src/mp3splt.c 2010-04-22 12:49:02.000000000 +0400
27	@@ -58,11 +58,13 @@ splt_state mp3splt_new_state(int error
28	}
29	else
30	{
31	+#ifdef ENABLE_NLS
32	#ifndef __WIN32__
33	bindtextdomain(MP3SPLT_LIB_GETTEXT_DOMAIN, LOCALEDIR);
34	#endif
35
36	bind_textdomain_codeset(MP3SPLT_LIB_GETTEXT_DOMAIN, "UTF-8");
37	+#endif
38
39	state = splt_t_new_state(state, err);
40	}