summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs/custom/quodlibet
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-09-25 19:56:06 +0200
committerjeschli <jeschli@gmail.com>2018-09-25 19:56:06 +0200
commit8834d1a9ff6eddfc36e3ad07b7f93805b3212b3f (patch)
tree9ce300976ec88d90e5c5c9030111d890dcf5683e /makefu/5pkgs/custom/quodlibet
parentf922d5947acc3151619ec06962197a800d3138eb (diff)
parenta374a452112ba962ab90e45b6b0f27b3a1330e4f (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'makefu/5pkgs/custom/quodlibet')
-rw-r--r--makefu/5pkgs/custom/quodlibet/remove-override-warning.patch54
-rw-r--r--makefu/5pkgs/custom/quodlibet/single-digit-discnumber.patch13
2 files changed, 67 insertions, 0 deletions
diff --git a/makefu/5pkgs/custom/quodlibet/remove-override-warning.patch b/makefu/5pkgs/custom/quodlibet/remove-override-warning.patch
new file mode 100644
index 000000000..0f9d41024
--- /dev/null
+++ b/makefu/5pkgs/custom/quodlibet/remove-override-warning.patch
@@ -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()
diff --git a/makefu/5pkgs/custom/quodlibet/single-digit-discnumber.patch b/makefu/5pkgs/custom/quodlibet/single-digit-discnumber.patch
new file mode 100644
index 000000000..05778fde7
--- /dev/null
+++ b/makefu/5pkgs/custom/quodlibet/single-digit-discnumber.patch
@@ -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: