summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2006-08-06 19:03:57 +0000
committerjmmv <jmmv@pkgsrc.org>2006-08-06 19:03:57 +0000
commitaa9fcf73342eb9d22fc9323698a7191e28534cc7 (patch)
tree6c57255f35a99c04815d54a7d47d33dc4bb34931
parent02ccabc89ff81c28874bcce4fe9b54153cf4a80e (diff)
downloadpkgsrc-aa9fcf73342eb9d22fc9323698a7191e28534cc7.tar.gz
Update to 2.6.10:
Overview of Changes in 2.6.10 (since 2.6.9) =========================================== * Bug #342199 fixed by adding locking to clearlooks animation code. * Fixes for notebook dnd releated crash bugs in both industrial and crux. * Slightly improved box_gap drawing in crux and industrial. Overview of Changes in 2.6.9 (since 2.6.8) ========================================== * Fixed bugs: Bug 341694 - Crash in d4x (Industrial) Bug 334557 - Compile errors with gcc 2.95 (Clearlooks)
-rw-r--r--x11/gtk2-engines/Makefile5
-rw-r--r--x11/gtk2-engines/distinfo9
-rw-r--r--x11/gtk2-engines/patches/patch-aa35
3 files changed, 6 insertions, 43 deletions
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 3ea1c9b0bd8..a948bd6f88b 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2006/04/17 13:46:09 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2006/08/06 19:03:57 jmmv Exp $
-DISTNAME= gtk-engines-2.6.8
+DISTNAME= gtk-engines-2.6.10
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-engines/2.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtk2-engines/distinfo b/x11/gtk2-engines/distinfo
index 9f3b275eea0..8e4d4576e1b 100644
--- a/x11/gtk2-engines/distinfo
+++ b/x11/gtk2-engines/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2006/04/04 13:41:47 jmmv Exp $
+$NetBSD: distinfo,v 1.16 2006/08/06 19:03:57 jmmv Exp $
-SHA1 (gtk-engines-2.6.8.tar.bz2) = 310f062341262a5dc05a138db29fcb00d360dd84
-RMD160 (gtk-engines-2.6.8.tar.bz2) = 8e2b939eb88cd6aaafd357317124f4c0193dcbbe
-Size (gtk-engines-2.6.8.tar.bz2) = 463097 bytes
-SHA1 (patch-aa) = ded272fe80c98d656eb9c23897e8f4bd4ffd4cfa
+SHA1 (gtk-engines-2.6.10.tar.bz2) = 5c3f88893c1d1d7665709271dbac37f1f7e30758
+RMD160 (gtk-engines-2.6.10.tar.bz2) = dc9b415471109f7c645888edd810ff10abf6add7
+Size (gtk-engines-2.6.10.tar.bz2) = 472374 bytes
diff --git a/x11/gtk2-engines/patches/patch-aa b/x11/gtk2-engines/patches/patch-aa
deleted file mode 100644
index 5c7a611cae7..00000000000
--- a/x11/gtk2-engines/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2006/04/04 13:41:47 jmmv Exp $
-
---- engines/clearlooks/src/clearlooks_style.c.orig 2006-03-11 13:14:40.000000000 +0100
-+++ engines/clearlooks/src/clearlooks_style.c
-@@ -974,23 +974,23 @@ draw_box (DRAW_ARGS)
- else if (DETAIL ("trough") &&
- (GTK_IS_VSCALE (widget) || GTK_IS_HSCALE (widget)))
- {
-- gint slider_length;
-+ gint fill_size, slider_length;
- GdkGC *inner = clearlooks_style->shade_gc[3],
- *outer = clearlooks_style->shade_gc[5],
- *shadow = clearlooks_style->shade_gc[4];
- GdkColor upper_color = *clearlooks_get_spot_color (CLEARLOOKS_RC_STYLE (style->rc_style)),
- lower_color;
-
-- gtk_widget_style_get (widget, "slider-length", &slider_length, NULL);
--
- GtkAdjustment *adjustment = gtk_range_get_adjustment (GTK_RANGE (widget));
-
- GtkOrientation orientation = GTK_RANGE (widget)->orientation;
-
-- gint fill_size = ((orientation ? height : width) - slider_length) *
-- (1 / ((adjustment->upper - adjustment->lower) /
-- (adjustment->value - adjustment->lower)))
-- + slider_length / 2;
-+ gtk_widget_style_get (widget, "slider-length", &slider_length, NULL);
-+
-+ fill_size = ((orientation ? height : width) - slider_length) *
-+ (1 / ((adjustment->upper - adjustment->lower) /
-+ (adjustment->value - adjustment->lower)))
-+ + slider_length / 2;
-
- if (orientation == GTK_ORIENTATION_HORIZONTAL)
- {