Attachment 183543 Details for Bug 218104 – Test patch to drop gcc requirement

[patch] Test patch to drop gcc requirement

audacity.patch (text/plain), 2.47 KB, created by Dmitry Marakasov on 2017-06-16 18:51:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2017-06-16 18:51:58 UTC

Size: 2.47 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 442255)
>+++ Makefile	(working copy)
>@@ -24,12 +24,11 @@
> WRKSRC=		${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}
> 
> GNU_CONFIGURE=	yes
>-USES=		autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
>+USES=		autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
> NLS_USES=	gettext-runtime
> NLS_CONFIGURE_ENABLE=	nls
> NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
> OPTIONS_SUB=	yes
>-USE_GCC=	4.9+
> USE_WX=		3.0+
> WX_COMPS=	wx
> INSTALLS_ICONS=	yes
>@@ -36,6 +35,7 @@
> PORTDOCS=	README.txt
> DOS2UNIX_GLOB=	Makefile.* *.c* *.h
> SHEBANG_FILES=	lib-src/lv2/build
>+CONFIGURE_ENV=	ax_cv_gcc_4_9_0=yes
> 
> OPTIONS_DEFINE=	NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
> 		MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
>Index: files/patch-include_audacity_Types.h
>===================================================================
>--- files/patch-include_audacity_Types.h	(nonexistent)
>+++ files/patch-include_audacity_Types.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- include/audacity/Types.h.orig	2017-03-13 21:02:21 UTC
>++++ include/audacity/Types.h
>+@@ -70,7 +70,7 @@ public:
>+    sampleCount ( int v ) : value { v } {}
>+    sampleCount ( unsigned v ) : value { v } {}
>+    sampleCount ( long v ) : value { v } {}
>+-   sampleCount ( unsigned long v ) : value { v } {}
>++   sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}
>+ 
>+    // Beware implicit conversions from floating point values!
>+    // Otherwise the meaning of binary operators with sampleCount change
>Index: files/patch-src_Audacity.h
>===================================================================
>--- files/patch-src_Audacity.h	(nonexistent)
>+++ files/patch-src_Audacity.h	(working copy)
>@@ -0,0 +1,16 @@
>+--- src/Audacity.h.orig	2017-06-16 13:26:40 UTC
>++++ src/Audacity.h
>+@@ -24,13 +24,6 @@
>+ #ifndef __AUDACITY_H__
>+ #define __AUDACITY_H__
>+ 
>+-// If building with GNU compiler, then must be 4.9 or later.
>+-// TODO: This would be much nicer as a standalone test in configure.ac
>+-#if !defined(__APPLE__) && defined __GNUC__ && ( __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
>+-#error insufficient compiler
>+-#endif
>+-
>+-
>+ // We only do alpha builds and release versions.
>+ // Most of the time we're in development, so IS_ALPHA should be defined
>+ // to 1.

Flags:

amdmi3: maintainer-approval?

Actions: View | Diff

Attachments on bug 218104: 181176 | 181177 | 183543 | 183551 | 183636 | 183697 | 183724