From 2bc7b7b79a4b1b4fd3cdd7506461e30990299933 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Wed, 20 Nov 2024 19:00:16 -0500
Subject: [PATCH] Rebase to noble

---
 .github/workflows/call-baseimage-update.yml |  2 +-
 Dockerfile                                  | 15 ++++++++-------
 README.md                                   |  1 +
 root/defaults/menu.xml                      |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml
index 1c09c2a..9873bad 100644
--- a/.github/workflows/call-baseimage-update.yml
+++ b/.github/workflows/call-baseimage-update.yml
@@ -11,7 +11,7 @@ jobs:
     with:
       repo_owner: ${{ github.repository_owner }}
       baseimage: "kasmvnc"
-      basebranch: "ubuntujammy"
+      basebranch: "ubuntunoble"
       app_name: "nomacs"
     secrets:
       repo_release_token: ${{ secrets.repo_release_token }}
diff --git a/Dockerfile b/Dockerfile
index 6bda323..a6b9683 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntujammy
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
 
 ARG BUILD_DATE
 ARG VERSION
@@ -42,13 +42,13 @@ RUN \
     kimageformat-plugins \
     libexiv2-27 \
     libheif1 \
-    libopencv-core4.5d \
-    libopencv-imgproc4.5d \
-    libquazip5-1 \
-    libqt5concurrent5 \
-    libqt5printsupport5 \
+    libopencv-core406t64 \
+    libopencv-imgproc406t64 \
+    libquazip5-1t64 \
+    libqt5concurrent5t64 \
+    libqt5printsupport5t64 \
     libqt5svg5 \
-    libraw20 \
+    libraw23t64 \
     qt5-image-formats-plugins && \
   echo "**** compile heif plugin ****" && \
   mkdir -p /tmp/heif && \
@@ -72,6 +72,7 @@ RUN \
   make && \
   make install && \
   ldconfig && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** clean up ****" && \
   apt-get purge --auto-remove -y \
     build-essential \
diff --git a/README.md b/README.md
index e64dff0..531fd69 100644
--- a/README.md
+++ b/README.md
@@ -253,6 +253,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.11.24:** - Rebase to noble.
 * **11.02.24:** - Add PWA icon, rely on baseimage's fullscreen fix.
 * **10.05.23:** - Build commits from upstream master branch.
 * **27.03.23:** - Rebase to the new kasmvnc baseimage. Deprecate arm32v7 build as the new base does not support it.
diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml
index a6b9b8f..0913355 100644
--- a/root/defaults/menu.xml
+++ b/root/defaults/menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 <menu id="root-menu" label="MENU">
-<item label="Nomacs"><action name="Execute"><command>/usr/local/bin/nomacs</command></action></item>
+<item label="Nomacs" icon="/usr/local/share/icons/hicolor/scalable/apps/org.nomacs.ImageLounge.svg"><action name="Execute"><command>/usr/local/bin/nomacs</command></action></item>
 <item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
 </menu>
 </openbox_menu>