From 676569dfb29348bf285ae3f921ede3b8fd1c8b3e Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Thu, 29 Dec 2022 00:50:50 +0600
Subject: [PATCH 1/4] qt: Display architecture information in About box

---
 src/qt/qt_mainwindow.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index d707fc7ea..6b9c75ba4 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -75,6 +75,7 @@ extern int qt_nvr_save(void);
 #include <QScreen>
 #include <QString>
 #include <QDir>
+#include <QSysInfo>
 #if QT_CONFIG(vulkan)
 #    include <QVulkanInstance>
 #    include <QVulkanFunctions>
@@ -2098,6 +2099,7 @@ MainWindow::on_actionAbout_86Box_triggered()
 #ifdef EMU_GIT_HASH
     githash = QString(" [%1]").arg(EMU_GIT_HASH);
 #endif
+    githash.append(QString(" [%1]").arg(QSysInfo::buildCpuArchitecture());
     msgBox.setText(QString("<b>%3%1%2</b>").arg(EMU_VERSION_FULL, githash, tr("86Box v")));
     msgBox.setInformativeText(tr("An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, Tiseno100, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."));
     msgBox.setWindowTitle("About 86Box");

From 74eaf6af255a3b463c669f4d98b88ad99aca8754 Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Thu, 29 Dec 2022 11:54:29 +0600
Subject: [PATCH 2/4] Fix typo

---
 src/qt/qt_mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index 6b9c75ba4..1c2ae6097 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -2099,7 +2099,7 @@ MainWindow::on_actionAbout_86Box_triggered()
 #ifdef EMU_GIT_HASH
     githash = QString(" [%1]").arg(EMU_GIT_HASH);
 #endif
-    githash.append(QString(" [%1]").arg(QSysInfo::buildCpuArchitecture());
+    githash.append(QString(" [%1]").arg(QSysInfo::buildCpuArchitecture()));
     msgBox.setText(QString("<b>%3%1%2</b>").arg(EMU_VERSION_FULL, githash, tr("86Box v")));
     msgBox.setInformativeText(tr("An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, Tiseno100, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."));
     msgBox.setWindowTitle("About 86Box");

From 3d5d37804e9ae105cc310a90567388e990ddf225 Mon Sep 17 00:00:00 2001
From: Dylan Morrison <dizzy@domad.science>
Date: Sat, 31 Dec 2022 21:50:40 -0500
Subject: [PATCH 3/4] Added support for bumpversion to bump version/date info
 for Debian changelog.

---
 bumpversion.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumpversion.sh b/bumpversion.sh
index ac6116bcc..ce3b7c4c8 100644
--- a/bumpversion.sh
+++ b/bumpversion.sh
@@ -73,3 +73,5 @@ patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]
 patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/'
 patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/'
 patch_file src/unix/assets/*.metainfo.xml release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/'
+patch_file debian/changelog 'changelog date' 's/>  .+/>  '"$(date -R)"'/'
+patch_file debian/changelog 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/'

From 1e26ee7cdd447a85452f4d240e760067648a944e Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 1 Jan 2023 17:32:01 -0500
Subject: [PATCH 4/4] Add CodeQL checking

---
 .github/workflows/codeql.yml | 51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..2cc36c6a6
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,51 @@
+name: "CodeQL"
+
+on: [ push, pull_request]
+
+jobs:
+  analyze:
+    name: Analyze
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp' ]
+
+    steps:
+      - name: Install dependencies
+        run: >-
+          sudo apt update && sudo apt install
+          build-essential
+          ninja-build
+          libfreetype-dev
+          libsdl2-dev
+          libpng-dev
+          libc6-dev
+          librtmidi-dev
+          qtbase5-dev
+          qttools5-dev
+          libopenal-dev
+          libvncserver-dev
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{matrix.language}}"