kid3: update to 3.5.1

* Release 3.5.1

* Improved:
  + Compatibility of imported and exported CSV files with cells
    containing new line characters.
  + Do not show unknown frames for ID3v2.3 TDAT, TIME, TYER, TRDA
    frames.
  + Enable high-DPI scaling for Qt >= 5.6.
  + Change AppStream directory from appdata to metainfo.

* Fixed:
  + Crash with DSF files having sample rates other than 2822400 or
    5644800.

* Release 3.5.0

* New:
  + Tags which violate the ID3v2 standard are marked.
  + Filter for marked files.
  + Configurable keyboard shortcuts for user actions.
  + Set and get frame fields from scripts and CLI.
  + Select a subset of frames for copy, paste, remove from scripts
    and CLI.
  + Set and get multiple frames of the same kind from scripts and CLI.
  + Support field names in export and filter expressions.
  + Support xid and ownr atoms in M4A files.
  + Danish translation.

* Improved:
  + Better performance when files are added to selection.
  + The script actions in the file list context menu only operate on
    selected files.
  + Only jump to tagged files with previous/next in GUI.
  + Show passed/total after "filtered" in title bar.
  + kid3-cli can run from a console without GUI/X11.

* Fixed:
  + Adding and deleting tag 3 frames from CLI.
  + Deletion of multiple METADATA_BLOCK_PICTURE picture frames.
  + Wrong depth 32 instead of 24 stored in METADATA_BLOCK_PICTURE.
  + Use Ogg/Vorbis Comment field name setting also for Opus files.

* Release 3.4.5

* New:
  + Settings to include and exclude folders in the file list.

* Improved:
  + Use HTTPS for imports where possible.
  + Much faster expanding of the file list by avoiding GUI
    updates during the operation.
  + Faster filtering by avoiding GUI updates during the
    operation.
  + Reduced memory usage when filtering.
  + Updated Czech and Dutch translations.

* Fixed:
  + Import from MusicBrainz.
  + Rate limit for import from Discogs.
  + Do not display multiple frames of same type as different.
  + Application not responsive when using a new filter after
    filtering a huge number of files.
  + Application not responsive when loading the tags after
    selecting a lot of files, is now abortable.
  + Terminate kid3-cli if EOF is received.

* Release 3.4.4

* New:
  + If the first command line argument is "--portable", the
    configuration is stored in a file kid3.ini in the program folder.
  + Image data can be copied to clipboard.
  + MPRIS2 D-Bus interface for the audio player.

* Improved:
  + "Import CSV" can import to different files if no matching
    file paths found.

* Fixed:
  + Importing of durations from text formats (file/clipboard).
  + Building with Chromaprint 1.4.

7 files changed, 37 insertions, 127 deletions

diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index e556138c48c..8ee4f2ea954 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.83 2017/11/30 16:45:14 adam Exp $
+# $NetBSD: Makefile,v 1.84 2018/01/21 04:10:44 markd Exp $
 
-DISTNAME=	kid3-3.4.3
-PKGREVISION=	11
+DISTNAME=	kid3-3.5.1
 CATEGORIES=	kde audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kid3/}
 
@@ -25,6 +24,8 @@ CMAKE_ARGS+=		-DWITH_MANDIR:STRING=${PKGMANDIR}
 # -DCMAKE_SKIP_RPATH:BOOL=TRUE, so re-add it manually
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/kid3
 
+BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+
 SUBST_CLASSES+=		apple
 SUBST_MESSAGE.apple=	Avoiding Mac OS X application bundles
 SUBST_STAGE.apple=	pre-configure
