summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-text/xchm/files/xchm-1.23-wx3.0-compat.patch32
-rw-r--r--app-text/xchm/xchm-1.23-r1.ebuild50
2 files changed, 0 insertions, 82 deletions
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
deleted file mode 100644
index a9545cf5b568..000000000000
--- a/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 <olly@survex.com>
-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
deleted file mode 100644
index 26b4e3e15f86..000000000000
--- a/app-text/xchm/xchm-1.23-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WX_GTK_VER="3.0"
-
-inherit eutils flag-o-matic wxwidgets xdg-utils
-
-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() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}