--- a/ChangeLog Fri Sep 10 02:44:17 2010 +0000
+++ b/ChangeLog Fri Sep 10 05:45:48 2010 +0000
@@ -1,3 +1,21 @@
+2010-09-10 Leon Sha <[email protected]>
+
+ - Bump gimp to 2.6.10
+ - Remove patch gimp-03-bmp-integer-overflows.diff
+ - Remove patch gimp-04-psd-integer-overflows.diff
+ - Remove patch gimp-07-libpng14.diff
+ - Add patch gimp-05-libpng12.diff to fix defect 16848 and CR 679840
+ - Updated the license line to correctly reflect same
+ * base-specs/gimp.spec:
+ * patches/gimp-03-bmp-integer-overflows.diff:
+ * patches/gimp-03-py26.diff:
+ * patches/gimp-04-fixxref-modules.diff:
+ * patches/gimp-04-psd-integer-overflows.diff:
+ * patches/gimp-05-libpng12.diff:
+ * patches/gimp-05-py26.diff:
+ * patches/gimp-06-fixxref-modules.diff:
+ * patches/gimp-07-libpng14.diff:
+
2010-09-10 Jeff Cai <[email protected]>
* base-specs/gdm.spec:
--- a/base-specs/gimp.spec Fri Sep 10 02:44:17 2010 +0000
+++ b/base-specs/gimp.spec Fri Sep 10 05:45:48 2010 +0000
@@ -13,7 +13,7 @@
%include l10n.inc
%define subver 2.6
%define subver_install 2.0
-%define microver 7
+%define microver 10
Name: gimp
License: GPL/LGPL
@@ -32,16 +32,12 @@
Patch1: gimp-01-menu-entry.diff
# date:2009-06-19 owner:leon.sha type:branding
Patch2: gimp-02-copying-gplv3.diff
-# date:2009-11-16 owner:leon.sha type:security
-Patch3: gimp-03-bmp-integer-overflows.diff
-# date:2009-11-18 owner:leon.sha type:security
-Patch4: gimp-04-psd-integer-overflows.diff
# date:2010-02-08 owner:jouby type:branding
-Patch5: gimp-05-py26.diff
+Patch3: gimp-03-py26.diff
# date:2010-02-23 owner:chrisk type:bug
-Patch6: gimp-06-fixxref-modules.diff
-# date:2010-08-04 owner:davelam type:bug
-Patch7: gimp-07-libpng14.diff
+Patch4: gimp-04-fixxref-modules.diff
+# date:2010-08-31 owner:leon.sha type:bug
+Patch5: gimp-05-libpng12.diff
URL: http://www.gimp.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -118,8 +114,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -243,6 +237,12 @@
%{_mandir}/man1/gimptool-%{subver_install}.1*
%changelog
+* Tue Aug 31 2010 [email protected]
+- Bump to 2.6.10
+- Remove patch gimp-03-bmp-integer-overflows.diff
+- Remove patch gimp-04-psd-integer-overflows.diff
+- Remove patch gimp-07-libpng14.diff
+- Add patch gimp-05-libpng12.diff to fix defect 16848 and CR 679840
* Mon Feb 08 2010 [email protected]
- Using python2.6 explicity in python script to fix CR 6924065
* Wed Nov 18 2009 [email protected]
--- a/patches/gimp-03-bmp-integer-overflows.diff Fri Sep 10 02:44:17 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
---- gimp-2.6.7/plug-ins/file-bmp/bmp-read.c.orig 2009-08-04 04:17:25.000000000 +0800
-+++ gimp-2.6.7/plug-ins/file-bmp/bmp-read.c 2009-11-16 12:24:19.984324000 +0800
-@@ -424,7 +424,8 @@
- return -1;
- }
-
-- if (Bitmap_Head.biWidth < 0)
-+ if (Bitmap_Head.biWidth < 0 ||
-+ ABS (Bitmap_Head.biHeight) < 0)
- {
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("'%s' is not a valid BMP file"),
-@@ -448,6 +449,18 @@
- return -1;
- }
-
-+ /* protect against integer overflows caused by malicious BMPs */
-+
-+ if (((guint64) Bitmap_Head.biWidth) * Bitmap_Head.biBitCnt > G_MAXINT32 ||
-+ ((guint64) Bitmap_Head.biWidth) * ABS (Bitmap_Head.biHeight) > G_MAXINT32 ||
-+ ((guint64) Bitmap_Head.biWidth) * ABS (Bitmap_Head.biHeight) * 4 > G_MAXINT32)
-+ {
-+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+ _("'%s' is not a valid BMP file"),
-+ gimp_filename_to_utf8 (filename));
-+ return -1;
-+ }
-+
- /* Windows and OS/2 declare filler so that rows are a multiple of
- * word length (32 bits == 4 bytes)
- */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gimp-03-py26.diff Fri Sep 10 05:45:48 2010 +0000
@@ -0,0 +1,153 @@
+diff -r 949ec3dc1c03 app/composite/make-installer.py
+--- a/app/composite/make-installer.py Mon Feb 08 13:22:19 2010 +0800
++++ b/app/composite/make-installer.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ #
+ # Gimp image compositing
+ # Copyright (C) 2003 Helvetix Victorinox, <[email protected]>
+diff -r 949ec3dc1c03 app/composite/ns.py
+--- a/app/composite/ns.py Mon Feb 08 13:22:19 2010 +0800
++++ b/app/composite/ns.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ # Copyright (C) 2003 Helvetix Victorinox, a pseudonym, <[email protected]>
+ #
+ # This program is free software; you can redistribute it and/or modify
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/benchmark-foreground-extract.py
+--- a/plug-ins/pygimp/plug-ins/benchmark-foreground-extract.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/benchmark-foreground-extract.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ # Foreground Extraction Benchmark
+ # Copyright 2005 Sven Neumann <[email protected]>
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/clothify.py
+--- a/plug-ins/pygimp/plug-ins/clothify.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/clothify.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ # Gimp-Python - allows the writing of Gimp plugins in Python.
+ # Copyright (C) 1997 James Henstridge <[email protected]>
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/colorxhtml.py
+--- a/plug-ins/pygimp/plug-ins/colorxhtml.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/colorxhtml.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ # Gimp-Python - allows the writing of Gimp plugins in Python.
+ # Copyright (C) 2003, 2005 Manish Singh <[email protected]>
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/foggify.py
+--- a/plug-ins/pygimp/plug-ins/foggify.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/foggify.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ # Gimp-Python - allows the writing of Gimp plugins in Python.
+ # Copyright (C) 1997 James Henstridge <[email protected]>
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/palette-offset.py
+--- a/plug-ins/pygimp/plug-ins/palette-offset.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/palette-offset.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ # -*- coding: utf-8 -*-
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/palette-sort.py
+--- a/plug-ins/pygimp/plug-ins/palette-sort.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/palette-sort.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/palette-to-gradient.py
+--- a/plug-ins/pygimp/plug-ins/palette-to-gradient.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/palette-to-gradient.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/py-slice.py
+--- a/plug-ins/pygimp/plug-ins/py-slice.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/py-slice.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ # -*- coding: utf-8 -*-
+
+ #Copyright (c) Manish Singh
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/python-console.py
+--- a/plug-ins/pygimp/plug-ins/python-console.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/python-console.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ # Gimp-Python - allows the writing of Gimp plugins in Python.
+ # Copyright (C) 1997 James Henstridge <[email protected]>
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/python-eval.py
+--- a/plug-ins/pygimp/plug-ins/python-eval.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/python-eval.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ # Gimp-Python - allows the writing of Gimp plugins in Python.
+ # Copyright (C) 2006 Manish Singh <[email protected]>
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/shadow_bevel.py
+--- a/plug-ins/pygimp/plug-ins/shadow_bevel.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/shadow_bevel.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ # Gimp-Python - allows the writing of Gimp plugins in Python.
+ # Copyright (C) 1997 James Henstridge <[email protected]>
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/sphere.py
+--- a/plug-ins/pygimp/plug-ins/sphere.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/sphere.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ # Gimp-Python - allows the writing of Gimp plugins in Python.
+ # Copyright (C) 1997 James Henstridge <[email protected]>
+diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/whirlpinch.py
+--- a/plug-ins/pygimp/plug-ins/whirlpinch.py Mon Feb 08 13:22:19 2010 +0800
++++ b/plug-ins/pygimp/plug-ins/whirlpinch.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ # Gimp-Python - allows the writing of Gimp plugins in Python.
+ # Copyright (C) 1997 James Henstridge <[email protected]>
+diff -r 949ec3dc1c03 tools/defcheck.py
+--- a/tools/defcheck.py Mon Feb 08 13:22:19 2010 +0800
++++ b/tools/defcheck.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ """
+ defcheck.py -- Consistency check for the .def files.
+diff -r 949ec3dc1c03 tools/gimppath2svg.py
+--- a/tools/gimppath2svg.py Mon Feb 08 13:22:19 2010 +0800
++++ b/tools/gimppath2svg.py Mon Feb 08 13:30:41 2010 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ import sys,re
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gimp-04-fixxref-modules.diff Fri Sep 10 05:45:48 2010 +0000
@@ -0,0 +1,89 @@
+--- gimp-2.6.7.orig/devel-docs/libgimpcolor/Makefile.am 2010-02-02 23:14:26.461012598 +0000
++++ gimp-2.6.7/devel-docs/libgimpcolor/Makefile.am 2010-02-02 23:21:59.780445729 +0000
+@@ -19,7 +19,7 @@
+ MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+ # Extra options to supply to gtkdoc-fixref
+-FIXXREF_OPTIONS =
++FIXXREF_OPTIONS = --module=$(DOC_MODULE)
+
+ # Used for dependencies
+ HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
+--- gimp-2.6.7.orig/devel-docs/libgimpconfig/Makefile.am 2010-02-02 23:14:26.466912830 +0000
++++ gimp-2.6.7/devel-docs/libgimpconfig/Makefile.am 2010-02-02 23:24:39.683453712 +0000
+@@ -19,7 +19,7 @@
+ MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+ # Extra options to supply to gtkdoc-fixref
+-FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpmath/html
++FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpmath/html --module=$(DOC_MODULE)
+
+ # Used for dependencies
+ HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
+--- gimp-2.6.7.orig/devel-docs/libgimpmath/Makefile.am 2010-02-02 23:14:26.477266439 +0000
++++ gimp-2.6.7/devel-docs/libgimpmath/Makefile.am 2010-02-02 23:26:08.651249656 +0000
+@@ -19,7 +19,7 @@
+ MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+ # Extra options to supply to gtkdoc-fixref
+-FIXXREF_OPTIONS =
++FIXXREF_OPTIONS = --module=$(DOC_MODULE)
+
+ # Used for dependencies
+ HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
+--- gimp-2.6.7.orig/devel-docs/libgimpmodule/Makefile.am 2010-02-02 23:14:26.583459855 +0000
++++ gimp-2.6.7/devel-docs/libgimpmodule/Makefile.am 2010-02-02 23:28:35.139822019 +0000
+@@ -19,7 +19,7 @@
+ MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+ # Extra options to supply to gtkdoc-fixref
+-FIXXREF_OPTIONS =
++FIXXREF_OPTIONS = --module=$(DOC_MODULE)
+
+ # Used for dependencies
+ HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
+--- gimp-2.6.7.orig/devel-docs/libgimpthumb/Makefile.am 2010-02-02 23:14:26.485150690 +0000
++++ gimp-2.6.7/devel-docs/libgimpthumb/Makefile.am 2010-02-02 23:30:11.674878664 +0000
+@@ -19,7 +19,7 @@
+ MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+ # Extra options to supply to gtkdoc-fixref
+-FIXXREF_OPTIONS = --extra-dir=../libgimpmath/html
++FIXXREF_OPTIONS = --extra-dir=../libgimpmath/html --module=$(DOC_MODULE)
+
+ # Used for dependencies
+ HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
+--- gimp-2.6.7.orig/devel-docs/libgimp/Makefile.am 2010-02-02 23:14:26.419121473 +0000
++++ gimp-2.6.7/devel-docs/libgimp/Makefile.am 2010-02-03 00:01:27.831794111 +0000
+@@ -19,7 +19,7 @@
+ MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+ # Extra options to supply to gtkdoc-fixref
+-FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimpwidgets/html
++FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimpwidgets/html --module=$(DOC_MODULE)
+
+ # Used for dependencies
+ HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
+--- gimp-2.6.7.orig/devel-docs/libgimpwidgets/Makefile.am 2010-02-02 23:14:26.507928484 +0000
++++ gimp-2.6.7/devel-docs/libgimpwidgets/Makefile.am 2010-02-02 23:58:24.512228368 +0000
+@@ -19,7 +19,7 @@
+ MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+ # Extra options to supply to gtkdoc-fixref
+-FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimp/html
++FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimp/html --module=$(DOC_MODULE)
+
+ # Used for dependencies
+ HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
+diff -ruN gimp-2.6.7.orig/devel-docs/libgimpbase/Makefile.am gimp-2.6.7/devel-docs/libgimpbase/Makefile.am
+--- gimp-2.6.7.orig/devel-docs/libgimpbase/Makefile.am 2010-02-03 00:58:49.609993900 +0000
++++ gimp-2.6.7/devel-docs/libgimpbase/Makefile.am 2010-02-03 00:59:28.149825100 +0000
+@@ -19,7 +19,7 @@
+ MKDB_OPTIONS = --sgml-mode --output-format=xml
+
+ # Extra options to supply to gtkdoc-fixref
+-FIXXREF_OPTIONS =
++FIXXREF_OPTIONS = --module=$(DOC_MODULE)
+
+ # Used for dependencies
+ HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
--- a/patches/gimp-04-psd-integer-overflows.diff Fri Sep 10 02:44:17 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
---- gimp-2.6.7/plug-ins/file-psd/psd-load.c.old 2009-11-18 12:11:32.806202000 +0800
-+++ gimp-2.6.7/plug-ins/file-psd/psd-load.c 2009-11-18 12:12:23.349719000 +0800
-@@ -304,6 +304,15 @@
- return -1;
- }
-
-+ /* img_a->rows is sanitized above, so a division by zero is avoided here */
-+ if (img_a->columns > G_MAXINT32 / img_a->rows)
-+ {
-+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+ _("Unsupported or invalid image size: %dx%d"),
-+ img_a->columns, img_a->rows);
-+ return -1;
-+ }
-+
- if (img_a->color_mode != PSD_BITMAP
- && img_a->color_mode != PSD_GRAYSCALE
- && img_a->color_mode != PSD_INDEXED
-@@ -533,10 +542,10 @@
- psd_set_error (feof (f), errno, error);
- return NULL;
- }
-- lyr_a[lidx]->top = GUINT32_FROM_BE (lyr_a[lidx]->top);
-- lyr_a[lidx]->left = GUINT32_FROM_BE (lyr_a[lidx]->left);
-- lyr_a[lidx]->bottom = GUINT32_FROM_BE (lyr_a[lidx]->bottom);
-- lyr_a[lidx]->right = GUINT32_FROM_BE (lyr_a[lidx]->right);
-+ lyr_a[lidx]->top = GINT32_FROM_BE (lyr_a[lidx]->top);
-+ lyr_a[lidx]->left = GINT32_FROM_BE (lyr_a[lidx]->left);
-+ lyr_a[lidx]->bottom = GINT32_FROM_BE (lyr_a[lidx]->bottom);
-+ lyr_a[lidx]->right = GINT32_FROM_BE (lyr_a[lidx]->right);
- lyr_a[lidx]->num_channels = GUINT16_FROM_BE (lyr_a[lidx]->num_channels);
-
- if (lyr_a[lidx]->num_channels > MAX_CHANNELS)
-@@ -546,14 +555,16 @@
- lyr_a[lidx]->num_channels);
- return NULL;
- }
-- if (lyr_a[lidx]->bottom - lyr_a[lidx]->top > GIMP_MAX_IMAGE_SIZE)
-+ if (lyr_a[lidx]->bottom < lyr_a[lidx]->top ||
-+ lyr_a[lidx]->bottom - lyr_a[lidx]->top > GIMP_MAX_IMAGE_SIZE)
- {
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("Unsupported or invalid layer height: %d"),
- lyr_a[lidx]->bottom - lyr_a[lidx]->top);
- return NULL;
- }
-- if (lyr_a[lidx]->right - lyr_a[lidx]->left > GIMP_MAX_IMAGE_SIZE)
-+ if (lyr_a[lidx]->right < lyr_a[lidx]->left ||
-+ lyr_a[lidx]->right - lyr_a[lidx]->left > GIMP_MAX_IMAGE_SIZE)
- {
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("Unsupported or invalid layer width: %d"),
-@@ -561,6 +572,16 @@
- return NULL;
- }
-
-+ if ((lyr_a[lidx]->right - lyr_a[lidx]->left) >
-+ G_MAXINT32 / MAX (lyr_a[lidx]->bottom - lyr_a[lidx]->top, 1))
-+ {
-+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+ _("Unsupported or invalid layer size: %dx%d"),
-+ lyr_a[lidx]->right - lyr_a[lidx]->left,
-+ lyr_a[lidx]->bottom - lyr_a[lidx]->top);
-+ return NULL;
-+ }
-+
- IFDBG(2) g_debug ("Layer %d, Coords %d %d %d %d, channels %d, ",
- lidx, lyr_a[lidx]->left, lyr_a[lidx]->top,
- lyr_a[lidx]->right, lyr_a[lidx]->bottom,
-@@ -670,13 +691,13 @@
- return NULL;
- }
- lyr_a[lidx]->layer_mask.top =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.top);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask.top);
- lyr_a[lidx]->layer_mask.left =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.left);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask.left);
- lyr_a[lidx]->layer_mask.bottom =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.bottom);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask.bottom);
- lyr_a[lidx]->layer_mask.right =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.right);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask.right);
- lyr_a[lidx]->layer_mask.mask_flags.relative_pos =
- lyr_a[lidx]->layer_mask.flags & 1 ? TRUE : FALSE;
- lyr_a[lidx]->layer_mask.mask_flags.disabled =
-@@ -702,21 +723,21 @@
- return NULL;
- }
- lyr_a[lidx]->layer_mask_extra.top =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.top);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.top);
- lyr_a[lidx]->layer_mask_extra.left =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.left);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.left);
- lyr_a[lidx]->layer_mask_extra.bottom =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.bottom);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.bottom);
- lyr_a[lidx]->layer_mask_extra.right =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.right);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.right);
- lyr_a[lidx]->layer_mask.top =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.top);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask.top);
- lyr_a[lidx]->layer_mask.left =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.left);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask.left);
- lyr_a[lidx]->layer_mask.bottom =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.bottom);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask.bottom);
- lyr_a[lidx]->layer_mask.right =
-- GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.right);
-+ GINT32_FROM_BE (lyr_a[lidx]->layer_mask.right);
- lyr_a[lidx]->layer_mask.mask_flags.relative_pos =
- lyr_a[lidx]->layer_mask.flags & 1 ? TRUE : FALSE;
- lyr_a[lidx]->layer_mask.mask_flags.disabled =
-@@ -734,6 +755,34 @@
- }
- }
-
-+ /* sanity checks */
-+ if (lyr_a[lidx]->layer_mask.bottom < lyr_a[lidx]->layer_mask.top ||
-+ lyr_a[lidx]->layer_mask.bottom - lyr_a[lidx]->layer_mask.top > GIMP_MAX_IMAGE_SIZE)
-+ {
-+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+ _("Unsupported or invalid layer mask height: %d"),
-+ lyr_a[lidx]->layer_mask.bottom - lyr_a[lidx]->layer_mask.top);
-+ return NULL;
-+ }
-+ if (lyr_a[lidx]->layer_mask.right < lyr_a[lidx]->layer_mask.left ||
-+ lyr_a[lidx]->layer_mask.right - lyr_a[lidx]->layer_mask.left > GIMP_MAX_IMAGE_SIZE)
-+ {
-+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+ _("Unsupported or invalid layer mask width: %d"),
-+ lyr_a[lidx]->layer_mask.right - lyr_a[lidx]->layer_mask.left);
-+ return NULL;
-+ }
-+
-+ if ((lyr_a[lidx]->layer_mask.right - lyr_a[lidx]->layer_mask.left) >
-+ G_MAXINT32 / MAX (lyr_a[lidx]->layer_mask.bottom - lyr_a[lidx]->layer_mask.top, 1))
-+ {
-+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+ _("Unsupported or invalid layer mask size: %dx%d"),
-+ lyr_a[lidx]->layer_mask.right - lyr_a[lidx]->layer_mask.left,
-+ lyr_a[lidx]->layer_mask.bottom - lyr_a[lidx]->layer_mask.top);
-+ return NULL;
-+ }
-+
- IFDBG(2) g_debug ("Layer mask coords %d %d %d %d, Rel pos %d",
- lyr_a[lidx]->layer_mask.left,
- lyr_a[lidx]->layer_mask.top,
-@@ -1135,7 +1184,7 @@
- psd_set_error (feof (f), errno, error);
- return -1;
- }
-- rle_pack_len[rowi] = GUINT16_FROM_BE (rle_pack_len[rowi]);
-+ rle_pack_len[rowi] = GUINT16_FROM_BE (rle_pack_len[rowi]);
- }
-
- IFDBG(3) g_debug ("RLE decode - data");
-@@ -1761,6 +1810,16 @@
-
- IFDBG(3) g_debug ("raw data size %d x %d = %d", readline_len,
- channel->rows, readline_len * channel->rows);
-+
-+ /* sanity check, int overflow check (avoid divisions by zero) */
-+ if ((channel->rows == 0) || (channel->columns == 0) ||
-+ (channel->rows > G_MAXINT32 / channel->columns / MAX (bps >> 3, 1)))
-+ {
-+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+ _("Unsupported or invalid channel size"));
-+ return -1;
-+ }
-+
- raw_data = g_malloc (readline_len * channel->rows);
- switch (compression)
- {
---- gimp-2.6.7/plug-ins/file-psd/psd.h.old 2009-11-18 12:11:42.845464000 +0800
-+++ gimp-2.6.7/plug-ins/file-psd/psd.h 2009-11-18 12:12:23.350290000 +0800
-@@ -447,10 +447,10 @@
- /* PSD Layer mask data (length 20) */
- typedef struct
- {
-- guint32 top; /* Layer top */
-- guint32 left; /* Layer left */
-- guint32 bottom; /* Layer bottom */
-- guint32 right; /* Layer right */
-+ gint32 top; /* Layer top */
-+ gint32 left; /* Layer left */
-+ gint32 bottom; /* Layer bottom */
-+ gint32 right; /* Layer right */
- guchar def_color; /* Default background colour */
- guchar flags; /* Layer flags */
- guchar extra_def_color; /* Real default background colour */
-@@ -461,20 +461,20 @@
- /* PSD Layer mask data (length 36) */
- typedef struct
- {
-- guint32 top; /* Layer top */
-- guint32 left; /* Layer left */
-- guint32 bottom; /* Layer bottom */
-- guint32 right; /* Layer right */
-+ gint32 top; /* Layer top */
-+ gint32 left; /* Layer left */
-+ gint32 bottom; /* Layer bottom */
-+ gint32 right; /* Layer right */
- } LayerMaskExtra;
-
- /* PSD Layer data structure */
- typedef struct
- {
- gboolean drop; /* Do not add layer to GIMP image */
-- guint32 top; /* Layer top */
-- guint32 left; /* Layer left */
-- guint32 bottom; /* Layer bottom */
-- guint32 right; /* Layer right */
-+ gint32 top; /* Layer top */
-+ gint32 left; /* Layer left */
-+ gint32 bottom; /* Layer bottom */
-+ gint32 right; /* Layer right */
- guint16 num_channels; /* Number of channels */
- ChannelLengthInfo *chn_info; /* Channel length info */
- gchar mode_key[4]; /* Blend mode key */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gimp-05-libpng12.diff Fri Sep 10 05:45:48 2010 +0000
@@ -0,0 +1,11 @@
+--- gimp-2.6.10/configure.in.orig 2010-08-27 16:23:21.600378577 +0800
++++ gimp-2.6.10/configure.in 2010-08-27 16:21:00.511876535 +0800
+@@ -1115,7 +1115,7 @@
+ have_libpng=no
+ if test "x$with_libpng" != xno; then
+ have_libpng=yes
+- PKG_CHECK_MODULES(PNG, libpng,
++ PKG_CHECK_MODULES(PNG, libpng12,
+ FILE_PNG='file-png$(EXEEXT)',
+ [have_libpng="no (libpng not found)"
+ AC_MSG_ERROR([
--- a/patches/gimp-05-py26.diff Fri Sep 10 02:44:17 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-diff -r 949ec3dc1c03 app/composite/make-installer.py
---- a/app/composite/make-installer.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/app/composite/make-installer.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # Gimp image compositing
- # Copyright (C) 2003 Helvetix Victorinox, <[email protected]>
-diff -r 949ec3dc1c03 app/composite/ns.py
---- a/app/composite/ns.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/app/composite/ns.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # Copyright (C) 2003 Helvetix Victorinox, a pseudonym, <[email protected]>
- #
- # This program is free software; you can redistribute it and/or modify
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/benchmark-foreground-extract.py
---- a/plug-ins/pygimp/plug-ins/benchmark-foreground-extract.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/benchmark-foreground-extract.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- # Foreground Extraction Benchmark
- # Copyright 2005 Sven Neumann <[email protected]>
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/clothify.py
---- a/plug-ins/pygimp/plug-ins/clothify.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/clothify.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- # Gimp-Python - allows the writing of Gimp plugins in Python.
- # Copyright (C) 1997 James Henstridge <[email protected]>
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/colorxhtml.py
---- a/plug-ins/pygimp/plug-ins/colorxhtml.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/colorxhtml.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- # Gimp-Python - allows the writing of Gimp plugins in Python.
- # Copyright (C) 2003, 2005 Manish Singh <[email protected]>
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/foggify.py
---- a/plug-ins/pygimp/plug-ins/foggify.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/foggify.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- # Gimp-Python - allows the writing of Gimp plugins in Python.
- # Copyright (C) 1997 James Henstridge <[email protected]>
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/palette-offset.py
---- a/plug-ins/pygimp/plug-ins/palette-offset.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/palette-offset.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- coding: utf-8 -*-
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/palette-sort.py
---- a/plug-ins/pygimp/plug-ins/palette-sort.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/palette-sort.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/palette-to-gradient.py
---- a/plug-ins/pygimp/plug-ins/palette-to-gradient.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/palette-to-gradient.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/py-slice.py
---- a/plug-ins/pygimp/plug-ins/py-slice.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/py-slice.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- coding: utf-8 -*-
-
- #Copyright (c) Manish Singh
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/python-console.py
---- a/plug-ins/pygimp/plug-ins/python-console.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/python-console.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- # Gimp-Python - allows the writing of Gimp plugins in Python.
- # Copyright (C) 1997 James Henstridge <[email protected]>
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/python-eval.py
---- a/plug-ins/pygimp/plug-ins/python-eval.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/python-eval.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- # Gimp-Python - allows the writing of Gimp plugins in Python.
- # Copyright (C) 2006 Manish Singh <[email protected]>
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/shadow_bevel.py
---- a/plug-ins/pygimp/plug-ins/shadow_bevel.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/shadow_bevel.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- # Gimp-Python - allows the writing of Gimp plugins in Python.
- # Copyright (C) 1997 James Henstridge <[email protected]>
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/sphere.py
---- a/plug-ins/pygimp/plug-ins/sphere.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/sphere.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- # Gimp-Python - allows the writing of Gimp plugins in Python.
- # Copyright (C) 1997 James Henstridge <[email protected]>
-diff -r 949ec3dc1c03 plug-ins/pygimp/plug-ins/whirlpinch.py
---- a/plug-ins/pygimp/plug-ins/whirlpinch.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/plug-ins/pygimp/plug-ins/whirlpinch.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- # Gimp-Python - allows the writing of Gimp plugins in Python.
- # Copyright (C) 1997 James Henstridge <[email protected]>
-diff -r 949ec3dc1c03 tools/defcheck.py
---- a/tools/defcheck.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/tools/defcheck.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- """
- defcheck.py -- Consistency check for the .def files.
-diff -r 949ec3dc1c03 tools/gimppath2svg.py
---- a/tools/gimppath2svg.py Mon Feb 08 13:22:19 2010 +0800
-+++ b/tools/gimppath2svg.py Mon Feb 08 13:30:41 2010 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
-
- import sys,re
-
--- a/patches/gimp-06-fixxref-modules.diff Fri Sep 10 02:44:17 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
---- gimp-2.6.7.orig/devel-docs/libgimpcolor/Makefile.am 2010-02-02 23:14:26.461012598 +0000
-+++ gimp-2.6.7/devel-docs/libgimpcolor/Makefile.am 2010-02-02 23:21:59.780445729 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS = --sgml-mode --output-format=xml
-
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS =
-+FIXXREF_OPTIONS = --module=$(DOC_MODULE)
-
- # Used for dependencies
- HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
---- gimp-2.6.7.orig/devel-docs/libgimpconfig/Makefile.am 2010-02-02 23:14:26.466912830 +0000
-+++ gimp-2.6.7/devel-docs/libgimpconfig/Makefile.am 2010-02-02 23:24:39.683453712 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS = --sgml-mode --output-format=xml
-
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpmath/html
-+FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpmath/html --module=$(DOC_MODULE)
-
- # Used for dependencies
- HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
---- gimp-2.6.7.orig/devel-docs/libgimpmath/Makefile.am 2010-02-02 23:14:26.477266439 +0000
-+++ gimp-2.6.7/devel-docs/libgimpmath/Makefile.am 2010-02-02 23:26:08.651249656 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS = --sgml-mode --output-format=xml
-
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS =
-+FIXXREF_OPTIONS = --module=$(DOC_MODULE)
-
- # Used for dependencies
- HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
---- gimp-2.6.7.orig/devel-docs/libgimpmodule/Makefile.am 2010-02-02 23:14:26.583459855 +0000
-+++ gimp-2.6.7/devel-docs/libgimpmodule/Makefile.am 2010-02-02 23:28:35.139822019 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS = --sgml-mode --output-format=xml
-
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS =
-+FIXXREF_OPTIONS = --module=$(DOC_MODULE)
-
- # Used for dependencies
- HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
---- gimp-2.6.7.orig/devel-docs/libgimpthumb/Makefile.am 2010-02-02 23:14:26.485150690 +0000
-+++ gimp-2.6.7/devel-docs/libgimpthumb/Makefile.am 2010-02-02 23:30:11.674878664 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS = --sgml-mode --output-format=xml
-
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS = --extra-dir=../libgimpmath/html
-+FIXXREF_OPTIONS = --extra-dir=../libgimpmath/html --module=$(DOC_MODULE)
-
- # Used for dependencies
- HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
---- gimp-2.6.7.orig/devel-docs/libgimp/Makefile.am 2010-02-02 23:14:26.419121473 +0000
-+++ gimp-2.6.7/devel-docs/libgimp/Makefile.am 2010-02-03 00:01:27.831794111 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS = --sgml-mode --output-format=xml
-
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimpwidgets/html
-+FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimpwidgets/html --module=$(DOC_MODULE)
-
- # Used for dependencies
- HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
---- gimp-2.6.7.orig/devel-docs/libgimpwidgets/Makefile.am 2010-02-02 23:14:26.507928484 +0000
-+++ gimp-2.6.7/devel-docs/libgimpwidgets/Makefile.am 2010-02-02 23:58:24.512228368 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS = --sgml-mode --output-format=xml
-
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimp/html
-+FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimp/html --module=$(DOC_MODULE)
-
- # Used for dependencies
- HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
-diff -ruN gimp-2.6.7.orig/devel-docs/libgimpbase/Makefile.am gimp-2.6.7/devel-docs/libgimpbase/Makefile.am
---- gimp-2.6.7.orig/devel-docs/libgimpbase/Makefile.am 2010-02-03 00:58:49.609993900 +0000
-+++ gimp-2.6.7/devel-docs/libgimpbase/Makefile.am 2010-02-03 00:59:28.149825100 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS = --sgml-mode --output-format=xml
-
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS =
-+FIXXREF_OPTIONS = --module=$(DOC_MODULE)
-
- # Used for dependencies
- HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
--- a/patches/gimp-07-libpng14.diff Fri Sep 10 02:44:17 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- gimp-2.6.7/plug-ins/file-ico/ico-load.c.ori 2010-08-04 02:40:56.260825207 +0100
-+++ gimp-2.6.7/plug-ins/file-ico/ico-load.c 2010-08-04 02:41:49.198735659 +0100
-@@ -287,14 +287,14 @@
- switch (color_type)
- {
- case PNG_COLOR_TYPE_GRAY:
-- png_set_gray_1_2_4_to_8 (png_ptr);
-+ png_set_expand_gray_1_2_4_to_8 (png_ptr);
- if ( bit_depth == 16 )
- png_set_strip_16 (png_ptr);
- png_set_gray_to_rgb (png_ptr);
- png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
- break;
- case PNG_COLOR_TYPE_GRAY_ALPHA:
-- png_set_gray_1_2_4_to_8 (png_ptr);
-+ png_set_expand_gray_1_2_4_to_8 (png_ptr);
- if ( bit_depth == 16 )
- png_set_strip_16 (png_ptr);
- png_set_gray_to_rgb (png_ptr);