Support for Fedora 43, Debian 13 and Ubuntu 24.04 operating systems

armm77 · armm77 · commit 497b0dbcfa76 · 2025-12-29T04:29:50.000Z
diff --git a/Applications/Terminal/TerminalView.m b/Applications/Terminal/TerminalView.m
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <termio.h>
+#include <termios.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/Packaging/Sources/0_build_libdispatch.sh b/Packaging/Sources/0_build_libdispatch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 
 #----------------------------------------
 # Install package dependecies
@@ -41,7 +41,9 @@ rm -rf _build 2>/dev/null
 mkdir -p _build
 cd _build
 
-C_FLAGS="-Wno-error=unused-but-set-variable"
+#C_FLAGS="-Wno-error=unused-but-set-variable"
+C_FLAGS="-Wno-error=cast-function-type-mismatch"
+CXX_FLAGS="-Wno-error=cast-function-type-mismatch"
 $CMAKE_CMD .. \
 	-DCMAKE_C_COMPILER=${C_COMPILER} \
 	-DCMAKE_CXX_COMPILER=${CXX_COMPILER} \
diff --git a/Packaging/Sources/1_build_libcorefoundation.sh b/Packaging/Sources/1_build_libcorefoundation.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 
 #----------------------------------------
 # Install package dependecies
diff --git a/Packaging/Sources/2_build_libobjc2.sh b/Packaging/Sources/2_build_libobjc2.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 
 #----------------------------------------
 # Install package dependecies
diff --git a/Packaging/Sources/3_build_core.sh b/Packaging/Sources/3_build_core.sh
@@ -1,6 +1,17 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
+
+#----------------------------------------
+# Install package dependecies
+#----------------------------------------
+if [ ${OS_ID} = "debian" ] || [ ${OS_ID} = "ubuntu" ]; then
+   sudo apt-get install -y ${RUNTIME_RUN_DEPS} || exit 1
+else
+   SPEC_FILE=${PROJECT_DIR}/Core/nextspace-core.spec
+   DEPS=`rpmspec -q --requires ${SPEC_FILE} | grep -v libobjc2 | grep -v libdispatch | grep -v nextspace-core | grep -v git | grep -v clang | awk -c '{print $1}'`
+   sudo yum -y install ${DEPS} || exit 1
+fi
 
 #----------------------------------------
 # Install system configuration files
diff --git a/Packaging/Sources/3_build_tools-make.sh b/Packaging/Sources/3_build_tools-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 
 #----------------------------------------
 # Install package dependecies
diff --git a/Packaging/Sources/4_build_libwraster.sh b/Packaging/Sources/4_build_libwraster.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 . /etc/profile.d/nextspace.sh
 
 #----------------------------------------
@@ -9,7 +9,7 @@
 ${ECHO} ">>> Installing ${OS_ID} packages for WRaster library build"
 if [ ${OS_ID} = "debian" ] || [ ${OS_ID} = "ubuntu" ]; then
 	${ECHO} "Debian-based Linux distribution: calling 'apt-get install'."
-	sudo apt-get install -y ${WRASTER_DEPS} || exit 1
+	sudo apt-get install -y ${WRASTER_DEPS} ${WRASTER_RUN_DEPS} || exit 1
 else
 	${ECHO} "RedHat-based Linux distribution: calling 'yum -y install'."
 	SPEC_FILE=${PROJECT_DIR}/Libraries/libwraster/libwraster.spec
@@ -43,4 +43,4 @@ $INSTALL_CMD || exit 1
 
 if [ "$DEST_DIR" = "" ]; then
 	sudo ldconfig
-fi
+fi
diff --git a/Packaging/Sources/5_build_libs-base.sh b/Packaging/Sources/5_build_libs-base.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 . /Developer/Makefiles/GNUstep.sh
 . /etc/profile.d/nextspace.sh
 
@@ -10,7 +10,7 @@
 ${ECHO} ">>> Installing ${OS_ID} packages for GNUstep Base (Foundation) build"
 if [ ${OS_ID} = "debian" ] || [ ${OS_ID} = "ubuntu" ]; then
 	${ECHO} "Debian-based Linux distribution: calling 'apt-get install'."
-	sudo apt-get install -y ${GNUSTEP_BASE_DEPS} || exit 1
+	sudo apt-get install -y ${GNUSTEP_BASE_DEPS} ${GNUSTEP_BASE_RUN_DEPS} || exit 1
 else
 	${ECHO} "RedHat-based Linux distribution: calling 'yum -y install'."
 	SPEC_FILE=${PROJECT_DIR}/Libraries/gnustep/nextspace-gnustep.spec
