ma pkgs.quodlibet: add private patches

This commit is contained in:
makefu 2018-09-17 00:29:03 +02:00
parent 04ab857228
commit 1424c4cdb6
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
3 changed files with 71 additions and 0 deletions

View File

@ -0,0 +1,54 @@
diff --git a/quodlibet/qltk/edittags.py b/quodlibet/quodlibet/qltk/edittags.py
index 148866ef7..e741b9c3d 100644
--- a/quodlibet/qltk/edittags.py
+++ b/quodlibet/qltk/edittags.py
@@ -740,13 +740,6 @@ class EditTags(Gtk.VBox):
win.show()
all_done = False
for song in songs:
- if not song.valid():
- win.hide()
- dialog = OverwriteWarning(self, song)
- resp = dialog.run()
- win.show()
- if resp != OverwriteWarning.RESPONSE_SAVE:
- break
changed = False
for key, values in iteritems(updated):
diff --git a/quodlibet/qltk/tagsfrompath.py b/quodlibet/quodlibet/qltk/tagsfrompath.py
index fd3f0709c..cb5b44f20 100644
--- a/quodlibet/qltk/tagsfrompath.py
+++ b/quodlibet/qltk/tagsfrompath.py
@@ -284,13 +284,6 @@ class TagsFromPath(Gtk.VBox):
for entry in ((model and itervalues(model)) or []):
song = entry.song
changed = False
- if not song.valid():
- win.hide()
- dialog = OverwriteWarning(self, song)
- resp = dialog.run()
- win.show()
- if resp != OverwriteWarning.RESPONSE_SAVE:
- break
for i, h in enumerate(pattern.headers):
text = entry.get_match(h)
diff --git a/quodlibet/qltk/tracknumbers.py b/quodlibet/quodlibet/qltk/tracknumbers.py
index 1ab4d0b9a..52f087db4 100644
--- a/quodlibet/qltk/tracknumbers.py
+++ b/quodlibet/qltk/tracknumbers.py
@@ -160,13 +160,6 @@ class TrackNumbers(Gtk.VBox):
if song.get("tracknumber") == track:
win.step()
continue
- if not song.valid():
- win.hide()
- dialog = OverwriteWarning(self, song)
- resp = dialog.run()
- win.show()
- if resp != OverwriteWarning.RESPONSE_SAVE:
- break
song["tracknumber"] = track
try:
song.write()

View File

@ -0,0 +1,13 @@
diff --git a/quodlibet/pattern/_pattern.py b/quodlibet/pattern/_pattern.py
index fc056d07a..8fb559c6e 100644
--- a/quodlibet/pattern/_pattern.py
+++ b/quodlibet/pattern/_pattern.py
@@ -387,7 +387,7 @@ def _number(key, value):
elif key == "discnumber":
parts = value.split("/")
try:
- return "%02d" % int(parts[0])
+ return "%d" % int(parts[0])
except (TypeError, ValueError):
return value
else:

View File

@ -20,6 +20,10 @@ with super.lib; with builtins; let
(filterAttrs (_: eq "directory") (readDir path));
in {
quodlibet = super.pkgs.stdenv.lib.overrideDerivation super.quodlibet (old: {
patches = [ ./custom/quodlibet/single-digit-discnumber.patch
./custom/quodlibet/remove-override-warning.patch ];
});
alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";};