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