dtardon pushed to libreoffice (f22). "fix patch to apply for 4.4"

[notifications at fedoraproject.org]

>From 45375ab5639318366f53919f06cf1436b50a977f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
Date: Fri, 20 Mar 2015 17:22:43 +0000
Subject: fix patch to apply for 4.4


diff --git a/0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch b/0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch
index 249b559..9e0fdc8 100644
--- a/0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch
+++ b/0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch
@@ -1,23 +1,28 @@
-From 88baab7de3b4e91c049ba3af39daf1969d596432 Mon Sep 17 00:00:00 2001
+From 642b908049decaa2da5064a9b09afbf2589bd881 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
 Date: Fri, 20 Mar 2015 16:48:57 +0000
 Subject: [PATCH] gdk-pixbuf-xlib-2.0->gdk-pixbuf-2.0
 
+(cherry picked from commit 7fff01817f61a2eb53a5da7248163630a7fb1555)
+
+Conflicts:
+	configure.ac
+
 Change-Id: Ib58578fd9e093d912294d861094e19151a097534
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index bdf5503..c51b6a2 100644
+index fd9a74b..ac7e78e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -10062,7 +10062,7 @@ ENABLE_SYSTRAY_GTK=""
+@@ -10056,7 +10056,7 @@ ENABLE_SYSTRAY_GTK=""
  if test  "$test_gtk" = "yes"; then
  
      if test "$ENABLE_GTK" = "TRUE"; then
--        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
-+        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0 gdk-pixbuf-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
+-        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
++        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
          GTK_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
          PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
          BUILD_TYPE="$BUILD_TYPE GTK"
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f22&id=45375ab5639318366f53919f06cf1436b50a977f