1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-07-01 13:09:27 +0000
3
+++ CMakeLists.txt	2016-10-04 14:38:43 +0000
4
@@ -11,11 +11,6 @@
5
11
if(NOT INTLTOOL_EXTRACT)
11
if(NOT INTLTOOL_EXTRACT)
6
12
    message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
12
    message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
7
13
endif()
13
endif()
8
14
find_program(XVFBRUN xvfb-run)
9
15
if(NOT XVFBRUN)
10
16
  message(FATAL_ERROR "Could not find xvfb-run, please install the xvfb package")
11
17
endif()
12
18
set(XVFB_COMMAND ${XVFBRUN} -s "-screen 0 640x480x24" -a)
13
19
14
14
20
# Standard install paths
15
# Standard install paths
15
21
include(GNUInstallDirs)
16
include(GNUInstallDirs)
16
22
17
17
=== modified file 'debian/control'
18
--- debian/control	2016-08-25 09:52:00 +0000
19
+++ debian/control	2016-10-04 14:38:43 +0000
20
@@ -11,7 +11,7 @@
21
11
               dh-translations,
11
               dh-translations,
22
12
               libapparmor-dev,
12
               libapparmor-dev,
23
13
               libevdev-dev,
13
               libevdev-dev,
25
14
               liboxideqt-qmlplugin (>= 1.15),
14
               liboxideqt-qmlplugin (>= 1.12),
26
15
               libqt5sql5-sqlite,
15
               libqt5sql5-sqlite,
27
16
               libudev-dev,
16
               libudev-dev,
28
17
               lsb-release,
17
               lsb-release,
29
@@ -23,7 +23,6 @@
30
23
               qml-module-qtquick2 (>= 5.4),
23
               qml-module-qtquick2 (>= 5.4),
31
24
               qml-module-qtquick-layouts,
24
               qml-module-qtquick-layouts,
32
25
               qml-module-qttest,
25
               qml-module-qttest,
33
26
               qmlscene,
34
27
               qt5-default,
26
               qt5-default,
35
28
               qt5-qmake,
27
               qt5-qmake,
36
29
               qtbase5-dev (>= 5.4),
28
               qtbase5-dev (>= 5.4),
37
30
29
38
=== modified file 'src/Ubuntu/CMakeLists.txt'
39
--- src/Ubuntu/CMakeLists.txt	2016-07-01 13:06:40 +0000
40
+++ src/Ubuntu/CMakeLists.txt	2016-10-04 14:38:43 +0000
41
@@ -23,13 +23,5 @@
42
23
    OUTPUT_VARIABLE UBUNTU_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
23
    OUTPUT_VARIABLE UBUNTU_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
43
24
add_definitions(-DUBUNTU_VERSION="${UBUNTU_VERSION}")
24
add_definitions(-DUBUNTU_VERSION="${UBUNTU_VERSION}")
44
25
25
45
26
execute_process(COMMAND ${XVFB_COMMAND} qmlscene --quit ${CMAKE_CURRENT_SOURCE_DIR}/chromium-version.qml
46
27
    OUTPUT_VARIABLE CHROMIUM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
47
28
string(REGEX MATCH "\\[(.*)\\]" _ ${CHROMIUM_VERSION})
48
29
set(CHROMIUM_VERSION ${CMAKE_MATCH_1})
49
30
if(NOT CHROMIUM_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
50
31
    message(FATAL_ERROR "Invalid chromium version: '${CHROMIUM_VERSION}'")
51
32
endif()
52
33
53
34
add_subdirectory(Components)
26
add_subdirectory(Components)
54
35
add_subdirectory(Web)
27
add_subdirectory(Web)
55
36
28
56
=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
57
--- src/Ubuntu/Web/UbuntuWebContext.qml	2016-09-13 16:07:06 +0000
58
+++ src/Ubuntu/Web/UbuntuWebContext.qml	2016-10-04 14:38:43 +0000
59
@@ -91,7 +91,13 @@
60
91
            }
91
            }
61
92
            if (temp !== null) {
92
            if (temp !== null) {
62
93
                console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script)))
93
                console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script)))
64
94
                userAgentOverrides = temp.overrides
94
                var chromiumVersion = Oxide.Oxide.chromiumVersion
65
95
                var overrides = []
66
96
                for (var o in temp.overrides) {
67
97
                    var override = temp.overrides[o]
68
98
                    overrides.push([override[0], override[1].replace(/\$\{CHROMIUM_VERSION\}/g, chromiumVersion)])
69
99
                }
