version 2.8.6
This commit is contained in:
Nils Philippsen
parent
750dc666f1
commit
798a22c52d
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,3 +13,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2
|
|||||||
/gimp-2.8.2.tar.bz2
|
/gimp-2.8.2.tar.bz2
|
||||||
/gimp-2.8.4.tar.bz2
|
/gimp-2.8.4.tar.bz2
|
||||||
/gimp-2.8.4-5-autofoo.patch.bz2
|
/gimp-2.8.4-5-autofoo.patch.bz2
|
||||||
|
/gimp-2.8.6.tar.bz2
|
||||||
|
|||||||
@ -1,46 +0,0 @@
|
|||||||
From 230cdd4e3890b44ca6dd8147609016b15c91eb9a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Wed, 29 May 2013 15:35:12 +0200
|
|
||||||
Subject: [PATCH] patch: color-profile-crash
|
|
||||||
|
|
||||||
Squashed commit of the following:
|
|
||||||
|
|
||||||
commit 3328d54954cfcdc403cdfe167f969a5edb248bc1
|
|
||||||
Author: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Mon Mar 18 13:37:17 2013 +0100
|
|
||||||
|
|
||||||
app: set error in case of error in ICC profile plug-in
|
|
||||||
|
|
||||||
The function plug_in_icc_profile_apply_rgb() didn't set the error object
|
|
||||||
when bailing out due to being called on a grayscale image, this could
|
|
||||||
lead to crashes in callers which just checked the return value, but not
|
|
||||||
whether or not an error had been set.
|
|
||||||
(cherry picked from commit 096c636b67abd7967da645699948c2bd3f8273fb)
|
|
||||||
|
|
||||||
Conflicts:
|
|
||||||
app/plug-in/plug-in-icc-profile.c
|
|
||||||
---
|
|
||||||
app/plug-in/plug-in-icc-profile.c | 7 ++++++-
|
|
||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/app/plug-in/plug-in-icc-profile.c b/app/plug-in/plug-in-icc-profile.c
|
|
||||||
index 268b5b8..cc5ec79 100644
|
|
||||||
--- a/app/plug-in/plug-in-icc-profile.c
|
|
||||||
+++ b/app/plug-in/plug-in-icc-profile.c
|
|
||||||
@@ -69,7 +69,12 @@ plug_in_icc_profile_apply_rgb (GimpImage *image,
|
|
||||||
gimp = image->gimp;
|
|
||||||
|
|
||||||
if (gimp_image_base_type (image) == GIMP_GRAY)
|
|
||||||
- return FALSE;
|
|
||||||
+ {
|
|
||||||
+ g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_EXECUTION_FAILED,
|
|
||||||
+ _("Can't apply color profile to grayscale image (%s)"),
|
|
||||||
+ ICC_PROFILE_APPLY_RGB_PROC);
|
|
||||||
+ return FALSE;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
procedure = gimp_pdb_lookup_procedure (gimp->pdb, ICC_PROFILE_APPLY_RGB_PROC);
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
From 684426ba6a623ee2473c852152dee013652ca49c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Wed, 6 Mar 2013 15:28:29 +0100
|
|
||||||
Subject: [PATCH] patch: mime-types
|
|
||||||
|
|
||||||
Squashed commit of the following:
|
|
||||||
|
|
||||||
commit 7b32db4ac0653fa375258287843b2dabe57dadfc
|
|
||||||
Author: Kevin Cozens <kcozens@svn.gnome.org>
|
|
||||||
Date: Sun Dec 30 10:43:50 2012 -0500
|
|
||||||
|
|
||||||
Fixed MIME_TYPES. Postscript and PDF are compiled conditionally. Fixes #690882.
|
|
||||||
(cherry picked from commit d17622dce6228bebd646ed1eb3063fc952905cfd)
|
|
||||||
---
|
|
||||||
configure.ac | 6 +++++-
|
|
||||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 2e66736..c32eff3 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -1024,7 +1024,7 @@ AC_SUBST(GIMP_COMMAND)
|
|
||||||
|
|
||||||
# The list of MIME types that are supported by plug-ins that are compiled
|
|
||||||
# unconditionally:
|
|
||||||
-MIME_TYPES="application/postscript;application/pdf;image/bmp;image/g3fax;image/gif;image/x-fits;image/x-pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/x-gimp-gbr;image/x-gimp-pat;image/x-gimp-gih"
|
|
||||||
+MIME_TYPES="image/bmp;image/g3fax;image/gif;image/x-fits;image/x-pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/x-gimp-gbr;image/x-gimp-pat;image/x-gimp-gih"
|
|
||||||
|
|
||||||
|
|
||||||
###################
|
|
||||||
@@ -1201,6 +1201,10 @@ if test "x$with_gs" != xno; then
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
+if test "x$have_gs" = xyes; then
|
|
||||||
+ MIME_TYPES="$MIME_TYPES;application/postscript"
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
AC_SUBST(FILE_PS)
|
|
||||||
AM_CONDITIONAL(HAVE_GS, test "x$have_gs" = xyes)
|
|
||||||
AC_SUBST(GS_LIBS)
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
From b86a9d6c44b876fcff0e92f63562e6285818abdb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Wed, 22 May 2013 17:41:22 +0200
|
|
||||||
Subject: [PATCH] patch: script-fu-gradient
|
|
||||||
|
|
||||||
Squashed commit of the following:
|
|
||||||
|
|
||||||
commit f98f40baa057315998ee9272b8bb50eb9a9aa9cd
|
|
||||||
Author: Michael Natterer <mitch@gimp.org>
|
|
||||||
Date: Thu Mar 21 01:50:32 2013 +0100
|
|
||||||
|
|
||||||
Bug 696240 - Changing Gradient From Script-Fu Drop Down Causes GIMP to Crash
|
|
||||||
|
|
||||||
gimp_gradient_select_run_callback(): Don't free the color values array
|
|
||||||
twice.
|
|
||||||
(cherry picked from commit ed2849cd5245a4f4f259a261e5d58a1e4fa637ba)
|
|
||||||
---
|
|
||||||
app/widgets/gimpgradientselect.c | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/app/widgets/gimpgradientselect.c b/app/widgets/gimpgradientselect.c
|
|
||||||
index 4dc9c23..edb9fea 100644
|
|
||||||
--- a/app/widgets/gimpgradientselect.c
|
|
||||||
+++ b/app/widgets/gimpgradientselect.c
|
|
||||||
@@ -187,7 +187,6 @@ gimp_gradient_select_run_callback (GimpPdbDialog *dialog,
|
|
||||||
G_TYPE_NONE);
|
|
||||||
|
|
||||||
gimp_array_free (array);
|
|
||||||
- g_free (values);
|
|
||||||
|
|
||||||
return return_vals;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
From bf1727f2eb3778c35d8a742f7d88866fd9a9cb55 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Wed, 6 Mar 2013 15:27:58 +0100
|
|
||||||
Subject: [PATCH] patch: strict-overflow-warning
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Squashed commit of the following:
|
|
||||||
|
|
||||||
commit f059fde47f4ae7d642d9a256b9b07297ad9aabd2
|
|
||||||
Author: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Wed Mar 6 12:16:43 2013 +0100
|
|
||||||
|
|
||||||
fix bogus overflow warning
|
|
||||||
|
|
||||||
tile-swap.c: In function ‘tile_swap_command’:
|
|
||||||
tile-swap.c:721:6: warning: assuming signed overflow does not occur when
|
|
||||||
assuming that (X + c) < X is always false [-Wstrict-overflow]
|
|
||||||
(cherry picked from commit bc610c8fbd61e9574a2c378829b6ab91047d61b7)
|
|
||||||
---
|
|
||||||
app/base/tile-swap.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/app/base/tile-swap.c b/app/base/tile-swap.c
|
|
||||||
index b65526e..ecc7dc1 100644
|
|
||||||
--- a/app/base/tile-swap.c
|
|
||||||
+++ b/app/base/tile-swap.c
|
|
||||||
@@ -110,7 +110,7 @@ static void tile_swap_gap_destroy (SwapFileGap *gap);
|
|
||||||
|
|
||||||
static SwapFile * gimp_swap_file = NULL;
|
|
||||||
|
|
||||||
-static const gint64 swap_file_grow = 1024 * TILE_WIDTH * TILE_HEIGHT * 4;
|
|
||||||
+static const guint64 swap_file_grow = 1024 * TILE_WIDTH * TILE_HEIGHT * 4;
|
|
||||||
|
|
||||||
static gboolean seek_err_msg = TRUE;
|
|
||||||
static gboolean read_err_msg = TRUE;
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
From e777d620374a5d3664064f535001ea5d57fcf639 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Sat, 20 Apr 2013 14:25:29 +0200
|
|
||||||
Subject: [PATCH] patch: tag-popup-crash
|
|
||||||
|
|
||||||
Squashed commit of the following:
|
|
||||||
|
|
||||||
commit fd4fc76e2114b8ab9341232912c2d19b6160ccd6
|
|
||||||
Author: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Tue Apr 16 11:16:41 2013 +0200
|
|
||||||
|
|
||||||
app: let the tag popup own its tag objects
|
|
||||||
|
|
||||||
This should fix crashes in which tag objects got accessed after they
|
|
||||||
were disposed, because they still were stored with the popup object.
|
|
||||||
(cherry picked from commit b109e0580650b4b49b6f00b15fec4bcd330fb045)
|
|
||||||
---
|
|
||||||
app/widgets/gimptagpopup.c | 9 +++++++++
|
|
||||||
1 file changed, 9 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c
|
|
||||||
index f822ab2..fd913c2 100644
|
|
||||||
--- a/app/widgets/gimptagpopup.c
|
|
||||||
+++ b/app/widgets/gimptagpopup.c
|
|
||||||
@@ -257,6 +257,8 @@ gimp_tag_popup_constructed (GObject *object)
|
|
||||||
tag_data->tag = tag_iterator->data;
|
|
||||||
tag_data->state = GTK_STATE_NORMAL;
|
|
||||||
|
|
||||||
+ g_object_ref (tag_data->tag);
|
|
||||||
+
|
|
||||||
for (j = 0; j < current_count; j++)
|
|
||||||
{
|
|
||||||
if (! gimp_tag_compare_with_string (tag_data->tag, current_tags[j]))
|
|
||||||
@@ -386,6 +388,13 @@ gimp_tag_popup_dispose (GObject *object)
|
|
||||||
|
|
||||||
if (popup->tag_data)
|
|
||||||
{
|
|
||||||
+ gint i;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < popup->tag_count; i++)
|
|
||||||
+ {
|
|
||||||
+ g_object_unref (popup->tag_data[i].tag);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
g_free (popup->tag_data);
|
|
||||||
popup->tag_data = NULL;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@ -1,125 +0,0 @@
|
|||||||
From 90f9b908951cf0793255215cbd703c847676f8eb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Mon, 27 May 2013 17:46:26 +0200
|
|
||||||
Subject: [PATCH] patch: text-selection-crash
|
|
||||||
|
|
||||||
Squashed commit of the following:
|
|
||||||
|
|
||||||
commit 44be26742ce317132687f78434e75e5b15f245cd
|
|
||||||
Author: Michael Natterer <mitch@gimp.org>
|
|
||||||
Date: Sun Apr 21 17:51:08 2013 +0200
|
|
||||||
|
|
||||||
Bug 694417 - GIMP Segmentation Faults (Segfault, Crash) after Changing Color...
|
|
||||||
|
|
||||||
Don't pass a NULL pointer to gimp_text_buffer_get_font_tag() because
|
|
||||||
it is dereferenced in a call to strcmp().
|
|
||||||
|
|
||||||
gimp_context_get_font_name() returns NULL when the selected text
|
|
||||||
includes spans with different fonts. Add the same special handling for
|
|
||||||
spans with inconsistent sizes too, and add comments that we should
|
|
||||||
have the same for the color.
|
|
||||||
|
|
||||||
Original patch from Massimo Valentini.
|
|
||||||
(cherry picked from commit 804313bbecf92e099952ef0b9e12824d57100ccd)
|
|
||||||
---
|
|
||||||
app/widgets/gimptextstyleeditor.c | 50 +++++++++++++++++++++++++--------------
|
|
||||||
1 file changed, 32 insertions(+), 18 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c
|
|
||||||
index 9fe6580..853fee3 100644
|
|
||||||
--- a/app/widgets/gimptextstyleeditor.c
|
|
||||||
+++ b/app/widgets/gimptextstyleeditor.c
|
|
||||||
@@ -562,26 +562,29 @@ gimp_text_style_editor_list_tags (GimpTextStyleEditor *editor,
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- GtkTextTag *tag;
|
|
||||||
- GList *list;
|
|
||||||
- gdouble pixels;
|
|
||||||
- gdouble points;
|
|
||||||
+ GList *list;
|
|
||||||
+ gdouble pixels;
|
|
||||||
|
|
||||||
for (list = editor->buffer->size_tags; list; list = g_list_next (list))
|
|
||||||
*remove_tags = g_list_prepend (*remove_tags, list->data);
|
|
||||||
|
|
||||||
pixels = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (editor->size_entry), 0);
|
|
||||||
- points = gimp_units_to_points (pixels,
|
|
||||||
- GIMP_UNIT_PIXEL,
|
|
||||||
- editor->resolution_y);
|
|
||||||
- tag = gimp_text_buffer_get_size_tag (editor->buffer,
|
|
||||||
- PANGO_SCALE * points);
|
|
||||||
|
|
||||||
- tags = g_list_prepend (tags, tag);
|
|
||||||
+ if (pixels != 0.0)
|
|
||||||
+ {
|
|
||||||
+ GtkTextTag *tag;
|
|
||||||
+ gdouble points;
|
|
||||||
+
|
|
||||||
+ points = gimp_units_to_points (pixels,
|
|
||||||
+ GIMP_UNIT_PIXEL,
|
|
||||||
+ editor->resolution_y);
|
|
||||||
+ tag = gimp_text_buffer_get_size_tag (editor->buffer,
|
|
||||||
+ PANGO_SCALE * points);
|
|
||||||
+ tags = g_list_prepend (tags, tag);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- GtkTextTag *tag;
|
|
||||||
GList *list;
|
|
||||||
const gchar *font_name;
|
|
||||||
|
|
||||||
@@ -589,24 +592,33 @@ gimp_text_style_editor_list_tags (GimpTextStyleEditor *editor,
|
|
||||||
*remove_tags = g_list_prepend (*remove_tags, list->data);
|
|
||||||
|
|
||||||
font_name = gimp_context_get_font_name (editor->context);
|
|
||||||
- tag = gimp_text_buffer_get_font_tag (editor->buffer, font_name);
|
|
||||||
|
|
||||||
- tags = g_list_prepend (tags, tag);
|
|
||||||
+ if (font_name)
|
|
||||||
+ {
|
|
||||||
+ GtkTextTag *tag;
|
|
||||||
+
|
|
||||||
+ tag = gimp_text_buffer_get_font_tag (editor->buffer, font_name);
|
|
||||||
+ tags = g_list_prepend (tags, tag);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
- GtkTextTag *tag;
|
|
||||||
- GList *list;
|
|
||||||
- GimpRGB color;
|
|
||||||
+ GList *list;
|
|
||||||
+ GimpRGB color;
|
|
||||||
|
|
||||||
for (list = editor->buffer->color_tags; list; list = g_list_next (list))
|
|
||||||
*remove_tags = g_list_prepend (*remove_tags, list->data);
|
|
||||||
|
|
||||||
gimp_color_button_get_color (GIMP_COLOR_BUTTON (editor->color_button),
|
|
||||||
&color);
|
|
||||||
- tag = gimp_text_buffer_get_color_tag (editor->buffer, &color);
|
|
||||||
|
|
||||||
- tags = g_list_prepend (tags, tag);
|
|
||||||
+ if (TRUE) /* FIXME should have "inconsistent" state as for font and size */
|
|
||||||
+ {
|
|
||||||
+ GtkTextTag *tag;
|
|
||||||
+
|
|
||||||
+ tag = gimp_text_buffer_get_color_tag (editor->buffer, &color);
|
|
||||||
+ tags = g_list_prepend (tags, tag);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
*remove_tags = g_list_reverse (*remove_tags);
|
|
||||||
@@ -767,6 +779,8 @@ gimp_text_style_editor_set_color (GimpTextStyleEditor *editor,
|
|
||||||
gimp_color_button_set_color (GIMP_COLOR_BUTTON (editor->color_button),
|
|
||||||
&color);
|
|
||||||
|
|
||||||
+ /* FIXME should have "inconsistent" state as for font and size */
|
|
||||||
+
|
|
||||||
g_signal_handlers_unblock_by_func (editor->color_button,
|
|
||||||
gimp_text_style_editor_color_changed,
|
|
||||||
editor);
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
From 3ea3dc0347ecf0fd2df4b1ca25666e2a78da150c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nils Philippsen <nils@redhat.com>
|
|
||||||
Date: Mon, 27 May 2013 14:33:28 +0200
|
|
||||||
Subject: [PATCH] patch: unsharp-mask-crash
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Squashed commit of the following:
|
|
||||||
|
|
||||||
commit a8748094ec325bfeb856c603ece8c2026f0968ea
|
|
||||||
Author: Téo Mazars <teo.mazars@ensimag.fr>
|
|
||||||
Date: Sun Apr 7 22:29:56 2013 +0200
|
|
||||||
|
|
||||||
Bug 695418 - Unsharp mask crashes for large radii
|
|
||||||
|
|
||||||
Make sure we are working on the image range
|
|
||||||
(cherry picked from commit 35cc644765c553b6feb24bd56133b6f9f74ed5e4)
|
|
||||||
---
|
|
||||||
plug-ins/common/unsharp-mask.c | 9 ++++++++-
|
|
||||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/plug-ins/common/unsharp-mask.c b/plug-ins/common/unsharp-mask.c
|
|
||||||
index e6e3ad8..998c96e 100644
|
|
||||||
--- a/plug-ins/common/unsharp-mask.c
|
|
||||||
+++ b/plug-ins/common/unsharp-mask.c
|
|
||||||
@@ -369,7 +369,7 @@ box_blur_line (const gint box_width, /* Width of the kernel */
|
|
||||||
/* If the leading edge has gone off the image, but the output and
|
|
||||||
* trailing edge are on the image. (The big loop exits when the
|
|
||||||
* output goes off the image. */
|
|
||||||
- else
|
|
||||||
+ else if (trail >= 0)
|
|
||||||
{
|
|
||||||
for (i = 0; i < bpp; i++)
|
|
||||||
{
|
|
||||||
@@ -377,6 +377,13 @@ box_blur_line (const gint box_width, /* Width of the kernel */
|
|
||||||
dest[bpp * output + i] = (ac[i] + (coverage >> 1)) / coverage;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ /* Leading has gone off the image and trailing isn't yet in it
|
|
||||||
+ * (small image) */
|
|
||||||
+ else if (output >= 0)
|
|
||||||
+ {
|
|
||||||
+ for (i = 0; i < bpp; i++)
|
|
||||||
+ dest[bpp * output + i] = (ac[i] + (coverage >> 1)) / coverage;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
lead++;
|
|
||||||
output++;
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
41
gimp.spec
41
gimp.spec
@ -81,8 +81,8 @@
|
|||||||
Summary: GNU Image Manipulation Program
|
Summary: GNU Image Manipulation Program
|
||||||
Name: gimp
|
Name: gimp
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Version: 2.8.4
|
Version: 2.8.6
|
||||||
Release: %{?prerelprefix}5%{dotprerel}%{dotgitrev}%{?dist}
|
Release: %{?prerelprefix}1%{dotprerel}%{dotgitrev}%{?dist}
|
||||||
|
|
||||||
# Compute some version related macros
|
# Compute some version related macros
|
||||||
# Ugly hack, you need to get your quoting backslashes/percent signs straight
|
# Ugly hack, you need to get your quoting backslashes/percent signs straight
|
||||||
@ -205,29 +205,6 @@ Patch0: gimp-%{version}%{dashprerel}-git%{gitrev}.patch.bz2
|
|||||||
# Try using the system monitor profile for color management by default.
|
# Try using the system monitor profile for color management by default.
|
||||||
# Fedora specific.
|
# Fedora specific.
|
||||||
Patch1: gimp-2.8.2-cm-system-monitor-profile-by-default.patch
|
Patch1: gimp-2.8.2-cm-system-monitor-profile-by-default.patch
|
||||||
# Don't trip strict overflow warning.
|
|
||||||
# Upstream commit bc610c8fbd61e9574a2c378829b6ab91047d61b7
|
|
||||||
Patch2: gimp-2.8.4-strict-overflow-warning.patch
|
|
||||||
# Don't have duplicate mime types in desktop file.
|
|
||||||
# Upstream commit 0ed3b482a422ff684c8921b7de9f44ea7b20345c
|
|
||||||
Patch3: gimp-2.8.4-mime-types.patch
|
|
||||||
# Fix crashes when deleting tags in popups.
|
|
||||||
# Upstream commit 37757e4e8dff76715a99394380c8809c5c3f0970
|
|
||||||
Patch4: gimp-2.8.4-tag-popup-crash.patch
|
|
||||||
# Fix double-free crashes when selecting gradients from script-fu.
|
|
||||||
# Upstream commit 15c5a9db32d49b22260ffde0202f39284b99d936
|
|
||||||
Patch5: gimp-2.8.4-script-fu-gradient.patch
|
|
||||||
# Fix crashes in unsharp-mask plug-in.
|
|
||||||
# Upstream commit 38d8312fdebee98a20b33807b09d8a832a4b97b7
|
|
||||||
Patch6: gimp-2.8.4-unsharp-mask-crash.patch
|
|
||||||
# Fix crashes when selecting text with multiple colors etc.
|
|
||||||
# Upstream commit 44be26742ce317132687f78434e75e5b15f245cd
|
|
||||||
Patch7: gimp-2.8.4-text-selection-crash.patch
|
|
||||||
# Don't crash upon not applying a color profile to a grayscale image.
|
|
||||||
# Upstream commit 15b88af4f11e556a1c30cd5bc447bb0c7c24d3c6
|
|
||||||
Patch8: gimp-2.8.4-color-profile-crash.patch
|
|
||||||
# Rebuilt files after changing configure.ac above.
|
|
||||||
Patch100: gimp-2.8.4-5-autofoo.patch.bz2
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
GIMP (GNU Image Manipulation Program) is a powerful image composition and
|
GIMP (GNU Image Manipulation Program) is a powerful image composition and
|
||||||
@ -315,17 +292,6 @@ EOF
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch1 -p1 -b .cm-system-monitor-profile-by-default
|
%patch1 -p1 -b .cm-system-monitor-profile-by-default
|
||||||
%patch2 -p1 -b .strict-overflow-warning
|
|
||||||
%patch3 -p1 -b .mime-types
|
|
||||||
%patch4 -p1 -b .tag-popup-crash
|
|
||||||
%patch5 -p1 -b .script-fu-gradient
|
|
||||||
%patch6 -p1 -b .unsharp-mask-crash
|
|
||||||
%patch7 -p1 -b .text-selection-crash
|
|
||||||
%patch8 -p1 -b .color-profile-crash
|
|
||||||
|
|
||||||
%patch100 -p1 -b .autofoo
|
|
||||||
# avoid running autoheader
|
|
||||||
touch config.h.in
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{with hardening}
|
%if %{with hardening}
|
||||||
@ -630,6 +596,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jun 23 2013 Nils Philippsen <nils@redhat.com> - 2:2.8.6-1
|
||||||
|
- version 2.8.6
|
||||||
|
|
||||||
* Tue Jun 04 2013 Nils Philippsen <nils@redhat.com> - 2:2.8.4-5
|
* Tue Jun 04 2013 Nils Philippsen <nils@redhat.com> - 2:2.8.4-5
|
||||||
- patch rebuilt files after changing configure.ac
|
- patch rebuilt files after changing configure.ac
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user