Accepting request 99010 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/99010
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdk-pixbuf?expand=0&rev=15

gdk-pixbuf-2.24.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700
-size 1676011

gdk-pixbuf-2.25.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d6bda49bf4cd53af838af466ceb3bb7ecf35983b76b0d953f82fdf172262fe9
+size 1178980

gdk-pixbuf-missing-include.patch

@@ -0,0 +1,20 @@
+commit 42e18a5d35bbdcf216c03f04e83153ba9f09ec36
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Mon Dec 19 14:57:03 2011 +0100
+
+    qtif: Add missing libintl.h include
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=666518
+
+diff --git a/gdk-pixbuf/io-qtif.c b/gdk-pixbuf/io-qtif.c
+index cd2deaa..d418cfc 100644
+--- a/gdk-pixbuf/io-qtif.c
++++ b/gdk-pixbuf/io-qtif.c
+@@ -27,6 +27,7 @@
+ 
+ #include "config.h"
+ #include <errno.h>
++#include <libintl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

gdk-pixbuf.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Mon Dec 19 11:43:36 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 2.25.0:
+  + Fix some string problems in the qtif loader (bgo#629396)
+  + Fix various introspection annotations (bgo#659888)
+  + Fix introspectability of gdk_pixbuf_get_pixels (bgo#662009)
+  + Skip compressed icons in ICOs (bgo#652498)
+  + Fix thread-safety issues with animations
+  + Fix gif animation delays between frames (bgo#655755)
+  + Work around gtk-doc limitations (bgo#663554)
+  + Add a --with-x11 configure options (bgo#657569)
+  + Fix build problem on NetBSD (bgo#640405)
+  + Fix mingw build (bgo#657876)
+  + Updated translations.
+- Add gdk-pixbuf-missing-include.patch: add missing include.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+- Pass new --with-x11 option to configure.
+
+-------------------------------------------------------------------
+Thu Dec  8 19:48:50 UTC 2011 - dimstar@opensuse.org
+
+- Split typelib file in typelib-1_0-GdkPixbuf-2_0 subpackage.
+- Add typelib-1_0-GdkPixbuf-2_0 Requires to devel subpackage.
+
 -------------------------------------------------------------------
 Wed Aug 31 09:52:33 CEST 2011 - vuntz@opensuse.org
 

gdk-pixbuf.spec

@@ -15,25 +15,28 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 # When updating the binary version, do not forget to also update baselibs.conf
 %define gdk_pixbuf_binary_version 2.10.0
 
 Name:           gdk-pixbuf
-Version:        2.24.0
+Version:        2.25.0
-Release:        1
+Release:        0
-License:        LGPL-2.1+
 Summary:        An image loading library
+License:        LGPL-2.1+
 Group:          System/Libraries
-Source:         http://download.gnome.org/sources/gdk-pixbuf/2.24/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gdk-pixbuf/2.25/%{name}-%{version}.tar.xz
 Source1:        macros.gdk-pixbuf
 Source2:        README.SUSE
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM gdk-pixbuf-missing-include.patch bgo#666518 vuntz@opensuse.org -- Add missing include
+Patch0:         gdk-pixbuf-missing-include.patch
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  translation-update-upstream
-BuildRequires:  pkgconfig(glib-2.0)
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
+BuildRequires:  pkgconfig(glib-2.0) >= 2.31.0
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(x11)
@@ -47,7 +50,6 @@ modules for new image formats. It is used by toolkits such as GTK+ or
 Clutter.
 
 %package -n libgdk_pixbuf-2_0-0
-License:        LGPL-2.1+
 Summary:        An image loading library
 Group:          System/Libraries
 # Provide %{name} to make the lang package installable
@@ -61,8 +63,18 @@ gdk-pixbuf is an image loading library that can be extended by loadable
 modules for new image formats. It is used by toolkits such as GTK+ or
 Clutter.
 
+%package -n typelib-1_0-GdkPixbuf-2_0
+Summary:        An image loading library -- Introspection bindings
+Group:          System/Libraries
+
+%description -n typelib-1_0-GdkPixbuf-2_0
+gdk-pixbuf is an image loading library that can be extended by loadable
+modules for new image formats. It is used by toolkits such as GTK+ or
+Clutter.
+
+This package provides the GObject Introspection bindings for gdk-pixbuf.
+
 %package query-loaders
-License:        LGPL-2.1+
 Summary:        An image loading library - Utility to create loaders cache
 Group:          System/Libraries
 
@@ -75,10 +87,10 @@ This package contains the utility to create the cache file needed for
 loadable modules.
 
 %package devel
-License:        LGPL-2.1+
 Summary:        An image loading library - Development Files
 Group:          Development/Languages/C and C++
 Requires:       libgdk_pixbuf-2_0-0 = %{version}
+Requires:       typelib-1_0-GdkPixbuf-2_0 = %{version}
 
 %description devel
 gdk-pixbuf is an image loading library that can be extended by loadable
@@ -94,6 +106,7 @@ translation-update-upstream
 %if "%_lib" == "lib64"
 cp -a %{S:2} .
 %endif
+%patch0 -p1
 
 %build
 # Needed for patch0 or when BUILD_FROM_VCS is set
@@ -106,7 +119,8 @@ cp -a %{S:2} .
 %if 0%{?BUILD_FROM_VCS}
         --enable-gtk-doc \
 %endif
-        --with-libjasper
+        --with-libjasper \
+        --with-x11
 %{__make} %{?_smp_mflags}
 
 %install
@@ -181,6 +195,9 @@ fi
 %dir %{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders
 %{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders/*.so
 %ghost %{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders.cache
+
+%files -n typelib-1_0-GdkPixbuf-2_0
+%defattr(-,root,root)
 %{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib
 
 %files query-loaders