Skip to content

Commit

Permalink
[usb-moded] fix qdbusxml2cpp error see sailfishos/usb-moded#14
Browse files Browse the repository at this point in the history
  • Loading branch information
jmlich committed Jul 24, 2023
1 parent da63714 commit b51b724
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 654576eeb6424808ee8d782bad1cceb18bc85d56 Mon Sep 17 00:00:00 2001
From: Jozef Mlich <[email protected]>
Date: Mon, 24 Jul 2023 17:12:01 +0000
Subject: [PATCH] usb_moded-dbus interface should define either direction or
add annotation for both

---
src/usb_moded-dbus.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/usb_moded-dbus.c b/src/usb_moded-dbus.c
index 537a866..22a5451 100644
--- a/src/usb_moded-dbus.c
+++ b/src/usb_moded-dbus.c
@@ -1032,7 +1032,8 @@ static const member_info_t usb_moded_members[] =
" <arg name=\"mode\" type=\"s\"/>\n"),
ADD_SIGNAL(USB_MODE_TARGET_CONFIG_SIGNAL_NAME,
" <arg name=\"config\" type=\"a{sv}\"/>\n"
- " <annotation name=\"org.qtproject.QtDBus.QtTypeName.In0\" value=\"QVariantMap\"/>\n"),
+ " <annotation name=\"org.qtproject.QtDBus.QtTypeName.In0\" value=\"QVariantMap\"/>\n"
+ " <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"QVariantMap\"/>\n"),
ADD_SIGNAL(USB_MODE_EVENT_SIGNAL_NAME,
" <arg name=\"event\" type=\"s\"/>\n"),
ADD_SIGNAL(USB_MODE_CONFIG_SIGNAL_NAME,
--
2.41.0

9 changes: 7 additions & 2 deletions usb-moded/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,20 @@ optdepends=('buteo-mtp: mtp sync support')
source=("${url}/archive/refs/tags/mer/$pkgver.tar.gz"
'https://github.com/sailfishos-mirror/dbus-glib/archive/d42176ae4763e5288ef37ea314fe58387faf2005.tar.gz'
'dhcpd.conf'
'0001-use_etc-hw-release.patch')
'0001-use_etc-hw-release.patch'
'0002-usb_moded-dbus-interface-should-define-either-direct.patch'
)
sha256sums=('5a5e7c2c12b63e934c7088d2a98473ffde8a7044364aba8c7ee24944f353226f'
'f4c28d4740ac90863082e81c869e5178d25238b179747984faf0509e40d1afef'
'a2408b6692339595f98fd5e46398da794019b4818ee865fd22953576f26366c9'
'e340d6a21b94518ebb16b6ab76b0a12f197e5b5ae0861c1c46201f863a3b971f')
'e340d6a21b94518ebb16b6ab76b0a12f197e5b5ae0861c1c46201f863a3b971f'
'ab8638a3562c453ac9ecd6fa67b68ff471448ccd9163623fa6471351b4a57db8'
)

prepare() {
cd $pkgname-mer-$_basever-mer$_merver
patch -p1 --input="${srcdir}/0001-use_etc-hw-release.patch"
patch -p1 --input="${srcdir}/0002-usb_moded-dbus-interface-should-define-either-direct.patch"
cp -r ../dbus-glib-d42176ae4763e5288ef37ea314fe58387faf2005/* dbus-gmain/
}

Expand Down

0 comments on commit b51b724

Please sign in to comment.