From d77dd42f8ebd4f903d82ccd58dd6a35aee1bfb72 Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Fri, 18 Feb 2022 00:04:48 +0600
Subject: [PATCH 1/3] qt: Fix network adapter combobox being grayed out when
 PCap is initially enabled

---
 src/qt/qt_settingsnetwork.cpp | 10 ++++++++++
 src/qt/qt_settingsnetwork.hpp |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/src/qt/qt_settingsnetwork.cpp b/src/qt/qt_settingsnetwork.cpp
index 290fea43b..98b1ac486 100644
--- a/src/qt/qt_settingsnetwork.cpp
+++ b/src/qt/qt_settingsnetwork.cpp
@@ -127,3 +127,13 @@ void SettingsNetwork::on_pushButtonConfigure_clicked() {
     DeviceConfig::ConfigureDevice(network_card_getdevice(ui->comboBoxAdapter->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
+
+void SettingsNetwork::on_comboBoxPcap_currentIndexChanged(int index)
+{
+    if (index < 0) {
+        return;
+    }
+
+    enableElements(ui);
+}
+
diff --git a/src/qt/qt_settingsnetwork.hpp b/src/qt/qt_settingsnetwork.hpp
index f17eb98f1..b473ee3df 100644
--- a/src/qt/qt_settingsnetwork.hpp
+++ b/src/qt/qt_settingsnetwork.hpp
@@ -25,6 +25,8 @@ private slots:
     void on_comboBoxAdapter_currentIndexChanged(int index);
     void on_comboBoxNetwork_currentIndexChanged(int index);
 
+    void on_comboBoxPcap_currentIndexChanged(int index);
+
 private:
     Ui::SettingsNetwork *ui;
     int machineId = 0;

From 79703457cfbb28116a6d5c5d176b6c15637d286c Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Fri, 18 Feb 2022 04:52:03 -0500
Subject: [PATCH 2/3] Disable CLANG64 builds for now

---
 .github/workflows/cmake.yml | 8 ++++----
 src/network/CMakeLists.txt  | 2 +-
 src/unix/unix.c             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 0c85655c1..5f95e1309 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -25,7 +25,7 @@ jobs:
   msys2:
     name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.environment.msystem }})
 
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     defaults:
       run:
@@ -68,8 +68,8 @@ jobs:
             prefix: mingw-w64-ucrt-x86_64
 #          - msystem: CLANG32
 #            prefix: mingw-w64-clang-i686
-          - msystem: CLANG64
-            prefix: mingw-w64-clang-x86_64
+#          - msystem: CLANG64
+#            prefix: mingw-w64-clang-x86_64
 
     steps:
     - uses: msys2/setup-msys2@v2
@@ -210,7 +210,7 @@ jobs:
   linux:
     name: "Linux GCC 11 (${{ matrix.build.name }} x86_64)"
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-2004
 
     strategy:
       fail-fast: true
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 5cfa87d91..ee9f9bdcc 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -26,4 +26,4 @@ if(SLIRP_EXTERNAL)
 else()
     add_subdirectory(slirp)
     target_link_libraries(86Box slirp)
-endif()
\ No newline at end of file
+endif()
diff --git a/src/unix/unix.c b/src/unix/unix.c
index a93609e2e..21418697a 100644
--- a/src/unix/unix.c
+++ b/src/unix/unix.c
@@ -1272,4 +1272,4 @@ void endblit()
 void
 ui_sb_mt32lcd(char* str)
 {
-}
\ No newline at end of file
+}

From 0a71f1921310edb7783180cf75d405a78679376a Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 18 Feb 2022 17:51:00 +0100
Subject: [PATCH 3/3] Updated the version number to 3.3.

---
 CMakeLists.txt                   | 2 +-
 src/include_make/86box/version.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56a4d446a..cb3bb8a5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 3.2
+    VERSION 3.3
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)
diff --git a/src/include_make/86box/version.h b/src/include_make/86box/version.h
index d2a0b2791..1dc91bfeb 100644
--- a/src/include_make/86box/version.h
+++ b/src/include_make/86box/version.h
@@ -20,11 +20,11 @@
 #define EMU_NAME	"86Box"
 #define EMU_NAME_W	LSTR(EMU_NAME)
 
-#define EMU_VERSION	"3.2"
+#define EMU_VERSION	"3.3"
 #define EMU_VERSION_W	LSTR(EMU_VERSION)
-#define EMU_VERSION_EX	"3.02"
+#define EMU_VERSION_EX	"3.30"
 #define EMU_VERSION_MAJ	3
-#define EMU_VERSION_MIN	0
+#define EMU_VERSION_MIN	3
 #define EMU_VERSION_PATCH 0
 
 #define EMU_BUILD_NUM	0