Merge lp://staging/~laney/ubiquity/webkit2 into lp://staging/ubiquity

Proposed by Iain Lane
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 6376
Merged at revision: 6371
Proposed branch: lp://staging/~laney/ubiquity/webkit2
Merge into: lp://staging/ubiquity
Diff against target: 191 lines (+53/-27)
5 files modified
d-i/manifest (+9/-9)
d-i/update-control (+1/-1)
debian/changelog (+10/-0)
debian/control (+2/-2)
ubiquity/frontend/gtk_ui.py (+31/-15)
To merge this branch: bzr merge lp://staging/~laney/ubiquity/webkit2
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Sebastien Bacher Approve
Review via email: mp+282467@code.staging.launchpad.net

Commit message

Port to WebKit 2

Description of the change

Port to webkit2. I think it's fairly straightforward and seems to work.

We need to upload everything at once, so please review but don't merge/upload right away

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks for the work, it doesn't work for me though (using the version published in a ppa an hour ago), the slides don't display

/var/log/installer/debug has

"sys:1: PyGIWarning: WebKit2 was imported without specifying a version first. Use gi.require_version('WebKit2', '4.0') before import to ensure that the right version gets loaded.

(process:8709): Gtk-WARNING **: This process is currently running setuid or setgid.
This is not a supported use of GTK+. You must create a helper
program instead. For further details, see:

    http://www.gtk.org/setuid.html

Refusing to initialize GTK+."

one other small thing
"# True will not sure the menu"

is that a typo sure->show?

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

could you also version the import to avoid the require_version warning?

lp://staging/~laney/ubiquity/webkit2 updated
6373. By Iain Lane

Merge with trunk

6374. By Iain Lane

drop and regain privileges harder

6375. By Iain Lane

Set a minimal version for WK2

6376. By Iain Lane

typo sure -> show

Revision history for this message
Iain Lane (laney) wrote :

On Tue, Feb 09, 2016 at 02:54:18PM -0000, Sebastien Bacher wrote:
> Review: Needs Fixing
>
> thanks for the work, it doesn't work for me though (using the version published in a ppa an hour ago), the slides don't display

Try again from the PPA please. All should be fixed.

I did this to test it from a live session:

  $ sudo sed -i 's/main/main universe/' /etc/apt/sources.list
  $ sudo add-apt-repository ppa:laney/wk2
  $ sudo apt update
  $ sudo apt install ubiquity ubiquity-frontend-kde- # recommends? don't need the kdeish bits to test this

Then close terminal and launch using the desktop file on the desktop.

This

  http://people.canonical.com/~laney/weird-things/zlidezhow.png

is a screenshot of it which I took just now.

Cheers,

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 10 February 2016 at 15:12, Iain Lane <email address hidden> wrote:
> On Tue, Feb 09, 2016 at 02:54:18PM -0000, Sebastien Bacher wrote:
>> Review: Needs Fixing
>>
>> thanks for the work, it doesn't work for me though (using the version published in a ppa an hour ago), the slides don't display
>
> Try again from the PPA please. All should be fixed.
>
> I did this to test it from a live session:
>
> $ sudo sed -i 's/main/main universe/' /etc/apt/sources.list
> $ sudo add-apt-repository ppa:laney/wk2
> $ sudo apt update
> $ sudo apt install ubiquity ubiquity-frontend-kde- # recommends? don't need the kdeish bits to test this
>

for historical reasons we depends on : ubiquity-frontend-kde |
ubiquity-frontend-gtk

So one can do:

$ sudo apt install ubiquity ubiquity-frontend-gtk

to upgrade it mid flight.

> Then close terminal and launch using the desktop file on the desktop.
>
> This
>
> http://people.canonical.com/~laney/weird-things/zlidezhow.png
>
> is a screenshot of it which I took just now.
>
> Cheers,
>
> --
> Iain Lane [ <email address hidden> ]
> Debian Developer [ <email address hidden> ]
> Ubuntu Developer [ <email address hidden> ]
>
> https://code.launchpad.net/~laney/ubiquity/webkit2/+merge/282467
> You are subscribed to branch lp:ubiquity.

--
Regards,

Dimitri.

Revision history for this message
Sebastien Bacher (seb128) wrote :

the updated version works fine here, tried on yesterday's daily with the ppa, the slides display as they should, you can switch to next/previous ones and clicking on an url in summary slide opens the webbrowser on the correct url

review: Approve
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

LGTM.

review: Approve

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 status/vote changes: