diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2006-08-19 15:39:39 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2006-08-19 15:39:39 +0000 |
| commit | 9561c06e46dae729d269dd010ad1a5615a5a0ab5 (patch) | |
| tree | 0fd1d69a37a8297fb2a80b09df353b0957b59f61 /app-doc/kchmviewer | |
| parent | Version bump #144107 by Conrad Kostecki. (diff) | |
| download | gentoo-2-9561c06e46dae729d269dd010ad1a5615a5a0ab5.tar.gz gentoo-2-9561c06e46dae729d269dd010ad1a5615a5a0ab5.tar.bz2 gentoo-2-9561c06e46dae729d269dd010ad1a5615a5a0ab5.zip | |
Fix bug #144315.
(Portage version: 2.1.1_pre5-r2)
Diffstat (limited to 'app-doc/kchmviewer')
| -rw-r--r-- | app-doc/kchmviewer/ChangeLog | 6 | ||||
| -rw-r--r-- | app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff | 11 | ||||
| -rw-r--r-- | app-doc/kchmviewer/kchmviewer-2.6.ebuild | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog index 3af01d561a08..6ba3ba2f1dbe 100644 --- a/app-doc/kchmviewer/ChangeLog +++ b/app-doc/kchmviewer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-doc/kchmviewer # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.16 2006/08/15 17:48:53 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.17 2006/08/19 15:39:38 carlo Exp $ + + 19 Aug 2006; Carsten Lohrke <carlo@gentoo.org> + +files/kchmviewer-2.6-build-Qt.diff, kchmviewer-2.6.ebuild: + Fix bug #144315. *kchmviewer-2.6 (15 Aug 2006) diff --git a/app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff b/app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff new file mode 100644 index 000000000000..509a2af930dc --- /dev/null +++ b/app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff @@ -0,0 +1,11 @@ +--- src/kde-qt.h.orig 2006-08-19 17:13:53.000000000 +0200 ++++ src/kde-qt.h 2006-08-19 17:15:18.000000000 +0200 +@@ -59,7 +59,7 @@ + #include <qmessagebox.h> + #include <qprogressdialog.h> + +- #define i18n(A) tr(A) ++ #define i18n(A) QObject::tr(A) + + #endif /* USE_KDE */ + diff --git a/app-doc/kchmviewer/kchmviewer-2.6.ebuild b/app-doc/kchmviewer/kchmviewer-2.6.ebuild index 1dc9091bc75f..cf43349216f0 100644 --- a/app-doc/kchmviewer/kchmviewer-2.6.ebuild +++ b/app-doc/kchmviewer/kchmviewer-2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-2.6.ebuild,v 1.1 2006/08/15 17:48:53 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-2.6.ebuild,v 1.2 2006/08/19 15:39:38 carlo Exp $ inherit kde-functions eutils @@ -30,9 +30,12 @@ pkg_setup() { src_unpack() { unpack ${A} + cd ${S} # broken configure script, assure it doesn't fall back to internal libs echo "# We use the external chmlib!" > chmlib/chm_lib.h + epatch "${FILESDIR}/kchmviewer-2.6-build-Qt.diff" } + src_compile() { set-kdedir 3 |