kid3: update to 3.9.3.

Switch to Qt6 by default, leave Qt5 as an option.

Thu Jan 12 12:15:43 CET 2023  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.9.3

	* New:
	  + User action script to fix ID3v2 standard violations.

	* Improved:
	  + Accept letters in track numbers when setting tags from filename.
	  + Embed lyrics: Use letras.com instead of lyrics.wikia.com.

	* Fixed:
	  + Crash upon termination when qml and qmlview actions have been used.
	  + Abort when invalid keys are used for FLAC Vorbis comments.
	  + Use of non-BMP Unicode characters with TagLib.
	  + Error description when saving files fails.
	  + Discogs import.
	  + Building with Musl libc.
	  + Windows: Handling of common path in multiple command line arguments.

Sat Aug  6 07:14:23 CEST 2022  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.9.2

	* New:
	  + Support DSDIFF (DFF) files.
	  + MP4: Support for audio book chapters, only with Mp4v2Metadata plugin.
	  + Norwegian Nynorsk translation.

	* Improved:
	  + Allow playlist file name formats to be edited.
	  + URLs with search results from web browser can be entered in the import
	    dialogs (Amazon, Discogs, gnudb.org, MusicBrainz).
	  + New style for macOS icon.
	  + kid3-cli: Encoding detection for text file import and export.
	  + kid3-cli: Set rating as star count with 'set ratingstars'.
	  + Build with latest mp4v2 library.

	* Fixed:
	  + Wrong frames are changed if track number is changed when importing.
	  + MP4: Editing of free form atoms with four letter names.
	  + Amazon import.

Sat Jan 15 09:01:43 CET 2022  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.9.1

	* New:
	  + Slovenian translation.

	* Fixed:
	  + Crash when tags are displayed in the file list, a tag is removed
	    and then saved or when the tag is reverted.
	  + With "Filename Format/Use for playlist and folder names" it is not
	    possible to rename a folder to multiple path components when a
	    string replacement for "/" is configured.
	  + With "Filename Format/Use for playlist and folder names", when path
	    components in folders or playlists contain a ".", the part after
	    the dot is not formatted.
	  + Discogs import.
	  + MP4: "No Tag" is not displayed in file list for files without
	    metadata.
	  + MP4: Metadata is not stripped from files when tag is removed
	    (requires new TagLib).
	  + Android: Import with HTTPS (Discogs, MusicBrainz) fails with
	    "Error: TLS initialization failed".

Sat Dec 18 09:22:30 CET 2021  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.9.0

	* New:
	  + Support for custom quick access frames.
	  + Support standard tags as columns in the file list.
	  + Option to use file format for playlist and folder names.
	  + Basque and Icelandic translations.
	  + kid3-cli: Command 'execute' to run QML scripts.
	  + QML: Scripts to export and import in JSON format.

	* Improved:
	  + KDE: Separate state config from settings config.
	  + kid3-cli: Allow setting frame values from a file and storing to a file.

	* Fixed:
	  + Discogs import.
	  + Get tags from file names with spaces before the extension.
	  + QML: Added support for Tag 3 where it was missing.
	  + Android: Quick access frames configuration.

Sun Jun 20 11:18:51 CEST 2021  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.8.7

	* New:
	  + Russian handbook.

	* Fixed:
	  + ID3v2: Wrong numeric strings for genres Fast Fusion, Folk, Folk Rock,
	    Folklore, Funk, Fusion.
	  + ID3v1: Genres Avant-Garde, Beat Music, Bebop, Britpop, Dancehall,
	    Dark Wave, Euro House, Eurotechno, Fast Fusion, Folk Rock, Hip Hop,
	    Jazz-Funk, Pop-Funk, Synth-Pop, Worldbeat cannot be set with TagLib
	    version < 1.12.
	  + Memory leak in the rare case where the file type is detected not by
	    the extension but by the contents.
	  + kid3-cli: Fields (sub-elements of a frame) with a non-string value
	    cannot be set with id3lib.

Thu Mar 18 08:21:47 CET 2021  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.8.6

	* Improved:
	  + Support Qt 6.
	  + Windows: Provide nicer default style.

	* Fixed:
	  + Windows 64-bit binary: Crash when using id3lib.
	  + Discogs import.
	  + Amazon import.
	  + Removed TrackType.org import.

Sun Jan 31 08:55:52 CET 2021  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.8.5

	* New:
	  + Language can be configured in "Appearance" tab of settings.
	  + New action "Edit/Invert Selection".
	  + kid3-cli: Command "config" to query and set configuration options.
	  + Script to rewrite all tags of the selected files.

	* Improved:
	  + Import multiple genres from Discogs and MusicBrainz.
	  + Support import from Discogs JSON API when token is provided.
	  + Snapshot builds can download the current translations.
	  + Mac: Allow code signing.

	* Fixed:
	  + Crash when adding Chapter frame.
	  + Support ID3v2 Podcast Category (TCAT) and Podcast Keywords (TKWD).
	  + Support for multiple genres with ID3v2.3.0.
	  + Support MP4 values with multiple strings with TagLib.

Sat Sep 26 16:36:24 CEST 2020  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.8.4

	* New:
	  + Section and file list shortcuts can be customized.
	  + Activate parent/current folder with Ctrl-Up/Down (Command-Up/Down).
	  + Go to parent item in file list when left arrow key is pressed.
	  + Header context menu options for custom or automatic column widths.
	  + Add flatpak support.
	  + Brazilian Portuguese translation.

	* Improved:
	  + Support detection of tagged file types from contents when matching by
	    extension does not succeed.
	  + Show more details (type, bits, bitrate) for M4A, FLAC, AIFF, WAV.
	  + Discogs import: Show year and format in album list.
	  + Dialogs: Store window position and size in settings.
	  + Mac: Enter key can activate entries in directory list.
	  + Android: Only navigate between tagged files with [<], [>] buttons.

	* Fixed:
	  + Do not duplicate pictures when pasting tags.
	  + Discogs import: Get year when language is not English.
	  + Keyboard shortcuts settings: Display correctly depending on language
	    and operating system.
	  + Android: Accept genre changes when focus lost and Enter not pressed.
	  + Android: Fix translation.
	  + Mac: Unlock files when changing permissions.
	  + Flatpak: Move to trash works in KDE version.

Sun May 10 08:47:03 CEST 2020  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.8.3

	* New:
	  + Keyboard shortcuts to navigate between the file and tag sections.
	  + Script to apply English title capitalization to tags.
	  + Script to transliterate ID3v1 tags to ASCII.
	  + Korean and Swedish translations.
	  + Catalan, Dutch, Italian, Swedish and Ukrainian handbooks.

	* Improved:
	  + Better compatibility with dark mode and custom themes.
	  + Support dragging multiple header rows in import table.
	  + User interface strings follow KDE HIG vocabulary.
	  + Support renaming read-only files.

	* Fixed:
	  + File filter reset when file is opened.
	  + Crash when dragging row in import table.
	  + Blocking when jumping to vanished previous or next file.
	  + Support languages with code or modifier.
	  + Hide text fragments visible in header of frame table columns.
	  + English plural forms.
	  + Add missing license files.
	  + Support large files on Windows (64-bit).

Thu Jan 23 12:18:05 CET 2020  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.8.2

	* New:
	  + Catalan, Portuguese and Ukrainian translations.

	* Fixed:
	  + Crash when removing M4A atoms.

Mon Dec 23 17:38:53 CET 2019  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.8.1

	* New:
	  + Show number of files in status bar.
	  + Support regular expressions in string replacements.

	* Improved:
	  + Support format codes in "Filename for cover" in "Extract Album Art"
	    script.
	  + The order of string replacements is respected.
	  + Show RVA2 identifier in frame table.
	  + Show UFID owner in frame table.
	  + Support setting file name with "Import from Tags".

	* Fixed:
	  + Android: Accept changes when focus is lost and Enter not pressed.
	  + Self-contained Linux package: Correctly change RPATH in plugins.
	  + Self-contained Linux package: Support composed accented characters.
	  + QML scripts: Skip "--" argument, which is used when passing
	    parameters from qml tool.
	  + Show UFID values in frame table.

Sat Aug 24 15:57:41 CEST 2019  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.8.0

	* New:
	  + kid3-cli: Support JSON output.
	  + Format codes %{modificationdate} and %{creationdate}.
	  + Support ID3v2 GRP1 frame introduced with iTunes 12.5.4.
	  + Import from Tags function which operates on selected files.
	  + Explicit frame names can be used by prepending a '!' character.

	* Improved:
	  + Adapt unified frame type mapping for better iTunes compatibility.
	  + Support multiple covers in M4A files.
	  + kid3-cli: Remove dependencies to GUI libraries.
	  + Android: Show info how to write to SD card.
	  + Android: Support Qt 5.12.

	* Fixed:
	  + Use file settings to replace illegal characters when renaming
	    directories.
	  + Self-contained Linux package: Provide libraries to run QML
	    console.

Mon Mar 18 16:19:08 CET 2019  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.7.1

	* New:
	  + Support max-, min-, unq- aggregation when renaming directories.
	  + Android: Support dark and light themes.
	  + Android: Support opening files with Kid3 from other apps.
	  + Android: Settings for formats, character replacements and import
	    profiles.

	* Improved:
	  + Support format codes in file name for cover.
	  + Support WMV extension.
	  + Android: Better file select dialog.

	* Fixed:
	  + Support setting of ID3v2 version for DSF files.
	  + Avoid jumping around frames while deleting.
	  + Removal of multiple tags where not all tags are removed.
	  + Setting of a simple string as value for IPLS frame with TagLib.
	  + Adapted to Discogs server update.
	  + Windows: Avoid insert disk dialog.
	  + Android: Save settings when app is suspended.
	  + Android: GUI updates on changes.

Sun Dec 23 12:05:20 CET 2018  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.7.0

	* New:
	  + Add and reorder playlist items using drag'n'drop.
	  + Edit tags from files referenced in playlist.
	  + Play songs from playlist.
	  + Drag image files from file list to embed them in audio files.
	  + Drag files from file list into other applications.
	  + Reload action to refresh file list.
	  + Completions with different values when selecting multiple files.
	  + Option "--dbus" to have a D-Bus interface with kid3-cli.
	  + Code "%{dirname}" to use current directory name when renaming.
	  + Code "%{disk}" as alias for "%{disc number}".
	  + Edit list of availble formats to set file and directory names
	    from the tags and vice versa.

	* Improved:
	  + Reduce number of open file handles.
	  + Allow user to resize file and directory list columns.
	  + Modernize code base, support only Qt 5, C++11, CMake 3.

	* Fixed:
	  + Add a number if a file is renamed with an existing name.
	  + Avoid losing changes when a directory is renamed.
	  + Change notifications for files in renamed directory.

Fri Aug 24 12:15:09 CEST 2018  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.6.2

	* Improved:
	  + Format from tags with custom strings prepended/appended when
	    replaced format code is not empty %{"t1"code"t2"}.

	* Fixed:
	  + MP4 free form names longer than 4 characters with TagLib.
	  + Support DOS line endings with "Import CSV".
	  + Set CTOC and CHAP element ID from values in the frame table.
	  + Correctly add frame when "Edit" is clicked on non existing frame.
	  + Show correct icon in Wayland session.
	  + Improve editing of ISO date/time values with validation enabled.
	  + Bundle OpenSSL libraries with self-contained Linux package.

Mon Apr 23 11:26:19 CEST 2018  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.6.1

	* Improved:
	  + Faster saving when many files are unchanged.
	  + Do not change file extension when creating file name from tags.
	  + Support for cross building.

	* Fixed:
	  + Parsing of xid atom with Mp4v2Metadata plugin.
	  + Scroll to opened file after sorting file list.
	  + Avoid recursion when automatically applying format.

Sun Mar 18 16:49:46 CET 2018  Urs Fleisch  <ufleisch@users.sourceforge.net>

	* Release 3.6.0

	* New:
	  + New look for Android app using Qt Quick Controls 2.
	  + Editor for star ratings, configurable mapping between rating
	    values and number of stars.
	  + Option to restrict length of file names.
	  + Option to show hidden files in file and directory lists.

	* Improved:
	  + Support adding unknown 4 letter atoms to M4A files.
	  + Allow Camelot wheel value 1A-12A, 1B-12B for initial key.

	* Fixed:
	  + Windows: Renaming directories which contain subfolders.
	  + Adding and finding unified frames by their frame ID.
	  + Deletion of M4A atoms which are not known or which have an
	    unofficial free form prefix.
	  + Support files with m4v extension.
This commit is contained in:
wiz 2023-02-01 20:08:53 +00:00
parent 82c6ee6053
commit 409ad8e481
5 changed files with 78 additions and 179 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.125 2023/01/29 21:15:27 ryoon Exp $
# $NetBSD: Makefile,v 1.126 2023/02/01 20:08:53 wiz Exp $
DISTNAME= kid3-3.5.1
PKGREVISION= 37
CATEGORIES= kde audio
DISTNAME= kid3-3.9.3
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kid3/}
MAINTAINER= pkgsrc-users@NetBSD.org
@ -15,7 +14,6 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
USE_LANGUAGES= c c++
USE_TOOLS+= perl:build pkg-config
CMAKE_ARGS+= -DQt5Core_DIR:PATH=${QTDIR}
CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:PATH=${QTDIR}/bin/qmake
CMAKE_ARGS+= -DWITH_DOCBOOKDIR:PATH=${PREFIX}/share/xsl/docbook
CMAKE_ARGS+= -DWITH_APPS:STRING="Qt;CLI"
@ -34,6 +32,8 @@ SUBST_FILES.apple+= src/app/qt/CMakeLists.txt
SUBST_FILES.apple+= src/plugins/kid3qml/CMakeLists.txt
SUBST_SED.apple= -e 's,APPLE,ELPPA,g'
.include "options.mk"
.include "../../devel/cmake/build.mk"
.include "../../audio/chromaprint/buildlink3.mk"
.include "../../audio/flac/buildlink3.mk"
@ -43,8 +43,5 @@ SUBST_SED.apple= -e 's,APPLE,ELPPA,g'
.include "../../devel/readline/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
.include "../../x11/qt5-qttools/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,10 +1,8 @@
@comment $NetBSD: PLIST,v 1.12 2018/01/21 04:22:58 markd Exp $
@comment $NetBSD: PLIST,v 1.13 2023/02/01 20:08:53 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
@ -17,15 +15,43 @@ lib/kid3/plugins/libmusicbrainzimport.so
lib/kid3/plugins/liboggflacmetadata.so
lib/kid3/plugins/libqmlcommand.so
lib/kid3/plugins/libtaglibmetadata.so
man/ca/man1/kid3-cli.1
man/ca/man1/kid3-qt.1
man/ca/man1/kid3.1
man/de/man1/kid3-cli.1
man/de/man1/kid3-qt.1
man/de/man1/kid3.1
man/it/man1/kid3-cli.1
man/it/man1/kid3-qt.1
man/it/man1/kid3.1
man/man1/kid3-cli.1
man/man1/kid3-qt.1
man/man1/kid3.1
share/applications/kid3-qt.desktop
man/nl/man1/kid3-cli.1
man/nl/man1/kid3-qt.1
man/nl/man1/kid3.1
man/pt/man1/kid3-cli.1
man/pt/man1/kid3-qt.1
man/pt/man1/kid3.1
man/ru/man1/kid3-cli.1
man/ru/man1/kid3-qt.1
man/ru/man1/kid3.1
man/sv/man1/kid3-cli.1
man/sv/man1/kid3-qt.1
man/sv/man1/kid3.1
man/uk/man1/kid3-cli.1
man/uk/man1/kid3-qt.1
man/uk/man1/kid3.1
share/applications/org.kde.kid3-qt.desktop
share/doc/kid3-qt/kid3_ca.html
share/doc/kid3-qt/kid3_de.html
share/doc/kid3-qt/kid3_en.html
share/doc/kid3-qt/kid3_it.html
share/doc/kid3-qt/kid3_nl.html
share/doc/kid3-qt/kid3_pt.html
share/doc/kid3-qt/kid3_ru.html
share/doc/kid3-qt/kid3_sv.html
share/doc/kid3-qt/kid3_uk.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
@ -36,28 +62,49 @@ 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/ExportJson.qml
share/kid3/qml/script/ExportPlaylist.qml
share/kid3/qml/script/ExtractAlbumArt.qml
share/kid3/qml/script/FixId3v2StandardViolations.qml
share/kid3/qml/script/ImportCsv.qml
share/kid3/qml/script/ImportJson.qml
share/kid3/qml/script/QmlConsole.qml
share/kid3/qml/script/ReplayGain2SoundCheck.qml
share/kid3/qml/script/ResizeAlbumArt.qml
share/kid3/qml/script/RewriteTags.qml
share/kid3/qml/script/ShowTextEncodingV1.qml
share/kid3/qml/script/Tag1ToAscii.qml
share/kid3/qml/script/TitleCase.qml
share/kid3/translations/kid3_ca.qm
share/kid3/translations/kid3_ca@valencia.qm
share/kid3/translations/kid3_cs.qm
share/kid3/translations/kid3_da.qm
share/kid3/translations/kid3_de.qm
share/kid3/translations/kid3_el.qm
share/kid3/translations/kid3_en.qm
share/kid3/translations/kid3_en_GB.qm
share/kid3/translations/kid3_es.qm
share/kid3/translations/kid3_et.qm
share/kid3/translations/kid3_eu.qm
share/kid3/translations/kid3_fi.qm
share/kid3/translations/kid3_fr.qm
share/kid3/translations/kid3_is.qm
share/kid3/translations/kid3_it.qm
share/kid3/translations/kid3_ko.qm
share/kid3/translations/kid3_nl.qm
share/kid3/translations/kid3_nn.qm
share/kid3/translations/kid3_pl.qm
share/kid3/translations/kid3_pt.qm
share/kid3/translations/kid3_pt_BR.qm
share/kid3/translations/kid3_ru.qm
share/kid3/translations/kid3_sl.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_sv.qm
share/kid3/translations/kid3_tr.qm
share/kid3/translations/kid3_uk.qm
share/kid3/translations/kid3_zh_CN.qm
share/kid3/translations/kid3_zh_TW.qm
share/metainfo/kid3-qt.appdata.xml
share/metainfo/org.kde.kid3-qt.appdata.xml

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.16 2021/10/26 09:59:03 nia Exp $
$NetBSD: distinfo,v 1.17 2023/02/01 20:08:53 wiz Exp $
BLAKE2s (kid3-3.5.1.tar.gz) = 1a3db3ad3c7295be8e678b3acfc609fabaef8d3b2bfdc95dd1a3e17696acdfb9
SHA512 (kid3-3.5.1.tar.gz) = 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58
Size (kid3-3.5.1.tar.gz) = 1414829 bytes
SHA1 (patch-CMakeLists.txt) = f3057fe24031a73d28c0031a7d1f0241b05d94f6
BLAKE2s (kid3-3.9.3.tar.gz) = 9b0d44b78542ac8b5ebd379f87a0762c9fbd0140679d49d3b5b34ab0e4fc5bb0
SHA512 (kid3-3.9.3.tar.gz) = 03b9c13e8e9924796e9a993e5f92b05d5435893e3fbdeb7b7fc5ae52d3f9f98322ec6e76c7911814a409f6c6253fb5687d5d3ab5b3fa6db46142a3b6b824cd9b
Size (kid3-3.9.3.tar.gz) = 2996599 bytes
SHA1 (patch-src_app_qt_fixappdata.py) = 7bd903eb866670b78a894bd5c1f7de5bc1f0141a

