gedit

Merge lp:~jbicha/gedit/snap-core18 into lp:~ubuntu-desktop/gedit/snap

  1. snap-core18
  2. Merge into snap
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 32
Proposed branch: lp:~jbicha/gedit/snap-core18
Merge into: lp:~ubuntu-desktop/gedit/snap
Diff against target: 46 lines (+15/-3)
1 file modified
snapcraft.yaml (+15/-3)
To merge this branch: bzr merge lp:~jbicha/gedit/snap-core18
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+362348@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snapcraft.yaml'
2--- snapcraft.yaml 2018-11-10 00:37:16 +0000
3+++ snapcraft.yaml 2019-01-28 18:42:06 +0000
4@@ -15,12 +15,13 @@
5
6 grade: stable # must be 'stable' to release into candidate/stable channels
7 confinement: strict
8+base: core18
9
10 plugs:
11- gnome-3-26-1604:
12+ gnome-3-28-1804:
13 interface: content
14 target: $SNAP/gnome-platform
15- default-provider: gnome-3-26-1604
16+ default-provider: gnome-3-28-1804
17 gtk-3-themes:
18 interface: content
19 target: $SNAP/data-dir/themes
20@@ -62,6 +63,18 @@
21 LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/lib/gedit
22
23 parts:
24+ desktop-gnome-platform:
25+ source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
26+ source-subdir: gtk
27+ plugin: make
28+ make-parameters: ["FLAVOR=gtk3"]
29+ build-packages:
30+ - build-essential
31+ - libgtk-3-dev
32+ override-build: |
33+ snapcraftctl build
34+ mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform
35+
36 gedit:
37 after: [desktop-gnome-platform]
38 source: https://gitlab.gnome.org/GNOME/gedit.git
39@@ -77,7 +90,6 @@
40 cp data/org.gnome.gedit.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
41 organize:
42 snap/gedit/current/usr: usr
43- build-attributes: [no-system-libraries]
44 build-packages:
45 - desktop-file-utils
46 - gettext

Subscribers

People subscribed via source and target branches

to all changes: