Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Aug 2013 13:11:14 +0200 (CEST)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/181211: [patch] audio/easytag: Fix build with latest clang in base
Message-ID:  <3cC0xZ5KKtz2hS@micro.madpilot.net>
Resent-Message-ID: <201308101120.r7ABK067075387@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         181211
>Category:       ports
>Synopsis:       [patch] audio/easytag: Fix build with latest clang in base
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 10 11:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD micro.madpilot.net 9.1-STABLE FreeBSD 9.1-STABLE #21 r252026: Thu Jun 20 16:27:06 CEST 2013 root@micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64

>Description:

Easytag fails to build on recent current with clang:

http://beefy1.isc.freebsd.org/bulk/head-default/2013-08-07_18h21m15s/logs/easytag-2.1.8_1.log

Attached patch makes it compile. Disabling the check for format
strings in that source file should be safe here, since all format
strings coming into the wrapper function Log_Print() are generated
oor hardcoded in the other sourcefiles anyway.

While here I also added options support, update LIB_DEPENDS to the
new format and converted to USES=gmake.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
--- Makefile	(revision 324471)
+++ Makefile	(working copy)
@@ -10,18 +10,17 @@
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	GTK2 Tag editor for MP3 and OGG files
 
-LIB_DEPENDS=	id3:${PORTSDIR}/audio/id3lib \
-		id3tag:${PORTSDIR}/audio/libid3tag \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		FLAC:${PORTSDIR}/audio/flac \
-		mp4v2:${PORTSDIR}/multimedia/mp4v2
+LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libFLAC.so:${PORTSDIR}/audio/flac \
+		libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
 
 MAN1=		easytag.1
 CONFLICTS=	easytag-devel-[0-9]*
 
 USE_XZ=		yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake
 USE_GNOME=	gnomehack gnomeprefix gtk20 desktopfileutils
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
@@ -28,7 +27,11 @@
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GTK
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_WAVPACK)
+OPTIONS_DEFINE=	WAVPACK
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MWAVPACK}
 LIB_DEPENDS+=		wavpack:${PORTSDIR}/audio/wavpack
 CONFIGURE_ARGS+=	--enable-wavpack
 .else
Index: files/patch-src-log.c
===================================================================
--- files/patch-src-log.c	(revision 0)
+++ files/patch-src-log.c	(working copy)
@@ -0,0 +1,14 @@
+--- src/log.c.orig	2013-02-05 23:42:37.000000000 +0100
++++ src/log.c	2013-08-07 10:52:19.934047139 +0200
+@@ -39,6 +39,11 @@
+ #include "win32/win32dep.h"
+ #endif /* G_OS_WIN32 */
+ 
++/* Disable -Wformat-nonliteral warning for this source file, since
++** all calls have safe format strings coming. */
++#ifdef __clang__
++#pragma clang diagnostic ignored "-Wformat-nonliteral"
++#endif
+ 
+ /****************
+  * Declarations *

Property changes on: files/patch-src-log.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3cC0xZ5KKtz2hS>