diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2022-01-02 11:40:38 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2022-01-02 12:56:11 +0100 |
| commit | 881ddcd4fb474299c68b78d3d32ec825a567ba09 (patch) | |
| tree | 36cec34e673832a411820e204bb04fc6254e0779 | |
| parent | 562f7b0da1b35a4dbd1f6b402a78ca321a033cde (diff) | |
Refresh patches
| -rw-r--r-- | debian/patches/add-keywords.patch | 13 | ||||
| -rw-r--r-- | debian/patches/default-to-gtk.patch | 52 |
2 files changed, 27 insertions, 38 deletions
diff --git a/debian/patches/add-keywords.patch b/debian/patches/add-keywords.patch index e0a726a..f9ac0d9 100644 --- a/debian/patches/add-keywords.patch +++ b/debian/patches/add-keywords.patch @@ -1,9 +1,16 @@ -Description: Add keywords to desktop file -Author: Mateusz Łukasik <mati75@linuxmint.pl> +From: Mateusz Łukasik <mati75@linuxmint.pl> +Date: Sat Feb 6 14:29:14 2016 +0100 +Subject: Add keywords to desktop file +--- + audacious.desktop | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/audacious.desktop b/audacious.desktop +index efdba75..4e50f03 100644 --- a/audacious.desktop +++ b/audacious.desktop -@@ -5,7 +5,8 @@ +@@ -5,7 +5,8 @@ Name=Audacious GenericName=Music Player Comment=Listen to music Icon=audacious diff --git a/debian/patches/default-to-gtk.patch b/debian/patches/default-to-gtk.patch index c18504b..9b7af4d 100644 --- a/debian/patches/default-to-gtk.patch +++ b/debian/patches/default-to-gtk.patch @@ -1,39 +1,21 @@ From: Andrej Shadura <andrewsh@debian.org> +Date: Sun, 2 Jan 2022 11:29:52 +0100 Subject: Default to the GTK interface, not Qt ---- a/src/audacious/main.cc -+++ b/src/audacious/main.cc -@@ -50,6 +50,7 @@ - int mainwin, show_jump_box; - int headless, quit_after_play; - int verbose; -+ int qt; - int gtk; - } options; - -@@ -78,6 +79,7 @@ - {"quit-after-play", 'q', & options.quit_after_play, N_("Quit on playback stop")}, - {"verbose", 'V', & options.verbose, N_("Print debugging messages (may be used twice)")}, - #if defined(USE_QT) && defined(USE_GTK) -+ {"qt", 'Q', & options.qt, N_("Run in Qt mode")}, - {"gtk", 'G', & options.gtk, N_("Run in GTK mode")}, - #endif - }; -@@ -171,8 +173,16 @@ - else if (options.verbose) - audlog::set_stderr_level (audlog::Info); - -- if (options.gtk) -+ if (options.qt && options.gtk) { -+ fprintf (stderr, _("Conflicting options: --gtk and --qt\n")); -+ return false; -+ } -+ -+ if (options.qt) { -+ aud_set_mainloop_type (MainloopType::Qt); -+ } else { - aud_set_mainloop_type (MainloopType::GLib); -+ } +--- + src/libaudcore/config.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libaudcore/config.cc b/src/libaudcore/config.cc +index d51bd32..b87bd84 100644 +--- a/src/libaudcore/config.cc ++++ b/src/libaudcore/config.cc +@@ -42,7 +42,7 @@ static const char * const core_defaults[] = { + "recurse_folders", "TRUE", + "resume_playback_on_startup", "TRUE", + "show_interface", "TRUE", +- "use_qt", "TRUE", ++ "use_qt", "FALSE", - return true; - } + /* equalizer */ + "eqpreset_default_file", "", |