Attachment #148562 for bug #194532

View | Details | Raw Unified | Return to bug 194532
Collapse All | Expand All

Lines 4-10 Link Here

(-)Makefile (-1 / +7 lines)
4		4
5	PORTNAME?= gimp-app	5	PORTNAME?= gimp-app
6	PORTVERSION= 2.8.10	6	PORTVERSION= 2.8.10
7	PORTREVISION?= 6	7	PORTREVISION?= 7
8	PORTEPOCH?= 1	8	PORTEPOCH?= 1
9	CATEGORIES?= graphics gnome	9	CATEGORIES?= graphics gnome
10	MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \	10	MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
Lines 195-199 Link Here
195	@${REINPLACE_CMD} -e 's\|"libpng"\|"libpng15"\|' \	195	@${REINPLACE_CMD} -e 's\|"libpng"\|"libpng15"\|' \
196	-e 's\|x86_64\|amd64\|g' \	196	-e 's\|x86_64\|amd64\|g' \
197	${WRKSRC}/configure	197	${WRKSRC}/configure
		198	# remove the following lines as well as the used patch file when updating gimp to > 2.8.10
		199	# See FreeBSD Bug 194532
		200	# (patch from https://lists.macosforge.org/pipermail/macports-changes/2013-December/098857.html)
		201	.if ${PORTVERSION} == 2.8.10
		202	@cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/2_8_10_patch-brush-outline-not-displayed-bz719593.diff
		203	.endif
198		204
199	.include <bsd.port.mk>	205	.include <bsd.port.mk>




--- app/core/gimpbezierdesc.c.orig
+++ app/core/gimpbezierdesc.c
@@ -111,6 +111,7 @@ gimp_bezier_desc_new_from_bound_segs (BoundSeg *bound_segs,
   gint         n_points;
   gint         seg;
   gint         i;
+  guint        path_data_len;
 
   g_return_val_if_fail (bound_segs != NULL, NULL);
   g_return_val_if_fail (n_bound_segs > 0, NULL);
@@ -159,8 +160,10 @@ gimp_bezier_desc_new_from_bound_segs (BoundSeg *bound_segs,
 
   g_free (points);
 
+  path_data_len = path_data->len;
+
   return gimp_bezier_desc_new ((cairo_path_data_t *) g_array_free (path_data, FALSE),
-                               path_data->len);
+                               path_data_len);
 }
 
 void

Return to bug 194532

Added Link Here

(-)files/2_8_10_patch-brush-outline-not-displayed-bz719593.diff (+22 lines)
1	--- app/core/gimpbezierdesc.c.orig
2	+++ app/core/gimpbezierdesc.c
3	@@ -111,6 +111,7 @@ gimp_bezier_desc_new_from_bound_segs (BoundSeg *bound_segs,
4	gint n_points;
5	gint seg;
6	gint i;
7	+ guint path_data_len;
8
9	g_return_val_if_fail (bound_segs != NULL, NULL);
10	g_return_val_if_fail (n_bound_segs > 0, NULL);
11	@@ -159,8 +160,10 @@ gimp_bezier_desc_new_from_bound_segs (BoundSeg *bound_segs,
12
13	g_free (points);
14
15	+ path_data_len = path_data->len;
16	+
17	return gimp_bezier_desc_new ((cairo_path_data_t *) g_array_free (path_data, FALSE),
18	- path_data->len);
19	+ path_data_len);
20	}
21
22	void