Merge branch 'master' into android-workflows

.github/workflows/lint.yml

@@ -51,5 +51,5 @@ jobs:
         run: |
           ./danmar-cppcheck-*/cppcheck \
             --quiet --inline-suppr --language=c++ --error-exitcode=10 \
-            -j"$(nproc)" --std=c++14 --enable=warning,style \
+            -j"$(nproc)" --std=c++17 --enable=warning,style \
             --suppress=useStlAlgorithm  src/

.github/workflows/macos.yml

@@ -50,25 +50,19 @@ jobs:
       - name: Install macos dependencies
         if: ${{ matrix.os == 'macos-11' }}
         run: |
-          brew install cmake googletest bash rename libogg libvorbis glew\
-                       openal-soft sdl2 sdl2_image sdl2_ttf freetype harfbuzz  \
-                       fribidi glib gtk-doc glbinding libraqm glm zlib
+          brew install cmake googletest bash rename libogg libvorbis glew \
+                       openal-soft sdl2 sdl2_image sdl2_ttf freetype harfbuzz \
+                       fribidi glib gtk-doc glbinding@2 libraqm glm zlib
+          brew link glbinding@2
+          install_name_tool -change \
+            '@rpath/libsharpyuv.0.dylib' \
+            /usr/local/opt/webp/lib/libsharpyuv.0.dylib \
+            /usr/local/opt/webp/lib/libwebp.7.dylib
 
           # Something funky happens with freetype if mono is left
           sudo mv /Library/Frameworks/Mono.framework                           \
                   /Library/Frameworks/Mono.framework-disabled
 
-      - name: Rollback harfbuzz version
-        if: ${{ matrix.os == 'macos-11' }}
-        run: |
-          PKG_NAME=harfbuzz
-          FORMULA_COMMIT=beb314d142c6ba06c23c761699ebe6a96d0d9864
-          brew uninstall --ignore-dependencies "${PKG_NAME}" || true
-          FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/${FORMULA_COMMIT}/Formula/${PKG_NAME}.rb"
-          FORMULA_FILE=$(find $(brew --repository) -path "*/Formula/${PKG_NAME}.rb")
-          curl -fsSL "$FORMULA_URL" > "${FORMULA_FILE}"
-          HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install "${PKG_NAME}"
-
       - name: Set compiler
         run: |
           # This ensures for now we use clang11
@@ -92,7 +86,7 @@ jobs:
                    -DWARNINGS=ON -DWERROR=ON -DGLBINDING_ENABLED=$GLBINDING    \
                    -DENABLE_DISCORD=ON -DCMAKE_INSTALL_MESSAGE=NEVER           \
                    -DCMAKE_INSTALL_PREFIX=/usr -DINSTALL_SUBDIR_BIN=bin        \
-                   -DINSTALL_SUBDIR_SHARE=share/supertux2 -DBUILD_TESTS=ON
+                   -DINSTALL_SUBDIR_SHARE=share/supertux2
 
       - name: Build and install
         working-directory: build
@@ -129,8 +123,8 @@ jobs:
           aws_key_id: ${{ secrets.CI_DOWNLOAD_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.CI_DOWNLOAD_SECRET_ACCESS_KEY }}
           source_dir: 'build/upload'
-          destination_dir: "${{ github.sha }}/gh-actions/${{ matrix.os }}-${{ matrix.arch }}/${{ github.run_id }}" 
-           
+          destination_dir: "${{ github.sha }}/gh-actions/${{ matrix.os }}-${{ matrix.arch }}/${{ github.run_id }}"
+
       - name: Post uploaded file
         if: matrix.release && env.DOWNLOAD_APIKEY != null
         working-directory: build

.tx/config

@@ -1,66 +1,84 @@
 [main]
 host = https://www.transifex.com
 
-[supertux.menu-principale]
-file_filter = data/locale/<lang>.po
-minimum_perc = 75
-source_file = data/locale/messages.pot
-source_lang = en
-type = PO
+[o:arctic-games:p:supertux:r:bonus-1]
+file_filter            = data/levels/bonus1/<lang>.po
+source_file            = data/levels/bonus1/messages.pot
+source_lang            = en
+type                   = PO
+minimum_perc           = 75
+replace_edited_strings = false
+keep_translations      = false
 
-[supertux.bonus-1]
-file_filter = data/levels/bonus1/<lang>.po
-minimum_perc = 75
-source_file = data/levels/bonus1/messages.pot
-source_lang = en
-type = PO
+[o:arctic-games:p:supertux:r:bonus-2]
+file_filter            = data/levels/bonus2/<lang>.po
+source_file            = data/levels/bonus2/messages.pot
+source_lang            = en
+type                   = PO
+minimum_perc           = 75
+replace_edited_strings = false
+keep_translations      = false
 
-[supertux.bonus-2]
-file_filter = data/levels/bonus2/<lang>.po
-minimum_perc = 75
-source_file = data/levels/bonus2/messages.pot
-source_lang = en
-type = PO
+[o:arctic-games:p:supertux:r:bonus-3]
+file_filter            = data/levels/bonus3/<lang>.po
+source_file            = data/levels/bonus3/messages.pot
+source_lang            = en
+type                   = PO
+minimum_perc           = 75
+replace_edited_strings = false
+keep_translations      = false
 
-[supertux.bonus-3]
-file_filter = data/levels/bonus3/<lang>.po
-minimum_perc = 75
-source_file = data/levels/bonus3/messages.pot
-source_lang = en
-type = PO
+[o:arctic-games:p:supertux:r:bonus-4]
+file_filter            = data/levels/bonus4/<lang>.po
+source_file            = data/levels/bonus4/messages.pot
+source_lang            = en
+type                   = PO
+minimum_perc           = 75
+replace_edited_strings = false
+keep_translations      = false
 
