From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: taglib2: musique-1.12
To: The OpenBSD ports mailing-list <ports@openbsd.org>
Date: Tue, 27 May 2025 12:57:03 +0200

Simple diff to make musique happy with taglib2. Tested on amd64. OK?

Cheers Rafael

diff --git a/audio/musique/patches/patch-src_coverutils_cpp b/audio/musique/patches/patch-src_coverutils_cpp
new file mode 100644
index 00000000000..d49b750a168
--- /dev/null
+++ b/audio/musique/patches/patch-src_coverutils_cpp
@@ -0,0 +1,14 @@
+Fix build with Taglib 2.x
+https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44
+Index: src/coverutils.cpp
+--- src/coverutils.cpp.orig
++++ src/coverutils.cpp
+@@ -158,7 +158,7 @@ bool CoverUtils::coverFromMP4(const QString &filename,
+     TagLib::MP4::Tag *tag = static_cast<TagLib::MP4::Tag *>(f.tag());
+     if (!tag) return false;
+ 
+-    TagLib::MP4::ItemListMap itemsListMap = tag->itemListMap();
++    TagLib::MP4::ItemMap itemsListMap = tag->itemMap();
+     TagLib::MP4::Item coverItem = itemsListMap["covr"];
+     TagLib::MP4::CoverArtList coverArtList = coverItem.toCoverArtList();
+     TagLib::MP4::CoverArt coverArt = coverArtList.front();
diff --git a/audio/musique/patches/patch-src_mainwindow_cpp b/audio/musique/patches/patch-src_mainwindow_cpp
new file mode 100644
index 00000000000..c3d03a38b2c
--- /dev/null
+++ b/audio/musique/patches/patch-src_mainwindow_cpp
@@ -0,0 +1,23 @@
+Fix build with Taglib 2.x
+https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44
+Index: src/mainwindow.cpp
+--- src/mainwindow.cpp.orig
++++ src/mainwindow.cpp
+@@ -46,6 +46,8 @@ $END_LICENSE */
+ #include "view.h"
+ #include "zoomableui.h"
+ 
++#include <iostream>
++
+ #if defined(APP_MAC_SEARCHFIELD) && !defined(APP_MAC_QMACTOOLBAR)
+ #include "searchlineedit_mac.h"
+ #else
+@@ -567,6 +569,8 @@ void MainWindow::createToolBar() {
+         volumeSlider->setPalette(p);
+     }
+     volumeSlider->setValue(volumeSlider->maximum());
++
++
+ 
+ #if defined(APP_MAC_SEARCHFIELD) && !defined(APP_MAC_QMACTOOLBAR)
+     SearchWrapper *searchWrapper = new SearchWrapper(this);
diff --git a/audio/musique/patches/patch-src_tags_mp4utils_h b/audio/musique/patches/patch-src_tags_mp4utils_h
new file mode 100644
index 00000000000..5fb189bc5c9
--- /dev/null
+++ b/audio/musique/patches/patch-src_tags_mp4utils_h
@@ -0,0 +1,23 @@
+Fix build with Taglib 2.x
+https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44
+Index: src/tags/mp4utils.h
+--- src/tags/mp4utils.h.orig
++++ src/tags/mp4utils.h
+@@ -9,7 +9,7 @@
+ namespace Mp4Utils {
+ 
+ void load(TagLib::MP4::Tag *tag, Tags *tags) {
+-    const TagLib::MP4::ItemListMap &map = tag->itemListMap();
++    const TagLib::MP4::ItemMap &map = tag->itemMap();
+ 
+     if (map.contains("trkn")) {
+         TagLib::MP4::Item::IntPair intPair = map["trkn"].toIntPair();
+@@ -31,7 +31,7 @@ void load(TagLib::MP4::Tag *tag, Tags *tags) {
+         tags->setComposerSort(v);
+     }
+ 
+-    TagLib::MP4::ItemListMap::ConstIterator it = map.find("aART");
++    TagLib::MP4::ItemMap::ConstIterator it = map.find("aART");
+     if (it != map.end()) {
+         TagLib::StringList sl = it->second.toStringList();
+         if (!sl.isEmpty())
diff --git a/audio/musique/patches/patch-src_tags_tagutils_cpp b/audio/musique/patches/patch-src_tags_tagutils_cpp
new file mode 100644
index 00000000000..9d6dfd18ebc
--- /dev/null
+++ b/audio/musique/patches/patch-src_tags_tagutils_cpp
@@ -0,0 +1,14 @@
+Fix build with Taglib 2.x
+https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44
+Index: src/tags/tagutils.cpp
+--- src/tags/tagutils.cpp.orig
++++ src/tags/tagutils.cpp
+@@ -49,7 +49,7 @@ Tags *TagUtils::load(const QString &filename) {
+         tags->setComment(TagUtils::qString(tag->comment()));
+         TagLib::AudioProperties *audioProperties = fileref.audioProperties();
+         if (audioProperties)
+-            tags->setDuration(audioProperties->length());
++            tags->setDuration(audioProperties->lengthInSeconds());
+     }
+ 
+     /*