| 1 |
commit: fc5354b711152c9154a0db0c6e3e882cf57ab0fb |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 24 12:46:08 2020 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 24 12:46:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5354b7 |
| 7 |
|
| 8 |
app-text/xchm: remove old |
| 9 |
|
| 10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 11 |
|
| 12 |
app-text/xchm/files/xchm-1.23-wx3.0-compat.patch | 32 --------------- |
| 13 |
app-text/xchm/xchm-1.23-r1.ebuild | 50 ------------------------ |
| 14 |
2 files changed, 82 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index a9545cf5b56..00000000000 |
| 19 |
--- a/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,32 +0,0 @@ |
| 22 |
-Description: Fix code to compile with wxwidgets 3.0 |
| 23 |
- Drops support for wx < 2.7, which is just not relevant now. And in fact |
| 24 |
- configure.ac checks for at least 2.8.0. |
| 25 |
-Author: Olly Betts <olly@××××××.com> |
| 26 |
-Last-Update: 2014-03-07 |
| 27 |
- |
| 28 |
---- xchm-1.23.orig/src/chmframe.cpp |
| 29 |
-+++ xchm-1.23/src/chmframe.cpp |
| 30 |
-@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv |
| 31 |
- enu.EnumerateFacenames(); |
| 32 |
- _normalFonts = new wxArrayString; |
| 33 |
- |
| 34 |
--#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 |
| 35 |
- *_normalFonts = enu.GetFacenames(); |
| 36 |
--#else |
| 37 |
-- *_normalFonts = *enu.GetFacenames(); |
| 38 |
--#endif |
| 39 |
- _normalFonts->Sort(); |
| 40 |
- } |
| 41 |
- |
| 42 |
-@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv |
| 43 |
- enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE); |
| 44 |
- _fixedFonts = new wxArrayString; |
| 45 |
- |
| 46 |
--#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 |
| 47 |
- *_fixedFonts = enu.GetFacenames(); |
| 48 |
--#else |
| 49 |
-- *_fixedFonts = *enu.GetFacenames(); |
| 50 |
--#endif |
| 51 |
- _fixedFonts->Sort(); |
| 52 |
- } |
| 53 |
- |
| 54 |
|
| 55 |
diff --git a/app-text/xchm/xchm-1.23-r1.ebuild b/app-text/xchm/xchm-1.23-r1.ebuild |
| 56 |
deleted file mode 100644 |
| 57 |
index 26b4e3e15f8..00000000000 |
| 58 |
--- a/app-text/xchm/xchm-1.23-r1.ebuild |
| 59 |
+++ /dev/null |
| 60 |
@@ -1,50 +0,0 @@ |
| 61 |
-# Copyright 1999-2018 Gentoo Foundation |
| 62 |
-# Distributed under the terms of the GNU General Public License v2 |
| 63 |
- |
| 64 |
-EAPI="5" |
| 65 |
-WX_GTK_VER="3.0" |
| 66 |
- |
| 67 |
-inherit eutils flag-o-matic wxwidgets xdg-utils |
| 68 |
- |
| 69 |
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files" |
| 70 |
-HOMEPAGE="http://xchm.sourceforge.net/" |
| 71 |
-SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz" |
| 72 |
- |
| 73 |
-LICENSE="GPL-2" |
| 74 |
-SLOT="0" |
| 75 |
-KEYWORDS="amd64 ppc x86" |
| 76 |
- |
| 77 |
-IUSE="" |
| 78 |
-DEPEND=">=dev-libs/chmlib-0.36 |
| 79 |
- x11-libs/wxGTK:${WX_GTK_VER}[X]" |
| 80 |
-RDEPEND=${DEPEND} |
| 81 |
- |
| 82 |
-src_prepare() { |
| 83 |
- epatch "${FILESDIR}"/${P}-wx3.0-compat.patch |
| 84 |
- |
| 85 |
- append-flags -Wno-unused-local-typedefs |
| 86 |
-} |
| 87 |
- |
| 88 |
-src_install() { |
| 89 |
- emake DESTDIR="${D}" install |
| 90 |
- |
| 91 |
- dodoc AUTHORS README ChangeLog |
| 92 |
- |
| 93 |
- cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm |
| 94 |
- rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm |
| 95 |
- rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm |
| 96 |
- |
| 97 |
- domenu "${FILESDIR}"/xchm.desktop |
| 98 |
- insinto /usr/share/mime/packages |
| 99 |
- doins "${FILESDIR}"/xchm.xml |
| 100 |
-} |
| 101 |
- |
| 102 |
-pkg_postinst() { |
| 103 |
- xdg_desktop_database_update |
| 104 |
- xdg_mimeinfo_database_update |
| 105 |
-} |
| 106 |
- |
| 107 |
-pkg_postrm() { |
| 108 |
- xdg_desktop_database_update |
| 109 |
- xdg_mimeinfo_database_update |
| 110 |
-} |
Archives