Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-qt-dbus-factory for
openSUSE:Factory checked in at 2021-03-02 12:32:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-qt-dbus-factory (Old)
and /work/SRC/openSUSE:Factory/.deepin-qt-dbus-factory.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-qt-dbus-factory"
Tue Mar 2 12:32:18 2021 rev:9 rq:875578 version:5.3.35
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-qt-dbus-factory/deepin-qt-dbus-factory.changes
2021-02-17 18:13:17.674026729 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-qt-dbus-factory.new.2378/deepin-qt-dbus-factory.changes
2021-03-02 12:44:40.916315333 +0100
@@ -1,0 +2,6 @@
+Tue Feb 16 14:36:21 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update versio to 5.3.35
+ * Add some apis for deepin-control-center
+
+-------------------------------------------------------------------
Old:
----
dde-qt-dbus-factory-5.3.0.14.tar.gz
New:
----
dde-qt-dbus-factory-5.3.35.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-qt-dbus-factory.spec ++++++
--- /var/tmp/diff_new_pack.DYa676/_old 2021-03-02 12:44:41.308315671 +0100
+++ /var/tmp/diff_new_pack.DYa676/_new 2021-03-02 12:44:41.308315671 +0100
@@ -20,7 +20,7 @@
%define _name dde-qt-dbus-factory
Name: deepin-qt-dbus-factory
-Version: 5.3.0.14
+Version: 5.3.35
Release: 0
Summary: A repository storing auto-generated Qt5 D-Bus code
License: GPL-3.0-or-later
++++++ dde-qt-dbus-factory-5.3.0.14.tar.gz -> dde-qt-dbus-factory-5.3.35.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-qt-dbus-factory-5.3.0.14/.gerrit_sources_list
new/dde-qt-dbus-factory-5.3.35/.gerrit_sources_list
--- old/dde-qt-dbus-factory-5.3.0.14/.gerrit_sources_list 1970-01-01
01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/.gerrit_sources_list 2021-01-05
03:07:41.000000000 +0100
@@ -0,0 +1,2 @@
+deb http://pools.corp.deepin.com/uos eagle/sp1 main contrib
+deb http://pools.corp.deepin.com/ppa/dde-eagle eagle/sp1 main contrib
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-qt-dbus-factory-5.3.0.14/.packit.yaml
new/dde-qt-dbus-factory-5.3.35/.packit.yaml
--- old/dde-qt-dbus-factory-5.3.0.14/.packit.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/.packit.yaml 2021-01-05 03:07:41.000000000
+0100
@@ -0,0 +1,20 @@
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+specfile_path: rpm/deepin-qt-dbus-factory.spec
+
+# add or remove files that should be synced
+synced_files:
+ - rpm/deepin-qt-dbus-factory.spec
+ - .packit.yaml
+
+upstream_package_name: dde-qt-dbus-factory
+# downstream (Fedora) RPM package name
+downstream_package_name: deepin-qt-dbus-factory
+
+actions:
+ fix-spec-file: |
+ bash -c "sed -i -r \"0,/Version:/
s/Version:(\s*)\S*/Version:\1${PACKIT_PROJECT_VERSION}/\"
rpm/deepin-qt-dbus-factory.spec"
+ post-upstream-clone: |
+ cp rpm/dde-qt-dbus-factory.spec rpm/deepin-qt-dbus-factory.spec
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-qt-dbus-factory-5.3.0.14/README.md
new/dde-qt-dbus-factory-5.3.35/README.md
--- old/dde-qt-dbus-factory-5.3.0.14/README.md 2020-09-09 12:10:42.000000000
+0200
+++ new/dde-qt-dbus-factory-5.3.35/README.md 2021-01-05 03:07:41.000000000
+0100
@@ -1,6 +1,7 @@
## dde-qt-dbus-factory
`dde-qt-dbus-factory` ????????????????????? `dde` ???????????????????????????
`Qt DBus` ???????????????????????? `dde`
???????????????????????????????????????????????????????????? `DBus`
????????????????????????????????????????????????????????????????????????
+
?????????????????????????????? `qdbusxml2cpp-fix` ????????????????????? `Qt`
??????????????? `qdbusxml2cpp`?????????????????????????????????????????????
`tools` ??????????????????????????????????????????????????????
??????????????????????????????
@@ -17,4 +18,4 @@
```
??????????????????????????????
-**??????**
??????????????????????????????????????????????????????????????????????????????????????????????????????????????????
+**??????**
??????????????????????????????????????????????????????????????????????????????????????????????????????????????????
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-qt-dbus-factory-5.3.0.14/debian/control
new/dde-qt-dbus-factory-5.3.35/debian/control
--- old/dde-qt-dbus-factory-5.3.0.14/debian/control 2020-09-09
12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/debian/control 2021-01-05
03:07:41.000000000 +0100
@@ -20,6 +20,9 @@
Depends:
${misc:Depends},
${shlibs:Depends},
+ dde-daemon (>=5.12.0.31),
+ startdde (>=5.6.0.34),
+ lastore-daemon (>=5.1.0.21)
Multi-Arch: same
Description: Qt DBus interface library for Deepin software (shared library)
Libdframeworkdbus provides Qt DBus interface for various Deepin software.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/generate_code.py
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/generate_code.py
--- old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/generate_code.py
2020-09-09 12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/generate_code.py
2021-01-05 03:07:41.000000000 +0100
@@ -7,7 +7,7 @@
dirname = os.path.dirname
abspath = os.path.abspath
-project_root = dirname(dirname(abspath(__file__)))
+project_root = "../"
def get_xml_files():
xml_dir = os.path.join(project_root, "xml")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/libdframeworkdbus.pro
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/libdframeworkdbus.pro
--- old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/libdframeworkdbus.pro
2020-09-09 12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/libdframeworkdbus.pro
2021-01-05 03:07:41.000000000 +0100
@@ -61,7 +61,10 @@
types/defenderdisplay.h \
types/defenderappflow.h \
types/defenderprocinfo.h \
- types/defenderprocinfolist.h
+ types/defenderprocinfolist.h \
+ types/policysubject.h \
+ types/policyresult.h \
+ types/policydetails.h
SOURCES += \
types/zoneinfo.cpp \
@@ -116,7 +119,10 @@
types/defenderdisplay.cpp \
types/defenderappflow.cpp \
types/defenderprocinfo.cpp \
- types/defenderprocinfolist.cpp
+ types/defenderprocinfolist.cpp \
+ types/policysubject.cpp \
+ types/policyresult.cpp \
+ types/policydetails.cpp
!system(python $$PWD/generate_code.py): error("Failed to generate code")
include(generated/generated.pri)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/qtdbusextended/dbusextendedabstractinterface.cpp
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/qtdbusextended/dbusextendedabstractinterface.cpp
---
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/qtdbusextended/dbusextendedabstractinterface.cpp
2020-09-09 12:10:42.000000000 +0200
+++
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/qtdbusextended/dbusextendedabstractinterface.cpp
2021-01-05 03:07:41.000000000 +0100
@@ -177,7 +177,7 @@
if (m_useCache) {
int propertyIndex = metaObject()->indexOfProperty(propname);
QMetaProperty metaProperty = metaObject()->property(propertyIndex);
- return QVariant(metaProperty.type(), propertyPtr);
+ return QVariant(metaProperty.userType(), propertyPtr);
}
if (m_sync) {
@@ -233,7 +233,7 @@
}
asyncProperty(propname);
- return QVariant(metaProperty.type(), propertyPtr);
+ return QVariant(metaProperty.userType(), propertyPtr);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policydetails.cpp
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policydetails.cpp
--- old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policydetails.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policydetails.cpp
2021-01-05 03:07:41.000000000 +0100
@@ -0,0 +1,7 @@
+#include "policydetails.h"
+
+void registerPolicyDetailsMetaType()
+{
+ qRegisterMetaType<PolicyDetails>("PolicyDetails");
+ qDBusRegisterMetaType<PolicyDetails>();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policydetails.h
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policydetails.h
--- old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policydetails.h
1970-01-01 01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policydetails.h
2021-01-05 03:07:41.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef POLICYDETAILS_H
+#define POLICYDETAILS_H
+
+#include <QMap>
+#include <QDBusMetaType>
+
+typedef QMap<QString, QString> PolicyDetails;
+
+void registerPolicyDetailsMetaType();
+
+#endif // POLICYDETAILS_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policyresult.cpp
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policyresult.cpp
--- old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policyresult.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policyresult.cpp
2021-01-05 03:07:41.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 ~ 2017 Deepin Technology Co., Ltd.
+ *
+ * Author: sbw <[email protected]>
+ * kirigaya <[email protected]>
+ * Hualet <[email protected]>
+ *
+ * Maintainer: sbw <[email protected]>
+ * kirigaya <[email protected]>
+ * Hualet <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QDBusMetaType>
+
+#include "policyresult.h"
+
+void registerPolicyResultMetaType()
+{
+ qRegisterMetaType<PolicyResult>("PolicyResult");
+ qDBusRegisterMetaType<PolicyResult>();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policyresult.h
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policyresult.h
--- old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policyresult.h
1970-01-01 01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policyresult.h
2021-01-05 03:07:41.000000000 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2016 ~ 2017 Deepin Technology Co., Ltd.
+ *
+ * Author: sbw <[email protected]>
+ * kirigaya <[email protected]>
+ * Hualet <[email protected]>
+ *
+ * Maintainer: sbw <[email protected]>
+ * kirigaya <[email protected]>
+ * Hualet <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef POLICYRESULT_H
+#define POLICYRESULT_H
+
+#include <QDBusMetaType>
+#include <QString>
+#include <QDBusArgument>
+#include <QDebug>
+
+class PolicyResult
+{
+public:
+ bool isAuthorized;
+ bool isChallenge;
+ QMap<QString, QString> stringList;
+
+ inline bool getAuthorized() const { return isAuthorized; }
+ inline bool getChallenge() const { return isChallenge; }
+
+ friend QDebug operator<<(QDebug argument, const PolicyResult &result) {
+ argument << result.isAuthorized << result.isChallenge <<
result.stringList;
+
+ return argument;
+ }
+
+ friend QDBusArgument &operator<<(QDBusArgument &argument, const
PolicyResult &result) {
+ argument.beginStructure();
+ argument << result.isAuthorized << result.isChallenge <<
result.stringList;
+ argument.endStructure();
+
+ return argument;
+ }
+
+ friend const QDBusArgument &operator>>(const QDBusArgument &argument,
PolicyResult &result) {
+ argument.beginStructure();
+ argument >> result.isAuthorized >> result.isChallenge >>
result.stringList;
+ argument.endStructure();
+
+ return argument;
+ }
+
+ bool operator==(const PolicyResult result) const {
+ return result.isAuthorized == isAuthorized && result.isChallenge ==
isChallenge && result.stringList == stringList;
+ }
+
+ bool operator!=(const PolicyResult result) const {
+ return result.isAuthorized != isAuthorized || result.isChallenge !=
isChallenge || result.stringList != stringList;
+ }
+};
+
+Q_DECLARE_METATYPE(PolicyResult)
+
+void registerPolicyResultMetaType();
+
+#endif // POLICYRESULT_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policysubject.cpp
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policysubject.cpp
--- old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policysubject.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policysubject.cpp
2021-01-05 03:07:41.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 ~ 2017 Deepin Technology Co., Ltd.
+ *
+ * Author: sbw <[email protected]>
+ * kirigaya <[email protected]>
+ * Hualet <[email protected]>
+ *
+ * Maintainer: sbw <[email protected]>
+ * kirigaya <[email protected]>
+ * Hualet <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QDBusMetaType>
+
+#include "policysubject.h"
+
+void registerPolicySubjectMetaType()
+{
+ qRegisterMetaType<PolicySubject>("PolicySubject");
+ qDBusRegisterMetaType<PolicySubject>();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policysubject.h
new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policysubject.h
--- old/dde-qt-dbus-factory-5.3.0.14/libdframeworkdbus/types/policysubject.h
1970-01-01 01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/libdframeworkdbus/types/policysubject.h
2021-01-05 03:07:41.000000000 +0100
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2016 ~ 2017 Deepin Technology Co., Ltd.
+ *
+ * Author: sbw <[email protected]>
+ * kirigaya <[email protected]>
+ * Hualet <[email protected]>
+ *
+ * Maintainer: sbw <[email protected]>
+ * kirigaya <[email protected]>
+ * Hualet <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef POLICYSUBJECT_H
+#define POLICYSUBJECT_H
+
+#include <QDBusMetaType>
+#include <QString>
+#include <QDBusArgument>
+#include <QDebug>
+
+class PolicySubject
+{
+public:
+ QString name;
+ QMap<QString, QVariant> sub;
+
+ friend QDebug operator<<(QDebug argument, const PolicySubject &subject) {
+ argument << subject.name;
+
+ return argument;
+ }
+
+ friend QDBusArgument &operator<<(QDBusArgument &argument, const
PolicySubject &subject) {
+ argument.beginStructure();
+ argument << subject.name << subject.sub;
+ argument.endStructure();
+
+ return argument;
+ }
+
+ friend const QDBusArgument &operator>>(const QDBusArgument &argument,
PolicySubject &subject) {
+ argument.beginStructure();
+ argument >> subject.name >> subject.sub;
+ argument.endStructure();
+
+ return argument;
+ }
+
+ bool operator==(const PolicySubject subject) const {
+ return subject.name == name;
+ }
+
+ bool operator!=(const PolicySubject subject) const {
+ return subject.name != name;
+ }
+};
+
+Q_DECLARE_METATYPE(PolicySubject)
+
+void registerPolicySubjectMetaType();
+
+#endif // POLICYSUBJECT_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/rpm/dde-qt-dbus-factory.spec
new/dde-qt-dbus-factory-5.3.35/rpm/dde-qt-dbus-factory.spec
--- old/dde-qt-dbus-factory-5.3.0.14/rpm/dde-qt-dbus-factory.spec
2020-09-09 12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/rpm/dde-qt-dbus-factory.spec 2021-01-05
03:07:41.000000000 +0100
@@ -1,21 +1,34 @@
%global soname dframeworkdbus
%global repo dde-qt-dbus-factory
+%if 0%{?fedora}
+Name: deepin-qt-dbus-factory
+%else
Name: dde-qt-dbus-factory
-Version: 5.2.0.0
-Release: 3
+%endif
+Version: 5.3.0.20
+Release: 1%{?fedora:%dist}
Summary: A repository stores auto-generated Qt5 dbus code
# The entire source code is GPLv3+ except
# libdframeworkdbus/qtdbusextended/ which is LGPLv2+
License: GPLv3+ and LGPLv2+
+%if 0%{?fedora}
+URL: https://github.com/linuxdeepin/dde-qt-dbus-factory
+Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
+%else
URL:
http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/56qX566h6IGU6LCD5rWL6K-V6aqM6K-BMDUyMTQ5Mg/pool/main/d/dde-qt-dbus-factory/
Source0: %{name}_%{version}.orig.tar.xz
+%endif
-BuildRequires: python3-devel
+BuildRequires: python3
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
+%if 0%{?fedora}
+BuildRequires: qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+%endif
%description
A repository stores auto-generated Qt5 dbus code.
@@ -29,32 +42,27 @@
Header files and libraries for %{name}.
%prep
-%setup -q -n %{repo}-%{version}
+%autosetup -p1 -n %{repo}-%{version}
sed -i "s/env python$/env python3/g" libdframeworkdbus/generate_code.py
sed -i "s/python/python3/g" libdframeworkdbus/libdframeworkdbus.pro
%build
%qmake_qt5 LIB_INSTALL_DIR=%{_libdir}
-sed -i "s/python/python3/g" Makefile
%make_build
%install
%make_install INSTALL_ROOT=%{buildroot}
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
%files
-#%doc README
+%doc README.md CHANGELOG.md technology-overview.md
%license LICENSE
-%{_libdir}/lib%{soname}.so.*
+%{_libdir}/lib%{soname}.so.2*
%files devel
%{_includedir}/lib%{soname}-2.0/
%{_libdir}/pkgconfig/%{soname}.pc
%{_libdir}/lib%{soname}.so
-%{_libdir}/cmake/DFrameworkdbus/DFrameworkdbusConfig.cmake
+%{_libdir}/cmake/DFrameworkdbus/
%changelog
* Thu Jun 09 2020 uoser <[email protected]> - 5.2.0.2-1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.ad.domain.xml
new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.ad.domain.xml
--- old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.ad.domain.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.ad.domain.xml 2021-01-05
03:07:41.000000000 +0100
@@ -0,0 +1,86 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
+<node>
+ <interface name="com.deepin.AD.ControlCenter">
+ <property name="isDomainEnabled" type="b" access="readwrite"/>
+ <property name="isJoined" type="b" access="read"/>
+ <property name="isServerValid" type="b" access="read"/>
+ <property name="isProcessing" type="b" access="read"/>
+ <property name="isDemandReboot" type="b" access="read"/>
+ <property name="errorDetail" type="s" access="read"/>
+ <signal name="enableDomainEnded">
+ <arg name="bSuccess" type="b" direction="out"/>
+ </signal>
+ <signal name="disableDomainEnded">
+ <arg name="bSuccess" type="b" direction="out"/>
+ </signal>
+ <signal name="joinDomainEnded">
+ <arg name="bSuccess" type="b" direction="out"/>
+ </signal>
+ <signal name="exitDomainEnded">
+ <arg name="bSuccess" type="b" direction="out"/>
+ </signal>
+ <signal name="checkServerEnded">
+ <arg name="bSuccess" type="b" direction="out"/>
+ </signal>
+ <signal name="queryAreasEnded">
+ <arg name="strJson" type="s" direction="out"/>
+ </signal>
+ <signal name="checkUserEnded">
+ <arg name="bSuccess" type="b" direction="out"/>
+ </signal>
+ <signal name="queryIdentityEnded">
+ <arg name="strJson" type="s" direction="out"/>
+ </signal>
+ <signal name="modifyPasswordEnded">
+ <arg name="bSuccess" type="b" direction="out"/>
+ </signal>
+ <signal name="serverError">
+ <arg name="errorDescription" type="s" direction="out"/>
+ </signal>
+ <signal name="demandReboot">
+ </signal>
+ <method name="enableDomain">
+ </method>
+ <method name="disableDomain">
+ </method>
+ <method name="joinDomain">
+ <arg name="strHostName" type="s" direction="in"/>
+ </method>
+ <method name="exitDomain">
+ </method>
+ <method name="checkIpv4">
+ <arg type="b" direction="out"/>
+ <arg name="strIp" type="s" direction="in"/>
+ </method>
+ <method name="checkServer">
+ <arg name="strIp" type="s" direction="in"/>
+ <arg name="iPort" type="i" direction="in"/>
+ </method>
+ <method name="queryAreas">
+ <arg name="strSearchKey" type="s" direction="in"/>
+ <arg name="iPageIndex" type="i" direction="in"/>
+ <arg name="iPageSize" type="i" direction="in"/>
+ </method>
+ <method name="checkUser">
+ <arg name="iAreaId" type="i" direction="in"/>
+ <arg name="strAreaName" type="s" direction="in"/>
+ <arg name="strUserName" type="s" direction="in"/>
+ <arg name="strPassword" type="s" direction="in"/>
+ </method>
+ <method name="reboot">
+ </method>
+ <method name="queryIdentity">
+ </method>
+ <method name="modifyPassword">
+ <arg name="strOldPassword" type="s" direction="in"/>
+ <arg name="strNewPassword" type="s" direction="in"/>
+ </method>
+ <method name="enableHttps">
+ </method>
+ <method name="passwordDemandTip">
+ <arg type="s" direction="out"/>
+ </method>
+ <method name="forceExitDomain">
+ </method>
+ </interface>
+</node>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.daemon.ACLNetwork.xml
new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.daemon.ACLNetwork.xml
--- old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.daemon.ACLNetwork.xml
2020-09-09 12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.daemon.ACLNetwork.xml
2021-01-05 03:07:41.000000000 +0100
@@ -9,6 +9,11 @@
<arg name="timeout" type="u" direction="in"></arg>
<arg name="result" type="b" direction="out"></arg>
</method>
+ <method name="Unregister">
+ <arg name="handler" type="s" direction="in"></arg>
+ <arg name="pid" type="i" direction="in"></arg>
+ <arg name="result" type="b" direction="out"></arg>
+ </method>
<signal name="AccessRequest">
<arg name="id" type="s"></arg>
</signal>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.daemon.Display.xml
new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.daemon.Display.xml
--- old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.daemon.Display.xml
2020-09-09 12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.daemon.Display.xml
2021-01-05 03:07:41.000000000 +0100
@@ -10,6 +10,9 @@
<method name="DeleteCustomMode">
<arg type="s" direction="in"></arg>
</method>
+ <method name="GetRealDisplayMode">
+ <arg type="y" direction="out"></arg>
+ </method>
<method name="ListOutputNames">
<arg type="as" direction="out"></arg>
</method>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.daemon.PowerManager.xml
new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.daemon.PowerManager.xml
--- old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.daemon.PowerManager.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.daemon.PowerManager.xml
2021-01-05 03:07:41.000000000 +0100
@@ -0,0 +1,15 @@
+ <interface name="com.deepin.daemon.PowerManager">
+ <method name="CanHibernate">
+ <arg type="b" direction="out"/>
+ </method>
+ <method name="CanReboot">
+ <arg type="b" direction="out"/>
+ </method>
+ <method name="CanShutdown">
+ <arg type="b" direction="out"/>
+ </method>
+ <method name="CanSuspend">
+ <arg type="b" direction="out"/>
+ </method>
+ </interface>
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.dde.Notification.xml
new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.dde.Notification.xml
--- old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.dde.Notification.xml
2020-09-09 12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.dde.Notification.xml
2021-01-05 03:07:41.000000000 +0100
@@ -44,10 +44,31 @@
<arg direction="out" type="s"/>
</method>
<method name="Toggle"/>
- <method name="recordCount">
+ <method name="recordCount">
<arg direction="out" type="u"/>
</method>
- <method name="setAppSetting">
+ <method name="GetAppList">
+ <arg direction="out" type="as"/>
+ </method>
+ <method name="GetAppInfo">
+ <arg direction="in" type="s"/>
+ <arg direction="in" type="u"/>
+ <arg direction="out" type="v"/>
+ </method>
+ <method name="GetSystemInfo">
+ <arg direction="in" type="u"/>
+ <arg direction="out" type="v"/>
+ </method>
+ <method name="SetAppInfo">
+ <arg direction="in" type="s"/>
+ <arg direction="in" type="u"/>
+ <arg direction="in" type="v"/>
+ </method>
+ <method name="SetSystemInfo">
+ <arg direction="in" type="u"/>
+ <arg direction="in" type="v"/>
+ </method>
+ <method name="setAppSetting">
<arg direction="in" type="s"/>
</method>
<signal name="NotificationClosed">
@@ -61,19 +82,31 @@
<signal name="RecordAdded">
<arg type="s"/>
</signal>
- <signal name="appSettingChanged">
+ <signal name="AppInfoChanged">
+ <arg type="s"/>
+ <arg type="u"/>
+ <arg type="v"/>
+ </signal>
+ <signal name="SystemInfoChanged">
+ <arg type="u"/>
+ <arg type="v"/>
+ </signal>
+ <signal name="AppAddedSignal">
<arg type="s"/>
</signal>
- <signal name="systemSettingChanged">
+ <signal name="AppRemovedSignal">
<arg type="s"/>
</signal>
<signal name="appRemoved">
<arg type="s"/>
</signal>
- <signal name="appAdded">
+ <signal name="appAdded">
<arg type="s"/>
</signal>
- <signal name="appSettingDone">
+ <signal name="appSettingChanged">
+ <arg type="s"/>
+ </signal>
+ <signal name="systemSettingChanged">
<arg type="s"/>
</signal>
<property name="allSetting" type="s" access="readwrite"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.lastore.JobManager.xml
new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.lastore.JobManager.xml
--- old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.lastore.JobManager.xml
2020-09-09 12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.lastore.JobManager.xml
2021-01-05 03:07:41.000000000 +0100
@@ -69,6 +69,6 @@
<property name="SystemArchitectures" type="as" access="read"></property>
<property name="UpgradableApps" type="as" access="read"></property>
<property name="SystemOnChanging" type="b" access="read"></property>
- <property name="AutoClean" type="b" access="read"/>
+ <property name="AutoClean" type="b" access="read"></property>
+ <property name="UpdateMode" type="t" access="readwrite"></property>
</interface>
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.system.SystemPower.xml
new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.system.SystemPower.xml
--- old/dde-qt-dbus-factory-5.3.0.14/xml/com.deepin.system.SystemPower.xml
2020-09-09 12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/xml/com.deepin.system.SystemPower.xml
2021-01-05 03:07:41.000000000 +0100
@@ -3,6 +3,9 @@
<arg name="batteries" type="ao" direction="out"/>
</method>
<method name="Refresh"/>
+ <method name="SetMode">
+ <arg name="mode" type="s" direction="in"></arg>
+ </method>
<method name="RefreshBatteries"/>
<method name="RefreshMains"/>
<signal name="BatteryDisplayUpdate">
@@ -28,4 +31,6 @@
<property name="PowerSystemAutoToSleepWhenFree" type="b" access="readwrite"/>
<property name="PowerSavingModeAutoWhenBatteryLow" type="b"
access="readwrite"/>
<property name="PowerSavingModeBrightnessDropPercent" type="u"
access="readwrite"/>
+ <property name="IsHighPerformanceSupported" type="b" access="read"/>
+ <property name="Mode" type="s" access="read"/>
</interface>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-qt-dbus-factory-5.3.0.14/xml/org.freedesktop.PolicyKit1.xml
new/dde-qt-dbus-factory-5.3.35/xml/org.freedesktop.PolicyKit1.xml
--- old/dde-qt-dbus-factory-5.3.0.14/xml/org.freedesktop.PolicyKit1.xml
2020-09-09 12:10:42.000000000 +0200
+++ new/dde-qt-dbus-factory-5.3.35/xml/org.freedesktop.PolicyKit1.xml
2021-01-05 03:07:41.000000000 +0100
@@ -6,20 +6,17 @@
ut">
</arg>
</method-->
- <!--method name="CheckAuthorization">
- <arg type="(sa{sv})" name="subject" direction="in">
- </arg>
- <arg type="s" name="action_id" direction="in">
- </arg>
- <arg type="a{ss}" name="details" direction="in">
- </arg>
- <arg type="u" name="flags" direction="in">
- </arg>
- <arg type="s" name="cancellation_id" direction="in">
- </arg>
- <arg type="(bba{ss})" name="result" direction="out">
- </arg>
- </method-->
+ <method name="CheckAuthorization">
+ <arg type="(sa{sv})" name="subject" direction="in"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0"
value="PolicySubject"/>
+ <arg type="s" name="action_id" direction="in"/>
+ <arg type="a{ss}" name="details" direction="in"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In2"
value="PolicyDetails"/>
+ <arg type="u" name="flags" direction="in"/>
+ <arg type="s" name="cancellation_id" direction="in"/>
+ <arg type="(bba{ss})" name="result" direction="out"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0"
value="PolicyResult"/>
+ </method>
<method name="CancelCheckAuthorization">
<arg type="s" name="cancellation_id" direction="in">
</arg>
