Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/webkit-gtk/ChangeLog8
-rw-r--r--net-libs/webkit-gtk/Manifest15
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch22
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild29
4 files changed, 57 insertions, 17 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 98c2f97007ee..fba7a7dfe33b 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-libs/webkit-gtk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.85 2010/11/25 07:25:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.86 2010/12/22 22:56:54 eva Exp $
+
+ 22 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> webkit-gtk-1.2.5.ebuild,
+ +files/webkit-gtk-1.2.5-tests-build.patch:
+ Make sure tests are built only when needed, bug #343249. Pin slotted
+ dependencies to needed slots. Replace addpredict by appropriate env variable
+ adjustement and do the same for tests.
25 Nov 2010; Fabian Groffen <grobian@gentoo.org> webkit-gtk-1.2.5.ebuild,
+files/webkit-gtk-1.2.5-darwin-quartz.patch,
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index ca040a1aabee..fcce616e07f8 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,14 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX webkit-gtk-1.1.15.2-unaligned.patch 4403 RMD160 c9ba117a35e07ed1097787934fdb0750b2baaab5 SHA1 fd1ddaff12705784662002554a76aea67ff70320 SHA256 8b20af7ccad9d91f8d76465843b6a40e80c59c8e9620cf7772ba6f64406b3e68
AUX webkit-gtk-1.1.15.4-darwin-quartz.patch 2353 RMD160 4293e345e05390cf93b97d381edb7c443ae0cc02 SHA1 f2d67803f59503ff9d408be0a38983ac25439dad SHA256 3aedd95fc50d92b31e6043d1e8df0c50385b96503e94945547b1f65675f21a12
AUX webkit-gtk-1.1.15.4-icu44.patch 4907 RMD160 aec153a9a9cbeb435a0e28ba567daf215380d870 SHA1 c5366b8f1e65105faa170ef8c90c1d94f739fec2 SHA256 75a6f47728436082b5039f961f3dc5a10888c1c49779c2b4dcbb0321cf65ef8e
AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b54917a3311553cc78 SHA1 8c4e6c5e7c0c957ee1743a0d347b50f992460c17 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434
AUX webkit-gtk-1.2.5-darwin-quartz.patch 1984 RMD160 5995be8598b62aff487726de02ac12b1a79357b4 SHA1 c7f0c5ac74f8a92f93ab36cfa1e1356f6112eac8 SHA256 8f37d606dec60186c10cca8795adc1dd3c8ec4ded86c94bad3036ed955573b78
AUX webkit-gtk-1.2.5-darwin8.patch 1152 RMD160 a546515b8a088f8f11e532662833c3e41ad6df83 SHA1 e1e841cae9d5a70940630a918b40ac4b27497c58 SHA256 51e3fb832793cb0be13ceff63d1b4c4ef82efaa7b3151ab53d04ae966d65efa6
+AUX webkit-gtk-1.2.5-tests-build.patch 526 RMD160 c336c7309899169a2691bf3b984fa4df480b2ad4 SHA1 c25129b41dcca46424d58c3796f7207119e4a790 SHA256 aa2875954048318f2a9c5035b670774a1c5ce1b641b067f936fa076f38659383
DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d1659513e SHA1 0778b130720756d880c2bbe9eeef79f35bcf861a SHA256 ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
DIST webkit-1.2.3.tar.gz 6740030 RMD160 41fa194de2865867dbf7d1156d0962a7580f2275 SHA1 88c38ebeba187a062272b2aa8ca2bbd0bbb86306 SHA256 ff70b25ea8dedc0031f29f2ea8d9aa226bfa65ebd2f12772390f4e2845306fe1
DIST webkit-1.2.5.tar.gz 6727977 RMD160 7510af4c5d15c06adf984a090a9e9550f5ea7147 SHA1 2cd50e62a0c94bba8cc8a8466ea16fac1f9fc1ce SHA256 b08a69a9ccbd84b2e23a94caf7eb5cfc390bb6cef49a4921b5eb11860b329d41
EBUILD webkit-gtk-1.1.15.4.ebuild 2557 RMD160 771413d3807a9da4522f483f4e838b8120177175 SHA1 7d71f4cacd1ebf7d8066f4e9e3cbb055c5515e58 SHA256 f1c9236bb0cefb171230c5b6852f2ce96036c75e25b45bbf262f81475386f89a
EBUILD webkit-gtk-1.2.3.ebuild 3225 RMD160 1b77c8ffe7a7670f4b3ad7a47531589d3f4ede09 SHA1 d9455dd4b8212de85f15197750959b7d28d58cd1 SHA256 c986810420fb57c811bfb548201749df24d74bdd2cd73bbe7490f2a4d05f82b1
-EBUILD webkit-gtk-1.2.5.ebuild 3046 RMD160 d34cbc829f8210f06382e08a0a5299f0f7c8b443 SHA1 bda4b76c3db66326c9d645037187ea685d72a612 SHA256 c81a3296f5cb6d0343c5be3a47d4a18c4da845405be1cab1b67e33bda6549b88
-MISC ChangeLog 17543 RMD160 33c1aa11e5b83fb6f17a76190978bdd533476fcc SHA1 9b02c5e6361e0364f2072bb7314de65250f0446c SHA256 9cf049cbf5d343869fc4a6d3b68053c5eae0b2f15a779eea8104f7a3379105d1
+EBUILD webkit-gtk-1.2.5.ebuild 3155 RMD160 dc0c1b728ec1705ec118c5e07abe718077b29f27 SHA1 39017c268c5325b6428f7ec6ba891dad60f611f7 SHA256 441bea58eddc695a44b718550f3f7d25e75e68c6626cdd8bb172d5804f280f04
+MISC ChangeLog 17855 RMD160 40bb9e8cdb4bbdeef6596f24fff75e8bd4c979e5 SHA1 c5c89a3d562d5f46036a9f933b97710c073f2f86 SHA256 90401677879ceefacac16d1df02e492817593140e98d6f530e299d100c69ebf2
MISC metadata.xml 415 RMD160 4cf82e15e7b1dadf71e0b4549a01b41f508d36e2 SHA1 f74ebd33bba8b57f7714e7267e2f13f97277bd38 SHA256 7498f904ea7154281d4082a83ff5a47647bdfca09ee3da630dd8e6a1ee6b0e1e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0SgjsACgkQ1fmVwcYIWAZ37QCgp/ga7DaCns4smAqHWeKpu9hg
+b0MAoLVg5RqKBdvlv1A85wIrNwXjvLtQ
+=t9yi
+-----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch
new file mode 100644
index 000000000000..0d9e1448056e
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch
@@ -0,0 +1,22 @@
+Do not build tests if not requested to.
+
+--- a/GNUmakefile.am 2010-12-21 17:23:58.000000000 +0100
++++ b/GNUmakefile.am 2010-12-21 17:24:28.000000000 +0100
+@@ -46,7 +46,8 @@
+
+ # Libraries and support components
+ bin_PROGRAMS :=
++check_PROGRAMS :=
+ noinst_PROGRAMS :=
+ noinst_HEADERS :=
+ noinst_LTLIBRARIES :=
+ lib_LIBRARIES :=
+@@ -541,7 +541,7 @@
+ include WebKit/gtk/po/GNUmakefile.am
+
+ # Build unit tests
+-noinst_PROGRAMS += $(TEST_PROGS)
++check_PROGRAMS += $(TEST_PROGS)
+
+ webkit_tests_cflags = \
+ -fno-strict-aliasing \
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
index 966a7557234b..90eeab858c81 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.4 2010/11/25 07:25:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.5 2010/12/22 22:56:54 eva Exp $
EAPI="3"
@@ -26,10 +26,10 @@ RDEPEND="
virtual/jpeg
>=media-libs/libpng-1.4
x11-libs/cairo
- >=x11-libs/gtk+-2.13[aqua=]
- >=dev-libs/glib-2.21.3
+ >=x11-libs/gtk+-2.13:2[aqua=]
+ >=dev-libs/glib-2.21.3:2
>=dev-libs/icu-3.8.1-r1
- >=net-libs/libsoup-2.29.90
+ >=net-libs/libsoup-2.29.90:2.4
>=dev-db/sqlite-3
>=app-text/enchant-0.22
>=x11-libs/pango-1.12
@@ -64,6 +64,9 @@ src_prepare() {
# Don't force -O2
sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
+ # Don't build tests if not needed, part of bug #343249
+ epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
# Prevent maintainer mode from being triggered during make
AT_M4DIR=autotools eautoreconf
}
@@ -90,19 +93,17 @@ src_configure() {
econf ${myconf}
}
-src_test() {
- unset DISPLAY
- # Tests can fail without it, bug 323669
- export XDG_DATA_HOME="${T}"
- # Tests will fail without it, bug 294691, bug 310695
- Xemake check || die "Test phase failed"
-}
-
src_compile() {
# Fix sandbox error with USE="introspection"
# https://bugs.webkit.org/show_bug.cgi?id=35471
- addpredict "$(unset HOME; echo ~)/.local"
- emake || die "Compile failed"
+ emake XDG_DATA_HOME="${T}/.local" || die "Compile failed"
+}
+
+src_test() {
+ unset DISPLAY
+ # Tests need virtualx, bug #294691, bug #310695
+ # Set XDG_DATA_HOME for introspection tools, bug #323669
+ Xemake check XDG_DATA_HOME="${T}/.local" || die "Test phase failed"
}
src_install() {