-[supertux.bonus-4]
-file_filter = data/levels/bonus4/<lang>.po
-minimum_perc = 75
-source_file = data/levels/bonus4/messages.pot
-source_lang = en
-type = PO
+[o:arctic-games:p:supertux:r:community-island-2016]
+file_filter            = data/levels/community2016/<lang>.po
+source_file            = data/levels/community2016/messages.pot
+source_lang            = en
+type                   = PO
+minimum_perc           = 0
+replace_edited_strings = false
+keep_translations      = false
 
-[supertux.halloween-2014]
-file_filter = data/levels/halloween2014/<lang>.po
-minimum_perc = 75
-source_file = data/levels/halloween2014/messages.pot
-source_lang = en
-type = PO
+[o:arctic-games:p:supertux:r:halloween-2014]
+file_filter            = data/levels/halloween2014/<lang>.po
+source_file            = data/levels/halloween2014/messages.pot
+source_lang            = en
+type                   = PO
+minimum_perc           = 75
+replace_edited_strings = false
+keep_translations      = false
 
-[supertux.world-1]
-file_filter = data/levels/world1/<lang>.po
-minimum_perc = 75
-source_file = data/levels/world1/messages.pot
-source_lang = en
-type = PO
+[o:arctic-games:p:supertux:r:menu-principale]
+file_filter            = data/locale/<lang>.po
+source_file            = data/locale/messages.pot
+source_lang            = en
+type                   = PO
+minimum_perc           = 75
+replace_edited_strings = false
+keep_translations      = false
 
-[supertux.world-2]
-file_filter = data/levels/world2/<lang>.po
-minimum_perc = 75
-source_file = data/levels/world2/messages.pot
-source_lang = en
-type = PO
+[o:arctic-games:p:supertux:r:world-1]
+file_filter            = data/levels/world1/<lang>.po
+source_file            = data/levels/world1/messages.pot
+source_lang            = en
+type                   = PO
+minimum_perc           = 75
+replace_edited_strings = false
+keep_translations      = false
 
-[supertux.community-island-2016]
-file_filter = data/levels/community2016/<lang>.po
-minimum_perc = 0
-source_file = data/levels/community2016/messages.pot
-source_lang = en
-type = PO
+[o:arctic-games:p:supertux:r:world-2]
+file_filter            = data/levels/world2/<lang>.po
+source_file            = data/levels/world2/messages.pot
+source_lang            = en
+type                   = PO
+minimum_perc           = 75
+replace_edited_strings = false
+keep_translations      = false
 

CMakeLists.txt

@@ -140,6 +140,13 @@ else()
   option(HIDE_NONMOBILE_OPTIONS "Hide options that are impractical on mobile devices (e. g. changing screen resolution)" OFF)
 endif()
 
+# Configure main menu logo
+if(("${SUPERTUX_VERSION_STRING}" MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+$") OR IS_SUPERTUX_RELEASE OR STEAM_BUILD)
+  set(LOGO_FILE "logo.png")
+else()
+  set(LOGO_FILE "logo_dev.png")
+endif()
+
 if(WIN32)
   include(SuperTux/Win32)
 endif()
@@ -317,6 +324,7 @@ include(SuperTux/BuildInstall)
 ## Create config.h now that INSTALL_SUBDIR_* have been set.
 configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h )
 
+#[[
 ## Configure main menu logo
 if(("${SUPERTUX_VERSION_STRING}" MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+$") OR IS_SUPERTUX_RELEASE OR STEAM_BUILD)
   set(LOGO_FILE "logo_final.sprite")
@@ -341,6 +349,7 @@ if(ANDROID)
     WORKING_DIRECTORY ${DATADIR}
   )
 endif()
+#]]
 
 ## Build tests
 include(SuperTux/BuildTests)

README.md

@@ -4,7 +4,8 @@
 [![MacOS](https://github.com/SuperTux/supertux/actions/workflows/macos.yml/badge.svg?branch=master)](https://github.com/SuperTux/supertux/actions/workflows/macos.yml?branch=master)
 [![GNU/Linux](https://github.com/SuperTux/supertux/actions/workflows/gnulinux.yml/badge.svg?branch=master)](https://github.com/SuperTux/supertux/actions/workflows/gnulinux.yml?branch=master)
 [![Android](https://github.com/SuperTux/supertux/actions/workflows/android.yml/badge.svg?branch=master)](https://github.com/SuperTux/supertux/actions/workflows/android.yml?branch=master)
-[![BSD](https://github.com/SuperTux/supertux/actions/workflows/bsd.yml/badge.svg?branch=master)](https://github.com/SuperTux/supertux/actions/workflows/bsd.yml?branch=master)
+<!-- BSD disabled, see https://github.com/SuperTux/supertux/pull/2366#issuecomment-1670925526 -->
+<!-- [![BSD](https://github.com/SuperTux/supertux/actions/workflows/bsd.yml/badge.svg?branch=master)](https://github.com/SuperTux/supertux/actions/workflows/bsd.yml?branch=master) -->
 [![WebAssembly](https://github.com/SuperTux/supertux/actions/workflows/wasm.yml/badge.svg?branch=master)](https://github.com/SuperTux/supertux/actions/workflows/wasm.yml?branch=master)
 [![Ubuntu Touch](https://github.com/SuperTux/supertux/actions/workflows/ubuntu-touch.yml/badge.svg?branch=master)](https://github.com/SuperTux/supertux/actions/workflows/ubuntu-touch.yml?branch=master)
 [![Github All Releases](https://img.shields.io/github/downloads/supertux/supertux/total.svg?maxAge=2592000)](https://github.com/SuperTux/supertux)