Attachment #101548 for bug #141107

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

Lines 5-12 Link Here

(-)audacity-new/Makefile (-2 / +1 lines)
5	# $FreeBSD: ports/audio/audacity-devel/Makefile,v 1.38 2009/11/28 20:05:22 marcus Exp $	5	# $FreeBSD: ports/audio/audacity-devel/Makefile,v 1.38 2009/11/28 20:05:22 marcus Exp $
6		6
7	PORTNAME= audacity	7	PORTNAME= audacity
8	PORTVERSION= 1.3.9	8	PORTVERSION= 1.3.10
9	PORTREVISION= 2
10	CATEGORIES= audio	9	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \	10	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
12	SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}	11	SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}

Lines 1-3 Link Here

(-)audacity-new/distinfo (-3 / +3 lines)
1	MD5 (audacity-minsrc-1.3.9.tar.bz2) = 0f2bc8971c6e2c4d39457c28aea16b5c	1	MD5 (audacity-minsrc-1.3.10.tar.bz2) = ffa698188e2e8f48c499268a478c579c
2	SHA256 (audacity-minsrc-1.3.9.tar.bz2) = f47afe8dcf38165d3550160eb7e94694119f5da563674060a93c5bc66e2fa012	2	SHA256 (audacity-minsrc-1.3.10.tar.bz2) = 7df8a12064cbd85b85a38ad56942dbbf46eace7ea685ec64daca9ad064e2ba09
3	SIZE (audacity-minsrc-1.3.9.tar.bz2) = 6719955	3	SIZE (audacity-minsrc-1.3.10.tar.bz2) = 6953513




--- src/AudacityApp.cpp.orig	2009-11-27 00:27:29.000000000 +0100
+++ src/AudacityApp.cpp	2009-11-27 00:48:36.000000000 +0100
@@ -23,6 +23,15 @@ It handles initialization and terminatio
 
 #include "Audacity.h" // This should always be included first
 
+/*
+ * Get Gtk.h and Glib.h included and working around that glib got
+ * a GSocket class now 
+ */
+#include <dlfcn.h>
+#define GSocket GlibGSocket
+#include <gtk/gtk.h>
+#undef GSocket
+
 #include <wx/defs.h>
 #include <wx/app.h>
 #include <wx/docview.h>
@@ -328,8 +337,11 @@ void QuitAudacity()
 // Most of this was taken from nsNativeAppSupportUnix.cpp from Mozilla.
 ///////////////////////////////////////////////////////////////////////////////
 
+/* moved up so it doesn't undefs GSocket from wxgtk */
+/*
 #include <dlfcn.h>
 #include <gtk/gtk.h>
+*/
 
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;




bin/audacity
man/man1/audacity.1.gz
share/applications/audacity.desktop
%%DATADIR%%/audacity.xpm
%%DATADIR%%/nyquist/bug.lsp
%%DATADIR%%/nyquist/dspprims.lsp
%%DATADIR%%/nyquist/envelopes.lsp

share/locale/ga/LC_MESSAGES/audacity.mo
share/locale/gl/LC_MESSAGES/audacity.mo
share/locale/he/LC_MESSAGES/audacity.mo
share/locale/hi/LC_MESSAGES/audacity.mo
share/locale/hu/LC_MESSAGES/audacity.mo
share/locale/id/LC_MESSAGES/audacity.mo
share/locale/it/LC_MESSAGES/audacity.mo

share/locale/zh/LC_MESSAGES/audacity.mo
share/locale/zh_TW/LC_MESSAGES/audacity.mo
share/mime/packages/audacity.xml
share/pixmaps/audacity.xpm
@dirrm share/mime/packages
@dirrm share/mime
@dirrm share/locale/oc/LC_MESSAGES
@dirrm share/locale/oc
@dirrm share/locale/km/LC_MESSAGES
@dirrm share/locale/km
@dirrm share/locale/ca@valencia/LC_MESSAGES
@dirrm share/locale/ca@valencia
@dirrm %%DATADIR%%/plug-ins
@dirrm %%DATADIR%%/nyquist
@dirrm share/audacity
@dirrm share/applications

Return to bug 141107

Lines 1-30 Link Here