70
100
                userAgentOverrides = overrides
71
95
                temp.destroy()
101
                temp.destroy()
72
96
            }
102
            }
73
97
        }
103
        }
74
98
104
75
=== modified file 'src/Ubuntu/Web/ua-overrides-desktop.js.in'
76
--- src/Ubuntu/Web/ua-overrides-desktop.js.in	2016-09-21 16:15:10 +0000
77
+++ src/Ubuntu/Web/ua-overrides-desktop.js.in	2016-10-04 14:38:43 +0000
78
@@ -19,17 +19,17 @@
79
19
.pragma library
19
.pragma library
80
20
20
81
21
var overrides = [
21
var overrides = [
87
22
      ["^https?:\/\/.+\.google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/@CHROMIUM_VERSION@ Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
22
      ["^https?:\/\/.+\.google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/${CHROMIUM_VERSION} Chrome/${CHROMIUM_VERSION} Safari/537.36"],
88
23
      ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1284158
23
      ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1284158
89
24
      ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1412880
24
      ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1412880
90
25
      ["^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
25
      ["^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
91
26
      ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1452616
26
      ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1452616
92
27
27
93
28
      // Google hangouts (https://launchpad.net/bugs/1565055)
28
      // Google hangouts (https://launchpad.net/bugs/1565055)
97
29
      ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
29
      ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
98
30
      ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
30
      ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
99
31
      ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
31
      ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
100
32
32
101
33
      // Google recaptcha (https://launchpad.net/bugs/1599146)
33
      // Google recaptcha (https://launchpad.net/bugs/1599146)
103
34
      ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
34
      ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
104
35
];
35
];
105
36
36
106
=== modified file 'src/Ubuntu/Web/ua-overrides-mobile.js.in'
107
--- src/Ubuntu/Web/ua-overrides-mobile.js.in	2016-08-19 10:10:12 +0000
108
+++ src/Ubuntu/Web/ua-overrides-mobile.js.in	2016-10-04 14:38:43 +0000
109
@@ -19,18 +19,18 @@
110
19
.pragma library
19
.pragma library
111
20
20
112
21
var overrides = [
21
var overrides = [
120
22
    ["^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
22
    ["^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
121
23
    ["^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
23
    ["^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
122
24
    ["^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
24
    ["^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
123
25
    ["^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
25
    ["^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
124
26
    ["^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
26
    ["^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
125
27
    ["^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
27
    ["^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
126
28
    ["^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
28
    ["^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
127
29
    // Google hangouts (https://launchpad.net/bugs/1565055)
29
    // Google hangouts (https://launchpad.net/bugs/1565055)
131
30
    ["^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"],
30
    ["^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"],
132
31
    ["^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"],
31
    ["^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"],
133
32
    ["^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"],
32
    ["^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"],
134
33
33
135
34
    // Google recaptcha (https://launchpad.net/bugs/1599146)
34
    // Google recaptcha (https://launchpad.net/bugs/1599146)
137
35
    ["^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"],
35
    ["^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"],
138
36
];
36
];
139
37
37
140
=== modified file 'tests/unittests/qml/CMakeLists.txt'
141
--- tests/unittests/qml/CMakeLists.txt	2016-07-01 12:51:45 +0000
142
+++ tests/unittests/qml/CMakeLists.txt	2016-10-04 14:38:43 +0000
143
@@ -6,6 +6,12 @@
144
6
find_package(Qt5QuickTest REQUIRED)
6
find_package(Qt5QuickTest REQUIRED)
145
7
find_package(Qt5Sql REQUIRED)
7
find_package(Qt5Sql REQUIRED)
146
8
8
147
9
find_program(XVFBRUN xvfb-run)
148
10
if(NOT XVFBRUN)
149
11
  message(FATAL_ERROR "Could not find xvfb-run, please install the xvfb package")
150
12
endif()
151
13
set(XVFB_COMMAND ${XVFBRUN} -s "-screen 0 640x480x24" -a)
152
14
153
9
set(TEST tst_QmlTests)
15
set(TEST tst_QmlTests)
154
10
set(SOURCES
16
set(SOURCES
155
11
    ${webbrowser-common_SOURCE_DIR}/favicon-fetcher.cpp
17
    ${webbrowser-common_SOURCE_DIR}/favicon-fetcher.cpp
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-10-04
Alexandre Abreu (community)		2016-08-24	Approve on 2016-08-24
Review via email: mp+303852@code.launchpad.net