diff --git a/Packaging/Sources/6_build_libs-gui.sh b/Packaging/Sources/6_build_libs-gui.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 . /Developer/Makefiles/GNUstep.sh
 . /etc/profile.d/nextspace.sh
 
@@ -9,7 +9,7 @@
 #----------------------------------------
 if [ ${OS_ID} = "debian" ] || [ ${OS_ID} = "ubuntu" ]; then
   	${ECHO} ">>> Installing packages for GNUstep GUI (AppKit) build"
-	sudo apt-get install -q -y ${GNUSTEP_GUI_DEPS}
+	sudo apt-get install -q -y ${GNUSTEP_GUI_DEPS} ${GNUSTEP_GUI_RUN_DEPS} || exit 1
 fi
 
 #----------------------------------------
diff --git a/Packaging/Sources/7_build_libs-back.sh b/Packaging/Sources/7_build_libs-back.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 . /etc/profile.d/nextspace.sh
 
 #----------------------------------------
 # Install package dependecies
 #----------------------------------------
 if [ ${OS_ID} = "debian" ] || [ ${OS_ID} = "ubuntu" ]; then
 	${ECHO} ">>> Installing packages for GNUstep GUI Backend (ART) build"
-	sudo apt-get install -y ${BACK_ART_DEPS}
+	sudo apt-get install -y ${BACK_ART_DEPS} ${BACK_ART_RUN_DEPS} || exit 1
 fi
 
 #----------------------------------------
diff --git a/Packaging/Sources/8_build_Frameworks.sh b/Packaging/Sources/8_build_Frameworks.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 . /etc/profile.d/nextspace.sh
 
 #----------------------------------------
@@ -9,8 +9,8 @@
 ${ECHO} ">>> Installing ${OS_ID} packages for NextSpace frameworks build"
 if [ ${OS_ID} = "debian" ] || [ ${OS_ID} = "ubuntu" ]; then
 	${ECHO} "Debian-based Linux distribution: calling 'apt-get install'."
-	sudo apt-get install -y ${FRAMEWORKS_BUILD_DEPS}
-	sudo apt-get install -y ${FRAMEWORKS_RUN_DEPS}
+	sudo apt-get install -y ${FRAMEWORKS_BUILD_DEPS} || exit 1
+	sudo apt-get install -y ${FRAMEWORKS_RUN_DEPS} || exit 1
 else
 	${ECHO} "RedHat-based Linux distribution: calling 'yum -y install'."
 	SPEC_FILE=${PROJECT_DIR}/Frameworks/nextspace-frameworks.spec
diff --git a/Packaging/Sources/9_build_Applications.sh b/Packaging/Sources/9_build_Applications.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../environment.sh
+. `dirname $0`/../environment.sh
 . /etc/profile.d/nextspace.sh
 
 _PWD=`pwd`
@@ -11,8 +11,8 @@ _PWD=`pwd`
 ${ECHO} ">>> Installing ${OS_ID} packages for NextSpace applications build"
 if [ ${OS_ID} = "debian" ] || [ ${OS_ID} = "ubuntu" ]; then
 	${ECHO} "Debian-based Linux distribution: calling 'apt-get install'."
-	sudo apt-get install -y ${APPS_BUILD_DEPS}
-	sudo apt-get install -y ${APPS_RUN_DEPS}
+	sudo apt-get install -y ${APPS_BUILD_DEPS} || exit 1
+	sudo apt-get install -y ${APPS_RUN_DEPS} || exit 1
 else
 	${ECHO} "RedHat-based Linux distribution: calling 'yum -y install'."
 	SPEC_FILE=${PROJECT_DIR}/Applications/nextspace-applications.spec
@@ -84,19 +84,19 @@ if [ "$DEST_DIR" = "" ] && [ "$GITHUB_ACTIONS" != "true" ]; then
 		${ECHO} "A Login panel is already running: refresh systemd unit info."
 		sudo systemctl daemon-reload
 	else
-		print_H2 "Setting up Login window service to run at system startup..."
+		${ECHO} "Setting up Login window service to run at system startup..."
 		systemctl --quiet is-active display-manager.service
 		if [ $? -eq 0 ];then
 			if [ -z $DISPLAY ];then
-				print_H2 "A session manager is already running: we must stop it now."
+				${ECHO} "A session manager is already running: we must stop it now."
 				sudo systemctl stop display-manager.service
 			else
-				print_H1 "You're in graphical session.\nTo enable Login panel you need to execute the following commands in console:\n  $ sudo systemctl stop display-manager.service\n  $ sudo systemctl enable /usr/NextSpace/lib/systemd/loginwindow.service"
+				${ECHO} "You're in graphical session.\nTo enable Login panel you need to execute the following commands in console:\n  $ sudo systemctl stop display-manager.service\n  $ sudo systemctl enable /usr/NextSpace/lib/systemd/loginwindow.service"
 			fi
 		else
 			systemctl --quiet is-enabled display-manager.service
 			if [ $? -eq 0 ];then
-				print_H2 "A session manager is already set: we must disable it now."
+				${ECHO} "A session manager is already set: we must disable it now."
 				sudo systemctl disable display-manager.service
 			fi
 			${ECHO} "Setting up Login window service..."
@@ -128,4 +128,4 @@ if [ "$MACHINE" = "aarch64" ] && [ "$MODEL" = "Raspberry" ] && [ "$GPU" = "bcm27
 	if [ -f ${_PWD}/rpi_info.sh ];then
 		. "${_PWD}/rpi_info.sh"
 	fi
-fi
+fi
diff --git a/Packaging/Sources/README.md b/Packaging/Sources/README.md
@@ -11,8 +11,8 @@ Each script preform the following actions:
 Scripts assume that you preform run inside this directory as user. Scripts use `sudo` to install build resultsa and ask you for the password when it's needed.
 
 Build scripts were tested on:
-- Debian 12, Ubuntu 22.04
-- Fedora 35, 39
+- Debian 13, Ubuntu 24.04
+- Fedora 42, 43
 - Rocky Linux 9, Alma Linux 9 and CentOS Stream 9
 
 ## Build and install each dependency
diff --git a/Packaging/Sources/debian-13.deps.sh b/Packaging/Sources/debian-13.deps.sh
@@ -1,16 +1,20 @@
-# Works for Debian 12 and Ubuntu 22.04
+# Works for Debian 13 and Ubuntu 22.04
 
 BUILD_TOOLS="
+    sudo
     curl
     clang
     cmake
     git
+    binutils-gold
 "
 #--- libdispatch, libcorefoundation, libobjc2
 RUNTIME_DEPS="
     libbsd-dev
+    libxml2-dev
+    libicu-dev
     uuid-dev
-    libcurl4-gnutls-dev
+    libcurl4-openssl-dev
     libavahi-compat-libdnssd-dev
 "
 #--- gnustep-make
@@ -43,8 +47,8 @@ WRASTER_DEPS="
 "
 WRASTER_RUN_DEPS="
     libgif7
-    libjpeg8
-    libtiff5
+    libjpeg62-turbo
+    libtiff6
     libpng16-16
     libwebp7
     libxpm4
@@ -55,7 +59,6 @@ WRASTER_RUN_DEPS="
 #--- gnustep-base
 GNUSTEP_BASE_DEPS="
     libffi-dev
-    libxml2-dev
     libxslt1-dev
     libavahi-client-dev
     libcups2-dev
@@ -66,15 +69,15 @@ GNUSTEP_BASE_RUN_DEPS="
     libavahi-client3
     libxml2
     libxslt1.1
-    libicu70
-    libicu-dev
+    libicu76
     libgnutls30
     libcups2
 "
 #--- gnustep-gui
 GNUSTEP_GUI_DEPS="
     libao-dev
     libsndfile1-dev
+    libmagic-dev
 "
 GNUSTEP_GUI_RUN_DEPS="
     libao4
@@ -107,6 +110,7 @@ FRAMEWORKS_BUILD_DEPS="
     libxcursor-dev
     libxrandr-dev
     libpulse-dev
+    libxkbfile-dev
 "
 FRAMEWORKS_RUN_DEPS="
     libmagic1
diff --git a/Packaging/Sources/nextspace_install.sh b/Packaging/Sources/nextspace_install.sh
diff --git a/Packaging/Sources/ubuntu-22.deps.sh b/Packaging/Sources/ubuntu-22.deps.sh
diff --git a/Packaging/Sources/ubuntu-24.deps.sh b/Packaging/Sources/ubuntu-24.deps.sh
diff --git a/Packaging/environment.sh b/Packaging/environment.sh
diff --git a/Packaging/install_environment.sh b/Packaging/install_environment.sh
