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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 121 insertions, 19 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/Manifest b/x11-themes/qtcurve/Manifest
index c615a7f2b125..c8de9e73b0df 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,31 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX qtcurve-1.8.18-gtk2_segfault.patch 665 SHA256 d153b49c5f29049c3383abd2c2cf8ee971c4f30722ef4e287a12e5779667c29f SHA512 537a36298a576d12adc79bab74cb33945f65b33ccfb40b9e892b9fdc1ee3bdff23a1fe8ab7c6b926b340453476f31d2d67968fc3aef57822274b8f42a9287381 WHIRLPOOL aa1ad438389eec2173dfb9d228294c7701ab8771a445868631e2b4a535466a87ecadab93252e9e68c2c1b64d0824888781f68ee1ee00df1a542a00ca5ecf3731
 AUX qtcurve-1.8.18-remove_qt_filedialog_api.patch 1908 SHA256 92137e54e5f92b6dc0a1c6011d3f68e2f0464ebede37d36d383a42b96dd51f87 SHA512 688d4e3525182804c94754ff2b0c53a94d531584c3335370b17e4f3e597f2ce23284a96cebbfb92525bbaa6bee4d4aea403ba7e4d58ceadaaa7c9bbf58b207ce WHIRLPOOL 4a359f29ef4244f977e70c794bf56db4b978fff6b7a23fa7e6b57b976205991fd4cd23b9747fe5c49c919618e5e675ad36db8552e0cde7401c348631c3337cbc
 DIST qtcurve-1.8.17-old_config_file.patch 1000 SHA256 fc744d2bc69b8e9008408df0b83d358c4036ea944aaf4ad46ff02905e0d8c87d SHA512 53de2692ba3a231d5a209f518291da035ac72ddb421073dfcdebacaef130f5249a1af7d05992a26be640641f50194f12ab5f710ea9651e749b839657411f4426 WHIRLPOOL 8afa96f0f32481387622e60ff538cd382f7c1f18d6ec8d9bfdbe600edf8060c18129206a8d792174b8844d0aea60b66a72e2caea196d2c47e3af139b0b146365
 DIST qtcurve-1.8.17.tar.gz 961958 SHA256 d673925f4f24ed7caf1aa722d2c9daeb4b3a383753b332b563153a9a288dafc7 SHA512 c8b760737fb6b4958ec3618b54f5277eac12dfab31f892b68cb74daae279afe721d14592c5dbb8fc376bad7b99d4d637be6a58f6fd296b61ab199d39768787b2 WHIRLPOOL a82ab899bb0ac2efbc3e76de7554f831f8d66a3c8eeee702a1f91e8deb7028f51b1ad2871d7708ea3a102aefdef0bd4b1b92237d3b12d87c473a414fec16affa
 DIST qtcurve-1.8.18-dont_use_c++11.patch 1096 SHA256 09a9c42bd045dc9161881fdfe62b854d8577fc57e00a245ae03fb00a384cb82f SHA512 3228e4e5babd6a309fca02c4a103500acd913f40364e9dffd8238aa05377f4d31c3b2ba2c84427804de909712a2dd9b391e9f84206fca5146dbadc0d96183cf7 WHIRLPOOL 23f4e2d568e6a2331e2f34f8c3061c1f4171ef0b39e74a56da44c7d761626eefc2a5ff0fa39d4983d8c99742f753ec26dcc2287320aa8d43d5cab9a0d13f2245
 DIST qtcurve-1.8.18.tar.gz 991195 SHA256 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6 SHA512 0ba7927db11d1f2d7bad08fa923d3f0f2167d89fdf0d09bf0b677ffd4f2cc547c22890c87b8f18495e73f8ce21ffbd40899792a512dd9e2a481b81a52abd84eb WHIRLPOOL d3c7dc0c08b42deafdd5fcd513dcb2d9ea9c52ade8090d6cc022315ac80b1ea196a8a763d9c96096ee645f45bc329b837f23987bf7229c718d2a5811a35c68d1
 EBUILD qtcurve-1.8.17-r1.ebuild 1990 SHA256 b1cc88cc9725a4b2246223f776a2b324b73f7d78faf5e8e9a73ed2d7103e2db6 SHA512 d22f5de3a222383ee074cc3ddda6c4cc7748edd9ad7258e62b3e6ec13440fd487b55b8bf4efc3fc7481eda163141c82ad2049dd362073886cae697a4e13730a4 WHIRLPOOL 3df15d908a1f476cf892ed53aeb5ae454d4e62b9710a7cf8be530cee6812c9d1a7ae6fddee649bcfa4f280ce48e2c4c64a8d9ee162bd4e4074a427e9547c7dd6
+EBUILD qtcurve-1.8.18-r1.ebuild 2106 SHA256 0c805474c8f74a646f478c3a44376274cf9b3a0878f7b7768ee35609b367f852 SHA512 d89e95e3b939796f20c4778aad67cdce447258b0833853c815c2350d2eb9bfb0fe225b73f522d16145adefcdfa26f05512d3c83d21327046529c6290c7d9e404 WHIRLPOOL 8bf7e80d017f4759ec4e34044f592e77dc70b90bbe6fdc1bb6f761887aa8abf923dfed542b29150c03cda0cd30f12ea4b45b5279c5b593762ef19c459a0d42b0
 EBUILD qtcurve-1.8.18.ebuild 2063 SHA256 210b1003095a2447a97103371a89e2756aefb0914d4e32448299013e4475051e SHA512 d134d9de04177255daed5233995b2b9edf18455cff9755a4eb1b6bf1151e0d767f69771147fd544dff844ddecbaaacbab6ead03c32290d859bf2d6ab2271c71b WHIRLPOOL 16fd7addc5b4a8159def21b9937cd5572214c2ed93079872d81bbbbba132347e4868f351dee41855fea3bdb9194e15473aadaf42072339c664c1497740b1d557
-MISC ChangeLog 2766 SHA256 751e775890ec08262b1cc4653d4f5704bed3c6363053a42484dfbffdb883c16c SHA512 aef38b7ad16b157bf1a35d02840104ca64e3adb335670c181998e9d2020008c58a68edb7d3c02522937407822339e2b805b8c7e6831f140b8ed365664a01e46e WHIRLPOOL 87de986edbaeee984e66e1a0731ac23042a4b1160c9f832d0b127e459db682d98e565bbc0dc5e8cfac5db4e553d1e9f6195d84b7afde358557dec779e2f78636
+MISC ChangeLog 2988 SHA256 87e212d4af6247ae290337b103048cf3ce7157b73ced677c0bf564dfa98266e4 SHA512 7f9ed719da7d05b6b02fb95e1ca376112da569999ae03bdd0c9cfcd0a88d2630c551acac29bc6b9f468b3bb0cce090045a12c310011226b744fe16e30cb6508f WHIRLPOOL 3ba2fd2da53f97c61b01cae0d70b30aec6f3e21047c2cefdc70f9583809bf0beef96f045f9dff193b014264599e26510aef03abaa608eee818385c69ae269ac5
 MISC metadata.xml 548 SHA256 975b4fdf4aa35f0b25318bb9763510795402e485ac6041b65eb2cdf9a24b9b36 SHA512 9676a81171ca40609ae8b3a880a90e22aad3d2f83a5772310fd2976572367e5d3819a45cf8dea627d49f036c536ccd02c9328ad4982eea49c2411b9a86ea146c WHIRLPOOL 1188ec66fdfb659149db76f4020d90bb58600bc97eeea93d6db2b7998b258c4f28217062617d6eb91cadd9cff1f38ce83b5cbdd8075ecd68a8b576dc69308f1f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVf8UZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAswP/AvZcqhbeYpV9HTRHOdY4thK
-jJK+yUjNyl0SM2PLOgqneNn9z98obNMlhpB6fOdzqAHWsRaaNJ/zjs5vheW2WY5j
-ILHOGVZa/6o1CeIfrWklKOrubqqiNkjYuYCEdG+joo+gNW8tCylIDcSdtdGRvfew
-USajVnbH909Vtz1OAACIsfBEAu5Muyn2MJmc7bFQsQnQrLBjmqonCxIc4Pq+ycbL
-uIII12ronEVAkTX9OSqBlnnoCPlBro+2kY3sKGcQBHQqzXvpjpJXm0uwzJspYcJR
-JziqYt8P0OuURL/ln1YVC9Sg69wiWeu7qAny1rCFWJvG0BzdGUOxbJYN//o5/TjJ
-Q935DAApA4B4Cg0zP2VtL151Cl+5Mtv7Vo686aYwdwwsME/f8os3PL9tlJgpdGot
-CEotoHS7pYYl6nT6nZSHm78JeqnRMgTqQxPr17Wx8amQ7AoTF87krU8bWGztjnLo
-o1KCxZjPC4me99iUr5xXmr0obhMNROoJix2kbpxyz0g0W0QFac5tuAt7bSNaft2t
-Qx1azk3KxhOJyO9pCZHm4ywRtdtLxZTDdict2s4nZR/pvRTzRT2Pm0q/rDZfINCE
-p0cMTEfZAlXKP5R2y0GSoGfmv2aoOBa6M1kSDlxl6xB5Xwwuex/ehIy2vhNEdUCg
-0+Unp7KA/4Gjz/+XFrYD
-=Fjzo
+iQIcBAEBCgAGBQJVp13NAAoJEPiazRVxLXTFo5gQALAtVKTvmpiMrwKxEtxxk+I3
+vnVWqU1GeimcX1aoqxBnvtDAjTcOw8SybLTnBNq7gg/vbAPrTNXP8Pdm/4NsJO83
+Tk8mGsGqN6fGRrZOC6z1OUvF8HpXdHh3LanVbMP82jqDMBsYjcFAVxhVfs7k3gYM
+MSas2KPMTlULhj0IVPocQ/R7R+iOgtqGfn1meCXeHUNcCe4NWhm38dAAs6N0dcVj
+lTNbhGznmcENsTTJIcv4rlMPJLiYpdsHzCoBMJTT7AX0c1xvNQqeOmkJse4OeofH
+lxbVCKixur+UMOT3i4JXiZGKBGShvRxv8pt9sglvLpbbi4M00R4Nt+zRX9mZd94j
+vdSqpsHSptMp/tODrmqgzi/gjffZ4PPz4ei5UsJWY2An/oJ4xhz0Hht89k8b0cma
+o52O66NcQVhvOeDPZmkqZlRlPkkCg9nxADIjS2Ej4ytca9AIZ4gTmvhpIf23sgSL
+2rZaRvtc0nNPWW1EmXyy0mkmgsvf0NTAHwbaBAOIq6jwx8hbzuRlUdaIJ2FTJvQ0
+IWaiG15u5Mg95MUfyPpKtErptUMVQUud2OqbUjv+3eOp9Yz1olMm7oXNyPcXyApg
+KAuGYMdoSw9zn3GJeVTvjx7Y2XNetUzLxAt0yhU3WKODdQZiF/zxGF63ptna9Ov5
+dfICsJ4QJ4+2SFM3N9CZ
+=OcMT
 -----END PGP SIGNATURE-----
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
+}