- up to 2.23.3 (merged from DEVEL)

Changed files:
    gdk-pixbuf2-nopngdep.patch -> 1.2
    gdk-pixbuf2.spec -> 1.16
    gobject-introspection.patch -> 1.2

diff --git a/gdk-pixbuf2-nopngdep.patch b/gdk-pixbuf2-nopngdep.patch
deleted file mode 100644 (file)
index 1e2bcd4..0000000
--- a/gdk-pixbuf2-nopngdep.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- gdk-pixbuf-2.22.1/configure.ac.orig        2010-11-06 00:33:52.000000000 +0100
-+++ gdk-pixbuf-2.22.1/configure.ac     2010-11-12 08:18:07.347103290 +0100
-@@ -598,7 +598,6 @@
-       if $PKG_CONFIG --exists $l ; then
-         AC_MSG_RESULT(yes)
-         PNG='png'
--        PNG_DEP_CFLAGS_PACKAGES=$l
-         LIBPNG=`$PKG_CONFIG --libs $l`
-         break
-       else
-@@ -919,9 +918,8 @@
- GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
- GDK_PIXBUF_EXTRA_CFLAGS=
- GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
--GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
-+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
- 
--AC_SUBST(PNG_DEP_CFLAGS_PACKAGES)
- AC_SUBST(GDK_PIXBUF_PACKAGES)
- AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
- AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
---- gdk-pixbuf-2.22.1/gdk-pixbuf-2.0-uninstalled.pc.in.orig    2010-08-10 03:26:57.000000000 +0200
-+++ gdk-pixbuf-2.22.1/gdk-pixbuf-2.0-uninstalled.pc.in 2010-11-12 08:19:30.375102452 +0100
-@@ -6,6 +6,6 @@
- Name: GdkPixbuf Uninstalled
- Description: Image loading and scaling, Not Installed
- Version: @VERSION@
--Requires: gobject-2.0 gmodule-2.0 @PNG_DEP_CFLAGS_PACKAGES@
-+Requires: gobject-2.0 gmodule-2.0
- Libs: ${pc_top_builddir}/${pcfiledir}/gdk-pixbuf/libgdk_pixbuf-@GDK_PIXBUF_API_VERSION@.la @GDK_PIXBUF_EXTRA_LIBS@
- Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_PIXBUF_EXTRA_CFLAGS@
---- gdk-pixbuf-2.22.1/gdk-pixbuf-2.0.pc.in.orig        2010-09-10 14:58:06.000000000 +0200
-+++ gdk-pixbuf-2.22.1/gdk-pixbuf-2.0.pc.in     2010-11-12 08:19:10.523101613 +0100
-@@ -11,7 +11,7 @@
- Name: GdkPixbuf
- Description: Image loading and scaling
- Version: @VERSION@
--Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
-+Requires: gobject-2.0 gmodule-no-export-2.0
- Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
- Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
- 

diff --git a/gdk-pixbuf2.spec b/gdk-pixbuf2.spec
index 3d47efc7620972aa2f66bc24b86bb39c7903a04b..ec8fe9d111f0417ebe44337430eff839743cbfaa 100644 (file)
--- a/gdk-pixbuf2.spec
+++ b/gdk-pixbuf2.spec
@@ -7,20 +7,18 @@
 Summary:       An image loading and scaling library
 Summary(pl.UTF-8):     Biblioteka ładująca i skalująca obrazki
 Name:          gdk-pixbuf2
 Summary:       An image loading and scaling library
 Summary(pl.UTF-8):     Biblioteka ładująca i skalująca obrazki
 Name:          gdk-pixbuf2

-Version:       2.22.1
-Release:       3
+Version:       2.23.3
+Release:       1

 License:       LGPL v2+
 Group:         X11/Libraries
 License:       LGPL v2+
 Group:         X11/Libraries

-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-%{version}.tar.bz2
-# Source0-md5: 716c4593ead3f9c8cca63b8b1907a561
-Patch0:                gobject-introspection.patch
-Patch1:                %{name}-nopngdep.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.23/gdk-pixbuf-%{version}.tar.bz2
+# Source0-md5: 5d50c5311b4ce460d33983938d92109e

 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
 BuildRequires: gettext-devel >= 0.17
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
 BuildRequires: gettext-devel >= 0.17

-BuildRequires: glib2-devel >= 1:2.25.9
-BuildRequires: gobject-introspection-devel >= 0.9.5
+BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: gobject-introspection-devel >= 0.10.0

 BuildRequires: gtk-doc >= 1.11
 BuildRequires: jasper-devel
 BuildRequires: libjpeg-devel
 BuildRequires: gtk-doc >= 1.11
 BuildRequires: jasper-devel
 BuildRequires: libjpeg-devel


@@ -32,7 +30,7 @@ BuildRequires:        perl-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.527
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.527
 BuildRequires: xorg-lib-libX11-devel

-Requires:      glib2 >= 1:2.25.9
+Requires:      glib2 >= 1:2.28.0

 Suggests:      librsvg >= 2.31
 Conflicts:     gtk+2 < 2:2.21.3-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Suggests:      librsvg >= 2.31
 Conflicts:     gtk+2 < 2:2.21.3-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)


@@ -62,7 +60,7 @@ Summary:      Header files for gdk-pixbuf library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki gdk-pixbuf
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki gdk-pixbuf
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}

-Requires:      glib2-devel >= 1:2.25.9
+Requires:      glib2-devel >= 1:2.28.0

 Conflicts:     gtk+2-devel < 2:2.21.3-1
 
 %description devel
 Conflicts:     gtk+2-devel < 2:2.21.3-1
 
 %description devel


@@ -85,8 +83,6 @@ Dokumentacja API biblioteki gdk-pixbuf.
 
 %prep
 %setup -q -n gdk-pixbuf-%{version}
 
 %prep
 %setup -q -n gdk-pixbuf-%{version}

-%patch0 -p1
-%patch1 -p1

 sed -i s#^io## po/LINGUAS
 %{__rm} po/io.po
 
 sed -i s#^io## po/LINGUAS
 %{__rm} po/io.po
 

diff --git a/gobject-introspection.patch b/gobject-introspection.patch
deleted file mode 100644 (file)
index 83e24da..0000000
--- a/gobject-introspection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdk-pixbuf-2.22.0/gdk-pixbuf/Makefile.am~  2010-09-21 18:42:39.000000000 +0200
-+++ gdk-pixbuf-2.22.0/gdk-pixbuf/Makefile.am   2010-09-22 20:25:16.436185596 +0200
-@@ -677,7 +677,7 @@
- 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 --identifier-prefix=Gdk
- 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)