mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
QMplay2: bump version (#7094)
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
From b8f87b0bf8795dbf815311f825a7f9f6ca5f42ff Mon Sep 17 00:00:00 2001
|
||||
From 9c947695bfc6c9730c073f4a779ffb578245068f Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 18 Dec 2021 21:36:25 +1000
|
||||
Subject: Add haiku support
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 210b1fa..7cfa9ee 100644
|
||||
index 16272aa..6bea14a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -78,6 +78,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
@@ -37,7 +37,7 @@ index 210b1fa..7cfa9ee 100644
|
||||
add_feature_info(MPRIS2 USE_MPRIS2 "Build Extensions with MPRIS2 support")
|
||||
endif()
|
||||
diff --git a/src/gui/Main.cpp b/src/gui/Main.cpp
|
||||
index 1360cba..73d4cd8 100644
|
||||
index 446ae6f..3c8dd2e 100644
|
||||
--- a/src/gui/Main.cpp
|
||||
+++ b/src/gui/Main.cpp
|
||||
@@ -606,6 +606,10 @@ int main(int argc, char *argv[])
|
||||
@@ -60,7 +60,7 @@ index 1360cba..73d4cd8 100644
|
||||
sharePath = QCoreApplication::applicationDirPath() + "/../share/qmplay2";
|
||||
libPath = QMPlay2CoreClass::getLibDir();
|
||||
if (libPath.isEmpty() || !QDir(libPath).exists("qmplay2"))
|
||||
@@ -913,5 +917,9 @@ int main(int argc, char *argv[])
|
||||
@@ -918,5 +922,9 @@ int main(int argc, char *argv[])
|
||||
if (canDeleteApp)
|
||||
#endif
|
||||
delete qApp;
|
||||
@@ -71,7 +71,7 @@ index 1360cba..73d4cd8 100644
|
||||
return 0;
|
||||
}
|
||||
diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp
|
||||
index 7aa180a..a50e01c 100644
|
||||
index 796b97d..13e40ec 100644
|
||||
--- a/src/gui/MainWidget.cpp
|
||||
+++ b/src/gui/MainWidget.cpp
|
||||
@@ -150,7 +150,7 @@ MainWidget::MainWidget(QList<QPair<QString, QString>> &arguments)
|
||||
@@ -84,7 +84,7 @@ index 7aa180a..a50e01c 100644
|
||||
#else
|
||||
settings.init("MainWidget/WidgetsLocked", true);
|
||||
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
|
||||
index 832b774..216e162 100644
|
||||
index f2f2ddd..df9076d 100644
|
||||
--- a/src/modules/CMakeLists.txt
|
||||
+++ b/src/modules/CMakeLists.txt
|
||||
@@ -7,6 +7,9 @@ if(WIN32)
|
||||
@@ -733,7 +733,7 @@ index 0000000..24b4ebd
|
||||
+ <file alias="MediaKit">MediaKit.png</file>
|
||||
+</qresource></RCC>
|
||||
diff --git a/src/qmplay2/IPC_Unix.cpp b/src/qmplay2/IPC_Unix.cpp
|
||||
index bac1b16..2bc3175 100644
|
||||
index 0ee330e..dac6bc3 100644
|
||||
--- a/src/qmplay2/IPC_Unix.cpp
|
||||
+++ b/src/qmplay2/IPC_Unix.cpp
|
||||
@@ -98,7 +98,7 @@ bool IPCSocket::open(QIODevice::OpenMode mode)
|
||||
@@ -746,7 +746,7 @@ index bac1b16..2bc3175 100644
|
||||
m_priv->socketNotifier = new QSocketNotifier(m_priv->fd, QSocketNotifier::Read, this);
|
||||
connect(m_priv->socketNotifier, SIGNAL(activated(int)), this, SLOT(socketReadActive()));
|
||||
diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp
|
||||
index 5cf15b9..aacaade 100644
|
||||
index 78f8700..10ae577 100644
|
||||
--- a/src/qmplay2/QMPlay2Core.cpp
|
||||
+++ b/src/qmplay2/QMPlay2Core.cpp
|
||||
@@ -45,7 +45,7 @@
|
||||
@@ -780,7 +780,7 @@ index 5cf15b9..aacaade 100644
|
||||
if (type == "decoders")
|
||||
defaultModules << "FFmpeg Decoder";
|
||||
diff --git a/src/qmplay2/YouTubeDL.cpp b/src/qmplay2/YouTubeDL.cpp
|
||||
index 5659018..63256fa 100644
|
||||
index ad99a2f..df78d73 100644
|
||||
--- a/src/qmplay2/YouTubeDL.cpp
|
||||
+++ b/src/qmplay2/YouTubeDL.cpp
|
||||
@@ -37,9 +37,13 @@ static QMutex g_mutex(QMutex::Recursive);
|
||||
@@ -837,5 +837,5 @@ index 5659018..63256fa 100644
|
||||
{
|
||||
QFile file(m_ytDlPath);
|
||||
--
|
||||
2.30.2
|
||||
2.36.1
|
||||
|
||||
@@ -8,7 +8,7 @@ COPYRIGHT="2010-2022 Błażej Szczygieł"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="e7a9f4076481808cd8aa2db91587ccb21e4c38c9fb970fced65de6c32fe99704"
|
||||
CHECKSUM_SHA256="1ed462c78288400d8fdcc5e9840e9f427afb883b7b4da9f3486b371ad50911f7"
|
||||
SOURCE_DIR="QMPlay2-$portVersion"
|
||||
PATCHES="qmplay2-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
Reference in New Issue
Block a user