diff --git a/audio/kid3/PLIST b/audio/kid3/PLIST
index c18e0fb909c..e69de29bb2d 100644
--- a/audio/kid3/PLIST
+++ b/audio/kid3/PLIST
@@ -1,62 +0,0 @@
-@comment $NetBSD: PLIST,v 1.10 2017/01/01 14:01:49 wiz Exp $
-bin/kid3-cli
-bin/kid3-qt
-lib/kid3/libkid3-core.so
-lib/kid3/libkid3-core.so.${PKGVERSION}
-lib/kid3/libkid3-gui.so
-lib/kid3/libkid3-gui.so.${PKGVERSION}
-lib/kid3/plugins/imports/Kid3/Kid3Script.qml
-lib/kid3/plugins/imports/Kid3/libkid3qml.so
-lib/kid3/plugins/imports/Kid3/qmldir
-lib/kid3/plugins/libacoustidimport.so
-lib/kid3/plugins/libamazonimport.so
-lib/kid3/plugins/libdiscogsimport.so
-lib/kid3/plugins/libfreedbimport.so
-lib/kid3/plugins/libid3libmetadata.so
-lib/kid3/plugins/libmusicbrainzimport.so
-lib/kid3/plugins/liboggflacmetadata.so
-lib/kid3/plugins/libqmlcommand.so
-lib/kid3/plugins/libtaglibmetadata.so
-man/de/man1/kid3-cli.1
-man/de/man1/kid3-qt.1
-man/de/man1/kid3.1
-man/man1/kid3-cli.1
-man/man1/kid3-qt.1
-man/man1/kid3.1
-share/appdata/kid3-qt.appdata.xml
-share/applications/kid3-qt.desktop
-share/doc/kid3-qt/kid3_de.html
-share/doc/kid3-qt/kid3_en.html
-share/icons/hicolor/128x128/apps/kid3-qt.png
-share/icons/hicolor/16x16/apps/kid3-qt.png
-share/icons/hicolor/32x32/apps/kid3-qt.png
-share/icons/hicolor/48x48/apps/kid3-qt.png
-share/icons/hicolor/64x64/apps/kid3-qt.png
-share/icons/hicolor/scalable/apps/kid3-qt.svg
-share/kid3/qml/script/EmbedAlbumArt.qml
-share/kid3/qml/script/EmbedLyrics.qml
-share/kid3/qml/script/ExportCsv.qml
-share/kid3/qml/script/ExportHtmlPlayer.qml
-share/kid3/qml/script/ExtractAlbumArt.qml
-share/kid3/qml/script/ImportCsv.qml
-share/kid3/qml/script/QmlConsole.qml
-share/kid3/qml/script/ReplayGain2SoundCheck.qml
-share/kid3/qml/script/ResizeAlbumArt.qml
-share/kid3/qml/script/ShowTextEncodingV1.qml
-share/kid3/translations/kid3_cs.qm
-share/kid3/translations/kid3_de.qm
-share/kid3/translations/kid3_es.qm
-share/kid3/translations/kid3_et.qm
-share/kid3/translations/kid3_fi.qm
-share/kid3/translations/kid3_fr.qm
-share/kid3/translations/kid3_it.qm
-share/kid3/translations/kid3_nl.qm
-share/kid3/translations/kid3_pl.qm
-share/kid3/translations/kid3_ru.qm
-share/kid3/translations/kid3_sr.qm
-share/kid3/translations/kid3_sr@ijekavian.qm
-share/kid3/translations/kid3_sr@ijekavianlatin.qm
-share/kid3/translations/kid3_sr@latin.qm
-share/kid3/translations/kid3_tr.qm
-share/kid3/translations/kid3_zh_CN.qm
-share/kid3/translations/kid3_zh_TW.qm
diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo
index 74ad6f14e8c..47e51c52fa6 100644
--- a/audio/kid3/distinfo
+++ b/audio/kid3/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.13 2017/01/01 14:01:49 wiz Exp $
+$NetBSD: distinfo,v 1.14 2018/01/21 04:10:44 markd Exp $
 
