public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gensio] rawhide: update to 3.0.4
@ 2026-08-13 18:12 Felix Kaechele
0 siblings, 0 replies; only message in thread
From: Felix Kaechele @ 2026-08-13 18:12 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gensio
Branch : rawhide
Commit : 33f534c88a426d0a9c4507aac7893c99aa2360b3
Author : Felix Kaechele <felix@kaechele.ca>
Date : 2026-08-13T14:06:33-04:00
Stats : +3/-180 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/gensio/c/33f534c88a426d0a9c4507aac7893c99aa2360b3?branch=rawhide
Log:
update to 3.0.4
- drop gensio-swig45.patch (upstreamed)
Signed-off-by: Felix Kaechele <felix@kaechele.ca>
---
diff --git a/.gitignore b/.gitignore
index eb33c44..798f61d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
/gensio-3.0.1.tar.gz
/gensio-3.0.2.tar.gz
/gensio-3.0.3.tar.gz
+/gensio-3.0.4.tar.gz
diff --git a/gensio-swig45.patch b/gensio-swig45.patch
deleted file mode 100644
index e22dda5..0000000
--- a/gensio-swig45.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -up gensio-3.0.3/c++/swig/pygensio/pygensio.i.swig45 gensio-3.0.3/c++/swig/pygensio/pygensio.i
---- gensio-3.0.3/c++/swig/pygensio/pygensio.i.swig45 2026-07-28 07:53:35.537381625 +0200
-+++ gensio-3.0.3/c++/swig/pygensio/pygensio.i 2026-07-28 07:53:35.545381780 +0200
-@@ -132,7 +132,7 @@ PI_StringArrayToTuple(const char *const
- ;
- o = PyTuple_New(len);
- for (i = 0; i < len; i++)
-- PyTuple_SetItem(o, i, PyString_FromString(val[i]));
-+ PyTuple_SetItem(o, i, PyUnicode_FromString(val[i]));
- return o;
- }
- }
-@@ -380,7 +380,7 @@ static bool check_for_err(int err)
- $1 = &temp;
- }
- %typemap(argout) unsigned int *outval {
-- $result = PI_add_result($result, PyInt_FromLong(*$1));
-+ $result = PI_add_result($result, PyLong_FromLong(*$1));
- }
-
- // Handling of nested waiters and python callback.
-diff -up gensio-3.0.3/swig/python/gensio_langinfo.i.swig45 gensio-3.0.3/swig/python/gensio_langinfo.i
---- gensio-3.0.3/swig/python/gensio_langinfo.i.swig45 2026-07-28 07:53:35.538381644 +0200
-+++ gensio-3.0.3/swig/python/gensio_langinfo.i 2026-07-28 07:53:35.546796179 +0200
-@@ -60,7 +60,7 @@
- }
-
- %typemap(argout) (long *r_int) {
-- PyObject *r = PyInt_FromLong(*$1);
-+ PyObject *r = PyLong_FromLong(*$1);
-
- $result = add_python_result($result, r);
- }
-diff -up gensio-3.0.3/swig/python/gensio_python.h.swig45 gensio-3.0.3/swig/python/gensio_python.h
---- gensio-3.0.3/swig/python/gensio_python.h.swig45 2026-07-28 07:53:35.540381683 +0200
-+++ gensio-3.0.3/swig/python/gensio_python.h 2026-07-28 07:53:35.548381838 +0200
-@@ -67,9 +67,9 @@ OI_PI_AsBytesAndSize(PyObject *o, char *
- #define OI_PI_StringCheck PyUnicode_Check
- #define OI_PI_FromStringAndSize PyUnicode_FromStringAndSize
- #else
--#define OI_PI_BytesCheck PyString_Check
-+#define OI_PI_BytesCheck PyBytes_Check
- #define OI_PI_AsBytesAndSize PyString_AsStringAndSize
--#define OI_PI_StringCheck PyString_Check
-+#define OI_PI_StringCheck PyBytes_Check
- #define OI_PI_FromStringAndSize PyString_FromStringAndSize
- #endif
-
-@@ -365,7 +365,7 @@ gensio_control_cb(struct gensio *io, int
- args = PyTuple_New(3);
- gensio_pyref(io);
- PyTuple_SET_ITEM(args, 0, io_ref.val);
-- o = PyInt_FromLong(err);
-+ o = PyLong_FromLong(err);
- PyTuple_SET_ITEM(args, 1, o);
- o = PyBytes_FromStringAndSize(buf, len);
- PyTuple_SET_ITEM(args, 2, o);
-@@ -393,7 +393,7 @@ sgensio_call(struct gensio *io, long val
- args = PyTuple_New(2);
- ref_gensio_data(data);
- PyTuple_SET_ITEM(args, 0, io_ref.val);
-- o = PyInt_FromLong(val);
-+ o = PyLong_FromLong(val);
- PyTuple_SET_ITEM(args, 1, o);
-
- swig_finish_call(data->handler_val, func, args, true);
-@@ -578,7 +578,7 @@ gensio_py_handle_auxdata(const char *con
- len++;
- o = PyTuple_New(len);
- for (i = 0; i < len; i++)
-- PyTuple_SetItem(o, i, PyString_FromString(auxdata[i]));
-+ PyTuple_SetItem(o, i, PyUnicode_FromString(auxdata[i]));
- return o;
- }
- }
-@@ -706,7 +706,7 @@ gensio_child_event(struct gensio *io, vo
- args = PyTuple_New(3);
- ref_gensio_data(data);
- PyTuple_SET_ITEM(args, 0, io_ref.val);
-- o = PyInt_FromLong(readerr);
-+ o = PyLong_FromLong(readerr);
- PyTuple_SET_ITEM(args, 1, o);
- if (auxdata && auxdata[0]) {
- o = OI_PI_FromString(auxdata[0]);
-@@ -753,8 +753,8 @@ gensio_child_event(struct gensio *io, vo
- *buflen = len;
- memcpy(buf, p, *buflen);
- rv = 0;
-- } else if (PyInt_Check(o)) {
-- rv = PyInt_AsLong(o);
-+ } else if (PyLong_Check(o)) {
-+ rv = PyLong_AsLong(o);
- }
- Py_DecRef(o);
- }
-@@ -802,8 +802,8 @@ gensio_child_event(struct gensio *io, vo
- *buflen = len;
- }
- }
-- } else if (PyInt_Check(o)) {
-- rv = PyInt_AsLong(o);
-+ } else if (PyLong_Check(o)) {
-+ rv = PyLong_AsLong(o);
- }
- Py_DecRef(o);
- }
-@@ -842,9 +842,9 @@ gensio_child_event(struct gensio *io, vo
- args = PyTuple_New(3);
- ref_gensio_data(data);
- PyTuple_SET_ITEM(args, 0, io_ref.val);
-- o = PyInt_FromLong(height);
-+ o = PyLong_FromLong(height);
- PyTuple_SET_ITEM(args, 1, o);
-- o = PyInt_FromLong(width);
-+ o = PyLong_FromLong(width);
- PyTuple_SET_ITEM(args, 2, o);
- swig_finish_call(data->handler_val, "win_size", args, true);
- break;
-@@ -1041,7 +1041,7 @@ gensio_acc_io_call_cb(struct gensio_acce
- PyTuple_SET_ITEM(args, 0, acc_ref.val);
- PyTuple_SET_ITEM(args, 1, io_ref.val);
- if (opterr >= 0) {
-- o = PyInt_FromLong(opterr);
-+ o = PyLong_FromLong(opterr);
- PyTuple_SET_ITEM(args, 2, o);
- if (optstr) {
- o = OI_PI_FromString(optstr);
-@@ -1177,8 +1177,8 @@ gensio_acc_child_event(struct gensio_acc
- pwvfy->password_len = len;
- memcpy(pwvfy->password, p, pwvfy->password_len);
- rv = 0;
-- } else if (PyInt_Check(o)) {
-- rv = PyInt_AsLong(o);
-+ } else if (PyLong_Check(o)) {
-+ rv = PyLong_AsLong(o);
- }
- Py_DecRef(o);
- }
-@@ -1234,8 +1234,8 @@ gensio_acc_child_event(struct gensio_acc
- pwvfy->password_len = len;
- }
- }
-- } else if (PyInt_Check(o)) {
-- rv = PyInt_AsLong(o);
-+ } else if (PyLong_Check(o)) {
-+ rv = PyLong_AsLong(o);
- }
- Py_DecRef(o);
- }
-@@ -1374,8 +1374,8 @@ static void gensio_mdns_cb(struct gensio
-
- args = PyTuple_New(9);
- PyTuple_SET_ITEM(args, 0, PyBool_FromLong(state == GENSIO_MDNS_WATCH_NEW_DATA));
-- PyTuple_SET_ITEM(args, 1, PyInt_FromLong(ipinterface));
-- PyTuple_SET_ITEM(args, 2, PyInt_FromLong(ipdomain));
-+ PyTuple_SET_ITEM(args, 1, PyLong_FromLong(ipinterface));
-+ PyTuple_SET_ITEM(args, 2, PyLong_FromLong(ipdomain));
- PyTuple_SET_ITEM(args, 3, OI_PI_FromStringN(name));
- PyTuple_SET_ITEM(args, 4, OI_PI_FromStringN(type));
- PyTuple_SET_ITEM(args, 5, OI_PI_FromStringN(domain));
-diff -up gensio-3.0.3/swig/python/python_swig_internals.h.swig45 gensio-3.0.3/swig/python/python_swig_internals.h
---- gensio-3.0.3/swig/python/python_swig_internals.h.swig45 2026-07-28 07:53:35.541381702 +0200
-+++ gensio-3.0.3/swig/python/python_swig_internals.h 2026-07-28 07:53:35.549137358 +0200
-@@ -52,8 +52,8 @@ swig_cb_val *gensio_python_deref_swig_cb
- #define OI_PI_FromString PyUnicode_FromString
- #define OI_PI_AsString PyUnicode_AsUTF8
- #else
--#define OI_PI_FromString PyString_FromString
--#define OI_PI_AsString PyString_AsString
-+#define OI_PI_FromString PyUnicode_FromString
-+#define OI_PI_AsString PyBytes_AsString
- #endif
-
- GENSIO_DLL_PUBLIC
diff --git a/gensio.spec b/gensio.spec
index 5f594c8..3078527 100644
--- a/gensio.spec
+++ b/gensio.spec
@@ -1,4 +1,4 @@
-Version: 3.0.3
+Version: 3.0.4
%global forgeurl https://github.com/cminyard/gensio
%forgemeta
@@ -14,10 +14,6 @@ License: GPL-2.0-only AND LGPL-2.1-only AND Apache-2.0
URL: %{forgeurl}
Source0: %{forgesource}
-# Replace removed Python 2 C API macros with Python 3 equivalents
-# for compatibility with SWIG 4.5.0
-Patch0: gensio-swig45.patch
-
BuildRequires: alsa-lib-devel
BuildRequires: avahi-devel
BuildRequires: gcc-c++
diff --git a/sources b/sources
index 8ab6d87..9351b15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gensio-3.0.3.tar.gz) = 20d63a6ecaa8be850693de6e37e5b46bb82a7ccdea7fdf4253d2af913c5f62228c6bc11cd323649be59c1428d51a5e5ecbd9bb3b1d5e3950545d95725cc72d6e
+SHA512 (gensio-3.0.4.tar.gz) = 002f5498ba62d00141ade0261ff760d40902c246eb6e66f76db0c0a66a58c0ca82d40b5a6c8fa46991a4035d2c944e4a4a1a43ad4a80083eef6717dbcf9d0447
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-13 18:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-13 18:12 [rpms/gensio] rawhide: update to 3.0.4 Felix Kaechele
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox