From e6b38ad14bf1647d36bd212f072e9189189a29c87232b43958adb1778d82749b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 12 Dec 2011 15:48:38 +0000 Subject: [PATCH 1/2] Accepting request 96142 from home:dimstar:branches:GNOME:Factory Push typelib change branch OBS-URL: https://build.opensuse.org/request/show/96142 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=31 --- gdk-pixbuf.changes | 5 +++++ gdk-pixbuf.spec | 23 +++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 33cbb6c..4ba4990 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 8 19:48:50 UTC 2011 - dimstar@opensuse.org + +- Split out the typelib file in typelib-1_0-GdkPixbuf-2_0. + ------------------------------------------------------------------- Wed Aug 31 09:52:33 CEST 2011 - vuntz@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 2cc2d44..9922508 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -22,7 +22,7 @@ Name: gdk-pixbuf Version: 2.24.0 Release: 1 -License: LGPLv2+ +License: LGPL-2.1+ Summary: An image loading library Group: System/Libraries Source: http://download.gnome.org/sources/gdk-pixbuf/2.24/%{name}-%{version}.tar.bz2 @@ -47,7 +47,7 @@ modules for new image formats. It is used by toolkits such as GTK+ or Clutter. %package -n libgdk_pixbuf-2_0-0 -License: LGPLv2+ +License: LGPL-2.1+ Summary: An image loading library Group: System/Libraries # Provide %{name} to make the lang package installable @@ -61,8 +61,19 @@ 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 +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 contains the gobject-introspection language bindings. + %package query-loaders -License: LGPLv2+ +License: LGPL-2.1+ Summary: An image loading library - Utility to create loaders cache Group: System/Libraries @@ -75,10 +86,11 @@ This package contains the utility to create the cache file needed for loadable modules. %package devel -License: LGPLv2+ +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 @@ -181,6 +193,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 From a45515bc18542e4c54328abfe26da69f83427be3ad88686dff1f5f8356b86d18 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 04:10:28 +0000 Subject: [PATCH 2/2] Accepting request 97279 from home:vuntz:branches:GNOME:Factory Update to 2.25.0 OBS-URL: https://build.opensuse.org/request/show/97279 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=32 --- gdk-pixbuf-2.24.0.tar.bz2 | 3 --- gdk-pixbuf-2.25.0.tar.xz | 3 +++ gdk-pixbuf-missing-include.patch | 20 ++++++++++++++++++++ gdk-pixbuf.changes | 24 +++++++++++++++++++++++- gdk-pixbuf.spec | 26 ++++++++++++++------------ 5 files changed, 60 insertions(+), 16 deletions(-) delete mode 100644 gdk-pixbuf-2.24.0.tar.bz2 create mode 100644 gdk-pixbuf-2.25.0.tar.xz create mode 100644 gdk-pixbuf-missing-include.patch diff --git a/gdk-pixbuf-2.24.0.tar.bz2 b/gdk-pixbuf-2.24.0.tar.bz2 deleted file mode 100644 index ebf5769..0000000 --- a/gdk-pixbuf-2.24.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700 -size 1676011 diff --git a/gdk-pixbuf-2.25.0.tar.xz b/gdk-pixbuf-2.25.0.tar.xz new file mode 100644 index 0000000..d0cdedc --- /dev/null +++ b/gdk-pixbuf-2.25.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d6bda49bf4cd53af838af466ceb3bb7ecf35983b76b0d953f82fdf172262fe9 +size 1178980 diff --git a/gdk-pixbuf-missing-include.patch b/gdk-pixbuf-missing-include.patch new file mode 100644 index 0000000..3aca36b --- /dev/null +++ b/gdk-pixbuf-missing-include.patch @@ -0,0 +1,20 @@ +commit 42e18a5d35bbdcf216c03f04e83153ba9f09ec36 +Author: Vincent Untz +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 ++#include + #include + #include + #include diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 4ba4990..9cb90b3 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,7 +1,29 @@ +------------------------------------------------------------------- +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 out the typelib file in typelib-1_0-GdkPixbuf-2_0. +- 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 diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 9922508..bf01e76 100644 --- a/gdk-pixbuf.spec +++ b/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 -Release: 1 -License: LGPL-2.1+ +Version: 2.25.0 +Release: 0 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 @@ -62,7 +64,7 @@ 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 +Summary: An image loading library -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-GdkPixbuf-2_0 @@ -70,10 +72,9 @@ 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 contains the gobject-introspection language bindings. +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 @@ -86,7 +87,6 @@ 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} @@ -106,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 @@ -118,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