PR#2: include upstream patch to fix gdbus-codegen with meson 0.46 - rpms/glib2

rpms / glib2

#2 include upstream patch to fix gdbus-codegen with meson 0.46

Merged 5 years ago by kalev. Opened 5 years ago by decathorpe.

Unknown source master into master

include upstream patch to fix gdbus-codegen with meson 0.46

Fabio Valentini • 5 years ago

4c1e2eb

00-fix-gdbus-codegen.patch

file added

+13

		`@@ -0,0 +1,13 @@`
		`+ diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py`
		`+ index 9d9099f..1cfe7c1 100755`
		`+ --- a/gio/gdbus-2.0/codegen/codegen_main.py`
		`+ +++ b/gio/gdbus-2.0/codegen/codegen_main.py`
		`+ @@ -209,7 +209,7 @@ def codegen_main():`
		`+ print_error('Using --body requires --output')`
		`+`
		`+ c_file = args.output`
		`+ - header_name = os.path.splitext(c_file)[0] + '.h'`
		`+ + header_name = os.path.splitext(os.path.basename(c_file))[0] + '.h'`
		`+`
		`+ all_ifaces = []`
		`+ for fname in args.files + args.xml_files:`

glib2.spec

file modified

+8 -1

		`@@ -5,13 +5,17 @@`

		`Name: glib2`
		`Version: 2.56.1`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Summary: A library of handy utility functions`

		`License: LGPLv2+`
		`URL: http://www.gtk.org`
		`Source0: http://download.gnome.org/sources/glib/2.56/glib-%{version}.tar.xz`

		`+ # Include upstream patch to fix gdbus-codegen when used with meson 0.46`
		`+ # https://gitlab.gnome.org/GNOME/glib/commit/cd1f82d8fc741a2203582c12cc21b4dacf7e1872`
		`+ Patch0: 00-fix-gdbus-codegen.patch`
		`+`
		`BuildRequires: chrpath`
		`BuildRequires: gettext`
		`BuildRequires: perl-interpreter`
		`@@ -217,6 +221,9 @@`
		`%{_datadir}/installed-tests`

		`%changelog`
		`+ * Sun May 13 2018 Fabio Valentini <decathorpe@gmail.com> - 2.56.1-2`
		`+ - Include upstream patch to fix gdbus-codegen with meson 0.46.`
		`+`
		`* Sun Apr 08 2018 Kalev Lember <klember@redhat.com> - 2.56.1-1`
		`- Update to 2.56.1`

decathorpe commented 5 years ago

This patch fixes compilation of programs using gdbus-codegen with meson 0.46, which is currently broken on rawhide, and with f28-updates-testing.

Once glib2 builds containing this fix are available on f28+, the meson 0.46 update can be pushed to f28 as well (which is currently blocked by the bug in question).

The exact upstream commit from the glib-2-56 branch can be seen here: https://gitlab.gnome.org/GNOME/glib/commit/cd1f82d8fc741a2203582c12cc21b4dacf7e1872