luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 12:25:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/smcv/girepository-must-be-3.0' into 'main'

Browse Source 
girepository: Skip GIRepository versions not matching GIRepository-3.0

See merge request GNOME/glib!3795
This commit is contained in:
Simon McVittie 2024-01-02 13:20:14 +00:00
commit e9c1dc1aa7
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
girepository/girepository.c
View File

@ -57,6 +57,14 @@
* Since: 2.80 * Since: 2.80
*/ */
/* The namespace and version corresponding to libgirepository itself, so
* that we can refuse to load typelibs corresponding to the older,
* incompatible version of this same library in gobject-introspection. */
#define GIREPOSITORY_TYPELIB_NAME "GIRepository"
#define GIREPOSITORY_TYPELIB_VERSION "3.0"
#define GIREPOSITORY_TYPELIB_FILENAME \
GIREPOSITORY_TYPELIB_NAME "-" GIREPOSITORY_TYPELIB_VERSION ".typelib"
static GIRepository *default_repository = NULL; static GIRepository *default_repository = NULL;
static GPtrArray *typelib_search_path = NULL; static GPtrArray *typelib_search_path = NULL;
@ -1323,6 +1331,16 @@ find_namespace_version (const char *namespace,
GMappedFile *mfile = NULL; GMappedFile *mfile = NULL;
char *fname; char *fname;
if (g_str_equal (namespace, GIREPOSITORY_TYPELIB_NAME) &&
!g_str_equal (version, GIREPOSITORY_TYPELIB_VERSION))
{
g_debug ("Ignoring %s-%s.typelib because this libgirepository "
"corresponds to %s-%s",
namespace, version,
namespace, GIREPOSITORY_TYPELIB_VERSION);
return NULL;
}
fname = g_strdup_printf ("%s-%s.typelib", namespace, version); fname = g_strdup_printf ("%s-%s.typelib", namespace, version);
for (size_t i = 0; i < n_search_paths; ++i) for (size_t i = 0; i < n_search_paths; ++i)
@ -1477,6 +1495,15 @@ enumerate_namespace_versions (const char *namespace,
const char *name_end; const char *name_end;
int major, minor; int major, minor;
if (g_str_equal (namespace, GIREPOSITORY_TYPELIB_NAME) &&
!g_str_equal (entry, GIREPOSITORY_TYPELIB_FILENAME))
{
g_debug ("Ignoring %s because this libgirepository "
"corresponds to %s",
entry, GIREPOSITORY_TYPELIB_FILENAME);
continue;
}
name_end = strrchr (entry, '.'); name_end = strrchr (entry, '.');
last_dash = strrchr (entry, '-'); last_dash = strrchr (entry, '-');
version = g_strndup (last_dash+1, name_end-(last_dash+1)); version = g_strndup (last_dash+1, name_end-(last_dash+1));