1 |
voyageur 09/06/02 08:08:16 |
2 |
|
3 |
Modified: ChangeLog google-gadgets-0.11.0.ebuild |
4 |
Log: |
5 |
Make xulrunner optional, now that there is a webkit backend |
6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.26 x11-misc/google-gadgets/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/google-gadgets/ChangeLog?rev=1.26&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/google-gadgets/ChangeLog?rev=1.26&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/google-gadgets/ChangeLog?r1=1.25&r2=1.26 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v |
18 |
retrieving revision 1.25 |
19 |
retrieving revision 1.26 |
20 |
diff -u -r1.25 -r1.26 |
21 |
--- ChangeLog 1 Jun 2009 22:50:41 -0000 1.25 |
22 |
+++ ChangeLog 2 Jun 2009 08:08:16 -0000 1.26 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for x11-misc/google-gadgets |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.25 2009/06/01 22:50:41 voyageur Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.26 2009/06/02 08:08:16 voyageur Exp $ |
28 |
+ |
29 |
+ 02 Jun 2009; Bernard Cafarelli <voyageur@g.o> |
30 |
+ google-gadgets-0.11.0.ebuild: |
31 |
+ Make xulrunner optional, now that there is a webkit backend |
32 |
|
33 |
*google-gadgets-0.11.0 (01 Jun 2009) |
34 |
|
35 |
|
36 |
|
37 |
|
38 |
1.2 x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: google-gadgets-0.11.0.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- google-gadgets-0.11.0.ebuild 1 Jun 2009 22:50:41 -0000 1.1 |
51 |
+++ google-gadgets-0.11.0.ebuild 2 Jun 2009 08:08:16 -0000 1.2 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2009 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild,v 1.1 2009/06/01 22:50:41 voyageur Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.0.ebuild,v 1.2 2009/06/02 08:08:16 voyageur Exp $ |
57 |
|
58 |
EAPI=2 |
59 |
|
60 |
@@ -16,7 +16,8 @@ |
61 |
LICENSE="Apache-2.0" |
62 |
SLOT="0" |
63 |
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86" |
64 |
-IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager soup startup-notification webkit" |
65 |
+IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager soup startup-notification |
66 |
+webkit +xulrunner" |
67 |
|
68 |
# Weird things happen when we start mix-n-matching, so for the time being |
69 |
# I've just locked the deps to the versions I had as of Summer 2008. With any |
70 |
@@ -24,7 +25,6 @@ |
71 |
|
72 |
RDEPEND=" |
73 |
>=dev-libs/libxml2-2.6.32 |
74 |
- net-libs/xulrunner:1.9 |
75 |
sys-libs/zlib |
76 |
x11-libs/libX11 |
77 |
x11-libs/libXext |
78 |
@@ -54,6 +54,7 @@ |
79 |
soup? ( >=net-libs/libsoup-2.26 ) |
80 |
startup-notification? ( x11-libs/startup-notification ) |
81 |
webkit? ( >=net-libs/webkit-gtk-1.0.3 ) |
82 |
+ xulrunner? ( net-libs/xulrunner:1.9 ) |
83 |
" |
84 |
DEPEND="${RDEPEND} |
85 |
>=dev-util/pkgconfig-0.20 |
86 |
@@ -88,19 +89,11 @@ |
87 |
} |
88 |
|
89 |
src_configure() { |
90 |
- #For the time being, the smjs-script runtime is required for both gtk and qt |
91 |
- #versions, but the goal is to make the qt4 version depend only on qt-script. |
92 |
- has_pkg_smjs=no \ |
93 |
- econf --disable-dependency-tracking \ |
94 |
+ local myconf="--disable-dependency-tracking \ |
95 |
--disable-update-desktop-database \ |
96 |
--disable-update-mime-database \ |
97 |
--disable-werror \ |
98 |
--enable-libxml2-xml-parser \ |
99 |
- --enable-smjs-script-runtime \ |
100 |
- --with-gtkmozembed=libxul \ |
101 |
- --with-smjs-cppflags=-I/usr/include/nspr \ |
102 |
- --with-smjs-libdir=/usr/$(get_libdir)/xulrunner-1.9 \ |
103 |
- --with-smjs-incdir=/usr/include/xulrunner-1.9/unstable \ |
104 |
--with-browser-plugins-dir=/usr/$(get_libdir)/nsbrowser/plugins \ |
105 |
--with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \ |
106 |
--with-oem-brand=Gentoo \ |
107 |
@@ -113,7 +106,6 @@ |
108 |
$(use_enable webkit gtkwebkit-browser-element) \ |
109 |
$(use_enable gtk gtk-host) \ |
110 |
$(use_enable gtk libggadget-gtk ) \ |
111 |
- $(use_enable gtk gtkmoz-browser-element) \ |
112 |
$(use_enable gtk gtk-edit-element) \ |
113 |
$(use_enable gtk gtk-flash-element) \ |
114 |
$(use_enable gtk gtk-system-framework) \ |
115 |
@@ -124,7 +116,20 @@ |
116 |
$(use_enable qt4 qt-system-framework) \ |
117 |
$(use_enable qt4 qtwebkit-browser-element) \ |
118 |
$(use_enable qt4 qt-xml-http-request) \ |
119 |
- $(use_enable qt4 qt-script-runtime) |
120 |
+ $(use_enable qt4 qt-script-runtime)" |
121 |
+ if use xulrunner; then |
122 |
+ myconf="${myconf} \ |
123 |
+ $(use_enable gtk gtkmoz-browser-element) \ |
124 |
+ --with-gtkmozembed=libxul \ |
125 |
+ --enable-smjs-script-runtime \ |
126 |
+ --with-smjs-cppflags=-I/usr/include/nspr \ |
127 |
+ --with-smjs-libdir=/usr/$(get_libdir)/xulrunner-1.9 \ |
128 |
+ --with-smjs-incdir=/usr/include/xulrunner-1.9/unstable" |
129 |
+ else |
130 |
+ myconf="${myconf} --disable-gtkmoz-browser-element" |
131 |
+ fi |
132 |
+ |
133 |
+ econf ${myconf} |
134 |
} |
135 |
|
136 |
src_test() { |