Update gtk2-engines-murrine to 0.98.2.

Overview of Changes in 0.98.2 (since 0.98.1)
============================================
Changes in this release:
- Changed option: reliefstyle = 5 for a more controllable inset.

Bugfixes in this release:
- Glib 2.31 compatibility: https://bugzilla.gnome.org/show_bug.cgi?id=665022
- Compiles using pixman: https://bugzilla.gnome.org/show_bug.cgi?id=630869

Overview of Changes in 0.98.1 (since 0.98.0)
============================================
Changes in this release:
- Murrine is now dual-licensed LGPLv2.1 and LGPLv3.

Bugfixes in this release:
- Now checks for pixman: https://bugzilla.gnome.org/show_bug.cgi?id=630869

Overview of Changes in 0.98.0 (since 0.90.3)
============================================
Changes in this release:
- New supported widget: GtkExpander is now themed by the engine.
- New supported widget: GtkIconView is now themed by the engine.
- New supported widget: GtkInfoBar is now themed by the engine.
- New option: arrowstyle = 1 to draw filled arrows.
              arrowstyle = 2 to draw fat filled arrows.
- New option: border_shades = { 1.0, 1.0 } to draw a gradient on the border.
- New option: border_colors = { "#ffffff", "#ffffff" }
              to set the colors used on the border of many widgets.
              border_colors = FALSE to disable.
- New option: cellstyle = 0 to remove the border around the selected cell.
              cellstyle = 1 for the border around the selected cell (as before).
- New option: comboboxstyle = 1 to colorize the GtkComboBox below the arrow.
- New option: default_button_color = "#ffffff" to specify a 2px border for the
              default button.
- New option: disable_focus = TRUE
- New option: expanderstyle = 0 to draw arrows.
              expanderstyle = 1 to draw circles with plus and minus.
              expanderstyle = 2 to draw buttons with plus and minus.
- New option: focusstyle = 0 to disable focus drawing.
              focusstyle = 1 to use dots.
              focusstyle = 2 to use a small colored rectangle.
              focusstyle = 3 to use a colored rectangle that touches the borders.
- New option: gradient_colors = { "#ffffff", "#ffffff", "#ffffff", "#ffffff" }
              to set the colors used on the gradient of many widgets.
              gradient_colors = FALSE to disable.
- New option: handlestyle = 0 for three simple lines.
              handlestyle = 1 for three simple lines with inset.
              handlestyle = 2 for three near simple lines with inset.
- New option: prelight_shade = 1.0 to select the shade level used in the
              scrollbar's slider, GtkComboBox with comboboxstyle = 1 and
              in the prelight state with gradient_colors.
- New option: separatorstyle = 1 to draw smooth separators.
- New option: shadow_shades = { 1.0, 1.0 } to draw a gradient on
              the shadow of some widgets.
- New option: spinbuttonstyle = 1 to add a separator on the GtkSpinButton.
- New option: textstyle = 1 for a shadow at the bottom of the text.
              textstyle = 2 for a shadow at the top of the text.
              textstyle = 3 for a shadow at the bottom right of the text.
              textstyle = 4 for a shadow at the top left of the text.
- New option: text_shade = 1.0 to specify the shade effect of the text's shadow.
- New option: trough_border_shades = { 1.0, 1.0 } to draw a gradient on
              the border of the trough of GtkScrollbar and GtkProgressBar.
- New option: trough_shades = { 1.0, 1.0 } to draw a gradient on
              the trough of GtkScrollbar and GtkProgressBar.
- Changed option: glowstyle = 5 for a glow around the edges.
- Changed option: listviewstyle = 2 for a solid line.
- Changed option: menustyle = 2 for a bright glow inside the menu.
                  menustyle = 3 for a dark glow inside the menu.
- Changed option: reliefstyle = 3 for a gradient on shadow.
                  reliefstyle = 4 for a stronger shadow.
