[gentoo-commits] gentoo-x86 commit in x11-themes/qtcurve: ChangeLog qtcurve-1.8.18.ebuild qtcurve-1.8.17-r1.ebuild

[Lars Wendler (polynomial-c)]

polynomial-c    14/02/04 14:10:09

  Modified:             ChangeLog qtcurve-1.8.18.ebuild
                        qtcurve-1.8.17-r1.ebuild
  Log:
  Fixed compilation with <gcc-4.7 (bug #498776)
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.86                 x11-themes/qtcurve/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/ChangeLog?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/ChangeLog?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/ChangeLog?r1=1.85&r2=1.86

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ChangeLog	2 Feb 2014 17:25:44 -0000	1.85
+++ ChangeLog	4 Feb 2014 14:10:09 -0000	1.86
@@ -1,6 +1,10 @@
 # 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.85 2014/02/02 17:25:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/ChangeLog,v 1.86 2014/02/04 14:10:09 polynomial-c Exp $
+
+  04 Feb 2014; Lars Wendler <polynomial-c@g.o> qtcurve-1.8.17-r1.ebuild,
+  qtcurve-1.8.18.ebuild:
+  Fixed compilation with <gcc-4.7 (bug #498776).
 
   02 Feb 2014; Sergey Popov <pinkbyte@g.o> qtcurve-1.8.17-r1.ebuild:
   Stable on amd64 and x86, wrt bug #498660



1.2                  x11-themes/qtcurve/qtcurve-1.8.18.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild?r1=1.1&r2=1.2

Index: qtcurve-1.8.18.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtcurve-1.8.18.ebuild	27 Jan 2014 13:50:20 -0000	1.1
+++ qtcurve-1.8.18.ebuild	4 Feb 2014 14:10:09 -0000	1.2
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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.ebuild,v 1.1 2014/01/27 13:50:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild,v 1.2 2014/02/04 14:10:09 polynomial-c Exp $
 
 EAPI=5
 KDE_REQUIRED="optional"
-inherit cmake-utils kde4-base
+inherit kde4-base
 
 DESCRIPTION="A set of widget styles for Qt and GTK2"
 HOMEPAGE="https://github.com/QtCurve/qtcurve"
@@ -14,7 +14,8 @@
 	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"
+	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
 
@@ -51,7 +52,14 @@
 
 DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 
+PATCHES=( "${DISTDIR}/${P}-dont_use_c++11.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
 }
 



1.7                  x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild?r1=1.6&r2=1.7

Index: qtcurve-1.8.17-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qtcurve-1.8.17-r1.ebuild	2 Feb 2014 17:25:44 -0000	1.6
+++ qtcurve-1.8.17-r1.ebuild	4 Feb 2014 14:10:09 -0000	1.7
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild,v 1.6 2014/02/02 17:25:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild,v 1.7 2014/02/04 14:10:09 polynomial-c Exp $
 
 EAPI=5
 KDE_REQUIRED="optional"
-inherit cmake-utils kde4-base
+inherit kde4-base
 
 DESCRIPTION="A set of widget styles for Qt and GTK2"
 HOMEPAGE="https://github.com/QtCurve/qtcurve"
@@ -53,6 +53,11 @@
 PATCHES=( "${DISTDIR}/${P}-old_config_file.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
 }