Attachment #70281 for bug #102580

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

Lines 7-13 Link Here

(-)audio/mhwaveedit/Makefile (-1 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= mhwaveedit	9	PORTNAME= mhwaveedit
10	PORTVERSION= 1.4.8	10	PORTVERSION= 1.4.9
11	CATEGORIES= audio	11	CATEGORIES= audio
12	MASTER_SITES= http://download.gna.org/mhwaveedit/	12	MASTER_SITES= http://download.gna.org/mhwaveedit/
13		13
Lines 24-29 Link Here
24	CONFIGURE_ARGS= --disable-optimization --without-alsalib	24	CONFIGURE_ARGS= --disable-optimization --without-alsalib
25		25
26	PLIST_FILES= bin/mhwaveedit \	26	PLIST_FILES= bin/mhwaveedit \
		27	share/locale/de/LC_MESSAGES/mhwaveedit.mo \
27	share/locale/es/LC_MESSAGES/mhwaveedit.mo \	28	share/locale/es/LC_MESSAGES/mhwaveedit.mo \
28	share/locale/fr/LC_MESSAGES/mhwaveedit.mo \	29	share/locale/fr/LC_MESSAGES/mhwaveedit.mo \
29	share/locale/ru/LC_MESSAGES/mhwaveedit.mo \	30	share/locale/ru/LC_MESSAGES/mhwaveedit.mo \

Lines 1-3 Link Here

(-)audio/mhwaveedit/distinfo (-3 / +3 lines)
1	MD5 (mhwaveedit-1.4.8.tar.bz2) = 447bb2421bf7c09c0960134bab910cf7	1	MD5 (mhwaveedit-1.4.9.tar.bz2) = c581c53f35f658d03134146c87cd87de
2	SHA256 (mhwaveedit-1.4.8.tar.bz2) = 183ec49b48164047eab1e3f3d5c171b68b33340fff8439883fcb3da80bc4dc5d	2	SHA256 (mhwaveedit-1.4.9.tar.bz2) = 1236b5bea0145e353a3851cfd12e93b47e1ba7329b733680ec69230afb211118
3	SIZE (mhwaveedit-1.4.8.tar.bz2) = 437386	3	SIZE (mhwaveedit-1.4.9.tar.bz2) = 465036




--- src/filetypes.c.orig	Tue Jul 25 05:06:59 2006
+++ src/filetypes.c	Tue Aug 22 15:52:56 2006
@@ -1258,7 +1258,11 @@
      return FALSE;
 }
 
-static gboolean xunsetenv(char *varname)
-{
-     if (unsetenv(varname) != 0) {
-	  console_message(_("unsetenv failed!"));
-	  return TRUE;
-     }
-     return FALSE;
-}
-
 static struct file_type *register_file_type
 (gchar *name, gchar *ext, gboolean lossy,
  gboolean (*typecheck)(gchar *filename), 
@@ -971,7 +962,7 @@
      b = pipe_dialog_send_chunk(y,c,FALSE,dither_mode,bar);
      g_free(c);     
      if (x != NULL) gtk_object_sink(GTK_OBJECT(x));
-     if (!xunsetenv("OUTFILE")) g_free(d);
+     if (!xputenv("OUTFILE")) g_free(d);
      if (b || !file_exists(filename)) {
 	  *fatal = TRUE;
 	  return TRUE;
@@ -1240,7 +1231,7 @@
 	       gtk_object_sink(GTK_OBJECT(x));
 	  }
      }
-     if (!xunsetenv("OUTFILE")) g_free(c);
+     if (!xputenv("OUTFILE")) g_free(c);
      if (b || !file_exists(filename)) {
 	  *fatal = TRUE;
 	  return TRUE;
@@ -1254,7 +1245,11 @@
 static Chunk *try_mplayer(gchar *filename, int dither_mode, StatusBar *bar)
 {
      gchar *c,*d;

      Chunk *x;
      if (!program_exists("mplayer")) return NULL;
      tempname = get_temp_filename(0);
@@ -1272,10 +1276,6 @@
      if (xputenv(c)) { g_free(d); g_free(c); g_free(tempname); return NULL; }
      if (xputenv(d)) { 
 	  g_free(d); 
-	  if (!xunsetenv("OUTFILE"))
+	  if (!xputenv("OUTFILE"))
 	       g_free(c);
 	  g_free(tempname);
 	  return NULL; 
      }

 
      x = run_decoder(filename,tempname,"sh",argv,dither_mode,bar);
 
-     if (!xunsetenv("OUTFILE")) g_free(c);
-     if (!xunsetenv("INFILE")) g_free(d);
+     if (!xputenv("OUTFILE")) g_free(c);
+     if (!xputenv("INFILE")) g_free(d);
      g_free(tempname);
      
      return x;

Return to bug 102580

Lines 1-40 Link Here

(-)audio/mhwaveedit/files/patch-src-filetypes.c (-51 / +4 lines)
1	--- src/filetypes.c.orig Sat Jan 14 22:39:51 2006	1	--- src/filetypes.c.orig Tue Jul 25 05:06:59 2006
2	+++ src/filetypes.c Sun Jan 29 12:48:53 2006	2	+++ src/filetypes.c Tue Aug 22 15:52:56 2006
3	@@ -104,15 +104,6 @@	3	@@ -1258,7 +1258,11 @@
4	return FALSE;
5	}
6
7	-static gboolean xunsetenv(char *varname)
8	-{
9	- if (unsetenv(varname) != 0) {
10	- console_message(_("unsetenv failed!"));
11	- return TRUE;
12	- }
13	- return FALSE;
14	-}
15	-
16	static struct file_type *register_file_type
17	(gchar name, gchar ext, gboolean lossy,
18	gboolean (typecheck)(gchar filename),
19	@@ -971,7 +962,7 @@
20	b = pipe_dialog_send_chunk(y,c,FALSE,dither_mode,bar);
21	g_free(c);
22	if (x != NULL) gtk_object_sink(GTK_OBJECT(x));
23	- if (!xunsetenv("OUTFILE")) g_free(d);
24	+ if (!xputenv("OUTFILE")) g_free(d);
25	if (b \|\| !file_exists(filename)) {
26	*fatal = TRUE;
27	return TRUE;
28	@@ -1240,7 +1231,7 @@
29	gtk_object_sink(GTK_OBJECT(x));
30	}
31	}
32	- if (!xunsetenv("OUTFILE")) g_free(c);
33	+ if (!xputenv("OUTFILE")) g_free(c);
34	if (b \|\| !file_exists(filename)) {
35	*fatal = TRUE;
36	return TRUE;
37	@@ -1254,7 +1245,11 @@
38	static Chunk try_mplayer(gchar filename, int dither_mode, StatusBar *bar)	4	static Chunk try_mplayer(gchar filename, int dither_mode, StatusBar *bar)
39	{	5	{
40	gchar c,d;	6	gchar c,d;
Lines 47-59 Link Here
47	Chunk *x;	13	Chunk *x;
48	if (!program_exists("mplayer")) return NULL;	14	if (!program_exists("mplayer")) return NULL;
49	tempname = get_temp_filename(0);	15	tempname = get_temp_filename(0);
50	@@ -1263,20 +1258,16 @@	16	@@ -1272,10 +1276,6 @@
51	if (xputenv(c)) { g_free(d); g_free(c); g_free(tempname); return NULL; }
52	if (xputenv(d)) {
53	g_free(d);
54	- if (!xunsetenv("OUTFILE"))
55	+ if (!xputenv("OUTFILE"))
56	g_free(c);
57	g_free(tempname);	17	g_free(tempname);
58	return NULL;	18	return NULL;
59	}	19	}
Lines 64-73 Link Here
64		24
65	x = run_decoder(filename,tempname,"sh",argv,dither_mode,bar);	25	x = run_decoder(filename,tempname,"sh",argv,dither_mode,bar);
66		26
67	- if (!xunsetenv("OUTFILE")) g_free(c);
68	- if (!xunsetenv("INFILE")) g_free(d);
69	+ if (!xputenv("OUTFILE")) g_free(c);
70	+ if (!xputenv("INFILE")) g_free(d);
71	g_free(tempname);
72
73	return x;