View file

@ -1,161 +0,0 @@
$NetBSD: patch-CMakeLists.txt,v 1.3 2018/01/21 04:10:44 markd Exp $
On Darwin, avoid app bundle creation.
--- 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")
set(WITH_PHONON ON CACHE BOOL "build with Phonon")
endif (ANDROID)
-if (APPLE OR WIN32)
+if (EPPLA OR WIN32)
set(WITH_DBUS OFF CACHE BOOL "build with QtDBus")
set(WITH_APPS "Qt;CLI" CACHE STRING "build applications (Qt;CLI;Test)")
elseif (ANDROID)
set(WITH_DBUS OFF CACHE BOOL "build with QtDBus")
set(WITH_APPS "Qml" CACHE STRING "build applications (Qml;Qt;CLI;Test)")
-else (APPLE OR WIN32)
+else (EPPLA OR WIN32)
set(WITH_DBUS ON CACHE BOOL "build with QtDBus")
set(WITH_APPS "Qt;CLI;KDE" CACHE STRING "build applications (Qt;CLI;KDE;Test)")
-endif (APPLE OR WIN32)
+endif (EPPLA OR WIN32)
if (WIN32)
set(WITH_READLINE OFF CACHE BOOL "build with readline")
else (WIN32)
@@ -123,7 +123,7 @@ set(CPACK_PACKAGE_VERSION ${KID3_VERSION
set(RELEASE_YEAR 2017)
# Platform specific default installation paths
-if (APPLE)
+if (ELPPA)
set(WITH_DATAROOTDIR_DEFAULT "kid3.app/Contents/Resources")
set(WITH_DOCDIR_DEFAULT "kid3.app/Contents/Resources")
set(WITH_TRANSLATIONSDIR_DEFAULT "kid3.app/Contents/Resources")
@@ -149,7 +149,7 @@ elseif (ANDROID)
set(WITH_PLUGINSDIR_DEFAULT ".")
set(QT_ANDROID_APP_VERSION ${KID3_VERSION})
set(QT_ANDROID_APP_VERSION_CODE 10)
-else (APPLE)
+else (ELPPA)
set(WITH_DATAROOTDIR_DEFAULT "share")
set(WITH_DOCDIR_DEFAULT "share/doc/kid3-qt")
if (BUILD_KDE_APP OR BUILD_SHARED_LIBS)
@@ -161,7 +161,7 @@ else (APPLE)
set(WITH_BINDIR_DEFAULT "bin")
set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3")
set(WITH_PLUGINSDIR_DEFAULT "${WITH_LIBDIR_DEFAULT}/plugins")
-endif (APPLE)
+endif (ELPPA)
set(WITH_DATAROOTDIR ${WITH_DATAROOTDIR_DEFAULT} CACHE STRING
"data root directory relative to CMAKE_INSTALL_PREFIX")
@@ -189,19 +189,19 @@ else (CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX_SLASH "")
endif (CMAKE_INSTALL_PREFIX)
-if (APPLE)
+if (ELPPA)
file(RELATIVE_PATH CFG_DATAROOTDIR "/kid3.app/Contents/MacOS" /${WITH_DATAROOTDIR})
file(RELATIVE_PATH CFG_DOCDIR "/kid3.app/Contents/MacOS" /${WITH_DOCDIR})
file(RELATIVE_PATH CFG_TRANSLATIONSDIR "/kid3.app/Contents/MacOS" /${WITH_TRANSLATIONSDIR})
file(RELATIVE_PATH CFG_QMLDIR "/kid3.app/Contents/MacOS" /${WITH_QMLDIR})
file(RELATIVE_PATH CFG_PLUGINSDIR "/kid3.app/Contents/MacOS" /${WITH_PLUGINSDIR})
-else (APPLE)
+else (ELPPA)
set(CFG_DATAROOTDIR ${CMAKE_INSTALL_PREFIX_SLASH}${WITH_DATAROOTDIR})
set(CFG_DOCDIR ${CMAKE_INSTALL_PREFIX_SLASH}${WITH_DOCDIR})
set(CFG_TRANSLATIONSDIR ${CMAKE_INSTALL_PREFIX_SLASH}${WITH_TRANSLATIONSDIR})
set(CFG_QMLDIR ${CMAKE_INSTALL_PREFIX_SLASH}${WITH_QMLDIR})
file(RELATIVE_PATH CFG_PLUGINSDIR /${WITH_BINDIR} /${WITH_PLUGINSDIR})
-endif (APPLE)
+endif (ELPPA)
if (CFG_PLUGINSDIR STREQUAL "")
set(CFG_PLUGINSDIR ".")
endif (CFG_PLUGINSDIR STREQUAL "")
@@ -308,14 +308,14 @@ if (NOT WITH_QT4 AND NOT Qt4_FOUND AND N
set(QT_EXECUTABLE_COMPILE_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
- if (APPLE)
+ if (ELPPA)
# For Mac Qt5.5.0 QT_LIBRARY_DIR is wrong
# (<installdir>/Qt5.5.0/5.5/clang_64/lib/QtCore.framework), fix it.
string(REGEX MATCH "^(.*)/QtCore.framework$" _qt5LibDir "${QT_LIBRARY_DIR}")
if (_qt5LibDir)
set(QT_LIBRARY_DIR ${CMAKE_MATCH_1})
endif (_qt5LibDir)
- endif (APPLE)
+ endif (ELPPA)
get_target_property(QT_LUPDATE_EXECUTABLE Qt5::lupdate LOCATION)
get_target_property(QT_PLUGINS_DIR Qt5::QJpegPlugin LOCATION)
if (QT_PLUGINS_DIR)
@@ -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)
-if (APPLE)
+if (ELPPA)
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")
@@ -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")
-endif (APPLE)
+endif (ELPPA)
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})
@@ -519,11 +519,11 @@ if (NOT WIN32)
endif (_HAVE_GCC_VISIBILITY)
endif (NOT WIN32)
-if (UNIX AND NOT APPLE)
+if (UNIX AND NOT ELPPA)
set(KID3_EXECUTABLE kid3-qt)
-else (UNIX AND NOT APPLE)
+else (UNIX AND NOT ELPPA)
set(KID3_EXECUTABLE kid3)
-endif (UNIX AND NOT APPLE)
+endif (UNIX AND NOT ELPPA)
if (BUILD_KDE_APP)
if (NOT HAVE_QT5)
@@ -545,18 +545,18 @@ endif (ANDROID)
# To create a package, run cpack
-if (APPLE)
+if (EPPLA)
set(CPACK_BINARY_DRAGNDROP ON)
set(CPACK_GENERATOR DragNDrop)
elseif (WIN32)
set(CPACK_GENERATOR ZIP)
elseif (LINUX_SELF_CONTAINED)
set(CPACK_GENERATOR TGZ)
-else (APPLE)
+else (EPPLA)
set(CPACK_GENERATOR DEB)
-endif (APPLE)
+endif (EPPLA)
-if (BUILD_KDE_APP OR APPLE OR WIN32 OR LINUX_SELF_CONTAINED)
+if (BUILD_KDE_APP OR EPPLA OR WIN32 OR LINUX_SELF_CONTAINED)
set(CPACK_PACKAGE_NAME "kid3")
set(CPACK_DEBIAN_PACKAGE_SECTION "kde")
else ()

View file

@ -0,0 +1,16 @@
$NetBSD: patch-src_app_qt_fixappdata.py,v 1.1 2023/02/01 20:08:53 wiz Exp $
Fix
UnicodeDecodeError: 'ascii' codec can't decode byte 0xd9 in position 305: ordinal not in range(128)
--- src/app/qt/fixappdata.py.orig 2023-01-12 03:56:49.000000000 +0000
+++ src/app/qt/fixappdata.py
@@ -5,7 +5,7 @@ import sys
def fix_appdata():
- for line in fileinput.input():
+ for line in fileinput.input(encoding="utf-8"):
line = line.replace('kid3.desktop', 'kid3-qt.desktop')
sys.stdout.write(line)