Port to Lua >= 5.2
- Switch from embedded lua to one provided by the system
- Remove bundled Lua
- Port to Lua >=5.2
- Don't use deprecated
table.maxn()
in Lua - Use
lua_pcall
instead oflua_call
to avoid SIGABRT when encountering Lua errors
table.maxn()
in Lualua_pcall
instead of lua_call
to avoid SIGABRT when encountering Lua errorsStep 1. Fetch and check out the branch for this merge request
git fetch "https://git.sailfishos.org/Thaodan/scratchbox2.git" "jb52528" git checkout -b "Thaodan/scratchbox2-jb52528" FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "origin/master" git merge --no-ff "Thaodan/scratchbox2-jb52528"
Step 4. Push the result of the merge to GitLab
git push origin "master"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.