From d876a980f2c51caed2da714728a65c02f7add7df Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Fri, 6 Jul 2007 10:08:18 +0000 Subject: Version bump svn path=/; revision=131 --- x11-libs/wxGTK/ChangeLog | 8 ++ x11-libs/wxGTK/Manifest | 18 +++- x11-libs/wxGTK/files/socketfix.patch | 29 ------ x11-libs/wxGTK/wxGTK-2.8.3.0.ebuild | 186 ----------------------------------- x11-libs/wxGTK/wxGTK-2.8.4.0.ebuild | 174 ++++++++++++++++++++++++++++++++ 5 files changed, 196 insertions(+), 219 deletions(-) create mode 100644 x11-libs/wxGTK/ChangeLog delete mode 100644 x11-libs/wxGTK/files/socketfix.patch delete mode 100644 x11-libs/wxGTK/wxGTK-2.8.3.0.ebuild create mode 100644 x11-libs/wxGTK/wxGTK-2.8.4.0.ebuild diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog new file mode 100644 index 0000000..8a8480d --- /dev/null +++ b/x11-libs/wxGTK/ChangeLog @@ -0,0 +1,8 @@ +# ChangeLog for x11-libs/wxGTK +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 06 Jul 2007; Timothy Redaelli ++, + -files/socketfix.patch, -wxGTK-2.8.3.0.ebuild: + Version bump + diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 05ba009..bdd65c2 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,4 +1,14 @@ -AUX socketfix.patch 1034 RMD160 d04b4d76a5ea104b27eda6b88f5932c7dacc459a SHA1 9388f32a91366149d826f9c97766aacb7d8d75bf SHA256 0e7ddd814b9dc6ebf59a310c222602df29cfad2b1659bd97b30caf55887fa6ef -DIST wxPython-src-2.8.3.0.tar.bz2 25004220 RMD160 f958cc7a3523b66c46d61c77c20b39280f008e68 SHA1 bcb931d00f3f5a218b8806bba8ba7424cbd08605 SHA256 086f8efa6ca7378463293226c39bd3ce17a7534e42651abbc2d9f8a00a260acb -DIST wxWidgets-2.8.3-HTML.tar.gz 1754449 RMD160 f9f39ee33d3ccd4b200ee853777349ae2c505117 SHA1 046bc7ab5b5e881cf8d5120238aaa3f4d5d8948d SHA256 e4828c0a4f86681c152486b6f47d13e87052ea94a8a6b0e55526d699e21fe7fb -EBUILD wxGTK-2.8.3.0.ebuild 5229 RMD160 3a53e29708e6da970a76ee3aea23c2257b962f12 SHA1 a01982ada3888e9b292a2db14c0671786722b8a2 SHA256 ca7c34603ab80a8f3cae16de82b48ac2c2170025349922b5e340692036b42fdb +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +DIST wxPython-src-2.8.4.0.tar.bz2 25133956 RMD160 bbf8b040d0a990f0ac8324066cf8fe29cab84ba6 SHA1 0947c74762d1419f503d19b8b5fe4ac7c81b9cc6 SHA256 d0e007634b762fd2e98f29636ceabc5738cc92adf5c11b8553780ece64127252 +DIST wxWidgets-2.8.4-HTML.tar.gz 1596934 RMD160 65d0e8ff0aac36a46e20aa406979754545d806f3 SHA1 33c8716653805d0807f32b3ebdae84c672549233 SHA256 879a7ceb6e7eed258dffcf7236c7f99c307faba9a9325a53c86c789198f36241 +EBUILD wxGTK-2.8.4.0.ebuild 4862 RMD160 a665401b5ae9cdb3d58aacdc71f98bb93aaf6dd6 SHA1 3703c18c40a99507ad512f228ac5e017a674151f SHA256 03b675dc4d035429eaba393669a1b50d5a401182977c76fcf254bcf17801e2b7 +MISC ChangeLog 236 RMD160 ad94fc375c92f97320dcec0831142a408128f5a0 SHA1 34743293799c8e8dc059ba6de5b0a11f04ba7fbe SHA256 3147452fafb1b48f0ff40800db9d9e1cdfbf1eb64fbf09295b8dc3bd01309b31 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.4 (GNU/Linux) + +iD8DBQFGjhSSjJyKLBkBVroRArSOAKCJ1yZNFWgDUfjcdKP/SPACqmH/BQCcDRtW +eeM7HC5gC7ZCBn9XG/QAQiM= +=L7Vq +-----END PGP SIGNATURE----- diff --git a/x11-libs/wxGTK/files/socketfix.patch b/x11-libs/wxGTK/files/socketfix.patch deleted file mode 100644 index bf694da..0000000 --- a/x11-libs/wxGTK/files/socketfix.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: src/unix/gsocket.cpp -=================================================================== -RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/unix/gsocket.cpp,v -retrieving revision 1.67.2.2 -diff -u -r1.67.2.2 gsocket.cpp ---- src/unix/gsocket.cpp 2007/03/17 02:15:29 1.67.2.2 -+++ src/unix/gsocket.cpp 2007/03/25 19:28:24 -@@ -1168,17 +1168,16 @@ - else - ret = Recv_Dgram(buffer, size); - -- /* If recv returned zero, then the connection is lost, and errno is not set. -+ /* If recv returned zero, then the connection has been gracefully closed. - * Otherwise, recv has returned an error (-1), in which case we have lost the - * socket only if errno does _not_ indicate that there may be more data to read. - */ - if (ret == 0) - { -- m_error = GSOCK_IOERR; -+ /* Make sure wxSOCKET_LOST event gets sent */ - m_detected = GSOCK_LOST_FLAG; -- Close(); -- // Signal an error for return -- return -1; -+ Detected_Read(); -+ return 0; - } - else if (ret == -1) - { diff --git a/x11-libs/wxGTK/wxGTK-2.8.3.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.3.0.ebuild deleted file mode 100644 index c5afd02..0000000 --- a/x11-libs/wxGTK/wxGTK-2.8.3.0.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit eutils flag-o-matic multilib toolchain-funcs versionator - -HTML_PV="$(get_version_component_range 1-3)" - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and wxbase non-gui library" - -SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 - doc? ( mirror://sourceforge/wxwindows/wxWidgets-${HTML_PV}-HTML.tar.gz )" - -SLOT="2.8" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc gnome joystick odbc opengl sdl stl unicode X gif" -LICENSE="wxWinLL-3" -HOMEPAGE="http://www.wxwidgets.org" - -# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets -# has its own implementation of it -# Note 2: PCX support is enabled if the correct libraries are detected. -# There is no USE flag for this. - -RDEPEND="X? ( opengl? ( virtual/opengl ) - >=x11-libs/gtk+-2.0 - >=dev-libs/glib-2.0 - media-libs/tiff - x11-libs/libXinerama - x11-libs/libXxf86vm - gnome? ( >=gnome-base/libgnomeprintui-2.8 ) ) - odbc? ( dev-db/unixODBC ) - x86? ( sdl? ( >=media-libs/libsdl-1.2 ) ) - amd64? ( sdl? ( >=media-libs/libsdl-1.2 ) ) - ppc? ( sdl? ( >=media-libs/libsdl-1.2 ) )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - X? ( - x11-proto/xproto - x11-proto/xineramaproto - x11-proto/xf86vidmodeproto - )" - -S=${WORKDIR}/wxPython-src-${PV} -HTML_S=${WORKDIR}/wxWidgets-${HTML_PV} - -# Configure a build. -# It takes three parameters; -# $1: prefix for the build directory (used for wxGTK which has two -# builds needed. -# $2: "unicode" if it must be build with else "" -# $3: all the extra parameters to pass to configure script -configure_build() { - export LANG='C' - - mkdir ${S}/$1_build - cd ${S}/$1_build - # odbc works with ansi only: - subconfigure $3 $(use_with odbc) - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake failed" - #wxbase has no contrib: - if [[ -e contrib/src ]]; then - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake contrib failed" - fi - - if [[ "$2" == "unicode" ]] && use unicode; then - mkdir ${S}/$1_build_unicode - cd ${S}/$1_build_unicode - subconfigure $3 --enable-unicode - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake failed" - if [[ -e contrib/src ]]; then - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake contrib failed" - fi - fi -} - -# This is a commodity function which calls configure script -# with the default parameters plus extra parameters. It's used -# as building the unicode version required redoing it. -# It takes all the params and passes them to the script -subconfigure() { - ECONF_SOURCE="${S}" \ - econf \ - --with-zlib \ - $(use_enable debug) $(use_enable debug debug_gdb) \ - $* || die "./configure failed" -} - -# Installs a build -# It takes only a parameter: the prefix for the build directory -# see configure_build function -install_build() { - cd ${S}/$1_build - einstall libdir="${D}/usr/$(get_libdir)" || die "Install failed" - if [[ -e contrib ]]; then - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "Install contrib failed" - fi - if [[ -e ${S}/$1_build_unicode ]]; then - cd ${S}/$1_build_unicode - einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install contrib failed" - fi -} - -pkg_setup() { - if use X; then - elog "To install only wxbase (non-gui libs) use USE=-X" - else - elog "To install GUI libraries, in addition to wxbase, use USE=X" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/socketfix.patch" -# epatch "${FILESDIR}/${P}-wxrc_build_fix.patch" -# epatch "${FILESDIR}/${P}-dialog_focus.patch" -# epatch "${FILESDIR}/${P}-slider_linesize.patch" -# -# # Reverse apply patch in wxPython tarball that breaks ABI -# EPATCH_OPTS="-R" epatch "${S}/patches/listctrl-ongetitemcolumnimage.patch" -} - -src_compile() { - gnuconfig_update - append-flags -fno-strict-aliasing - myconf="${myconf} - $(use_with sdl) - $(use_enable joystick)" - - if use X; then - myconf="${myconf} - $(use_enable opengl) - $(use_with opengl) - $(use_with gnome gnomeprint)" - fi - if use stl; then - myconf="${myconf} - $(use_enable stl)" - fi - - if use gif; then - myconf="${myconf} - $(use_enable gif)" - else - myconf="${myconf} - $(use_disable gif)" - fi - - - use X && configure_build gtk2 unicode "${myconf} --with-gtk=2" - use X || configure_build base unicode "${myconf} --disable-gui" -} - -src_install() { - use X && install_build gtk2 - use X || install_build base - - cp ${D}/usr/bin/wx-config ${D}/usr/bin/wx-config-2.8 || die "Failed to cp wx-config" - - # In 2.6 all wx-config*'s go in/usr/lib/wx/config - # Only install wx-config if 2.4 is not installed: - if [ -e "/usr/bin/wx-config" ]; then - if [ "$(/usr/bin/wx-config --release)" = "2.4" ]; then - rm ${D}/usr/bin/wx-config - fi - fi - - dodoc ${S}/docs/changes.txt - dodoc ${S}/docs/gtk/readme.txt - - if use doc; then - dohtml -r ${HTML_S}/docs/html/* - fi -} - -pkg_postinst() { - elog "dev-libs/wxbase has been removed from portage." - elog "wxBase is installed with wxGTK, as one of many libraries." - elog "If only wxBase is wanted, -X USE flag may be specified." -} diff --git a/x11-libs/wxGTK/wxGTK-2.8.4.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.4.0.ebuild new file mode 100644 index 0000000..74f0ce6 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-2.8.4.0.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit eutils flag-o-matic multilib toolchain-funcs versionator + +HTML_PV="$(get_version_component_range 1-3)" + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and wxbase non-gui library" + +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 + doc? ( mirror://sourceforge/wxwindows/wxWidgets-${HTML_PV}-HTML.tar.gz )" + +SLOT="2.8" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="debug doc gnome joystick odbc opengl sdl stl unicode X gif" +LICENSE="wxWinLL-3" +HOMEPAGE="http://www.wxwidgets.org" + +# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets +# has its own implementation of it +# Note 2: PCX support is enabled if the correct libraries are detected. +# There is no USE flag for this. + +RDEPEND="X? ( opengl? ( virtual/opengl ) + >=x11-libs/gtk+-2.0 + >=dev-libs/glib-2.0 + media-libs/tiff + x11-libs/libXinerama + x11-libs/libXxf86vm + gnome? ( >=gnome-base/libgnomeprintui-2.8 ) ) + odbc? ( dev-db/unixODBC ) + x86? ( sdl? ( >=media-libs/libsdl-1.2 ) ) + amd64? ( sdl? ( >=media-libs/libsdl-1.2 ) ) + ppc? ( sdl? ( >=media-libs/libsdl-1.2 ) )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" + +S=${WORKDIR}/wxPython-src-${PV} +HTML_S=${WORKDIR}/wxWidgets-${HTML_PV} + +# Configure a build. +# It takes three parameters; +# $1: prefix for the build directory (used for wxGTK which has two +# builds needed. +# $2: "unicode" if it must be build with else "" +# $3: all the extra parameters to pass to configure script +configure_build() { + export LANG='C' + + mkdir ${S}/$1_build + cd ${S}/$1_build + # odbc works with ansi only: + subconfigure $3 $(use_with odbc) + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake failed" + #wxbase has no contrib: + if [[ -e contrib/src ]]; then + cd contrib/src + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake contrib failed" + fi + + if [[ "$2" == "unicode" ]] && use unicode; then + mkdir ${S}/$1_build_unicode + cd ${S}/$1_build_unicode + subconfigure $3 --enable-unicode + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake failed" + if [[ -e contrib/src ]]; then + cd contrib/src + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake contrib failed" + fi + fi +} + +# This is a commodity function which calls configure script +# with the default parameters plus extra parameters. It's used +# as building the unicode version required redoing it. +# It takes all the params and passes them to the script +subconfigure() { + ECONF_SOURCE="${S}" \ + econf \ + --with-zlib \ + $(use_enable debug) $(use_enable debug debug_gdb) \ + $* || die "./configure failed" +} + +# Installs a build +# It takes only a parameter: the prefix for the build directory +# see configure_build function +install_build() { + cd ${S}/$1_build + einstall libdir="${D}/usr/$(get_libdir)" || die "Install failed" + if [[ -e contrib ]]; then + cd contrib/src + einstall libdir="${D}/usr/$(get_libdir)" || die "Install contrib failed" + fi + if [[ -e ${S}/$1_build_unicode ]]; then + cd ${S}/$1_build_unicode + einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install failed" + cd contrib/src + einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install contrib failed" + fi +} + +pkg_setup() { + if use X; then + elog "To install only wxbase (non-gui libs) use USE=-X" + else + elog "To install GUI libraries, in addition to wxbase, use USE=X" + fi +} + +src_compile() { + gnuconfig_update + append-flags -fno-strict-aliasing + myconf="${myconf} + $(use_with sdl) + $(use_enable joystick)" + + if use X; then + myconf="${myconf} + $(use_enable opengl) + $(use_with opengl) + $(use_with gnome gnomeprint)" + fi + if use stl; then + myconf="${myconf} + $(use_enable stl)" + fi + + if use gif; then + myconf="${myconf} + $(use_enable gif)" + else + myconf="${myconf} + $(use_disable gif)" + fi + + + use X && configure_build gtk2 unicode "${myconf} --with-gtk=2" + use X || configure_build base unicode "${myconf} --disable-gui" +} + +src_install() { + use X && install_build gtk2 + use X || install_build base + + cp ${D}/usr/bin/wx-config ${D}/usr/bin/wx-config-2.8 || die "Failed to cp wx-config" + + # In 2.6 all wx-config*'s go in/usr/lib/wx/config + # Only install wx-config if 2.4 is not installed: + if [ -e "/usr/bin/wx-config" ]; then + if [ "$(/usr/bin/wx-config --release)" = "2.4" ]; then + rm ${D}/usr/bin/wx-config + fi + fi + + dodoc ${S}/docs/changes.txt + dodoc ${S}/docs/gtk/readme.txt + + if use doc; then + dohtml -r ${HTML_S}/docs/html/* + fi +} + +pkg_postinst() { + elog "dev-libs/wxbase has been removed from portage." + elog "wxBase is installed with wxGTK, as one of many libraries." + elog "If only wxBase is wanted, -X USE flag may be specified." +} -- cgit v1.2.3-65-gdbad