From c783cd6ef10f52774b8745c24c6e3d3f3d7b5f96 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Jun 28 2017 14:20:50 +0000
Subject: Add additional packages, as needed for gedit


Add dependencies of gedit that are in the org.gnome.Platform runtime:

 enchant, hunspell, gvfs-client, zenity

---

diff --git a/flatpak-runtime-packages.yaml b/flatpak-runtime-packages.yaml
index 2fa4064..13d40fd 100644
--- a/flatpak-runtime-packages.yaml
+++ b/flatpak-runtime-packages.yaml
@@ -1,11 +1,16 @@
 # This is a set of binary packages that we should depsolve to get the
 # set of packages that are installed into the runtime.
 runtime-roots:
+    - enchant
+    - hunspell-en-US
+    - hunspell-en-GB
     - gtk3
     - gnome-desktop3
+    - gvfs-client
     - librsvg2
     - libappstream-glib
     - python3-gobject
+    - zenity
 
 # These are extra packages to install into the runtime beyond what we
 # depsolve from runtime-roots.
diff --git a/flatpak-runtime.dependencies b/flatpak-runtime.dependencies
index 5642312..c49a4d1 100644
--- a/flatpak-runtime.dependencies
+++ b/flatpak-runtime.dependencies
@@ -1,53 +1,11 @@
+enchant
+  libstdc++
 gnome-desktop3
-  atk
-  cairo
-    libXrender
-    libglvnd-egl
-      mesa-libEGL
-        libdrm
-          libpciaccess
-            hwdata
-        libwayland-server
-        libxshmfence
-        mesa-libgbm
-    libglvnd-glx
-      libglvnd
-      mesa-libGL
-        libXxf86vm
-        mesa-libglapi
-    libxcb
-      libXau
-    pixman
-    zlib
-  cairo-gobject
-  gdk-pixbuf2
-    shared-mime-info
-  glib2
-    libmount
-      libblkid
-    pcre
-  glibc
-    basesystem
-      setup
-        fedora-modular-release
-          fedora-modular-repos
-    glibc-all-langpacks
-    glibc-common
-      tzdata
   gnome-themes-standard
     abattis-cantarell-fonts
     adwaita-gtk2-theme
       gtk2
   gsettings-desktop-schemas
-  libX11
-    libX11-common
-  libgcc
-  pango
-    harfbuzz
-      graphite2
-    libXft
-    libthai
-      libdatrie
   systemd-libs
     libcap
     libgcrypt
@@ -92,6 +50,7 @@ gtk3
             libutempter
       libXtst
     dbus-libs
+  atk
   bash
     filesystem
     ncurses-libs
@@ -114,7 +73,6 @@ gtk3
           popt
     libcom_err
     libcrypt
-    libstdc++
   fontconfig
     expat
     fontpackages-filesystem
@@ -132,6 +90,8 @@ gtk3
       gmp
       libattr
       ncurses
+  libX11
+    libX11-common
   libXcomposite
   libXcursor
   libXdamage
@@ -148,6 +108,10 @@ gtk3
     xkeyboard-config
   mesa-libwayland-egl
   rest
+gvfs-client
+hunspell-en-GB
+hunspell-en-US
+  hunspell
 libappstream-glib
   json-glib
   libarchive
@@ -160,6 +124,7 @@ libappstream-glib
       crypto-policies
     xz-libs
   libgcab1
+  libgcc
   libsoup
     glib-networking
       libproxy
@@ -175,10 +140,50 @@ libappstream-glib
   libstemmer
   libuuid
 librsvg2
+  cairo
+    libXrender
+    libglvnd-egl
+      mesa-libEGL
+        libdrm
+          libpciaccess
+            hwdata
+        libwayland-server
+        libxshmfence
+        mesa-libgbm
+    libglvnd-glx
+      libglvnd
+      mesa-libGL
+        libXxf86vm
+        mesa-libglapi
+    libxcb
+      libXau
+    pixman
+    zlib
+  gdk-pixbuf2
+    shared-mime-info
+  glib2
+    libmount
+      libblkid
+    pcre
+  glibc
+    basesystem
+      setup
+        fedora-modular-release
+          fedora-modular-repos
+    glibc-all-langpacks
+    glibc-common
+      tzdata
   libcroco
   libpng
   libxml2
