[gnome-build-meta/alatiera/gcc-4: 1/4] core: add another gnome-bluetooth element

[Jordan Petridis <jpetridis src gnome org>]

commit 5b93d4fd487a6119b7a12aad9d6c74eddd02735c
Author: Jordan Petridis <jordan centricular com>
Date:   Wed Dec 15 17:33:33 2021 +0200

    core: add another gnome-bluetooth element
    
    This is the gtk4 port of gnome-bluetooth

 elements/core/gnome-bluetooth.bst                  | 28 ++++++++++++++++++
 elements/core/meta-gnome-core-shell.bst            |  1 +
 ...omebt_api_name-for-the-gtk-doc-module-nam.patch | 31 ++++++++++++++++++++
 .../0002-meson-bump-gettext-package-suffix.patch   | 34 ++++++++++++++++++++++
 4 files changed, 94 insertions(+)
---
diff --git a/elements/core/gnome-bluetooth.bst b/elements/core/gnome-bluetooth.bst
new file mode 100644
index 000000000..f38b2b8b7
--- /dev/null
+++ b/elements/core/gnome-bluetooth.bst
@@ -0,0 +1,28 @@
+kind: meson
+
+sources:
+- kind: git_tag
+  url: gitlab_gnome_org:GNOME/gnome-bluetooth.git
+  track: master
+- kind: patch
+  path: files/gnome-bluetooth/0001-docs-use-gnomebt_api_name-for-the-gtk-doc-module-nam.patch
+- kind: patch
+  path: files/gnome-bluetooth/0002-meson-bump-gettext-package-suffix.patch
+
+build-depends:
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+depends:
+- core-deps/gsound.bst
+- sdk/glib.bst
+- sdk/gtk.bst
+- sdk/libadwaita.bst
+- sdk/libnotify.bst
+- freedesktop-sdk.bst:components/systemd.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  meson-local: >-
+    -Dgtk_doc=true
diff --git a/elements/core/meta-gnome-core-shell.bst b/elements/core/meta-gnome-core-shell.bst
index 7b60dc42d..02a1460e4 100644
--- a/elements/core/meta-gnome-core-shell.bst
+++ b/elements/core/meta-gnome-core-shell.bst
@@ -6,6 +6,7 @@ kind: stack
 depends:
 - core/gdm.bst
 - core/gnome-backgrounds.bst
+- core/gnome-bluetooth.bst
 - core/gnome-bluetooth-1.0.bst
 - core/gnome-color-manager.bst
 - core/gnome-control-center.bst
diff --git a/files/gnome-bluetooth/0001-docs-use-gnomebt_api_name-for-the-gtk-doc-module-nam.patch 
b/files/gnome-bluetooth/0001-docs-use-gnomebt_api_name-for-the-gtk-doc-module-nam.patch
new file mode 100644
index 000000000..85ebf6c41
--- /dev/null
+++ b/files/gnome-bluetooth/0001-docs-use-gnomebt_api_name-for-the-gtk-doc-module-nam.patch
@@ -0,0 +1,31 @@
+From ad6b34eea0710fefb584c44ac7e6a43501f14fb6 Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jordan centricular com>
+Date: Thu, 16 Dec 2021 22:37:42 +0200
+Subject: [PATCH 1/2] docs: use gnomebt_api_name for the gtk-doc module name
+
+Currently the docs are not prefixed with a version and overlap
+with the gnome-bluetooth-1.0 files. gnomebt_api_name is like the
+project name but with the api version appended and now the path looks
+like:
+
+`share/gtk-doc/html/gnome-bluetooth-2.0/index.html`
+---
+ docs/reference/libgnome-bluetooth/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/reference/libgnome-bluetooth/meson.build b/docs/reference/libgnome-bluetooth/meson.build
+index 51ad8089..94ce693a 100644
+--- a/docs/reference/libgnome-bluetooth/meson.build
++++ b/docs/reference/libgnome-bluetooth/meson.build
+@@ -20,7 +20,7 @@ version_xml = configure_file(
+ )
+ 
+ gnome.gtkdoc(
+-  meson.project_name(),
++  gnomebt_api_name,
+   main_sgml: meson.project_name() + '-docs.sgml',
+   src_dir: lib_inc,
+   dependencies: libgnome_bluetooth_dep,
+-- 
+2.31.1
+
diff --git a/files/gnome-bluetooth/0002-meson-bump-gettext-package-suffix.patch 
b/files/gnome-bluetooth/0002-meson-bump-gettext-package-suffix.patch
new file mode 100644
index 000000000..e9f9393de
--- /dev/null
+++ b/files/gnome-bluetooth/0002-meson-bump-gettext-package-suffix.patch
@@ -0,0 +1,34 @@
+From bf5692fc60cfacd17b2bc5e8f0c668c3b83ce8ff Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jordan centricular com>
+Date: Thu, 16 Dec 2021 22:43:27 +0200
+Subject: [PATCH 2/2] meson: bump gettext package suffix
+
+Currently, both gnome-bluetooth-1.0 and 2.0 are using "2"
+as a suffix for the gettext locale files which causes them to
+overalp. Looks like 2 has been used since the initial commit
+of the meson port, back in 3.20 cycle, although not sure if
+there is any special meaning to the number. Bump it anyway
+so that translations won't overlap between the two versions.
+---
+ meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index b7fd1e04..fddf173a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -15,7 +15,10 @@ gnomebt_api_name = '@0@-@1@'.format(meson.project_name(), gnomebt_api_version)
+ 
+ gnomebt_gir_ns = 'GnomeBluetooth'
+ 
+-gnomebt_gettext_package = meson.project_name() + '2'
++# The number at the end a suffix of the files and should
++# be bumped along the api_version so that translations
++# can be installed in parallel with older versions.
++gnomebt_gettext_package = meson.project_name() + '3'
+ 
+ gnomebt_prefix = get_option('prefix')
+ gnomebt_datadir = get_option('datadir')
+-- 
+2.31.1
+