[Merge] ~marcustomlinson/epiphany/+git/snap:master into ~ubuntu-desktop/epiphany/+git/snap:master

[Ken VanDine]

Review: Approve

Looks good, just one inline comment but nothing important.

Diff comments:

> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index 18543be..44cb10a 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -83,6 +85,54 @@ parts:
>        - gcc-multilib
>        - g++-multilib
>  
> +  gtk:
> +    source: https://gitlab.gnome.org/GNOME/gtk.git
> +    source-branch: gtk-3-24
> +    source-depth: 1
> +    plugin: meson
> +    meson-parameters:
> +      - --prefix=/usr
> +      - -Dbroadway_backend=true

You can probably disable broadway and introspection, but not really important.

> +      - -Dx11_backend=true
> +      - -Dwayland_backend=true
> +      - -Dwin32_backend=false
> +      - -Dquartz_backend=false
> +      - -Dxinerama=yes
> +      - -Dintrospection=true
> +      - -Dbuiltin_immodules=yes
> +      - -Ddemos=false
> +      - -Dexamples=false
> +    organize:
> +      usr/lib/gtk-3.0: usr/lib/$SNAPCRAFT_ARCH_TRIPLET/gtk-3.0
> +      usr/bin/gtk-query-immodules-3.0: usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libgtk-3-0/gtk-query-immodules-3.0
> +    build-packages:
> +      - libwayland-dev
> +      - wayland-protocols
> +      - libxkbcommon-dev
> +      - libxinerama-dev
> +      - libcups2-dev
> +      - libcolord-dev
> +      - libxrandr-dev
> +      - libxcursor-dev
> +      - libisocodes-dev
> +      - libxcomposite-dev
> +      - libxdamage-dev
> +      - libxfixes-dev
> +      - libxi-dev
> +      - libxkbfile-dev
> +      - libxml2-utils
> +      - libmount-dev
> +      - libthai-dev
> +      - librest-dev
> +
> +  libdazzle:
> +    source: https://gitlab.gnome.org/GNOME/libdazzle.git
> +    source-depth: 1
> +    plugin: meson
> +    meson-parameters: [ --prefix=/usr ]
> +    build-packages:
> +      - valac
> +
>    desktop-gnome-platform:
>      source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
>      source-subdir: gtk


-- 
https://code.launchpad.net/~marcustomlinson/epiphany/+git/snap/+merge/368059
Your team Ubuntu Desktop is requested to review the proposed merge of ~marcustomlinson/epiphany/+git/snap:master into ~ubuntu-desktop/epiphany/+git/snap:master.