From 9ec3dd03ade213c1821ac6d7ebadf6d099efb2d977f5f57c74a14b44bd92ec9f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 26 Jul 2007 23:43:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=6 --- gimp-2.2.13.tar.bz2 | 3 -- gimp-2.2.17.tar.bz2 | 3 ++ gimp-psd-overflow.patch | 37 -------------------- gimp-sunras-overflow.patch | 63 --------------------------------- gimp.changes | 71 ++++++++++++++++++++++++++++++++++++++ gimp.spec | 67 +++++++++++++++++++++++++++++------ 6 files changed, 131 insertions(+), 113 deletions(-) delete mode 100644 gimp-2.2.13.tar.bz2 create mode 100644 gimp-2.2.17.tar.bz2 delete mode 100644 gimp-psd-overflow.patch delete mode 100644 gimp-sunras-overflow.patch diff --git a/gimp-2.2.13.tar.bz2 b/gimp-2.2.13.tar.bz2 deleted file mode 100644 index 1978a27..0000000 --- a/gimp-2.2.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0273a3133461f5531bfa17ee24419abfe1f21121b03ef99195a2371a79b2ed7 -size 12930670 diff --git a/gimp-2.2.17.tar.bz2 b/gimp-2.2.17.tar.bz2 new file mode 100644 index 0000000..5738ea0 --- /dev/null +++ b/gimp-2.2.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a4d3b28b3a11ea7564df09c8990d1c90bc3dd713b1dde0737e08603854b01b4 +size 13102077 diff --git a/gimp-psd-overflow.patch b/gimp-psd-overflow.patch deleted file mode 100644 index c789756..0000000 --- a/gimp-psd-overflow.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: gimp-2.2.13/plug-ins/common/psd.c -=================================================================== ---- gimp-2.2.13.orig/plug-ins/common/psd.c -+++ gimp-2.2.13/plug-ins/common/psd.c -@@ -1771,6 +1771,7 @@ load_image (const gchar *name) - gint32 iter; - fpos_t tmpfpos; - int red_chan, grn_chan, blu_chan, alpha_chan, ichan; -+ gint lidx, cidx; - - IFDBG printf("------- %s ---------------------------------\n",name); - -@@ -1789,6 +1790,24 @@ load_image (const gchar *name) - - read_whole_file (fd); - -+ for (lidx = 0; lidx < psd_image.num_layers; ++lidx) { -+ PSDlayer tl = psd_image.layer[lidx]; -+ -+ for (cidx = 0; cidx < tl.num_channels; ++cidx) { -+ PSDchannel tc = tl.channel[cidx]; -+ -+ if (tc.width > 30000 || tc.width < 0 || -+ tc.height > 30000 || tc.height < 0) { -+ /* No good! */ -+ -+ g_message (_("Invalid file: %s"), -+ gimp_filename_to_utf8 (name)); -+ /* Is it necessary to free up anything else? */ -+ fclose (fd); -+ return -1; -+ } -+ } -+ } - if (psd_image.num_layers > 0) /* PS3-style */ - { - int lnum; diff --git a/gimp-sunras-overflow.patch b/gimp-sunras-overflow.patch deleted file mode 100644 index 366ec39..0000000 --- a/gimp-sunras-overflow.patch +++ /dev/null @@ -1,63 +0,0 @@ ------------------------------------------------------------------------- -r22356 | neo | 2007-04-27 13:50:58 +0200 (Pá, 27 dub 2007) | 8 lines - -2007-04-27 Sven Neumann - - Merged from trunk: - - * plug-ins/common/sunras.c (set_color_table): guard against a - possible stack overflow. - - ------------------------------------------------------------------------- -Index: sunras.c -=================================================================== ---- plug-ins/common/sunras.c (revision 22355) -+++ plug-ins/common/sunras.c (revision 22356) -@@ -102,8 +102,7 @@ - gint32 image_ID, - gint32 drawable_ID); - --static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *); -- -+static void set_color_table (gint32, L_SUNFILEHEADER *, const guchar *); - static gint32 create_new_image (const gchar *filename, - guint width, - guint height, -@@ -865,19 +864,20 @@ - static void - set_color_table (gint32 image_ID, - L_SUNFILEHEADER *sunhdr, -- guchar *suncolmap) -+ const guchar *suncolmap) - { -- int ncols, j; -- guchar ColorMap[256*3]; -+ guchar ColorMap[256 * 3]; -+ gint ncols, j; - - ncols = sunhdr->l_ras_maplength / 3; -- if (ncols <= 0) return; -+ if (ncols <= 0) -+ return; - -- for (j = 0; j < ncols; j++) -+ for (j = 0; j < MIN (ncols, 256); j++) - { -- ColorMap[j*3] = suncolmap[j]; -- ColorMap[j*3+1] = suncolmap[j+ncols]; -- ColorMap[j*3+2] = suncolmap[j+2*ncols]; -+ ColorMap[j * 3 + 0] = suncolmap[j]; -+ ColorMap[j * 3 + 1] = suncolmap[j + ncols]; -+ ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols]; - } - - #ifdef DEBUG -@@ -886,6 +886,7 @@ - printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j, - ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]); - #endif -+ - gimp_image_set_colormap (image_ID, ColorMap, ncols); - } - diff --git a/gimp.changes b/gimp.changes index a052d0f..f14068d 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,74 @@ +------------------------------------------------------------------- +Wed Jul 25 22:08:25 CEST 2007 - maw@suse.de + +- Update to version 2.2.17 (#293749) +- Remove upstreamed gimp-psd-overflow.patch and + gimp-sunras-overflow.patch +- The following bug numbers in this changelog entry are against + bugzilla.gnome.org: + +Bugs fixed in GIMP 2.2.17 +========================= + +- fixed regression in PSD load plug-in (bug #456042) +- fixed crash when loading a corrupt PSD file (bug #327444) +- work around for Pango appending " Not-Rotated" to font names + + +Bugs fixed in GIMP 2.2.16 +========================= + +- improved input value validation in several file plug-ins (bug #453973) +- improved handling of corrupt or invalid XCF files +- guard against integer overflows in several file plug-ins (bug #451379) +- fixed handling of background alpha channel in XCF files (bug #443097) +- improved forward compatibility of the config parser +- fixed crash when previewing some animated brushes (bug #446005) + + +Bugs fixed in GIMP 2.2.15 +========================= + +- fixed parsing of GFig files with CRLF line endings (bug #346988) +- guard against a possible stack overflow in the Sunras loader (bug #433902) +- fixed definition of datarootdir in gimptool-2.0 (bug #436386) +- fixed Perspective tool crash on Mac OS X (bug #349483) +- fixed area resizing in the Image Map plug-in (bug #439222) +- added missing library in gimptool-2.0 --libs output +- added new localizations: Occitan and Persian + + +Bugs fixed in GIMP 2.2.14 +========================= + +- avoid crashing on newer versions of the winicon format (bug #352899) +- fixed crash in Postscript plug-in (bug #353381) +- fixed handling of TABs in the text tool (bug #353132) +- fixed bug in Depth Merge plug-in (bug #355219) +- fixed bug in GimpDrawablePreview widget (bug #353639) +- fixed bug in Line Nove script (bug #357433) +- fixed bug in Ripple plug-in (bug #357431) +- save locale independent files from Fractal Explorer plug-in (bug #360095) +- fixed bug in Super Nova plug-in (bug #340073) +- be more robust against broken XCF files (bug #357809) +- fixed drawing issues in Image Map plug-in (bug #311621) +- fixed smoothing option in Fractal Explorer plug-in (bug #372671) +- load channels in the proper order when opening an XCF file (bug #378003) +- deal with floating selections in the Burn-In Animation script (bug #384096) +- fixed clipping in the GimpPreviewArea widget (bug #392692) +- fixed a potential crash in gimp-remote (bug #392111) +- work around a file-chooser problem on Windows (bug #398726) +- fixed markup of the gimp(1) manual page (bug #401145) +- fixed the fix for the right-to-left layout in layers dialog (bug #348347) +- fixed PSD save plug-in on 64bit architectures (bug #335130) +- added missing dependency in gimpui-2.0.pc file (bug #356394) +- fixed a crash in the PSD save plug-in (bug #395385) +- improved robustness of transform tool preview code (bug #420595) +- improved forward compatibility of XCF loader (bug #316207) +- don't crash in the Compressor plug-in if files can't be opened (bug #422444) +- fixed sensitivity of input fields in the Lighting plug-in (bug #359833) + + ------------------------------------------------------------------- Thu Jul 19 00:05:23 CEST 2007 - maw@suse.de diff --git a/gimp.spec b/gimp.spec index 26070ee..acae515 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,5 +1,5 @@ # -# spec file for package gimp (Version 2.2.13) +# spec file for package gimp (Version 2.2.17) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ BuildRequires: python-gtk-devel BuildRequires: python-gtk %endif URL: http://www.gimp.org/ -Version: 2.2.13 -Release: 91 +Version: 2.2.17 +Release: 1 License: GPL v2 or later Group: Productivity/Graphics/Bitmap Editors Provides: gimp2 gimp-2.0 @@ -34,9 +34,7 @@ Summary: The GNU Image Manipulation Program Source: ftp://ftp.gimp.org/pub/gimp/v2.2/%{name}-%{version}.tar.bz2 Source1: gimp-logo.png Source2: gimp-splash.png -Patch: gimp-default-browser.patch -Patch1: gimp-sunras-overflow.patch -Patch2: gimp-psd-overflow.patch +Patch0: gimp-default-browser.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -632,10 +630,7 @@ Authors: # spline.c: 44 # gimpbilinear.c: 179, 132 # fit.c: 1302 -%patch -%patch1 -rm po*/no.* -sed -i "/ALL_LINGUAS=/s/ no / /" configure.in +%patch0 %build # Remove redundand Norwegian locale. @@ -721,6 +716,58 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Wed Jul 25 2007 - maw@suse.de +- Update to version 2.2.17 (#293749) +- Remove upstreamed gimp-psd-overflow.patch and + gimp-sunras-overflow.patch +- The following bug numbers in this changelog entry are against + bugzilla.gnome.org: + Bugs fixed in GIMP 2.2.17 +- fixed regression in PSD load plug-in (bug #456042) +- fixed crash when loading a corrupt PSD file (bug #327444) +- work around for Pango appending " Not-Rotated" to font names + Bugs fixed in GIMP 2.2.16 +- improved input value validation in several file plug-ins (bug #453973) +- improved handling of corrupt or invalid XCF files +- guard against integer overflows in several file plug-ins (bug #451379) +- fixed handling of background alpha channel in XCF files (bug #443097) +- improved forward compatibility of the config parser +- fixed crash when previewing some animated brushes (bug #446005) + Bugs fixed in GIMP 2.2.15 +- fixed parsing of GFig files with CRLF line endings (bug #346988) +- guard against a possible stack overflow in the Sunras loader (bug #433902) +- fixed definition of datarootdir in gimptool-2.0 (bug #436386) +- fixed Perspective tool crash on Mac OS X (bug #349483) +- fixed area resizing in the Image Map plug-in (bug #439222) +- added missing library in gimptool-2.0 --libs output +- added new localizations: Occitan and Persian + Bugs fixed in GIMP 2.2.14 +- avoid crashing on newer versions of the winicon format (bug #352899) +- fixed crash in Postscript plug-in (bug #353381) +- fixed handling of TABs in the text tool (bug #353132) +- fixed bug in Depth Merge plug-in (bug #355219) +- fixed bug in GimpDrawablePreview widget (bug #353639) +- fixed bug in Line Nove script (bug #357433) +- fixed bug in Ripple plug-in (bug #357431) +- save locale independent files from Fractal Explorer plug-in (bug #360095) +- fixed bug in Super Nova plug-in (bug #340073) +- be more robust against broken XCF files (bug #357809) +- fixed drawing issues in Image Map plug-in (bug #311621) +- fixed smoothing option in Fractal Explorer plug-in (bug #372671) +- load channels in the proper order when opening an XCF file (bug #378003) +- deal with floating selections in the Burn-In Animation script (bug #384096) +- fixed clipping in the GimpPreviewArea widget (bug #392692) +- fixed a potential crash in gimp-remote (bug #392111) +- work around a file-chooser problem on Windows (bug #398726) +- fixed markup of the gimp(1) manual page (bug #401145) +- fixed the fix for the right-to-left layout in layers dialog (bug #348347) +- fixed PSD save plug-in on 64bit architectures (bug #335130) +- added missing dependency in gimpui-2.0.pc file (bug #356394) +- fixed a crash in the PSD save plug-in (bug #395385) +- improved robustness of transform tool preview code (bug #420595) +- improved forward compatibility of XCF loader (bug #316207) +- don't crash in the Compressor plug-in if files can't be opened (bug #422444) +- fixed sensitivity of input fields in the Lighting plug-in (bug #359833) * Thu Jul 19 2007 - maw@suse.de - Respin gimp-psd-overflow.patch (http://bugzilla.gnome.org/show_bug.cgi?id=456042 and https://bugzilla.novell.com/show_bug.cgi?id=284288#c13).