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

Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 8378
Proposed branch: lp:~hjd/widelands/boost-system-dependency
Merge into: lp:widelands
Diff against target: 52 lines (+7/-4)
3 files modified
.travis.sh (+1/-2)
debian/changelog (+5/-1)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~hjd/widelands/boost-system-dependency
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+325448@code.launchpad.net

Description of the change

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 :)

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

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).

Revision history for this message
Hans Joachim Desserud (hjd) wrote :

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)

Revision history for this message
GunChleoc (gunchleoc) wrote :

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
Revision history for this message
bunnybot (widelandsofficial) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.travis.sh'
2--- .travis.sh 2016-08-27 09:46:22 +0000
3+++ .travis.sh 2017-06-11 09:26:49 +0000
4@@ -27,12 +27,11 @@
5 libglew-dev \
6 libicu-dev \
7 libpng-dev \
8- zlib1g-dev \
9 libsdl2-dev \
10 libsdl2-image-dev \
11 libsdl2-mixer-dev \
12- libsdl2-net-dev \
13 libsdl2-ttf-dev \
14+ zlib1g-dev \
15 ; do sleep 10; done
16
17 # Configure the build
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2017-03-12 11:22:07 +0000
21+++ debian/changelog 2017-06-11 09:26:49 +0000
22@@ -1,6 +1,10 @@
23 widelands (1:19+repack-3widelands1) UNRELEASED; urgency=medium
24
25-
26+ * Changed build dependencies:
27+ - New build dependencies required:
28+ libboost-system-dev
29+ - No longer needed;
30+ libsdl2-net-dev
31 * Merged Debian packaging of Widelands 1:19+repack-3. Remaining changes:
32 - Disabled all Debian-patches since applying them might cause conflicts as
33 development moves along in latest trunk. They mostly concern
34
35=== modified file 'debian/control'
36--- debian/control 2016-11-20 10:08:33 +0000
37+++ debian/control 2017-06-11 09:26:49 +0000
38@@ -15,13 +15,13 @@
39 # libminizip-dev,
40 libboost-dev,
41 libboost-regex-dev,
42+ libboost-system-dev,
43 libboost-test-dev,
44 libglew1.6-dev | libglew-dev,
45 libpng-dev,
46 libsdl2-dev,
47 libsdl2-image-dev,
48 libsdl2-mixer-dev,
49- libsdl2-net-dev,
50 libsdl2-ttf-dev,
51 python,
52 zlib1g-dev

Subscribers

People subscribed via source and target branches

to status/vote changes: