pool/python-sip
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 643585 from home:cgiboudeaux:branches:KDE:Qt5

Browse Source 
update to 4.19.13

OBS-URL: https://build.opensuse.org/request/show/643585
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip?expand=0&rev=19
This commit is contained in:
Luca Beltrame 2018-10-22 05:00:23 +00:00 committed by Git OBS Bridge
parent 75a147a0d6
commit 1bb0b0e7ff
6 changed files with 120 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
disable-rpaths.diff
View File

@ -1,8 +1,8 @@
Index: b/siputils.py
===================================================================
diff --git a/siputils.py b/siputils.py
index a29300d..df58650 100644
--- a/siputils.py
+++ b/siputils.py
@@ -926,6 +926,7 @@ class Makefile:
@@ -927,6 +927,7 @@ class Makefile:
rpaths is the cannonical list of rpaths.
"""
flags = []

30
disable-strip.diff Normal file
View File

@ -0,0 +1,30 @@
commit c59ca3fa7a63c7c13fb6be2d9642feeeaef603e2
Author: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun Oct 21 11:29:04 2018 +0200
Don't strip files.
This prevents the debug package from being created.
diff --git a/siputils.py b/siputils.py
index a29300d..d58537c 100644
--- a/siputils.py
+++ b/siputils.py
@@ -1473,7 +1473,7 @@ class ModuleMakefile(Makefile):
"""
def __init__(self, configuration, build_file, install_dir=None, static=0,
console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0,
- dir=None, makefile="Makefile", installs=None, strip=1,
+ dir=None, makefile="Makefile", installs=None, strip=0,
export_all=0, universal=None, arch=None,
deployment_target=None):
"""Initialise an instance of a module Makefile.
@@ -1784,7 +1784,7 @@ class SIPModuleMakefile(ModuleMakefile):
"""
def __init__(self, configuration, build_file, install_dir=None, static=0,
console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0,
- dir=None, makefile="Makefile", installs=None, strip=1,
+ dir=None, makefile="Makefile", installs=None, strip=0,
export_all=0, universal=None, arch=None, prot_is_public=0,
deployment_target=None):
"""Initialise an instance of a SIP generated module Makefile.

29
python-sip.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Sun Oct 21 09:31:18 UTC 2018 - Christophe Giboudeaux <christophe@krop.fr>
- Add disable-strip.diff to fix the -debuginfo creation.
- Update to 4.19.13:
* Build system fixes
* Removed support in the XML/API export for deprecated features
* Pass the fully qualified Python names of types for arguments and
results.
* Various fixes for the XML export
* Fixed a bug when arguments that were templates could lose their type
hints
-------------------------------------------------------------------
Mon Jul 2 16:52:01 UTC 2018 - christophe@krop.fr
- Update to 4.19.12:
* Added the /ScopesStripped/ argument annotation.
* The members of traditional C/C++ enums are now also visible within the
scope of the enum itself. This means that members of scoped and unscoped
enums can be accessed in the same way from Python.
* Private copies of the sip module are now easier to configure and use.
SIP v5 will only support private copies.
* Added the -n option to the sip code generator to support private copies of
the sip module.
See https://www.riverbankcomputing.com/static/Downloads/sip/ChangeLog for
the complete changelog.
- Run spec-cleaner
-------------------------------------------------------------------
Fri Apr 13 23:33:06 UTC 2018 - termim@gmail.com

83
python-sip.spec
View File

@ -12,30 +12,30 @@
# 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/
#
%define python_sip_api 12.4
%define python_sip_api 12.5
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-sip
Version: 4.19.8
Version: 4.19.13
Release: 0
Summary: SIP tool to use python sip bindings
License: GPL-2.0 or GPL-3.0 or SUSE-SIP
License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP
Group: Development/Libraries/Python
Url: https://www.riverbankcomputing.com/software/sip/introa
URL: https://www.riverbankcomputing.com/software/sip/introa
Source0: https://sourceforge.net/projects/pyqt/files/sip/sip-%{version}/sip-%{version}.tar.gz
# PATCH-FIX-OPENSUSE disable-rpaths.diff -- Disable rpaths
Patch0: disable-rpaths.diff
# PATCH-FIX-OPENSUSE disable-strip.diff -- Disable stripping
Patch1: disable-strip.diff
BuildRequires: %{python_module devel}
BuildRequires: c++_compiler
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: %{name}-common = %{version}
Provides: python-sip(api) = %{python_sip_api}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%python_subpackages
%description
@ -44,7 +44,6 @@ and C++ libraries. It was originally developed to create PyQt, the
Python bindings for the Qt toolkit, but can be used to create bindings
for any C or C++ library.
%package devel
Summary: SIP tool to create python bindings
Group: Development/Libraries/Python
@ -52,10 +51,10 @@ Requires: %{name} = %{version}
Requires: %{name}-common = %{version}
Requires: c++_compiler
Requires: python-devel
Provides: %{name}-bin = %{version}
Obsoletes: %{name}-bin < %{version}
Requires(post): update-alternatives
Requires(postun): update-alternatives
Provides: %{name}-bin = %{version}
Obsoletes: %{name}-bin < %{version}
%description devel
SIP is a tool that makes it very easy to create Python bindings for C
@ -66,7 +65,6 @@ for any C or C++ library.
This package contains all the developer tools you need to create your
own sip bindings.
%package -n %{name}-doc
Summary: SIP tool to create python bindings -- common documentation
Group: Development/Libraries/Python
@ -81,7 +79,6 @@ for any C or C++ library.
This package contains common documentation files shared between python2
and python3 versions of sip.
%package -n %{name}-common
Summary: SIP tool to create python bindings -- common files
Group: Development/Libraries/Python
@ -96,13 +93,12 @@ for any C or C++ library.
This package contains common files shared between python2 and python3
versions of sip.
%prep
%setup -q -n sip-%{version}
%patch0 -p1
%autopatch -p1
sip_major=$(grep "define SIP_API_MAJOR_NR" siplib/sip.h.in | awk '{print $3}')
sip_minor=$(grep "define SIP_API_MINOR_NR" siplib/sip.h.in | awk '{print $3}')
sip_major=$(grep "define SIP_API_MAJOR_NR" siplib/sip.h | awk '{print $3}')
sip_minor=$(grep "define SIP_API_MINOR_NR" siplib/sip.h | awk '{print $3}')
if test "%{python_sip_api}" != "$sip_major.$sip_minor"; then
echo "API version was changed to $sip_major.$sip_minor"
@ -118,7 +114,12 @@ pushd build_%{$python_bin_suffix}
# Link against libpython (fixes bnc#756282 and bnc#721280)
ldlibrary=`$python -c "import sysconfig as s;print(s.get_config_var('LDLIBRARY')[3:-3])"`
$python ../configure.py --debug CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LIBS+="-l$ldlibrary"
$python ../configure.py --debug \
CFLAGS+="%{optflags}" \
CXXFLAGS+="%{optflags}" \
LIBS+="-l$ldlibrary" \
--no-dist-info
make %{?_smp_mflags}
# Point to the correct location for the documentation files
@ -128,17 +129,42 @@ sed -i 's/"doc" directory/"doc" directory of package %{$python_prefix}-sip-devel
popd
}
# Now build the PyQt5 sip module
%{python_expand mkdir build_PyQt5_%{$python_bin_suffix}
pushd build_PyQt5_%{$python_bin_suffix}
# Link against libpython (fixes bnc#756282 and bnc#721280)
ldlibrary=`$python -c "import sysconfig as s;print(s.get_config_var('LDLIBRARY')[3:-3])"`
$python ../configure.py --debug \
--sip-module=PyQt5.sip \
CFLAGS+="%{optflags}" \
CXXFLAGS+="%{optflags}" \
LIBS+="-l$ldlibrary" \
--no-dist-info
make %{?_smp_mflags}
popd
}
%install
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
%{python_expand pushd build_%{$python_bin_suffix}
%make_install
popd
# Prepare for update-alternatives usage
mv %{buildroot}%{_bindir}/sip %{buildroot}%{_bindir}/sip-%{$python_bin_suffix}
# Make sure the correct sip executable is picked
sed -i 's,%{_bindir}/sip,%{_bindir}/sip-%{$python_bin_suffix},' %{buildroot}%{python_sitearch}/sipconfig.py
}
%{python_expand pushd build_PyQt5_%{$python_bin_suffix}
%make_install
popd
%fdupes %{buildroot}%{python_sitearch}
}
mkdir -p %{buildroot}/%{_sysconfdir}/rpm/
@ -168,16 +194,19 @@ mkdir -p %{buildroot}%{_datadir}/sip
%python_uninstall_alternative sip
%files %{python_files}
%defattr(-,root,root,-)
%doc ChangeLog LICENSE* NEWS
%license LICENSE*
%doc ChangeLog NEWS
%doc build_%{python_bin_suffix}/README
%{python_sitearch}/sip.so
%dir %{python_sitearch}/PyQt5
%{python_sitearch}/PyQt5/sip.so
%files %{python_files devel}
%defattr(-,root,root,-)
%doc LICENSE*
%license LICENSE*
%config %{_sysconfdir}/rpm/macros.%{python_prefix}-sip
%python_alternative %{_bindir}/sip
%dir %{python_sitearch}/PyQt5
%{python_sitearch}/PyQt5/sip.pyi
%{_includedir}/python%{python_version}*/sip.h
%{python_sitearch}/sipconfig.py*
%{python_sitearch}/sipdistutils.py*
@ -186,13 +215,11 @@ mkdir -p %{buildroot}%{_datadir}/sip
%pycache_only %{python_sitearch}/__pycache__/sipdistutils.*.py*
%files -n python-sip-doc
%defattr(-,root,root,-)
%doc LICENSE*
%license LICENSE*
%doc doc/
%files -n python-sip-common
%defattr(-,root,root,-)
%doc LICENSE*
%license LICENSE*
%config %{_sysconfdir}/rpm/macros.python_all-sip
%{_datadir}/sip/

3
sip-4.19.13.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e353a7056599bf5fbd5d3ff9842a6ab2ea3cf4e0304a0f925ec5862907c0d15e
size 1038815

3
sip-4.19.8.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc
size 1024548