+  pango
+    harfbuzz
+      graphite2
+    libXft
+    libthai
+      libdatrie
 python3-gobject
+  cairo-gobject
   gobject-introspection
   python3
     python3-libs
@@ -194,3 +199,5 @@ python3-gobject
       readline
   python3-cairo
   python3-gobject-base
+zenity
+  libnotify
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index 7a51984..000131a 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -48,6 +48,7 @@ data:
       - elfutils-libelf
       - elfutils-libs
       - emacs-filesystem
+      - enchant
       - expat
       - fedora-modular-release
       - fedora-modular-repos
@@ -76,9 +77,13 @@ data:
       - gtk-update-icon-cache
       - gtk2
       - gtk3
+      - gvfs-client
       - gzip
       - harfbuzz
       - hicolor-icon-theme
+      - hunspell
+      - hunspell-en-GB
+      - hunspell-en-US
       - hwdata
       - info
       - iptables-libs
@@ -133,6 +138,7 @@ data:
       - libjpeg-turbo
       - libmodman
       - libmount
+      - libnotify
       - libpcap
       - libpciaccess
       - libpng
@@ -212,6 +218,7 @@ data:
       - util-linux
       - xkeyboard-config
       - xz-libs
+      - zenity
       - zlib
     buildroot:
       rpms:
@@ -226,6 +233,7 @@ data:
     - at-spi2-atk
     - at-spi2-core
     - colord-libs
+    - enchant
     - flatpak-rpm-macros
     - flatpak-runtime-config
     - glib-networking
@@ -236,12 +244,17 @@ data:
     - gobject-introspection
     - gobject-introspection-devel
     - gsettings-desktop-schemas
+    - gvfs-client
+    - hunspell
+    - hunspell-en-GB
+    - hunspell-en-US
     - json-glib
     - libXtst
     - libappstream-glib
     - libepoxy
     - libgcab1
     - libgusb
+    - libnotify
     - librsvg2
     - libsoup
     - libwayland-client
@@ -253,6 +266,7 @@ data:
     - python3-gobject-base
     - rest
     - xkeyboard-config
+    - zenity
   components:
     rpms:
       abattis-cantarell-fonts:
@@ -279,6 +293,10 @@ data:
         rationale: Runtime requirement of pycryptopp (*)
         ref: f26
         buildorder: 5
+      enchant:
+        rationale: ''
+        ref: f26
+        buildorder: 12
       flatpak-rpm-macros:
         rationale: Set up build root for flatpak RPMS
         ref: master
@@ -298,7 +316,6 @@ data:
       glib2:
         rationale: Rebuild to fix triggers
         ref: private-f26-flatpak
-        repository: file:///home/otaylor/fedora-git/glib2
         buildorder: -1
       gnome-desktop3:
         rationale: ''
@@ -316,6 +333,18 @@ data:
         rationale: Runtime requirement of gnome-desktop3
         ref: f26
         buildorder: 8
+      gvfs:
+        rationale: ''
+        ref: f26
+        buildorder: 13
+      hunspell:
+        rationale: Runtime requirement of hunspell-en-US
+        ref: f26
+        buildorder: 11
+      hunspell-en:
+        rationale: ''
+        ref: f26
+        buildorder: 11
       intltool:
         rationale: ''
         ref: f26
@@ -344,6 +373,10 @@ data:
         rationale: Runtime requirement of colord-libs (*)
         ref: f26
         buildorder: 10
+      libnotify:
+        rationale: Runtime requirement of zenity
+        ref: f26
+        buildorder: 12
       librsvg2:
         rationale: ''
         ref: f26
@@ -452,3 +485,7 @@ data:
         rationale: Runtime requirement of libxkbcommon (*)
         ref: f26
         buildorder: 10
+      zenity:
+        rationale: ''
+        ref: f26
+        buildorder: 13