webbrowser-app

Merge lp:~osomon/webbrowser-app/16.10-SRU1 into lp:webbrowser-app/yakkety

  1. 16.10-SRU1
  2. Merge into 16.10
Proposed by Olivier Tilloy on 2016-10-14
Status: Merged
Approved by: Olivier Tilloy on 2016-10-18
Approved revision: 1544
Merged at revision: 1543
Proposed branch: lp:~osomon/webbrowser-app/16.10-SRU1
Merge into: lp:webbrowser-app/yakkety
Diff against target: 169 lines (+36/-37)
8 files modified
CMakeLists.txt (+0/-5)
debian/control (+1/-2)
debian/rules (+2/-1)
src/Ubuntu/CMakeLists.txt (+0/-8)
src/Ubuntu/Web/UbuntuWebContext.qml (+7/-1)
src/Ubuntu/Web/ua-overrides-desktop.js.in (+9/-9)
src/Ubuntu/Web/ua-overrides-mobile.js.in (+11/-11)
tests/unittests/qml/CMakeLists.txt (+6/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/16.10-SRU1
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2016-10-14 Pending
Review via email: mp+308487@code.launchpad.net

Commit Message

Fix FTBFS on yakkety arm64 and work around a limitation in the sound and microphone policy groups.

To post a comment you must log in.
lp:~osomon/webbrowser-app/16.10-SRU1 updated on 2016-10-14
1544. By Olivier Tilloy on 2016-10-14

Replace chromium version in UA overrides at runtime, not at build time.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-07-01 13:09:27 +0000
3+++ CMakeLists.txt 2016-10-14 11:46:01 +0000
4@@ -11,11 +11,6 @@
5 if(NOT INTLTOOL_EXTRACT)
6 message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
7 endif()
8-find_program(XVFBRUN xvfb-run)
9-if(NOT XVFBRUN)
10- message(FATAL_ERROR "Could not find xvfb-run, please install the xvfb package")
11-endif()
12-set(XVFB_COMMAND ${XVFBRUN} -s "-screen 0 640x480x24" -a)
13
14 # Standard install paths
15 include(GNUInstallDirs)
16
17=== modified file 'debian/control'
18--- debian/control 2016-08-25 09:52:00 +0000
19+++ debian/control 2016-10-14 11:46:01 +0000
20@@ -11,7 +11,7 @@
21 dh-translations,
22 libapparmor-dev,
23 libevdev-dev,
24- liboxideqt-qmlplugin (>= 1.15),
25+ liboxideqt-qmlplugin (>= 1.12),
26 libqt5sql5-sqlite,
27 libudev-dev,
28 lsb-release,
29@@ -23,7 +23,6 @@
30 qml-module-qtquick2 (>= 5.4),
31 qml-module-qtquick-layouts,
32 qml-module-qttest,
33- qmlscene,
34 qt5-default,
35 qt5-qmake,
36 qtbase5-dev (>= 5.4),
37
38=== modified file 'debian/rules'
39--- debian/rules 2016-09-27 16:19:42 +0000
40+++ debian/rules 2016-10-14 11:46:01 +0000
41@@ -18,7 +18,8 @@
42 sed 's#/run/shm/\.org\.chromium\.Chromium\.\*#/{dev,run}/shm/.org.chromium.Chromium.*#g' | \
43 egrep -v 'deny /run/udev/data/\*\* r,' | \
44 sed 's#^}$$#\n /sys/class/ r,\n /sys/class/input/ r,\n /run/udev/data/** r,\n}#g' | \
45- egrep -v '^\s*deny /dev/ r,\s*$$' \
46+ egrep -v '^\s*deny /dev/ r,\s*$$' | \
47+ sed 's#^\(\s*\)deny\(\s\+/{run,dev}/shm/pulse-shm\*\s\+w,\).*$$#\1owner\2#g' \
48 > ./debian/usr.bin.webbrowser-app
49 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
50 apparmor_parser -QTK ./debian/usr.bin.webbrowser-app
51
52=== modified file 'src/Ubuntu/CMakeLists.txt'
53--- src/Ubuntu/CMakeLists.txt 2016-07-01 13:06:40 +0000
54+++ src/Ubuntu/CMakeLists.txt 2016-10-14 11:46:01 +0000
55@@ -23,13 +23,5 @@
56 OUTPUT_VARIABLE UBUNTU_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
57 add_definitions(-DUBUNTU_VERSION="${UBUNTU_VERSION}")
58
59-execute_process(COMMAND ${XVFB_COMMAND} qmlscene --quit ${CMAKE_CURRENT_SOURCE_DIR}/chromium-version.qml
60- OUTPUT_VARIABLE CHROMIUM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
61-string(REGEX MATCH "\\[(.*)\\]" _ ${CHROMIUM_VERSION})
62-set(CHROMIUM_VERSION ${CMAKE_MATCH_1})
63-if(NOT CHROMIUM_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
64- message(FATAL_ERROR "Invalid chromium version: '${CHROMIUM_VERSION}'")
65-endif()
66-
67 add_subdirectory(Components)
68 add_subdirectory(Web)
69
70=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
71--- src/Ubuntu/Web/UbuntuWebContext.qml 2016-09-13 16:07:06 +0000
72+++ src/Ubuntu/Web/UbuntuWebContext.qml 2016-10-14 11:46:01 +0000
73@@ -91,7 +91,13 @@
74 }
75 if (temp !== null) {
76 console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script)))
77- userAgentOverrides = temp.overrides
78+ var chromiumVersion = Oxide.Oxide.chromiumVersion
79+ var overrides = []
80+ for (var o in temp.overrides) {
81+ var override = temp.overrides[o]
82+ overrides.push([override[0], override[1].replace(/\$\{CHROMIUM_VERSION\}/g, chromiumVersion)])
83+ }
84+ userAgentOverrides = overrides
85 temp.destroy()
86 }
87 }
88
89=== modified file 'src/Ubuntu/Web/ua-overrides-desktop.js.in'
90--- src/Ubuntu/Web/ua-overrides-desktop.js.in 2016-09-21 16:15:10 +0000
91+++ src/Ubuntu/Web/ua-overrides-desktop.js.in 2016-10-14 11:46:01 +0000
92@@ -19,17 +19,17 @@
93 .pragma library
94
95 var overrides = [
96- ["^https?:\/\/.+\.google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/@CHROMIUM_VERSION@ Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
97- ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1284158
98- ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1412880
99- ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1503506, http://pad.lv/1551649
100- ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1452616
101+ ["^https?:\/\/.+\.google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/${CHROMIUM_VERSION} Chrome/${CHROMIUM_VERSION} Safari/537.36"],
102+ ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1284158
103+ ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1412880
104+ ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1503506, http://pad.lv/1551649
105+ ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1452616
106
107 // Google hangouts (https://launchpad.net/bugs/1565055)
108- ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
109- ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
110- ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
111+ ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
112+ ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
113+ ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
114
115 // Google recaptcha (https://launchpad.net/bugs/1599146)
116- ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
117+ ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
118 ];
119
120=== modified file 'src/Ubuntu/Web/ua-overrides-mobile.js.in'
121--- src/Ubuntu/Web/ua-overrides-mobile.js.in 2016-08-19 10:10:12 +0000
122+++ src/Ubuntu/Web/ua-overrides-mobile.js.in 2016-10-14 11:46:01 +0000
123@@ -19,18 +19,18 @@
124 .pragma library
125
126 var overrides = [
127- ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1375889
128- ["^https?:\/\/(www|m)\.youtube\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1228415, http://pad.lv/1415107, http://pad.lv/1417258, http://pad.lv/1499394, http://pad.lv/1408760, http://pad.lv/1437485
129- ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1284158
130- ["^https?:\/\/(\w+\.)*hsbc\.com\.br\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1380657
131- ["^http:\/\/(\w+\.)*espn\.(go\.)?com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1316259
132- ["^https?:\/\/(www|m)\.facebook\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1538056, http://pad.lv/1457661
133- ["^https?:\/\/(mobile\.)?nytimes\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1573620
134+ ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1375889
135+ ["^https?:\/\/(www|m)\.youtube\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1228415, http://pad.lv/1415107, http://pad.lv/1417258, http://pad.lv/1499394, http://pad.lv/1408760, http://pad.lv/1437485
136+ ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1284158
137+ ["^https?:\/\/(\w+\.)*hsbc\.com\.br\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1380657
138+ ["^http:\/\/(\w+\.)*espn\.(go\.)?com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1316259
139+ ["^https?:\/\/(www|m)\.facebook\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1538056, http://pad.lv/1457661
140+ ["^https?:\/\/(mobile\.)?nytimes\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1573620
141 // Google hangouts (https://launchpad.net/bugs/1565055)
142- ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"],
143- ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"],
144- ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"],
145+ ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
146+ ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
147+ ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
148
149 // Google recaptcha (https://launchpad.net/bugs/1599146)
150- ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
151+ ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
152 ];
153
154=== modified file 'tests/unittests/qml/CMakeLists.txt'
155--- tests/unittests/qml/CMakeLists.txt 2016-07-01 12:51:45 +0000
156+++ tests/unittests/qml/CMakeLists.txt 2016-10-14 11:46:01 +0000
157@@ -6,6 +6,12 @@
158 find_package(Qt5QuickTest REQUIRED)
159 find_package(Qt5Sql REQUIRED)
160
161+find_program(XVFBRUN xvfb-run)
162+if(NOT XVFBRUN)
163+ message(FATAL_ERROR "Could not find xvfb-run, please install the xvfb package")
164+endif()
165+set(XVFB_COMMAND ${XVFBRUN} -s "-screen 0 640x480x24" -a)
166+
167 set(TEST tst_QmlTests)
168 set(SOURCES
169 ${webbrowser-common_SOURCE_DIR}/favicon-fetcher.cpp

Subscribers

People subscribed via source and target branches