Parcourir la source

updated 2 packages

python-qt5-5.15.6-1

sip-4.19.25-2
Tomohiro "Tomo-p" KATO il y a 1 an
Parent
commit
3083b777ce
2 fichiers modifiés avec 24 ajouts et 11 suppressions
  1. 8 5
      p/python-qt5/python-qt5-vl.spec
  2. 16 6
      s/sip/sip-vl.spec

+ 8 - 5
p/python-qt5/python-qt5-vl.spec

@@ -28,7 +28,7 @@
 
 %global with_python3 1
 %global python3_dbus_dir %(%{__python3} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")
-%global with_python2 1
+%global with_python2 0
 %global python_dbus_dir %(%{__python} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")
 
 # enable/disable individual modules
@@ -45,7 +45,7 @@
 
 Summary:        PyQt5 is Python bindings for Qt5
 Name:           python-qt5 
-Version:        5.15.4
+Version:        5.15.6
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -53,7 +53,7 @@ Distribution:   Vine Linux
 
 License: GPLv3+
 Url:     https://www.riverbankcomputing.com/software/pyqt/
-Source0: PyQt5-%{version}.tar.gz
+Source0: https://pypi.python.org/packages/source/P/PyQt5/PyQt5-%{version}.tar.gz
 Source1: macros.pyqt5
 # wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9
 Source2: pylupdate5.sh
@@ -63,7 +63,6 @@ Source4: pyuic5.sh
 ## upstream patches
 
 ## upstreamable patches
-Patch0: python-qt5_sipdir.patch
 
 BuildRequires: chrpath
 BuildRequires: findutils
@@ -276,7 +275,7 @@ Requires:  python3-qt5%{?_isa} = %{version}-%{release}
 %prep
 %setup -q -n PyQt5-%{version}%{?snap:-snapshot-%{snap}}
 
-%patch0 -p1
+sed -i -e 's/, py_ssize_t_clean=True//' sip/QtCore/QtCoremod.sip
 
 
 %build
@@ -564,7 +563,11 @@ sed -i \
 %doc %{_qt5_datadir}/qsci/api/python/PyQt5.api
 %endif
 
+
 %changelog
+* Sat Oct 29 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.6-1
+- new upstream release.
+
 * Wed Apr 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.4-1
 - new upstream release.
 

+ 16 - 6
s/sip/sip-vl.spec

@@ -1,12 +1,7 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")}
 %define py_ver %(python -c 'import sys;print(sys.version[0:3])')
 
-%{!?python3:%global __python3 /usr/bin/python3}
 %{!?python3_inc:%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")}
-%{!?python3_sitearch: %global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))")}
-%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python3_version: %global python3_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
 
 %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
@@ -17,7 +12,7 @@ Name:           sip
 Summary:        Python/C++ Bindings Generator
 Summary(ja):    Python/C++ インターフェイス生成ツール
 Version:        4.19.25
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -40,6 +35,15 @@ Source10: sip-wrapper.sh
 Patch50: sip-4.18-no_strip.patch
 # try not to rpath the world
 Patch51: sip-4.18-no_rpath.patch
+# set sip_bin properly for python3 build (needswork to be upstreamable)
+# no longer needed?  keep for a little while before dropping completely -- rex
+#Patch52: sip-4.19.3-python3_sip_bin.patch
+# Avoid hardcoding sip.so (needed for wxpython's siplib.so)
+Patch53: sip-4.19.18-no_hardcode_sip_so.patch
+# Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6
+Patch54: sip-4.19.25-py_ssize_t_clean.patch
+# Fix error: invalid use of undefined type 'struct _frame' 
+Patch55: sip-4.19.25-pyframe_getback.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -153,6 +157,9 @@ This is the Python 3 build of pyqt5-SIP.
 
 %patch50 -p1 -b .no_strip
 %patch51 -p1 -b .no_rpath
+%patch53 -p1 -b .no_sip_so
+%patch54 -p1 -b .py_ssize_t_clean
+%patch55 -p1 -b .pyframe_getback
 
 
 %build
@@ -283,6 +290,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 29 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.25-2
+- rebuilt with python3-3.11.
+
 * Wed Apr 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.25-1
 - new upstream release.