From 47326b30cb34df7237218dd9eb7e41a212abc56949066e0740658dba5570e88c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 7 Feb 2012 16:51:47 +0000 Subject: [PATCH 1/2] Accepting request 102801 from home:Zaitor:branches:GNOME:Factory Update to 2.25.2, Newsfile only had ref to 2.25.1, but I think this is an error. - Further I'm slightly unsure if I placed the new files in the correct file section OBS-URL: https://build.opensuse.org/request/show/102801 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=34 --- gdk-pixbuf-2.25.0.tar.xz | 3 --- gdk-pixbuf-2.25.2.tar.xz | 3 +++ gdk-pixbuf-missing-include.patch | 20 -------------------- gdk-pixbuf.changes | 12 ++++++++++++ gdk-pixbuf.spec | 11 +++++------ 5 files changed, 20 insertions(+), 29 deletions(-) delete mode 100644 gdk-pixbuf-2.25.0.tar.xz create mode 100644 gdk-pixbuf-2.25.2.tar.xz delete mode 100644 gdk-pixbuf-missing-include.patch diff --git a/gdk-pixbuf-2.25.0.tar.xz b/gdk-pixbuf-2.25.0.tar.xz deleted file mode 100644 index d0cdedc..0000000 --- a/gdk-pixbuf-2.25.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d6bda49bf4cd53af838af466ceb3bb7ecf35983b76b0d953f82fdf172262fe9 -size 1178980 diff --git a/gdk-pixbuf-2.25.2.tar.xz b/gdk-pixbuf-2.25.2.tar.xz new file mode 100644 index 0000000..bb2994b --- /dev/null +++ b/gdk-pixbuf-2.25.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8bc5d7b823b5b8ecdf053225b12a9c26163ab23fcb68f176d3ec36ce96ff931 +size 1159316 diff --git a/gdk-pixbuf-missing-include.patch b/gdk-pixbuf-missing-include.patch deleted file mode 100644 index 3aca36b..0000000 --- a/gdk-pixbuf-missing-include.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 9cb90b3..07e4d75 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Feb 5 18:52:47 UTC 2012 - zaitor@opensuse.org + +- Update to version 2.25.2: + + New functions to load pixbufs from resources: + gdk_pixbuf_new_from_resource. + gdk_pixbuf_new_from_resource_at_scale. + + gdk-pixbuf-pixdata is a new program that generates raw binary + GdkPixdata files, and there is a new loader for these. + + Updated translations. +- Removed gdk-pixbuf-missing-include.patch - Fixed upstream. + ------------------------------------------------------------------- Mon Dec 19 11:43:36 UTC 2011 - vuntz@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index bf01e76..1e6becd 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -1,7 +1,7 @@ # # spec file for package gdk-pixbuf # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,12 @@ # 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.25.0 +Version: 2.25.2 Release: 0 Summary: An image loading library License: LGPL-2.1+ @@ -28,8 +29,6 @@ Source: http://download.gnome.org/sources/gdk-pixbuf/2.25/%{name}-%{vers 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 @@ -106,10 +105,9 @@ translation-update-upstream %if "%_lib" == "lib64" cp -a %{S:2} . %endif -%patch0 -p1 %build -# Needed for patch0 or when BUILD_FROM_VCS is set +# Needed for when BUILD_FROM_VCS is set %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh %endif @@ -203,6 +201,7 @@ fi %files query-loaders %defattr(-, root, root) %{_bindir}/gdk-pixbuf-query-loaders* +%{_bindir}/gdk-pixbuf-pixdata* %{_mandir}/man1/gdk-pixbuf-query-loaders*.1* %files devel From b41209c57874c39fd7dad79e6e2af1a42035cb857a4354ef316c115fb0496c05 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 8 Feb 2012 10:55:27 +0000 Subject: [PATCH 2/2] Accepting request 103086 from home:vuntz:branches:GNOME:Factory Small cleanup OBS-URL: https://build.opensuse.org/request/show/103086 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=35 --- gdk-pixbuf.changes | 12 +++++++++--- gdk-pixbuf.spec | 6 +----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 07e4d75..95ea2dc 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,15 +1,21 @@ +------------------------------------------------------------------- +Tue Feb 7 16:53:33 UTC 2012 - vuntz@opensuse.org + +- Remove xz BuildRequires now that it comes for free in the build + system. + ------------------------------------------------------------------- Sun Feb 5 18:52:47 UTC 2012 - zaitor@opensuse.org - Update to version 2.25.2: + New functions to load pixbufs from resources: - gdk_pixbuf_new_from_resource. + gdk_pixbuf_new_from_resource, gdk_pixbuf_new_from_resource_at_scale. + gdk-pixbuf-pixdata is a new program that generates raw binary GdkPixdata files, and there is a new loader for these. + Updated translations. -- Removed gdk-pixbuf-missing-include.patch - Fixed upstream. - +- Drop gdk-pixbuf-missing-include.patch: fixed upstream. + ------------------------------------------------------------------- Mon Dec 19 11:43:36 UTC 2011 - vuntz@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 1e6becd..a0685f6 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -15,7 +15,6 @@ # 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 @@ -33,8 +32,6 @@ BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: translation-update-upstream -# 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) @@ -107,7 +104,6 @@ cp -a %{S:2} . %endif %build -# Needed for when BUILD_FROM_VCS is set %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh %endif @@ -201,12 +197,12 @@ fi %files query-loaders %defattr(-, root, root) %{_bindir}/gdk-pixbuf-query-loaders* -%{_bindir}/gdk-pixbuf-pixdata* %{_mandir}/man1/gdk-pixbuf-query-loaders*.1* %files devel %defattr(-, root, root) %{_bindir}/gdk-pixbuf-csource +%{_bindir}/gdk-pixbuf-pixdata %{_mandir}/man1/gdk-pixbuf-csource.1* %{_includedir}/gdk-pixbuf-2.0 %{_libdir}/pkgconfig/*.pc