[neon/backports-noble/libsignon-glib-noble/Neon/unstable] debian: use in-sources D-Bus interfaces

[Pino Toscano]

Git commit 113673cb6cd9819cb19565e21a899829b77ed48d by Pino Toscano.
Committed on 31/12/2020 at 14:17.
Pushed by carlosdem into branch 'Neon/unstable'.

use in-sources D-Bus interfaces

M  +1    -0    debian/changelog
A  +22   -0    debian/patches/fix-interfaces-path.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/backports-noble/libsignon-glib-noble/-/commit/113673cb6cd9819cb19565e21a899829b77ed48d

diff --git a/debian/changelog b/debian/changelog
index 0378646..3bf0391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ libsignon-glib (2.1-0r1) UNRELEASED; urgency=medium
     - rename libsignon-glib1 to libsignon-glib2
     - rename gir1.2-signon-1.0 to gir1.2-signon-2.0
   * Update install files.
+  * Use the in-sources D-Bus interfaces; patch fix-interfaces-path.diff.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 31 Dec 2020 14:37:44 +0100
 
diff --git a/debian/patches/fix-interfaces-path.diff b/debian/patches/fix-interfaces-path.diff
new file mode 100644
index 0000000..55f2744
--- /dev/null
+++ b/debian/patches/fix-interfaces-path.diff
@@ -0,0 +1,22 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix path to the D-Bus interfaces files
+ Use the in-sources copies, instead of what is in the 'interfaces' git
+ submodule.
+Forwarded: no
+Last-Update: 2020-12-31
+
+--- a/libsignon-glib/meson.build
++++ b/libsignon-glib/meson.build
+@@ -31,9 +31,9 @@ libsignon_glib_sources = libsignon_glib_
+ 
+ sso_interface_prefix = 'com.google.code.AccountsSSO.SingleSignOn.'
+ 
+-dbus_auth_service_xml = join_paths('interfaces', 'com.google.code.AccountsSSO.SingleSignOn.AuthService.xml')
+-dbus_auth_session_xml = join_paths('interfaces', 'com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml')
+-dbus_identity_xml = join_paths('interfaces', 'com.google.code.AccountsSSO.SingleSignOn.Identity.xml')
++dbus_auth_service_xml = 'com.google.code.AccountsSSO.SingleSignOn.AuthService.xml'
++dbus_auth_session_xml = 'com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml'
++dbus_identity_xml = 'com.google.code.AccountsSSO.SingleSignOn.Identity.xml'
+ if (meson.version().version_compare('<0.47.2'))
+     dbus_auth_service_xml = 'com.google.code.AccountsSSO.SingleSignOn.AuthService.xml'
+     dbus_auth_session_xml = 'com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..53362b8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-interfaces-path.diff