From 6295f37a70d50a32011b5a1ee7793fea329cd5f2 Mon Sep 17 00:00:00 2001 From: Crucible Date: Thu, 24 Sep 2026 16:55:33 -0500 Subject: Publish srcux candidate 0000000383-20260924-165302 --- .../gpgmepy/files/gpgmepy-2.0.0-swig-4.5.patch | 63 ---------------------- dev-python/gpgmepy/gpgmepy-2.0.0-r2.ebuild | 1 - 2 files changed, 64 deletions(-) delete mode 100644 dev-python/gpgmepy/files/gpgmepy-2.0.0-swig-4.5.patch (limited to 'dev-python/gpgmepy') diff --git a/dev-python/gpgmepy/files/gpgmepy-2.0.0-swig-4.5.patch b/dev-python/gpgmepy/files/gpgmepy-2.0.0-swig-4.5.patch deleted file mode 100644 index 4ab94bebc3e8..000000000000 --- a/dev-python/gpgmepy/files/gpgmepy-2.0.0-swig-4.5.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://bugs.gentoo.org/983043 -https://lists.gnupg.org/pipermail/gnupg-devel/2026-August/036421.html - -As of 2026/09/21 this or an equivalent hasn't been merged upstream. - -Description: Build with swig 4.5.0 - Without this patch, the package FTBFS with swig 4.5.0. This is due to - the removal of the Python 2 compatibility macros in version 4.5.0. - According to the SWIG authors, these macros were retained in the - generated code (pyhead.swg) solely for user typemaps. All typemap - using these macros are updated to call the Python 3 C API - directly. -Author: Rafael Laboissière -Bug-Debian: https://bugs.debian.org/1145351 -Forwarded: no -Last-Update: 2026-08-25 - ---- gpgmepy-2.0.0.orig/gpgme.i -+++ gpgmepy-2.0.0/gpgme.i -@@ -94,8 +94,8 @@ - } - $1[i] = PyBytes_AsString(pyVector[i]); - } -- else if (PyString_Check(o)) -- $1[i] = PyString_AsString(o); -+ else if (PyBytes_Check(o)) -+ $1[i] = PyBytes_AsString(o); - else { - PyErr_Format(PyExc_TypeError, - "arg %d: list must contain only str or bytes, got %s " -@@ -316,8 +316,8 @@ - if (PyLong_Check($input)) - $1 = PyLong_AsLong($input); - #if PY_MAJOR_VERSION < 3 -- else if (PyInt_Check($input)) -- $1 = PyInt_AsLong($input); -+ else if (PyLong_Check($input)) -+ $1 = PyLong_AsLong($input); - #endif - else { - PyErr_SetString(PyExc_TypeError, "Numeric argument expected"); -@@ -341,8 +341,8 @@ - $1 = PyLong_AsLong($input); - #endif - #if PY_MAJOR_VERSION < 3 -- else if (PyInt_Check($input)) -- $1 = PyInt_AsLong($input); -+ else if (PyLong_Check($input)) -+ $1 = PyLong_AsLong($input); - #endif - else { - PyErr_SetString(PyExc_TypeError, "Numeric argument expected"); -@@ -357,8 +357,8 @@ - if (PyLong_Check($input)) - tmp$argnum = PyLong_AsLong($input); - #if PY_MAJOR_VERSION < 3 -- else if (PyInt_Check($input)) -- tmp$argnum = PyInt_AsLong($input); -+ else if (PyLong_Check($input)) -+ tmp$argnum = PyLong_AsLong($input); - #endif - else - { diff --git a/dev-python/gpgmepy/gpgmepy-2.0.0-r2.ebuild b/dev-python/gpgmepy/gpgmepy-2.0.0-r2.ebuild index 70cdd27b1496..bf0cea406949 100644 --- a/dev-python/gpgmepy/gpgmepy-2.0.0-r2.ebuild +++ b/dev-python/gpgmepy/gpgmepy-2.0.0-r2.ebuild @@ -36,7 +36,6 @@ PATCHES=( "${FILESDIR}"/${PN}-2.0.0_pre20250603-python.patch # https://github.com/gpg/gpgmepy/commit/a4b0c9f6e285c0a56b758f73cc4ee38c0b3e5c46 "${FILESDIR}"/${P}-test-fix.patch - "${FILESDIR}"/${PN}-2.0.0-swig-4.5.patch ) src_prepare() { -- cgit v1.3