Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
a1fa07d36d
!13 fix build error with python 3.11.4
From: @cherry530 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-07-20 04:06:34 +00:00
cherry530
8a0f339571 fix build error with python 3.11.4
Signed-off-by: cherry530 <707078654@qq.com>
2023-07-20 10:46:43 +08:00
openeuler-ci-bot
39b0e70e60
!11 Package upgrade
From: @xigaoxinyan 
Reviewed-by: @shinwell_hu 
Signed-off-by: @shinwell_hu
2022-06-30 03:12:26 +00:00
xigaoxinyan
79779ade14 Package upgrade 2022-06-28 14:56:47 +08:00
openeuler-ci-bot
d4a3941198 !10 remove python2 dependency
From: @lei_ju
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-10-30 11:48:01 +08:00
lei_ju
703906473d remove python2 dependency 2020-10-30 09:30:23 +08:00
openeuler-ci-bot
ab40180ac5 !7 Modify Source0 Url of package PyQt4
From: @wang--ge
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-09-17 11:50:08 +08:00
wangge
484de8259e Modify Source0 Url on master branch 2020-09-15 20:10:45 +08:00
openeuler-ci-bot
7a6b85023a !2 add yaml file
Merge pull request !2 from sugarfillet/master
2020-05-21 10:35:40 +08:00
sugarfillet
02ac1ea862 add yaml file 2020-05-08 15:54:38 +08:00
4 changed files with 41 additions and 35 deletions

View File

@ -0,0 +1,12 @@
diff -up PyQt4_gpl_x11-4.12.3/qpy/QtCore/qpycore_classinfo.cpp.me PyQt4_gpl_x11-4.12.3/qpy/QtCore/qpycore_classinfo.cpp
--- PyQt4_gpl_x11-4.12.3/qpy/QtCore/qpycore_classinfo.cpp.me 2022-06-21 15:04:28.885197054 +0200
+++ PyQt4_gpl_x11-4.12.3/qpy/QtCore/qpycore_classinfo.cpp 2022-06-21 15:04:51.654741730 +0200
@@ -36,7 +36,7 @@ PyObject *qpycore_ClassInfo(const char *
// We need the frame we were called from, not the current one.
if (frame)
- frame = frame->f_back;
+ frame = PyFrame_GetBack(frame);
if (!frame)
{

View File

@ -1,31 +1,27 @@
%{!?python2_sitelib: %global python2_sitelib %(/usr/bin/python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python2_sitearch:%global python2_sitearch %(/usr/bin/python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%{!?python2_inc:%global python2_inc %(/usr/bin/python2 -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")}
%{!?python3_inc:%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")} %{!?python3_inc:%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")}
%global python2_dbus_dir %(/usr/bin/python2 -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")
%global python3_dbus_dir %(%{__python3} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])") %global python3_dbus_dir %(%{__python3} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")
%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so|%{_qt4_plugindir}/.*\\.so)$ %global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so|%{_qt4_plugindir}/.*\\.so)$
Name: PyQt4 Name: PyQt4
Version: 4.12.1 Version: 4.12.3
Release: 12 Release: 2
Summary: Python bindings for Qt4 Summary: Python bindings for Qt4
License: (GPLv3 or GPLv2 with exceptions) and BSD License: (GPLv3 or GPLv2 with exceptions) and BSD
Url: http://www.riverbankcomputing.com/software/pyqt/ Url: http://www.riverbankcomputing.com/software/pyqt/
Source0: http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-%{version}/PyQt4_gpl_x11-%{version}.tar.gz Source0: http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-%{version}/PyQt4_gpl_x11-%{version}.tar.gz/download?use_mirror=ufpr#/PyQt4_gpl_x11-%{version}.tar.gz
Patch0001: qreal_float_support.diff Patch0001: qreal_float_support.diff
Patch0002: PyQt4-4.12.3-pyframe_getback.patch
BuildRequires: chrpath dbus-python findutils gcc-c++ pkgconfig(dbus-1) pkgconfig(dbus-python) pkgconfig(phonon) BuildRequires: chrpath dbus-python findutils gcc-c++ pkgconfig(dbus-1) pkgconfig(dbus-python) pkgconfig(phonon)
BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDeclarative) pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtHelp) BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDeclarative) pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtHelp)
BuildRequires: pkgconfig(QtMultimedia) pkgconfig(QtNetwork) pkgconfig(QtOpenGL) pkgconfig(QtScript) pkgconfig(QtScriptTools) BuildRequires: pkgconfig(QtMultimedia) pkgconfig(QtNetwork) pkgconfig(QtOpenGL) pkgconfig(QtScript) pkgconfig(QtScriptTools)
BuildRequires: pkgconfig(QtSql) pkgconfig(QtSvg) pkgconfig(QtTest) pkgconfig(QtXml) pkgconfig(QtXmlPatterns) python2-devel BuildRequires: pkgconfig(QtSql) pkgconfig(QtSvg) pkgconfig(QtTest) pkgconfig(QtXml) pkgconfig(QtXmlPatterns)
BuildRequires: python2-sip python2-sip-devel >= 4.19 python3-dbus python3-devel python3-sip python3-sip-devel >= 4.19 BuildRequires: python3-dbus python3-devel python3-sip python3-sip-devel >= 4.19
Buildrequires: qt-assistant-adp-devel pkgconfig(QtWebKit) Buildrequires: qt-assistant-adp-devel
Requires: dbus-python qt4 >= %{_qt4_version} sip-api(%{_sip_api_major}) >= %{_sip_api} Requires: dbus-python qt4 >= %{_qt4_version}
Provides: python-qt4 = %{version}-%{release} python2-qt4 = %{version}-%{release} python2-PyQt4 = %{version}-%{release} Provides: python-qt4 = %{version}-%{release}
Provides: PyQt4-qsci-api = %{version}-%{release} PyQt4-assistant = %{version}-%{release} PyQt4-webkit = %{version}-%{release} Provides: PyQt4-qsci-api = %{version}-%{release} PyQt4-assistant = %{version}-%{release} PyQt4-webkit = %{version}-%{release}
Provides: python-qt4-qsci-api = %{version}-%{release} python2-qt4-qsci-api = %{version}-%{release} python2-pyqt4-qsci-api = %{version}-%{release} Provides: python-qt4-qsci-api = %{version}-%{release} python-qt4-assistant = %{version}-%{release} python-qt4-webkit = %{version}-%{release}
Provides: python-qt4-assistant = %{version}-%{release} python2-qt4-assistant = %{version}-%{release} python2-pyqt4-assistant = %{version}-%{release}
Provides: python-qt4-webkit = %{version}-%{release} python2-qt4-webkit = %{version}-%{release} python2-PyQt4-webkit = %{version}-%{release}
Provides: pyqt4-webkit = %{version}-%{release} pyqt4 = %{version}-%{release} Provides: pyqt4-webkit = %{version}-%{release} pyqt4 = %{version}-%{release}
Obsoletes: PyQt4 < 4.11.4-8 pyqt4-devel < 4.10.3-6 python3-pyqt4-devel < 4.10.3-6 Obsoletes: PyQt4 < 4.11.4-8 pyqt4-devel < 4.10.3-6 python3-pyqt4-devel < 4.10.3-6
Obsoletes: PyQt4-qsci-api < %{version}-%{release} PyQt4-assistant < %{version}-%{release} PyQt4-webkit < %{version}-%{release} Obsoletes: PyQt4-qsci-api < %{version}-%{release} PyQt4-assistant < %{version}-%{release} PyQt4-webkit < %{version}-%{release}
@ -35,9 +31,8 @@ These are Python bindings for Qt4.
%package devel %package devel
Summary: Development files for the Qt4 library Summary: Development files for the Qt4 library
Requires: PyQt4 = %{version}-%{release} qt4-devel sip-devel Requires: PyQt4 = %{version}-%{release} qt4-devel
Provides: PyQt4-webkit-devel = %{version}-%{release} python-qt4-devel = %{version}-%{release} Provides: PyQt4-webkit-devel = %{version}-%{release} python-qt4-devel = %{version}-%{release}
Provides: python2-qt4-doc = %{version}-%{release} python2-PyQt4-doc = %{version}-%{release}
Provides: pyqt4-devel = %{version}-%{release} Provides: pyqt4-devel = %{version}-%{release}
Obsoletes: PyQt4 < 4.11.4-8 PyQt4-devel < 4.10.3-6 PyQt4-webkit-devel < %{version}-%{release} Obsoletes: PyQt4 < 4.11.4-8 PyQt4-devel < 4.10.3-6 PyQt4-webkit-devel < %{version}-%{release}
@ -49,7 +44,6 @@ Summary: This package contains help documents
BuildArch: noarch BuildArch: noarch
Requires: PyQt4 = %{version}-%{release} Requires: PyQt4 = %{version}-%{release}
Provides: PyQt4-doc = %{version}-%{release} python-qt4-doc = %{version}-%{release} Provides: PyQt4-doc = %{version}-%{release} python-qt4-doc = %{version}-%{release}
Provides: python2-qt4-doc = %{version}-%{release} python2-PyQt4-doc = %{version}-%{release}
Obsoletes: PyQt4-doc < %{version}-%{release} PyQt4-devel < 4.10.3-6 python3-PyQt4-devel < 4.10.3-6 Obsoletes: PyQt4-doc < %{version}-%{release} PyQt4-devel < 4.10.3-6 python3-PyQt4-devel < 4.10.3-6
%description help %description help
@ -83,12 +77,6 @@ find examples/ -name "*.py" | xargs chmod a-x
%build %build
QT4DIR=%{_qt4_prefix} QT4DIR=%{_qt4_prefix}
PATH=%{_qt4_bindir}:$PATH ; export PATH PATH=%{_qt4_bindir}:$PATH ; export PATH
install -d %{_target_platform}
cd %{_target_platform}
/usr/bin/python2 ../configure.py --assume-shared --confirm-license --no-timestamp --qmake=%{_qt4_qmake} --qsci-api \
--qsci-api-destdir=%{_qt4_datadir}/qsci --verbose CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LFLAGS="%{?__global_ldflags}"
%make_build
cd ..
install -d %{_target_platform}-python3 install -d %{_target_platform}-python3
cd %{_target_platform}-python3 cd %{_target_platform}-python3
%{__python3} ../configure.py --assume-shared --confirm-license --no-timestamp --qmake=%{_qt4_qmake} --no-qsci-api \ %{__python3} ../configure.py --assume-shared --confirm-license --no-timestamp --qmake=%{_qt4_qmake} --no-qsci-api \
@ -97,8 +85,6 @@ cd %{_target_platform}-python3
%install %install
%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3 %make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3
%make_install -C %{_target_platform}
rm -rfv %{buildroot}%{python2_sitearch}/PyQt4/uic/port_v3/
rm -rfv %{buildroot}%{python3_sitearch}/PyQt4/uic/port_v2/ rm -rfv %{buildroot}%{python3_sitearch}/PyQt4/uic/port_v2/
%check %check
@ -106,18 +92,10 @@ diff -u ./sip/QtGui/opengl_types.sip.orig ./sip/QtGui/opengl_types.sip ||:
%files %files
%doc LICENSE %doc LICENSE
%{python2_dbus_dir}/qt.so
%dir %{python2_sitearch}/PyQt4/
%{python2_sitearch}/PyQt4/*
%{_qt4_plugindir}/designer/* %{_qt4_plugindir}/designer/*
%dir %{_qt4_datadir}/qsci/
%dir %{_qt4_datadir}/qsci/api/
%dir %{_qt4_datadir}/qsci/api/python/
%{_qt4_datadir}/qsci/api/python/PyQt4.api
%files devel %files devel
%{_bindir}/* %{_bindir}/*
%{_datadir}/sip/PyQt4/
%files help %files help
%doc doc/* examples/ NEWS README %doc doc/* examples/ NEWS README
@ -133,5 +111,17 @@ diff -u ./sip/QtGui/opengl_types.sip.orig ./sip/QtGui/opengl_types.sip ||:
%{_datadir}/python3-sip/PyQt4/ %{_datadir}/python3-sip/PyQt4/
%changelog %changelog
* Thu Jul 20 2023 xu_ping <707078654@qq.com> - 4.12.3-2
- fix build error with python 3.11.4
* Thu Jun 23 2022 SimpleUpdate Robot <tc@openeuler.org> - 4.12.3-1
- Upgrade to version 4.12.3
* Tue Oct 27 2020 leiju <leiju4@huawei.com> - 4.12.1-14
- Remove python2 dependency
* Tue Sep 15 2020 Ge wang <wangge20@huawei.com> - 4.12.1-13
- Modify Source0 Url
* Fri Feb 14 2020 fengbing <fengbing7@huawei.com> - 4.12.1-12 * Fri Feb 14 2020 fengbing <fengbing7@huawei.com> - 4.12.1-12
- Pakcage init - Pakcage init

4
PyQt4.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: pypi
src_repo: PyQt4
tag_prefix: ^
seperator: .