diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2005-10-01 13:51:14 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2005-10-01 13:51:14 +0000 |
| commit | 29ffc038d4c4d299def6eecb8b667e649ff18bfc (patch) | |
| tree | 75676d52b79cdf1da41acaf614320073d41dc724 | |
| parent | Clean up. (diff) | |
| download | gentoo-2-29ffc038d4c4d299def6eecb8b667e649ff18bfc.tar.gz gentoo-2-29ffc038d4c4d299def6eecb8b667e649ff18bfc.tar.bz2 gentoo-2-29ffc038d4c4d299def6eecb8b667e649ff18bfc.zip | |
Fix for wxGTK > 2.2 - bug 105302.
(Portage version: 2.0.52-r1)
| -rw-r--r-- | x11-misc/jaffm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/jaffm/Manifest | 7 | ||||
| -rw-r--r-- | x11-misc/jaffm/files/jaffm-1.2.1-wx24.patch | 23 | ||||
| -rw-r--r-- | x11-misc/jaffm/jaffm-1.2.1.ebuild | 9 |
4 files changed, 40 insertions, 5 deletions
diff --git a/x11-misc/jaffm/ChangeLog b/x11-misc/jaffm/ChangeLog index dc11f56c29ff..0bbf442efa33 100644 --- a/x11-misc/jaffm/ChangeLog +++ b/x11-misc/jaffm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/jaffm # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/ChangeLog,v 1.8 2005/06/15 07:59:43 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/ChangeLog,v 1.9 2005/10/01 13:51:14 nelchael Exp $ + + 01 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> + +files/jaffm-1.2.1-wx24.patch, jaffm-1.2.1.ebuild: + Fix for wxGTK > 2.2 - bug 105302. 15 Jun 2005; David Holm <dholm@gentoo.org> jaffm-1.2.1.ebuild: Added to ~ppc. diff --git a/x11-misc/jaffm/Manifest b/x11-misc/jaffm/Manifest index 3a399f3bbd8b..0f14e2e92d44 100644 --- a/x11-misc/jaffm/Manifest +++ b/x11-misc/jaffm/Manifest @@ -1,6 +1,7 @@ -MD5 7e452681a8ea048e926adaa80c1dbbba ChangeLog 1144 MD5 5c220953d1d4799ae9bab119bff9fda4 jaffm-1.0.ebuild 512 +MD5 7e452681a8ea048e926adaa80c1dbbba ChangeLog 1144 MD5 854ad93ffa90b305b1f1f87592698ed8 metadata.xml 167 -MD5 ed4f7bcf52993adfb18292093d3d4d55 jaffm-1.2.1.ebuild 535 -MD5 d7dd08e0d28c3ed259b52711b75f7054 files/digest-jaffm-1.0 60 +MD5 1a63c4579e95a253474c33e54cd14ce3 jaffm-1.2.1.ebuild 622 MD5 ab6eed4d0bdff0b036654ebd179f6144 files/digest-jaffm-1.2.1 63 +MD5 d7dd08e0d28c3ed259b52711b75f7054 files/digest-jaffm-1.0 60 +MD5 f7b7e2038a0a9e029e28f3a0cbc99b5e files/jaffm-1.2.1-wx24.patch 1113 diff --git a/x11-misc/jaffm/files/jaffm-1.2.1-wx24.patch b/x11-misc/jaffm/files/jaffm-1.2.1-wx24.patch new file mode 100644 index 000000000000..4840266fea92 --- /dev/null +++ b/x11-misc/jaffm/files/jaffm-1.2.1-wx24.patch @@ -0,0 +1,23 @@ +diff -Nru jaffm-1.2.1.original/filetree.h jaffm-1.2.1/filetree.h +--- jaffm-1.2.1.original/filetree.h 2005-10-01 14:46:08.000000000 +0200 ++++ jaffm-1.2.1/filetree.h 2005-10-01 15:35:50.000000000 +0200 +@@ -20,6 +20,7 @@ + public: + UFiletree(wxWindow *oParent, wxWindowID iID, wxTextCtrl *oLocation, MainWindow *oParentWindow, Settings *oNewSettings); + ++ wxTreeItemId UFiletree::GetParent(wxTreeItemId item) const { return GetItemParent(item); } + wxString getFullpath(wxTreeItemId iItem); + void selectPrevItem(); + void selectNextItem(); +diff -Nru jaffm-1.2.1.original/mainwindow.cpp jaffm-1.2.1/mainwindow.cpp +--- jaffm-1.2.1.original/mainwindow.cpp 2005-10-01 14:46:08.000000000 +0200 ++++ jaffm-1.2.1/mainwindow.cpp 2005-10-01 14:46:44.000000000 +0200 +@@ -541,7 +541,7 @@ + // the keycodes are hardcoded into USettings, + // so that we'll only have to change USettings + // and not MainWindow as well, when the time comes. +- std::string sKeySignal = oSettings->getKeySignal(oEvent.GetCode()); ++ std::string sKeySignal = oSettings->getKeySignal(oEvent.GetKeyCode()); + + if (sKeySignal == "ToggleMenubar") + { diff --git a/x11-misc/jaffm/jaffm-1.2.1.ebuild b/x11-misc/jaffm/jaffm-1.2.1.ebuild index 138049bd6e4f..ff117510ea19 100644 --- a/x11-misc/jaffm/jaffm-1.2.1.ebuild +++ b/x11-misc/jaffm/jaffm-1.2.1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/jaffm-1.2.1.ebuild,v 1.2 2005/06/15 07:59:43 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/jaffm-1.2.1.ebuild,v 1.3 2005/10/01 13:51:14 nelchael Exp $ + +inherit eutils DESCRIPTION="Very lightweight file manager" HOMEPAGE="http://jaffm.binary.is/" @@ -16,6 +18,11 @@ IUSE="" DEPEND="virtual/x11 >=x11-libs/wxGTK-2.6" +src_unpack() { + unpack "${A}" + epatch "${FILESDIR}/${P}-wx24.patch" +} + src_compile() { emake || die } |