Merge lp:~hjd/widelands/boost-system-dependency into lp:widelands

[Hans Joachim Desserud]

Adds libboost-system-dev as a required build dependency. Should resolve the FTBFS issue in current trunk. I've started a build for my PPA to verify, see https://code.launchpad.net/~hjd/+recipe/widelands-test for results.

As mentioned in the bug report, I'll take a closer look at the build dependencies tomorrow with regards to the latest changes :)

[GunChleoc (gunchleoc)]

libsdl2-net-dev can be removed from debian/control too - take your time though, we'll survive a day without a nightly (unless the e-mails annoy you too much).

[Hans Joachim Desserud (hjd)]

It isn't shown by the diff below, but `.travis.sh` installs `libboost-all-dev`, which is a metapackage to install all boost components. This is likely the reason why this wasn't discovered until merged to trunk, since the Debian packaging is more minimal and only list the required components. Should we change this, so that travis also only installs the specific components we use?

(I think Debian/Ubuntu are one of the few distros to split up boost like this, so most other platforms where people do self-compile shouldn't see similar issues)

[GunChleoc (gunchleoc)]

If you want to do the work, I would not be against it. It would certainly help with flagging up issues for Debian :)

Let's get this branch in.

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2286. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/242179650.
Appveyor build 2121. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_boost_system_dependency-2121.

=== modified file '.travis.sh'
--- .travis.sh	2016-08-27 09:46:22 +0000
+++ .travis.sh	2017-06-11 09:26:49 +0000
@@ -27,12 +27,11 @@
    libglew-dev \
    libicu-dev \
    libpng-dev \
-   zlib1g-dev \
    libsdl2-dev \
    libsdl2-image-dev \
    libsdl2-mixer-dev \
-   libsdl2-net-dev \
    libsdl2-ttf-dev \
+   zlib1g-dev \
 ; do sleep 10; done
 
 # Configure the build
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-03-12 11:22:07 +0000
+++ debian/changelog	2017-06-11 09:26:49 +0000
@@ -1,6 +1,10 @@
 widelands (1:19+repack-3widelands1) UNRELEASED; urgency=medium
 
-
+  * Changed build dependencies:
+      - New build dependencies required:
+        libboost-system-dev
+      - No longer needed;
+        libsdl2-net-dev
   * Merged Debian packaging of Widelands 1:19+repack-3. Remaining changes:
     - Disabled all Debian-patches since applying them might cause conflicts as
       development moves along in latest trunk. They mostly concern 
 
=== modified file 'debian/control'
--- debian/control	2016-11-20 10:08:33 +0000
+++ debian/control	2017-06-11 09:26:49 +0000
@@ -15,13 +15,13 @@
 #  libminizip-dev,
   libboost-dev, 
   libboost-regex-dev, 
+  libboost-system-dev, 
   libboost-test-dev, 
   libglew1.6-dev | libglew-dev,
   libpng-dev, 
   libsdl2-dev, 
   libsdl2-image-dev, 
   libsdl2-mixer-dev, 
-  libsdl2-net-dev, 
   libsdl2-ttf-dev, 
   python,
   zlib1g-dev