diff --git a/srcpkgs/python3-sip b/srcpkgs/python3-sip deleted file mode 120000 index 27dcc148ae7..00000000000 --- a/srcpkgs/python3-sip +++ /dev/null @@ -1 +0,0 @@ -sip4 \ No newline at end of file diff --git a/srcpkgs/python3-sip-devel b/srcpkgs/python3-sip-devel deleted file mode 120000 index 27dcc148ae7..00000000000 --- a/srcpkgs/python3-sip-devel +++ /dev/null @@ -1 +0,0 @@ -sip4 \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index fee5d69f35b..b345554e637 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -746,6 +746,7 @@ replaces=" python3-scikit-video<=1.1.11_6 python3-shiboken2<=5.15.10_2 python3-shiboken<=5.15.0_3 + python3-sip<=4.19.25_5 python3-snakeoil-devel<=0.8.8_4 python3-sqlalchemy-migrate<=0.12.0_6 python3-stormssh<=0.7.0_7 @@ -794,6 +795,7 @@ replaces=" seriespl<=2.3.5_2 shiboken2<=5.15.10_2 simple-obfs<=0.0.5_2 + sip4<=4.19.25_5 sitecopy<=0.16.6_11 sk1<=2.0rc5_1 skypetab-ng<=20150201_3 diff --git a/srcpkgs/sip4/patches/python-3.11.patch b/srcpkgs/sip4/patches/python-3.11.patch deleted file mode 100644 index 9fdc9acf35f..00000000000 --- a/srcpkgs/sip4/patches/python-3.11.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: sip-4.19.25/siplib/sip.h -=================================================================== ---- sip-4.19.25.orig/siplib/sip.h -+++ sip-4.19.25/siplib/sip.h -@@ -1799,7 +1799,7 @@ typedef struct _sipAPIDef { - int (*api_get_time)(PyObject *, sipTimeDef *); - PyObject *(*api_from_time)(const sipTimeDef *); - int (*api_is_user_type)(const sipWrapperType *); -- struct _frame *(*api_get_frame)(int); -+ PyFrameObject *(*api_get_frame)(int); - int (*api_check_plugin_for_type)(const sipTypeDef *, const char *); - PyObject *(*api_unicode_new)(SIP_SSIZE_T, unsigned, int *, void **); - void (*api_unicode_write)(int, void *, int, unsigned); -Index: sip-4.19.25/siplib/siplib.c -=================================================================== ---- sip-4.19.25.orig/siplib/siplib.c -+++ sip-4.19.25/siplib/siplib.c -@@ -448,7 +448,7 @@ static PyObject *sip_api_from_datetime(c - static int sip_api_get_time(PyObject *obj, sipTimeDef *time); - static PyObject *sip_api_from_time(const sipTimeDef *time); - static int sip_api_is_user_type(const sipWrapperType *wt); --static struct _frame *sip_api_get_frame(int); -+static PyFrameObject *sip_api_get_frame(int); - static int sip_api_check_plugin_for_type(const sipTypeDef *td, - const char *name); - static PyObject *sip_api_unicode_new(SIP_SSIZE_T len, unsigned maxchar, -@@ -13741,15 +13741,19 @@ static int sip_api_is_user_type(const si - /* - * Return a frame from the execution stack. - */ --static struct _frame *sip_api_get_frame(int depth) -+static PyFrameObject *sip_api_get_frame(int depth) - { -- struct _frame *frame = PyEval_GetFrame(); -+ PyFrameObject *frame = PyEval_GetFrame(); -+ Py_XINCREF(frame); - - while (frame != NULL && depth > 0) - { -- frame = frame->f_back; -+ PyFrameObject *oframe = frame; -+ frame = PyFrame_GetBack(frame); -+ Py_DECREF(oframe); - --depth; - } -+ Py_XDECREF(frame); - - return frame; - } diff --git a/srcpkgs/sip4/template b/srcpkgs/sip4/template deleted file mode 100644 index 1d1e8fb89c3..00000000000 --- a/srcpkgs/sip4/template +++ /dev/null @@ -1,51 +0,0 @@ -# Template file for 'sip4' -pkgname=sip4 -version=4.19.25 -revision=5 -hostmakedepends="python3-devel python3-setuptools" -makedepends="${hostmakedepends}" -short_desc="Python extension module generator for C/C++ libraries" -maintainer="Orphaned " -license="GPL-2.0-only, GPL-3.0-only, custom:SIP" -homepage="https://riverbankcomputing.com/software/sip/intro" -distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz" -checksum=b39d93e937647807bac23579edbff25fe46d16213f708370072574ab1f1b4211 -replaces="sip<=${version}_${revision}" -provides="sip-${version}_${revision}" - -do_build() { - python3 configure.py \ - CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \ - INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} install -C sipgen - make DESTDIR=${DESTDIR} install -C siplib - vinstall sipconfig.py 644 $py3_sitelib - vinstall sipdistutils.py 644 $py3_sitelib - vlicense LICENSE -} - -python3-sip_package() { - lib32disabled=yes - depends="python3" - short_desc="Python3 SIP bindings" - pkg_install() { - vmove ${py3_sitelib}/sip.so - vmove ${py3_sitelib}/sipconfig.py - vmove ${py3_sitelib}/sip.pyi - vlicense LICENSE - } -} - -python3-sip-devel_package() { - depends="python3-sip-${version}_${revision} sip4-${version}_${revision}" - short_desc="Python3 SIP bindings - development files" - pkg_install() { - vmove ${py3_inc} - vmove ${py3_sitelib}/sipdistutils.py - } -} diff --git a/srcpkgs/sip4/update b/srcpkgs/sip4/update deleted file mode 100644 index 3504cf6a067..00000000000 --- a/srcpkgs/sip4/update +++ /dev/null @@ -1,2 +0,0 @@ -site='https://www.riverbankcomputing.com/software/sip/download' -ignore='*dev*'