Fix the build with latest gdk-pixbuf2

This commit is contained in:
Kalev Lember 2014-12-17 15:05:50 +01:00
parent 701db9924b
commit 1f7f94722a
2 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From 5bafcca63f8d065461c311f1ab768e7d0d290813 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 22 Oct 2014 22:10:56 -0400
Subject: [PATCH] Ignore gdk-pixbuf deprecations
We're not going to start updating the 2.24 branch to newer
gdk-pixbuf APIs, so ignore deprecations.
---
configure.ac | 2 --
1 file changed, 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 85f0454..9e5c4f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,8 +621,6 @@ if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; th
CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
fi
-CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
-
dnl
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
--
2.2.0

View File

@ -35,6 +35,7 @@ Patch2: icon-padding.patch
Patch8: tooltip-positioning.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=611313
Patch15: window-dragging.patch
Patch16: 0001-Ignore-gdk-pixbuf-deprecations.patch
BuildRequires: atk-devel >= %{atk_version}
BuildRequires: glib2-devel >= %{glib2_version}
@ -148,6 +149,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
%patch2 -p1 -b .icon-padding
%patch8 -p1 -b .tooltip-positioning
%patch15 -p1 -b .window-dragging
%patch16 -p1 -b .gdk-pixbuf-deprecations
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@ -339,6 +341,7 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache
%changelog
* Wed Dec 17 2014 Kalev Lember <kalevlember@gmail.com> - 2.24.25-2
- Use gtk-update-icon-cache that's built as gtk3 subpackage
- Fix the build with latest gdk-pixbuf2
* Sat Oct 11 2014 Kalev Lember <kalevlember@gmail.com> - 2.24.25-1
- Update to 2.24.25