Hello community, here is the log from the commit of package PythonQt for openSUSE:Factory checked in at 2020-04-09 23:18:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PythonQt (Old) and /work/SRC/openSUSE:Factory/.PythonQt.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PythonQt" Thu Apr 9 23:18:02 2020 rev:2 rq:792727 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/PythonQt/PythonQt.changes 2018-03-22 12:08:06.663234856 +0100 +++ /work/SRC/openSUSE:Factory/.PythonQt.new.3248/PythonQt.changes 2020-04-09 23:18:27.230348521 +0200 @@ -1,0 +2,15 @@ +Thu Apr 9 10:12:39 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Spec cleanup. Use dos2unix +- Update patches: + * PythonQt-add-install-target.patch + * PythonQt-create-pkg-config.patch +- Add patch to fix build with python 3.8: + * 0001-Fix-build-with-python-3.8.patch + +------------------------------------------------------------------- +Mon Mar 12 09:13:32 UTC 2018 - [email protected] + +- Trim filler wording of descriptions. + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-python-3.8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PythonQt.spec ++++++ --- /var/tmp/diff_new_pack.eu2ix0/_old 2020-04-09 23:18:28.970349528 +0200 +++ /var/tmp/diff_new_pack.eu2ix0/_new 2020-04-09 23:18:28.970349528 +0200 @@ -1,7 +1,7 @@ # # spec file for package PythonQt # -# Copyright (c) 2018 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,14 +22,17 @@ Version: 3.2 Release: 0 Summary: Dynamic Python binding for the Qt framework +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -License: LGPL-2.1+ URL: http://pythonqt.sourceforge.net Source0: https://downloads.sourceforge.net/pythonqt/%{name}%{version}.zip # PATCH-FIX-OPENSUSE PythonQt-add-install-target.patch Patch0: %{name}-add-install-target.patch # PATCH-FIX-UPSTREAM PythonQt-create-pkg-config.patch Patch1: PythonQt-create-pkg-config.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-Fix-build-with-python-3.8.patch +BuildRequires: dos2unix BuildRequires: libqt5-qtbase-private-headers-devel BuildRequires: libqt5-qtdeclarative-devel BuildRequires: libqt5-qttools-devel @@ -44,15 +47,11 @@ BuildRequires: pkgconfig(python3) %description -PythonQt offers an easy way to embed the Python scripting language into a +PythonQt offers embedding of the Python scripting language into a C++ Qt applications. It makes heavy use of the QMetaObject system and requires Qt 5.x. -The focus of PythonQt is on embedding Python into an existing C++ application, -not on writing the whole application completely in Python. If you want to write -your whole application in Python, you should use PyQt or PySide instead. -If you are looking for a simple way to embed Python objects into your C++/Qt -Application and to script parts of your application via Python, PythonQt is the -way to go! +It is focused on embedding, not writing entire applications in Python - +that should use PyQt or PySide instead. %package devel Summary: Header files and development libraries for the pythonqt package @@ -70,59 +69,44 @@ %description devel Header files and development libraries for the PythonQt package. -PythonQt offers an easy way to embed the Python scripting language into a +PythonQt offers embedding of the Python scripting language into a C++ Qt applications. It makes heavy use of the QMetaObject system and requires Qt 5.x. -The focus of PythonQt is on embedding Python into an existing C++ application, -not on writing the whole application completely in Python. If you want to write -your whole application in Python, you should use PyQt or PySide instead. -If you are looking for a simple way to embed Python objects into your C++/Qt -Application and to script parts of your application via Python, PythonQt is the -way to go! +It is focused on embedding, not writing entire applications in Python - +that should use PyQt or PySide instead. %package -n lib%{name}-Qt5-Python%{mypyver}-%{sover} Summary: Dynamic Python binding for the Qt framework Group: System/Libraries %description -n lib%{name}-Qt5-Python%{mypyver}-%{sover} -PythonQt offers an easy way to embed the Python scripting language into a +PythonQt offers embedding of the Python scripting language into a C++ Qt applications. It makes heavy use of the QMetaObject system and requires Qt 5.x. -The focus of PythonQt is on embedding Python into an existing C++ application, -not on writing the whole application completely in Python. If you want to write -your whole application in Python, you should use PyQt or PySide instead. -If you are looking for a simple way to embed Python objects into your C++/Qt -Application and to script parts of your application via Python, PythonQt is the -way to go! %package -n lib%{name}_QtAll-Qt5-Python%{mypyver}-%{sover} Summary: Dynamic Python binding for the Qt framework Group: System/Libraries %description -n lib%{name}_QtAll-Qt5-Python%{mypyver}-%{sover} -PythonQt offers an easy way to embed the Python scripting language into a +PythonQt offers embedding of the Python scripting language into a C++ Qt applications. It makes heavy use of the QMetaObject system and requires Qt 5.x. -The focus of PythonQt is on embedding Python into an existing C++ application, -not on writing the whole application completely in Python. If you want to write -your whole application in Python, you should use PyQt or PySide instead. -If you are looking for a simple way to embed Python objects into your C++/Qt -Application and to script parts of your application via Python, PythonQt is the -way to go! %prep %setup -q -n %{name}%{version} -%patch0 -p1 -%patch1 -p1 + +find . -type f -exec dos2unix {} \; + +%autopatch -p1 + sed -r -i -e "s/(unix:PYTHON_VERSION=).*/\1%{mypyver}/g" build/python.prf -# Fix README end-of-line encoding -sed -i 's/\r//' README %build %qmake5 \ "LIB_INSTALL=%{_libdir}" \ "HEADER_INSTALL=%{_includedir}/PythonQt" -make %{?_smp_mflags} +%make_build %install %qmake5_install ++++++ 0001-Fix-build-with-python-3.8.patch ++++++ >From 6393d51947c94a2ba43aff3b44966827f2cf7b27 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Thu, 9 Apr 2020 13:23:56 +0200 Subject: [PATCH] Fix build with python 3.8. python-config --libs doesn't contain the python3.8 library. --- build/python.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/python.prf b/build/python.prf index 165ad3b..be45d23 100644 --- a/build/python.prf +++ b/build/python.prf @@ -36,6 +36,8 @@ macx { # on linux, python-config is used to autodetect Python. # make sure that you have installed a matching python-dev package. - unix:LIBS += $$system(python$${PYTHON_VERSION}-config --libs) + system(python$${PYTHON_VERSION}-config --embed --libs) { + unix:LIBS += $$system(python$${PYTHON_VERSION}-config --embed --libs) + } else: unix:LIBS += $$system(python$${PYTHON_VERSION}-config --libs) unix:QMAKE_CXXFLAGS += $$system(python$${PYTHON_VERSION}-config --includes) } -- 2.26.0 ++++++ PythonQt-add-install-target.patch ++++++ --- /var/tmp/diff_new_pack.eu2ix0/_old 2020-04-09 23:18:29.006349548 +0200 +++ /var/tmp/diff_new_pack.eu2ix0/_new 2020-04-09 23:18:29.006349548 +0200 @@ -9,30 +9,30 @@ --- PythonQt3.2.orig/extensions/PythonQt_QtAll/PythonQt_QtAll.pro 2017-06-06 09:26:08.000000000 +0200 +++ PythonQt3.2/extensions/PythonQt_QtAll/PythonQt_QtAll.pro 2017-06-08 08:36:47.640909008 +0200 @@ -42,3 +42,6 @@ - DEFINES += PYTHONQT_WITH_WEBKIT - include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri) - } -+ -+target.path = $${LIB_INSTALL} -+INSTALLS += target + DEFINES += PYTHONQT_WITH_WEBKIT + include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri) + } ++ ++target.path = $${LIB_INSTALL} ++INSTALLS += target diff -uNr PythonQt3.2.orig/PythonQt.pro PythonQt3.2/PythonQt.pro --- PythonQt3.2.orig/PythonQt.pro 2009-04-09 11:32:54.000000000 +0200 +++ PythonQt3.2/PythonQt.pro 2017-06-08 08:37:17.042002297 +0200 @@ -2,3 +2,7 @@ - - CONFIG += ordered - SUBDIRS = generator src extensions tests examples -+ -+header.path = $${HEADER_INSTALL} -+header.files = src/*.h extensions/PythonQt_QtAll/*.h -+INSTALLS += header + + CONFIG += ordered + SUBDIRS = generator src extensions tests examples ++ ++header.path = $${HEADER_INSTALL} ++header.files = src/*.h extensions/PythonQt_QtAll/*.h ++INSTALLS += header diff -uNr PythonQt3.2.orig/src/src.pro PythonQt3.2/src/src.pro --- PythonQt3.2.orig/src/src.pro 2017-06-06 09:26:08.000000000 +0200 +++ PythonQt3.2/src/src.pro 2017-06-08 08:37:41.769080755 +0200 @@ -41,3 +41,6 @@ - - include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin.pri) - include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin.pri) -+ -+target.path = $${LIB_INSTALL} -+INSTALLS += target + + include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin.pri) + include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin.pri) ++ ++target.path = $${LIB_INSTALL} ++INSTALLS += target ++++++ PythonQt-create-pkg-config.patch ++++++ --- /var/tmp/diff_new_pack.eu2ix0/_old 2020-04-09 23:18:29.018349555 +0200 +++ /var/tmp/diff_new_pack.eu2ix0/_new 2020-04-09 23:18:29.018349555 +0200 @@ -7,44 +7,44 @@ --- PythonQt3.2.orig/src/src.pro +++ PythonQt3.2/src/src.pro @@ -39,6 +39,18 @@ TARGET = $$replace(TARGET, PythonXY, Pyt - - include ( src.pri ) - -+unix { -+ CONFIG += create_pc create_prl no_install_prl -+ QMAKE_PKGCONFIG_NAME = PythonQt-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION} -+ QMAKE_PKGCONFIG_DESCRIPTION = Dynamic Python binding for the Qt framework -+ QMAKE_PKGCONFIG_PREFIX = $$INSTALLBASE -+ QMAKE_PKGCONFIG_LIBDIR = $$target.path -+ QMAKE_PKGCONFIG_INCDIR = $$headers.path -+ QMAKE_PKGCONFIG_INCDIR += $$PREFIX/include/PythonQt -+ QMAKE_PKGCONFIG_VERSION = $$VERSION -+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig -+} -+ - include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin.pri) - include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin.pri) - + + include ( src.pri ) + ++unix { ++ CONFIG += create_pc create_prl no_install_prl ++ QMAKE_PKGCONFIG_NAME = PythonQt-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION} ++ QMAKE_PKGCONFIG_DESCRIPTION = Dynamic Python binding for the Qt framework ++ QMAKE_PKGCONFIG_PREFIX = $$INSTALLBASE ++ QMAKE_PKGCONFIG_LIBDIR = $$target.path ++ QMAKE_PKGCONFIG_INCDIR = $$headers.path ++ QMAKE_PKGCONFIG_INCDIR += $$PREFIX/include/PythonQt ++ QMAKE_PKGCONFIG_VERSION = $$VERSION ++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig ++} ++ + include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin.pri) + include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin.pri) + Index: PythonQt3.2/extensions/PythonQt_QtAll/PythonQt_QtAll.pro =================================================================== --- PythonQt3.2.orig/extensions/PythonQt_QtAll/PythonQt_QtAll.pro +++ PythonQt3.2/extensions/PythonQt_QtAll/PythonQt_QtAll.pro @@ -20,6 +20,18 @@ HEADERS += \ - SOURCES += \ - PythonQt_QtAll.cpp - -+unix { -+ CONFIG += create_pc create_prl no_install_prl -+ QMAKE_PKGCONFIG_NAME = PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION} -+ QMAKE_PKGCONFIG_DESCRIPTION = Dynamic Python binding for the Qt framework -+ QMAKE_PKGCONFIG_PREFIX = $$INSTALLBASE -+ QMAKE_PKGCONFIG_LIBDIR = $$target.path -+ QMAKE_PKGCONFIG_INCDIR = $$headers.path -+ QMAKE_PKGCONFIG_INCDIR += $$PREFIX/include/PythonQt -+ QMAKE_PKGCONFIG_VERSION = $$VERSION -+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig -+} -+ - QT += gui svg sql network xml xmlpatterns opengl - QT += widgets printsupport multimedia multimediawidgets - QT += quick qml quickwidgets uitools + SOURCES += \ + PythonQt_QtAll.cpp + ++unix { ++ CONFIG += create_pc create_prl no_install_prl ++ QMAKE_PKGCONFIG_NAME = PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION} ++ QMAKE_PKGCONFIG_DESCRIPTION = Dynamic Python binding for the Qt framework ++ QMAKE_PKGCONFIG_PREFIX = $$INSTALLBASE ++ QMAKE_PKGCONFIG_LIBDIR = $$target.path ++ QMAKE_PKGCONFIG_INCDIR = $$headers.path ++ QMAKE_PKGCONFIG_INCDIR += $$PREFIX/include/PythonQt ++ QMAKE_PKGCONFIG_VERSION = $$VERSION ++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig ++} ++ + QT += gui svg sql network xml xmlpatterns opengl + QT += widgets printsupport multimedia multimediawidgets + QT += quick qml quickwidgets uitools
