From 4e68f4c1fa8847218314aa18612965ff00ece2e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Wed, 7 Feb 2024 18:51:52 -0500
Subject: [PATCH] Comment-out "classic" Linux builds, "disable Javascript" for
 sbbs.h in gtk utils

---
 .gitlab-ci.yml                      | 128 ++++++++++++++--------------
 src/sbbs3/gtkchat/chatfuncs.c       |   1 +
 src/sbbs3/gtkchat/main.c            |   1 +
 src/sbbs3/gtkuseredit/events.c      |   1 +
 src/sbbs3/gtkuseredit/gtkuseredit.c |   1 +
 5 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bad3460460..f7e2aaaf3b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,21 +50,21 @@ include:
       tagname: "Linux"
       has_gtk: "yes"
 
-sbbs-linux:
-  tags: [Linux]
-  image: gcc
-  stage: build
-  extends: .rules
-  script:
-    - cd src/sbbs3
-    - make RELEASE=1 all
-    - make RELEASE=1 gtkutils
-  artifacts:
-    name: sbbs-linux-x64
-    paths:
-      - "src/sbbs3/*.exe.release/*"
-      - "src/sbbs3/*.lib.release/*"
-      - "src/sbbs3/*/*.exe.release/*"
+#sbbs-linux:
+#  tags: [Linux]
+#  image: gcc
+#  stage: build
+#  extends: .rules
+#  script:
+#    - cd src/sbbs3
+#    - make RELEASE=1 all
+#    - make RELEASE=1 gtkutils
+#  artifacts:
+#    name: sbbs-linux-x64
+#    paths:
+#      - "src/sbbs3/*.exe.release/*"
+#      - "src/sbbs3/*.lib.release/*"
+#      - "src/sbbs3/*/*.exe.release/*"
 
 smoketest-jsexec-linux:
   tags: [Linux]
@@ -77,32 +77,32 @@ smoketest-jsexec-linux:
     - "*.exe.release/jsexec -C -c../../ctrl -r 'exit(0)'"
   dependencies: [sbbs-linux]
 
-sexpots-linux:
-  tags: [Linux]
-  image: gcc
-  stage: build
-  extends: .rules
-  script:
-    - cd src/sexpots
-    - make RELEASE=1
-  artifacts:
-    name: sexpots-linux-x64
-    paths:
-      - "src/sexpots/*.exe.release/*"
+#sexpots-linux:
+#  tags: [Linux]
+#  image: gcc
+#  stage: build
+#  extends: .rules
+#  script:
+#    - cd src/sexpots
+#    - make RELEASE=1
+#  artifacts:
+#    name: sexpots-linux-x64
+#    paths:
+#      - "src/sexpots/*.exe.release/*"
 
-syncterm-linux:
-  tags: [Linux]
-  image: gcc
-  stage: build
-  extends: .rules
-  script:
-    - cd src/syncterm
-    - make RELEASE=1 PREFIX=/usr dpkg
-  artifacts:
-    name: syncterm-linux-x64
-    paths:
-      - "src/syncterm/*.exe.release/*"
-      - "src/syncterm/syncterm*.deb"
+#syncterm-linux:
+#  tags: [Linux]
+#  image: gcc
+#  stage: build
+#  extends: .rules
+#  script:
+#    - cd src/syncterm
+#    - make RELEASE=1 PREFIX=/usr dpkg
+#  artifacts:
+#    name: syncterm-linux-x64
+#    paths:
+#      - "src/syncterm/*.exe.release/*"
+#      - "src/syncterm/syncterm*.deb"
 
 sbbs-windows:
   tags: [Windows]
@@ -169,31 +169,31 @@ syncterm-msvc:
     paths:
       - "src/syncterm/Release/*.exe"
 
-syncdraw-linux:
-  tags: [Linux]
-  image: gcc
-  stage: build
-  extends: .rules
-  script:
-    - cd src/syncdraw
-    - make RELEASE=1
-  artifacts:
-    name: syncdraw-linux-x64
-    paths:
-      - "src/syncdraw/*.exe.release/*"
+#syncdraw-linux:
+#  tags: [Linux]
+#  image: gcc
+#  stage: build
+#  extends: .rules
+#  script:
+#    - cd src/syncdraw
+#    - make RELEASE=1
+#  artifacts:
+#    name: syncdraw-linux-x64
+#    paths:
+#      - "src/syncdraw/*.exe.release/*"
 
-jsdoor-linux:
-  tags: [Linux]
-  image: gcc
-  stage: build
-  extends: .rules
-  script:
-    - cd src/sbbs3
-    - make RELEASE=1 jsdoor
-  artifacts:
-    name: jsdoor-linux-x64
-    paths:
-      - "src/sbbs3/*.exe.release/*"
+#jsdoor-linux:
+#  tags: [Linux]
+#  image: gcc
+#  stage: build
+#  extends: .rules
+#  script:
+#    - cd src/sbbs3
+#    - make RELEASE=1 jsdoor
+#  artifacts:
+#    name: jsdoor-linux-x64
+#    paths:
+#      - "src/sbbs3/*.exe.release/*"
 
 sbbs-freebsd-noskeeters:
   extends:
diff --git a/src/sbbs3/gtkchat/chatfuncs.c b/src/sbbs3/gtkchat/chatfuncs.c
index 683abd6fa5..b443b44fa8 100644
--- a/src/sbbs3/gtkchat/chatfuncs.c
+++ b/src/sbbs3/gtkchat/chatfuncs.c
@@ -8,6 +8,7 @@
 #include <utime.h>
 #include <unistd.h>
 
+#undef JAVASCRIPT
 #include "sbbs.h"
 #include "chatfuncs.h"
 
diff --git a/src/sbbs3/gtkchat/main.c b/src/sbbs3/gtkchat/main.c
index 61e83d64ab..3c8df59ee4 100644
--- a/src/sbbs3/gtkchat/main.c
+++ b/src/sbbs3/gtkchat/main.c
@@ -3,6 +3,7 @@
 
 #include <gtk/gtk.h>
 
+#undef JAVASCRIPT
 #include "sbbs.h"
 
 #include "chatfuncs.h"
diff --git a/src/sbbs3/gtkuseredit/events.c b/src/sbbs3/gtkuseredit/events.c
index 2e33d5ae95..56f0ffade2 100644
--- a/src/sbbs3/gtkuseredit/events.c
+++ b/src/sbbs3/gtkuseredit/events.c
@@ -1,5 +1,6 @@
 #include <gtk/gtk.h>
 
+#undef JAVASCRIPT
 #include "sbbs.h"
 #include "dirwrap.h"
 #include "xpbeep.h"
diff --git a/src/sbbs3/gtkuseredit/gtkuseredit.c b/src/sbbs3/gtkuseredit/gtkuseredit.c
index 9f743bf91c..0402937ae9 100644
--- a/src/sbbs3/gtkuseredit/gtkuseredit.c
+++ b/src/sbbs3/gtkuseredit/gtkuseredit.c
@@ -1,5 +1,6 @@
 #include <gtk/gtk.h>
 
+#undef JAVASCRIPT
 #include "sbbs.h"
 #include "dirwrap.h"
 
-- 
GitLab