[gnome-build-meta/abderrahim/flatpak-sdk: 13/15] sdk{-platform}: add (almost) everything from freedesktop-sdk to the flatpak runtimes

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 64aef675d0c89b7a4df639310b5f7f6ca03a536b
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Jun 29 21:18:58 2018 +0100

    sdk{-platform}: add (almost) everything from freedesktop-sdk to the flatpak runtimes

 elements/sdk-platform.bst | 182 ++++++++++++++++++++++++++++++++++++++++++++++
 elements/sdk.bst          |  24 ++++++
 2 files changed, 206 insertions(+)
---
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 13605be..68c3f31 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -56,3 +56,185 @@ depends:
 - sdk/yelp-xsl.bst
 - sdk/yelp.bst
 - sdk/zenity.bst
+# we can't depend on desktop-platform.bst from freedesktop-sdk directly as that would
+# bring elements we want to build ourselves, and that can cause conflicts.
+# This should be kept in sync with desktop-platform.bst from freedesktop-sdk whenever we
+# update our reference to add any new elements.
+
+# Currently, the elements we want to build ourselves, and not use from freedesktop-sdk are:
+# appstream-glib, at-spi2-*, atk, dconf, gcab, gdk-pixbuf, geoclue2, glib-networking,
+# gobject-introspection, gstreamer-*, gtk3, ibus, json-glib, libcroco, librsvg,
+# libsoup, os-release, pango, sdl2* and zenity.
+
+# Due to being relatively deep in the stack, glib needs special treatment.
+
+- filename: base-platform.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/alsa-lib.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/alsa-plugins.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/aspell.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/cairo.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/cups.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/dbus.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/dejavu-fonts.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/dictionaries.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/emoji-one-font.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/ffmpeg.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/flatpak-xdg-utils.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/fontconfig.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/freetype.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/fribidi.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gnu-free-fonts.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/google-crosextra-caladea.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/google-crosextra-carlito.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/graphite2.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/harfbuzz.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/hicolor-icon-theme.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/hunspell.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/hyphen.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/lame.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libdatrie.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libdrm.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libepoxy.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/liberation-fonts.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libglvnd.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libproxy.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libseccomp.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libthai.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libva-vdpau-driver.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libva.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libvdpau.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libxkbcommon.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/llvm6.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/mesa.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/mpg123.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/multiarch-links.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/mythes.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/openal.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/opencl.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/orc.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/pixman.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libpulse.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/shared-mime-info.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/sound-theme-freedesktop.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/vulkan.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/wayland.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xcb-util-cursor.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xcb-util-image.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xcb-util-keysyms.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xcb-util-renderutil.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xcb-util-wm.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xcb-util.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xdg-user-dirs.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-app-xkbcomp.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-data-xkeyboard-config.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-ice.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-pciaccess.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-sm.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-x11.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xau.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xcb.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xcomposite.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xcursor.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xdamage.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xdmcp.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xext.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xfixes.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xft.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xi.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xinerama.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xkbfile.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xpm.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xrandr.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xrender.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xscrnsaver.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xshmfence.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xt.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xtrans.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xtst.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xv.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xxf86vm.bst
+  junction: freedesktop-sdk.bst
diff --git a/elements/sdk.bst b/elements/sdk.bst
index 7b3c122..19a6bdb 100644
--- a/elements/sdk.bst
+++ b/elements/sdk.bst
@@ -5,3 +5,27 @@ depends:
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - sdk/yelp-tools.bst
+
+# We can't depend on desktop.bst from freedesktop-sdk directly, as that would bring
+# unwanted dependencies. See sdk-platform.bst for details.
+# This should be kept in sync with desktop.bst from freedesktop-sdk whenever we
+# update our reference.
+# elements we remove: desktop-platform and gtk-doc.
+- filename: base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/desktop-file-utils.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/itstools.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/jq.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/mercurial.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/wayland-protocols.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-proto-xcb.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-proto-xorgproto.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-util-macros.bst
+  junction: freedesktop-sdk.bst