Revbump to fix a segfault in the gtk2 theme (bug #549292)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 981CA6FC)

3 files changed, 104 insertions, 2 deletions

diff --git a/x11-themes/qtcurve/ChangeLog b/x11-themes/qtcurve/ChangeLog
index 6dd691c831c4..72039005c3fc 100644
--- a/x11-themes/qtcurve/ChangeLog
+++ b/x11-themes/qtcurve/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/qtcurve
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/ChangeLog,v 1.92 2014/08/25 20:52:02 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/ChangeLog,v 1.93 2015/07/16 07:31:24 polynomial-c Exp $
+
+*qtcurve-1.8.18-r1 (16 Jul 2015)
+
+  16 Jul 2015; Lars Wendler <polynomial-c@gentoo.org>
+  +qtcurve-1.8.18-r1.ebuild, +files/qtcurve-1.8.18-gtk2_segfault.patch:
+  Revbump to fix a segfault in the gtk2 theme (bug #549292).
 
   25 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> qtcurve-1.8.18.ebuild,
   +files/qtcurve-1.8.18-remove_qt_filedialog_api.patch:
diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch
new file mode 100644
index 000000000000..b4a2f1a44610
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch
@@ -0,0 +1,14 @@
+https://github.com/QtCurve/qtcurve-gtk2/issues/3
+https://gist.github.com/anonymous/8e6e4ea32dabf03cf630
+
+--- qtcurve-1.8.18/gtk2/style/qtcurve.c
++++ qtcurve-1.8.18/gtk2/style/qtcurve.c
+@@ -372,7 +372,7 @@
+     } 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);
+         }
diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
new file mode 100644
index 000000000000..259b3347dc8a
--- /dev/null
+++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild,v 1.1 2015/07/16 07:31:24 polynomial-c Exp $
+
+EAPI=5
+KDE_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="A set of widget styles for Qt and GTK2"
+HOMEPAGE="https://github.com/QtCurve/qtcurve"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/QtCurve/qtcurve.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV/_/}.tar.gz  -> ${P}.tar.gz
+		https://github.com/QtCurve/qtcurve/commit/020b70404f6202490d5ca131f0ec084355cb98e3.patch -> ${PN}-1.8.18-dont_use_c++11.patch"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+X gtk kde nls +qt4 qt5 windeco"
+REQUIRED_USE="gtk? ( X )
+	windeco? ( kde X )
+	|| ( gtk qt4 qt5 )"
+
+RDEPEND="X? ( x11-libs/libxcb
+		x11-libs/libX11 )
+	gtk? ( x11-libs/gtk+:2 )
+	qt4? ( dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+	)
+	qt5? ( dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? ( dev-qt/qtdbus:5
+			dev-qt/qtx11extras:5 )
+	)
+	kde? ( $(add_kdebase_dep systemsettings)
+		windeco? ( $(add_kdebase_dep kwin) )
+	)
+	!x11-themes/gtk-engines-qtcurve"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${P/_/}"
+
+DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
+
+PATCHES=(
+	"${DISTDIR}/${P}-dont_use_c++11.patch"
+	"${FILESDIR}/${P}-remove_qt_filedialog_api.patch"
+	"${FILESDIR}/${P}-gtk2_segfault.patch"
+	)
+
+pkg_setup() {
+	# bug #498776
+	if ! version_is_at_least 4.7 $(gcc-version) ; then
+		append-cxxflags -Doverride=
+	fi
+
+	use kde && kde4-base_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+	mycmakeargs=(
+		$(cmake-utils_use_enable gtk GTK2)
+		$(cmake-utils_use_enable qt4 QT4)
+		$(cmake-utils_use_enable qt5 QT5)
+		$(cmake-utils_use X QTC_ENABLE_X11 )
+		$(cmake-utils_use kde QTC_QT4_ENABLE_KDE )
+		$(cmake-utils_use windeco QTC_QT4_ENABLE_KWIN )
+		$(cmake-utils_use nls QTC_INSTALL_PO )
+	)
+	cmake-utils_src_configure
+}