webbrowser-app

Merge lp:~osomon/webbrowser-app/snap into lp:webbrowser-app

  1. snap
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 1552
Proposed branch: lp:~osomon/webbrowser-app/snap
Merge into: lp:webbrowser-app
Diff against target: 193 lines (+114/-3)
7 files modified
.bzrignore (+1/-0)
CMakeLists.txt (+3/-1)
make-snap.sh (+4/-0)
setup/gui/webbrowser-app.desktop.in (+27/-0)
snap/webbrowser-app.launcher (+10/-0)
snapcraft.yaml (+66/-0)
src/app/config.h.in (+3/-2)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/snap
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Alexandre Abreu (community) Approve
Review via email: mp+304794@code.launchpad.net

Commit message

Initial support for generating a snap package for webbrowser-app.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1516
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/624/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1411/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1411
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1270
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1270
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1270
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1267
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1267/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1267
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1267/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1267/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1267
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1267/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1267
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1267/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1267/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1267
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1267/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1267
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1267/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1267/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/624/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

looks ok (and works), I added a small comment,

review: Approve
Revision history for this message
Olivier Tilloy (osomon) wrote :

See answer inline.

lp:~osomon/webbrowser-app/snap updated
1517. By Olivier Tilloy

Use new naming convention for subparts.

1518. By Olivier Tilloy

Add a couple of missing build dependencies.

1519. By Olivier Tilloy

Merge the latest changes from trunk.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1519
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/660/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1652
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/396
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1652
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1498
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1498/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1498
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1498/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1498
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1498/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1498
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1498/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1498
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1498/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1498
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1498/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1498
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1498/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1498
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1498/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1498
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1498/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/660/rebuild

review: Needs Fixing (continuous-integration)
lp:~osomon/webbrowser-app/snap updated
1520. By Olivier Tilloy

Add 'camera' plug to webbrowser-app.
This needs to be manually connected: `sudo snap connect webbrowser-app:camera ubuntu-core:camera`

1521. By Olivier Tilloy

Add 'screen-inhibit-control' plug to webbrowser-app.
This one is connected automatically.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1520
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/663/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1666
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/399
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1666
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1512
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1512/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1512
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1512/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1512
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1512/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1512
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1512/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1512
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1512/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1512
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1512/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1512
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1512/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1512
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1512/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1512
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1512/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/663/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1521
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/664/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1667/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1667
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1513
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1513/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1513
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1513/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1513
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1513/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1513/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1513
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1513/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1513
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1513/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1513
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1513/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1513
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1513/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1513
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1513/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/664/rebuild

review: Needs Fixing (continuous-integration)
lp:~osomon/webbrowser-app/snap updated
1522. By Olivier Tilloy

Merge the latest changes from trunk.

1523. By Olivier Tilloy

Bump version number to reflect upstream changes.

1524. By Olivier Tilloy

Add icon to snap per http://snapcraft.io/docs/build-snaps/metadata#snap-icon.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1524
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/682/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1756
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/427
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1756
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1601
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1601/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1601
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1601/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1601
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1601/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1601
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1601/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1601
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1601/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1601
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1601/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1601
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1601/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1601
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1601/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1601
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1601/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/682/rebuild

review: Needs Fixing (continuous-integration)
lp:~osomon/webbrowser-app/snap updated
1525. By Olivier Tilloy

Add a script to generate a snap package, and include a desktop file.

1526. By Olivier Tilloy

Merge the latest changes from trunk.

1527. By Olivier Tilloy

Make the app work (unconfined) under unity8.

1528. By Olivier Tilloy

Fix desktop file so that Exec entries are not trimmed out on install.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1526
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/686/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1767
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/432
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1767
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1612
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1612
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1612
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1612
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1612
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1612
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1612
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1612
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1612
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1612/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/686/rebuild

review: Needs Fixing (continuous-integration)
lp:~osomon/webbrowser-app/snap updated
1529. By Olivier Tilloy

Ensure the app finds locale definitions.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1528
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/688/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1769
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/433
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1769
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1614
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1614/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1614
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1614/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1614
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1614/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1614
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1614/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1614
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1614/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1614
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1614/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1614
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1614/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1614
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1614/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1614
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1614/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/688/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1529
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/691/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1781
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/436
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1781
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1626
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1626/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1626
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1626/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1626
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1626/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1626
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1626/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1626
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1626/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1626
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1626/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1626
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1626/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1626
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1626/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1626
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1626/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/691/rebuild

