diff -Nrup a/arch/Darwin/arcade_macdeployimports.sh b/arch/Darwin/arcade_macdeployimports.sh --- a/arch/Darwin/arcade_macdeployimports.sh 2022-04-29 10:33:05.000000000 +0200 +++ b/arch/Darwin/arcade_macdeployimports.sh 2023-05-16 18:08:13.288432318 +0200 @@ -7,7 +7,7 @@ cd arcade QT_INSTALL_IMPORTS=`qmake -query QT_INSTALL_IMPORTS` rsync -avP $QT_INSTALL_IMPORTS/ qmc2-arcade.app/Contents/MacOS/ for i in $(find qmc2-arcade.app/Contents/MacOS -name "*.dylib"); do - QTLIBS=`otool -L $i | egrep ".*Qt.*framework.*Qt.*" | awk '{ print $1 }'` + QTLIBS=`otool -L $i | grep -E ".*Qt.*framework.*Qt.*" | awk '{ print $1 }'` for j in $QTLIBS; do qtlib="" for k in $(echo $j | tr "/" " "); do diff -Nrup a/arch/Linux/Mageia.cfg b/arch/Linux/Mageia.cfg --- a/arch/Linux/Mageia.cfg 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/Linux/Mageia.cfg 2022-04-29 10:33:05.000000000 +0200 @@ -0,0 +1,3 @@ +QMAKE = /usr/bin/qmake-qt5 +LUPDATE = /usr/bin/lupdate-qt5 +LRELEASE = /usr/bin/lrelease-qt5 diff -Nrup a/Makefile b/Makefile --- a/Makefile 2022-04-29 10:33:05.000000000 +0200 +++ b/Makefile 2023-05-16 19:19:08.780818514 +0200 @@ -1435,13 +1435,13 @@ man: doc-clean: man-clean man-clean: - $(RM) data/doc/man/*.gz + $(RM) data/doc/man/*.xz doc-install: man-install man-install: @$(ECHO) "Installing man-pages to $(DESTDIR)$(MAN_DIR)/man6" @$(MKDIR) $(DESTDIR)$(MAN_DIR)/man6 - @$(RSYNC) ./data/doc/man/*.gz $(DESTDIR)$(MAN_DIR)/man6/ + @$(RSYNC) ./data/doc/man/*.xz $(DESTDIR)$(MAN_DIR)/man6/ endif # process translations diff -Nrup a/scripts/generate-option-lists.sh b/scripts/generate-option-lists.sh --- a/scripts/generate-option-lists.sh 2022-04-29 10:33:05.000000000 +0200 +++ b/scripts/generate-option-lists.sh 2023-05-16 18:12:47.595036424 +0200 @@ -5,12 +5,12 @@ for opt in $(grep "<option " data/opt/MA done echo ");" echo -n -e "\tQStringList booleanOptions(QStringList()" -for opt in $(egrep "type=\"bool\"" data/opt/MAME/template.xml data/opt/SDLMAME/template-SDL2.xml | grep -Po "name=\".*\"" | awk '{print $1}' | colrm 1 6 | tr '\"' ' ' | sort -u); do +for opt in $(grep -E "type=\"bool\"" data/opt/MAME/template.xml data/opt/SDLMAME/template-SDL2.xml | grep -Po "name=\".*\"" | awk '{print $1}' | colrm 1 6 | tr '\"' ' ' | sort -u); do echo -n " << \"$opt\"" done echo ");" echo -n -e "\tQStringList floatOptions(QStringList()" -for opt in $(egrep "type=\"(float|float2|float3)\"" data/opt/MAME/template.xml data/opt/SDLMAME/template-SDL2.xml | grep -Po "name=\".*\"" | awk '{print $1}' | colrm 1 6 | tr '\"' ' ' | sort -u); do +for opt in $(grep -E "type=\"(float|float2|float3)\"" data/opt/MAME/template.xml data/opt/SDLMAME/template-SDL2.xml | grep -Po "name=\".*\"" | awk '{print $1}' | colrm 1 6 | tr '\"' ' ' | sort -u); do echo -n " << \"$opt\"" done echo ");" diff -Nrup a/scripts/make-man-pages.sh b/scripts/make-man-pages.sh --- a/scripts/make-man-pages.sh 2022-04-29 10:33:05.000000000 +0200 +++ b/scripts/make-man-pages.sh 2023-05-16 19:20:04.129354137 +0200 @@ -43,14 +43,14 @@ for ctl_file in $(ls *.ctl); do ctl_file_basename=$(basename $ctl_file .ctl) man_source=$ctl_file_basename.man.text man_target=$ctl_file_basename.$man_section - man_compressed_target=$man_target.gz + man_compressed_target=$man_target.xz echo "Converting '$man_source' to '$man_target'" cat $man_source | sed -e "s|SYS_CONF_DIR|$SYS_CONF_DIR|g" -e "s|CONFIG_PATH|$CONFIG_PATH|g" | "$TXT2MAN" -t "$title_name" -v "$volume_name" -r "$VERSION" -s "$man_section" > $man_target echo "Compressing '$man_target' to '$man_compressed_target'" - gzip -f $man_target + xz -z $man_target for man_page_link in $man_pages; do if [ "$man_page_link" != "$ctl_file_basename" ]; then - link_name=$man_page_link.$man_section.gz + link_name=$man_page_link.$man_section.xz echo "Sym-linking '$man_compressed_target' to '$link_name'" ln -s -f $man_compressed_target $link_name fi diff -Nrup a/scripts/os-detect.sh b/scripts/os-detect.sh --- a/scripts/os-detect.sh 2022-04-29 10:33:05.000000000 +0200 +++ b/scripts/os-detect.sh 2023-05-16 18:57:35.395600758 +0200 @@ -7,9 +7,9 @@ DIST="$(uname -r)" if [ "${OS}" = "Linux" ]; then if [ -f /etc/os-release ]; then - VERSION_ID=$(cat /etc/os-release | egrep "\bVERSION_ID\b" | sed 's/VERSION_ID=//g' | sed 's/\"//g') - VERSION=$(cat /etc/os-release | egrep "\bVERSION\b" | sed 's/VERSION=//g' | sed 's/\"//g') - NAME=$(cat /etc/os-release | egrep "\bNAME\b" | sed 's/NAME=//g' | sed 's/\"//g' | tr ' ' '_' | tr '/' '_') + VERSION_ID=$(cat /etc/os-release | grep -E "\bVERSION_ID\b" | sed 's/VERSION_ID=//g' | sed 's/\"//g') + VERSION=$(cat /etc/os-release | grep -E "\bVERSION\b" | sed 's/VERSION=//g' | sed 's/\"//g') + NAME=$(cat /etc/os-release | grep -E "\bNAME\b" | sed 's/NAME=//g' | sed 's/\"//g' | tr ' ' '_' | tr '/' '_') case ${NAME} in Fedora | Fedora_Linux) NAME="Fedora_release" @@ -31,6 +31,8 @@ if [ "${OS}" = "Linux" ]; then esac elif [ -f /etc/mandriva-release ]; then DIST="$(cat /etc/mandriva-release | sed 's/\ for .*//' | sed 's/\ (.*)//')" + elif [ -f /etc/mageia-release ]; then + DIST="$(cat /etc/mageia-release | sed 's/\ for .*//' | sed 's/\ (.*)//')" elif [ -f /etc/redhat-release ]; then DIST="$(cat /etc/redhat-release | sed 's/\ (.*)//')" elif [ -f /etc/SuSE-release ]; then diff -Nrup a/scripts/sdl-defines.sh b/scripts/sdl-defines.sh --- a/scripts/sdl-defines.sh 2022-04-29 10:33:05.000000000 +0200 +++ b/scripts/sdl-defines.sh 2023-05-16 18:08:46.900766579 +0200 @@ -26,5 +26,5 @@ else fi fi fi -echo $SDL_CFLAGS | egrep -o -e "\\-D\\S+" | sed -e 's/^-D//' +echo $SDL_CFLAGS | grep -E -o -e "\\-D\\S+" | sed -e 's/^-D//' exit 0 diff -Nrup a/scripts/sdl-includepath.sh b/scripts/sdl-includepath.sh --- a/scripts/sdl-includepath.sh 2022-04-29 10:33:05.000000000 +0200 +++ b/scripts/sdl-includepath.sh 2023-05-16 18:09:41.238296891 +0200 @@ -26,5 +26,5 @@ else fi fi fi -echo $SDL_CFLAGS | egrep -o -e "\\-I\\S+" | sed -e 's/^-I//' +echo $SDL_CFLAGS | grep -E -o -e "\\-I\\S+" | sed -e 's/^-I//' exit 0 diff -Nrup a/scripts/strip-png-headers.sh b/scripts/strip-png-headers.sh --- a/scripts/strip-png-headers.sh 2022-04-29 10:33:05.000000000 +0200 +++ b/scripts/strip-png-headers.sh 2023-05-16 18:09:15.968051747 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -for i in $(find . -type f | grep -v "data/js/pdfjs" | egrep ".png$"); do +for i in $(find . -type f | grep -v "data/js/pdfjs" | grep -E ".png$"); do echo $i convert "$i" -strip "$i" done