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

clementine: bump git commit

Browse Source
This commit is contained in:
Jerome Duval
2020-10-21 20:02:52 +02:00
parent 510a4c43e8
commit 1e7290d074
2 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media-sound/clementine/clementine-1.4.0~git.recipe
View File

@@ -31,10 +31,10 @@ Queue manager."
HOMEPAGE="https://www.clementine-player.org/"
COPYRIGHT="2010-2020 David Sansome, John Maguire, Arnaud Bienner"
LICENSE="GNU GPL v3"
REVISION="2"
srcGitRev="934fd336da6a72963b6e67c1ef3eaef2a1092b1c"
REVISION="3"
srcGitRev="fc4cb6fc7a71695beef3c30a25fe78c4aabc6017"
SOURCE_URI="https://github.com/clementine-player/Clementine/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="66d27019417d9fa3ce3aa6398f634889b2bbc12f8872ca901911bb5c660fdc35"
CHECKSUM_SHA256="79628e500f37f92539fa522e265bf40bf54da2cdb243589992ad681536f0c86e"
SOURCE_DIR="Clementine-$srcGitRev"
PATCHES="clementine-$portVersion.patchset"
ADDITIONAL_FILES="clementine.rdef.in"

90
media-sound/clementine/patches/clementine-1.4.0~git.patchset
View File

@@ -1,11 +1,11 @@
From 53fb223400241e93c07a1e2277b0880b6324b58b Mon Sep 17 00:00:00 2001
From 8f82aac3616133df4c550270ffa3f23e1697e53c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 19 Apr 2020 15:30:42 +1000
Subject: Fix build for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15cc4d3..904ad43 100644
index 600dc6e..e414a18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ find_package(PkgConfig REQUIRED)
@@ -17,7 +17,7 @@ index 15cc4d3..904ad43 100644
find_package(X11)
endif()
if(X11_FOUND)
@@ -397,6 +397,7 @@ if(NOT QTIOCOMPRESSOR_INCLUDE_DIRS OR NOT QTIOCOMPRESSOR_LIBRARIES)
@@ -398,6 +398,7 @@ if(NOT QTIOCOMPRESSOR_INCLUDE_DIRS OR NOT QTIOCOMPRESSOR_LIBRARIES)
set(QTIOCOMPRESSOR_LIBRARIES qtiocompressor)
endif(NOT QTIOCOMPRESSOR_INCLUDE_DIRS OR NOT QTIOCOMPRESSOR_LIBRARIES)
@@ -25,7 +25,7 @@ index 15cc4d3..904ad43 100644
# When/if upstream accepts our or reimplement our patches then these options can be
# used to link to system installed qxt instead.
option(USE_SYSTEM_QXT "Don't set this option unless your system Qxt library has been compiled with the Clementine patches in 3rdparty" OFF)
@@ -414,6 +415,7 @@ else (USE_SYSTEM_QXT)
@@ -415,6 +416,7 @@ else (USE_SYSTEM_QXT)
add_subdirectory(3rdparty/qxt)
endif (NOT APPLE)
endif (USE_SYSTEM_QXT)
@@ -34,7 +34,7 @@ index 15cc4d3..904ad43 100644
# Use system gmock if it's available
# We need to look for both gmock and gtest
diff --git a/data/data.qrc b/data/data.qrc
index f7fff7c..a8fd056 100644
index 757a575..a6b0a8b 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -102,6 +102,9 @@
@@ -47,7 +47,7 @@ index f7fff7c..a8fd056 100644
<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 @@
@@ -188,6 +191,9 @@
<file>icons/32x32/x-clementine-artist.png</file>
<file>icons/32x32/x-clementine-shuffle.png</file>
<file>icons/32x32/zoom-in.png</file>
@@ -57,7 +57,7 @@ index f7fff7c..a8fd056 100644
<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 @@
@@ -269,6 +275,9 @@
<file>icons/48x48/x-clementine-artist.png</file>
<file>icons/48x48/x-clementine-shuffle.png</file>
<file>icons/48x48/zoom-in.png</file>
@@ -140,10 +140,10 @@ index 0000000..fcdd6f2
+view-media-playlist.png
\ No newline at end of file
diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
index 1a1269a..089a158 100644
index 8012c0c..89b6ab2 100644
--- a/ext/libclementine-common/core/logging.cpp
+++ b/ext/libclementine-common/core/logging.cpp
@@ -313,7 +313,7 @@ QString DemangleSymbol(const QString& symbol) {
@@ -315,7 +315,7 @@ QString DemangleSymbol(const QString& symbol) {
}
void DumpStackTrace() {
@@ -153,10 +153,10 @@ index 1a1269a..089a158 100644
int callstack_size =
backtrace(reinterpret_cast<void**>(&callstack), sizeof(callstack));
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ecea33..803d4a6 100644
index 627b2e7..eb4e239 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -906,6 +906,14 @@ optional_source(WIN32
@@ -912,6 +912,14 @@ optional_source(WIN32
${CMAKE_SOURCE_DIR}/3rdparty/tinysvcmdns
)
@@ -171,7 +171,7 @@ index 0ecea33..803d4a6 100644
# Platform specific - X11
optional_source(HAVE_X11 SOURCES widgets/osd_x11.cpp)
@@ -1373,7 +1381,7 @@ if (WIN32)
@@ -1379,7 +1387,7 @@ if (WIN32)
)
endif (WIN32)
@@ -194,20 +194,18 @@ index 2e6ac60..9ac5b59 100644
if (version < kVersion) {
diff --git a/src/core/qxtglobalshortcutbackend.cpp b/src/core/qxtglobalshortcutbackend.cpp
index 6c87860..7420929 100644
index 1acd08a..44ef7b3 100644
--- a/src/core/qxtglobalshortcutbackend.cpp
+++ b/src/core/qxtglobalshortcutbackend.cpp
@@ -19,7 +19,9 @@
@@ -25,12 +25,15 @@
#include "core/logging.h"
#include "globalshortcuts.h"
#include "qxtglobalshortcutbackend.h"
+#ifndef Q_OS_HAIKU
#include "qxtglobalshortcut.h"
+#endif
#include "core/logging.h"
#include <QAction>
@@ -30,6 +32,7 @@ QxtGlobalShortcutBackend::QxtGlobalShortcutBackend(GlobalShortcuts* parent)
QxtGlobalShortcutBackend::QxtGlobalShortcutBackend(GlobalShortcuts* parent)
: GlobalShortcutBackend(parent) {}
bool QxtGlobalShortcutBackend::DoRegister() {
@@ -215,7 +213,7 @@ index 6c87860..7420929 100644
if (QGuiApplication::platformName() == "wayland") {
qLog(Warning) << "No support for Wayland in qxt.";
return false;
@@ -39,19 +42,23 @@ bool QxtGlobalShortcutBackend::DoRegister() {
@@ -40,19 +43,23 @@ bool QxtGlobalShortcutBackend::DoRegister() {
manager_->shortcuts().values()) {
AddShortcut(shortcut.action);
}
@@ -241,10 +239,10 @@ index 6c87860..7420929 100644
+#endif
}
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 03a7966..6cbd6b3 100644
index ddbdb53..d0b97a9 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -349,6 +349,9 @@ QString GetConfigPath(ConfigPath config) {
@@ -350,6 +350,9 @@ QString GetConfigPath(ConfigPath config) {
#ifdef Q_OS_DARWIN
return mac::GetApplicationSupportPath() + "/" +
QCoreApplication::organizationName();
@@ -254,7 +252,7 @@ index 03a7966..6cbd6b3 100644
#else
return QString("%1/%2").arg(
QStandardPaths::writableLocation(QStandardPaths::ConfigLocation),
@@ -360,7 +363,7 @@ QString GetConfigPath(ConfigPath config) {
@@ -361,7 +364,7 @@ QString GetConfigPath(ConfigPath config) {
if (Application::kIsPortable) {
return GetConfigPath(Path_Root) + "/cache";
}
@@ -264,7 +262,7 @@ index 03a7966..6cbd6b3 100644
QStandardPaths::GenericCacheLocation),
QCoreApplication::organizationName());
diff --git a/src/library/librarysettingspage.cpp b/src/library/librarysettingspage.cpp
index afb73df..763fb11 100644
index 91a8614..3ca9eee 100644
--- a/src/library/librarysettingspage.cpp
+++ b/src/library/librarysettingspage.cpp
@@ -132,7 +132,7 @@ void LibrarySettingsPage::Load() {
@@ -274,13 +272,13 @@ index afb73df..763fb11 100644
- ui_->monitor->setChecked(s.value("monitor", true).toBool());
+ ui_->monitor->setChecked(s.value("monitor", false).toBool());
QStringList filters =
s.value("cover_art_patterns", QStringList() << "front"
QStringList filters = s.value("cover_art_patterns", QStringList() << "front"
<< "cover")
diff --git a/src/main.cpp b/src/main.cpp
index 6b59169..909bdce 100644
index ec1e1f0..05fc675 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -460,5 +460,9 @@ int main(int argc, char* argv[]) {
@@ -462,5 +462,9 @@ int main(int argc, char* argv[]) {
int ret = a.exec();
@@ -291,7 +289,7 @@ index 6b59169..909bdce 100644
return ret;
}
diff --git a/src/ui/appearancesettingspage.cpp b/src/ui/appearancesettingspage.cpp
index 8cffb45..befbbca 100644
index 9f99f20..72af21d 100644
--- a/src/ui/appearancesettingspage.cpp
+++ b/src/ui/appearancesettingspage.cpp
@@ -108,7 +108,11 @@ void AppearanceSettingsPage::Load() {
@@ -303,15 +301,15 @@ index 8cffb45..befbbca 100644
+#else
ui_->b_use_sys_icons->setChecked(s.value("b_use_sys_icons", false).toBool());
+#endif
ui_->b_hide_filter_toolbar->setChecked(s.value("b_hide_filter_toolbar",false).toBool());
ui_->b_hide_filter_toolbar->setChecked(
s.value("b_hide_filter_toolbar", false).toBool());
s.endGroup();
diff --git a/src/ui/iconloader.cpp b/src/ui/iconloader.cpp
index f691504..857af19 100644
index 8508e02..5c51a65 100644
--- a/src/ui/iconloader.cpp
+++ b/src/ui/iconloader.cpp
@@ -38,7 +38,11 @@ void IconLoader::Init() {
icon_sub_path_ << "/icons" << "/providers" << "/last.fm" << "";
@@ -42,7 +42,11 @@ void IconLoader::Init() {
<< "";
QSettings settings;
settings.beginGroup(Appearance::kSettingsGroup);
+#ifdef Q_OS_HAIKU
@@ -323,10 +321,10 @@ index f691504..857af19 100644
QIcon IconLoader::Load(const QString& name, const IconType& icontype) {
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index ddf4a84..048057c 100644
index 7f72f32..08c5a80 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -266,13 +266,13 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
@@ -268,13 +268,13 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
IconLoader::Load("folder-sound", IconLoader::Base),
tr("Library"));
ui_->tabs->addTab(file_view_,
@@ -343,7 +341,7 @@ index ddf4a84..048057c 100644
tr("Internet"));
ui_->tabs->addTab(
device_view_container_,
@@ -387,8 +387,8 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
@@ -389,8 +389,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));
@@ -354,7 +352,7 @@ index ddf4a84..048057c 100644
ui_->action_hypnotoad->setIcon(
IconLoader::Load("hypnotoad", IconLoader::Base));
ui_->action_kittens->setIcon(IconLoader::Load("kittens", IconLoader::Base));
@@ -484,7 +484,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
@@ -486,7 +486,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
connect(ui_->action_view_stream_details, SIGNAL(triggered()),
SLOT(DiscoverStreamDetails()));
@@ -364,7 +362,7 @@ index ddf4a84..048057c 100644
background_streams_->AddAction("Make it so!", ui_->action_enterprise);
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index fce8c3f..d240c07 100644
index bef7b14..0faf4dc 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -532,7 +532,6 @@
@@ -375,7 +373,7 @@ index fce8c3f..d240c07 100644
<addaction name="action_hypnotoad"/>
<addaction name="action_enterprise"/>
<addaction name="action_kittens"/>
@@ -725,14 +724,6 @@
@@ -726,14 +725,6 @@
<string>Cover Manager</string>
</property>
</action>
@@ -391,10 +389,10 @@ index fce8c3f..d240c07 100644
<property name="checkable">
<bool>true</bool>
diff --git a/src/ui/notificationssettingspage.cpp b/src/ui/notificationssettingspage.cpp
index c04dcb3..3b5108b 100644
index 75733d3..5fca7e0 100644
--- a/src/ui/notificationssettingspage.cpp
+++ b/src/ui/notificationssettingspage.cpp
@@ -98,7 +98,9 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog)
@@ -99,7 +99,9 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog)
if (!OSD::SupportsNativeNotifications())
ui_->notifications_native->setEnabled(false);
if (!OSD::SupportsTrayPopups()) ui_->notifications_tray->setEnabled(false);
@@ -405,7 +403,7 @@ index c04dcb3..3b5108b 100644
connect(ui_->notifications_pretty, SIGNAL(toggled(bool)),
SLOT(UpdatePopupVisible()));
@@ -126,7 +128,11 @@ void NotificationsSettingsPage::Load() {
@@ -135,7 +137,11 @@ void NotificationsSettingsPage::Load() {
s.beginGroup(OSD::kSettingsGroup);
OSD::Behaviour osd_behaviour =
@@ -417,7 +415,7 @@ index c04dcb3..3b5108b 100644
switch (osd_behaviour) {
case OSD::Native:
if (OSD::SupportsNativeNotifications()) {
@@ -171,6 +177,11 @@ void NotificationsSettingsPage::Load() {
@@ -180,6 +186,11 @@ void NotificationsSettingsPage::Load() {
ui_->notifications_pretty->isChecked());
#endif
@@ -430,10 +428,10 @@ index c04dcb3..3b5108b 100644
pretty_popup_->ReloadSettings();
ui_->notifications_opacity->setValue(pretty_popup_->background_opacity() *
diff --git a/src/widgets/osd.cpp b/src/widgets/osd.cpp
index 7cd74df..5e366e0 100644
index 5cdea66..064bce7 100644
--- a/src/widgets/osd.cpp
+++ b/src/widgets/osd.cpp
@@ -64,7 +64,11 @@ OSD::~OSD() { delete pretty_popup_; }
@@ -65,7 +65,11 @@ OSD::~OSD() { delete pretty_popup_; }
void OSD::ReloadSettings() {
QSettings s;
s.beginGroup(kSettingsGroup);
@@ -446,5 +444,5 @@ index 7cd74df..5e366e0 100644
show_on_volume_change_ = s.value("ShowOnVolumeChange", false).toBool();
show_art_ = s.value("ShowArt", true).toBool();
--
2.26.0
2.28.0