From 75ef65e1d85ed11edba434fe2efa2e1736ae88f5 Mon Sep 17 00:00:00 2001
From: Sebastian Palencsar <hello@linuxcommand.dev>
Date: Mon, 22 Jun 2026 16:43:49 +0200
Subject: [PATCH] release: bump to 1.0.6 and show build id in About dialog

Make Flatpak updates unmistakable after clients were stuck on the
May 1.0.3 commit. Expose bearwaveVersion/bearwaveBuildId to QML and
set the flatpak manifest version explicitly.
---
 CMakeLists.txt                     |  2 +-
 de.nerdbear.bearwave.json          |  1 +
 de.nerdbear.bearwave.metainfo.xml  |  8 ++++++++
 src/CMakeLists.txt                 | 12 ++++++++++++
 src/main.cpp                       |  2 ++
 src/qml/components/AboutDialog.qml |  4 +++-
 6 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 514d39b..d4ee400 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-project(bearwave VERSION 1.0.5 LANGUAGES CXX)
+project(bearwave VERSION 1.0.6 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/de.nerdbear.bearwave.json b/de.nerdbear.bearwave.json
index 64f377f..6d1c674 100644
--- a/de.nerdbear.bearwave.json
+++ b/de.nerdbear.bearwave.json
@@ -1,5 +1,6 @@
 {
     "app-id": "de.nerdbear.bearwave",
+    "version": "1.0.6",
     "runtime": "org.kde.Platform",
     "runtime-version": "6.10",
     "sdk": "org.kde.Sdk",
diff --git a/de.nerdbear.bearwave.metainfo.xml b/de.nerdbear.bearwave.metainfo.xml
index 1331031..a771f39 100644
--- a/de.nerdbear.bearwave.metainfo.xml
+++ b/de.nerdbear.bearwave.metainfo.xml
@@ -59,6 +59,14 @@
   </provides>
   
   <releases>
+    <release version="1.0.6" date="2026-06-22">
+      <description>
+        <ul>
+          <li>Flatpak: KDE 6.10 runtime, signed repo updates, QML resource path fix</li>
+          <li>Version display now follows CMake project version</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.0.5" date="2026-06-20">
       <description>
         <ul>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a79e365..2efd28f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,8 +18,20 @@ set(SOURCES
 # Create executable
 add_executable(bearwave ${SOURCES})
 
+execute_process(
+    COMMAND git rev-parse --short HEAD
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
+    OUTPUT_VARIABLE BEARWAVE_GIT_HASH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+)
+if(NOT BEARWAVE_GIT_HASH)
+    set(BEARWAVE_GIT_HASH "unknown")
+endif()
+
 target_compile_definitions(bearwave PRIVATE
     BEARWAVE_VERSION="${PROJECT_VERSION}"
+    BEARWAVE_GIT_HASH="${BEARWAVE_GIT_HASH}"
 )
 
 # Qt Resources
diff --git a/src/main.cpp b/src/main.cpp
index 15fb27e..165d4de 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -53,6 +53,8 @@ int main(int argc, char *argv[])
 
     RadioBackend backend;
     engine.rootContext()->setContextProperty("radioBackend", &backend);
+    engine.rootContext()->setContextProperty("bearwaveVersion", QStringLiteral(BEARWAVE_VERSION));
+    engine.rootContext()->setContextProperty("bearwaveBuildId", QStringLiteral(BEARWAVE_GIT_HASH));
 
     auto *mprisRoot = new MprisRootAdaptor(&backend, &app);
     auto *mprisPlayer = new MprisPlayerAdaptor(&backend);
diff --git a/src/qml/components/AboutDialog.qml b/src/qml/components/AboutDialog.qml
index 4d9fefb..58f35da 100644
--- a/src/qml/components/AboutDialog.qml
+++ b/src/qml/components/AboutDialog.qml
@@ -53,7 +53,9 @@ Dialog {
 
             Label {
                 Layout.alignment: Qt.AlignHCenter
-                text: qsTr("Version: %1").arg(Qt.application.version)
+                text: qsTr("Version: %1 (%2)").arg(
+                    (typeof bearwaveVersion !== "undefined" ? bearwaveVersion : Qt.application.version),
+                    (typeof bearwaveBuildId !== "undefined" ? bearwaveBuildId : "?"))
                 color: BearTheme.textMuted
                 font.pixelSize: 12
             }