-SHA1 (kid3-3.4.3.tar.gz) = 29436bfe5ce6d080d962766392171f1f8e6035c5
-RMD160 (kid3-3.4.3.tar.gz) = 6a2706cc9d970e29ec804b25f70a4394f2a1922c
-SHA512 (kid3-3.4.3.tar.gz) = 4df64bd23cca7ca58d62f046c885df859c7e27fbfb6da5121df78d5123314d45ae59619cfb4bf629143414f103a240c89a5d557614b2899a6cf373fb0755acbe
-Size (kid3-3.4.3.tar.gz) = 1360042 bytes
-SHA1 (patch-CMakeLists.txt) = a52261fd6c043969afcf7dbc2e71a52c0dc33716
-SHA1 (patch-src_plugins_acoustidimport_fingerprintcalculator.cpp) = 8ef550096f4a89c6074b94bb467832dfb2f1c98f
-SHA1 (patch-src_plugins_acoustidimport_fingerprintcalculator.h) = 9b9815db812d38eac65cc6c153c58ca86acd8dec
+SHA1 (kid3-3.5.1.tar.gz) = efaf95e5b057bc8d3414321bf643fe24a98111a2
+RMD160 (kid3-3.5.1.tar.gz) = 14f203dcc105766bb94fe6318a5346089ecb0888
+SHA512 (kid3-3.5.1.tar.gz) = 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58
+Size (kid3-3.5.1.tar.gz) = 1414829 bytes
+SHA1 (patch-CMakeLists.txt) = f3057fe24031a73d28c0031a7d1f0241b05d94f6
diff --git a/audio/kid3/hacks.mk b/audio/kid3/hacks.mk
new file mode 100644
index 00000000000..f6ad7d8a4f3
--- /dev/null
+++ b/audio/kid3/hacks.mk
@@ -0,0 +1,7 @@
+# $NetBSD: hacks.mk,v 1.1 2018/01/21 04:10:44 markd Exp $
+
+# linking -lQt5Widgets on NetBSD with gcc produces
+# ld: BFD (NetBSD Binutils nb1) 2.27 assertion fail
+# /usr/src/external/gpl3/binutils/lib/libbfd/../../dist/bfd/elflink.c:2694
+# unless -lexecinfo preceeds -lQt5Widgets
+BUILDLINK_TRANSFORM.NetBSD+=l:Qt5Widgets:execinfo:Qt5Widgets
diff --git a/audio/kid3/patches/patch-CMakeLists.txt b/audio/kid3/patches/patch-CMakeLists.txt
index 88bd93e8282..cbf4d4ac025 100644
--- a/audio/kid3/patches/patch-CMakeLists.txt
+++ b/audio/kid3/patches/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2017/01/01 14:01:49 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2018/01/21 04:10:44 markd Exp $
 
 On Darwin, avoid app bundle creation.
 
---- CMakeLists.txt.orig	2016-10-26 18:44:43.000000000 +0000
+--- CMakeLists.txt.orig	2017-10-30 17:12:24.000000000 +0000
 +++ CMakeLists.txt
 @@ -58,16 +58,16 @@ else (ANDROID)
    set(WITH_CHROMAPRINT ON CACHE BOOL "build with Chromaprint")
