gedit

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

  1. snap-add-plugins
  2. Merge into snap
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 36
Proposed branch: lp:~jbicha/gedit/snap-add-plugins
Merge into: lp:~ubuntu-desktop/gedit/snap
Diff against target: 76 lines (+62/-0)
1 file modified
snapcraft.yaml (+62/-0)
To merge this branch: bzr merge lp:~jbicha/gedit/snap-add-plugins
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+362429@code.launchpad.net

Description of the change

I fixed the libpeas issue and included gedit-plugins.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

This looks great, thanks!

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 2019-01-28 18:40:35 +0000
3+++ snapcraft.yaml 2019-01-29 23:35:51 +0000
4@@ -42,6 +42,11 @@
5 bus: session
6 name: org.gnome.gedit
7
8+passthrough:
9+ layout:
10+ /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libpeas-1.0:
11+ symlink: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libpeas-1.0
12+
13 apps:
14 gedit:
15 command: desktop-launch gedit
16@@ -111,3 +116,60 @@
17 - gobject-introspection
18 - libgirepository1.0-dev
19 - valac
20+ stage-packages:
21+ - gir1.2-ggit-1.0
22+ - gir1.2-gucharmap-2.90
23+ - gir1.2-glib-2.0
24+ - gir1.2-pango-1.0
25+ - gir1.2-peas-1.0
26+ - gir1.2-vte-2.91
27+ - iso-codes
28+ - libgtksourceview-3.0-1
29+ - libgspell-1-1
30+ - libpeas-1.0-0
31+ - python3-dbus
32+ - python3-gi
33+ - python3-gi-cairo
34+
35+ gedit-plugins:
36+ after: [gedit]
37+ source: https://gitlab.gnome.org/GNOME/gedit-plugins.git
38+ source-type: git
39+ source-tag: 3.30.1
40+ plugin: autotools
41+ configflags: [--prefix=/usr]
42+ organize:
43+ snap/gedit-plugins/current/usr: usr
44+ build-environment:
45+ - C_INCLUDE_PATH: $SNAPCRAFT_STAGE/usr/include/gedit-3.14/
46+ build-packages:
47+ - build-essential
48+ - gettext
49+ - gnome-common
50+ - intltool
51+ - libgit2-glib-1.0-dev
52+ - libglib2.0-dev
53+ - libgtk-3-dev
54+ - libgtksourceview-3.0-dev
55+ - libgucharmap-2-90-dev
56+ - libvte-2.91-dev
57+ - python3
58+ - python3-dbus
59+ - python-dbus-dev
60+ - python-gi-dev
61+ - yelp-tools
62+# Overriding VAPIDIR in build-environment doesn't seem to work
63+ override-build: |
64+ sed -i.bak -e 's|--pkg\ config|--vapidir=$SNAPCRAFT_STAGE/usr/share/vala/vapi\ --pkg\ config|g' plugins/findinfiles/Makefile.am
65+ sed -i.bak -e 's|--pkg\ config|--vapidir=$SNAPCRAFT_STAGE/usr/share/vala/vapi\ --pkg\ config|g' plugins/findinfiles/Makefile.am
66+ snapcraftctl build
67+# Zeitgeist plugin isn't as useful in a Snap. Dashboard plugin is broken and was removed from 3.32. Remove.
68+ stage:
69+ - -usr/lib/gedit/plugins/libzeitgeist.so
70+ - -usr/lib/gedit/plugins/zeitgeist.plugin
71+ - -usr/share/help/*/gedit/zeitgeist-dataprovider.page
72+ - -usr/share/metainfo/gedit-zeitgeist.metainfo.xml
73+ - -usr/lib/gedit/plugins/dashboard*
74+ - -usr/share/help/*/gedit/dashboard.page
75+ - -usr/share/metainfo/gedit-dashboard.metainfo.xml
76+ - -usr/share/python3/runtime.d/gedit-plugin-dashboard.rtupdate

Subscribers

People subscribed via source and target branches

to all changes: