Marcus Tomlinson has proposed merging
~marcustomlinson/epiphany/+git/snap:master into
~ubuntu-desktop/epiphany/+git/snap:master.
Commit message:
bump to 3.33.1 and link gtk & libdazzle from source
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
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.
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 18543be..44cb10a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -59,16 +59,18 @@ apps:
- desktop-legacy
- gsettings
- home
+ - hostname-control
- mount-observe
- network
+ - network-manager
- opengl
+ - password-manager-service
- pulseaudio
- removable-media
- screen-inhibit-control
- unity7
- upower-observe
- wayland
- - password-manager-service
desktop: usr/share/applications/org.gnome.Epiphany.desktop
environment:
GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
@@ -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
+ - -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
@@ -90,16 +140,15 @@ parts:
make-parameters: ["FLAVOR=gtk3"]
build-packages:
- build-essential
- - libgtk-3-dev
override-build: |
snapcraftctl build
mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform
epiphany:
- after: [desktop-gnome-platform, snapcraft-preload]
+ after: [desktop-gnome-platform, libdazzle, gtk, snapcraft-preload]
source: https://gitlab.gnome.org/GNOME/epiphany.git
source-type: git
- source-tag: 3.30.4
+ source-tag: 3.33.1
plugin: meson
meson-parameters: [--prefix=/snap/epiphany/current/usr]
organize:
@@ -107,11 +156,11 @@ parts:
override-pull: |
snapcraftctl pull
snapcraftctl set-version $(git describe --tags --abbrev=10)
- sed -i.bak -e 's|Icon=org.gnome.Epiphany$|Icon=${SNAP}/meta/gui/org.gnome.Epiphany.png|g' data/org.gnome.Epiphany.desktop.in
+ sed -i.bak -e 's|Icon=org.gnome.Epiphany$|Icon=${SNAP}/meta/gui/org.gnome.Epiphany.png|g' data/org.gnome.Epiphany.desktop.in.in
override-build: |
snapcraftctl build
mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
- cp ../src/data/icons/hicolor/512x512/apps/org.gnome.Epiphany.png $SNAPCRAFT_PART_INSTALL/meta/gui/
+ cp ../src/data/icons/hicolor/scalable/apps/org.gnome.Epiphany.svg $SNAPCRAFT_PART_INSTALL/meta/gui/
cp ../install/snap/epiphany/current/usr/share/applications/org.gnome.Epiphany.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
organize:
snap/epiphany/current/usr: usr
@@ -119,9 +168,7 @@ parts:
- gettext
- gobject-introspection
- itstool
- - libdazzle-1.0-dev
- libgcr-3-dev
- - libgtk-3-dev
- libjson-glib-dev
- libnotify-dev
- libsecret-1-dev
@@ -137,6 +184,7 @@ parts:
- python3
- python-gi-dev
- libgirepository1.0-dev
+ - gsettings-desktop-schemas-dev
stage-packages:
- gstreamer1.0-clutter-3.0
- gstreamer1.0-gl
@@ -146,7 +194,6 @@ parts:
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-bad
- gstreamer1.0-pulseaudio
- - libdazzle-1.0-0
- libgcr-base-3-1
- libgcr-ui-3-1
- libglu1-mesa
@@ -160,3 +207,17 @@ parts:
- libsqlite3-0
- libwebkit2gtk-4.0-37
- libxml2
+ - libxft2
+ stage:
+ - -usr/bin/gtk-update-icon-cache
+ - -usr/lib/*/gtk-3.0/3.0.0/printbackends/libprintbackend*.so*
+ - -usr/lib/*/libfribidi.so.0
+ - -usr/lib/*/libgdk-3.so.0
+ - -usr/lib/*/libgio-2.0.so.0
+ - -usr/lib/*/libglib-2.0.so.0
+ - -usr/lib/*/libgmodule-2.0.so.0
+ - -usr/lib/*/libgobject-2.0.so.0
+ - -usr/lib/*/libgthread-2.0.so.0
+ - -usr/lib/*/libgtk-3.so.0
+ - -usr/lib/*/libgtk-3-0/gtk-query-immodules-3.0
+ - -usr/lib/*/libpango*.so*
--
ubuntu-desktop mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
