diff --git a/gdk-pixbuf-2.22.1.tar.bz2 b/gdk-pixbuf-2.22.1.tar.bz2 deleted file mode 100644 index b3814bc..0000000 --- a/gdk-pixbuf-2.22.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d -size 1543273 diff --git a/gdk-pixbuf-2.23.3.tar.bz2 b/gdk-pixbuf-2.23.3.tar.bz2 new file mode 100644 index 0000000..7c11529 --- /dev/null +++ b/gdk-pixbuf-2.23.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9faba780151c02e13cb2029d512c975e9c41b98cd72de6d2cc50e4af10a5e76a +size 1590998 diff --git a/gdk-pixbuf-add-gir_PACKAGES.patch b/gdk-pixbuf-add-gir_PACKAGES.patch deleted file mode 100644 index 8668321..0000000 --- a/gdk-pixbuf-add-gir_PACKAGES.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b68e5328451d5d805c44b2e33f7b0f0565f3a572 Mon Sep 17 00:00:00 2001 -From: Evan Nemerson -Date: Sat, 20 Nov 2010 09:39:07 -0800 -Subject: [PATCH] introspection: Add C include and exported packages information to GIR - -https://bugzilla.gnome.org/show_bug.cgi?id=635364 ---- - gdk-pixbuf/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am -index d4105d2..72f4aa5 100644 ---- a/gdk-pixbuf/Makefile.am -+++ b/gdk-pixbuf/Makefile.am -@@ -677,7 +677,8 @@ EXTRA_DIST += \ - if HAVE_INTROSPECTION - - GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile --GdkPixbuf_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk -+GdkPixbuf_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk --c-include="gdk-pixbuf/gdk-pixdata.h" -+GdkPixbuf_2_0_gir_EXPORT_PACKAGES = gdk-pixbuf-2.0 - GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0 - GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la - GdkPixbuf_2_0_gir_CFLAGS = $(INCLUDES) --- -1.7.2.3 - - diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index ba986c9..bc6d2a7 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Mon Apr 4 09:23:54 UTC 2011 - fcrozat@novell.com + +- Update to version 2.23.3: + + Fix release tarball + + More win32 build fixes +- Changes from version 2.23.2: + + bgo#636138: Fix possible crashes when loading jpegs + + Introspection annotation fixes + + Update build files on Win32 + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 7 09:19:54 UTC 2011 - fcrozat@novell.com + +- Update to version 2.23.1: + + Introspection: + - Add package information + - Don't include backend API + + Fix build against libpng 1.5 + + Bugs fixed: + - bgo#634659: gdk-pixbuf 2.22 can't find localisation + - bgo#635364: Add C include and exported packages information + to GIR + - bgo#639922: Proposed Visual C++ 2008 Project Files + - bgo#640407: Unportable test(1) construct in configure script. + + Updated translations. + +------------------------------------------------------------------- +Wed Feb 16 08:01:37 UTC 2011 - fcrozat@novell.com + +- Update to version 2.23.0: + + New API: gdk_pixbuf_new_from_stream_async + + Updated translations. +- Drop gdk-pixbuf-add-gir_PACKAGES.patch: fixed upstream. Also + remove gnome-common BuildRequires and call to gnome-autogen.sh + that were needed for the patch. +- Add support for source service checkout, with %BUILD_FROM_VCS: + + Add gtk-doc BuildRequires. + + Add call to ./autogen.sh. + + Enforce gtk-doc html generation by passing --enable-gtk-doc to + configure. + ------------------------------------------------------------------- Mon Feb 14 17:46:42 CET 2011 - sbrabec@suse.cz diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 5ca0230..0c5cb3e 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -20,8 +20,8 @@ %define gdk_pixbuf_binary_version 2.10.0 Name: gdk-pixbuf -Version: 2.22.1 -Release: 7 +Version: 2.23.3 +Release: 1 License: LGPLv2+ Summary: An image loading library Group: System/Libraries @@ -29,10 +29,6 @@ Source: %{name}-%{version}.tar.bz2 Source1: macros.gdk-pixbuf Source2: README.SUSE Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gdk-pixbuf-add-gir_PACKAGES.patch bgo#635364 dimstar@opensuse.org -- Add gir_PACKAGES. This helps vapigen 0.12 to add proper package information, needed to bind .vapi and .gir files, in case both are installed. -Patch0: gdk-pixbuf-add-gir_PACKAGES.patch -# Needed for patch0 -BuildRequires: gnome-common BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel @@ -41,6 +37,9 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(x11) +%if 0%{?BUILD_FROM_VCS} +BuildRequires: gtk-doc +%endif %description gdk-pixbuf is an image loading library that can be extended by loadable @@ -95,14 +94,18 @@ translation-update-upstream %if "%_lib" == "lib64" cp -a %{S:2} . %endif -%patch0 -p1 %build -# Needed for patch0 -NOCONFIGURE=1 gnome-autogen.sh +# Needed for patch0 or when BUILD_FROM_VCS is set +%if 0%{?BUILD_FROM_VCS} +[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh +%endif %configure \ --disable-static \ --enable-introspection \ +%if 0%{?BUILD_FROM_VCS} + --enable-gtk-doc \ +%endif --with-libjasper %{__make} %{?_smp_mflags}