[gnome-build-meta/abderrahim/remove-dconf: 1/2] split ibus into library and daemon

[Abderrahim Kitouni <akitouni src gnome org>]

commit 63c29753269a5c95e1bb1e4684302854097ef893
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Jul 15 09:16:47 2020 +0100

    split ibus into library and daemon
    
    The daemon doesn't need to be in the sdk, and can't be anymore because it
    depends on dconf

 elements/core-deps/ibus-daemon.bst      | 15 +++++++++++++++
 elements/core/gnome-control-center.bst  |  2 +-
 elements/core/gnome-initial-setup.bst   |  2 +-
 elements/core/gnome-settings-daemon.bst |  2 +-
 elements/{sdk => sdk-deps}/ibus.bst     |  7 +++----
 elements/sdk/libibus.bst                | 21 +++++++++++++++++++++
 elements/world/ibus-anthy.bst           |  2 +-
 elements/world/ibus-hangul.bst          |  2 +-
 elements/world/ibus-libpinyin.bst       |  2 +-
 9 files changed, 45 insertions(+), 10 deletions(-)
---
diff --git a/elements/core-deps/ibus-daemon.bst b/elements/core-deps/ibus-daemon.bst
new file mode 100644
index 00000000..ec9cfdbc
--- /dev/null
+++ b/elements/core-deps/ibus-daemon.bst
@@ -0,0 +1,15 @@
+kind: filter
+
+build-depends:
+- sdk-deps/ibus.bst
+
+runtime-depends:
+- core-deps/dconf.bst
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libibus.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+config:
+  exclude:
+    - libibus
diff --git a/elements/core/gnome-control-center.bst b/elements/core/gnome-control-center.bst
index 41f5e948..9ea750ab 100644
--- a/elements/core/gnome-control-center.bst
+++ b/elements/core/gnome-control-center.bst
@@ -24,6 +24,7 @@ depends:
 - core-deps/gnome-online-accounts.bst
 - core-deps/grilo.bst
 - core-deps/gsound.bst
+- core-deps/ibus-daemon.bst
 - core-deps/libgtop.bst
 - core-deps/libhandy-0.bst
 - core-deps/libnma.bst
@@ -41,7 +42,6 @@ depends:
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
-- sdk/ibus.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:components/libwacom.bst
 - freedesktop-sdk.bst:components/pwquality.bst
diff --git a/elements/core/gnome-initial-setup.bst b/elements/core/gnome-initial-setup.bst
index 767ac681..3425106c 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -12,6 +12,7 @@ depends:
 - core-deps/NetworkManager.bst
 - core-deps/accountsservice.bst
 - core-deps/gnome-online-accounts.bst
+- core-deps/ibus-daemon.bst
 - core-deps/libgweather.bst
 - core-deps/libnma.bst
 - core-deps/upower.bst
@@ -25,7 +26,6 @@ depends:
 - sdk/geoclue.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/ibus.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:components/pwquality.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-settings-daemon.bst b/elements/core/gnome-settings-daemon.bst
index 0f844062..3f911301 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -17,6 +17,7 @@ depends:
 - core-deps/colord.bst
 - core-deps/cups-pk-helper.bst
 - core-deps/geocode-glib.bst
+- core-deps/ibus-daemon.bst
 - core-deps/libcanberra.bst
 - core-deps/libgweather.bst
 - core-deps/upower.bst
@@ -26,7 +27,6 @@ depends:
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
-- sdk/ibus.bst
 - sdk/libnotify.bst
 - freedesktop-sdk.bst:components/alsa-lib.bst
 - freedesktop-sdk.bst:components/libgudev.bst
diff --git a/elements/sdk/ibus.bst b/elements/sdk-deps/ibus.bst
similarity index 91%
rename from elements/sdk/ibus.bst
rename to elements/sdk-deps/ibus.bst
index afe8f2a5..1145c20a 100644
--- a/elements/sdk/ibus.bst
+++ b/elements/sdk-deps/ibus.bst
@@ -10,7 +10,6 @@ depends:
 - sdk/dconf.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/libnotify.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   conf-local: >-
@@ -38,6 +37,6 @@ variables:
 public:
   bst:
     split-rules:
-      devel:
-        (>):
-        - '%{libdir}/libibus-1.0.so'
+      libibus:
+      - '%{includedir}/**'
+      - '%{libdir}/**'
diff --git a/elements/sdk/libibus.bst b/elements/sdk/libibus.bst
new file mode 100644
index 00000000..bb464662
--- /dev/null
+++ b/elements/sdk/libibus.bst
@@ -0,0 +1,21 @@
+kind: filter
+
+build-depends:
+- sdk-deps/ibus.bst
+
+runtime-depends:
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+config:
+  include:
+    - libibus
+  include-orphans: false
+
+public:
+  bst:
+    split-rules:
+      devel:
+        (>):
+        - '%{libdir}/libibus-1.0.so'
diff --git a/elements/world/ibus-anthy.bst b/elements/world/ibus-anthy.bst
index 0804ca42..a269748c 100644
--- a/elements/world/ibus-anthy.bst
+++ b/elements/world/ibus-anthy.bst
@@ -5,9 +5,9 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
+- core-deps/ibus-daemon.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- sdk/ibus.bst
 - sdk/pygobject.bst
 - world/anthy.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/ibus-hangul.bst b/elements/world/ibus-hangul.bst
index e3214f53..861d3fe3 100644
--- a/elements/world/ibus-hangul.bst
+++ b/elements/world/ibus-hangul.bst
@@ -5,6 +5,6 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
-- sdk/ibus.bst
+- core-deps/ibus-daemon.bst
 - world/libhangul.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/ibus-libpinyin.bst b/elements/world/ibus-libpinyin.bst
index 1cd1bb42..fa7ce317 100644
--- a/elements/world/ibus-libpinyin.bst
+++ b/elements/world/ibus-libpinyin.bst
@@ -5,7 +5,7 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
-- sdk/ibus.bst
+- core-deps/ibus-daemon.bst
 - world/libpinyin.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables: