From 8ac8c8df17ffd6410970f97b580faa80a32c8059747a302b7ba174e537488c68 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Tue, 20 Feb 2024 16:01:24 +0000
Subject: [PATCH 1/2] - Add patch to fix build with taglib 2:   *
 0001-Fix-build-with-taglib-2.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/juk?expand=0&rev=184
---
 0001-Fix-build-with-taglib-2.patch | 39 ++++++++++++++++++++++++++++++
 juk.changes                        |  6 +++++
 juk.spec                           |  2 ++
 3 files changed, 47 insertions(+)
 create mode 100644 0001-Fix-build-with-taglib-2.patch

diff --git a/0001-Fix-build-with-taglib-2.patch b/0001-Fix-build-with-taglib-2.patch
new file mode 100644
index 0000000..113ede9
--- /dev/null
+++ b/0001-Fix-build-with-taglib-2.patch
@@ -0,0 +1,39 @@
+From 5389ae860ca4c672c022cad7e51c48bc699fcba3 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 24 Jan 2024 17:40:16 +0100
+Subject: [PATCH] Fix build with taglib 2
+
+Drop unused includes that no longer exist
+---
+ mediafiles.cpp | 1 -
+ mediafiles.h   | 2 --
+ 2 files changed, 3 deletions(-)
+
+diff --git a/mediafiles.cpp b/mediafiles.cpp
+index facdf1fc..0bb33b37 100644
+--- a/mediafiles.cpp
++++ b/mediafiles.cpp
+@@ -29,7 +29,6 @@
+ #include <QMimeDatabase>
+ 
+ #include <taglib.h>
+-#include <taglib_config.h>
+ #include <tag.h>
+ #include <tdebuglistener.h>
+ #include <mpegfile.h>
+diff --git a/mediafiles.h b/mediafiles.h
+index 81ab4b8a..41decb34 100644
+--- a/mediafiles.h
++++ b/mediafiles.h
+@@ -28,8 +28,6 @@ namespace TagLib {
+     class File;
+ }
+ 
+-#include <taglib_config.h>
+-
+ /**
+  * A namespace for file JuK's file related functions.  The goal is to hide
+  * all specific knowledge of mimetypes and file extensions here.
+-- 
+2.43.1
+
diff --git a/juk.changes b/juk.changes
index 75bd1ea..10bb858 100644
--- a/juk.changes
+++ b/juk.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 20 16:00:54 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Add patch to fix build with taglib 2:
+  * 0001-Fix-build-with-taglib-2.patch
+
 -------------------------------------------------------------------
 Tue Dec  5 14:19:08 UTC 2023 - Christophe Marin <christophe@krop.fr>
 
diff --git a/juk.spec b/juk.spec
index f0d5e0e..a9da4ff 100644
--- a/juk.spec
+++ b/juk.spec
@@ -28,6 +28,8 @@ Source:         https://download.kde.org/stable/release-service/%{version}/src/%
 Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
 Source2:        applications.keyring
 %endif
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-Fix-build-with-taglib-2.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  libtag-devel
 BuildRequires:  update-desktop-files

From a5d8727b6a275d0fbc0ff9fec1a49e7163a12d2c8e32a8aa06ece579b4043bf2 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Tue, 20 Feb 2024 16:09:32 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/juk?expand=0&rev=185

---
 0001-Fix-build-with-taglib-2.patch | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/0001-Fix-build-with-taglib-2.patch b/0001-Fix-build-with-taglib-2.patch
index 113ede9..f778a1b 100644
--- a/0001-Fix-build-with-taglib-2.patch
+++ b/0001-Fix-build-with-taglib-2.patch
@@ -1,16 +1,18 @@
-From 5389ae860ca4c672c022cad7e51c48bc699fcba3 Mon Sep 17 00:00:00 2001
+From db3bab2c24c3d75a11ddbbe3d2d8bfc920f19299 Mon Sep 17 00:00:00 2001
 From: Antonio Rojas <arojas@archlinux.org>
 Date: Wed, 24 Jan 2024 17:40:16 +0100
 Subject: [PATCH] Fix build with taglib 2
 
 Drop unused includes that no longer exist
+
+(cherry picked from commit 5389ae860ca4c672c022cad7e51c48bc699fcba3)
 ---
  mediafiles.cpp | 1 -
  mediafiles.h   | 2 --
  2 files changed, 3 deletions(-)
 
 diff --git a/mediafiles.cpp b/mediafiles.cpp
-index facdf1fc..0bb33b37 100644
+index 8a4fc38f..086bf48d 100644
 --- a/mediafiles.cpp
 +++ b/mediafiles.cpp
 @@ -29,7 +29,6 @@
@@ -19,8 +21,8 @@ index facdf1fc..0bb33b37 100644
  #include <taglib.h>
 -#include <taglib_config.h>
  #include <tag.h>
- #include <tdebuglistener.h>
  #include <mpegfile.h>
+ #include <vorbisfile.h>
 diff --git a/mediafiles.h b/mediafiles.h
 index 81ab4b8a..41decb34 100644
 --- a/mediafiles.h