- Changed option: stepperstyle = 2 for squared steppers with a rounded slider.
- Deprecated option: gradients, please unset the other options instead.
- Deprecated option: profile, please manually adjust the other options.
- Deprecated option: scrollbar_color, please use a custom bg[SELECTED].
- Improved rendering: rounded GtkScale trough.
- Improved rendering: disabled GtkScale trough.
- Improved rendering: contrast function in GtkButton.
- Improved rendering: draw lightborder with on menubar (with menubarstyle = 1).
- Improved rendering: draw lightborder with on toolbar (with toolbarstyle = 1).
- Improved rendering: better GtkTooltip theming.
- Improved rendering: use bg[GTK_STATE_PRELIGHT] on the scrollbar's slider
                      with colorize_scrollbar = FALSE.

Bugfixes in this release:
- Fix a potential endless loop in draw_progressbar_fill and draw_menuitem.
- Support for automake-1.11.
- Some minor fixes on big-endian systems.
- Fixes transparent WebKitGtk window with RGBA colormaps.
- https://bugzilla.gnome.org/show_bug.cgi?id=554871
- https://bugs.launchpad.net/ubuntu/+source/gtk2-engines-murrine/+bug/624901
- Minor fixes and maybe more bugs I forgot to link. :)

3 files changed, 11 insertions, 26 deletions

diff --git a/x11/gtk2-engines-murrine/Makefile b/x11/gtk2-engines-murrine/Makefile
index 51887a3c3c1..c29d7e4ac4a 100644
--- a/x11/gtk2-engines-murrine/Makefile
+++ b/x11/gtk2-engines-murrine/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.26 2014/05/05 00:48:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2015/01/08 04:19:13 obache Exp $
 
-DISTNAME=	murrine-0.90.3
+DISTNAME=	murrine-0.98.2
 PKGNAME=	${DISTNAME:S/^/gtk2-engines-/}
-PKGREVISION=	19
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/murrine/0.90/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/murrine/0.98/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cimitan.com/murrine/
 COMMENT=	GTK2+ engine featuring a modern glassy look
+LICENSE=	gnu-lgpl-v2.1 OR gnu-lgpl-v3
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config intltool msgfmt
@@ -17,6 +17,7 @@ USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--enable-animation
 
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.18.0
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2-engines-murrine/distinfo b/x11/gtk2-engines-murrine/distinfo
index 2cc4e515d19..8132b130aed 100644
--- a/x11/gtk2-engines-murrine/distinfo
+++ b/x11/gtk2-engines-murrine/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/05/06 17:29:38 dholland Exp $
+$NetBSD: distinfo,v 1.5 2015/01/08 04:19:13 obache Exp $
 
-SHA1 (murrine-0.90.3.tar.bz2) = 5c65acf7948d23bb1693728157425120486303a8
-RMD160 (murrine-0.90.3.tar.bz2) = 347909724a11cfe53f922208f46e39f47b420459
-Size (murrine-0.90.3.tar.bz2) = 271512 bytes
-SHA1 (patch-src_animation_c) = 807b41e782050f6d8d0e596d1412c96cb4f5646e
+SHA1 (murrine-0.98.2.tar.xz) = ddaca56b6e10736838572014ae9d20b814242615
+RMD160 (murrine-0.98.2.tar.xz) = d408ce9ca25be3e3b7afe9ce1e6127ffa0d9cff3
+Size (murrine-0.98.2.tar.xz) = 296944 bytes
diff --git a/x11/gtk2-engines-murrine/patches/patch-src_animation_c b/x11/gtk2-engines-murrine/patches/patch-src_animation_c
deleted file mode 100644
index 528c8912aa4..00000000000
--- a/x11/gtk2-engines-murrine/patches/patch-src_animation_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_animation_c,v 1.1 2012/05/06 17:29:38 dholland Exp $
-
-Fix build with latest glib2.
-
---- src/animation.c~	2009-02-20 18:35:50.000000000 +0000
-+++ src/animation.c
-@@ -21,7 +21,7 @@
- #include "animation.h"
- 
- #ifdef HAVE_ANIMATION
--#include <glib/gtimer.h>
-+#include <glib.h>
- 
- struct _AnimationInfo
- {