summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2023-04-04 20:04:57 +0100
committerChristoph Reiter <reiter.christoph@gmail.com>2023-05-13 19:17:36 +0200
commit55c7610a68a4b77d836359fb1a3f56ba665915e8 (patch)
tree03d9fb451ba4badd95f46c98c246e2fe5d8a5ebe
parentf07368a79accac0b34c13a8c465afcb0d57b37a1 (diff)
downloadpygobject-55c7610a68a4b77d836359fb1a3f56ba665915e8.tar.gz
Bump up the requirement to gobject-introspection
We now require 1.60.0, to unconditionally use the GI_CHECK_VERSION version check macro.
-rw-r--r--gi/gimodule.c5
-rw-r--r--gi/pygi-closure.c5
-rw-r--r--meson.build2
-rwxr-xr-xsetup.py2
4 files changed, 2 insertions, 12 deletions
diff --git a/gi/gimodule.c b/gi/gimodule.c
index fa4ad0f3..9bc86be5 100644
--- a/gi/gimodule.c
+++ b/gi/gimodule.c
@@ -54,11 +54,6 @@
#include "gimodule.h"
#include "pygi-basictype.h"
-/* GI_CHECK_VERSION was introduced in gobject-introspection 1.60 */
-#ifndef GI_CHECK_VERSION
-# define GI_CHECK_VERSION(x,y,z) 0
-#endif
-
PyObject *PyGIWarning;
PyObject *PyGIDeprecationWarning;
PyObject *_PyGIDefaultArgPlaceholder;
diff --git a/gi/pygi-closure.c b/gi/pygi-closure.c
index 22b407b3..4e19c5ec 100644
--- a/gi/pygi-closure.c
+++ b/gi/pygi-closure.c
@@ -24,11 +24,6 @@
#include "pygi-ccallback.h"
#include "pygi-info.h"
-/* GI_CHECK_VERSION was introduced in gobject-introspection 1.60 */
-#ifndef GI_CHECK_VERSION
-# define GI_CHECK_VERSION(x,y,z) 0
-#endif
-
extern PyObject *_PyGIDefaultArgPlaceholder;
typedef struct _PyGICallbackCache
diff --git a/meson.build b/meson.build
index a0a3dddf..6494cabd 100644
--- a/meson.build
+++ b/meson.build
@@ -22,7 +22,7 @@ endif
python_dep = python.dependency()
glib_version_req = '>= 2.56.0'
-gi_version_req = '>= 1.56.0'
+gi_version_req = '>= 1.60.0'
pycairo_version_req = '>= 1.16.0'
libffi_version_req = '>= 3.0'
diff --git a/setup.py b/setup.py
index e5d2b544..709b5605 100755
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ from distutils.spawn import find_executable
PYGOBJECT_VERSION = "3.45.0"
GLIB_VERSION_REQUIRED = "2.56.0"
-GI_VERSION_REQUIRED = "1.56.0"
+GI_VERSION_REQUIRED = "1.60.0"
PYCAIRO_VERSION_REQUIRED = "1.16.0"
LIBFFI_VERSION_REQUIRED = "3.0"