review: Needs Fixing (continuous-integration)
lp:~osomon/webbrowser-app/snap updated
1530. By Olivier Tilloy

Revert last commit as the workaround has been included in the desktop helpers upstream
(https://github.com/ubuntu/snapcraft-desktop-helpers/commit/46bea1d261e005eecfe532a5a23d9dd080898432).

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1530
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/701/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1818
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/440
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1818
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1662
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1662
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1662
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1662
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1662
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1662
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1662
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1662
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1662
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1662/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/701/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2016-06-13 13:41:48 +0000
3+++ .bzrignore 2016-10-11 08:15:30 +0000
4@@ -31,6 +31,7 @@
5 doc/html
6 click-hooks/webapp-container-hook
7 click-hooks/webapp-container.hook
8+setup/gui/webbrowser-app.desktop
9
10 obj-*
11 debian/usr.bin.webbrowser-app
12
13=== modified file 'CMakeLists.txt'
14--- CMakeLists.txt 2016-07-01 13:09:27 +0000
15+++ CMakeLists.txt 2016-10-11 08:15:30 +0000
16@@ -67,13 +67,15 @@
17 add_subdirectory(tests)
18
19 # make non compiled files (QML, JS, images, etc.) visible in QtCreator
20-file(GLOB NON_COMPILED_ROOT *.png .bzrignore COPYING README)
21+file(GLOB NON_COMPILED_ROOT *.png .bzrignore COPYING make-snap.sh README snapcraft.yaml)
22 file(GLOB_RECURSE NON_COMPILED_SUBDIRS
23 debian/*.dirs debian/*.install debian/*.lintian-overrides debian/*.manifest
24 debian/compat debian/control debian/copyright debian/rules debian/source/format
25 debian/tests/*
26 doc/*.css doc/*.qdoc doc/*.qdocconf
27 po/*.po po/*.pot
28+ setup/gui/*.png setup/gui/webbrowser-app.desktop.in
29+ snap/webbrowser-app.launcher
30 src/*.js src/*.qml src/*.sci src/README
31 tests/*.py tests/*.qml)
32 add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_ROOT} ${NON_COMPILED_SUBDIRS})
33
34=== added file 'make-snap.sh'
35--- make-snap.sh 1970-01-01 00:00:00 +0000
36+++ make-snap.sh 2016-10-11 08:15:30 +0000
37@@ -0,0 +1,4 @@
38+#!/bin/sh
39+SNAP_DESKTOP_FILE=setup/gui/webbrowser-app.desktop
40+intltool-merge -d -u po $SNAP_DESKTOP_FILE.in $SNAP_DESKTOP_FILE
41+snapcraft
42
43=== added directory 'setup'
44=== added directory 'setup/gui'
45=== added symlink 'setup/gui/icon.png'
46=== target is u'../../webbrowser-app.png'
47=== added symlink 'setup/gui/screenshot.png'
48=== target is u'../../screenshot.png'
49=== added file 'setup/gui/webbrowser-app.desktop.in'
50--- setup/gui/webbrowser-app.desktop.in 1970-01-01 00:00:00 +0000
51+++ setup/gui/webbrowser-app.desktop.in 2016-10-11 08:15:30 +0000
52@@ -0,0 +1,27 @@
53+[Desktop Entry]
54+Version=1.0
55+_Name=Browser
56+_GenericName=Web Browser
57+_Comment=Browse the World Wide Web
58+_Keywords=Internet;WWW;Browser;Web;Explorer
59+Type=Application
60+Icon=${SNAP}/meta/gui/icon.png
61+Exec=webbrowser-app %u
62+Terminal=false
63+Categories=Network;WebBrowser;
64+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
65+X-Ubuntu-Touch=true
66+X-Ubuntu-Gettext-Domain=webbrowser-app
67+X-Ubuntu-Single-Instance=true
68+X-Ubuntu-Default-Department-ID=web-browsers
69+X-Screenshot=${SNAP}/meta/gui/screenshot.png
70+X-Ubuntu-Splash-Color=#FFFFFF
71+Actions=NewWindow;Incognito;
72+
73+[Desktop Action NewWindow]
74+_Name=Open a New Window
75+Exec=webbrowser-app --new-window
76+
77+[Desktop Action Incognito]
78+_Name=Open a New Private Window
79+Exec=webbrowser-app --incognito
80
81=== added directory 'snap'
82=== added file 'snap/webbrowser-app.launcher'
83--- snap/webbrowser-app.launcher 1970-01-01 00:00:00 +0000
84+++ snap/webbrowser-app.launcher 2016-10-11 08:15:30 +0000
85@@ -0,0 +1,10 @@
86+#!/bin/sh
87+
88+# Disable the chromium sandbox to work around https://launchpad.net/bugs/1599234.
89+# Rely on snapd’s security policy instead.
90+export OXIDE_NO_SANDBOX=1
91+
92+# Explicitly set APP_ID.
93+export APP_ID=webbrowser-app
94+
95+exec "$SNAP/bin/desktop-launch" "webbrowser-app" --desktop_file_hint=unity8 "$@"
96
97=== added file 'snapcraft.yaml'
98--- snapcraft.yaml 1970-01-01 00:00:00 +0000
99+++ snapcraft.yaml 2016-10-11 08:15:30 +0000
100@@ -0,0 +1,66 @@
101+name: webbrowser-app
102+version: 0.23+16.10.20160928-0ubuntu1
103+summary: Ubuntu web browser
104+description: A lightweight web browser tailored for Ubuntu, based on the Oxide browser engine and using the Ubuntu UI components.
105+confinement: strict
106+
107+apps:
108+ webbrowser-app:
109+ command: webbrowser-app.launcher
110+ plugs:
111+ - browser-sandbox
112+ - camera
113+ - network
114+ - network-bind
115+ - opengl
116+ - pulseaudio
117+ - screen-inhibit-control
118+ - unity7
119+
120+plugs:
121+ browser-sandbox:
122+ interface: browser-support
123+ allow-sandbox: true
124+
125+parts:
126+ webbrowser-app:
127+ plugin: cmake
128+ source: .
129+ build-packages:
130+ - intltool
131+ - libapparmor-dev
132+ - libevdev-dev
133+ - libudev-dev
134+ - lsb-release
135+ - pkg-config
136+ - qt5-default
137+ - qt5-qmake
138+ - qtbase5-dev
139+ - qtbase5-dev-tools
140+ - qtbase5-private-dev
141+ - qtdeclarative5-dev
142+ - qttools5-dev-tools
143+ - xvfb
144+ stage-packages:
145+ - fonts-liberation
146+ - liboxideqt-qmlplugin
147+ - libqt5sql5-sqlite
148+ - mir-graphics-drivers-desktop
149+ - qml-module-qt-labs-folderlistmodel
150+ - qml-module-qt-labs-settings
151+ - qml-module-qtquick2
152+ - qml-module-qtquick-layouts
153+ - qml-module-qtquick-window2
154+ - qml-module-ubuntu-components
155+ - qml-module-ubuntu-thumbnailer0.1
156+ - qtdeclarative5-ubuntu-content1
157+ - qtdeclarative5-ubuntu-download-manager0.1
158+ - qtdeclarative5-unity-action-plugin
159+ - qtubuntu-desktop
160+ after: [desktop-qt5]
161+
162+ launcher:
163+ plugin: dump
164+ source: snap
165+ organize:
166+ webbrowser-app.launcher: bin/webbrowser-app.launcher
167
168=== modified file 'src/app/config.h.in'
169--- src/app/config.h.in 2016-05-26 17:00:55 +0000
170+++ src/app/config.h.in 2016-10-11 08:15:30 +0000
171@@ -22,19 +22,20 @@
172 #include <QtCore/QCoreApplication>
173 #include <QtCore/QDir>
174 #include <QtCore/QString>
175+#include <QtCore/QtGlobal>
176
177 #define REMOTE_INSPECTOR_PORT 9221
178
179 inline bool isRunningInstalled()
180 {
181- static bool installed = (QCoreApplication::applicationDirPath() == QDir("@CMAKE_INSTALL_FULL_BINDIR@").canonicalPath());
182+ static bool installed = (QCoreApplication::applicationDirPath() == QDir(qgetenv("SNAP").append("@CMAKE_INSTALL_FULL_BINDIR@")).canonicalPath());
183 return installed;
184 }
185
186 inline QString UbuntuBrowserDirectory()
187 {
188 if (isRunningInstalled()) {
189- return QStringLiteral("@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app");
190+ return qgetenv("SNAP").append("@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app");
191 } else {
192 return QStringLiteral("@CMAKE_SOURCE_DIR@/src/app");
193 }

Subscribers

People subscribed via source and target branches

to status/vote changes: