Hello community,
here is the log from the commit of package deepin-qt-dbus-factory for
openSUSE:Leap:15.2 checked in at 2020-02-04 18:00:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/deepin-qt-dbus-factory (Old)
and /work/SRC/openSUSE:Leap:15.2/.deepin-qt-dbus-factory.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-qt-dbus-factory"
Tue Feb 4 18:00:04 2020 rev:12 rq:770027 version:1.1.6
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/deepin-qt-dbus-factory/deepin-qt-dbus-factory.changes
2020-01-15 14:52:03.441475281 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.deepin-qt-dbus-factory.new.26092/deepin-qt-dbus-factory.changes
2020-02-04 18:00:21.632964483 +0100
@@ -1,0 +2,5 @@
+Thu Jan 30 16:00:20 UTC 2020 - Hillwood Yang <[email protected]>
+
+- Migrate to python3, add migrate-to-python3.patch
+
+-------------------------------------------------------------------
New:
----
migrate-to-python3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-qt-dbus-factory.spec ++++++
--- /var/tmp/diff_new_pack.FH9w9K/_old 2020-02-04 18:00:22.456964980 +0100
+++ /var/tmp/diff_new_pack.FH9w9K/_new 2020-02-04 18:00:22.460964983 +0100
@@ -1,7 +1,7 @@
#
# spec file for package deepin-qt-dbus-factory
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,8 @@
Group: Development/Libraries/C and C++
URL: https://github.com/linuxdeepin/dde-qt-dbus-factory
Source:
https://github.com/linuxdeepin/dde-qt-dbus-factory/archive/%{version}/%{_name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREA migrate-to-python3.patch [email protected] - migrate
to python3
+Patch0: migrate-to-python3.patch
BuildRequires: dtkcore
BuildRequires: gcc-c++
BuildRequires: libqt5-qtbase-devel
@@ -34,8 +36,7 @@
BuildRequires: libqt5-qtdeclarative-devel
BuildRequires: libqt5-qttools-devel
BuildRequires: pkgconfig
-BuildRequires: python-devel
-BuildRequires: python-setuptools
+BuildRequires: python3
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
@@ -73,6 +74,7 @@
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
%build
%qmake5 DEFINES+=QT_NO_DEBUG_OUTPUT \
++++++ migrate-to-python3.patch ++++++
diff -Nur dde-qt-dbus-factory-1.1.6/libdframeworkdbus/generate_code.py
dde-qt-dbus-factory-1.1.6-new/libdframeworkdbus/generate_code.py
--- dde-qt-dbus-factory-1.1.6/libdframeworkdbus/generate_code.py
2019-06-19 17:15:56.000000000 +0800
+++ dde-qt-dbus-factory-1.1.6-new/libdframeworkdbus/generate_code.py
2020-01-31 00:17:18.273338000 +0800
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-from __future__ import print_function
+
import os
import glob
import subprocess
@@ -52,8 +52,8 @@
print("generating the pri file...")
pwdfy = lambda x: "$$PWD/%s" % x
- sources = map(pwdfy, sorted(glob.glob1(generated_dir, "*.cpp")))
- headers = map(pwdfy, sorted(glob.glob1(generated_dir, "*.h")))
+ sources = list(map(pwdfy, sorted(glob.glob1(generated_dir, "*.cpp"))))
+ headers = list(map(pwdfy, sorted(glob.glob1(generated_dir, "*.h"))))
pri.write("HEADERS += %s\n" % " ".join(headers))
pri.write("SOURCES += %s" % " ".join(sources))
print("done.")
diff -Nur dde-qt-dbus-factory-1.1.6/libdframeworkdbus/libdframeworkdbus.pro
dde-qt-dbus-factory-1.1.6-new/libdframeworkdbus/libdframeworkdbus.pro
--- dde-qt-dbus-factory-1.1.6/libdframeworkdbus/libdframeworkdbus.pro
2019-06-19 17:15:56.000000000 +0800
+++ dde-qt-dbus-factory-1.1.6-new/libdframeworkdbus/libdframeworkdbus.pro
2020-01-31 00:14:04.776764306 +0800
@@ -86,7 +86,7 @@
types/dockrect.cpp \
types/intstring.cpp
-!system(python $$PWD/generate_code.py): error("Failed to generate code")
+!system(python3 $$PWD/generate_code.py): error("Failed to generate code")
include(generated/generated.pri)
isEmpty(LIB_INSTALL_DIR) {
