Backport a patch to fix perl-Gtk3 build

https://bugzilla.redhat.com/show_bug.cgi?id=1676474
This commit is contained in:
Kalev Lember 2019-02-12 13:22:52 +01:00
parent 441a292a31
commit c3941b7a6c
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 79b4b4007db1dd4ad09d32c8461e6768cd4300bf Mon Sep 17 00:00:00 2001
From: Iain Lane <iainl@gnome.org>
Date: Wed, 12 Sep 2018 12:50:34 +0100
Subject: [PATCH] build: Include gdk-pixdata.c when building GdkPixbuf-2.0.gir
After the split, this wasn't included here. We need this file because
it contains the annotations for gdk_pixbuf_new_from_inline - without
those we generate broken introspection metadata.
Closes #92
---
gdk-pixbuf/meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index 9acb2c414..9a1083a93 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -189,7 +189,11 @@ if build_gir
gdkpixbuf_gir = gnome.generate_gir(
gdkpixbuf,
- sources: gdkpixbuf_sources + gdkpixbuf_headers + gdkpixbuf_enums + [
+ sources: [
+ gdkpixbuf_sources,
+ gdkpixbuf_headers,
+ gdkpixbuf_enums,
+ gdkpixdata_sources,
gdk_pixbuf_features_h,
],
namespace: 'GdkPixbuf',
--
2.20.1

View File

@ -2,12 +2,14 @@
Name: gdk-pixbuf2
Version: 2.38.0
Release: 5%{?dist}
Release: 6%{?dist}
Summary: An image loading library
License: LGPLv2+
URL: http://www.gtk.org
Source0: http://download.gnome.org/sources/gdk-pixbuf/2.38/gdk-pixbuf-%{version}.tar.xz
# Backported from upstream
Patch0: 0001-build-Include-gdk-pixdata.c-when-building-GdkPixbuf-.patch
BuildRequires: gettext
BuildRequires: gtk-doc
@ -143,6 +145,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache
%{_datadir}/installed-tests
%changelog
* Tue Feb 12 2019 Kalev Lember <klember@redhat.com> - 2.38.0-6
- Backport a patch to fix perl-Gtk3 build (#1676474)
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.38.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild