Hello community, here is the log from the commit of package cantata for openSUSE:Factory checked in at 2020-03-11 18:47:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantata (Old) and /work/SRC/openSUSE:Factory/.cantata.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantata" Wed Mar 11 18:47:21 2020 rev:14 rq:783103 version:2.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cantata/cantata.changes 2020-02-22 19:08:59.842652492 +0100 +++ /work/SRC/openSUSE:Factory/.cantata.new.3160/cantata.changes 2020-03-11 18:50:13.231537367 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 08:08:53 UTC 2020 - Cor Blom <corne...@solcon.nl> + +- Add correct-path-saved-lyrics.patch to fix saving lyrics + +------------------------------------------------------------------- New: ---- correct-path-saved-lyrics.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantata.spec ++++++ --- /var/tmp/diff_new_pack.j2xkZ4/_old 2020-03-11 18:50:13.903537667 +0100 +++ /var/tmp/diff_new_pack.j2xkZ4/_new 2020-03-11 18:50:13.907537669 +0100 @@ -26,6 +26,9 @@ Source0: https://github.com/CDrummond/cantata/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE fix-translations-with-qt5.diff -- Make sure that it finds the right lrelease and lconvert binaries with Qt5 (cantata only find the 64bits lrelease). Patch0: fix-translations-with-qt5.diff +# PATCH-FIX-UPSTREAM: [PATCH] Correctly set 'storeLyricsInMpdDir' config item, UI was +# setting wrong config item. Cantatan issue #1576 +Patch1: correct-path-saved-lyrics.patch BuildRequires: fdupes BuildRequires: media-player-info BuildRequires: cmake(Qt5LinguistTools) @@ -96,6 +99,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake -DENABLE_REMOTE_DEVICES=OFF \ ++++++ correct-path-saved-lyrics.patch ++++++ >From 5a8fcd033fbab98c68583a509f775fd2bab6a947 Mon Sep 17 00:00:00 2001 From: Craig Drummond <craig.p.drumm...@gmail.com> Date: Sun, 1 Mar 2020 14:17:52 +0000 Subject: [PATCH] Correctly set 'storeLyricsInMpdDir' config item, UI was setting wrong config item. Issue #1576 --- diff --git a/context/othersettings.cpp b/context/othersettings.cpp index 2f403cbc0..5aebeb664 100644 --- a/context/othersettings.cpp +++ b/context/othersettings.cpp @@ -54,7 +54,7 @@ void OtherSettings::load() wikipediaIntroOnly->setChecked(Settings::self()->wikipediaIntroOnly()); contextDarkBackground->setChecked(Settings::self()->contextDarkBackground()); contextAlwaysCollapsed->setChecked(Settings::self()->contextAlwaysCollapsed()); - storeCoversInMpdDir->setChecked(Settings::self()->storeCoversInMpdDir()); + storeLyricsInMpdDir->setChecked(Settings::self()->storeLyricsInMpdDir()); int bgnd=Settings::self()->contextBackdrop(); contextBackdrop_none->setChecked(bgnd==contextBackdrop_none->property(constValueProperty).toInt()); @@ -76,7 +76,7 @@ void OtherSettings::save() Settings::self()->saveWikipediaIntroOnly(wikipediaIntroOnly->isChecked()); Settings::self()->saveContextDarkBackground(contextDarkBackground->isChecked()); Settings::self()->saveContextAlwaysCollapsed(contextAlwaysCollapsed->isChecked()); - Settings::self()->saveStoreCoversInMpdDir(storeCoversInMpdDir->isChecked()); + Settings::self()->saveStoreLyricsInMpdDir(storeLyricsInMpdDir->isChecked()); if (contextBackdrop_none->isChecked()) { Settings::self()->saveContextBackdrop(contextBackdrop_none->property(constValueProperty).toInt()); diff --git a/context/othersettings.ui b/context/othersettings.ui index b08bd498f..19cdc47c7 100644 --- a/context/othersettings.ui +++ b/context/othersettings.ui @@ -198,7 +198,7 @@ </widget> </item> <item row="3" column="0" colspan="2"> - <widget class="QCheckBox" name="storeCoversInMpdDir"> + <widget class="QCheckBox" name="storeLyricsInMpdDir"> <property name="text"> <string>Save downloaded lyrics into music folder</string> </property>
