From 6236e0cbdfa10d9da6f4f56392d3fa02fd821721 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 18 Apr 2023 21:58:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?libdmapsharing:=203.9.10=20=E2=86=92=203.9.?=
 =?UTF-8?q?12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libdmapsharing/-/compare/LIBDMAPSHARING_3_9_10...LIBDMAPSHARING_3_9_12
---
 .../libraries/libdmapsharing/default.nix      | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/development/libraries/libdmapsharing/default.nix
index e469283ae7ca..8f8354ae8587 100644
--- a/pkgs/development/libraries/libdmapsharing/default.nix
+++ b/pkgs/development/libraries/libdmapsharing/default.nix
@@ -12,19 +12,16 @@
 , gdk-pixbuf
 , gst_all_1
 , glib
-, gtk3
-, libgee
-, check
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
 , gobject-introspection
-, libsoup
+, libsoup_3
 }:
 
 stdenv.mkDerivation rec {
   pname = "libdmapsharing";
-  version = "3.9.10";
+  version = "3.9.12";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
@@ -34,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = pname;
     rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "04y1wjwnbw4pzg05h383d83p6an6ylwy4b4g32jmjxpfi388x33g";
+    sha256 = "tnQ25RR/bAZJKa8vTwzkGK1iPc7CMGFbyX8mBf6TKr4=";
   };
 
   nativeBuildInputs = [
@@ -60,31 +57,18 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [
     glib
-    libsoup
-  ];
-
-  nativeCheckInputs = [
-    libgee
-    check
-    gtk3
+    libsoup_3
   ];
 
   configureFlags = [
     "--enable-gtk-doc"
+    "--disable-tests" # Tests require mDNS server.
   ];
 
-  # Cannot disable tests here or `check` from nativeCheckInputs would not be included.
-  # Cannot disable building the tests or docs will not build:
-  # https://gitlab.gnome.org/GNOME/libdmapsharing/-/issues/49
-  doCheck = true;
-
   preConfigure = ''
     NOCONFIGURE=1 ./autogen.sh
   '';
 
-  # Tests require mDNS server.
-  checkPhase = ":";
-
   meta = with lib; {
     homepage = "https://www.flyn.org/projects/libdmapsharing/";
     description = "Library that implements the DMAP family of protocols";

From 9c373c07ec2e446c50a041dc46c473a13d7c4dc2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 18 Apr 2023 22:05:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?rhythmbox:=203.4.6=20=E2=86=92=203.4.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/rhythmbox/-/compare/v3.4.6...v3.4.7
---
 pkgs/applications/audio/rhythmbox/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index fe9f4a835c84..9cd6b0d9ae05 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -10,7 +10,7 @@
 , glib
 , gtk3
 , libpeas
-, libsoup
+, libsoup_3
 , libxml2
 , libsecret
 , libnotify
@@ -36,11 +36,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rhythmbox";
-  version = "3.4.6";
+  version = "3.4.7";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ=";
+    sha256 = "L21WwT/BpkxTT1AHiPtIKTbOVHs0PtkMZ94fK84M+n4=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     python3
-    libsoup
+    libsoup_3
     libxml2
     tdb
     json-glib
@@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
+    "-Ddaap=enabled"
     "-Dtests=disabled"
   ];
 

From abf61df282b3c87ff494069330c4af0aef172765 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 18 Apr 2023 23:07:53 +0800
Subject: [PATCH 3/3] grilo-plugins: enable dmap plugin

Fixes 7e9e6958207e3f129e2f28c7d723a8d99de977b2.
---
 pkgs/development/libraries/grilo-plugins/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 966e85a4bca3..88b83a32918f 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -8,6 +8,7 @@
 , gperf
 , sqlite
 , libarchive
+, libdmapsharing
 , libsoup_3
 , gnome
 , libxml2
@@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
     gnome-online-accounts
     totem-pl-parser
     libarchive
+    libdmapsharing
     libsoup_3
     gmime
     gom