Merge lp://qastaging/~mvo/oxide/crossbuild-friendly into lp://qastaging/~oxide-developers/oxide/oxide.trunk

Proposed by Michael Vogt
Status: Work in progress
Proposed branch: lp://qastaging/~mvo/oxide/crossbuild-friendly
Merge into: lp://qastaging/~oxide-developers/oxide/oxide.trunk
Diff against target: 19867 lines (+19800/-0)
13 files modified
debian/changelog (+240/-0)
debian/compat (+1/-0)
debian/control (+149/-0)
debian/copyright (+19225/-0)
debian/liboxideqt-qmlplugin.install (+1/-0)
debian/liboxideqtcore0.install (+6/-0)
debian/oxideqmlscene.install (+1/-0)
debian/oxideqt-codecs-extra.install (+1/-0)
debian/patches/gross-hack-for-dual-ffmpeg-build.patch (+108/-0)
debian/patches/series (+1/-0)
debian/rules (+40/-0)
debian/source.lintian-overrides (+26/-0)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp://qastaging/~mvo/oxide/crossbuild-friendly
Reviewer Review Type Date Requested Status
Chris Coulson Pending
Review via email: mp+234093@code.qastaging.launchpad.net

Description of the change

My goal is to be able to install ubuntu-sdk-libs-dev:armhf in a chroot. One problem right now is the hard dependency of liboxide on oxideqt-codecs|oxideqt-codecs-extra and (oddly enough) the conflict between them.

I end up in a situation where apt tries to install oxideqt-codecs-extra:armhf and oxideqt-codecs:amd64. They conlict which prevents the install.

One solution is to make them a recommend which may not be ideal if the codecs are indeed a hard dependency.

The other would be (and I'm happy to submit a new branch for this) to make the conflicts between oxideqt-codec arch specific as its fine to mix oxideqt-codecs:ARCH-1 and oxideqt-codecs-extra:ARCH-2 due to the different multiarch dir. So something like:
"""
Package: oxideqt-codecs
Conflicts: oxideqt-codecs-extra:${Arch}
...
Package: oxideqt-codecs-extra
Conflicts: oxideqt-codecs:${Arch}
"""
may work as well.

Ideally the codecs would just complement each other :) But I guess thats quite a bit more work.

So please let me know if you prefer the recommends approach or the arch specific conflicts.

Thanks,
 Michael

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) wrote :

Thanks for this.

Note, we have separate packaging branches for Oxide, so this should be proposed in to one of those :)

Have you tested what happens if either of the codecs packages aren't installed? (Particularly when viewing pages that contain audio or video)

Unmerged revisions

37. By Michael Vogt

make oxideqt-codecs/oxideqt-codecs-extra a recommends instead of a dependency to make it more cross build friendly

36. By Chris Coulson

releasing package oxide-qt version 1.2.0~bzr683-0ubuntu1

35. By Chris Coulson

* 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

34. By Chris Coulson

releasing package oxide-qt version 1.1.1-0ubuntu2

33. By Chris Coulson

releasing package oxide-qt version 1.1.1-0ubuntu1

32. By Chris Coulson

* 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

31. By Chris Coulson

releasing package oxide-qt version 1.1.0-0ubuntu1

30. By Chris Coulson

* 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

29. By Olivier Tilloy

Add back changes that were accidentally removed when 1.1.0 was published in the archive.

28. By Chris Coulson

releasing package oxide-qt version 1.1.0~bzr640-0ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: