-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.242 2010/01/19 01:19:35 dirtyepic Exp $

-AUX wxGTK-2.8.10-collision.patch 6255 RMD160 ad41118f5a001741a5cc331cf7007bd702182b28 SHA1 0803811fb1cdeeec80a492fcc0a4b171d2986321 SHA256 d68c60125076dceaf96bfdb03821142209b6d5c79a6dec41cffda0feace5ce01

-AUX wxGTK-2.8.6-wxrc_link_fix.patch 989 RMD160 baf0009e0ecfe68b25df80e6b0956ef08f9e8bfd SHA1 dc8d7474647b5d8d0b9bc7c9bdf77899351808c1 SHA256 4eac080fe34870398309623cb363573b2d0242eb1dd24534efde4e7237c05fd0

-AUX wxGTK-2.8.8-collision.patch 6072 RMD160 28101d936ed94190fa9a38c707f804c113a3e413 SHA1 66a7d717c5f3dc78fc3f0b451de178423b255399 SHA256 21949c67d2977a5bb59e22e73fcbeb8631462ec38fc864d4975309b3f24d69a0

-AUX wxGTK-2.8.9-dont-touch-my-bools.patch 872 RMD160 931ba9d7b4929a2c44b6866c61fec115498de143 SHA1 eddfb0ab5d3b934ac82969badd6dfd9ecba81d91 SHA256 2c7bfd887374adce1f35889d8876a608a2e3d8c64566667cd38e1124998ebd69

-AUX wxGTK-2.8.9.2-nestedtables.patch 773 RMD160 82a481f6ec6ad668308ddf1b10803f46d344eb14 SHA1 74e37c2d44d44cd335ff469be42006d2dbb7ddf3 SHA256 a0509fbfc428c4706818c972c49da447dea75808fa856fcce6872acafcc7976c

-EBUILD wxGTK-2.8.10.1-r3.ebuild 3664 RMD160 024ea2169e17b5aa8e5acb09db2767adcb1d3711 SHA1 a41444b2fa37bb1f30b74ecd0d8a0b5665861d53 SHA256 f2ac421a3b12f25d87de92f110ee835987cada63898fac69980f180ad2bca9d9

-EBUILD wxGTK-2.8.10.1-r4.ebuild 3738 RMD160 26e8774b7090618bac57873bcd9129c7a2738e36 SHA1 4569af71da14be6f0b711784e281df711df04288 SHA256 c624a0419b8bc3753a823502f2038c4a5968244767f5575c79172c945562b593

-MISC ChangeLog 37828 RMD160 c33dc4af9256e2546480079487392ed5b2c65ddf SHA1 5dd0d0f05771ce0b463fd142277c2e5db3c049f2 SHA256 a00c0d25050fbcf90405e4c5154cc24ec453be36dd80487f78f97d68f692d19c

-iEYEARECAAYFAktVCSwACgkQiqiDRvmkBmL1NQCgtU1UUJSUi/OLlW2KNUmTWFN4

-9qsAoPDe0nPKUgzx1K9vRvVOyYY7a+5K

-=iDFX

-+ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));bOk = AddCatalog(wxT("wxstd"));

-diff -Naur wxPython-src-2.8.6.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.6.1/utils/wxrc/Makefile.in

---- wxPython-src-2.8.6.1-orig/utils/wxrc/Makefile.in 2007-12-03 12:59:33.000000000 -0600

-+++ wxPython-src-2.8.6.1/utils/wxrc/Makefile.in 2007-12-03 13:02:01.000000000 -0600

-@@ -108,7 +108,7 @@

- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile

-

- @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)

--@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)

-+@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(LDFLAGS) $(EXTRALIBS_FOR_BASE)

- @COND_USE_XRC_1@

- @COND_USE_XRC_1@ $(__wxrc___mac_setfilecmd)

-

-diff -Naur wxPython-src-2.8.9.1-orig/Makefile.in wxPython-src-2.8.9.1/Makefile.in

---- wxPython-src-2.8.9.1-orig/Makefile.in 2008-10-28 16:27:37.000000000 -0600

-+++ wxPython-src-2.8.9.1/Makefile.in 2008-10-28 16:29:45.000000000 -0600

-@@ -27,6 +27,7 @@

- INSTALL_PROGRAM = @INSTALL_PROGRAM@

- INSTALL_DATA = @INSTALL_DATA@