(-)audacity-new/files/patch-src_AudacityApp.cpp (-30 lines)
1	--- src/AudacityApp.cpp.orig 2009-11-27 00:27:29.000000000 +0100
2	+++ src/AudacityApp.cpp 2009-11-27 00:48:36.000000000 +0100
3	@@ -23,6 +23,15 @@ It handles initialization and terminatio
4
5	#include "Audacity.h" // This should always be included first
6
7	+/*
8	+ * Get Gtk.h and Glib.h included and working around that glib got
9	+ * a GSocket class now
10	+ */
11	+#include <dlfcn.h>
12	+#define GSocket GlibGSocket
13	+#include <gtk/gtk.h>
14	+#undef GSocket
15	+
16	#include <wx/defs.h>
17	#include <wx/app.h>
18	#include <wx/docview.h>
19	@@ -328,8 +337,11 @@ void QuitAudacity()
20	// Most of this was taken from nsNativeAppSupportUnix.cpp from Mozilla.
21	///////////////////////////////////////////////////////////////////////////////
22
23	+/* moved up so it doesn't undefs GSocket from wxgtk */
24	+/*
25	#include <dlfcn.h>
26	#include <gtk/gtk.h>
27	+*/
28
29	typedef struct _GnomeProgram GnomeProgram;
30	typedef struct _GnomeModuleInfo GnomeModuleInfo;

Lines 1-6 Link Here

(-)audacity-new/pkg-plist (-5 / +13 lines)
1	bin/audacity	1	bin/audacity
		2	man/man1/audacity.1.gz
2	share/applications/audacity.desktop	3	share/applications/audacity.desktop
3	%%DATADIR%%/audacity.xpm
4	%%DATADIR%%/nyquist/bug.lsp	4	%%DATADIR%%/nyquist/bug.lsp
5	%%DATADIR%%/nyquist/dspprims.lsp	5	%%DATADIR%%/nyquist/dspprims.lsp
6	%%DATADIR%%/nyquist/envelopes.lsp	6	%%DATADIR%%/nyquist/envelopes.lsp
Lines 60-65 Link Here
60	share/locale/ga/LC_MESSAGES/audacity.mo	60	share/locale/ga/LC_MESSAGES/audacity.mo
61	share/locale/gl/LC_MESSAGES/audacity.mo	61	share/locale/gl/LC_MESSAGES/audacity.mo
62	share/locale/he/LC_MESSAGES/audacity.mo	62	share/locale/he/LC_MESSAGES/audacity.mo
		63	share/locale/hi/LC_MESSAGES/audacity.mo
63	share/locale/hu/LC_MESSAGES/audacity.mo	64	share/locale/hu/LC_MESSAGES/audacity.mo
64	share/locale/id/LC_MESSAGES/audacity.mo	65	share/locale/id/LC_MESSAGES/audacity.mo
65	share/locale/it/LC_MESSAGES/audacity.mo	66	share/locale/it/LC_MESSAGES/audacity.mo
Lines 87-95 Link Here
87	share/locale/zh/LC_MESSAGES/audacity.mo	88	share/locale/zh/LC_MESSAGES/audacity.mo
88	share/locale/zh_TW/LC_MESSAGES/audacity.mo	89	share/locale/zh_TW/LC_MESSAGES/audacity.mo
89	share/mime/packages/audacity.xml	90	share/mime/packages/audacity.xml
90	@dirrmtry share/locale/km/LC_MESSAGES	91	share/pixmaps/audacity.xpm
91	@dirrmtry share/locale/km	92	@dirrm share/mime/packages
92	@dirrm share/audacity/plug-ins	93	@dirrm share/mime
93	@dirrm share/audacity/nyquist	94	@dirrm share/locale/oc/LC_MESSAGES
		95	@dirrm share/locale/oc
		96	@dirrm share/locale/km/LC_MESSAGES
		97	@dirrm share/locale/km
		98	@dirrm share/locale/ca@valencia/LC_MESSAGES
		99	@dirrm share/locale/ca@valencia
		100	@dirrm %%DATADIR%%/plug-ins
		101	@dirrm %%DATADIR%%/nyquist
94	@dirrm share/audacity	102	@dirrm share/audacity
95	@dirrm share/applications	103	@dirrm share/applications