minenux/minetest-engine-minetest
minenux/minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

again fix for miscspelled sintax in CMakefile for compiling

Browse Source 
* fix miscspelled sintax in cmakefile
* fix missing packages for debian based distros ad ci gitlab
* change server description after a search
  this backported https://gituhub.com/minetest/minetest/issues/6074
This commit is contained in:
mckaygerhard 2023-01-05 15:05:07 -04:00
parent fbabea7c60
commit a125db579e
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@ -50,7 +50,7 @@ variables:
stage: deploy
before_script:
- apt-get update -y || true
- apt-get install -y --force-yes libc6 libcurl3-gnutls libfreetype6 libirrlicht1.8 $LEVELDB_PKG liblua5.1-0 libluajit-5.1-2 libopenal1 libstdc++6 libvorbisfile3 libx11-6 zlib1g
- apt-get install -y --force-yes libc6 libcurl3-gnutls libfreetype6 libirrlicht1.8 $LEVELDB_PKG liblua5.1-0 libluajit-5.1-2 libopenal1 libstdc++6 libvorbisfile3 libx11-6 zlib1g doxygen gettext
script:
- dpkg -i build/deb/*.deb
@ -65,7 +65,7 @@ build:debian-8:
image: debian:8
before_script:
- apt-get update -y || true
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
package:debian-8:
image: debian:8
@ -90,7 +90,7 @@ build:debian-9:
image: debian:9
before_script:
- apt-get update -y || true
- apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
- apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
package:debian-9:
image: debian:9
@ -119,7 +119,7 @@ build:ubuntu-14.04:
image: ubuntu:trusty
before_script:
- apt-get update -y || true
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
package:ubuntu-14.04:
image: ubuntu:trusty
@ -144,7 +144,7 @@ build:ubuntu-16.04:
image: ubuntu:xenial
before_script:
- apt-get update -y || true
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
package:ubuntu-16.04:
image: ubuntu:xenial
@ -169,7 +169,7 @@ build:ubuntu-16.10:
image: ubuntu:yakkety
before_script:
- apt-get update -y || true
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
package:ubuntu-16.10:
image: ubuntu:yakkety
@ -194,7 +194,7 @@ build:ubuntu-17.04:
image: ubuntu:zesty
before_script:
- apt-get update -y || true
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
- apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
package:ubuntu-17.04:
image: ubuntu:zesty

1
builtin/mainmenu/tab_online.lua
View File

@ -295,6 +295,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
local first_server = search_result[1]
core.settings:set("address", first_server.address)
core.settings:set("remote_port", first_server.port)
gamedata.serverdescription = first_server.description
end
return true
end

2
lib/lua/CMakeLists.txt
View File

@ -90,7 +90,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
else()
if (CMAKE_VERSION VERSION_GREATER "3.0")
set(CMAKE_C_STANDARD 11)
else
else()
if(APPLE)
# Fix behavior of CMAKE_CXX_STANDARD when targeting macOS.
if (POLICY CMP0025)