serial-studio: 3.0.6 -> 3.1.10-unstable-2025-12-12 (#446514)
This commit is contained in:
@@ -2,37 +2,17 @@ diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
|
||||
index e69150cd..c4ce7975 100644
|
||||
--- a/app/CMakeLists.txt
|
||||
+++ b/app/CMakeLists.txt
|
||||
@@ -257,16 +257,16 @@ elseif(APPLE)
|
||||
MACOSX_BUNDLE_INFO_PLIST ${INFO_MACOSX}
|
||||
)
|
||||
elseif(UNIX)
|
||||
- install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION /usr/bin)
|
||||
+ install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION bin)
|
||||
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.png
|
||||
- DESTINATION /usr/share/pixmaps
|
||||
+ DESTINATION share/pixmaps
|
||||
)
|
||||
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.desktop
|
||||
- DESTINATION /usr/share/applications
|
||||
+ DESTINATION share/applications
|
||||
)
|
||||
@@ -392,17 +392,6 @@
|
||||
set(deploy_tool_options_arg "-force-openssl --release --no-translations")
|
||||
endif()
|
||||
|
||||
@@ -289,17 +289,6 @@ elseif(WIN32)
|
||||
set(deploy_tool_options_arg --no-compiler-runtime -force-openssl --release)
|
||||
endif()
|
||||
|
||||
|
||||
-qt_generate_deploy_qml_app_script(
|
||||
- TARGET ${PROJECT_EXECUTABLE}
|
||||
- OUTPUT_SCRIPT deploy_script
|
||||
- MACOS_BUNDLE_POST_BUILD
|
||||
- NO_UNSUPPORTED_PLATFORM_ERROR
|
||||
- DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM
|
||||
- DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg}
|
||||
- TARGET ${PROJECT_EXECUTABLE}
|
||||
- OUTPUT_SCRIPT deploy_script
|
||||
- MACOS_BUNDLE_POST_BUILD
|
||||
- NO_UNSUPPORTED_PLATFORM_ERROR
|
||||
- DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM
|
||||
- DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg}
|
||||
-)
|
||||
-
|
||||
-install(SCRIPT ${deploy_script})
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
diff --git a/app/qml/MainWindow/Panes/Toolbar.qml b/app/qml/MainWindow/Panes/Toolbar.qml
|
||||
index 9b59c0c2..fa428a2f 100644
|
||||
--- a/app/qml/MainWindow/Panes/Toolbar.qml
|
||||
+++ b/app/qml/MainWindow/Panes/Toolbar.qml
|
||||
@@ -320,7 +320,7 @@ Rectangle {
|
||||
font: Cpp_Misc_CommonFonts.boldUiFont
|
||||
Layout.minimumWidth: metrics.width + 16
|
||||
Layout.maximumWidth: metrics.width + 16
|
||||
- enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen && !Cpp_MQTT_Client.isSubscribed
|
||||
+ enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen
|
||||
text: checked ? qsTr("Disconnect") : qsTr("Connect")
|
||||
icon.source: checked ? "qrc:/rcc/icons/toolbar/connect.svg" :
|
||||
"qrc:/rcc/icons/toolbar/disconnect.svg"
|
||||
--
|
||||
2.47.2
|
||||
|
||||
@@ -5,17 +5,18 @@
|
||||
cmake,
|
||||
qt6,
|
||||
pkg-config,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "serial-studio";
|
||||
version = "3.0.6";
|
||||
version = "3.1.10-unstable-2025-12-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Serial-Studio";
|
||||
repo = "Serial-Studio";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-q3RWy3HRs5NG0skFb7PSv8jK5pI5rtbccP8j38l8kjM=";
|
||||
rev = "b2e8b5430da59969dd697636677873f3f6c10c7c";
|
||||
hash = "sha256-O/KAYKpVGn2Q0CPaReh564P5l+ilHuQYRJ4w5aFKZmg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -35,25 +36,27 @@ stdenv.mkDerivation rec {
|
||||
qt6.qttools
|
||||
qt6.qtserialport
|
||||
qt6.qtpositioning
|
||||
qt6.qt5compat
|
||||
];
|
||||
|
||||
patches = [
|
||||
./0001-CMake-Deploy-Fix.patch
|
||||
./0002-Connect-Button-Fix.patch
|
||||
];
|
||||
patches = [ ./0001-CMake-Deploy-Fix.patch ];
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv $out/Serial-Studio.app $out/Applications
|
||||
makeWrapper $out/Applications/Serial-Studio.app/Contents/MacOS/Serial-Studio $out/bin/serial-studio
|
||||
mv $out/Serial-Studio-GPL3.app $out/Applications
|
||||
ln --symbolic $out/Applications/Serial-Studio-GPL3.app/Contents/MacOS/Serial-Studio-GPL3 $out/bin/serial-studio
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Multi-purpose serial data visualization & processing program";
|
||||
mainProgram = "serial-studio";
|
||||
homepage = "https://serial-studio.github.io/";
|
||||
license = lib.licenses.mit;
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user