@@ -25,7 +25,7 @@ On Darwin, avoid app bundle creation.
    set(WITH_READLINE OFF CACHE BOOL "build with readline")
  else (WIN32)
 @@ -123,7 +123,7 @@ set(CPACK_PACKAGE_VERSION ${KID3_VERSION
- set(RELEASE_YEAR 2016)
+ set(RELEASE_YEAR 2017)
  
  # Platform specific default installation paths
 -if (APPLE)
@@ -36,7 +36,7 @@ On Darwin, avoid app bundle creation.
 @@ -149,7 +149,7 @@ elseif (ANDROID)
    set(WITH_PLUGINSDIR_DEFAULT ".")
    set(QT_ANDROID_APP_VERSION ${KID3_VERSION})
-   set(QT_ANDROID_APP_VERSION_CODE 6)
+   set(QT_ANDROID_APP_VERSION_CODE 10)
 -else (APPLE)
 +else (ELPPA)
    set(WITH_DATAROOTDIR_DEFAULT "share")
@@ -91,7 +91,19 @@ On Darwin, avoid app bundle creation.
      get_target_property(QT_LUPDATE_EXECUTABLE Qt5::lupdate LOCATION)
      get_target_property(QT_PLUGINS_DIR Qt5::QJpegPlugin LOCATION)
      if (QT_PLUGINS_DIR)
-@@ -493,7 +493,7 @@ if (MSVC)
+@@ -399,9 +399,9 @@ endif (NOT DOCBOOK_XSL_DIR)
+ set(BASIC_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ 
+ 
+-if (APPLE)
++if (ELPPA)
+   set(BASIC_LIBRARIES ${BASIC_LIBRARIES} "-framework CoreServices")
+-endif (APPLE)
++endif (ELPPA)
+ 
+ if (WIN32)
+   link_directories($ENV{LIB})
+@@ -497,7 +497,7 @@ if (MSVC)
    # Treat wchar_t as built-in type, else QString::fromWCharArray is unresolved
    add_definitions("/Zc:wchar_t-")
  endif (MSVC)
@@ -100,7 +112,7 @@ On Darwin, avoid app bundle creation.
    exec_program(sw_vers ARGS -productVersion OUTPUT_VARIABLE _osxVersion)
    if (_osxVersion VERSION_LESS "10.10")
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.5")
-@@ -503,7 +503,7 @@ if (APPLE)
+@@ -507,7 +507,7 @@ if (APPLE)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 -stdlib=libc++")
      set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -stdlib=libc++")
    endif (_osxVersion VERSION_LESS "10.10")
@@ -109,7 +121,7 @@ On Darwin, avoid app bundle creation.
  add_definitions(${QT_DEFINITIONS} -DHAVE_CONFIG_H=1 -DQT_NO_EXCEPTIONS -DQT_NO_STL)
  include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDES} ${PHONON_INCLUDE_DIR})
  
-@@ -515,11 +515,11 @@ if (NOT WIN32)
+@@ -519,11 +519,11 @@ if (NOT WIN32)
    endif (_HAVE_GCC_VISIBILITY)
  endif (NOT WIN32)
  
@@ -124,7 +136,7 @@ On Darwin, avoid app bundle creation.
  
  if (BUILD_KDE_APP)
    if (NOT HAVE_QT5)
-@@ -541,18 +541,18 @@ endif (ANDROID)
+@@ -545,18 +545,18 @@ endif (ANDROID)
  
  
  # To create a package, run cpack
diff --git a/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.cpp b/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.cpp
deleted file mode 100644
index 00e043bd08f..00000000000
--- a/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_plugins_acoustidimport_fingerprintcalculator.cpp,v 1.1 2016/12/19 09:20:10 wiz Exp $
-
-Fix build with chromaprint-1.4.x.
-
---- src/plugins/acoustidimport/fingerprintcalculator.cpp.orig	2015-09-30 06:40:08.000000000 +0000
-+++ src/plugins/acoustidimport/fingerprintcalculator.cpp
-@@ -26,7 +26,6 @@
- 
- #define __STDC_CONSTANT_MACROS
- #include "fingerprintcalculator.h"
--#include <chromaprint.h>
- #include "config.h"
- #include "abstractfingerprintdecoder.h"
- 
-@@ -94,7 +93,7 @@ void FingerprintCalculator::startChromap
-  */
- void FingerprintCalculator::feedChromaprint(QByteArray data)
- {
--  if (!::chromaprint_feed(m_chromaprintCtx, data.data(), data.size() / 2)) {
-+  if (!::chromaprint_feed(m_chromaprintCtx, (int16_t*)data.data(), data.size() / 2)) {
-     m_decoder->stop();
-     emit finished(QString(), 0, FingerprintCalculationFailed);
-   }
diff --git a/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.h b/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.h
deleted file mode 100644
index 8cd0f3ebde5..00000000000
--- a/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_plugins_acoustidimport_fingerprintcalculator.h,v 1.1 2016/12/19 09:20:10 wiz Exp $
-
-Fix build with chromaprint-1.4.x.
-
---- src/plugins/acoustidimport/fingerprintcalculator.h.orig	2015-09-30 06:40:08.000000000 +0000
-+++ src/plugins/acoustidimport/fingerprintcalculator.h
-@@ -29,6 +29,7 @@
- 
- #include <QObject>
- #include <QString>
-+#include <chromaprint.h>
- 
- class AbstractFingerprintDecoder;
- 
-@@ -110,7 +111,7 @@ private slots:
-   void finishChromaprint(int duration);
- 
- private:
--  void** m_chromaprintCtx;
-+  ChromaprintContext* m_chromaprintCtx;
-   AbstractFingerprintDecoder* m_decoder;
- };
-