Fix segfault in draw_background(GtkThemingEngine *engine, ...)

ok aja@
This commit is contained in:
dcoppa 2012-06-08 14:58:05 +00:00
parent 3294a50c3d
commit 6911497a97
4 changed files with 98 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2012/04/01 09:16:49 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2012/06/08 14:58:05 dcoppa Exp $
SHARED_ONLY= Yes
@ -7,6 +7,7 @@ COMMENT= Unico GTK+3 engine
V= 1.0.2
DISTNAME= unico-${V}
PKGNAME= gtk3-unico-engine-${V}
REVISION= 0
CATEGORIES= x11

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-unico_gtkroundedbox_c,v 1.1 2012/06/08 14:58:05 dcoppa Exp $
Fix segfault in draw_background(GtkThemingEngine *engine, ...)
--- unico/gtkroundedbox.c.orig Thu Mar 29 16:26:20 2012
+++ unico/gtkroundedbox.c Fri Jun 8 16:41:41 2012
@@ -85,10 +85,10 @@ gtk_rounded_box_clamp_border_radius (GtkRoundedBox *bo
}
void
-_gtk_rounded_box_apply_border_radius (GtkRoundedBox *box,
- GtkThemingEngine *engine,
- GtkStateFlags state,
- GtkJunctionSides junction)
+_gtk_rounded_box_apply_border_radius_for_engine (GtkRoundedBox *box,
+ GtkThemingEngine *engine,
+ GtkStateFlags state,
+ GtkJunctionSides junction)
{
GtkCssBorderCornerRadius *corner[4];
guint i;

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-unico_gtkroundedboxprivate_h,v 1.1 2012/06/08 14:58:05 dcoppa Exp $
Fix segfault in draw_background(GtkThemingEngine *engine, ...)
--- unico/gtkroundedboxprivate.h.orig Thu Mar 29 16:26:20 2012
+++ unico/gtkroundedboxprivate.h Fri Jun 8 15:23:18 2012
@@ -49,7 +49,7 @@ void _gtk_rounded_box_init_rect
gdouble width,
gdouble height);
-void _gtk_rounded_box_apply_border_radius (GtkRoundedBox *box,
+void _gtk_rounded_box_apply_border_radius_for_engine (GtkRoundedBox *box,
GtkThemingEngine *engine,
GtkStateFlags state,
GtkJunctionSides junction);

View File

@ -0,0 +1,60 @@
$OpenBSD: patch-unico_unico-cairo-support_c,v 1.1 2012/06/08 14:58:05 dcoppa Exp $
Fix segfault in draw_background(GtkThemingEngine *engine, ...)
--- unico/unico-cairo-support.c.orig Fri Jun 8 15:19:53 2012
+++ unico/unico-cairo-support.c Fri Jun 8 15:20:50 2012
@@ -298,7 +298,7 @@ draw_background (GtkThemingEngine *engine,
/* create the path to fill */
_gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
- _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
+ _gtk_rounded_box_apply_border_radius_for_engine (&border_box, engine, state, junction);
_gtk_rounded_box_shrink (&border_box, border.top, border.right, border.bottom, border.left);
_gtk_rounded_box_path (&border_box, cr);
@@ -361,7 +361,7 @@ draw_glow (GtkThemingEngine *engine,
/* create the path to clip */
_gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
- _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
+ _gtk_rounded_box_apply_border_radius_for_engine (&border_box, engine, state, junction);
_gtk_rounded_box_shrink (&border_box, border.top, border.right, border.bottom, border.left);
_gtk_rounded_box_path (&border_box, cr);
@@ -451,7 +451,7 @@ draw_texture (GtkThemingEngine *engine,
/* create the path to fill */
_gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
- _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
+ _gtk_rounded_box_apply_border_radius_for_engine (&border_box, engine, state, junction);
_gtk_rounded_box_shrink (&border_box, border.top, border.right, border.bottom, border.left);
_gtk_rounded_box_path (&border_box, cr);
@@ -788,7 +788,7 @@ draw_border (GtkThemingEngine *engine,
/* create the path to fill */
_gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
- _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
+ _gtk_rounded_box_apply_border_radius_for_engine (&border_box, engine, state, junction);
padding_box = border_box;
_gtk_rounded_box_shrink (&padding_box, border.top, border.right, border.bottom, border.left);
@@ -922,7 +922,7 @@ draw_inner_stroke (GtkThemingEngine *engine,
/* create the path to fill */
_gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
- _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
+ _gtk_rounded_box_apply_border_radius_for_engine (&border_box, engine, state, junction);
padding_box = border_box;
_gtk_rounded_box_shrink (&padding_box, inner_border->top,
inner_border->right,
@@ -1052,7 +1052,7 @@ draw_outer_stroke (GtkThemingEngine *engine,
/* create the path to fill */
_gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
- _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
+ _gtk_rounded_box_apply_border_radius_for_engine (&border_box, engine, state, junction);
padding_box = border_box;
_gtk_rounded_box_shrink (&padding_box, outer_border->top,
outer_border->right,