Compiz

Merge lp:~bregma/compiz/lp-1477978 into lp:compiz/0.9.12

  1. lp-1477978
  2. Merge into 0.9.12
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3959
Merged at revision: 3962
Proposed branch: lp:~bregma/compiz/lp-1477978
Merge into: lp:compiz/0.9.12
Prerequisite: lp:~bregma/compiz/lp-1477654
Diff against target: 14 lines (+4/-0)
1 file modified
debian/rules (+4/-0)
To merge this branch: bzr merge lp:~bregma/compiz/lp-1477978
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Christopher Townsend (community) Approve
Review via email: mp+265821@code.launchpad.net

Commit message

force Compiz to build using C++-11 (required by build dependency libgtkmm-3.0-1).

Description of the change

Forces Compiz package to be build using C++-11 as required by build-dep libgtkmm-3.0-1.

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

Ok. I'll wait on Jenkins before top approving.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3959
http://jenkins.qa.ubuntu.com/job/compiz-ci/70/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/70/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Top approving since Jenkins can't figure out that it needs to pull in the prerequisite in order to build.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2014-11-25 19:25:20 +0000
3+++ debian/rules 2015-07-24 12:58:20 +0000
4@@ -11,6 +11,10 @@
5 # currently, segfault if CMAKE_BUILD_TYPE=Release
6 export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
7
8+# libgtkmm requires C++-11, and some plugins require libgtkmm, so we do too
9+# (lp: #1477978)
10+export DEB_CXXFLAGS_MAINT_APPEND=-std=c++11
11+
12 CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' include/core/abiversion.h )
13
14 override_dh_quilt_patch:

Subscribers

People subscribed via source and target branches