Gentoo Archives: gentoo-commits

From: "Nirbheek Chauhan (nirbheek)" <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/xulrunner: ChangeLog xulrunner-1.9.0.11-r1.ebuild xulrunner-1.9.0.11.ebuild
Date: Mon, 29 Jun 2009 16:42:05
Message-Id: E1MLJvg-0005me-4z@stork.gentoo.org
1 nirbheek 09/06/29 16:42:04
2
3 Modified: ChangeLog
4 Added: xulrunner-1.9.0.11-r1.ebuild
5 Removed: xulrunner-1.9.0.11.ebuild
6 Log:
7 Add patch to fix mozilla-js.pc to have the correct path. Changes no code, unbreaks a lot of apps (like bug 275318), and will not break anything. Straight to stable! Muahahaha. (arch teams don't really have anything to do here)
8 (Portage version: 2.2_rc33/cvs/Linux i686, RepoMan options: --force)
9
10 Revision Changes Path
11 1.214 net-libs/xulrunner/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.214&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.214&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/ChangeLog?r1=1.213&r2=1.214
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v
20 retrieving revision 1.213
21 retrieving revision 1.214
22 diff -u -r1.213 -r1.214
23 --- ChangeLog 26 Jun 2009 00:23:12 -0000 1.213
24 +++ ChangeLog 29 Jun 2009 16:42:04 -0000 1.214
25 @@ -1,6 +1,16 @@
26 # ChangeLog for net-libs/xulrunner
27 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.213 2009/06/26 00:23:12 rich0 Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.214 2009/06/29 16:42:04 nirbheek Exp $
30 +
31 +*xulrunner-1.9.0.11-r1 (29 Jun 2009)
32 +
33 + 29 Jun 2009; <nirbheek@g.o>
34 + +files/066-fix-includedir-mozilla-js.patch, -xulrunner-1.9.0.11.ebuild,
35 + +xulrunner-1.9.0.11-r1.ebuild:
36 + Add patch to fix mozilla-js.pc to have the correct path. Changes no code,
37 + unbreaks a lot of apps (like bug 275318), and will not break anything.
38 + Straight to stable! Muahahaha. (arch teams don't really have anything to
39 + do here)
40
41 26 Jun 2009; Richard Freeman <rich0@g.o> xulrunner-1.9.0.11.ebuild:
42 amd64 stable - 273918
43
44
45
46 1.1 net-libs/xulrunner/xulrunner-1.9.0.11-r1.ebuild
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.11-r1.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.11-r1.ebuild?rev=1.1&content-type=text/plain
50
51 Index: xulrunner-1.9.0.11-r1.ebuild
52 ===================================================================
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.11-r1.ebuild,v 1.1 2009/06/29 16:42:04 nirbheek Exp $
56 EAPI="2"
57 WANT_AUTOCONF="2.1"
58
59 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
60 PATCH="${PN}-1.9.0.10-patches-0.1"
61
62 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
63 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
64 SRC_URI="mirror://gentoo/${P}.tar.bz2
65 http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
66 mirror://gentoo/${PATCH}.tar.bz2
67 http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2"
68
69 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
70 SLOT="1.9"
71 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
72 IUSE=""
73
74 RDEPEND="java? ( >=virtual/jre-1.4 )
75 >=sys-devel/binutils-2.16.1
76 >=dev-libs/nss-3.12.2
77 >=dev-libs/nspr-4.7.4
78 >=app-text/hunspell-1.1.9
79 >=media-libs/lcms-1.17
80 x11-libs/cairo[X]
81 x11-libs/pango[X]"
82
83 DEPEND="java? ( >=virtual/jdk-1.4 )
84 ${RDEPEND}
85 dev-util/pkgconfig"
86
87 S="${WORKDIR}/mozilla"
88
89 # Needed by src_compile() and src_install().
90 # Would do in pkg_setup but that loses the export attribute, they
91 # become pure shell variables.
92 export MOZ_CO_PROJECT=xulrunner
93 export BUILD_OFFICIAL=1
94 export MOZILLA_OFFICIAL=1
95
96 pkg_setup() {
97 java-pkg-opt-2_pkg_setup
98 }
99
100 src_prepare() {
101 # Apply our patches
102 cd "${S}" || die "cd failed"
103 EPATCH_SUFFIX="patch" \
104 EPATCH_FORCE="yes" \
105 epatch "${WORKDIR}"/patch
106
107 # Bad mozilla-js.pc, causes stuff like bug 275318
108 epatch "${FILESDIR}/066-fix-includedir-mozilla-js.patch"
109
110 eautoreconf || die "failed running eautoreconf"
111
112 # We need to re-patch this because autoreconf overwrites it
113 epatch "${WORKDIR}"/patch/000_flex-configure-LANG.patch
114 }
115
116 src_configure() {
117 declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
118
119 ####################################
120 #
121 # mozconfig, CFLAGS and CXXFLAGS setup
122 #
123 ####################################
124
125 mozconfig_init
126 mozconfig_config
127
128 MEXTENSIONS="default"
129 # if use python; then
130 # MEXTENSIONS="${MEXTENSIONS},python/xpcom"
131 # fi
132
133 # It doesn't compile on alpha without this LDFLAGS
134 use alpha && append-ldflags "-Wl,--no-relax"
135
136 mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
137 mozconfig_annotate '' --disable-mailnews
138 mozconfig_annotate 'broken' --disable-mochitest
139 mozconfig_annotate 'broken' --disable-crashreporter
140 mozconfig_annotate '' --enable-system-hunspell
141 #mozconfig_annotate '' --enable-system-sqlite
142 mozconfig_annotate '' --enable-image-encoder=all
143 mozconfig_annotate '' --enable-canvas
144 #mozconfig_annotate '' --enable-js-binary
145 mozconfig_annotate '' --enable-embedding-tests
146 mozconfig_annotate '' --with-system-nspr
147 mozconfig_annotate '' --with-system-nss
148 mozconfig_annotate '' --enable-system-lcms
149 mozconfig_annotate '' --with-system-bz2
150 # Bug 60668: Galeon doesn't build without oji enabled, so enable it
151 # regardless of java setting.
152 mozconfig_annotate '' --enable-oji --enable-mathml
153 mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
154 mozconfig_annotate '' --enable-safe-browsing
155
156 # Other ff-specific settings
157 mozconfig_annotate '' --enable-jsd
158 mozconfig_annotate '' --enable-xpctools
159 mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
160
161 #disable java
162 if ! use java ; then
163 mozconfig_annotate '-java' --disable-javaxpcom
164 fi
165
166 # Finalize and report settings
167 mozconfig_final
168
169 ####################################
170 #
171 # Configure and build
172 #
173 ####################################
174
175 if [[ $(gcc-major-version) -lt 4 ]]; then
176 append-cxxflags -fno-stack-protector
177 fi
178
179 CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
180 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
181 econf || die
182
183 # It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
184 # to econf, but the quotes cause configure to fail.
185 sed -i -e \
186 's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
187 "${S}"/config/autoconf.mk \
188 "${S}"/toolkit/content/buildconfig.html
189 }
190
191 src_install() {
192 declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
193
194 emake DESTDIR="${D}" install || die "emake install failed"
195
196 rm "${D}"/usr/bin/xulrunner
197
198 dodir /usr/bin
199 dosym ${MOZILLA_FIVE_HOME}/xulrunner /usr/bin/xulrunner-1.9
200
201 # Add vendor
202 echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
203 >> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
204
205 if use java ; then
206 java-pkg_regjar "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
207 java-pkg_regjar "${D}"${MOZILLA_FIVE_HOME}/sdk/lib/MozillaGlue.jar
208 java-pkg_regjar "${D}"${MOZILLA_FIVE_HOME}/sdk/lib/MozillaInterfaces.jar
209 fi
210 }