Merge lp:~abreu-alexandre/oxide/chromedriver-packaging-utopic into lp:~oxide-developers/oxide/packaging.trusty

[Alexandre Abreu]

Add chromedriver that seems to have been forgotten

Add chromedriver that seems to have been forgotten

[lp:~abreu-alexandre/oxide/chromedriver-packaging-utopic]

40. By Chris Coulson on 2014-09-12

* Update to v1.2.1
  - Bump Chromium rev to 38.0.2125.58
  - Fix LP: #1260048 - Don't initialize NSS with a user DB for now
  - Fix LP: #1368117 - WebView.blockedContent doesn't get updated after
    a reload, because whilst the browser-side state is cleared when a
    navigation is committed, the renderer-side state is not cleared on a
    reload
  - Fix a null pointer deref for non-overridable SSL errors
  - Fix LP: #1368385 - Make all subframe and subresource SSL errors non-
    overridable, as overriding them doesn't always result in the security
    status API indicating a degraded security level
  - Fix LP: #1367446 - Ensure WebView.securityStatus.certificate is cleared
    when navigating away from a HTTPS url

41. By Chris Coulson on 2014-09-12

releasing package oxide-qt version 1.2.1-0ubuntu1

[Chris Coulson (chrisccoulson)]

This should be proposed in to packaging.utopic for now, shouldn't it?

Also, I think you need to add -DENABLE_CHROMEDRIVER=1 as an argument to cmake in debian/rules. Other than that, this looks fine

review: Needs Fixing

[lp:~abreu-alexandre/oxide/chromedriver-packaging-utopic]

42. By Chris Coulson on 2014-09-25

* Update to v1.2.2
  - Bump Chromium rev to 38.0.2125.77
  - Fix LP: #1324292 - Disable the touch editing mechanism to avoid
    breaking the webbrowser-app user script
  - Fix LP: #1362543 - Web application fails to load properly every other
    time. Ensure that when a new cache is created, the initial cache stats
    are stored to permanent storage immediately to avoid the cache being
    left in an inconsistent state if the process exits uncleanly before
    the stats are updated
  - Fix LP: #1371166 - Geolocation fails when the location source returns
    invalid values for some attributes
  - Fix LP: #1372414 - SSL certificates report incorrect dates because
    Chromium's base::Time measures milliseconds since the Windows epoch

43. By Chris Coulson on 2014-09-26

* Update to v1.2.4
  - Fix LP: #1352631 - Turn on accelerated canvas on krillin

44. By Chris Coulson on 2014-09-26

releasing package oxide-qt version 1.2.4-0ubuntu1

45. By Chris Coulson on 2014-10-14

* Update to v1.2.5
  - see USN-2345-1
  - Bump Chromium rev to 38.0.2125.101

46. By Chris Coulson on 2014-10-14

releasing package oxide-qt version 1.2.5-0ubuntu1

47. By Alexandre Abreu on 2014-10-21

Add chromedriver that seems to have been forgotten

Unmerged revisions

47. By Alexandre Abreu on 2014-10-21

Add chromedriver that seems to have been forgotten

46. By Chris Coulson on 2014-10-14

releasing package oxide-qt version 1.2.5-0ubuntu1

45. By Chris Coulson on 2014-10-14

* Update to v1.2.5
  - see USN-2345-1
  - Bump Chromium rev to 38.0.2125.101

44. By Chris Coulson on 2014-09-26

releasing package oxide-qt version 1.2.4-0ubuntu1

43. By Chris Coulson on 2014-09-26

* Update to v1.2.4
  - Fix LP: #1352631 - Turn on accelerated canvas on krillin

42. By Chris Coulson on 2014-09-25

* Update to v1.2.2
  - Bump Chromium rev to 38.0.2125.77
  - Fix LP: #1324292 - Disable the touch editing mechanism to avoid
    breaking the webbrowser-app user script
  - Fix LP: #1362543 - Web application fails to load properly every other
    time. Ensure that when a new cache is created, the initial cache stats
    are stored to permanent storage immediately to avoid the cache being
    left in an inconsistent state if the process exits uncleanly before
    the stats are updated
  - Fix LP: #1371166 - Geolocation fails when the location source returns
    invalid values for some attributes
  - Fix LP: #1372414 - SSL certificates report incorrect dates because
    Chromium's base::Time measures milliseconds since the Windows epoch

41. By Chris Coulson on 2014-09-12

releasing package oxide-qt version 1.2.1-0ubuntu1

40. By Chris Coulson on 2014-09-12

* Update to v1.2.1
  - Bump Chromium rev to 38.0.2125.58
  - Fix LP: #1260048 - Don't initialize NSS with a user DB for now
  - Fix LP: #1368117 - WebView.blockedContent doesn't get updated after
    a reload, because whilst the browser-side state is cleared when a
    navigation is committed, the renderer-side state is not cleared on a
    reload
  - Fix a null pointer deref for non-overridable SSL errors
  - Fix LP: #1368385 - Make all subframe and subresource SSL errors non-
    overridable, as overriding them doesn't always result in the security
    status API indicating a degraded security level
  - Fix LP: #1367446 - Ensure WebView.securityStatus.certificate is cleared
    when navigating away from a HTTPS url

39. By Chris Coulson on 2014-09-03

Add /usr/share/locale to liboxideqtcore0.install

38. By Chris Coulson on 2014-09-03

Refresh debian/patches/gross-hack-for-dual-ffmpeg-build.patch

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-11 10:54:13 +0000
+++ debian/changelog	2014-10-21 14:26:03 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 oxide-qt (1.1.3-0ubuntu0.14.04.1) trusty-security; urgency=medium
 
   * Update to v1.1.3
@@ -59,6 +60,238 @@
   * Update to v1.0.4
     - see LP: #1337301 for USN information
     - Bump Chromium to 36.0.1985.125
+=======
+oxide-qt (1.2.5-0ubuntu1) utopic; urgency=medium
+
+  * Update to v1.2.5
+    - see USN-2345-1
+    - Bump Chromium rev to 38.0.2125.101
+
+ -- Chris Coulson <[e-mail]>  Tue, 14 Oct 2014 12:39:07 +0100
+
+oxide-qt (1.2.4-0ubuntu1) utopic; urgency=medium
+
+  * Update to v1.2.4
+    - Fix LP: #1352631 - Turn on accelerated canvas on krillin
+
+ -- Chris Coulson <[e-mail]>  Fri, 26 Sep 2014 11:13:36 +0100
+
+oxide-qt (1.2.2-0ubuntu1) utopic; urgency=medium
+
+  * Update to v1.2.2
+    - Bump Chromium rev to 38.0.2125.77
+    - Fix LP: #1324292 - Disable the touch editing mechanism to avoid
+      breaking the webbrowser-app user script
+    - Fix LP: #1362543 - Web application fails to load properly every other
+      time. Ensure that when a new cache is created, the initial cache stats
+      are stored to permanent storage immediately to avoid the cache being
+      left in an inconsistent state if the process exits uncleanly before
+      the stats are updated
+    - Fix LP: #1371166 - Geolocation fails when the location source returns
+      invalid values for some attributes
+    - Fix LP: #1372414 - SSL certificates report incorrect dates because
+      Chromium's base::Time measures milliseconds since the Windows epoch
+
+ -- Chris Coulson <[e-mail]>  Thu, 25 Sep 2014 15:32:47 +0100
+
+oxide-qt (1.2.1-0ubuntu1) utopic; urgency=medium
+
+  * Update to v1.2.1
+    - Bump Chromium rev to 38.0.2125.58
+    - Fix LP: #1260048 - Don't initialize NSS with a user DB for now
+    - Fix LP: #1368117 - WebView.blockedContent doesn't get updated after
+      a reload, because whilst the browser-side state is cleared when a
+      navigation is committed, the renderer-side state is not cleared on a
+      reload
+    - Fix a null pointer deref for non-overridable SSL errors
+    - Fix LP: #1368385 - Make all subframe and subresource SSL errors non-
+      overridable, as overriding them doesn't always result in the security
+      status API indicating a degraded security level
+    - Fix LP: #1367446 - Ensure WebView.securityStatus.certificate is cleared
+      when navigating away from a HTTPS url
+
+ -- Chris Coulson <[e-mail]>  Fri, 12 Sep 2014 08:59:12 +0100
+
+oxide-qt (1.2.0-0ubuntu1) utopic; urgency=medium
+
+  * Update to v1.2.0
+    - Bump Chromium rev to 38.0.2125.24
+    - Add WebContext.devtoolsBindIp property
+    - Refactor the various BrowserContext classes to avoid having to modify
+      2 implementations of BrowserContext each time we add functionality that's
+      shared between the normal and OTR contexts
+    - Assert that BrowserContext is only accessed on the main thread
+    - Fix LP: #1224707 - Use a localized Accept-Language header
+    - Fix various threading issues in the interaction of WebContext and
+      WebContextDelegateWorker
+    - Don't leak the default WebPreferences object when setting a custom one
+    - Make certificate revocation checking work properly, which is also
+      required for EV to work. Also fixes some console spew (LP: #1240723)
+    - Fix LP: #1361868 - Don't leak GeolocationPermissionRequest if there are
+      no handlers on WebView.geolocationPermissionRequested
+    - Fix LP: #1214034:
+      + Add API's to query the security status of the webview
+        (WebView.securityStatus property + SecurityStatus and SslCertificate
+        classes)
+      + Add WebView.certificateError signal and CertificateError class to
+        give the application a chance to allow certain SSL errors (some errors
+        are non-overridable and this is enforced by Oxide - in which case, the
+        signal only acts as a notification)
+      + Add WebView.blockedContent property, which is a bitmask of content
+        types that have currently been blocked - currently this only indicates
+        MixedDisplay and MixedScript, but will be extended later on for other
+        content types (eg, cookies, popups etc)
+      + Add WebView.setCanTemporarily{Display,Run}InsecureContent functions,
+        which allows the mixed content blocker preferences to be overridden
+        temporarily (will reset on navigation to a new page)
+    - Fix LP: #1355703 - Linkedin profiles don't render correctly because
+      it triggers the mixed content blocker. Change the default for
+      WebPreferences.canDisplayInsecureContent to true to allow secure sites
+      to display insecure content. We can do this now we have a security
+      status API, as displaying insecure content results in
+      SecurityStatus.securityLevel indicating a degraded level. This is the
+      same default as Chrome. Note, insecure scripts are still blocked by
+      default
+    - Various fixes to the CookieManager API:
+      - Ensure that requests don't always get the same request ID
+      - Don't depend on undefined behaviour (signed integer overflow)
+      - Chromium can run callbacks for cookie requests synchronously - take
+        this in to account to avoid potentially hidden reentrancy issues
+      - Ensure that the responses at the API level always happen asynchronously
+      - Make it possible to set a session cookie instead of setting the expiry
+        to the Unix epoch when an expiration date isn't specifed (which then
+        gets rejected by Chromium for being already expired)
+      - Ensure that session cookies returned from the API don't have an expiry
+        date set to the Unix epoch (LP: #1362558)
+      - Rename CookieManager.gotCookies to CookieManager.getCookiesResponse and
+        CookieManager.cookiesSet to CookieManager.setCookiesResponse
+      - CookieManager.getCookiesResponse no longer returns a status code.
+        The only time getCookies can fail is before WebContext is fully
+        initialized, which we can indicate synchronously by returning an
+        invalid request ID
+      - CookieManager.getCookies() has been added so that it's possible to
+        request the cookies for a specific URL
+      - The cookie expirationdate attribute now accepts QML's built-in Date
+        type
+      - URL parameters in the API are now QUrl rather than QString
+      - When the response to setCookies indicates an error it's impossible
+        to know which cookies failed to set. Get rid of the status parameter
+        from CookieManager.setCookiesResponse and replace it with a list
+        of failed cookies instead
+  * Refresh debian/patches/gross-hack-for-dual-ffmpeg-build.patch
+  * Add /usr/share/locale to liboxideqtcore0.install
+
+ -- Chris Coulson <[e-mail]>  Wed, 03 Sep 2014 15:31:16 +0100
+
+oxide-qt (1.2.0~bzr683-0ubuntu1) utopic; urgency=medium
+
+  * Update to snapshot r683 from trunk
+    - Bump Chromium rev to 38.0.2114.2
+    - Don't modify Chromium's EGL implementation to select the GLES API when
+      creating contexts and calling eglMakeCurrent. These calls all happen
+      on a dedicated GPU thread with no application code running on it, and
+      the selected API is thread-local. We do still need to temporarily select
+      GLES at startup where we make the first few calls on the UI thread,
+      but we restore the originally selected API once done (only affects
+      Unity 8 desktop)
+    - Fix LP: #1286204 - Make double-tap-to-zoom work
+    - Adjust ui::ScaleGestureDetector::Config::min_pinch_update_span_delta to
+      remove the coarseness when pinching
+    - Fix LP: #1285750 - Add support for building a chromedriver binary
+    - Add OXIDE_DISABLE_SETUID_SANDBOX and OXIDE_DISABLE_SECCOMP_FILTER_SANDBOX
+      environment variables
+    - Assert we have a QGuiApplication on startup
+    - Fix LP: #1347924 - QProcess::waitForFinished() hangs - stop using
+      ContentMainRunner for starting the browser code - it does things with
+      process global state that are unexpected in a public library (eg,
+      setting the SIGCHLD handler to the default which breaks QProcess because
+      it relies on its own custom handler). We do still set the SIGPIPE action
+      to SIG_IGN, but only if it is SIG_DFL when we start. We also abort if the
+      SIGCHLD action is SIG_IGN when we initialize
+    - Fix LP: #1352952 - Ensure files returned by the file picker exist
+    - Fix LP: #1349510 - Browser crashes when attaching a photo in GMail -
+      when checking for an override for navigator.userAgent, limit the length
+      of the URL sent across IPC by trimming off the fragment, username and
+      password
+    - Add WebContext.cookieManager API
+  * Refresh debian/patches/gross-hack-for-dual-ffmpeg-build.patch
+
+ -- Chris Coulson <[e-mail]>  Tue, 12 Aug 2014 15:01:03 +0100
+
+oxide-qt (1.1.1-0ubuntu3) utopic; urgency=medium
+
+  * Update to v1.1.1
+    - Bump Chromium rev to 37.0.2062.58
+    - Fix LP: #1337389 - Make ContentBrowserClient::CanCreateWindow work
+      again
+    - Fix LP: #1332996 - QtCreator often halts for a minute. Don't crash on
+      Qt platforms that don't implement QPlatformNativeInterface. As we can't
+      get a native display handle on these platforms, disallow any GL
+      implementation in Chromium and guard against accesses to
+      BrowserProcessMain::GetNativeDisplay()
+  * Build with GCC 4.8 for now because GCC 4.9 breaks web content layout on
+    the device, which sucks quite a lot right before RTM
+    - update debian/rules
+    - update debian/control
+
+ -- Chris Coulson <[e-mail]>  Thu, 31 Jul 2014 10:41:43 +0100
+
+oxide-qt (1.1.0-0ubuntu1) utopic; urgency=medium
+
+  * Update to v1.1.0
+    - Bump Chromium rev to 37.0.2062.44
+    - Fix LP: #1337338 - Don't crash when destroying a visible RWHV, which
+      happens when a render process crashes
+    - Fix LP: #1337890 - Update the power save blocker to use the Unity API
+      on touch devices
+    - Fix LP: #1338639 - Don't crash when calling WebView.loadHtml() before
+      the webview is fully constructed
+
+ -- Chris Coulson <[e-mail]>  Tue, 29 Jul 2014 15:00:10 +0100
+
+oxide-qt (1.1.0~bzr640-0ubuntu1) utopic; urgency=medium
+
+  * Update to trunk snapshot r640
+    - Bump Chromium to 37.0.2062.3
+    - Fix LP: #1244373 - Screen blanks during video playback. Use the powerd
+      API for now on the device
+    - Fix LP: #1259216 - Expose WebView.icon property
+    - Fix LP: #1282063 - Add WebView.downloadRequested API
+    - Fix LP: #1307709 - webbrowser-app doesn't start in Unity 8 desktop
+      preview session. Fix this by using surfaceless EGL (pbuffers not supported
+      in the Mir EGL platform for mesa) and ensuring we always bind the
+      GLES API on Chromium's GPU thread
+    - Fix LP: #1312082 - Stop using deprecated compositing paths in Chromium
+    - Fix LP: #1323743 - OSK doesn't display after some time. Add a workaround
+      for this in Oxide for the time being
+    - Fix LP: #1324909 - User agent string is incorrect in newly opened
+      webviews and subframes
+    - Fix LP: #1332754 - Allow the frontbuffer and delegated frame data for
+      hidden webviews to be evicted
+    - Fix LP: #1252302 - Add devtools support
+    - Fix LP: #1312081 - Render content and handle input events directly in
+      the WebView, rather than having a per-process RenderViewItem
+    - Fix LP: #1330511 - Expose a Flickable-like API on WebView
+    - An empty preedit string in IM events doesn't mean we should do a commit.
+      Fixes an issue where deleting the last character of a composition does
+      a commit instead, causing the deletion to appear to fail
+    - Notify the IM of updates to cursor and anchor positions
+  * Refresh debian/patches/gross-hack-for-dual-ffmpeg-build.patch
+
+ -- Chris Coulson <[e-mail]>  Thu, 03 Jul 2014 09:52:30 +0100
+
+oxide-qt (1.0.2-0ubuntu3) utopic; urgency=medium
+
+  * Rebuild against Qt 5.3.0
+  * Change maintainer to Ubuntu Developers
+
+ -- Timo Jyrinki <[e-mail]>  Wed, 18 Jun 2014 05:49:32 +0000
+
+oxide-qt (1.0.2-0ubuntu2) utopic; urgency=medium
+
+  * Update to v1.0.2
+    - Bump Chromium to 36.0.1985.49
+>>>>>>> MERGE-SOURCE
     - Add experimental support for the Google Talk PPAPI plugin, to support
       Google Hangouts. This is hidden behind an environment variable that
       defaults to off (LP: #1308397)

=== modified file 'debian/control'
--- debian/control	2014-06-06 13:02:22 +0000
+++ debian/control	2014-10-21 14:26:03 +0000
@@ -1,7 +1,7 @@
 Source: oxide-qt
 Section: libs
 Priority: extra
-Maintainer: Chris Coulson <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 8.0.0),
     cmake,
     qt5-qmake,
@@ -37,7 +37,8 @@
     bison,
     xvfb,
     qtdeclarative5-qtquick2-plugin,
-    qtdeclarative5-test-plugin
+    qtdeclarative5-test-plugin,
+    g++-4.8
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/oxide
 
@@ -146,3 +147,16 @@
  it easy to embed web content in your Qt application
  .
  This package provides the debugging symbols for Oxide
+
+Package: oxideqt-chromedriver
+Architecture: any
+Section: misc
+Depends: ${misc:Depends},
+    liboxideqtcore0 (= ${binary:Version})
+Description: Web browser engine library for Qt (chromedriver build)
+ Oxide is a web browser engine library based on Google Chromium, that makes
+ it easy to embed web content in your Qt application
+ .
+ This package provides the chromedriver binary that can be used
+ as a WebDriver proxy to drive oxide with Selenium or any WebDriver
+ based client.

=== modified file 'debian/liboxideqtcore0.install'
--- debian/liboxideqtcore0.install	2014-04-08 20:04:01 +0000
+++ debian/liboxideqtcore0.install	2014-10-21 14:26:03 +0000
@@ -4,3 +4,4 @@
 usr/lib/*/oxide-qt/oxide-renderer
 usr/lib/*/oxide-qt/*.dat
 usr/lib/*/oxide-qt/*.pak
+usr/share/locale

=== added file 'debian/oxideqt-chromedriver.install'
--- debian/oxideqt-chromedriver.install	1970-01-01 00:00:00 +0000
+++ debian/oxideqt-chromedriver.install	2014-10-21 14:26:03 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/oxide-qt/chromedriver

=== modified file 'debian/patches/gross-hack-for-dual-ffmpeg-build.patch'
--- debian/patches/gross-hack-for-dual-ffmpeg-build.patch	2014-08-27 15:00:41 +0000
+++ debian/patches/gross-hack-for-dual-ffmpeg-build.patch	2014-10-21 14:26:03 +0000
@@ -1,7 +1,16 @@
+<<<<<<< TREE
 Index: oxide-qt-1.1.2/CMakeLists.txt
+=======
+Index: oxide-qt-1.2.0/CMakeLists.txt
+>>>>>>> MERGE-SOURCE
 ===================================================================
+<<<<<<< TREE
 --- oxide-qt-1.1.2.orig/CMakeLists.txt	2014-08-27 15:56:33.905756648 +0100
 +++ oxide-qt-1.1.2/CMakeLists.txt	2014-08-27 15:56:33.865756648 +0100
+=======
+--- oxide-qt-1.2.0.orig/CMakeLists.txt	2014-09-03 16:08:28.077973471 +0100
++++ oxide-qt-1.2.0/CMakeLists.txt	2014-09-03 16:08:28.065973471 +0100
+>>>>>>> MERGE-SOURCE
 @@ -101,7 +101,7 @@
    list(APPEND GYP_COMMAND -Dproprietary_codecs=1)
  else()
@@ -11,6 +20,7 @@
  endif()
  if(DEFINED ENABLE_PLUGINS AND ENABLE_PLUGINS EQUAL 0)
    list(APPEND GYP_COMMAND -Denable_plugins=0)
+<<<<<<< TREE
 Index: oxide-qt-1.1.2/third_party/chromium/src/content/content_renderer.gypi
 ===================================================================
 --- oxide-qt-1.1.2.orig/third_party/chromium/src/content/content_renderer.gypi	2014-08-27 15:56:33.905756648 +0100
@@ -29,6 +39,14 @@
 +++ oxide-qt-1.1.2/third_party/chromium/src/content/renderer/renderer_webkitplatformsupport_impl.cc	2014-08-27 15:56:33.869756648 +0100
 @@ -116,6 +116,12 @@
  #define WebScrollbarBehaviorImpl blink::WebScrollbarBehavior
+=======
+Index: oxide-qt-1.2.0/third_party/chromium/src/content/renderer/renderer_webkitplatformsupport_impl.cc
+===================================================================
+--- oxide-qt-1.2.0.orig/third_party/chromium/src/content/renderer/renderer_webkitplatformsupport_impl.cc	2014-09-03 16:08:28.077973471 +0100
++++ oxide-qt-1.2.0/third_party/chromium/src/content/renderer/renderer_webkitplatformsupport_impl.cc	2014-09-03 16:08:28.065973471 +0100
+@@ -121,6 +121,12 @@
+ #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
+>>>>>>> MERGE-SOURCE
  #endif
  
 +#if defined(USE_PROPRIETARY_CODECS)
@@ -40,7 +58,11 @@
  using blink::Platform;
  using blink::WebAudioDevice;
  using blink::WebBlobRegistry;
+<<<<<<< TREE
 @@ -414,6 +420,15 @@
+=======
+@@ -403,6 +409,15 @@
+>>>>>>> MERGE-SOURCE
    if (!net::IsSupportedMediaMimeType(mime_type_ascii))
      return IsNotSupported;
  
@@ -56,7 +78,11 @@
    if (!key_system.isEmpty()) {
      // Check whether the key system is supported with the mime_type and codecs.
  
+<<<<<<< TREE
 @@ -469,6 +484,16 @@
+=======
+@@ -451,6 +466,16 @@
+>>>>>>> MERGE-SOURCE
    net::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codec_ids, false);
    if (mime_type_ascii.empty())
      return false;
@@ -73,11 +99,21 @@
    return media::StreamParserFactory::IsTypeSupported(
        mime_type_ascii, parsed_codec_ids);
  }
+<<<<<<< TREE
 Index: oxide-qt-1.1.2/third_party/chromium/src/net/base/mime_util.cc
+=======
+Index: oxide-qt-1.2.0/third_party/chromium/src/net/base/mime_util.cc
+>>>>>>> MERGE-SOURCE
 ===================================================================
+<<<<<<< TREE
 --- oxide-qt-1.1.2.orig/third_party/chromium/src/net/base/mime_util.cc	2014-08-27 15:56:33.905756648 +0100
 +++ oxide-qt-1.1.2/third_party/chromium/src/net/base/mime_util.cc	2014-08-27 15:56:33.873756648 +0100
 @@ -1063,6 +1063,15 @@
+=======
+--- oxide-qt-1.2.0.orig/third_party/chromium/src/net/base/mime_util.cc	2014-09-03 16:08:28.077973471 +0100
++++ oxide-qt-1.2.0/third_party/chromium/src/net/base/mime_util.cc	2014-09-03 16:08:28.065973471 +0100
+@@ -1340,6 +1340,15 @@
+>>>>>>> MERGE-SOURCE
    return file_type != CERTIFICATE_MIME_TYPE_UNKNOWN;
  }
  
@@ -93,10 +129,19 @@
  void AddMultipartValueForUpload(const std::string& value_name,
                                  const std::string& value,
                                  const std::string& mime_boundary,
+<<<<<<< TREE
 Index: oxide-qt-1.1.2/third_party/chromium/src/net/base/mime_util.h
+=======
+Index: oxide-qt-1.2.0/third_party/chromium/src/net/base/mime_util.h
+>>>>>>> MERGE-SOURCE
 ===================================================================
+<<<<<<< TREE
 --- oxide-qt-1.1.2.orig/third_party/chromium/src/net/base/mime_util.h	2014-08-27 15:56:33.905756648 +0100
 +++ oxide-qt-1.1.2/third_party/chromium/src/net/base/mime_util.h	2014-08-27 15:56:33.873756648 +0100
+=======
+--- oxide-qt-1.2.0.orig/third_party/chromium/src/net/base/mime_util.h	2014-09-03 16:08:28.077973471 +0100
++++ oxide-qt-1.2.0/third_party/chromium/src/net/base/mime_util.h	2014-09-03 16:08:28.065973471 +0100
+>>>>>>> MERGE-SOURCE
 @@ -46,6 +46,8 @@
  NET_EXPORT bool IsSupportedJavascriptMimeType(const std::string& mime_type);
  NET_EXPORT bool IsSupportedCertificateMimeType(const std::string& mime_type);
@@ -106,3 +151,15 @@
  // Convenience function.
  NET_EXPORT bool IsSupportedMimeType(const std::string& mime_type);
  
+Index: oxide-qt-1.2.0/third_party/chromium/src/content/content_renderer.gypi
+===================================================================
+--- oxide-qt-1.2.0.orig/third_party/chromium/src/content/content_renderer.gypi	2014-09-03 16:08:28.077973471 +0100
++++ oxide-qt-1.2.0/third_party/chromium/src/content/content_renderer.gypi	2014-09-03 16:08:28.069973471 +0100
+@@ -17,6 +17,7 @@
+     '../mojo/mojo_base.gyp:mojo_js_bindings_lib',
+     '../net/net.gyp:net',
+     '../skia/skia.gyp:skia',
++    '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+     '../third_party/WebKit/public/blink.gyp:blink',
+     '../third_party/icu/icu.gyp:icui18n',
+     '../third_party/icu/icu.gyp:icuuc',

=== modified file 'debian/rules'
--- debian/rules	2014-06-05 15:13:14 +0000
+++ debian/rules	2014-10-21 14:26:03 +0000
@@ -7,19 +7,20 @@
 export DH_OPTIONS
 
 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+COMMON_OPTIONS := -DENABLE_TESTS=1 -DENABLE_CHROMEDRIVER=1 -DCMAKE_C_COMPILER=$(shell which gcc-4.8) -DCMAKE_CXX_COMPILER=$(shell which g++-4.8)
 
 %:
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DENABLE_TESTS=1 -DENABLE_PROPRIETARY_CODECS=1
+	dh_auto_configure -- $(COMMON_OPTIONS) -DENABLE_PROPRIETARY_CODECS=1
 
 override_dh_auto_test:
 	#xvfb-run -a -s "-screen 0 1024x768x24" dh_auto_test --max-parallel=1
 
 override_dh_auto_install:
 	dh_auto_install
-	dh_auto_configure -- -DENABLE_TESTS=1 -DENABLE_PROPRIETARY_CODECS=0
+	dh_auto_configure -- $(COMMON_OPTIONS) -DENABLE_PROPRIETARY_CODECS=0
 	dh_auto_build
 	dh_auto_install --destdir debian/tmp.free