import sip-4.19.25-1.el9

c9 imports/c9/sip-4.19.25-1.el9
CentOS Sources 2 years ago committed by MSVSphere Packaging Team
commit 62578b8fb8

1
.gitignore vendored

@ -0,0 +1 @@
SOURCES/sip-4.19.25.tar.gz

@ -0,0 +1 @@
dea579470269fabeb920976c405fa7f5e67cd4bd SOURCES/sip-4.19.25.tar.gz

@ -0,0 +1,3 @@
%_sip_api_major 12
%_sip_api_minor 7
%_sip_api %{_sip_api_major}.%{_sip_api_minor}

@ -0,0 +1,21 @@
diff -rupN --no-dereference sip-4.19.25/siputils.py sip-4.19.25-new/siputils.py
--- sip-4.19.25/siputils.py 2021-10-21 13:45:54.808566613 +0200
+++ sip-4.19.25-new/siputils.py 2021-10-21 13:45:54.812566611 +0200
@@ -436,7 +436,7 @@ class Makefile:
if l_dir in ("", ".", ".."):
continue
- rpaths.append(l)
+ #rpaths.append(l)
if self._python:
incdir.append(self.config.py_inc_dir)
@@ -613,7 +613,7 @@ class Makefile:
# Handle library directories.
libdir_qt = self.optional_list("LIBDIR_QT")
libdir.extend(libdir_qt)
- rpaths.extend(libdir_qt)
+ #rpaths.extend(libdir_qt)
if qt_version >= 0x040000:
# Try and read QT_LIBINFIX from qconfig.pri.

@ -0,0 +1,21 @@
diff -rupN --no-dereference sip-4.19.25/siputils.py sip-4.19.25-new/siputils.py
--- sip-4.19.25/siputils.py 2021-02-26 16:17:35.156108000 +0100
+++ sip-4.19.25-new/siputils.py 2021-10-21 13:45:54.780566626 +0200
@@ -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.

@ -0,0 +1,12 @@
diff -rupN --no-dereference sip-4.19.25/configure.py sip-4.19.25-new/configure.py
--- sip-4.19.25/configure.py 2021-02-26 16:28:41.621025600 +0100
+++ sip-4.19.25-new/configure.py 2021-10-21 13:45:54.845566597 +0200
@@ -449,7 +449,7 @@ def create_makefiles(macros):
if sys.platform == 'win32':
mod = 'sip.lib' if opts.static else 'sip.pyd'
else:
- mod = 'libsip.a' if opts.static else 'sip.so'
+ mod = 'libsip.a' if opts.static else sip_module_name.split('.')[-1] + '.so'
all_installs.append((mod, sip_module_dest_dir))

@ -0,0 +1,52 @@
From: Jochen Sprickerhof <jspricke@debian.org>
Date: Fri, 5 Nov 2021 09:13:14 +0100
Subject: Make parser not break on py_ssize_t_clean directive from SIP v6.4
---
sipgen/metasrc/lexer.l | 1 +
sipgen/metasrc/parser.y | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/sipgen/metasrc/lexer.l b/sipgen/metasrc/lexer.l
index a52b018..c328202 100644
--- a/sipgen/metasrc/lexer.l
+++ b/sipgen/metasrc/lexer.l
@@ -174,6 +174,7 @@ SIP_QOBJECT {return TK_QOBJECT;}
<directive>timestamp {return TK_TIMESTAMP;}
<directive>type {return TK_TYPE;}
<directive>use_argument_names {return TK_USEARGNAMES;}
+<directive>py_ssize_t_clean {return TK_PYSSIZETCLEAN;}
<directive>use_limited_api {return TK_USELIMITEDAPI;}
<directive>all_raise_py_exception {return TK_ALLRAISEPYEXC;}
<directive>call_super_init {return TK_CALLSUPERINIT;}
diff --git a/sipgen/metasrc/parser.y b/sipgen/metasrc/parser.y
index 5623dca..2d98380 100644
--- a/sipgen/metasrc/parser.y
+++ b/sipgen/metasrc/parser.y
@@ -389,6 +389,7 @@ static scopedNameDef *fullyQualifiedName(scopedNameDef *snd);
%token TK_TIMESTAMP
%token TK_TYPE
%token TK_USEARGNAMES
+%token TK_PYSSIZETCLEAN
%token TK_USELIMITEDAPI
%token TK_ALLRAISEPYEXC
%token TK_CALLSUPERINIT
@@ -2012,6 +2013,18 @@ module_arg: TK_KWARGS '=' TK_STRING_VALUE {
$$.call_super_init = -1;
$$.def_error_handler = NULL;
}
+ | TK_PYSSIZETCLEAN '=' bool_value {
+ $$.token = TK_PYSSIZETCLEAN;
+
+ $$.c_module = FALSE;
+ $$.kwargs = defaultKwArgs;
+ $$.name = NULL;
+ $$.use_arg_names = FALSE;
+ $$.use_limited_api = FALSE;
+ $$.all_raise_py_exc = FALSE;
+ $$.call_super_init = -1;
+ $$.def_error_handler = NULL;
+ }
| TK_USELIMITEDAPI '=' bool_value {
$$.token = TK_USELIMITEDAPI;

@ -0,0 +1,3 @@
#!/bin/sh
exec sip -n @SIP_MODULE@ $@

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save