commit: dad40a664c6842b93e52259c49d9d1e5435b6ffb Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Oct 17 16:13:08 2015 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Oct 17 16:13:08 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad40a66
app-text/xchm: Apply Debian patch to support wxGTK:3.0 (#562480) Package-Manager: portage-2.2.23 app-text/xchm/files/xchm-1.23-wx3.0-compat.patch | 32 +++++++++++++++ app-text/xchm/xchm-1.23-r1.ebuild | 51 ++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch b/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch new file mode 100644 index 0000000..a9545cf --- /dev/null +++ b/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch @@ -0,0 +1,32 @@ +Description: Fix code to compile with wxwidgets 3.0 + Drops support for wx < 2.7, which is just not relevant now. And in fact + configure.ac checks for at least 2.8.0. +Author: Olly Betts <[email protected]> +Last-Update: 2014-03-07 + +--- xchm-1.23.orig/src/chmframe.cpp ++++ xchm-1.23/src/chmframe.cpp +@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv + enu.EnumerateFacenames(); + _normalFonts = new wxArrayString; + +-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 + *_normalFonts = enu.GetFacenames(); +-#else +- *_normalFonts = *enu.GetFacenames(); +-#endif + _normalFonts->Sort(); + } + +@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv + enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE); + _fixedFonts = new wxArrayString; + +-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 + *_fixedFonts = enu.GetFacenames(); +-#else +- *_fixedFonts = *enu.GetFacenames(); +-#endif + _fixedFonts->Sort(); + } + diff --git a/app-text/xchm/xchm-1.23-r1.ebuild b/app-text/xchm/xchm-1.23-r1.ebuild new file mode 100644 index 0000000..c65c560 --- /dev/null +++ b/app-text/xchm/xchm-1.23-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +WX_GTK_VER="3.0" + +inherit eutils fdo-mime flag-o-matic wxwidgets + +DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files" +HOMEPAGE="http://xchm.sourceforge.net/"; +SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="" +DEPEND=">=dev-libs/chmlib-0.36 + x11-libs/wxGTK:${WX_GTK_VER}[X]" +RDEPEND=${DEPEND} + +src_prepare() { + epatch "${FILESDIR}"/${P}-wx3.0-compat.patch + + append-flags -Wno-unused-local-typedefs +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc AUTHORS README ChangeLog + + cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm + rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm + rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm + + domenu "${FILESDIR}"/xchm.desktop + insinto /usr/share/mime/packages + doins "${FILESDIR}"/xchm.xml +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +}
