svn commit: r424491 - in head/x11-themes: qtcurve qtcurve-gtk2 qtcurve/files

[Jason E. Hale]

Author: jhale
Date: Sat Oct 22 23:20:21 2016
New Revision: 424491
URL: https://svnweb.freebsd.org/changeset/ports/424491

Log:
  - Fix NULL pointer dereference in gtkDrawFlatBox() in x11-themes/qtcurve-gtk2 [1]
  - Set LICENSE
  - Take maintainership of the qtcurve ports
  
  PR:		211391 [1]
  Submitted by:	<f.degner at gmx.de> [1]

Added:
  head/x11-themes/qtcurve/files/patch-gtk2_style_qtcurve.c   (contents, props changed)
Modified:
  head/x11-themes/qtcurve-gtk2/Makefile
  head/x11-themes/qtcurve/Makefile

Modified: head/x11-themes/qtcurve-gtk2/Makefile
==============================================================================
--- head/x11-themes/qtcurve-gtk2/Makefile	Sat Oct 22 21:47:28 2016	(r424490)
+++ head/x11-themes/qtcurve-gtk2/Makefile	Sat Oct 22 23:20:21 2016	(r424491)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qtcurve
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	QtCurve GTK+ 2.x engine and theme
 

Modified: head/x11-themes/qtcurve/Makefile
==============================================================================
--- head/x11-themes/qtcurve/Makefile	Sat Oct 22 21:47:28 2016	(r424490)
+++ head/x11-themes/qtcurve/Makefile	Sat Oct 22 23:20:21 2016	(r424491)
@@ -4,7 +4,7 @@ PORTNAME=	qtcurve
 PORTVERSION=	1.8.18
 CATEGORIES=	x11-themes
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	jhale at FreeBSD.org
 COMMENT?=	Widget styles for Qt and GTK+ toolkits
 
 .if !defined(QTCURVE_SLAVE)
@@ -21,6 +21,9 @@ QT4_RUN_DEPENDS=	qt4-style-qtcurve>=1.8.
 QT5_RUN_DEPENDS=	qt5-style-qtcurve>=1.8.18:x11-themes/qtcurve-qt5
 
 .else # !defined(QTCURVE_SLAVE)
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	QtCurve
 

Added: head/x11-themes/qtcurve/files/patch-gtk2_style_qtcurve.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-themes/qtcurve/files/patch-gtk2_style_qtcurve.c	Sat Oct 22 23:20:21 2016	(r424491)
@@ -0,0 +1,11 @@
+--- gtk2/style/qtcurve.c.orig	2014-01-25 20:13:54 UTC
++++ gtk2/style/qtcurve.c
+@@ -372,7 +372,7 @@ gtkDrawFlatBox(GtkStyle *style, GdkWindo
+     } else if (!(qtSettings.app == GTK_APP_JAVA && widget &&
+                  GTK_IS_LABEL(widget))) {
+         if (state != GTK_STATE_PRELIGHT || opts.crHighlight ||
+-            strcmp(detail, "checkbutton") != 0) {
++            ( detail != NULL && strcmp(detail, "checkbutton") != 0 )) {
+             parent_class->draw_flat_box(style, window, state, shadow, area,
+                                         widget, detail, x, y, width, height);
+         }