- INSTALL_DIR = @INSTALL_DIR@

-+INSTALL_SCRIPT = @INSTALL_SCRIPT@

- BK_DEPS = @BK_DEPS@

- BK_MAKE_PCH = @BK_MAKE_PCH@

- srcdir = @srcdir@

-@@ -11342,10 +11343,9 @@

- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)

-

- install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)

-- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal

-- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)

- $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets

-- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)

-+ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \

-+ do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)

- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx

- for f in setup.h $(RCDEFS_H); do \

- if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \

-@@ -12101,8 +12101,8 @@

- install-wxconfig:

- $(INSTALL_DIR) $(DESTDIR)$(bindir)

- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config

-- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config

-- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)

-+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config

-+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))

-

- locale_install:

- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale

-@@ -12110,7 +12110,7 @@

- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \

- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \

- if test -f $(srcdir)/locale/$$l.mo ; then \

-- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \

-+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \

- fi ; \

- done

-

-diff -Naur wxPython-src-2.8.9.1-orig/src/common/intl.cpp wxPython-src-2.8.9.1/src/common/intl.cpp

---- wxPython-src-2.8.9.1-orig/src/common/intl.cpp 2008-10-28 16:27:37.000000000 -0600

-+++ wxPython-src-2.8.9.1/src/common/intl.cpp 2008-10-28 16:28:16.000000000 -0600

-@@ -1529,6 +1529,8 @@

- m_initialized = false;

- }

-

-+#define wxSTRINGIZE2(x) wxSTRINGIZE(x)

-+

- // NB: this function has (desired) side effect of changing current locale

- bool wxLocale::Init(const wxChar *szName,

- const wxChar *szShort,

-@@ -1597,7 +1599,7 @@

- bool bOk = true;

- if ( bLoadDefault )

- {

-- bOk = AddCatalog(wxT("wxstd"));

-+ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));bOk = AddCatalog(wxT("wxstd"));

-

- // there may be a catalog with toolkit specific overrides, it is not

- // an error if this does not exist

-diff -Naur wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.9.1/utils/wxrc/Makefile.in

---- wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in 2008-10-28 16:27:37.000000000 -0600

-+++ wxPython-src-2.8.9.1/utils/wxrc/Makefile.in 2008-10-28 16:28:16.000000000 -0600

-@@ -120,7 +120,6 @@

- @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)

- @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)

- @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)

--@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))

-

- @COND_USE_XRC_1@uninstall_wxrc:

- @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)

-diff -Naurp wxPython-src-2.8.9.1-orig/include/wx/db.h wxPython-src-2.8.9.1/include/wx/db.h

---- wxPython-src-2.8.9.1-orig/include/wx/db.h 2007-07-04 13:24:57.000000000 -0600

-+++ wxPython-src-2.8.9.1/include/wx/db.h 2008-11-07 17:05:16.000000000 -0600

-@@ -78,10 +78,15 @@

- // defined in many other places on other systems (Motif, at least on

- // OpenVMS; Cocoa and X11) so prevent the problem by defining it before

- // including these headers

-- #define BOOL int

-- #include <sql.h>

-- #include <sqlext.h>

-- #undef BOOL

-+ #ifndef BOOL

-+ #define BOOL int

-+ #include <sql.h>

-+ #include <sqlext.h>

-+ #undef BOOL

-+ #else

-+ #include <sql.h>

-+ #include <sqlext.h>

-+ #endif

- #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC

- }

- #endif

-https://bugs.gentoo.org/show_bug.cgi?id=264544

-http://trac.wxwidgets.org/ticket/10370

-

---- wxPython-src-2.8.9.2-orig/src/html/m_tables.cpp

-+++ wxPython-src-2.8.9.2/src/html/m_tables.cpp

-@@ -684,6 +684,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH

- {

- wxHtmlTableCell *oldt = m_Table;

-

-+ wxHtmlContainerCell *oldEnclosing = m_enclosingContainer;

- m_enclosingContainer = c = m_WParser->OpenContainer();

-

- m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());

-@@ -722,6 +723,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH

- m_WParser->CloseContainer();

-

- m_Table = oldt;

-+ m_enclosingContainer = oldEnclosing;

-

- return true; // ParseInner() called

- }

-# 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

-}

-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r4.ebuild,v 1.1 2010/01/19 01:19:35 dirtyepic Exp $