From b4c83f95540672b6b968b9388dbb57f6d3455f06 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Feb 28 2019 16:38:00 +0000 Subject: Update to 2.38.1 --- diff --git a/.gitignore b/.gitignore index bd3b35b..a1756f0 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ gdk-pixbuf-2.21.6.tar.bz2 /gdk-pixbuf-2.36.11.tar.xz /gdk-pixbuf-2.36.12.tar.xz /gdk-pixbuf-2.38.0.tar.xz +/gdk-pixbuf-2.38.1.tar.xz diff --git a/0001-build-Include-gdk-pixdata.c-when-building-GdkPixbuf-.patch b/0001-build-Include-gdk-pixdata.c-when-building-GdkPixbuf-.patch deleted file mode 100644 index 51438c3..0000000 --- a/0001-build-Include-gdk-pixdata.c-when-building-GdkPixbuf-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 79b4b4007db1dd4ad09d32c8461e6768cd4300bf Mon Sep 17 00:00:00 2001 -From: Iain Lane -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 - diff --git a/gdk-pixbuf2.spec b/gdk-pixbuf2.spec index 8b15c00..a467c1e 100644 --- a/gdk-pixbuf2.spec +++ b/gdk-pixbuf2.spec @@ -1,15 +1,13 @@ %global glib2_version 2.48.0 Name: gdk-pixbuf2 -Version: 2.38.0 -Release: 6%{?dist} +Version: 2.38.1 +Release: 1%{?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 @@ -145,6 +143,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache %{_datadir}/installed-tests %changelog +* Thu Feb 28 2019 Kalev Lember - 2.38.1-1 +- Update to 2.38.1 + * Tue Feb 12 2019 Kalev Lember - 2.38.0-6 - Backport a patch to fix perl-Gtk3 build (#1676474) diff --git a/sources b/sources index 893ad40..27943b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gdk-pixbuf-2.38.0.tar.xz) = 10fcd7999dcff48d6e965306e208cc8ca324ba98f3f4f56755d015e96938bcfbfaadc56ed75142c037e3df34b04283cd4fdf043b32e3e091b32115fccde229f4 +SHA512 (gdk-pixbuf-2.38.1.tar.xz) = e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920