gallery-app

Merge lp:~osomon/gallery-app/fix-ftbfs into lp:gallery-app

  1. fix-ftbfs
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Günter Schwann
Approved revision: 816
Merged at revision: 816
Proposed branch: lp:~osomon/gallery-app/fix-ftbfs
Merge into: lp:gallery-app
Diff against target: 13 lines (+2/-1)
1 file modified
src/medialoader/CMakeLists.txt (+2/-1)
To merge this branch: bzr merge lp:~osomon/gallery-app/fix-ftbfs
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Günter Schwann (community) Approve
Review via email: mp+180786@code.launchpad.net

Commit message

Fix FTBFS.

To post a comment you must log in.
Revision history for this message
Günter Schwann (schwann) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/98
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2342
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/72/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2348
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2348/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1990
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/74
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/74/artifact/work/output/*zip*/output.zip
    FAILURE: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/72/console
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/69

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:816
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/434/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/244
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2356
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2356/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1997
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/77
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/75
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/72

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/434/rebuild

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

PASSED: Continuous integration, rev:816
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/435/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/245
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2358
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2358/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1999
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/78
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/76
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/73

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/435/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/medialoader/CMakeLists.txt'
2--- src/medialoader/CMakeLists.txt 2013-08-15 06:40:15 +0000
3+++ src/medialoader/CMakeLists.txt 2013-08-19 06:47:03 +0000
4@@ -30,7 +30,8 @@
5 video-metadata.cpp
6 )
7
8-set(CMAKE_CXX_FLAGS ${MEDIAINFO_CFLAGS_OTHER})
9+string(REPLACE ";" " " OTHER_CFLAGS "${MEDIAINFO_CFLAGS_OTHER}")
10+set(CMAKE_CXX_FLAGS ${OTHER_CFLAGS})
11
12 add_library(${GALLERY_MEDIALOADER_LIB}
13 ${gallery_medialoader_SRCS}

Subscribers

People subscribed via source and target branches