PyQt5-5.6
This commit is contained in:
parent
1f097497a3
commit
fccf80206a
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
/PyQt-gpl-5.4.2.tar.gz
|
|
||||||
/PyQt-gpl-5.5.1.tar.gz
|
/PyQt-gpl-5.5.1.tar.gz
|
||||||
|
/PyQt5_gpl-5.6.tar.gz
|
||||||
|
12
PyQt5_gpl-5.6-dbus_ftbfs.patch
Normal file
12
PyQt5_gpl-5.6-dbus_ftbfs.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up PyQt5_gpl-5.6/configure.py.dbus PyQt5_gpl-5.6/configure.py
|
||||||
|
--- PyQt5_gpl-5.6/configure.py.dbus 2016-04-24 22:16:43.120281591 -0500
|
||||||
|
+++ PyQt5_gpl-5.6/configure.py 2016-04-25 10:16:52.465218805 -0500
|
||||||
|
@@ -2141,7 +2141,7 @@ def check_dbus(target_config, verbose):
|
||||||
|
else:
|
||||||
|
dlist = target_config.dbus_inc_dirs
|
||||||
|
|
||||||
|
- target_config.dbus_inc_dirs = []
|
||||||
|
+ #target_config.dbus_inc_dirs = []
|
||||||
|
|
||||||
|
for d in dlist:
|
||||||
|
if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK):
|
@ -18,16 +18,16 @@
|
|||||||
|
|
||||||
Summary: PyQt5 is Python bindings for Qt5
|
Summary: PyQt5 is Python bindings for Qt5
|
||||||
Name: python-qt5
|
Name: python-qt5
|
||||||
Version: 5.5.1
|
Version: 5.6
|
||||||
Release: 20%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# all BSD, except for GPLv2+ dbus bindings and examples
|
# all BSD, except for GPLv2+ dbus bindings and examples
|
||||||
License: BSD and GPLv2+
|
License: BSD and GPLv2+
|
||||||
Url: http://www.riverbankcomputing.com/software/pyqt/
|
Url: http://www.riverbankcomputing.com/software/pyqt/
|
||||||
%if 0%{?snap:1}
|
%if 0%{?snap:1}
|
||||||
Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt-gpl-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
|
Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
|
||||||
%else
|
%else
|
||||||
Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt-gpl-%{version}.tar.gz
|
Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt5_gpl-%{version}.tar.gz
|
||||||
%endif
|
%endif
|
||||||
Source1: macros.pyqt5
|
Source1: macros.pyqt5
|
||||||
# wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9
|
# wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9
|
||||||
@ -37,6 +37,7 @@ Source2: pyuic5.sh
|
|||||||
|
|
||||||
## upstreamable patches
|
## upstreamable patches
|
||||||
Patch0: python-qt5_sipdir.patch
|
Patch0: python-qt5_sipdir.patch
|
||||||
|
Patch1: PyQt5_gpl-5.6-dbus_ftbfs.patch
|
||||||
|
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: findutils
|
BuildRequires: findutils
|
||||||
@ -63,10 +64,10 @@ BuildRequires: pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns)
|
|||||||
BuildRequires: pkgconfig(Qt5WebChannel)
|
BuildRequires: pkgconfig(Qt5WebChannel)
|
||||||
BuildRequires: pkgconfig(Qt5WebSockets)
|
BuildRequires: pkgconfig(Qt5WebSockets)
|
||||||
BuildRequires: python2-devel python2
|
BuildRequires: python2-devel python2
|
||||||
BuildRequires: sip-devel >= 4.16.9
|
BuildRequires: sip-devel >= 4.18
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
BuildRequires: python3-devel python3
|
BuildRequires: python3-devel python3
|
||||||
BuildRequires: python3-sip-devel >= 4.16.8
|
BuildRequires: python3-sip-devel >= 4.18
|
||||||
BuildRequires: python3-dbus
|
BuildRequires: python3-dbus
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
@ -88,6 +89,8 @@ Requires: dbus-python
|
|||||||
|
|
||||||
Provides: PyQt5 = %{version}-%{release}
|
Provides: PyQt5 = %{version}-%{release}
|
||||||
Provides: PyQt5%{?_isa} = %{version}-%{release}
|
Provides: PyQt5%{?_isa} = %{version}-%{release}
|
||||||
|
Provides: python2-PyQt5 = %{version}-%{release}
|
||||||
|
Provides: python2-PyQt5%{?_isa} = %{version}-%{release}
|
||||||
Provides: python2-qt5 = %{version}-%{release}
|
Provides: python2-qt5 = %{version}-%{release}
|
||||||
Provides: python2-qt5%{?_isa} = %{version}-%{release}
|
Provides: python2-qt5%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
@ -100,6 +103,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
Requires: qt5-qtbase-devel
|
Requires: qt5-qtbase-devel
|
||||||
Requires: sip-devel
|
Requires: sip-devel
|
||||||
Provides: PyQt5-devel = %{version}-%{release}
|
Provides: PyQt5-devel = %{version}-%{release}
|
||||||
|
Provides: python2-PyQt5-devel = %{version}-%{release}
|
||||||
%description devel
|
%description devel
|
||||||
Files needed to build other bindings for C++ classes that inherit from any
|
Files needed to build other bindings for C++ classes that inherit from any
|
||||||
of the Qt5 classes (e.g. KDE or your own).
|
of the Qt5 classes (e.g. KDE or your own).
|
||||||
@ -118,6 +122,7 @@ Summary: Python 3 bindings for Qt5
|
|||||||
Obsoletes: python3-qt5 < 5.5.1-10
|
Obsoletes: python3-qt5 < 5.5.1-10
|
||||||
%endif
|
%endif
|
||||||
Provides: python3-PyQt5 = %{version}-%{release}
|
Provides: python3-PyQt5 = %{version}-%{release}
|
||||||
|
Provides: python3-PyQt5%{?_isa} = %{version}-%{release}
|
||||||
Requires: %{name}-rpm-macros = %{version}-%{release}
|
Requires: %{name}-rpm-macros = %{version}-%{release}
|
||||||
Requires: python3-dbus
|
Requires: python3-dbus
|
||||||
%description -n python3-qt5
|
%description -n python3-qt5
|
||||||
@ -174,8 +179,10 @@ Requires: python3-qt5%{?_isa} = %{version}-%{release}
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n PyQt-gpl-%{version}%{?snap:-snapshot-%{snap}}
|
%setup -q -n PyQt5_gpl-%{version}%{?snap:-snapshot-%{snap}}
|
||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -188,7 +195,6 @@ pushd %{_target_platform}
|
|||||||
%{__python2} ../configure.py \
|
%{__python2} ../configure.py \
|
||||||
--assume-shared \
|
--assume-shared \
|
||||||
--confirm-license \
|
--confirm-license \
|
||||||
--no-timestamp \
|
|
||||||
--qmake=%{_qt5_qmake} \
|
--qmake=%{_qt5_qmake} \
|
||||||
--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \
|
--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \
|
||||||
--verbose \
|
--verbose \
|
||||||
@ -207,7 +213,6 @@ pushd %{_target_platform}-python3
|
|||||||
%{__python3} ../configure.py \
|
%{__python3} ../configure.py \
|
||||||
--assume-shared \
|
--assume-shared \
|
||||||
--confirm-license \
|
--confirm-license \
|
||||||
--no-timestamp \
|
|
||||||
--qmake=%{_qt5_qmake} \
|
--qmake=%{_qt5_qmake} \
|
||||||
--no-qsci-api \
|
--no-qsci-api \
|
||||||
--verbose \
|
--verbose \
|
||||||
@ -404,6 +409,9 @@ sed -i \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 25 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6-1
|
||||||
|
- PyQt5-5.6
|
||||||
|
|
||||||
* Wed Apr 13 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.5.1-20
|
* Wed Apr 13 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.5.1-20
|
||||||
- rebuild (sip), re-enable -webengine for secondary archs
|
- rebuild (sip), re-enable -webengine for secondary archs
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
diff -rupN PyQt-gpl-5.4.1/configure.py PyQt-gpl-5.4.1-new/configure.py
|
diff -up PyQt5_gpl-5.6/configure.py.orig PyQt5_gpl-5.6/configure.py
|
||||||
--- PyQt-gpl-5.4.1/configure.py 2015-02-26 13:17:00.000000000 +0100
|
--- PyQt5_gpl-5.6/configure.py.orig 2016-04-24 05:55:08.000000000 -0500
|
||||||
+++ PyQt-gpl-5.4.1-new/configure.py 2015-06-05 00:12:06.326506542 +0200
|
+++ PyQt5_gpl-5.6/configure.py 2016-04-24 18:39:26.144925768 -0500
|
||||||
@@ -25,6 +25,7 @@ import os
|
@@ -25,6 +25,7 @@ import os
|
||||||
import shutil
|
import shutil
|
||||||
import stat
|
import stat
|
||||||
@ -9,10 +9,10 @@ diff -rupN PyQt-gpl-5.4.1/configure.py PyQt-gpl-5.4.1-new/configure.py
|
|||||||
|
|
||||||
|
|
||||||
# Initialise the constants.
|
# Initialise the constants.
|
||||||
@@ -463,7 +464,7 @@ class TargetConfiguration:
|
@@ -476,7 +477,7 @@ class TargetConfiguration:
|
||||||
self.py_version = py_config.version
|
|
||||||
self.pyqt_bin_dir = py_config.bin_dir
|
self.pyqt_bin_dir = py_config.bin_dir
|
||||||
self.pyqt_module_dir = py_config.module_dir
|
self.pyqt_module_dir = py_config.module_dir
|
||||||
|
self.pyqt_stubs_dir = os.path.join(py_config.module_dir, 'PyQt5')
|
||||||
- self.pyqt_sip_dir = os.path.join(py_config.data_dir, 'sip', 'PyQt5')
|
- self.pyqt_sip_dir = os.path.join(py_config.data_dir, 'sip', 'PyQt5')
|
||||||
+ self.pyqt_sip_dir = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt5')
|
+ self.pyqt_sip_dir = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt5')
|
||||||
self.pyuic_interpreter = py_config.pyuic_interpreter
|
self.pyuic_interpreter = py_config.pyuic_interpreter
|
||||||
|
Loading…
Reference in New Issue
Block a user