summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2008-01-06 22:47:55 +0000
committerRyan Hill <rhill@gentoo.org>2008-01-06 22:47:55 +0000
commit3486e3d106f61d6e461990a99987738d0741bc74 (patch)
treeaed8d64d92f02ca5436acf36beff00fa9c21b665 /x11-libs/wxGTK
parentMarked stable on amd64 as per bug 203756. (diff)
downloadhistorical-3486e3d106f61d6e461990a99987738d0741bc74.tar.gz
historical-3486e3d106f61d6e461990a99987738d0741bc74.tar.bz2
historical-3486e3d106f61d6e461990a99987738d0741bc74.zip
Revision bump.
- prevent segfault by configuring with --without-gnomevfs (Bug #203389) - don't build the mmedia contrib library (indirectly fixes Bug #174874) Package-Manager: portage-2.1.4_rc14
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r--x11-libs/wxGTK/ChangeLog13
-rw-r--r--x11-libs/wxGTK/Manifest32
-rw-r--r--x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1-r1 (renamed from x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1)0
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch11
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.7.1-r1.ebuild (renamed from x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild)17
5 files changed, 47 insertions, 26 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index d44ca1bac554..42b9f50a4f16 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for x11-libs/wxGTK
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.174 2007/12/23 18:28:42 dirtyepic Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.175 2008/01/06 22:47:55 dirtyepic Exp $
+
+*wxGTK-2.8.7.1-r1 (06 Jan 2008)
+
+ 06 Jan 2008; Ryan Hill <dirtyepic@gentoo.org>
+ +files/wxGTK-2.8.7-mmedia.patch, -wxGTK-2.8.7.1.ebuild,
+ +wxGTK-2.8.7.1-r1.ebuild:
+ Revision bump.
+ - prevent segfault by configuring with --without-gnomevfs (Bug #203389)
+ - don't build the mmedia contrib library (indirectly fixes Bug #174874)
23 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.7.1.ebuild:
Restore dropped ppc keyword for bug #199594.
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 6826c1386086..e0309f188a3b 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -25,6 +25,10 @@ AUX wxGTK-2.8.6-wxrc_link_fix.patch 989 RMD160 baf0009e0ecfe68b25df80e6b0956ef08
MD5 a4380d52dd58eda96d6c7809aab8ca68 files/wxGTK-2.8.6-wxrc_link_fix.patch 989
RMD160 baf0009e0ecfe68b25df80e6b0956ef08f9e8bfd files/wxGTK-2.8.6-wxrc_link_fix.patch 989
SHA256 4eac080fe34870398309623cb363573b2d0242eb1dd24534efde4e7237c05fd0 files/wxGTK-2.8.6-wxrc_link_fix.patch 989
+AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85
+MD5 52754371c5ff2d09e331aca811a22053 files/wxGTK-2.8.7-mmedia.patch 585
+RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 files/wxGTK-2.8.7-mmedia.patch 585
+SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85 files/wxGTK-2.8.7-mmedia.patch 585
DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
DIST wxPython-src-2.8.7.1.tar.bz2 26362160 RMD160 c22d6eb1dfcd165226b0ff50bfeb2aed21763a8e SHA1 5526ee4c4cc57bcebb4950ea05e24639ef8b02dd SHA256 4683dd50208b816a7fa482c4694fc4c132d8a18708102898377388ea32e083f3
DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
@@ -36,14 +40,14 @@ EBUILD wxGTK-2.6.4.0-r3.ebuild 4631 RMD160 2ec38dccb57f21b115e60bd901af203dd2326
MD5 44fec340d766b9eacbfb81b2cad14ed7 wxGTK-2.6.4.0-r3.ebuild 4631
RMD160 2ec38dccb57f21b115e60bd901af203dd2326387 wxGTK-2.6.4.0-r3.ebuild 4631
SHA256 0082aea03e423c3f7d351f0a30c518122bad52f0898f87e012c2d2deb53a6f3c wxGTK-2.6.4.0-r3.ebuild 4631
-EBUILD wxGTK-2.8.7.1.ebuild 3186 RMD160 ae97be2ef91ee41e30266885d79ec25d3d02a7ae SHA1 7da00dcbf1ff1179dd1b77edc49e72dbd514a7b4 SHA256 8b5c5fe6ff8f0eec472a25eb179e1ddb0f704c8f5a4058fb80a32439294c4de8
-MD5 642086b43a47d4ca0df43752efce103f wxGTK-2.8.7.1.ebuild 3186
-RMD160 ae97be2ef91ee41e30266885d79ec25d3d02a7ae wxGTK-2.8.7.1.ebuild 3186
-SHA256 8b5c5fe6ff8f0eec472a25eb179e1ddb0f704c8f5a4058fb80a32439294c4de8 wxGTK-2.8.7.1.ebuild 3186
-MISC ChangeLog 27510 RMD160 bcec7e27dda1e6417fa964caa659c3dff081072f SHA1 f380969a41d0fa95c3af05a7d34bd01e5d67afb1 SHA256 f32bf14585dea6e562ecb743ab66ce301d785ab3ca8db2d989e8f798d48cfc69
-MD5 eaa1a6f5357e90ec8748c2acbb303166 ChangeLog 27510
-RMD160 bcec7e27dda1e6417fa964caa659c3dff081072f ChangeLog 27510
-SHA256 f32bf14585dea6e562ecb743ab66ce301d785ab3ca8db2d989e8f798d48cfc69 ChangeLog 27510
+EBUILD wxGTK-2.8.7.1-r1.ebuild 3264 RMD160 6eac8c5729892d35a93f97e33f7de62240f5f208 SHA1 8ac09fb498e1f89623bcd18207ea132d0b844bb5 SHA256 1b5f0bd09e0da56306f210bce0f386bc333178a2875233bd79e25dd8e2066096
+MD5 093047fced475788ab968b0f1e92f4f7 wxGTK-2.8.7.1-r1.ebuild 3264
+RMD160 6eac8c5729892d35a93f97e33f7de62240f5f208 wxGTK-2.8.7.1-r1.ebuild 3264
+SHA256 1b5f0bd09e0da56306f210bce0f386bc333178a2875233bd79e25dd8e2066096 wxGTK-2.8.7.1-r1.ebuild 3264
+MISC ChangeLog 27845 RMD160 f3205abe031d55d77cb6f4cd49eed4269b8339a9 SHA1 b736cd2c1cd8cd6f58f62dd83d250b5b16b210dc SHA256 b04267f6ed0996b929c9e87db0b992fb7ab420d19a26be5f08a767556f07194f
+MD5 36dbafba69d5a97af2e8d1e506e5d717 ChangeLog 27845
+RMD160 f3205abe031d55d77cb6f4cd49eed4269b8339a9 ChangeLog 27845
+SHA256 b04267f6ed0996b929c9e87db0b992fb7ab420d19a26be5f08a767556f07194f ChangeLog 27845
MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -54,13 +58,13 @@ SHA256 c6fc3d1efa916b8bed0c000de832879341897fd2c70ce23a6f5fe2b711e5b2d9 files/di
MD5 93bb905fd69b1ddd387cf1e25b310ff7 files/digest-wxGTK-2.6.4.0-r3 536
RMD160 02d6744262a4fcfa2095c4a56a9ac0e00e74e327 files/digest-wxGTK-2.6.4.0-r3 536
SHA256 c6fc3d1efa916b8bed0c000de832879341897fd2c70ce23a6f5fe2b711e5b2d9 files/digest-wxGTK-2.6.4.0-r3 536
-MD5 16a83c00efb7cffcc252710da5e1b150 files/digest-wxGTK-2.8.7.1 271
-RMD160 979ef657661bd66c15cbedf5d9707535ae0ab30f files/digest-wxGTK-2.8.7.1 271
-SHA256 8531b5ba29a31f35b419ac4a011209640df603c73b00cc48b9aa092ca02e5534 files/digest-wxGTK-2.8.7.1 271
+MD5 16a83c00efb7cffcc252710da5e1b150 files/digest-wxGTK-2.8.7.1-r1 271
+RMD160 979ef657661bd66c15cbedf5d9707535ae0ab30f files/digest-wxGTK-2.8.7.1-r1 271
+SHA256 8531b5ba29a31f35b419ac4a011209640df603c73b00cc48b9aa092ca02e5534 files/digest-wxGTK-2.8.7.1-r1 271
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.8 (GNU/Linux)
-iEYEARECAAYFAkduqN8ACgkQiqiDRvmkBmIgmwCg7SsjLn741d4AvWvt21GlDwAQ
-C1kAoOF9P/vsmorCv06RRrdETarxfKDI
-=cmtD
+iEYEARECAAYFAkeBWqYACgkQiqiDRvmkBmIysACglLx2HYeg03MIG1/Z6930E/Bn
+/agAn3MeTWc5UbMK40n8r6qgor/EAlp9
+=x+dk
-----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1 b/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1-r1
index 37ff37eafa0c..37ff37eafa0c 100644
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1-r1
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
new file mode 100644
index 000000000000..3972fcbe6754
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
@@ -0,0 +1,11 @@
+diff -Naur wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in wxPython-src-2.8.7.1/contrib/src/Makefile.in
+--- wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in 2007-07-27 17:57:27.000000000 -0600
++++ wxPython-src-2.8.7.1/contrib/src/Makefile.in 2007-12-28 17:34:28.000000000 -0600
+@@ -1,6 +1,6 @@
+ # $Id: wxGTK-2.8.7-mmedia.patch,v 1.1 2008/01/06 22:47:55 dirtyepic Exp $
+
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet mmedia
+
+ all:
+ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.7.1-r1.ebuild
index 87002611d088..8a32c54af79a 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.7.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v 1.7 2007/12/23 18:28:42 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1-r1.ebuild,v 1.1 2008/01/06 22:47:55 dirtyepic Exp $
inherit eutils versionator flag-o-matic
@@ -59,16 +59,10 @@ src_unpack() {
unpack ${A}
cd "${S}"
- # General patches
-
epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
epatch "${FILESDIR}"/${PN}-2.8.4-collision.patch
epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch
-
- # Patches specific to this Version
-
- # none yet :)
-
+ epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874
}
src_compile() {
@@ -89,6 +83,9 @@ src_compile() {
$(use_with odbc)"
# wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+
use X && \
myconf="${myconf}
--enable-graphics_ctx
@@ -101,7 +98,7 @@ src_compile() {
$(use_enable opengl)
$(use_with opengl)
$(use_with gnome gnomeprint)
- $(use_with gnome gnomevfs)"
+ --without-gnomevfs"
# wxBase options
use X || \