haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clementine: fixes

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-02-24 20:39:54 +10:00
parent 42ed6bfd12
commit df1394b78e
2 changed files with 231 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-sound/clementine/clementine-1.3.1~git.recipe
View File

@@ -31,7 +31,7 @@ Queue manager."
HOMEPAGE="https://www.clementine-player.org/"
COPYRIGHT="2010-2019 David Sansome, John Maguire, Arnaud Bienner"
LICENSE="GNU GPL v3"
REVISION="1"
REVISION="2"
srcGitRev="36cc5b82f4daf5c2d4e93dc8072665e5a3ca622b"
SOURCE_URI="https://github.com/clementine-player/Clementine/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="d7f4ee2564fc045dd446226cff02032ba18b9030ad00ba670e484bc9612e7434"

235
media-sound/clementine/patches/clementine-1.3.1~git.patchset
View File

@@ -1,4 +1,4 @@
From 42e2e54e9cfc5dd3f2007256ff679278a97a1847 Mon Sep 17 00:00:00 2001
From ae3f5bacdd7f44e83859c44c9bf4fd7a32c84667 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 24 Feb 2019 14:47:42 +1000
Subject: Fix build for Haiku
@@ -95,7 +95,7 @@ index 0ee7a8f..88e6f7c 100644
2.19.1
From 207f5027997897cda2b0c1eba92e71f2c9899a87 Mon Sep 17 00:00:00 2001
From b7331379b00e2dc988a735747ec7bce72bb0e061 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 24 Feb 2019 15:11:18 +1000
Subject: Disable qxt and x11
@@ -134,7 +134,7 @@ index 657efdb..abda86b 100644
2.19.1
From edd7d6fdc02d45a998cafd84a8a0927df1e6d47a Mon Sep 17 00:00:00 2001
From 98f936fd4b23bd08a30d2d1df8b93e9770f7024b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 24 Feb 2019 16:01:04 +1000
Subject: disable backtrace_symbols for haiku
@@ -157,7 +157,7 @@ index 9aa1319..e148298 100644
2.19.1
From 137ec8ac22ca7a7a6c5797fddd4c8a9b36bba95f Mon Sep 17 00:00:00 2001
From 0beeef3aaf72db942a4d5b213e13f4a73efce48e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 24 Feb 2019 16:36:40 +1000
Subject: Fix settings paths
@@ -190,7 +190,7 @@ index fe106e2..58a80b9 100644
2.19.1
From a5588095c9fc11c4d67606c9817bcaaad1aee6e3 Mon Sep 17 00:00:00 2001
From e30e22a1c4a3f20e65b2970b6ae9105d39496283 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 24 Feb 2019 17:39:21 +1000
Subject: Tune default settings for Haiku
@@ -299,3 +299,228 @@ index 77178a1..f5ec09c 100644
--
2.19.1
From e5c4462abe4bed169c5895cab46df9bc176a9506 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 24 Feb 2019 19:20:23 +1000
Subject: Don't use action icons for side panel
diff --git a/data/icons/22x22/folder-network.png b/data/icons/22x22/folder-network.png
new file mode 120000
index 0000000..b2eb970
--- /dev/null
+++ b/data/icons/22x22/folder-network.png
@@ -0,0 +1 @@
+applications-internet.png
\ No newline at end of file
diff --git a/data/icons/22x22/folder-open.png b/data/icons/22x22/folder-open.png
new file mode 120000
index 0000000..f58170c
--- /dev/null
+++ b/data/icons/22x22/folder-open.png
@@ -0,0 +1 @@
+document-open.png
\ No newline at end of file
diff --git a/data/icons/22x22/folder-text.png b/data/icons/22x22/folder-text.png
new file mode 120000
index 0000000..fcdd6f2
--- /dev/null
+++ b/data/icons/22x22/folder-text.png
@@ -0,0 +1 @@
+view-media-playlist.png
\ No newline at end of file
diff --git a/data/icons/32x32/folder-network.png b/data/icons/32x32/folder-network.png
new file mode 120000
index 0000000..b2eb970
--- /dev/null
+++ b/data/icons/32x32/folder-network.png
@@ -0,0 +1 @@
+applications-internet.png
\ No newline at end of file
diff --git a/data/icons/32x32/folder-open.png b/data/icons/32x32/folder-open.png
new file mode 120000
index 0000000..f58170c
--- /dev/null
+++ b/data/icons/32x32/folder-open.png
@@ -0,0 +1 @@
+document-open.png
\ No newline at end of file
diff --git a/data/icons/32x32/folder-text.png b/data/icons/32x32/folder-text.png
new file mode 120000
index 0000000..fcdd6f2
--- /dev/null
+++ b/data/icons/32x32/folder-text.png
@@ -0,0 +1 @@
+view-media-playlist.png
\ No newline at end of file
diff --git a/data/icons/48x48/folder-network.png b/data/icons/48x48/folder-network.png
new file mode 120000
index 0000000..b2eb970
--- /dev/null
+++ b/data/icons/48x48/folder-network.png
@@ -0,0 +1 @@
+applications-internet.png
\ No newline at end of file
diff --git a/data/icons/48x48/folder-open.png b/data/icons/48x48/folder-open.png
new file mode 120000
index 0000000..f58170c
--- /dev/null
+++ b/data/icons/48x48/folder-open.png
@@ -0,0 +1 @@
+document-open.png
\ No newline at end of file
diff --git a/data/icons/48x48/folder-text.png b/data/icons/48x48/folder-text.png
new file mode 120000
index 0000000..fcdd6f2
--- /dev/null
+++ b/data/icons/48x48/folder-text.png
@@ -0,0 +1 @@
+view-media-playlist.png
\ No newline at end of file
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 2944d46..3f116b9 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -266,13 +266,13 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
IconLoader::Load("folder-sound", IconLoader::Base),
tr("Library"));
ui_->tabs->addTab(file_view_,
- IconLoader::Load("document-open", IconLoader::Base),
+ IconLoader::Load("folder-open", IconLoader::Base),
tr("Files"));
ui_->tabs->addTab(playlist_list_,
- IconLoader::Load("view-media-playlist", IconLoader::Base),
+ IconLoader::Load("folder-text", IconLoader::Base),
tr("Playlists"));
ui_->tabs->addTab(internet_view_,
- IconLoader::Load("applications-internet", IconLoader::Base),
+ IconLoader::Load("folder-network", IconLoader::Base),
tr("Internet"));
ui_->tabs->addTab(
device_view_container_,
--
2.19.1
From bc85872b90a93ed0c5a51b1d9d361952e93956bc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 24 Feb 2019 19:38:26 +1000
Subject: Add icon aliases to resource
diff --git a/data/data.qrc b/data/data.qrc
index f7fff7c..a8fd056 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -102,6 +102,9 @@
<file>icons/22x22/x-clementine-artist.png</file>
<file>icons/22x22/x-clementine-shuffle.png</file>
<file>icons/22x22/zoom-in.png</file>
+ <file>icons/22x22/folder-network.png</file>
+ <file>icons/22x22/folder-open.png</file>
+ <file>icons/22x22/folder-text.png</file>
<file>icons/32x32/application-exit.png</file>
<file>icons/32x32/applications-internet.png</file>
<file>icons/32x32/audio-volume-medium.png</file>
@@ -186,6 +189,9 @@
<file>icons/32x32/x-clementine-artist.png</file>
<file>icons/32x32/x-clementine-shuffle.png</file>
<file>icons/32x32/zoom-in.png</file>
+ <file>icons/32x32/folder-network.png</file>
+ <file>icons/32x32/folder-open.png</file>
+ <file>icons/32x32/folder-text.png</file>
<file>icons/48x48/application-exit.png</file>
<file>icons/48x48/applications-internet.png</file>
<file>icons/48x48/audio-volume-medium.png</file>
@@ -267,6 +273,9 @@
<file>icons/48x48/x-clementine-artist.png</file>
<file>icons/48x48/x-clementine-shuffle.png</file>
<file>icons/48x48/zoom-in.png</file>
+ <file>icons/48x48/folder-network.png</file>
+ <file>icons/48x48/folder-open.png</file>
+ <file>icons/48x48/folder-text.png</file>
<file>last.fm/as_disabled.png</file>
<file>last.fm/as_light.png</file>
<file>last.fm/as.png</file>
--
2.19.1
From effac414d78c55c803e889b7ecc89fb2b32cee11 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 24 Feb 2019 19:40:32 +1000
Subject: Remove broken background stream
diff --git a/src/core/backgroundstreams.cpp b/src/core/backgroundstreams.cpp
index 2e6ac60..9ac5b59 100644
--- a/src/core/backgroundstreams.cpp
+++ b/src/core/backgroundstreams.cpp
@@ -44,7 +44,7 @@ void BackgroundStreams::LoadStreams() {
int version = s.value("version", 0).toInt();
if (version < 1) {
AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl));
- AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl));
+// AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl));
}
if (version < kVersion) {
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 3f116b9..a2c8e74 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -482,7 +482,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
connect(ui_->action_view_stream_details, SIGNAL(triggered()),
SLOT(DiscoverStreamDetails()));
- background_streams_->AddAction("Rain", ui_->action_rain);
+// background_streams_->AddAction("Rain", ui_->action_rain);
background_streams_->AddAction("Hypnotoad", ui_->action_hypnotoad);
background_streams_->AddAction("Make it so!", ui_->action_enterprise);
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index a2c8e74..68e2395 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -385,8 +385,8 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
IconLoader::Load("document-save", IconLoader::Base));
ui_->action_full_library_scan->setIcon(
IconLoader::Load("view-refresh", IconLoader::Base));
- ui_->action_rain->setIcon(
- IconLoader::Load("weather-showers-scattered", IconLoader::Base));
+// ui_->action_rain->setIcon(
+// IconLoader::Load("weather-showers-scattered", IconLoader::Base));
ui_->action_hypnotoad->setIcon(
IconLoader::Load("hypnotoad", IconLoader::Base));
ui_->action_kittens->setIcon(IconLoader::Load("kittens", IconLoader::Base));
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index fce8c3f..d240c07 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -532,7 +532,6 @@
<property name="title">
<string>&amp;Extras</string>
</property>
- <addaction name="action_rain"/>
<addaction name="action_hypnotoad"/>
<addaction name="action_enterprise"/>
<addaction name="action_kittens"/>
@@ -725,14 +724,6 @@
<string>Cover Manager</string>
</property>
</action>
- <action name="action_rain">
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="text">
- <string comment="Label for button to enable/disable rain background sound.">Rain</string>
- </property>
- </action>
<action name="action_hypnotoad">
<property name="checkable">
<bool>true</bool>
--
2.19.1