Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-themes/qtcurve: ChangeLog qtcurve-1.8.18.ebuild qtcurve-1.8.17-r1.ebuild
Date: Tue, 04 Feb 2014 14:10:16
Message-Id: 20140204141009.AD4132004C@flycatcher.gentoo.org
1 polynomial-c 14/02/04 14:10:09
2
3 Modified: ChangeLog qtcurve-1.8.18.ebuild
4 qtcurve-1.8.17-r1.ebuild
5 Log:
6 Fixed compilation with <gcc-4.7 (bug #498776)
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
9
10 Revision Changes Path
11 1.86 x11-themes/qtcurve/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/ChangeLog?rev=1.86&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/ChangeLog?rev=1.86&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/ChangeLog?r1=1.85&r2=1.86
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/ChangeLog,v
20 retrieving revision 1.85
21 retrieving revision 1.86
22 diff -u -r1.85 -r1.86
23 --- ChangeLog 2 Feb 2014 17:25:44 -0000 1.85
24 +++ ChangeLog 4 Feb 2014 14:10:09 -0000 1.86
25 @@ -1,6 +1,10 @@
26 # ChangeLog for x11-themes/qtcurve
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/ChangeLog,v 1.85 2014/02/02 17:25:44 pinkbyte Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/ChangeLog,v 1.86 2014/02/04 14:10:09 polynomial-c Exp $
30 +
31 + 04 Feb 2014; Lars Wendler <polynomial-c@g.o> qtcurve-1.8.17-r1.ebuild,
32 + qtcurve-1.8.18.ebuild:
33 + Fixed compilation with <gcc-4.7 (bug #498776).
34
35 02 Feb 2014; Sergey Popov <pinkbyte@g.o> qtcurve-1.8.17-r1.ebuild:
36 Stable on amd64 and x86, wrt bug #498660
37
38
39
40 1.2 x11-themes/qtcurve/qtcurve-1.8.18.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild?rev=1.2&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild?rev=1.2&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild?r1=1.1&r2=1.2
45
46 Index: qtcurve-1.8.18.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild,v
49 retrieving revision 1.1
50 retrieving revision 1.2
51 diff -u -r1.1 -r1.2
52 --- qtcurve-1.8.18.ebuild 27 Jan 2014 13:50:20 -0000 1.1
53 +++ qtcurve-1.8.18.ebuild 4 Feb 2014 14:10:09 -0000 1.2
54 @@ -1,10 +1,10 @@
55 # Copyright 1999-2014 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $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 $
58 +# $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 $
59
60 EAPI=5
61 KDE_REQUIRED="optional"
62 -inherit cmake-utils kde4-base
63 +inherit kde4-base
64
65 DESCRIPTION="A set of widget styles for Qt and GTK2"
66 HOMEPAGE="https://github.com/QtCurve/qtcurve"
67 @@ -14,7 +14,8 @@
68 EGIT_REPO_URI="https://github.com/QtCurve/qtcurve.git"
69 KEYWORDS=""
70 else
71 - SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
72 + SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV/_/}.tar.gz -> ${P}.tar.gz
73 + https://github.com/QtCurve/qtcurve/commit/020b70404f6202490d5ca131f0ec084355cb98e3.patch -> ${PN}-1.8.18-dont_use_c++11.patch"
74 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
75 fi
76
77 @@ -51,7 +52,14 @@
78
79 DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
80
81 +PATCHES=( "${DISTDIR}/${P}-dont_use_c++11.patch" )
82 +
83 pkg_setup() {
84 + # bug #498776
85 + if ! version_is_at_least 4.7 $(gcc-version) ; then
86 + append-cxxflags -Doverride=
87 + fi
88 +
89 use kde && kde4-base_pkg_setup
90 }
91
92
93
94
95 1.7 x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild
96
97 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild?rev=1.7&view=markup
98 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
99 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild?r1=1.6&r2=1.7
100
101 Index: qtcurve-1.8.17-r1.ebuild
102 ===================================================================
103 RCS file: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild,v
104 retrieving revision 1.6
105 retrieving revision 1.7
106 diff -u -r1.6 -r1.7
107 --- qtcurve-1.8.17-r1.ebuild 2 Feb 2014 17:25:44 -0000 1.6
108 +++ qtcurve-1.8.17-r1.ebuild 4 Feb 2014 14:10:09 -0000 1.7
109 @@ -1,10 +1,10 @@
110 # Copyright 1999-2014 Gentoo Foundation
111 # Distributed under the terms of the GNU General Public License v2
112 -# $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 $
113 +# $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 $
114
115 EAPI=5
116 KDE_REQUIRED="optional"
117 -inherit cmake-utils kde4-base
118 +inherit kde4-base
119
120 DESCRIPTION="A set of widget styles for Qt and GTK2"
121 HOMEPAGE="https://github.com/QtCurve/qtcurve"
122 @@ -53,6 +53,11 @@
123 PATCHES=( "${DISTDIR}/${P}-old_config_file.patch" )
124
125 pkg_setup() {
126 + # bug #498776
127 + if ! version_is_at_least 4.7 $(gcc-version) ; then
128 + append-cxxflags -Doverride=
129 + fi
130 +
131 use kde && kde4-base_pkg_setup
132 }