Package: colobot / 0.2.2-2

Metadata

Package Version Patches format
colobot 0.2.2-2 3.0 (quilt)

Patch series

view the series file
Patch File delta Description
appstream fixes.patch | (download)

desktop/info.colobot.Colobot.appdata.xml | 7 5 + 2 - 0 !
1 file changed, 5 insertions(+), 2 deletions(-)

 minor fixes to appstream data
i18n fix multiple languages desktop files.patch | (download)

desktop/CMakeLists.txt | 15 11 + 4 - 0 !
1 file changed, 11 insertions(+), 4 deletions(-)

 fix building with partial translations for some languages
i18n desktop german.patch | (download)

desktop/po/de.po | 40 40 + 0 - 0 !
1 file changed, 40 insertions(+)

 add very basic german .desktop file translation
find music in root for multi source.patch | (download)

data/music/CMakeLists.txt | 7 3 + 4 - 0 !
1 file changed, 3 insertions(+), 4 deletions(-)

 cope with the music orig.tar being unpacked in music/ and not in data/music
fix install of ogg files.patch | (download)

data/music/CMakeLists.txt | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fix install of converted ogg files
oggenc reproducibly.patch | (download)

data/music/CMakeLists.txt | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 pass the original flac file's bytesize as serial integer to oggenc
 to avoid picking unreproducibilty from current time and process id
doxygen reproducibly.patch | (download)

Doxyfile.in | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 in doxyfile, ask for a strip of the project source directory, to
 avoid picking unreproducibilty from the build path
revert linux savegame path.patch | (download)

src/common/system/system_linux.cpp | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 revert "fix linux savegame path issue" from alexander olofsson <ace@haxalot.com>

Upstream's d11404a6e9ddf5017f18b2ab0565c19e066f33ee

Given the buster freeze, don't break this for buster users just now.


simpler FindSDL2 cmake.patch | (download)

CMakeLists.txt | 6 3 + 3 - 0 !
cmake/FindSDL2.cmake | 388 0 + 388 - 0 !
cmake/FindSDL2_image.cmake | 222 0 + 222 - 0 !
cmake/FindSDL2_ttf.cmake | 222 0 + 222 - 0 !
src/CMakeLists.txt | 8 4 + 4 - 0 !
5 files changed, 7 insertions(+), 839 deletions(-)

 remove findsdl2 find-module, use sdl2-config.cmake instead

This requires SDL >= 2.0.4.

Since <https://bugzilla.libsdl.org/show_bug.cgi?id=2464> was fixed in
SDL 2.0.4, SDL behaves as a CMake "config-file package", even if it was
not itself built using CMake: it installs a sdl2-config.cmake file to
${libdir}/cmake/SDL2, which tells CMake where to find SDL's headers and
library, analogous to a pkg-config .pc file.

As a result, we no longer need to copy/paste a "find-module package"
to be able to find a system copy of SDL >= 2.0.4 with find_package(SDL2).
Find-module packages are now discouraged by the CMake developers, in
favour of having upstream projects behave as config-file packages.

This results in a small API change: FindSDL2 used to set SDL2_INCLUDE_DIR
and SDL2_LIBRARY, but the standard behaviour for config-file packages is
to set <name>_INCLUDE_DIRS and <name>_LIBRARIES. Use the CONFIG keyword
to make sure we search in config-file package mode, and will not find a
FindSDL2.cmake in some other directory that implements the old interface.

In addition to deleting redundant code, this avoids some assumptions in
FindSDL2 about the layout of a SDL installation. The current libsdl2-dev
package in Debian breaks those assumptions; this is considered a bug
and will hopefully be fixed soon, but it illustrates how fragile these
fix gcc15 extern c main.patch | (download)

src/app/main.cpp | 8 7 + 1 - 0 !
1 file changed, 7 insertions(+), 1 deletion(-)

 [patch] check if sdl_main is in use

The main() function of colobot-app is declared as extern "C" to prevent
name mangling. This is required because on some platforms, SDL2 declares
its own main() function and defines a macro that renames the user's main
to SDL_main; in which case, name mangling may cause linking failures.

However, when building for platforms where this is not the case,
gcc15 complains that specifying linkage for main is not allowed.
> error: cannot declare ::main with a linkage
>        specification [-Wpedantic]

This commit wraps the extern block in #ifdefs that check
if the main -> SDL_main macro is in use.

Bug-Debian: https://bugs.debian.org/1096454
verbose oggenc stat.patch | (download)

data/music/CMakeLists.txt | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

---