Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/dwb: ChangeLog dwb-9999.ebuild dwb-2013.03.30.ebuild
Date: Tue, 30 Apr 2013 07:58:04
Message-Id: 20130430075759.0DF1D2171D@flycatcher.gentoo.org
1 radhermit 13/04/30 07:57:58
2
3 Modified: ChangeLog dwb-9999.ebuild dwb-2013.03.30.ebuild
4 Log:
5 Fix compile with >=json-c-0.11 (bug #467940), fix compile on uclibc and other systems without execinfo.h (bug #465170), and add dep on gnutls.
6
7 (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.18 www-client/dwb/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/ChangeLog?rev=1.18&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/ChangeLog?rev=1.18&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/ChangeLog?r1=1.17&r2=1.18
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/dwb/ChangeLog,v
19 retrieving revision 1.17
20 retrieving revision 1.18
21 diff -u -r1.17 -r1.18
22 --- ChangeLog 8 Apr 2013 15:28:35 -0000 1.17
23 +++ ChangeLog 30 Apr 2013 07:57:58 -0000 1.18
24 @@ -1,6 +1,11 @@
25 # ChangeLog for www-client/dwb
26 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/dwb/ChangeLog,v 1.17 2013/04/08 15:28:35 radhermit Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-client/dwb/ChangeLog,v 1.18 2013/04/30 07:57:58 radhermit Exp $
29 +
30 + 30 Apr 2013; Tim Harder <radhermit@g.o> dwb-2013.03.30.ebuild,
31 + +files/dwb-2013.03.30-json-c.patch, dwb-9999.ebuild:
32 + Fix compile with >=json-c-0.11 (bug #467940), fix compile on uclibc and other
33 + systems without execinfo.h (bug #465170), and add dep on gnutls.
34
35 *dwb-2013.03.30 (08 Apr 2013)
36
37
38
39
40 1.7 www-client/dwb/dwb-9999.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/dwb-9999.ebuild?rev=1.7&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/dwb-9999.ebuild?rev=1.7&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/dwb-9999.ebuild?r1=1.6&r2=1.7
45
46 Index: dwb-9999.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/www-client/dwb/dwb-9999.ebuild,v
49 retrieving revision 1.6
50 retrieving revision 1.7
51 diff -u -r1.6 -r1.7
52 --- dwb-9999.ebuild 8 Apr 2013 15:17:04 -0000 1.6
53 +++ dwb-9999.ebuild 30 Apr 2013 07:57:58 -0000 1.7
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2013 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/www-client/dwb/dwb-9999.ebuild,v 1.6 2013/04/08 15:17:04 radhermit Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/www-client/dwb/dwb-9999.ebuild,v 1.7 2013/04/30 07:57:58 radhermit Exp $
59
60 EAPI=5
61
62 @@ -10,7 +10,6 @@
63
64 DESCRIPTION="Dynamic web browser based on WebKit and GTK+"
65 HOMEPAGE="http://portix.bitbucket.org/dwb/"
66 -SRC_URI=""
67
68 LICENSE="GPL-3"
69 SLOT="0"
70 @@ -19,6 +18,7 @@
71
72 RDEPEND=">=net-libs/libsoup-2.32:2.4
73 dev-libs/json-c
74 + net-libs/gnutls
75 !gtk3? (
76 >=net-libs/webkit-gtk-1.8.0:2
77 x11-libs/gtk+:2
78 @@ -38,6 +38,11 @@
79 local myconf
80 use gtk3 && myconf+=" GTK=3"
81
82 + # uclibc and other systems don't have execinfo.h (bug #465170)
83 + if ! (echo '#include <execinfo.h>' | $(tc-getCC) -E - &>/dev/null) ; then
84 + myconf+=" WITHOUT_EXECINFO=1"
85 + fi
86 +
87 emake CC="$(tc-getCC)" ${myconf}
88 }
89
90
91
92
93 1.2 www-client/dwb/dwb-2013.03.30.ebuild
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/dwb-2013.03.30.ebuild?rev=1.2&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/dwb-2013.03.30.ebuild?rev=1.2&content-type=text/plain
97 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/dwb-2013.03.30.ebuild?r1=1.1&r2=1.2
98
99 Index: dwb-2013.03.30.ebuild
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/www-client/dwb/dwb-2013.03.30.ebuild,v
102 retrieving revision 1.1
103 retrieving revision 1.2
104 diff -u -r1.1 -r1.2
105 --- dwb-2013.03.30.ebuild 8 Apr 2013 15:28:35 -0000 1.1
106 +++ dwb-2013.03.30.ebuild 30 Apr 2013 07:57:58 -0000 1.2
107 @@ -1,6 +1,6 @@
108 # Copyright 1999-2013 Gentoo Foundation
109 # Distributed under the terms of the GNU General Public License v2
110 -# $Header: /var/cvsroot/gentoo-x86/www-client/dwb/dwb-2013.03.30.ebuild,v 1.1 2013/04/08 15:28:35 radhermit Exp $
111 +# $Header: /var/cvsroot/gentoo-x86/www-client/dwb/dwb-2013.03.30.ebuild,v 1.2 2013/04/30 07:57:58 radhermit Exp $
112
113 EAPI=5
114
115 @@ -17,6 +17,7 @@
116
117 RDEPEND=">=net-libs/libsoup-2.32:2.4
118 dev-libs/json-c
119 + net-libs/gnutls
120 !gtk3? (
121 >=net-libs/webkit-gtk-1.8.0:2
122 x11-libs/gtk+:2
123 @@ -30,13 +31,20 @@
124
125 src_prepare() {
126 epatch "${FILESDIR}"/${P}-verbose-build.patch
127 - sed -i "/^CFLAGS += -\(pipe\|g\|O2\)/d" config.mk || die
128 + epatch "${FILESDIR}"/${P}-json-c.patch
129 +
130 + sed -i '/^CFLAGS += -\(pipe\|g\|O2\)/d' config.mk || die
131 }
132
133 src_compile() {
134 local myconf
135 use gtk3 && myconf+=" GTK=3"
136
137 + # uclibc and other systems don't have execinfo.h (bug #465170)
138 + if ! (echo '#include <execinfo.h>' | $(tc-getCC) -E - &>/dev/null) ; then
139 + myconf+=" WITHOUT_EXECINFO=1"
140 + fi
141 +
142 emake CC="$(tc-getCC)" ${myconf}
143 }
Report Message
Find on MARC Find on Google Groups