* [gentoo-commits] gentoo-x86 commit in www-client/phantomjs: phantomjs-1.9.0.ebuild ChangeLog
@ 2013-04-29 16:46 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-29 16:46 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/29 16:46:25
Modified: phantomjs-1.9.0.ebuild ChangeLog
Log:
Clean up random problems (but does not fix them all -- see #409991).
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.5 www-client/phantomjs/phantomjs-1.9.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?r1=1.4&r2=1.5
Index: phantomjs-1.9.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- phantomjs-1.9.0.ebuild 25 Apr 2013 22:16:43 -0000 1.4
+++ phantomjs-1.9.0.ebuild 29 Apr 2013 16:46:25 -0000 1.5
@@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.4 2013/04/25 22:16:43 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.5 2013/04/29 16:46:25 vapier Exp $
EAPI=5
-inherit toolchain-funcs pax-utils
+inherit toolchain-funcs pax-utils multiprocessing
-DESCRIPTION="A headless WebKit scriptable with a JavaScript API."
+DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
HOMEPAGE="http://phantomjs.org/"
SRC_URI="https://phantomjs.googlecode.com/files/${P}-source.zip"
@@ -15,15 +15,22 @@
KEYWORDS="~amd64 ~x86"
IUSE="examples"
-DEPEND="media-libs/fontconfig media-libs/freetype dev-libs/icu"
-RDEPEND="${DEPEND}"
-
+RDEPEND="dev-libs/icu
+ dev-libs/openssl
+ media-libs/fontconfig
+ media-libs/freetype"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
src_prepare() {
- sed -i 's/# CONFIG += text_breaking_with_icu/CONFIG += text_breaking_with_icu/' \
- src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
+ sed -i \
+ -e '/^# CONFIG += text_breaking_with_icu/s:#::' \
+ src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri \
+ || die
+
# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
- sed -e "/^SYSTEM_VARIABLES=/i \
+ sed -i \
+ -e "/^SYSTEM_VARIABLES=/i \
CC='$(tc-getCC)'\n\
CXX='$(tc-getCXX)'\n\
CFLAGS='${CFLAGS}'\n\
@@ -35,19 +42,23 @@
QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
QMakeVar set QMAKE_LFLAGS_RELEASE\n\
QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
- -i src/qt/configure \
- || die "sed SYSTEM_VARIABLES failed"
+ src/qt/configure \
+ || die
# Respect CC, CXX, LINK and *FLAGS in config.tests
- find src/qt/config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
+ find src/qt/config.tests/unix -name '*.test' -type f -exec \
sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
- || die "sed config.tests failed"
+ {} + || die
}
src_compile() {
- ./build.sh --confirm --qt-config $(pkg-config --cflags-only-I freetype2) || die
+ ./build.sh \
+ --confirm \
+ --jobs $(makeopts_jobs) \
+ --qt-config "$($(tc-getPKG_CONFIG) --cflags-only-I freetype2)" \
+ || die
}
src_test() {
@@ -56,10 +67,10 @@
src_install() {
pax-mark m bin/phantomjs || die
- dobin bin/phantomjs || die
+ dobin bin/phantomjs
dodoc ChangeLog README.md
if use examples ; then
docinto examples
- dodoc examples/* || die
+ dodoc examples/*
fi
}
1.9 www-client/phantomjs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?r1=1.8&r2=1.9
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog 25 Apr 2013 22:06:45 -0000 1.8
+++ ChangeLog 29 Apr 2013 16:46:25 -0000 1.9
@@ -1,6 +1,9 @@
# ChangeLog for www-client/phantomjs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.8 2013/04/25 22:06:45 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.9 2013/04/29 16:46:25 vapier Exp $
+
+ 29 Apr 2013; Mike Frysinger <vapier@gentoo.org> phantomjs-1.9.0.ebuild:
+ Clean up random problems (but does not fix them all -- see #409991).
25 Apr 2013; Jason A. Donenfeld <zx2c4@gentoo.org> phantomjs-1.9.0.ebuild:
Respect CFLAGS.
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-client/phantomjs: phantomjs-1.9.0.ebuild ChangeLog
@ 2013-04-25 22:06 Jason Donenfeld (zx2c4)
0 siblings, 0 replies; 3+ messages in thread
From: Jason Donenfeld (zx2c4) @ 2013-04-25 22:06 UTC (permalink / raw
To: gentoo-commits
zx2c4 13/04/25 22:06:45
Modified: phantomjs-1.9.0.ebuild ChangeLog
Log:
Respect CFLAGS.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)
Revision Changes Path
1.3 www-client/phantomjs/phantomjs-1.9.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?r1=1.2&r2=1.3
Index: phantomjs-1.9.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- phantomjs-1.9.0.ebuild 25 Apr 2013 21:11:29 -0000 1.2
+++ phantomjs-1.9.0.ebuild 25 Apr 2013 22:06:45 -0000 1.3
@@ -1,9 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.2 2013/04/25 21:11:29 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.3 2013/04/25 22:06:45 zx2c4 Exp $
EAPI=5
+inherit toolchain-funcs
+
DESCRIPTION="A headless WebKit scriptable with a JavaScript API."
HOMEPAGE="http://phantomjs.org/"
SRC_URI="https://phantomjs.googlecode.com/files/${P}-source.zip"
@@ -20,6 +22,28 @@
src_prepare() {
sed -i 's/# CONFIG += text_breaking_with_icu/CONFIG += text_breaking_with_icu/' \
src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
+ # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
+ sed -e "/^SYSTEM_VARIABLES=/i \
+ CC='$(tc-getCC)'\n\
+ CXX='$(tc-getCXX)'\n\
+ CFLAGS='${CFLAGS}'\n\
+ CXXFLAGS='${CXXFLAGS}'\n\
+ LDFLAGS='${LDFLAGS}'\n\
+ QMakeVar set QMAKE_CFLAGS_RELEASE\n\
+ QMakeVar set QMAKE_CFLAGS_DEBUG\n\
+ QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
+ QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
+ QMakeVar set QMAKE_LFLAGS_RELEASE\n\
+ QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
+ -i src/qt/configure \
+ || die "sed SYSTEM_VARIABLES failed"
+
+ # Respect CC, CXX, LINK and *FLAGS in config.tests
+ find src/qt/config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
+ sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
+ 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
+ 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+ || die "sed config.tests failed"
}
src_compile() {
1.8 www-client/phantomjs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?r1=1.7&r2=1.8
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog 25 Apr 2013 21:11:29 -0000 1.7
+++ ChangeLog 25 Apr 2013 22:06:45 -0000 1.8
@@ -1,6 +1,9 @@
# ChangeLog for www-client/phantomjs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.7 2013/04/25 21:11:29 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.8 2013/04/25 22:06:45 zx2c4 Exp $
+
+ 25 Apr 2013; Jason A. Donenfeld <zx2c4@gentoo.org> phantomjs-1.9.0.ebuild:
+ Respect CFLAGS.
25 Apr 2013; Jason A. Donenfeld <zx2c4@gentoo.org> phantomjs-1.9.0.ebuild:
Needs icu.
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-client/phantomjs: phantomjs-1.9.0.ebuild ChangeLog
@ 2013-04-25 21:11 Jason Donenfeld (zx2c4)
0 siblings, 0 replies; 3+ messages in thread
From: Jason Donenfeld (zx2c4) @ 2013-04-25 21:11 UTC (permalink / raw
To: gentoo-commits
zx2c4 13/04/25 21:11:29
Modified: phantomjs-1.9.0.ebuild ChangeLog
Log:
Needs icu.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)
Revision Changes Path
1.2 www-client/phantomjs/phantomjs-1.9.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?r1=1.1&r2=1.2
Index: phantomjs-1.9.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phantomjs-1.9.0.ebuild 25 Apr 2013 19:36:22 -0000 1.1
+++ phantomjs-1.9.0.ebuild 25 Apr 2013 21:11:29 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.1 2013/04/25 19:36:22 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.2 2013/04/25 21:11:29 zx2c4 Exp $
EAPI=5
@@ -13,7 +13,7 @@
KEYWORDS="~amd64 ~x86"
IUSE="examples"
-DEPEND="media-libs/fontconfig media-libs/freetype"
+DEPEND="media-libs/fontconfig media-libs/freetype dev-libs/icu"
RDEPEND="${DEPEND}"
1.7 www-client/phantomjs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?r1=1.6&r2=1.7
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 25 Apr 2013 19:36:22 -0000 1.6
+++ ChangeLog 25 Apr 2013 21:11:29 -0000 1.7
@@ -1,6 +1,9 @@
# ChangeLog for www-client/phantomjs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.6 2013/04/25 19:36:22 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.7 2013/04/25 21:11:29 zx2c4 Exp $
+
+ 25 Apr 2013; Jason A. Donenfeld <zx2c4@gentoo.org> phantomjs-1.9.0.ebuild:
+ Needs icu.
*phantomjs-1.9.0 (25 Apr 2013)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-29 16:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-29 16:46 [gentoo-commits] gentoo-x86 commit in www-client/phantomjs: phantomjs-1.9.0.ebuild ChangeLog Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2013-04-25 22:06 Jason Donenfeld (zx2c4)
2013-04-25 21:11 Jason Donenfeld (zx2c4)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox