From 4dbb8c8543804316877ab0c684eedc46200bc147 Mon Sep 17 00:00:00 2001
From: Benjamen Meyer <bm_witness@yahoo.com>
Date: Sat, 12 Oct 2024 00:11:37 -0400
Subject: [PATCH] Disable Rocky Linux 8.10

There's some bugs with building on Rocky Linux 8.10.
Disable it until either it completely leaves our support window
or someone in the community that runs Rocky Linux 8.10 steps up
to help fix the issues.
---
 .github/workflows/gh-actions-pr.yml      | 11 ++++++-----
 .github/workflows/gh-actions-release.yml | 11 ++++++-----
 script/bootstrap                         |  6 +++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml
index d8a126402..f786ca3d3 100644
--- a/.github/workflows/gh-actions-pr.yml
+++ b/.github/workflows/gh-actions-pr.yml
@@ -146,11 +146,12 @@ jobs:
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             allow_failure: false
-          - FROM:     'rockylinux_rockylinux:8.10'
-            COMPILER: 'clang'
-            OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'ON'
-            allow_failure: false
+          # Disabled until the build can be fixed
+          #- FROM:     'rockylinux_rockylinux:8.10'
+          #  COMPILER: 'clang'
+          #  OpenGL_GL_PREFERENCE: 'GLVND'
+          #  ENABLE_PIE: 'ON'
+          #  allow_failure: false
           #- FROM:     'manjarolinux/base'
           #  COMPILER: 'clang'
           #  OpenGL_GL_PREFERENCE: 'LEGACY'
diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml
index bdcd0197f..4b29f968f 100644
--- a/.github/workflows/gh-actions-release.yml
+++ b/.github/workflows/gh-actions-release.yml
@@ -131,11 +131,12 @@ jobs:
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             ARTIFACT_EXT: 'rpm'
-          - FROM:     'rockylinux_rockylinux:8.10'
-            COMPILER: 'clang'
-            OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'ON'
-            ARTIFACT_EXT: 'rpm'
+          # Disabled until the build can be fixed
+          #- FROM:     'rockylinux_rockylinux:8.10'
+          #  COMPILER: 'clang'
+          #  OpenGL_GL_PREFERENCE: 'GLVND'
+          #  ENABLE_PIE: 'ON'
+          #  ARTIFACT_EXT: 'rpm'
 
     steps:
       - name: Check out repository
diff --git a/script/bootstrap b/script/bootstrap
index 9ce02fa4c..446e5ed57 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -1735,7 +1735,7 @@ function bootstrapOnRockyLinux ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
+                          python3.11-devel \
                           rpm-build \
                           make \
                           clang
@@ -1762,7 +1762,7 @@ function bootstrapOnRockyLinux ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
+                          python3.11-devel \
                           rpm-build \
                           make \
                           clang
@@ -1789,7 +1789,7 @@ function bootstrapOnRockyLinux ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
+                          python3.11-devel \
                           rpm-build \
                           make \
                           clang