CVS commit: pkgsrc/audio/audacity

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Sat Feb  6 23:21:14 UTC 2021

Modified Files:
        pkgsrc/audio/audacity: Makefile distinfo
Added Files:
        pkgsrc/audio/audacity/patches: patch-include_audacity_Types.h

Log Message:
audio/audacity: include Audacity.h in audacity/Types.h to get HAVE_VISIBILITY definition


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 pkgsrc/audio/audacity/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/audio/audacity/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/audacity/patches/patch-include_audacity_Types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/audacity/Makefile
diff -u pkgsrc/audio/audacity/Makefile:1.138 pkgsrc/audio/audacity/Makefile:1.139
--- pkgsrc/audio/audacity/Makefile:1.138        Thu Dec 31 20:04:11 2020
+++ pkgsrc/audio/audacity/Makefile      Sat Feb  6 23:21:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2020/12/31 20:04:11 nia Exp $
+# $NetBSD: Makefile,v 1.139 2021/02/06 23:21:13 dbj Exp $
 
 DISTNAME=      audacity-2.4.1
 PKGREVISION=   2
@@ -26,8 +26,6 @@ USE_LANGUAGES=        c c++
 # configure: error: Audacity requires at least GCC 4.9
 GCC_REQD+=     4.9
 
-CFLAGS+=       -DHAVE_VISIBILITY=1 # ???
-
 WRAPPER_SHELL= ${BASH}
 CONFIG_SHELL=  ${BASH}
 

Index: pkgsrc/audio/audacity/distinfo
diff -u pkgsrc/audio/audacity/distinfo:1.43 pkgsrc/audio/audacity/distinfo:1.44
--- pkgsrc/audio/audacity/distinfo:1.43 Sat May 23 15:51:28 2020
+++ pkgsrc/audio/audacity/distinfo      Sat Feb  6 23:21:13 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2020/05/23 15:51:28 nia Exp $
+$NetBSD: distinfo,v 1.44 2021/02/06 23:21:13 dbj Exp $
 
 SHA1 (audacity-2.4.1.tar.gz) = f164b6a2e02947809cee2e313cb61279a60d4829
 RMD160 (audacity-2.4.1.tar.gz) = 8c0b5643d015c7dd5bbe1b47eae0025201eb51b2
@@ -8,6 +8,7 @@ SHA1 (patch-Makefile.in) = 2aca8c2ae0af7
 SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
 SHA1 (patch-configure) = 2cf208a6104c73c761156e2373d21af64606c31e
 SHA1 (patch-configure.ac) = b34f733208080d57b30877d762e61a3d3fdec888
+SHA1 (patch-include_audacity_Types.h) = 369ce152d4ecc8fd67fcb45fe4adf3260119571b
 SHA1 (patch-lib-src_FileDialog_Makefile.am) = efa6ca612f3984a4cf8150e3c624e347d144af87
 SHA1 (patch-lib-src_FileDialog_Makefile.in) = 44ca2539d68ab3951ae44377ed56f574785c1b08
 SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e

Added files:

Index: pkgsrc/audio/audacity/patches/patch-include_audacity_Types.h
diff -u /dev/null pkgsrc/audio/audacity/patches/patch-include_audacity_Types.h:1.1
--- /dev/null   Sat Feb  6 23:21:14 2021
+++ pkgsrc/audio/audacity/patches/patch-include_audacity_Types.h        Sat Feb  6 23:21:13 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_audacity_Types.h,v 1.1 2021/02/06 23:21:13 dbj Exp $
+
+this include file references HAVE_VISIBILITY when it might not be defined
+pull in Audacity.h which includes the appropriate config*.h file that sets it
+
+--- include/audacity/Types.h.orig      2020-05-19 09:43:53.000000000 +0000
++++ include/audacity/Types.h
+@@ -42,6 +42,7 @@
+ #ifndef __AUDACITY_TYPES_H__
+ #define __AUDACITY_TYPES_H__
+ 
++#include "Audacity.h" // for HAVE_VISIBILITY
+ #include <algorithm>
+ #include <functional>
+ #include <type_traits>