[gedit] snap: don't bundle gedit-plugins for now



commit d15476fc594d54f1ddc23aaf4bda202cac5fc68b
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Fri Feb 1 11:44:34 2019 -0500

    snap: don't bundle gedit-plugins for now
    
    it needs more work to build with current gedit

 snap/snapcraft.yaml | 43 +++++--------------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 203d6016d..fd1594cb6 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -104,7 +104,11 @@ parts:
     source: .
     source-type: git
     plugin: meson
-    meson-parameters: [--prefix=/snap/gedit/current/usr]
+    meson-parameters:
+      - --prefix=/snap/gedit/current/usr
+      - -Dintrospection=false
+    build-environment:
+      - PKG_CONFIG_PATH: $SNAPCRAFT_STAGE/usr/lib/pkgconfig
     override-build: |
        sed -i.bak -e 's|Icon=org.gnome.gedit$|Icon=${SNAP}/meta/gui/org.gnome.gedit.svg|g' 
data/org.gnome.gedit.desktop.in.in
        snapcraftctl build
@@ -144,40 +148,3 @@ parts:
       - python3-dbus
       - python3-gi
       - python3-gi-cairo
-
-  gedit-plugins:
-    after: [gedit]
-    source: https://gitlab.gnome.org/GNOME/gedit-plugins.git
-    source-type: git
-    plugin: autotools
-    configflags: [--prefix=/usr]
-    organize:
-      snap/gedit-plugins/current/usr: usr
-    build-environment:
-      - C_INCLUDE_PATH: $SNAPCRAFT_STAGE/usr/include/gedit-3.14/
-    build-packages:
-      - build-essential
-      - gettext
-      - gnome-common
-      - itstool
-      - libgit2-glib-1.0-dev
-      - libglib2.0-dev
-      - libgtk-3-dev
-      - libgucharmap-2-90-dev
-      - libvte-2.91-dev
-      - python3
-      - python3-dbus
-      - python-dbus-dev
-      - python-gi-dev
-      - yelp-tools
-# Overriding VAPIDIR in build-environment doesn't seem to work
-    override-build: |
-      sed -i.bak -e 's|--pkg\ config|--vapidir=$SNAPCRAFT_STAGE/usr/share/vala/vapi\ --pkg\ config|g' 
plugins/findinfiles/Makefile.am
-      sed -i.bak -e 's|--pkg\ config|--vapidir=$SNAPCRAFT_STAGE/usr/share/vala/vapi\ --pkg\ config|g' 
plugins/findinfiles/Makefile.am
-      snapcraftctl build
-# Zeitgeist plugin isn't as useful in a Snap.
-    stage:
-      - -usr/lib/gedit/plugins/libzeitgeist.so
-      - -usr/lib/gedit/plugins/zeitgeist.plugin
-      - -usr/share/help/*/gedit/zeitgeist-dataprovider.page
-      - -usr/share/metainfo/gedit-zeitgeist.metainfo.xml


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]