Merge fix from upstream to build with -Wpointer-sign.

This commit is contained in:
ajacoutot 2022-12-01 08:13:45 +00:00
parent 06a208be08
commit 3114f61c77
3 changed files with 19 additions and 11 deletions

View File

@ -2,6 +2,7 @@ COMMENT= libvirt wrapper suited for GObject-based applications
DISTNAME= libvirt-glib-4.0.0
EXTRACT_SUFX= .tar.xz
REVISION= 0
CATEGORIES= devel sysutils

View File

@ -0,0 +1,17 @@
From e0bfc34682744a74b850fa217e9c206a9eb80612 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Wed, 23 Nov 2022 16:47:52 +0100
Subject: [PATCH] libvirt-gconfig-domain-capabilities-os.c: fix pointer-sign issue
Index: libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.c
--- libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.c.orig
+++ libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.c
@@ -67,7 +67,7 @@ static gboolean search_firmwares(xmlNodePtr node, gpoi
{
const gchar *content;
- if (!g_str_equal(node->name, "enum"))
+ if (!g_str_equal((const gchar *)node->name, "enum"))
return TRUE;
content = gvir_config_xml_get_attribute_content(node, "name");

View File

@ -5,8 +5,6 @@ Subject: [PATCH] build: don't set glib version constraints for g-ir-scanner
Should match b_lundef in meson(1).
XXX -Wpointer-sign: https://gitlab.com/libvirt/libvirt-glib/-/issues/4
Index: meson.build
--- meson.build.orig
+++ meson.build
@ -30,15 +28,7 @@ Index: meson.build
build_tests = not get_option('tests').disabled()
@@ -253,7 +247,6 @@ cc_flags += [
'-Wparentheses',
'-Wpointer-arith',
'-Wpointer-compare',
- '-Wpointer-sign',
'-Wpointer-to-int-cast',
'-Wpragmas',
'-Wpsabi',
@@ -518,6 +511,8 @@ common_cflags = [
@@ -518,6 +512,8 @@ common_cflags = [
'-DLOCALEDIR="@0@"'.format(localedir),
'-DDATADIR="@0@"'.format(datadir),
'-DLIBVIRT_GLIB_BUILD',