Hello community, here is the log from the commit of package audacious for openSUSE:Factory checked in at 2020-06-04 17:54:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacious (Old) and /work/SRC/openSUSE:Factory/.audacious.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audacious" Thu Jun 4 17:54:42 2020 rev:10 rq:811239 version:4.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/audacious/audacious.changes 2020-05-01 11:15:01.264065077 +0200 +++ /work/SRC/openSUSE:Factory/.audacious.new.3606/audacious.changes 2020-06-04 17:54:53.328715961 +0200 @@ -1,0 +2,6 @@ +Wed Jun 3 17:24:18 UTC 2020 - Alexei Sorokin <[email protected]> + +- Update to version 4.0.4: + * See https://audacious-media-player.org/news/49-audacious-4-0-4-released + +------------------------------------------------------------------- Old: ---- audacious-4.0.3.tar.bz2 New: ---- audacious-4.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacious.spec ++++++ --- /var/tmp/diff_new_pack.U4fhQl/_old 2020-06-04 17:54:56.864726831 +0200 +++ /var/tmp/diff_new_pack.U4fhQl/_new 2020-06-04 17:54:56.868726843 +0200 @@ -22,7 +22,7 @@ %define qt_soname 2 %define tag_soname 3 Name: audacious -Version: 4.0.3 +Version: 4.0.4 Release: 0 Summary: Audio player with graphical UI and library functionality License: BSD-2-Clause ++++++ audacious-4.0.3.tar.bz2 -> audacious-4.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/audacious.desktop new/audacious-4.0.4/audacious.desktop --- old/audacious-4.0.3/audacious.desktop 2020-04-29 06:25:16.000000000 +0200 +++ new/audacious-4.0.4/audacious.desktop 2020-06-01 18:52:06.000000000 +0200 @@ -5,10 +5,10 @@ GenericName=Music Player Comment=Listen to music Icon=audacious -Categories=AudioVideo;Audio;Player;GTK; +Categories=AudioVideo;Audio;Player; Exec=audacious %U TryExec=audacious -StartupNotify=true +StartupNotify=false Terminal=false MimeType=application/ogg;application/x-cue;application/x-ogg;application/xspf+xml;audio/aac;audio/flac;audio/midi;audio/mp3;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/wav;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;x-content/audio-cdda; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/configure new/audacious-4.0.4/configure --- old/audacious-4.0.3/configure 2020-04-29 06:43:28.000000000 +0200 +++ new/audacious-4.0.4/configure 2020-06-01 19:10:02.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for audacious 4.0.3. +# Generated by GNU Autoconf 2.69 for audacious 4.0.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='audacious' PACKAGE_TARNAME='audacious' -PACKAGE_VERSION='4.0.3' -PACKAGE_STRING='audacious 4.0.3' +PACKAGE_VERSION='4.0.4' +PACKAGE_STRING='audacious 4.0.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1369,7 +1369,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures audacious 4.0.3 to adapt to many kinds of systems. +\`configure' configures audacious 4.0.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1435,7 +1435,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of audacious 4.0.3:";; + short | recursive ) echo "Configuration of audacious 4.0.4:";; esac cat <<\_ACEOF @@ -1568,7 +1568,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -audacious configure 4.0.3 +audacious configure 4.0.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2036,7 +2036,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by audacious $as_me 4.0.3, which was +It was created by audacious $as_me 4.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -10952,7 +10952,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by audacious $as_me 4.0.3, which was +This file was extended by audacious $as_me 4.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11018,7 +11018,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -audacious config.status 4.0.3 +audacious config.status 4.0.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/configure.ac new/audacious-4.0.4/configure.ac --- old/audacious-4.0.3/configure.ac 2020-04-29 06:25:16.000000000 +0200 +++ new/audacious-4.0.4/configure.ac 2020-06-01 18:52:06.000000000 +0200 @@ -6,7 +6,7 @@ dnl ========== AC_PREREQ([2.59]) -AC_INIT([audacious], [4.0.3]) +AC_INIT([audacious], [4.0.4]) AC_COPYRIGHT([Copyright (C) 2001-2020 Audacious developers and others]) AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME", [Name of package]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/po/da.po new/audacious-4.0.4/po/da.po --- old/audacious-4.0.3/po/da.po 2020-04-29 06:25:16.000000000 +0200 +++ new/audacious-4.0.4/po/da.po 2020-06-01 18:52:06.000000000 +0200 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the Audacious package. # # Translators: -# Joe Hansen <[email protected]>, 2013-2014,2016 +# Joe Hansen <[email protected]>, 2013-2014,2016,2020 # scootergrisen, 2017-2018 msgid "" msgstr "" "Project-Id-Version: Audacious\n" "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"; "POT-Creation-Date: 2020-01-26 13:17+0100\n" -"PO-Revision-Date: 2020-01-26 12:21+0000\n" +"PO-Revision-Date: 2020-05-12 10:00+0000\n" "Last-Translator: Joe Hansen <[email protected]>\n" "Language-Team: Danish (http://www.transifex.com/audacious/audacious/language/da/)\n" "MIME-Version: 1.0\n" @@ -81,7 +81,7 @@ #: src/audacious/main.cc:81 msgid "Run in GTK mode" -msgstr "" +msgstr "Kør i GTK-tilstand" #: src/audacious/main.cc:138 #, c-format @@ -191,7 +191,7 @@ #: src/libaudcore/playlist-files.cc:161 src/libaudqt/eq-preset-qt.cc:309 #, c-format msgid "Error saving %s." -msgstr "" +msgstr "Kunne ikke gemme %s." #: src/libaudcore/playlist-files.cc:167 #, c-format @@ -307,7 +307,7 @@ #: src/libaudgui/eq-preset.cc:153 msgid "Please select one preset to export." -msgstr "" +msgstr "Vælg venligst en forhåndsindstilling at eksportere" #: src/libaudgui/eq-preset.cc:256 src/libaudgui/eq-preset.cc:261 msgid "Preset File ..." @@ -676,7 +676,7 @@ #: src/libaudgui/infowin.cc:397 msgid "_Auto-fill empty fields" -msgstr "" +msgstr "_Udfyld automatisk tomme felter" #: src/libaudgui/infowin.cc:411 src/libaudqt/infowin-qt.cc:183 msgid "_Save" @@ -684,7 +684,7 @@ #: src/libaudgui/infowin.cc:417 msgid "_Previous" -msgstr "" +msgstr "_Forrige" #: src/libaudgui/infowin.cc:420 msgid "_Next" @@ -881,7 +881,7 @@ #: src/libaudgui/prefs-window.cc:110 src/libaudqt/info-widget.cc:55 #: src/libaudqt/prefs-window-qt.cc:173 msgid "Description" -msgstr "" +msgstr "Beskrivelse" #: src/libaudgui/prefs-window.cc:113 src/libaudqt/info-widget.cc:64 #: src/libaudqt/prefs-window-qt.cc:176 @@ -1077,15 +1077,15 @@ #: src/libaudgui/prefs-window.cc:273 src/libaudqt/prefs-window-qt.cc:287 msgid "Use SOCKS proxy" -msgstr "" +msgstr "Brug SOCKS-proxy" #: src/libaudgui/prefs-window.cc:275 src/libaudqt/prefs-window-qt.cc:288 msgid "SOCKS v4a" -msgstr "" +msgstr "SOCKS v4a" #: src/libaudgui/prefs-window.cc:279 src/libaudqt/prefs-window-qt.cc:289 msgid "SOCKS v5" -msgstr "" +msgstr "SOCKS v5" #: src/libaudgui/prefs-window.cc:286 src/libaudqt/prefs-window-qt.cc:292 msgid "Auto character encoding detector for:" @@ -1225,7 +1225,7 @@ #: src/libaudgui/prefs-window.cc:366 src/libaudqt/prefs-window-qt.cc:364 msgid "Step forward/backward by:" -msgstr "" +msgstr "Trin fremad/tilbage med:" #: src/libaudgui/prefs-window.cc:368 src/libaudqt/prefs-window-qt.cc:365 msgid "seconds" @@ -1233,11 +1233,11 @@ #: src/libaudgui/prefs-window.cc:369 src/libaudqt/prefs-window-qt.cc:366 msgid "Adjust volume by:" -msgstr "" +msgstr "Juster lydstyrke med:" #: src/libaudgui/prefs-window.cc:371 src/libaudqt/prefs-window-qt.cc:367 msgid "percent" -msgstr "" +msgstr "procent" #: src/libaudgui/prefs-window.cc:388 src/libaudqt/prefs-window-qt.cc:384 msgid "TITLE" @@ -1380,7 +1380,7 @@ #: src/libaudqt/eq-preset-qt.cc:249 msgid "Preset files (*.preset *.eqf *.q1)" -msgstr "" +msgstr "Forhåndsindstillingsfiler (*.preset *.eqf *.q1)" #: src/libaudqt/eq-preset-qt.cc:348 msgid "Close" @@ -1404,11 +1404,11 @@ #: src/libaudqt/font-entry.cc:39 msgid "Set Font" -msgstr "" +msgstr "Angiv skrifttype" #: src/libaudqt/info-widget.cc:44 msgid "<various>" -msgstr "" +msgstr "<various>" #: src/libaudqt/info-widget.cc:47 msgid "Metadata" @@ -1440,23 +1440,23 @@ #: src/libaudqt/info-widget.cc:67 msgid "MusicBrainz ID" -msgstr "" +msgstr "MusicBrainz-id" #: src/libaudqt/infowin-qt.cc:156 msgid "_Revert" -msgstr "" +msgstr "_Fortryd" #: src/libaudqt/infowin-qt.cc:167 msgid "Error writing tag(s)." -msgstr "" +msgstr "Kunne ikke skrive mærker." #: src/libaudqt/infowin-qt.cc:189 msgid "%1 files selected" -msgstr "" +msgstr "%1 filer valgt" #: src/libaudqt/infowin-qt.cc:193 msgid "_Save %1 files" -msgstr "" +msgstr "_Gem %1 filer" #: src/libaudqt/log-inspector.cc:150 msgid "Level" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/po/fi.po new/audacious-4.0.4/po/fi.po --- old/audacious-4.0.3/po/fi.po 2020-04-29 06:25:16.000000000 +0200 +++ new/audacious-4.0.4/po/fi.po 2020-06-01 18:52:06.000000000 +0200 @@ -17,7 +17,7 @@ "Project-Id-Version: Audacious\n" "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"; "POT-Creation-Date: 2020-01-26 13:17+0100\n" -"PO-Revision-Date: 2020-03-24 10:46+0000\n" +"PO-Revision-Date: 2020-05-07 17:08+0000\n" "Last-Translator: Kimmo Kujansuu <[email protected]>\n" "Language-Team: Finnish (http://www.transifex.com/audacious/audacious/language/fi/)\n" "MIME-Version: 1.0\n" @@ -1284,7 +1284,7 @@ #: src/libaudgui/prefs-window.cc:553 src/libaudqt/prefs-window-qt.cc:408 msgid "Custom" -msgstr "Mukautettu..." +msgstr "Mukautettu" #: src/libaudgui/prefs-window.cc:571 src/libaudqt/prefs-window-qt.cc:400 msgid "Title format:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/po/fr.po new/audacious-4.0.4/po/fr.po --- old/audacious-4.0.3/po/fr.po 2020-04-29 06:25:16.000000000 +0200 +++ new/audacious-4.0.4/po/fr.po 2020-06-01 18:52:06.000000000 +0200 @@ -19,7 +19,7 @@ "Project-Id-Version: Audacious\n" "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"; "POT-Creation-Date: 2020-01-26 13:17+0100\n" -"PO-Revision-Date: 2020-02-18 17:05+0000\n" +"PO-Revision-Date: 2020-04-30 18:49+0000\n" "Last-Translator: AO <[email protected]>\n" "Language-Team: French (http://www.transifex.com/audacious/audacious/language/fr/)\n" "MIME-Version: 1.0\n" @@ -154,7 +154,7 @@ #: src/libaudcore/drct.cc:96 msgid "" "Stream recording must be configured in Audio Settings before it can be used." -msgstr "L’enregistrement des flux doit être configuré dans les paramètres audio avant de pouvoir être utilisé." +msgstr "L’enregistrement des flux doit être configuré dans les paramètres du son avant de pouvoir être utilisé." #: src/libaudcore/output.cc:289 msgid "Error opening output stream" @@ -173,7 +173,7 @@ #: src/libaudcore/playback.cc:510 msgid "Invalid audio format" -msgstr "Format audio invalide" +msgstr "Le format son est invalide" #: src/libaudcore/playlist.cc:82 msgid "Now Playing" @@ -827,7 +827,7 @@ #: src/libaudgui/prefs-window.cc:83 src/libaudqt/prefs-window-qt.cc:156 msgid "Audio" -msgstr "Audio" +msgstr "Son" #: src/libaudgui/prefs-window.cc:84 src/libaudqt/prefs-window-qt.cc:157 msgid "Network" @@ -1303,7 +1303,7 @@ #: src/libaudgui/prefs-window.cc:783 src/libaudqt/prefs-window-qt.cc:718 msgid "No audio recording plugin available" -msgstr "Aucun greffon d’enregistrement audio n’est proposé" +msgstr "Aucun greffon d’enregistrement de son n’est proposé" #: src/libaudgui/prefs-window.cc:843 src/libaudqt/prefs-window-qt.cc:593 msgid "Audacious Settings" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/po/pt_BR.po new/audacious-4.0.4/po/pt_BR.po --- old/audacious-4.0.3/po/pt_BR.po 2020-04-29 06:25:16.000000000 +0200 +++ new/audacious-4.0.4/po/pt_BR.po 2020-06-01 18:52:06.000000000 +0200 @@ -11,6 +11,7 @@ # Cleiton Lima <[email protected]>, 2011 # edu engler <[email protected]>, 2012 # F Marcelo O Amarante <[email protected]>, 2015 +# Fúlvio Alves <[email protected]>, 2020 # Habner Costa <[email protected]>, 2013 # Habner Costa <[email protected]>, 2013 # Iuri Suzano <[email protected]>, 2017 @@ -34,8 +35,8 @@ "Project-Id-Version: Audacious\n" "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"; "POT-Creation-Date: 2020-01-26 13:17+0100\n" -"PO-Revision-Date: 2020-01-26 12:21+0000\n" -"Last-Translator: Alexandro Casanova <[email protected]>\n" +"PO-Revision-Date: 2020-05-01 16:16+0000\n" +"Last-Translator: Fúlvio Alves <[email protected]>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/audacious/audacious/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,7 +106,7 @@ #: src/audacious/main.cc:81 msgid "Run in GTK mode" -msgstr "" +msgstr "Executar no modo GTK" #: src/audacious/main.cc:138 #, c-format @@ -215,7 +216,7 @@ #: src/libaudcore/playlist-files.cc:161 src/libaudqt/eq-preset-qt.cc:309 #, c-format msgid "Error saving %s." -msgstr "" +msgstr "Erro ao salvar %s." #: src/libaudcore/playlist-files.cc:167 #, c-format @@ -331,7 +332,7 @@ #: src/libaudgui/eq-preset.cc:153 msgid "Please select one preset to export." -msgstr "" +msgstr "Selecione uma predefinição para exportar." #: src/libaudgui/eq-preset.cc:256 src/libaudgui/eq-preset.cc:261 msgid "Preset File ..." @@ -700,7 +701,7 @@ #: src/libaudgui/infowin.cc:397 msgid "_Auto-fill empty fields" -msgstr "" +msgstr "_Auto-preencher espaços vazios" #: src/libaudgui/infowin.cc:411 src/libaudqt/infowin-qt.cc:183 msgid "_Save" @@ -708,7 +709,7 @@ #: src/libaudgui/infowin.cc:417 msgid "_Previous" -msgstr "" +msgstr "_Anterior" #: src/libaudgui/infowin.cc:420 msgid "_Next" @@ -905,7 +906,7 @@ #: src/libaudgui/prefs-window.cc:110 src/libaudqt/info-widget.cc:55 #: src/libaudqt/prefs-window-qt.cc:173 msgid "Description" -msgstr "" +msgstr "Descrição" #: src/libaudgui/prefs-window.cc:113 src/libaudqt/info-widget.cc:64 #: src/libaudqt/prefs-window-qt.cc:176 @@ -1101,15 +1102,15 @@ #: src/libaudgui/prefs-window.cc:273 src/libaudqt/prefs-window-qt.cc:287 msgid "Use SOCKS proxy" -msgstr "" +msgstr "Usar proxy SOCKS" #: src/libaudgui/prefs-window.cc:275 src/libaudqt/prefs-window-qt.cc:288 msgid "SOCKS v4a" -msgstr "" +msgstr "SOCKS v4a" #: src/libaudgui/prefs-window.cc:279 src/libaudqt/prefs-window-qt.cc:289 msgid "SOCKS v5" -msgstr "" +msgstr "SOCKS v5" #: src/libaudgui/prefs-window.cc:286 src/libaudqt/prefs-window-qt.cc:292 msgid "Auto character encoding detector for:" @@ -1249,7 +1250,7 @@ #: src/libaudgui/prefs-window.cc:366 src/libaudqt/prefs-window-qt.cc:364 msgid "Step forward/backward by:" -msgstr "" +msgstr "Avançar/retroceder por:" #: src/libaudgui/prefs-window.cc:368 src/libaudqt/prefs-window-qt.cc:365 msgid "seconds" @@ -1257,11 +1258,11 @@ #: src/libaudgui/prefs-window.cc:369 src/libaudqt/prefs-window-qt.cc:366 msgid "Adjust volume by:" -msgstr "" +msgstr "Ajustar volume em:" #: src/libaudgui/prefs-window.cc:371 src/libaudqt/prefs-window-qt.cc:367 msgid "percent" -msgstr "" +msgstr "por cento" #: src/libaudgui/prefs-window.cc:388 src/libaudqt/prefs-window-qt.cc:384 msgid "TITLE" @@ -1404,11 +1405,11 @@ #: src/libaudqt/eq-preset-qt.cc:249 msgid "Preset files (*.preset *.eqf *.q1)" -msgstr "" +msgstr "Arquivos de predefinição (*.preset *.eqf *.q1)" #: src/libaudqt/eq-preset-qt.cc:348 msgid "Close" -msgstr "" +msgstr "Fechar" #: src/libaudqt/file-entry.cc:40 msgid "Browse" @@ -1428,11 +1429,11 @@ #: src/libaudqt/font-entry.cc:39 msgid "Set Font" -msgstr "" +msgstr "Definir fonte" #: src/libaudqt/info-widget.cc:44 msgid "<various>" -msgstr "" +msgstr "<various>" #: src/libaudqt/info-widget.cc:47 msgid "Metadata" @@ -1464,23 +1465,23 @@ #: src/libaudqt/info-widget.cc:67 msgid "MusicBrainz ID" -msgstr "" +msgstr "ID do MusicBrainz" #: src/libaudqt/infowin-qt.cc:156 msgid "_Revert" -msgstr "" +msgstr "_Reverter" #: src/libaudqt/infowin-qt.cc:167 msgid "Error writing tag(s)." -msgstr "" +msgstr "Erro ao gravar marcador(es)." #: src/libaudqt/infowin-qt.cc:189 msgid "%1 files selected" -msgstr "" +msgstr "%1 arquivos selecionados" #: src/libaudqt/infowin-qt.cc:193 msgid "_Save %1 files" -msgstr "" +msgstr "_Salvar %1 arquivos" #: src/libaudqt/log-inspector.cc:150 msgid "Level" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/src/libaudqt/treeview.cc new/audacious-4.0.4/src/libaudqt/treeview.cc --- old/audacious-4.0.3/src/libaudqt/treeview.cc 2020-04-29 06:25:16.000000000 +0200 +++ new/audacious-4.0.4/src/libaudqt/treeview.cc 2020-06-01 18:52:06.000000000 +0200 @@ -19,6 +19,7 @@ #include "treeview.h" +#include <QApplication> #include <QKeyEvent> #include <QMouseEvent> #include <QProxyStyle> @@ -41,8 +42,14 @@ class TreeViewStyleOverrides : public QProxyStyle { public: - int styleHint(StyleHint hint, - const QStyleOption * option = nullptr, + TreeViewStyleOverrides() + { + // detect and respond to application-wide style change + connect(qApp->style(), &QObject::destroyed, this, + &TreeViewStyleOverrides::resetBaseStyle); + } + + int styleHint(StyleHint hint, const QStyleOption * option = nullptr, const QWidget * widget = nullptr, QStyleHintReturn * returnData = nullptr) const override { @@ -51,12 +58,20 @@ return QProxyStyle::styleHint(hint, option, widget, returnData); } + +private: + void resetBaseStyle() + { + setBaseStyle(nullptr); + connect(qApp->style(), &QObject::destroyed, this, + &TreeViewStyleOverrides::resetBaseStyle); + } }; EXPORT TreeView::TreeView(QWidget * parent) : QTreeView(parent) { auto style = new TreeViewStyleOverrides; - connect(this, &QObject::destroyed, [style]() { delete style; }); + style->setParent(this); setStyle(style); // activate() is perhaps a bit redundant with activated() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/src/libaudtag/id3/id3v22.cc new/audacious-4.0.4/src/libaudtag/id3/id3v22.cc --- old/audacious-4.0.3/src/libaudtag/id3/id3v22.cc 2020-04-29 06:25:16.000000000 +0200 +++ new/audacious-4.0.4/src/libaudtag/id3/id3v22.cc 2020-06-01 18:52:06.000000000 +0200 @@ -72,7 +72,7 @@ #pragma pack(push) /* must be byte-aligned */ #pragma pack(1) -struct ID3v2Header { +struct ID3v22Header { char magic[3]; unsigned char version; unsigned char revision; @@ -80,7 +80,7 @@ uint32_t size; }; -struct ID3v2FrameHeader { +struct ID3v22FrameHeader { char key[3]; unsigned char size[3]; }; @@ -95,7 +95,7 @@ namespace audtag { -static bool validate_header (ID3v2Header * header) +static bool validate_header (ID3v22Header * header) { if (memcmp (header->magic, "ID3", 3)) return false; @@ -117,20 +117,20 @@ static bool read_header (VFSFile & handle, int * version, bool * syncsafe, int64_t * offset, int * header_size, int * data_size) { - ID3v2Header header; + ID3v22Header header; if (handle.fseek (0, VFS_SEEK_SET)) return false; - if (handle.fread (& header, 1, sizeof (ID3v2Header)) != sizeof - (ID3v2Header)) + if (handle.fread (& header, 1, sizeof (ID3v22Header)) != sizeof + (ID3v22Header)) return false; if (validate_header (& header)) { * offset = 0; * version = header.version; - * header_size = sizeof (ID3v2Header); + * header_size = sizeof (ID3v22Header); * data_size = header.size; } else @@ -147,14 +147,14 @@ static bool read_frame (VFSFile & handle, int max_size, int version, bool syncsafe, int * frame_size, GenericFrame & frame) { - ID3v2FrameHeader header; + ID3v22FrameHeader header; uint32_t hdrsz = 0; - if ((max_size -= sizeof (ID3v2FrameHeader)) < 0) + if ((max_size -= sizeof (ID3v22FrameHeader)) < 0) return false; - if (handle.fread (& header, 1, sizeof (ID3v2FrameHeader)) != sizeof - (ID3v2FrameHeader)) + if (handle.fread (& header, 1, sizeof (ID3v22FrameHeader)) != sizeof + (ID3v22FrameHeader)) return false; if (! header.key[0]) /* padding */ @@ -173,7 +173,7 @@ AUDDBG (" key = %.3s\n", header.key); AUDDBG (" size = %d\n", (int) hdrsz); - * frame_size = sizeof (ID3v2FrameHeader) + hdrsz; + * frame_size = sizeof (ID3v22FrameHeader) + hdrsz; frame.key = String (str_copy (header.key, 3)); frame.clear (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audacious-4.0.3/src/libaudtag/id3/id3v24.cc new/audacious-4.0.4/src/libaudtag/id3/id3v24.cc --- old/audacious-4.0.3/src/libaudtag/id3/id3v24.cc 2020-04-29 06:25:16.000000000 +0200 +++ new/audacious-4.0.4/src/libaudtag/id3/id3v24.cc 2020-06-01 18:52:06.000000000 +0200 @@ -80,7 +80,7 @@ #pragma pack(push) /* must be byte-aligned */ #pragma pack(1) -struct ID3v2Header { +struct ID3v24Header { char magic[3]; unsigned char version; unsigned char revision; @@ -88,7 +88,7 @@ uint32_t size; }; -struct ID3v2FrameHeader { +struct ID3v24FrameHeader { char key[4]; uint32_t size; uint16_t flags; @@ -150,7 +150,7 @@ return true; } -static bool validate_header (ID3v2Header * header, bool is_footer) +static bool validate_header (ID3v24Header * header, bool is_footer) { if (memcmp (header->magic, is_footer ? "3DI" : "ID3", 3)) return false; @@ -175,19 +175,19 @@ syncsafe, int64_t * offset, int * header_size, int * data_size, int * footer_size) { - ID3v2Header header, footer; + ID3v24Header header, footer; if (handle.fseek (0, VFS_SEEK_SET)) return false; - if (handle.fread (& header, 1, sizeof (ID3v2Header)) != sizeof (ID3v2Header)) + if (handle.fread (& header, 1, sizeof (ID3v24Header)) != sizeof (ID3v24Header)) return false; if (validate_header (& header, false)) { * offset = 0; * version = header.version; - * header_size = sizeof (ID3v2Header); + * header_size = sizeof (ID3v24Header); * data_size = header.size; if (header.flags & ID3_HEADER_HAS_FOOTER) @@ -195,16 +195,16 @@ if (handle.fseek (header.size, VFS_SEEK_CUR)) return false; - if (handle.fread (& footer, 1, sizeof (ID3v2Header)) != sizeof (ID3v2Header)) + if (handle.fread (& footer, 1, sizeof (ID3v24Header)) != sizeof (ID3v24Header)) return false; if (! validate_header (& footer, true)) return false; - if (handle.fseek (sizeof (ID3v2Header), VFS_SEEK_SET)) + if (handle.fseek (sizeof (ID3v24Header), VFS_SEEK_SET)) return false; - * footer_size = sizeof (ID3v2Header); + * footer_size = sizeof (ID3v24Header); } else * footer_size = 0; @@ -216,26 +216,26 @@ if (end < 0) return false; - if (handle.fseek (end - sizeof (ID3v2Header), VFS_SEEK_SET)) + if (handle.fseek (end - sizeof (ID3v24Header), VFS_SEEK_SET)) return false; - if (handle.fread (& footer, 1, sizeof (ID3v2Header)) != sizeof (ID3v2Header)) + if (handle.fread (& footer, 1, sizeof (ID3v24Header)) != sizeof (ID3v24Header)) return false; if (! validate_header (& footer, true)) return false; - * offset = end - 2 * sizeof (ID3v2Header) - footer.size; + * offset = end - 2 * sizeof (ID3v24Header) - footer.size; * version = footer.version; - * header_size = sizeof (ID3v2Header); + * header_size = sizeof (ID3v24Header); * data_size = footer.size; - * footer_size = sizeof (ID3v2Header); + * footer_size = sizeof (ID3v24Header); if (handle.fseek (* offset, VFS_SEEK_SET)) return false; - if (handle.fread (& header, 1, sizeof (ID3v2Header)) != sizeof - (ID3v2Header)) + if (handle.fread (& header, 1, sizeof (ID3v24Header)) != sizeof + (ID3v24Header)) return false; if (! validate_header (& header, false)) @@ -312,14 +312,14 @@ static bool read_frame (const char * data, int max_size, int version, int * frame_size, GenericFrame & frame) { - ID3v2FrameHeader header; + ID3v24FrameHeader header; unsigned skip = 0; - if ((max_size -= sizeof (ID3v2FrameHeader)) < 0) + if ((max_size -= sizeof (ID3v24FrameHeader)) < 0) return false; - memcpy (& header, data, sizeof (ID3v2FrameHeader)); - data += sizeof (ID3v2FrameHeader); + memcpy (& header, data, sizeof (ID3v24FrameHeader)); + data += sizeof (ID3v24FrameHeader); if (! header.key[0]) /* padding */ return false; @@ -349,7 +349,7 @@ if (skip >= header.size) return false; - * frame_size = sizeof (ID3v2FrameHeader) + header.size; + * frame_size = sizeof (ID3v24FrameHeader) + header.size; frame.key = String (str_copy (header.key, 4)); frame.clear (); @@ -386,7 +386,7 @@ { AUDDBG ("Writing frame %s, size %d\n", (const char *) frame.key, frame.len ()); - ID3v2FrameHeader header; + ID3v24FrameHeader header; strncpy (header.key, frame.key, 4); @@ -397,13 +397,13 @@ header.size = TO_BE32 (size); header.flags = 0; - if (file.fwrite (& header, 1, sizeof (ID3v2FrameHeader)) != sizeof (ID3v2FrameHeader)) + if (file.fwrite (& header, 1, sizeof (ID3v24FrameHeader)) != sizeof (ID3v24FrameHeader)) return false; if (file.fwrite (& frame[0], 1, frame.len ()) != frame.len ()) return false; - * frame_size = sizeof (ID3v2FrameHeader) + frame.len (); + * frame_size = sizeof (ID3v24FrameHeader) + frame.len (); return true; } @@ -427,7 +427,7 @@ static bool write_header (VFSFile & file, int version, int size) { - ID3v2Header header; + ID3v24Header header; memcpy (header.magic, "ID3", 3); header.version = version; @@ -435,7 +435,7 @@ header.flags = 0; header.size = TO_BE32 (syncsafe32 (size)); - return file.fwrite (& header, 1, sizeof (ID3v2Header)) == sizeof (ID3v2Header); + return file.fwrite (& header, 1, sizeof (ID3v24Header)) == sizeof (ID3v24Header); } static int get_frame_id (const char * key)
