# ChangeLog for x11-libs/wxGTK
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.275 2011/11/12 13:55:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.276 2011/12/09 03:42:26 dirtyepic Exp $
+
+ 09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> -wxGTK-2.8.10.1-r5.ebuild,
+ -files/wxGTK-2.8.10-collision.patch:
+ Remove old.
12 Nov 2011; Justin Lecher <jlec@gentoo.org> wxGTK-2.6.4.0-r6.ebuild,
wxGTK-2.8.10.1-r5.ebuild, wxGTK-2.8.11.0.ebuild, wxGTK-2.8.12.0.ebuild,
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
AUX wxGTK-2.6.4-mmedia.patch 599 RMD160 e894dacc346d7c10f9582c2885df8c0b82962bb1 SHA1 d1da9fe158c5db80f8e65395b9d2c3383133352c SHA256 0f848e5985e404d89fbcc4820ca07069845dc8219e0a8679ff5ad3bf28dbc93f
AUX wxGTK-2.6.4.0-g_free.patch 1102 RMD160 a2b4fc260d834b5e8c5244a19b61dd2f74c9c3b1 SHA1 0af47b2b10b1c472b8d6ec9e43160c4b28527bf0 SHA256 029b962d7ca861e15b00712a786e070aaaaa89c1faa6b9a5e46e3c5a2b8b00f5
AUX wxGTK-2.6.4.0-wxrc_link_fix.patch 1085 RMD160 2af7918740d4826822af82a50b63ea00c5f40694 SHA1 c03791332103b199921dbe6e132d5f215d3a2aee SHA256 63cec2a3eb7c0a12c92230a68aa5878d518f7ebe504d8714c49140a23e72fbd3
-AUX wxGTK-2.8.10-collision.patch 6224 RMD160 ff2145bbb5863d782800b8c909210787cc283c47 SHA1 cd911714567ac41f6ab8e3505f84bb91e17bebcc SHA256 7ddcf556ca4d5491f732a8495199607e228ba10ffd4faa023b912bd11df26b48
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.10.1-odbc-defines.patch 1341 RMD160 2444b56d28dacf4def2e329419596a491e88f2a2 SHA1 80039dc3e6a796c6fa86088d0c2d6ccda1a3d040 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698
AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85
AUX wxGTK-2.9.1.1-collision.patch 5953 RMD160 a80b62e8a6c099d27ff7df6e63a0c55078f342a7 SHA1 3f6897bfe49c5d3123f7fc53479dcb31977b5600 SHA256 b7470d4e2eaed28b2fedc5f8e94fb897a837daa0aa33c77ca99e4e379b0e9cdf
DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
-DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f
DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4ae6693c2c04b SHA1 f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4 SHA256 6d5e82772b87981c2a0d78d7a08b3a4498529127be2f05016892e8866e98babd
DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
EBUILD wxGTK-2.6.4.0-r6.ebuild 5079 RMD160 355f1a2077d296254dfd172d914555407d460be5 SHA1 f14398400cf3673516a2b7118c75e37002994771 SHA256 8110dd38ac23024b58d3d58259c4e1ee5a668d6e842626e3b74019c8032225e7
-EBUILD wxGTK-2.8.10.1-r5.ebuild 3926 RMD160 9cc04b3f0255c49488911accb69601115cc2c4f2 SHA1 7bed4bdc40b2dd1be40a4e40f58cb3d23a4de29a SHA256 14dba1c1b87c2d363e87668623923c1d69e804ef5fb1ba1263d2ef078689b1d8
EBUILD wxGTK-2.8.11.0.ebuild 3607 RMD160 6c432fdde32ef01a5ea96101e78e4b0df950b260 SHA1 8d982b93d53c1829048d857b38fe6cdd4aa0bdec SHA256 468ea1693f80687de7cabf75f93a1a2b6c8588cf8d012be1489b8ada9e58a424
EBUILD wxGTK-2.8.12.0.ebuild 3979 RMD160 717015350f482fb45d264c46cadf74642422106a SHA1 7c930fc1f126bd93950a0fac183bc94b1fc019c8 SHA256 7797afed776dfa65b7dc0446c5ff86bdbdb0f2587cc9f6df8e7e7a3cfe38912a
EBUILD wxGTK-2.9.1.1.ebuild 4173 RMD160 146b9a46d5f274e048d17620aadcf278c85ff2cd SHA1 aaa2dc23d443ebaadedfba1e5fe7859309e169b8 SHA256 1a37870888dcff024271330dfd4d2251a82c6a61211ebd390c04c5281e4e18c2
-MISC ChangeLog 43173 RMD160 be2fd64df1050598a1f7f98e3c3b7eedc05a61af SHA1 15b01651a6d2c943b2a8213853f8f2e2e68c7721 SHA256 2e7b16f132aaf47029179aab3d5c8d3540af2cf6872be80b8141ff2e99838f6b
+MISC ChangeLog 43307 RMD160 b76d2951ee8ecc74e0d134f4f6c8cc39ea3c4021 SHA1 c600232db00e6289a8089dd34f112df9da27e31a SHA256 24ff5aac4f7621bc80192e3c2ab4ccdd98f8a4a019b9f78a918c3706a641f5ef
MISC metadata.xml 670 RMD160 af633c7a38fd8d4fce77e2e05836d38c3ecccf54 SHA1 a463ce81e4784cb35f53a5fb7551a508fa5fce19 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEAREKAAYFAk6+evUACgkQgAnW8HDreRayoACfUbzuQAqy5r+W2uf6wkIYCK2p
-atUAoLWNQXs26tza8qQ0u2IDG++3uBnt
-=1n60
+iEYEARECAAYFAk7hhgEACgkQiqiDRvmkBmJ3KgCffmRUcvsx8/lnvBIEOqP0bk3X
+yPoAn21bcN3q9P1P1QzWr0/flqJ1Y8sU
+=OiDS
-----END PGP SIGNATURE-----
+++ /dev/null
-diff -Naurp wxPython-src-2.8.10.1-orig/Makefile.in wxPython-src-2.8.10.1/Makefile.in
---- wxPython-src-2.8.10.1-orig/Makefile.in 2009-05-17 15:57:18.682065956 -0600
-+++ wxPython-src-2.8.10.1/Makefile.in 2009-05-17 16:01:41.554066672 -0600
-@@ -27,6 +27,7 @@ STRIP = @STRIP@
- 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@
-@@ -11448,10 +11449,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p =
- 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: $(__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 \
-@@ -12207,8 +12207,8 @@ samples:
- 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
-@@ -12216,7 +12216,7 @@ locale_install:
- $(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 -Naurp wxPython-src-2.8.10.1-orig/src/common/intl.cpp wxPython-src-2.8.10.1/src/common/intl.cpp
---- wxPython-src-2.8.10.1-orig/src/common/intl.cpp 2009-01-03 14:40:01.000000000 -0600
-+++ wxPython-src-2.8.10.1/src/common/intl.cpp 2009-05-17 16:04:28.683867667 -0600
-@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
- 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 wxLocale::Init(const wxChar *szName
- bool bOk = true;
- if ( bLoadDefault )
- {
-- bOk = AddCatalog(wxT("wxstd"));
-+ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
-
- // there may be a catalog with toolkit specific overrides, it is not
- // an error if this does not exist
-diff -Naurp wxPython-src-2.8.10.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.10.1/utils/wxrc/Makefile.in
---- wxPython-src-2.8.10.1-orig/utils/wxrc/Makefile.in 2009-04-27 21:38:59.000000000 -0600
-+++ wxPython-src-2.8.10.1/utils/wxrc/Makefile.in 2009-05-17 16:03:56.490863515 -0600
-@@ -120,7 +120,6 @@ distclean: clean
- @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)
+++ /dev/null
-# Copyright 1999-2011 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-r5.ebuild,v 1.13 2011/11/12 13:55:52 jlec 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? (
- dev-libs/glib:2
- media-libs/libpng:0
- sys-libs/zlib
- virtual/jpeg
- x11-libs/gtk+:2
- media-libs/tiff:0
- x11-libs/libSM
- x11-libs/libXinerama
- x11-libs/libXxf86vm
- x11-libs/pango[X]
- gnome? ( gnome-base/libgnomeprintui:2.2 )
- gstreamer? (
- gnome-base/gconf:2
- >=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
- epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch # Bug #310923
- # this version only:
- epatch "${FILESDIR}"/${P}-CVE-2009-2369.patch # Bug #277722
- epatch "${FILESDIR}"/${P}-gsocket.patch # Bug #278778
- epatch "${FILESDIR}"/${P}-wxTimer-unbounded-hook.patch # Bug #301143
-
- # Fix for >=libpng-1.4.0 Bug #305119.
- sed -i -e 's:png_check_sig:png_sig_cmp:g' "${S}"/configure{,.in}
-}
-
-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}
-}
-
-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
-}
projects / gentoo.git / commitdiff