From: Tiziano Müller Date: Sun, 24 Feb 2008 17:53:32 +0000 (+0000) Subject: Added patch to fix broken copy/paste when switching tabs using the keyboard shortcut... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1efc45c639932fa66965091482d1d5ec9d811564;p=gentoo.git Added patch to fix broken copy/paste when switching tabs using the keyboard shortcut (bug #210298, thanks to Jon White). Package-Manager: portage-2.1.4.4 --- diff --git a/dev-python/drpython/ChangeLog b/dev-python/drpython/ChangeLog index c5b1228306c9..3c76f4e4efb0 100644 --- a/dev-python/drpython/ChangeLog +++ b/dev-python/drpython/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-python/drpython -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/ChangeLog,v 1.15 2007/12/04 07:51:55 hawking Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/ChangeLog,v 1.16 2008/02/24 17:53:32 dev-zero Exp $ + +*drpython-165-r2 (24 Feb 2008) + + 24 Feb 2008; Tiziano Müller + +files/drpython-165-tabswitch.patch, -drpython-165-r1.ebuild, + +drpython-165-r2.ebuild: + Added patch to fix broken copy/paste when switching tabs using the keyboard + shortcut (bug #210298, thanks to Jon White). *drpython-165-r1 (04 Dec 2007) diff --git a/dev-python/drpython/Manifest b/dev-python/drpython/Manifest index 34c05b06d5d1..dc311f1f0c49 100644 --- a/dev-python/drpython/Manifest +++ b/dev-python/drpython/Manifest @@ -1,5 +1,6 @@ +AUX drpython-165-tabswitch.patch 408 RMD160 199722b875fc075ff0883d9e09bcad4f3b0819ab SHA1 e7e0fd75ea60cb3cfda4e5c0201b435aede85e83 SHA256 d1a59d1219f6d386b0a66d1c5ca1f81ce2bc4f85d01a44fa90798e3037768698 AUX drpython-165-wxversion.patch 385 RMD160 78b41d6ad1af3c454a946cf036e637c5f0aa6ac1 SHA1 33b6da7eafc3fdf76cdc0bf6546e354e20366930 SHA256 99fa009e880d2c5252a51fccf97bc3e9ec6bf2ba00c301810916a5f956450442 DIST drpython165.zip 597435 RMD160 cd6669848b121e54304d591008e8fa9475b9d5fb SHA1 069d0424dbe8df3ee34fce921f69e4fad6563629 SHA256 53e081a04962303b820d4cd956fdc83b4b475a217b5e2e22e99988644fe8eace -EBUILD drpython-165-r1.ebuild 1173 RMD160 713023ae3f6e813aea6247561aaca4cbb21cbe63 SHA1 28c0e6ed4b9bf61680c07261459b9607081ed69b SHA256 3e938a45922cda0c95764d6404e7a8fb35b9e8470174f7b6ba58aff9e9cf9656 -MISC ChangeLog 2738 RMD160 595b14e244849c3b10566619cf22e4b9be9ef9f8 SHA1 f6aa8a9cf4ab70df0b861a0d23439bc0b8246c3a SHA256 e6c802861d041ad883804c51c43810ad4c793dbfb9bc2e55c598017f466cf48f +EBUILD drpython-165-r2.ebuild 1229 RMD160 af9bd6ab449b65a55e8526f2956c99d25cf4b001 SHA1 89e09f451b0e6993c5d65842f2941bb0d4a00870 SHA256 daa57bf043778a67572c2299a081d2fcd35c967c5ed6d950630d8e12ae04cc3f +MISC ChangeLog 3041 RMD160 2cef5d58713e4b6910449d3a9ce0e0c9fb3e7f28 SHA1 f014b79bf2fd7f41dfc2495262a25de76c87b808 SHA256 8144d255b88949332222e10da674dce4315bf1e530e0b26bfa128b77e85e83a5 MISC metadata.xml 616 RMD160 55d32aae74924cd293b2c87b126506ee696aa947 SHA1 26735d0c74bc7033987b8d722fe38261977696f5 SHA256 c40683b55039fafad9ee14c549b3ec4cbcaca6d52b966d884666b0e2becd4744 diff --git a/dev-python/drpython/drpython-165-r1.ebuild b/dev-python/drpython/drpython-165-r2.ebuild similarity index 64% rename from dev-python/drpython/drpython-165-r1.ebuild rename to dev-python/drpython/drpython-165-r2.ebuild index 705ea960faab..e364557580f8 100644 --- a/dev-python/drpython/drpython-165-r1.ebuild +++ b/dev-python/drpython/drpython-165-r2.ebuild @@ -1,6 +1,8 @@ -# 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/dev-python/drpython/drpython-165-r1.ebuild,v 1.1 2007/12/04 07:51:55 hawking Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-165-r2.ebuild,v 1.1 2008/02/24 17:53:32 dev-zero Exp $ + +EAPI="1" inherit distutils eutils multilib @@ -12,29 +14,31 @@ SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~x86" IUSE="" -RDEPEND="=dev-python/wxpython-2.6*" +RDEPEND="dev-python/wxpython:2.6" DEPEND="app-arch/unzip" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" src_unpack() { distutils_src_unpack - epatch "${FILESDIR}"/${P}-wxversion.patch + epatch \ + "${FILESDIR}/${P}-wxversion.patch" \ + "${FILESDIR}/${P}-tabswitch.patch" } src_install() { distutils_python_version - local destdir="/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/" + local destdir="/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}" dodir ${destdir}/bitmaps/{16,24} - cp -R bitmaps "${D}"/${destdir} || die "Failed to cp bitmaps" + cp -R bitmaps "${D}/${destdir}/" || die "failed to cp bitmaps" distutils_src_install - #Windows-only setup script: - rm "${D}"/usr/bin/postinst.py + # Windows-only setup script: + rm "${D}/usr/bin/postinst.py" - make_wrapper drpython "python ${destdir}drpython_wx26.py" + make_wrapper drpython "python ${destdir}/drpython_wx26.py" } pkg_postinst() { diff --git a/dev-python/drpython/files/drpython-165-tabswitch.patch b/dev-python/drpython/files/drpython-165-tabswitch.patch new file mode 100644 index 000000000000..4b33ba55d3f0 --- /dev/null +++ b/dev-python/drpython/files/drpython-165-tabswitch.patch @@ -0,0 +1,12 @@ +--- drNotebook.py 2008-02-15 22:57:01.000000000 +0000 ++++ drNotebook.py.new 2008-02-15 23:07:04.000000000 +0000 +@@ -513,6 +513,9 @@ + self.grandparent.txtDocumentArray[i].IsActive = True + self.grandparent.txtDocumentArray[i].OnModified(None) + ++ # Bug fix - make sure Cut/Copy/Paste/Run etc. use the right document ++ self.SetTab() ++ + if event is not None: + event.Skip() +