Merge lp:~widelands-dev/widelands/gcc9 into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 9171
Proposed branch: lp:~widelands-dev/widelands/gcc9
Merge into: lp:widelands
Diff against target: 72 lines (+7/-25)
3 files modified
appveyor.yml (+2/-15)
src/graphic/gl/fields_to_draw.h (+4/-9)
utils/win32/innosetup/Widelands.iss (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/gcc9
Reviewer Review Type Date Requested Status
hessenfarmer playtest Approve
Review via email: mp+370692@code.launchpad.net

Commit message

Patch for GCC9.

Description of the change

Tested by kaputtnik

To post a comment you must log in.
Revision history for this message
kaputtnik (franku) wrote :

Didn't we need to adapt the travis/appveyor configuration?

I am unfamiliar with those configuration, so i didn't proposed the merge...

Revision history for this message
GunChleoc (gunchleoc) wrote :

Probably - I haven't looked into that yet.

Revision history for this message
Tino (tino79) wrote :

I've pushed the appveyor changes to a github branch: https://github.com/widelands/widelands/commit/1af305097f174a9a38e2710f3f96ed26d4f39e55

Sorry, I am not able to use bzr/launchpad on my new laptop anymore.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5286. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/564607195.
Appveyor build 5061. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gcc9-5061.

lp:~widelands-dev/widelands/gcc9 updated
9168. By Tino (tino79)

Update AppVeyor configuration for GCC9.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks, Tino!

I have applied your changes to this branch now.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Jobs are green on AppVeyor - can somebody with a Windows machine please test before we merge?

https://ci.appveyor.com/project/widelands-dev/widelands/builds/26365811

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

ok installed the appveyor x64 release build and did some playtest worked fine so far

review: Approve (playtest)
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for testing!

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'appveyor.yml'
2--- appveyor.yml 2019-06-01 20:53:24 +0000
3+++ appveyor.yml 2019-07-31 09:09:19 +0000
4@@ -20,21 +20,8 @@
5 # Update msys2 system (twice, first run does system packages)
6 - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
7 - cmd: "bash --login -c \"pacman -Suuyy --nodeps --noconfirm\""
8- # we need to downgrade GCC to the last working version
9- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-8.3.0-2-any.pkg.tar.xz\""
10- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-libgfortran-8.3.0-2-any.pkg.tar.xz\""
11- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-fortran-8.3.0-2-any.pkg.tar.xz\""
12- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-objc-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-objc-8.3.0-2-any.pkg.tar.xz\""
13- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-libs-8.3.0-2-any.pkg.tar.xz\""
14-
15- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-7.4.0-1-any.pkg.tar.xz\""
16- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-libgfortran-7.4.0-1-any.pkg.tar.xz\""
17- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-fortran-7.4.0-1-any.pkg.tar.xz\""
18- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-objc-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-objc-7.4.0-1-any.pkg.tar.xz\""
19- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-libs-7.4.0-1-any.pkg.tar.xz\""
20-
21 # Installed required libs
22- - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glew\""
23+ - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\""
24
25 shallow_clone: true
26
27@@ -49,7 +36,7 @@
28 - cmd: md build
29 - cmd: cd build
30 - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
31- - cmd: "IF \"%PLATFORM%\" == \"x86\" (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%) ELSE (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%)"
32+ - cmd: "IF \"%PLATFORM%\" == \"x86\" (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%) ELSE (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%)"
33 - cmd: "cmake --build ."
34 on_success:
35 - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
36
37=== modified file 'src/graphic/gl/fields_to_draw.h'
38--- src/graphic/gl/fields_to_draw.h 2019-05-29 15:43:40 +0000
39+++ src/graphic/gl/fields_to_draw.h 2019-07-31 09:09:19 +0000
40@@ -100,15 +100,10 @@
41 // coordinates in the map. Returns INVALID_INDEX if this field is not in the
42 // fields_to_draw.
43 inline int calculate_index(int fx, int fy) const {
44- uint16_t xidx = fx - min_fx_;
45- if (xidx >= w_) {
46- return kInvalidIndex;
47- }
48- uint16_t yidx = fy - min_fy_;
49- if (yidx >= h_) {
50- return kInvalidIndex;
51- }
52- return yidx * w_ + xidx;
53+ if (fx < min_fx_ || fx > max_fx_ || fy < min_fy_ || fy > max_fy_) {
54+ return kInvalidIndex;
55+ }
56+ return (fy - min_fy_) * w_ + (fx - min_fx_);
57 }
58
59 private:
60
61=== modified file 'utils/win32/innosetup/Widelands.iss'
62--- utils/win32/innosetup/Widelands.iss 2019-07-19 13:16:07 +0000
63+++ utils/win32/innosetup/Widelands.iss 2019-07-31 09:09:19 +0000
64@@ -114,7 +114,7 @@
65 #else
66 Source: {#DLLFolder}\libgcc_s_dw2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
67 #endif
68-Source: {#DLLFolder}\glew32.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
69+Source: {#DLLFolder}\libglbinding.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
70 Source: {#DLLFolder}\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
71 Source: {#DLLFolder}\libharfbuzz-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
72 Source: {#DLLFolder}\libicudt64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"

Subscribers

People subscribed via source and target branches

to status/vote changes: