From edf1e0008608ec6c7001b1e09ac285da5ce7b1b4 Mon Sep 17 00:00:00 2001
From: Simonas Kazlauskas <git@kazlauskas.me>
Date: Mon, 31 May 2021 20:17:25 +0300
Subject: [PATCH] quodlibet: 4.3.0 -> 4.4.0

---
 pkgs/applications/audio/quodlibet/default.nix        | 10 +++-------
 .../audio/quodlibet/quodlibet-feedparser6.patch      | 12 ------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 52e8b4f8183d..24f9f057b65a 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg,
+{ lib, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg,
   tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,
   gst_all_1, withGstPlugins ? true,
   xineBackend ? false, xine-lib,
@@ -9,15 +9,13 @@
 let optionals = lib.optionals; in
 python3.pkgs.buildPythonApplication rec {
   pname = "quodlibet${tag}";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchurl {
     url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
-    sha256 = "1q17ckblfa4fcs7wsjwsq1dj7360ymrdyjkyqmj864wzlqkw1rd2";
+    sha256 = "sha256-oDMY0nZ+SVlVF2PQqH+tl3OHr3EmCP5XJxQXaiS782c=";
   };
 
-  patches = [ ./quodlibet-feedparser6.patch ];
-
   nativeBuildInputs = [ wrapGAppsHook gettext ];
 
   checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]);
@@ -50,8 +48,6 @@ python3.pkgs.buildPythonApplication rec {
 
   checkPhase = ''
     runHook preCheck
-    # newer gettext spews some warnings which fail the tests
-    substituteInPlace tests/test_po.py --replace "strict=True" "strict=False"
     # otherwise tests can't find the app icons; instead of creating index.theme from scratch
     # I re-used the one from hicolor-icon-theme which seems to work
     cp "${hicolor-icon-theme}/share/icons/hicolor/index.theme" quodlibet/images/hicolor
diff --git a/pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch b/pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch
deleted file mode 100644
index 41c6c75cea25..000000000000
--- a/pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Support feedparser 6, based on https://github.com/quodlibet/quodlibet/pull/3464
-
---- a/quodlibet/browsers/audiofeeds.py
-+++ b/quodlibet/browsers/audiofeeds.py
-@@ -137,7 +137,4 @@ class Feed(list):
-     def parse(self):
-         try:
--            if not self._check_feed():
--                return False
--
-             doc = feedparser.parse(self.uri)
-         except Exception as e: