Sat Nov 4 19:34:10 2017 UTC ()
Pullup ticket #5602 - requested by sevan
audio/grip: Linux build fix

Revisions pulled up:
- audio/grip/Makefile                                           1.5
- audio/grip/distinfo                                           1.3
- audio/grip/patches/patch-configure                            1.3

---
   Module Name:    pkgsrc
   Committed By:   triaxx
   Date:           Sun Oct 22 07:55:24 UTC 2017

   Modified Files:
           pkgsrc/audio/grip: Makefile distinfo
   Added Files:
           pkgsrc/audio/grip/patches: patch-configure

   Log Message:
   Add workaround for fixing build on Linux

   See https://github.com/westes/flex/issues/241
   The problem is fixed in master branch and the workaround could be removed
   in the next version update.


(bsiegert)
diff -r1.4 -r1.4.4.1 pkgsrc/audio/grip/Makefile
diff -r1.2 -r1.2.4.1 pkgsrc/audio/grip/distinfo
diff -r0 -r1.3.2.2 pkgsrc/audio/grip/patches/patch-configure

cvs diff -r1.4 -r1.4.4.1 pkgsrc/audio/grip/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/grip/Makefile 2017/09/19 14:34:16 1.4
+++ pkgsrc/audio/grip/Makefile 2017/11/04 19:34:09 1.4.4.1
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.4 2017/09/19 14:34:16 triaxx Exp $ 1# $NetBSD: Makefile,v 1.4.4.1 2017/11/04 19:34:09 bsiegert Exp $
2 2
3DISTNAME= grip-3.5.2 3DISTNAME= grip-3.6.1
4PKGREVISION= 1 
5CATEGORIES= audio 4CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=grip/}  5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=grip/}
7 6
8MAINTAINER= triaxx@NetBSD.org 7MAINTAINER= triaxx@NetBSD.org
9HOMEPAGE= https://sourceforge.net/projects/grip/ 8HOMEPAGE= https://sourceforge.net/projects/grip/
10COMMENT= CD-player and CD-ripper for the Gnome desktop 9COMMENT= CD-player and CD-ripper for the Gnome desktop
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13USE_TOOLS+= pkg-config 12USE_TOOLS+= pkg-config
14USE_LIBTOOL= yes 13USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17 16

cvs diff -r1.2 -r1.2.4.1 pkgsrc/audio/grip/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/grip/distinfo 2017/08/18 13:26:37 1.2
+++ pkgsrc/audio/grip/distinfo 2017/11/04 19:34:09 1.2.4.1
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.2 2017/08/18 13:26:37 triaxx Exp $ 1$NetBSD: distinfo,v 1.2.4.1 2017/11/04 19:34:09 bsiegert Exp $
2 2
3SHA1 (grip-3.5.2.tar.gz) = 6a9c20502a4c71decc454348457021844c6958de 3SHA1 (grip-3.6.1.tar.gz) = c7ad80476f35d2d966458995c34660452c24225a
4RMD160 (grip-3.5.2.tar.gz) = e95b15315f8ca1bbde0d3a66d8f30394aa04b7f3 4RMD160 (grip-3.6.1.tar.gz) = e34efd335ac5da54f3963433e9161c9855ad395c
5SHA512 (grip-3.5.2.tar.gz) = 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421 5SHA512 (grip-3.6.1.tar.gz) = ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf
6Size (grip-3.5.2.tar.gz) = 952153 bytes 6Size (grip-3.6.1.tar.gz) = 958967 bytes
 7SHA1 (patch-configure) = aefe8f4fdfaba93b95cca656d0ea6c8ec7b3348f
7SHA1 (patch-src_cdplay.c) = ae6dd708d4a5bc61ad49477e79b2005959290634 8SHA1 (patch-src_cdplay.c) = ae6dd708d4a5bc61ad49477e79b2005959290634
8SHA1 (patch-src_grip.c) = ed6ff6e70d0395af4a1ca3b06337a7fb354a0fae 9SHA1 (patch-src_grip.c) = ed6ff6e70d0395af4a1ca3b06337a7fb354a0fae

File Added: pkgsrc/audio/grip/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.3.2.2 2017/11/04 19:34:10 bsiegert Exp $

id3lib has a unused variable warning that makes build fail.

--- configure.orig	2017-10-04 13:07:02.000000000 +0000
+++ configure
@@ -3067,7 +3067,6 @@ fi
 
 
 warning_flags="$CFLAGS -Wall"
-werror_flags="$warning_flags -Werror"
 
 # Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :