From 4ee7dbfa43978ab9e22a8cd8128061b96dbc01de8742e0a0f4d9e21b303f5dfb Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 25 May 2010 08:37:53 +0000 Subject: [PATCH] Accepting request 40432 from GNOME:Factory checked in (request 40432) OBS-URL: https://build.opensuse.org/request/show/40432 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=107 --- gtk+-2.20.1-pngmess.patch | 43 --------------------------------------- gtk2.changes | 7 ------- gtk2.spec | 3 --- 3 files changed, 53 deletions(-) delete mode 100644 gtk+-2.20.1-pngmess.patch diff --git a/gtk+-2.20.1-pngmess.patch b/gtk+-2.20.1-pngmess.patch deleted file mode 100644 index 572d9cb..0000000 --- a/gtk+-2.20.1-pngmess.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- gdk-pixbuf/io-png.c -+++ gdk-pixbuf/io-png.c -@@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) - gchar *icc_profile_base64; - const gchar *icc_profile_title; - const gchar *icc_profile; -- gulong icc_profile_size; -+ png_uint_32 icc_profile_size; - guint32 retval; - gint compression_type; - -@@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) - (png_charpp) &icc_profile_title, &compression_type, - (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); - if (retval != 0) { -- icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size); -+ icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size); - gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profile_base64); - g_free (icc_profile_base64); - } -@@ -607,7 +607,7 @@ png_info_callback (png_structp png_read_ptr, - gchar *icc_profile_base64; - const gchar *icc_profile_title; - const gchar *icc_profile; -- gulong icc_profile_size; -+ png_uint_32 icc_profile_size; - guint32 retval; - gint compression_type; - -@@ -679,9 +679,9 @@ png_info_callback (png_structp png_read_ptr, - /* Extract embedded ICC profile */ - retval = png_get_iCCP (png_read_ptr, png_info_ptr, - (png_charpp) &icc_profile_title, &compression_type, -- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); -+ (png_charpp) &icc_profile, &icc_profile_size); - if (retval != 0) { -- icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size); -+ icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size); - gdk_pixbuf_set_option (lc->pixbuf, "icc-profile", icc_profile_base64); - g_free (icc_profile_base64); - } --- -cgit v0.8.3.1 diff --git a/gtk2.changes b/gtk2.changes index 96a5584..173d613 100644 --- a/gtk2.changes +++ b/gtk2.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Thu May 20 12:49:46 CEST 2010 - fridrich.strba@bluewin.ch - -- Fix a memory allocation problem in png loader - + patch gtk+-2.20.1-pngmess.patch: backport upstream commit - f0cfc970ed917adb10d4f92ba9e8d3aa079449e0 - ------------------------------------------------------------------- Mon May 3 22:16:19 CEST 2010 - captain.magnus@opensuse.org diff --git a/gtk2.spec b/gtk2.spec index 852fa88..8fca7ce 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -52,8 +52,6 @@ Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.d # be here instead. # PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 Patch53: gtk-path-local.patch -# PATCH-FIX-UPSTREAM gtk+-2.20.1-pngmess.patch fridrich.strba@bluewin.ch - Fix a memory allocation problem in png loader -Patch54: gtk+-2.20.1-pngmess.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: atk-devel @@ -169,7 +167,6 @@ cp -a %{S:2} . %patch23 -p1 %patch24 -p1 %patch53 -%patch54 gnome-patch-translation-update %build