From 72a7d5522a16c4b815e9ba3cddc72f3f469d4c4b Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Thu, 6 Aug 2009 04:56:07 +0000 Subject: Add patch from upstream to fix symbol conflict with GSocket struct from developmental glib currently in gnome-overlay. Bug #278778. Package-Manager: portage-2.2_rc35/cvs/Linux x86_64 --- x11-libs/wxGTK/ChangeLog | 10 +- x11-libs/wxGTK/Manifest | 11 +- x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch | 16 ++ x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild | 220 ++++++++++++++++++++++ x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild | 159 ++++++++++++++++ 5 files changed, 411 insertions(+), 5 deletions(-) create mode 100644 x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch create mode 100644 x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild create mode 100644 x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild (limited to 'x11-libs/wxGTK') diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index 0525982087d1..e95dcb909c49 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/wxGTK # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.238 2009/07/29 21:43:35 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.239 2009/08/06 04:56:07 dirtyepic Exp $ + +*wxGTK-2.8.10.1-r3 (06 Aug 2009) +*wxGTK-2.6.4.0-r6 (06 Aug 2009) + + 06 Aug 2009; Ryan Hill +wxGTK-2.6.4.0-r6.ebuild, + +wxGTK-2.8.10.1-r3.ebuild, +files/wxGTK-2.8.10.1-gsocket.patch: + Add patch from upstream to fix symbol conflict with GSocket struct from + developmental glib currently in gnome-overlay. Bug #278778. 29 Jul 2009; Markus Meier wxGTK-2.6.4.0-r5.ebuild, wxGTK-2.8.10.1-r1.ebuild: diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index d10ef1484a33..4595899ce541 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -8,6 +8,7 @@ AUX wxGTK-2.6.4.0-g_free.patch 1102 RMD160 a2b4fc260d834b5e8c5244a19b61dd2f74c9c AUX wxGTK-2.6.4.0-wxrc_link_fix.patch 1085 RMD160 2af7918740d4826822af82a50b63ea00c5f40694 SHA1 c03791332103b199921dbe6e132d5f215d3a2aee SHA256 63cec2a3eb7c0a12c92230a68aa5878d518f7ebe504d8714c49140a23e72fbd3 AUX wxGTK-2.8.10-collision.patch 6255 RMD160 ad41118f5a001741a5cc331cf7007bd702182b28 SHA1 0803811fb1cdeeec80a492fcc0a4b171d2986321 SHA256 d68c60125076dceaf96bfdb03821142209b6d5c79a6dec41cffda0feace5ce01 AUX wxGTK-2.8.10.1-CVE-2009-2369.patch 2348 RMD160 0b0c37a21bd68a99d837592c7745bb9d4f783ebb SHA1 36e74d5384e912f6bf1890c582d872b805e5bbfb SHA256 6a7427a621bc33b65928aee09261be28bfb4b85568554ae5c9c1fc147aea2e9e +AUX wxGTK-2.8.10.1-gsocket.patch 480 RMD160 8aa2654dfe926980388235a91d78aa73fc8471d1 SHA1 885442567f2f80f78f9ed4f0ac2483c6fc932efe SHA256 a2955800a8ece8d3e328d0a287bd73d021cf7e14898432b1771e708a1f960fac AUX wxGTK-2.8.6-wxrc_link_fix.patch 989 RMD160 baf0009e0ecfe68b25df80e6b0956ef08f9e8bfd SHA1 dc8d7474647b5d8d0b9bc7c9bdf77899351808c1 SHA256 4eac080fe34870398309623cb363573b2d0242eb1dd24534efde4e7237c05fd0 AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85 AUX wxGTK-2.8.8-collision.patch 6072 RMD160 28101d936ed94190fa9a38c707f804c113a3e413 SHA1 66a7d717c5f3dc78fc3f0b451de178423b255399 SHA256 21949c67d2977a5bb59e22e73fcbeb8631462ec38fc864d4975309b3f24d69a0 @@ -20,16 +21,18 @@ DIST wxPython-src-2.8.9.2.tar.bz2 29370216 RMD160 93a9bd35b59e16674375b1431e24d4 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c EBUILD wxGTK-2.6.4.0-r4.ebuild 4710 RMD160 08573f1b1e490e6d08ef282b08b4805653062757 SHA1 beebb30d9eadf9cd1938927adbdb2ebef734c6b4 SHA256 8c4fb921e21b30fb18ba73827939af2b84f148c7f945587f4a3839237789b068 EBUILD wxGTK-2.6.4.0-r5.ebuild 4766 RMD160 96c9d1daa572e51db7142e7e96ede8ccf8a55fec SHA1 b1edeeba3ec50edac4c2d16421907600959ab2bc SHA256 72a320a0d8a2742cd00686d2e097fa3ee6360220ba0ae9435c4923426d002338 +EBUILD wxGTK-2.6.4.0-r6.ebuild 4829 RMD160 4bc062f5daa70dcdd1ff731975cb1a0307471886 SHA1 cd57a191ccbb8fea9aa578c184e0609355a798e1 SHA256 d6f3674d9ec3c869aae0304ef13d2d0d26418d62fbd75382143c74026991ae81 EBUILD wxGTK-2.8.10.1-r1.ebuild 3588 RMD160 08c246b8c2651bf26a3250b9e8c4b8fbb6e94818 SHA1 697540aea5ab9815ebab8abd1e9291a478e58e32 SHA256 39d95da1522cc0926c5ba1f129e1f1f4803a98bce41780bcb68ada92afd216fc +EBUILD wxGTK-2.8.10.1-r3.ebuild 3664 RMD160 024ea2169e17b5aa8e5acb09db2767adcb1d3711 SHA1 a41444b2fa37bb1f30b74ecd0d8a0b5665861d53 SHA256 f2ac421a3b12f25d87de92f110ee835987cada63898fac69980f180ad2bca9d9 EBUILD wxGTK-2.8.10.1.ebuild 3502 RMD160 7b54c24e96ffdb868b9ac3250bfa7aa971a61bbf SHA1 adc06db875dbb597518f65d48ae8dfedbcf684c5 SHA256 1d926973f78bc5df6d5df6b6136c32ef8f90b294ad6a3e7c845e4c4ee80fed0b EBUILD wxGTK-2.8.9.1-r3.ebuild 3503 RMD160 1cf46a38c02ff151e695ba1cc52a7cf27e020977 SHA1 69e5b404de10168c7a8ff7060d0fdec947c63d0a SHA256 4eac832ee9ee321fbedb5b5096e807553115edf2eb37c9aa0616d732cd5b3c80 EBUILD wxGTK-2.8.9.2-r1.ebuild 3631 RMD160 e2a708203df47021c89d934389a221378deb4e45 SHA1 156f00e2dbff86f81750938266beafc9d136d6d7 SHA256 9c6c499f711444780d0cddc5fdedbca70d2c1f3689bc549c9e758818e145760c -MISC ChangeLog 36959 RMD160 02246ad634d93939cf9e00514eeafd40f1929ccf SHA1 baef76ab013f706f47f142fe0071e520bcf311da SHA256 602fabb4e69393f03d83aeb421afc0f537cabf7e344b8f40a3e5eb5671e19c84 +MISC ChangeLog 37305 RMD160 01b838d93667ae472cc3976fb5f27243f213cfd5 SHA1 f93cae86c20d46427929ac2d44e75adf28b5fac9 SHA256 e56d4c2eb4df5af502de524b1ecf8af817c7c3d09dbf634b65e48e4ec235384a MISC metadata.xml 500 RMD160 d0f05c0d915928bc4c424ca00f20621805ddc7f0 SHA1 3ba77d570e4764cf377b3e63078b21f69232a1fc SHA256 2592b31d76fd0a79aa634bcbc9697d7ee8420b89cbead01a8db562a4d66be98c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkpwwrkACgkQkKaRLQcq0GKyXgCfTivCm2JVySjqoMStpgbwTJLl -egUAn2jZtlHnGRRnsmwVL2tTU0DG4qOl -=b2i/ +iEYEARECAAYFAkp6YocACgkQiqiDRvmkBmLe/ACgzlavyy3O2D2UyVYx6IrOS1zY +N6sAn2Dm/w3X6Z+mhG7MG8NENjZQnDu6 +=r8rO -----END PGP SIGNATURE----- diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch new file mode 100644 index 000000000000..b875cb814ad6 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch @@ -0,0 +1,16 @@ +--- wxPython-src-2.8.10.1-orig/src/gtk/gsockgtk.cpp ++++ wxPython-src-2.8.10.1/src/gtk/gsockgtk.cpp +@@ -15,8 +15,13 @@ + #include + #include + ++// newer versions of glib define its own GSocket but we unfortunately use this ++// name in our own (semi-)public header and so can't change it -- rename glib ++// one instead ++#define GSocket GlibGSocket + #include + #include ++#undef GSocket + + #include "wx/gsocket.h" + #include "wx/unix/gsockunx.h" diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild new file mode 100644 index 000000000000..75cd4e24820d --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild @@ -0,0 +1,220 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.1 2009/08/06 04:56:07 dirtyepic Exp $ + +inherit eutils versionator flag-o-matic + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit." +HOMEPAGE="http://wxwidgets.org/" + +BASE_PV="$(get_version_component_range 1-3)" +BASE_P="${PN}-${BASE_PV}" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 + doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="X doc debug gnome odbc opengl pch sdl unicode" + +RDEPEND=" + dev-libs/expat + odbc? ( dev-db/unixODBC ) + sdl? ( media-libs/libsdl ) + X? ( + >=x11-libs/gtk+-2.0 + >=dev-libs/glib-2.0 + media-libs/jpeg + media-libs/tiff + x11-libs/libSM + x11-libs/libXinerama + x11-libs/libXxf86vm + gnome? ( gnome-base/libgnomeprintui ) + opengl? ( virtual/opengl ) + )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" + +PDEPEND=">=app-admin/eselect-wxwidgets-0.7" + +SLOT="2.6" +LICENSE="wxWinLL-3 + GPL-2 + odbc? ( LGPL-2 ) + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" +HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + # General Patches + + epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch + epatch "${FILESDIR}"/${BASE_P}-collision.patch + epatch "${FILESDIR}"/${BASE_P}-mmedia.patch # Bug #174874 + + # Patches Specific to this version + + epatch "${FILESDIR}"/${P}-wxrc_link_fix.patch + epatch "${FILESDIR}"/${P}-g_free.patch + epatch "${FILESDIR}"/${PN}-2.8.10.1-CVE-2009-2369.patch + epatch "${FILESDIR}"/${PN}-2.8.10.1-gsocket.patch + + # Reverse apply patch in wxPython tarball that breaks ABI + EPATCH_SINGLE_MSG="Reversing listctrl-ongetitemcolumnimage.patch ..." \ + EPATCH_OPTS="-R" epatch "${S}"/patches/listctrl-ongetitemcolumnimage.patch + + # wxBase has an automagic sdl dependency. short circuit it here. + # http://bugs.gentoo.org/show_bug.cgi?id=91574 + use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure +} + +src_compile() { + local myconf + + append-flags -fno-strict-aliasing + + # X independent options + myconf="--enable-shared + --enable-compat24 + --with-regex=builtin + --with-zlib=sys + --with-expat + $(use_enable pch precomp-headers) + $(use_with sdl) + $(use_with odbc)" + + # wxGTK only + use X && \ + myconf="${myconf} + --enable-gui + --with-libpng + --with-libxpm + --with-libjpeg + --with-libtiff + $(use_enable opengl) + $(use_with opengl) + $(use_with gnome gnomeprint)" + + # wxBase only + use X || \ + myconf="${myconf} + --disable-gui" + + # in 2.6 we always build ansi + # everything else is controlled by USE + if ! use debug; then + build_wx ansi + else + build_wx ansi-debug + fi + + if use unicode; then + if ! use debug; then + build_wx unicode + else + build_wx unicode-debug + fi + fi +} + +src_install() { + # Note - the last version to be installed becomes the default, so install + # ansi after unicode + install_wx unicode + install_wx unicode-debug + install_wx ansi + install_wx ansi-debug + + dodoc "${S}"/docs/changes.txt + dodoc "${S}"/docs/gtk/readme.txt + + if use doc; then + dohtml -r "${HTML_S}"/docs/html/* + fi + + # We don't want this + rm "${D}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo +} + +pkg_postinst() { + has_version app-admin/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-admin/eselect-wxwidgets \ + && eselect wxwidgets update +} + +build_wx() { + local build_wx_conf + + case "$1" in + ansi) + build_wx_conf="${build_wx_conf} + --disable-unicode" + ;; + + ansi-debug) + build_wx_conf="${build_wx_conf} + --disable-unicode + --enable-debug_flag" + ;; + + unicode) + build_wx_conf="${build_wx_conf} + --enable-unicode" + ;; + + unicode-debug) + build_wx_conf="${build_wx_conf} + --enable-unicode + --enable-debug_flag" + ;; + + *) + eerror "wxlib.class: build_wx called with invalid argument(s)." + die "wxlib.class: build_wx called with invalid argument(s)." + ;; + esac + + mkdir -p build_$1 + pushd build_$1 + + ECONF_SOURCE="${S}" econf \ + ${myconf} \ + ${build_wx_conf} \ + || die "Failed to configure $1." + + emake || die "Failed to make $1." + + if [[ -e contrib/src ]]; then + cd contrib/src + emake || die "Failed to make $1 contrib." + fi + + popd +} + +install_wx() { + if [[ -d build_$1 ]]; then + pushd build_$1 + emake DESTDIR="${D}" install || die "Failed to install $1." + if [[ -e contrib/src ]]; then + cd contrib/src + emake DESTDIR="${D}" install || die "Failed to install $1 contrib." + fi + popd + fi +} diff --git a/x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild b/x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild new file mode 100644 index 000000000000..0c89ff285334 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild,v 1.1 2009/08/06 04:56:07 dirtyepic Exp $ + +EAPI="2" + +inherit eutils versionator flag-o-matic + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit." +HOMEPAGE="http://wxwidgets.org/" + +BASE_PV="$(get_version_component_range 1-3)" +BASE_P="${PN}-${BASE_PV}" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# docs, and are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="X doc debug gnome gstreamer odbc opengl pch sdl" + +RDEPEND=" + dev-libs/expat + odbc? ( dev-db/unixODBC ) + sdl? ( media-libs/libsdl ) + X? ( + >=x11-libs/gtk+-2.4 + >=dev-libs/glib-2.4 + media-libs/jpeg + media-libs/tiff + x11-libs/libSM + x11-libs/libXinerama + x11-libs/libXxf86vm + gnome? ( gnome-base/libgnomeprintui ) + gstreamer? ( + >=gnome-base/gconf-2.0 + >=media-libs/gstreamer-0.10 ) + opengl? ( virtual/opengl ) + )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" + +PDEPEND=">=app-admin/eselect-wxwidgets-0.7" + +SLOT="2.8" +LICENSE="wxWinLL-3 + GPL-2 + odbc? ( LGPL-2 ) + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch + epatch "${FILESDIR}"/${PN}-2.8.10-collision.patch + epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874 + # this version only: + epatch "${FILESDIR}"/${P}-CVE-2009-2369.patch # Bug #277722 + epatch "${FILESDIR}"/${P}-gsocket.patch # Bug #278778 +} + +src_configure() { + local myconf + + append-flags -fno-strict-aliasing + + # X independent options + myconf="--enable-compat26 + --enable-shared + --enable-unicode + --with-regex=builtin + --with-zlib=sys + --with-expat=sys + $(use_enable debug) + $(use_enable pch precomp-headers) + $(use_with sdl)" + + use odbc \ + && myconf="${myconf} --with-odbc=sys" \ + || myconf="${myconf} $(use_with odbc)" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-libtiff=sys + $(use_enable gstreamer mediactrl) + $(use_enable opengl) + $(use_with opengl) + $(use_with gnome gnomeprint) + --without-gnomevfs" + + # wxBase options + use X || \ + myconf="${myconf} + --disable-gui" + + mkdir "${S}"/wxgtk_build + cd "${S}"/wxgtk_build + + ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed." +} + +src_compile() { + cd "${S}"/wxgtk_build + + emake || die "make failed." + + if [[ -d contrib/src ]]; then + cd contrib/src + emake || die "make contrib failed." + fi +} + +src_install() { + cd "${S}"/wxgtk_build + + emake DESTDIR="${D}" install || die "install failed." + + if [[ -d contrib/src ]]; then + cd contrib/src + emake DESTDIR="${D}" install || die "install contrib failed." + fi + + cd "${S}"/docs + dodoc changes.txt readme.txt todo30.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dohtml -r "${S}"/docs/html/* + fi + + # We don't want this + rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo +} + +pkg_postinst() { + has_version app-admin/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-admin/eselect-wxwidgets \ + && eselect wxwidgets update +} -- cgit v1.2.3-65-gdbad